keycloakify 10.0.0-rc.117 → 10.0.0-rc.119

package/bin/526.index.js

@@ -3,13 +3,13 @@ exports.id = 526;
 exports.ids = [526];
 exports.modules = {
 
-/***/ 95781:
+/***/ 97189:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "s": () => (/* binding */ promptKeycloakVersion)
+  "_": () => (/* binding */ getLatestsSemVersionedTag)
 });
 
 ;// CONCATENATED MODULE: ./dist/bin/tools/octokit-addons/listTags.js
@@ -79,7 +79,7 @@ function getLatestsSemVersionedTagFactory(params) {
     const { octokit } = params;
     async function getLatestsSemVersionedTag(params) {
         var _a, e_1, _b, _c;
-        const { owner, repo, count } = params;
+        const { owner, repo, count, doIgnoreReleaseCandidates } = params;
         const semVersionedTags = [];
         const { listTags } = listTagsFactory({ octokit });
         try {
@@ -95,7 +95,7 @@ function getLatestsSemVersionedTagFactory(params) {
                     catch (_g) {
                         continue;
                     }
-                    if (version.rc !== undefined) {
+                    if (doIgnoreReleaseCandidates && version.rc !== undefined) {
                         continue;
                     }
                     semVersionedTags.push({ tag, version });
@@ -121,16 +121,30 @@ function getLatestsSemVersionedTagFactory(params) {
 //# sourceMappingURL=getLatestsSemVersionedTag.js.map
 // EXTERNAL MODULE: ./node_modules/@octokit/rest/dist-node/index.js
 var dist_node = __webpack_require__(55375);
-// EXTERNAL MODULE: ./node_modules/cli-select/dist/index.js
-var dist = __webpack_require__(99398);
-var dist_default = /*#__PURE__*/__webpack_require__.n(dist);
 // EXTERNAL MODULE: external "path"
 var external_path_ = __webpack_require__(71017);
 // EXTERNAL MODULE: external "fs"
 var external_fs_ = __webpack_require__(57147);
+// EXTERNAL MODULE: ./node_modules/zod/lib/index.mjs
+var lib = __webpack_require__(52300);
+// EXTERNAL MODULE: ./node_modules/tsafe/assert.js
+var assert = __webpack_require__(88078);
 // EXTERNAL MODULE: ./node_modules/tsafe/id.js
 var id = __webpack_require__(43047);
-;// CONCATENATED MODULE: ./dist/bin/shared/promptKeycloakVersion.js
+// EXTERNAL MODULE: ./node_modules/evt/tools/inDepth/same.js
+var same = __webpack_require__(33805);
+;// CONCATENATED MODULE: ./dist/bin/shared/getLatestsSemVersionedTag.js
+var __rest = (undefined && undefined.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 
 
 
@@ -138,50 +152,144 @@ var id = __webpack_require__(43047);
 
 
 
-async function promptKeycloakVersion(params) {
-    const { startingFromMajor, excludeMajorVersions, cacheDirPath } = params;
-    const { getLatestsSemVersionedTag } = (() => {
-        const { octokit } = (() => {
+
+let getLatestsSemVersionedTag_stateless = undefined;
+const CACHE_VERSION = 1;
+async function getLatestsSemVersionedTag(_a) {
+    var { cacheDirPath } = _a, params = __rest(_a, ["cacheDirPath"]);
+    const cacheFilePath = (0,external_path_.join)(cacheDirPath, "latest-sem-versioned-tags.json");
+    const cacheLookupResult = (() => {
+        const getResult_currentCache = (currentCacheEntries) => ({
+            hasCachedResult: false,
+            currentCache: {
+                version: CACHE_VERSION,
+                entries: currentCacheEntries
+            }
+        });
+        if (!external_fs_.existsSync(cacheFilePath)) {
+            return getResult_currentCache([]);
+        }
+        let cache_json;
+        try {
+            cache_json = external_fs_.readFileSync(cacheFilePath).toString("utf8");
+        }
+        catch (_a) {
+            return getResult_currentCache([]);
+        }
+        let cache_json_parsed;
+        try {
+            cache_json_parsed = JSON.parse(cache_json);
+        }
+        catch (_b) {
+            return getResult_currentCache([]);
+        }
+        const zSemVer = (() => {
+            const zTargetType = lib.z.object({
+                major: lib.z.number(),
+                minor: lib.z.number(),
+                patch: lib.z.number(),
+                rc: lib.z.number().optional(),
+                parsedFrom: lib.z.string()
+            });
+            (0,assert.assert)();
+            return (0,id.id)(zTargetType);
+        })();
+        const zCache = (() => {
+            const zTargetType = lib.z.object({
+                version: lib.z.literal(CACHE_VERSION),
+                entries: lib.z.array(lib.z.object({
+                    time: lib.z.number(),
+                    params: lib.z.object({
+                        owner: lib.z.string(),
+                        repo: lib.z.string(),
+                        count: lib.z.number(),
+                        doIgnoreReleaseCandidates: lib.z.boolean()
+                    }),
+                    result: lib.z.array(lib.z.object({
+                        tag: lib.z.string(),
+                        version: zSemVer
+                    }))
+                }))
+            });
+            (0,assert.assert)();
+            return (0,id.id)(zTargetType);
+        })();
+        let cache;
+        try {
+            cache = zCache.parse(cache_json_parsed);
+        }
+        catch (_c) {
+            return getResult_currentCache([]);
+        }
+        const cacheEntry = cache.entries.find(e => (0,same.same)(e.params, params));
+        if (cacheEntry === undefined) {
+            return getResult_currentCache(cache.entries);
+        }
+        if (Date.now() - cacheEntry.time > 3600000) {
+            return getResult_currentCache(cache.entries.filter(e => e !== cacheEntry));
+        }
+        return {
+            hasCachedResult: true,
+            cachedResult: cacheEntry.result
+        };
+    })();
+    if (cacheLookupResult.hasCachedResult) {
+        return cacheLookupResult.cachedResult;
+    }
+    const { currentCache } = cacheLookupResult;
+    getLatestsSemVersionedTag_stateless !== null && getLatestsSemVersionedTag_stateless !== void 0 ? getLatestsSemVersionedTag_stateless : (getLatestsSemVersionedTag_stateless = (() => {
+        const octokit = (() => {
             const githubToken = process.env.GITHUB_TOKEN;
             const octokit = new dist_node.Octokit(githubToken === undefined ? undefined : { auth: githubToken });
-            return { octokit };
+            return octokit;
         })();
         const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
             octokit
         });
-        return { getLatestsSemVersionedTag };
-    })();
-    const semVersionedTagByMajor = new Map();
-    const semVersionedTags = await (async () => {
-        const cacheFilePath = (0,external_path_.join)(cacheDirPath, "keycloak-versions.json");
-        use_cache: {
-            if (!external_fs_.existsSync(cacheFilePath)) {
-                break use_cache;
-            }
-            const cache = JSON.parse(external_fs_.readFileSync(cacheFilePath).toString("utf8"));
-            if (Date.now() - cache.time > 3600000) {
-                external_fs_.unlinkSync(cacheFilePath);
-                break use_cache;
-            }
-            return cache.semVersionedTags;
-        }
-        const semVersionedTags = await getLatestsSemVersionedTag({
-            count: 50,
-            owner: "keycloak",
-            repo: "keycloak"
-        });
-        {
-            const dirPath = (0,external_path_.dirname)(cacheFilePath);
-            if (!external_fs_.existsSync(dirPath)) {
-                external_fs_.mkdirSync(dirPath, { recursive: true });
-            }
+        return getLatestsSemVersionedTag;
+    })());
+    const result = await getLatestsSemVersionedTag_stateless(params);
+    currentCache.entries.push({
+        time: Date.now(),
+        params,
+        result
+    });
+    {
+        const dirPath = (0,external_path_.dirname)(cacheFilePath);
+        if (!external_fs_.existsSync(dirPath)) {
+            external_fs_.mkdirSync(dirPath, { recursive: true });
         }
-        external_fs_.writeFileSync(cacheFilePath, JSON.stringify((0,id.id)({
-            time: Date.now(),
-            semVersionedTags
-        }), null, 2));
-        return semVersionedTags;
-    })();
+    }
+    external_fs_.writeFileSync(cacheFilePath, JSON.stringify(currentCache, null, 2));
+    return result;
+}
+//# sourceMappingURL=getLatestsSemVersionedTag.js.map
+
+/***/ }),
+
+/***/ 82635:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "s": () => (/* binding */ promptKeycloakVersion)
+/* harmony export */ });
+/* harmony import */ var _getLatestsSemVersionedTag__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97189);
+/* harmony import */ var cli_select__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(99398);
+/* harmony import */ var cli_select__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(cli_select__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _tools_SemVer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12171);
+
+
+
+async function promptKeycloakVersion(params) {
+    const { startingFromMajor, excludeMajorVersions, cacheDirPath } = params;
+    const semVersionedTagByMajor = new Map();
+    const semVersionedTags = await (0,_getLatestsSemVersionedTag__WEBPACK_IMPORTED_MODULE_0__/* .getLatestsSemVersionedTag */ ._)({
+        cacheDirPath,
+        count: 50,
+        owner: "keycloak",
+        repo: "keycloak",
+        doIgnoreReleaseCandidates: true
+    });
     semVersionedTags.forEach(semVersionedTag => {
         if (startingFromMajor !== undefined &&
             semVersionedTag.version.major < startingFromMajor) {
@@ -192,13 +300,13 @@ async function promptKeycloakVersion(params) {
         }
         const currentSemVersionedTag = semVersionedTagByMajor.get(semVersionedTag.version.major);
         if (currentSemVersionedTag !== undefined &&
-            SemVer/* SemVer.compare */.h.compare(semVersionedTag.version, currentSemVersionedTag.version) === -1) {
+            _tools_SemVer__WEBPACK_IMPORTED_MODULE_2__/* .SemVer.compare */ .h.compare(semVersionedTag.version, currentSemVersionedTag.version) === -1) {
             return;
         }
         semVersionedTagByMajor.set(semVersionedTag.version.major, semVersionedTag);
     });
     const lastMajorVersions = Array.from(semVersionedTagByMajor.values()).map(({ tag }) => tag);
-    const { value } = await dist_default()({
+    const { value } = await cli_select__WEBPACK_IMPORTED_MODULE_1___default()({
         values: lastMajorVersions
     }).catch(() => {
         process.exit(-1);
@@ -225,8 +333,8 @@ __webpack_require__.d(__webpack_exports__, {
 var shared_buildContext = __webpack_require__(56031);
 // EXTERNAL MODULE: ./node_modules/tsafe/exclude.js
 var exclude = __webpack_require__(41370);
-// EXTERNAL MODULE: ./dist/bin/shared/promptKeycloakVersion.js + 2 modules
-var promptKeycloakVersion = __webpack_require__(95781);
+// EXTERNAL MODULE: ./dist/bin/shared/promptKeycloakVersion.js
+var promptKeycloakVersion = __webpack_require__(82635);
 // EXTERNAL MODULE: ./dist/bin/shared/constants.js
 var constants = __webpack_require__(173);
 // EXTERNAL MODULE: ./dist/bin/tools/SemVer.js
@@ -266,10 +374,12 @@ var Deferred = __webpack_require__(50689);
 
 
 
+
+
 (0,assert.assert)();
 async function appBuild(params) {
     const { buildContext } = params;
-    switch (buildContext.bundler.type) {
+    switch (buildContext.bundler) {
         case "vite":
             return appBuild_vite({ buildContext });
         case "webpack":
@@ -278,7 +388,7 @@ async function appBuild(params) {
 }
 async function appBuild_vite(params) {
     const { buildContext } = params;
-    (0,assert.assert)(buildContext.bundler.type === "vite");
+    (0,assert.assert)(buildContext.bundler === "vite");
     const dIsSuccess = new Deferred.Deferred();
     console.log(source_default().blue("Running: 'npx vite build'"));
     const child = external_child_process_.spawn("npx", ["vite", "build"], {
@@ -297,12 +407,14 @@ async function appBuild_vite(params) {
     return { isAppBuildSuccess: isSuccess };
 }
 async function appBuild_webpack(params) {
+    var _a;
     const { buildContext } = params;
-    (0,assert.assert)(buildContext.bundler.type === "webpack");
-    const entries = Object.entries(buildContext.bundler.packageJsonScripts).filter(([, scriptCommand]) => scriptCommand.includes("keycloakify build"));
+    (0,assert.assert)(buildContext.bundler === "webpack");
+    const entries = Object.entries(((_a = JSON.parse(external_fs_.readFileSync(buildContext.packageJsonFilePath).toString("utf8"))
+        .scripts) !== null && _a !== void 0 ? _a : {})).filter(([, scriptCommand]) => scriptCommand.includes("keycloakify build"));
     if (entries.length === 0) {
         console.log(source_default().red([
-            `You should have a script in your package.json at ${buildContext.bundler.packageJsonDirPath}`,
+            `You should have a script in your package.json at ${(0,external_path_.relative)(process.cwd(), (0,external_path_.dirname)(buildContext.packageJsonFilePath))}`,
             `that includes the 'keycloakify build' command`
         ].join(" ")));
         process.exit(-1);
@@ -329,7 +441,7 @@ async function appBuild_webpack(params) {
         console.log(source_default().red(`Your ${scriptName} script should look like "... && keycloakify build ..."`));
         process.exit(-1);
     }
-    let commandCwd = buildContext.bundler.packageJsonDirPath;
+    let commandCwd = (0,external_path_.dirname)(buildContext.packageJsonFilePath);
     for (const subCommand of appBuildSubCommands) {
         const dIsSuccess = new Deferred.Deferred();
         const [command, ...args] = subCommand.split(" ");
@@ -348,7 +460,7 @@ async function appBuild_webpack(params) {
                     var _a;
                     const separator = external_path_.sep === "/" ? ":" : ";";
                     return [
-                        (0,external_path_.join)(buildContext.bundler.packageJsonDirPath, "node_modules", ".bin"),
+                        (0,external_path_.join)((0,external_path_.dirname)(buildContext.packageJsonFilePath), "node_modules", ".bin"),
                         ...((_a = process.env.PATH) !== null && _a !== void 0 ? _a : "").split(separator)
                     ].join(separator);
                 })() }),