keycloakify 7.16.0-rc.1 → 8.0.0-rc.0

package/bin/keycloakify/generateTheme/readStaticResourcesUsage.js

@@ -0,0 +1,172 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readPaths = exports.readStaticResourcesUsage = void 0;
+var crawl_1 = require("../../tools/crawl");
+var path_1 = require("path");
+var fs = __importStar(require("fs"));
+/** Assumes the theme type exists */
+function readStaticResourcesUsage(params) {
+    var e_1, _a, e_2, _b;
+    var keycloakifySrcDirPath = params.keycloakifySrcDirPath, themeSrcDirPath = params.themeSrcDirPath, themeType = params.themeType;
+    var resourcesCommonFilePaths = new Set();
+    var resourcesFilePaths = new Set();
+    try {
+        for (var _c = __values([(0, path_1.join)(keycloakifySrcDirPath, themeType), (0, path_1.join)(themeSrcDirPath, themeType)]), _d = _c.next(); !_d.done; _d = _c.next()) {
+            var srcDirPath = _d.value;
+            var filePaths = (0, crawl_1.crawl)({ "dirPath": srcDirPath, "returnedPathsType": "absolute" }).filter(function (filePath) { return /\.(ts|tsx|js|jsx)$/.test(filePath); });
+            try {
+                for (var filePaths_1 = (e_2 = void 0, __values(filePaths)), filePaths_1_1 = filePaths_1.next(); !filePaths_1_1.done; filePaths_1_1 = filePaths_1.next()) {
+                    var filePath = filePaths_1_1.value;
+                    var rawSourceFile = fs.readFileSync(filePath).toString("utf8");
+                    if (!rawSourceFile.includes("resourcesCommonPath") && !rawSourceFile.includes("resourcesPath")) {
+                        continue;
+                    }
+                    var wrap = readPaths({ rawSourceFile: rawSourceFile });
+                    wrap.resourcesCommonFilePaths.forEach(function (filePath) { return resourcesCommonFilePaths.add(filePath); });
+                    wrap.resourcesFilePaths.forEach(function (filePath) { return resourcesFilePaths.add(filePath); });
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (filePaths_1_1 && !filePaths_1_1.done && (_b = filePaths_1.return)) _b.call(filePaths_1);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return {
+        "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths),
+        "resourcesFilePaths": Array.from(resourcesFilePaths)
+    };
+}
+exports.readStaticResourcesUsage = readStaticResourcesUsage;
+/** Exported for testing purpose */
+function readPaths(params) {
+    var e_3, _a, e_4, _b, e_5, _c;
+    var rawSourceFile = params.rawSourceFile;
+    var resourcesCommonFilePaths = new Set();
+    var resourcesFilePaths = new Set();
+    try {
+        for (var _d = __values([true, false]), _e = _d.next(); !_e.done; _e = _d.next()) {
+            var isCommon = _e.value;
+            var set = isCommon ? resourcesCommonFilePaths : resourcesFilePaths;
+            {
+                var regexp = new RegExp("resources".concat(isCommon ? "Common" : "", "Path\\s*}([^`]+)`"), "g");
+                var matches = __spreadArray([], __read(rawSourceFile.matchAll(regexp)), false);
+                try {
+                    for (var matches_1 = (e_4 = void 0, __values(matches)), matches_1_1 = matches_1.next(); !matches_1_1.done; matches_1_1 = matches_1.next()) {
+                        var match = matches_1_1.value;
+                        var filePath = match[1];
+                        set.add(filePath);
+                    }
+                }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                finally {
+                    try {
+                        if (matches_1_1 && !matches_1_1.done && (_b = matches_1.return)) _b.call(matches_1);
+                    }
+                    finally { if (e_4) throw e_4.error; }
+                }
+            }
+            {
+                var regexp = new RegExp("resources".concat(isCommon ? "Common" : "", "Path\\s*[+,]\\s*[\"']([^\"'`]+)[\"'`]"), "g");
+                var matches = __spreadArray([], __read(rawSourceFile.matchAll(regexp)), false);
+                try {
+                    for (var matches_2 = (e_5 = void 0, __values(matches)), matches_2_1 = matches_2.next(); !matches_2_1.done; matches_2_1 = matches_2.next()) {
+                        var match = matches_2_1.value;
+                        var filePath = match[1];
+                        set.add(filePath);
+                    }
+                }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (matches_2_1 && !matches_2_1.done && (_c = matches_2.return)) _c.call(matches_2);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
+            }
+        }
+    }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    finally {
+        try {
+            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+        }
+        finally { if (e_3) throw e_3.error; }
+    }
+    var removePrefixSlash = function (filePath) { return (filePath.startsWith("/") ? filePath.slice(1) : filePath); };
+    return {
+        "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths).map(removePrefixSlash),
+        "resourcesFilePaths": Array.from(resourcesFilePaths).map(removePrefixSlash)
+    };
+}
+exports.readPaths = readPaths;
+//# sourceMappingURL=readStaticResourcesUsage.js.map

package/bin/keycloakify/generateTheme/readStaticResourcesUsage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readStaticResourcesUsage.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/readStaticResourcesUsage.ts"],"names":[],"mappings":"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"}

package/bin/keycloakify/keycloakify.js

@@ -148,6 +148,7 @@ function main() {
                     if (!!_b.done) return [3 /*break*/, 5];
                     themeName = _b.value;
                     return [4 /*yield*/, (0, generateTheme_1.generateTheme)({
+                            projectDirPath: projectDirPath,
                             "keycloakThemeBuildingDirPath": buildOptions.keycloakifyBuildDirPath,
                             themeSrcDirPath: themeSrcDirPath,
                             "keycloakifySrcDirPath": (0, path_1.join)(keycloakifyDirPath, "src"),
@@ -176,7 +177,8 @@ function main() {
                     }
                     finally { if (e_1) throw e_1.error; }
                     return [7 /*endfinally*/];
-                case 8: return [4 /*yield*/, (0, generateJavaStackFiles_1.generateJavaStackFiles)({
+                case 8:
+                    jarFilePath = (0, generateJavaStackFiles_1.generateJavaStackFiles)({
                         "keycloakThemeBuildingDirPath": buildOptions.keycloakifyBuildDirPath,
                         "implementedThemeTypes": (function () {
                             var e_2, _a;
@@ -204,20 +206,18 @@ function main() {
                             return implementedThemeTypes;
                         })(),
                         buildOptions: buildOptions
-                    })];
-                case 9:
-                    jarFilePath = (_e.sent()).jarFilePath;
+                    }).jarFilePath;
                     _c = buildOptions.bundler;
                     switch (_c) {
-                        case "none": return [3 /*break*/, 10];
-                        case "keycloakify": return [3 /*break*/, 11];
-                        case "mvn": return [3 /*break*/, 13];
+                        case "none": return [3 /*break*/, 9];
+                        case "keycloakify": return [3 /*break*/, 10];
+                        case "mvn": return [3 /*break*/, 12];
                     }
+                    return [3 /*break*/, 13];
+                case 9:
+                    logger.log("😱 Skipping bundling step, there will be no jar");
                     return [3 /*break*/, 14];
                 case 10:
-                    logger.log("😱 Skipping bundling step, there will be no jar");
-                    return [3 /*break*/, 15];
-                case 11:
                     logger.log("🫶 Let keycloakify do its thang");
                     return [4 /*yield*/, (0, jar_1.default)({
                             "rootPath": buildOptions.keycloakifyBuildDirPath,
@@ -226,17 +226,17 @@ function main() {
                             "artifactId": buildOptions.artifactId,
                             "targetPath": jarFilePath
                         })];
-                case 12:
+                case 11:
                     _e.sent();
-                    return [3 /*break*/, 15];
-                case 13:
+                    return [3 /*break*/, 14];
+                case 12:
                     logger.log("🫙 Run maven to deliver a jar");
                     child_process.execSync("mvn package", { "cwd": buildOptions.keycloakifyBuildDirPath });
-                    return [3 /*break*/, 15];
-                case 14:
+                    return [3 /*break*/, 14];
+                case 13:
                     (0, assert_1.assert)(false);
-                    _e.label = 15;
-                case 15:
+                    _e.label = 14;
+                case 14:
                     containerKeycloakVersion = "21.1.2";
                     (0, generateStartKeycloakTestingContainer_1.generateStartKeycloakTestingContainer)({
                         keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,

package/bin/keycloakify/keycloakify.js.map

@@ -1 +1 @@
-{"version":3,"file":"keycloakify.js","sourceRoot":"","sources":["../../src/bin/keycloakify/keycloakify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"keycloakify.js","sourceRoot":"","sources":["../../src/bin/keycloakify/keycloakify.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAgD;AAChD,mEAAkE;AAClE,6BAA4G;AAC5G,2DAA+C;AAC/C,iGAAgG;AAChG,qCAAyB;AACzB,+CAAkD;AAClD,0CAA4C;AAC5C,qDAA+B;AAC/B,uCAAsC;AAEtC,kDAAsD;AACtD,0DAAyD;AACzD,+CAA8C;AAE9C,SAAsB,IAAI;;;;;;;oBAChB,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;oBAE/B,YAAY,GAAG,IAAA,+BAAgB,EAAC;wBAClC,cAAc,gBAAA;wBACd,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;qBACvC,CAAC,CAAC;oBAEG,MAAM,GAAG,IAAA,kBAAS,EAAC,EAAE,UAAU,EAAE,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAChE,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;oBAE3C,kBAAkB,GAAG,IAAA,+BAAc,GAAE,CAAC;oBAEpC,eAAe,GAAK,IAAA,kCAAkB,EAAC,EAAE,cAAc,gBAAA,EAAE,CAAC,gBAA3C,CAA4C;;;;oBAE3C,KAAA,wBAAC,YAAY,CAAC,SAAS,UAAK,YAAY,CAAC,eAAe,UAAC;;;;oBAAtE,SAAS;oBAChB,qBAAM,IAAA,6BAAa,EAAC;4BAChB,cAAc,gBAAA;4BACd,8BAA8B,EAAE,YAAY,CAAC,uBAAuB;4BACpE,eAAe,iBAAA;4BACf,uBAAuB,EAAE,IAAA,WAAQ,EAAC,kBAAkB,EAAE,KAAK,CAAC;4BAC5D,sBAAsB,EAAE,YAAY,CAAC,oBAAoB;4BACzD,cAAc,wBACP,YAAY,KACf,WAAW,EAAE,SAAS,GACzB;4BACD,oBAAoB,EAAE,CAAC;gCACnB,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAA,WAAQ,EAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gCAEtH,IAAA,eAAM,EAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC;gCAEpC,OAAO,OAAO,CAAC;4BACnB,CAAC,CAAC,EAAE;yBACP,CAAC,EAAA;;oBAjBF,SAiBE,CAAC;;;;;;;;;;;;;;;;;oBAGC,WAAW,GAAK,IAAA,+CAAsB,EAAC;wBAC3C,8BAA8B,EAAE,YAAY,CAAC,uBAAuB;wBACpE,uBAAuB,EAAE,CAAC;;4BACtB,IAAM,qBAAqB,GAAG;gCAC1B,OAAO,EAAE,KAAK;gCACd,SAAS,EAAE,KAAK;gCAChB,OAAO,EAAE,KAAK;6BACjB,CAAC;;gCAEF,KAAwB,IAAA,KAAA,SAAA,IAAA,uBAAU,EAAC,qBAAqB,CAAC,CAAA,gBAAA,4BAAE;oCAAtD,IAAM,SAAS,WAAA;oCAChB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAA,WAAQ,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC,EAAE;wCACtD,SAAS;qCACZ;oCACD,qBAAqB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;iCAC3C;;;;;;;;;4BAED,OAAO,qBAAqB,CAAC;wBACjC,CAAC,CAAC,EAAE;wBACJ,YAAY,cAAA;qBACf,CAAC,YAnBiB,CAmBhB;oBAEK,KAAA,YAAY,CAAC,OAAO,CAAA;;6BACnB,MAAM,CAAC,CAAP,wBAAM;6BAGN,aAAa,CAAC,CAAd,yBAAa;6BAUb,KAAK,CAAC,CAAN,yBAAK;;;;oBAZN,MAAM,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;oBAC9D,yBAAM;;oBAEN,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;oBAC9C,qBAAM,IAAA,aAAG,EAAC;4BACN,UAAU,EAAE,YAAY,CAAC,uBAAuB;4BAChD,SAAS,EAAE,YAAY,CAAC,YAAY;4BACpC,SAAS,EAAE,YAAY,CAAC,OAAO;4BAC/B,YAAY,EAAE,YAAY,CAAC,UAAU;4BACrC,YAAY,EAAE,WAAW;yBAC5B,CAAC,EAAA;;oBANF,SAME,CAAC;oBACH,yBAAM;;oBAEN,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;oBAC5C,aAAa,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,uBAAuB,EAAE,CAAC,CAAC;oBACvF,yBAAM;;oBAEN,IAAA,eAAM,EAA6C,KAAK,CAAC,CAAC;;;oBAI5D,wBAAwB,GAAG,QAAQ,CAAC;oBAE1C,IAAA,6EAAqC,EAAC;wBAClC,4BAA4B,EAAE,YAAY,CAAC,uBAAuB;wBAClE,iBAAiB,EAAE,wBAAwB;wBAC3C,YAAY,cAAA;qBACf,CAAC,CAAC;oBAEH,MAAM,CAAC,GAAG,CACN;wBACI,EAAE;wBACF,0EAA8D,UAAO,SAAG,IAAA,eAAY,EAAC,cAAc,EAAE,WAAW,CAAC,kBAAK;wBACtH,sHAAoH;wBACpH,EAAE;wBACF,4DAA4D;wBAC5D,8EAA8E;wBAC9E,EAAE;wBACF,cAAc;wBACd,4BAA4B;wBAC5B,oCAAoC;wBACpC,kCAAkC;wBAClC,yCAAyC;wBACzC,oBAAoB;wBACpB,kBAAkB;wBAClB,iBAAiB;wBACjB,kBAAkB;wBAClB,qDAA8C,IAAA,eAAY,EAAC,WAAW,CAAC,iCAAuB,IAAA,eAAY,EAAC,WAAW,CAAC,CAAE;wBACzH,yBAAyB;wBACzB,gCAAgC;wBAChC,sCAAsC;wBACtC,UAAU;wBACV,8BAA8B;wBAC9B,gCAAgC;wBAChC,kDAAkD;wBAClD,iBAAiB;wBACjB,2BAA2B;wBAC3B,oBAAoB;wBACpB,+BAA+B;wBAC/B,wBAAwB;wBACxB,uBAAuB;wBACvB,yCAAyC;wBACzC,EAAE;wBACF,EAAE;wBACF,gEAAyD,wBAAwB,2DAAwD;wBACzI,EAAE;wBACF,0BAAS,UAAO,SAAG,IAAA,eAAY,EAC3B,cAAc,EACd,IAAA,WAAQ,EAAC,YAAY,CAAC,uBAAuB,EAAE,6EAAqC,CAAC,QAAQ,CAAC,CACjG,kBAAK;wBACN,EAAE;wBACF,mJAAmJ;wBACnJ,EAAE;wBACF,yCAAyC;wBACzC,iGAAiG;wBACjG,uFAAuF;wBACvF,+FAA+F;wBAC/F,iGAA0F,YAAY,CAAC,SAAS,CAAE;wBAClH,iGAA0F,YAAY,CAAC,SAAS,CAAE;wBAClH,iGAA0F,YAAY,CAAC,SAAS,0EAAuE;wBACvL,mHAAmH;wBACnH,wIAAwI;wBACxI,kLAAkL;wBAClL,0JAA0J;wBAC1J,4GAA4G;wBAC5G,mHAA4G,YAAY,CAAC,SAAS,CAAE;wBACpI,iHAAiH;wBACjH,EAAE;wBACF,mIAA2G;wBAC3G,4GAAwF;wBACxF,EAAE;wBACF,8CAA8C;wBAC9C,EAAE;qBACL,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;;;;;CACL;AA1JD,oBA0JC"}

package/bin/keycloakify/replacers/replaceImportsFromStaticInJsCode.d.ts

@@ -1,16 +1,5 @@
-export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets;
-export declare namespace BuildOptionsLike {
-    type Standalone = {
-        isStandalone: true;
-    };
-    type ExternalAssets = {
-        isStandalone: false;
-        urlOrigin: string;
-    };
-}
 export declare function replaceImportsFromStaticInJsCode(params: {
     jsCode: string;
-    buildOptions: BuildOptionsLike;
 }): {
     fixedJsCode: string;
 };

package/bin/keycloakify/replacers/replaceImportsFromStaticInJsCode.js

@@ -27,14 +27,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceImportsFromStaticInJsCode = void 0;
 var ftlValuesGlobalName_1 = require("../ftlValuesGlobalName");
-var assert_1 = require("tsafe/assert");
-var is_1 = require("tsafe/is");
-var Reflect_1 = require("tsafe/Reflect");
-{
-    var buildOptions = (0, Reflect_1.Reflect)();
-    (0, assert_1.assert)(!(0, is_1.is)(buildOptions));
-    (0, assert_1.assert)();
-}
 function replaceImportsFromStaticInJsCode(params) {
     /*
     NOTE:
@@ -48,7 +40,7 @@ function replaceImportsFromStaticInJsCode(params) {
     will always run in keycloak context.
     */
     var _a;
-    var jsCode = params.jsCode, buildOptions = params.buildOptions;
+    var jsCode = params.jsCode;
     var getReplaceArgs = function (language) { return [
         new RegExp("([a-zA-Z_]+)\\.([a-zA-Z]+)=function\\(([a-zA-Z]+)\\){return\"static\\/".concat(language, "\\/\""), "g"),
         function () {
@@ -57,33 +49,20 @@ function replaceImportsFromStaticInJsCode(params) {
                 _a[_i] = arguments[_i];
             }
             var _b = __read(_a, 4), n = _b[1], u = _b[2], e = _b[3];
-            return "\n\t\t\t".concat(n, "[(function(){\n                var pd= Object.getOwnPropertyDescriptor(").concat(n, ", \"p\");\n                if( pd === undefined || pd.configurable ){\n                ").concat(buildOptions.isStandalone
-                ? "\n                        Object.defineProperty(".concat(n, ", \"p\", {\n                            get: function() { return window.").concat(ftlValuesGlobalName_1.ftlValuesGlobalName, ".url.resourcesPath; },\n                            set: function (){}\n                        });\n                    ")
-                : "\n                    var p= \"\";\n                    Object.defineProperty(".concat(n, ", \"p\", {\n                        get: function() { return \"").concat(ftlValuesGlobalName_1.ftlValuesGlobalName, "\" in window ? \"").concat(buildOptions.urlOrigin, "/\" : p; },\n                        set: function (value){ p = value;}\n                    });\n                    "), "\n                }\n\t\t\t\treturn \"").concat(u, "\";\n\t\t\t})()] = function(").concat(e, ") { return \"").concat(buildOptions.isStandalone ? "/build/" : "", "static/").concat(language, "/\"");
+            return "\n\t\t\t".concat(n, "[(function(){\n                var pd= Object.getOwnPropertyDescriptor(").concat(n, ", \"p\");\n                if( pd === undefined || pd.configurable ){\n                    Object.defineProperty(").concat(n, ", \"p\", {\n                        get: function() { return window.").concat(ftlValuesGlobalName_1.ftlValuesGlobalName, ".url.resourcesPath; },\n                        set: function (){}\n                    });\n                }\n\t\t\t\treturn \"").concat(u, "\";\n\t\t\t})()] = function(").concat(e, ") { return \"").concat(true ? "/build/" : "", "static/").concat(language, "/\"");
         }
     ]; };
     var fixedJsCode = (_a = jsCode
         .replace.apply(jsCode, __spreadArray([], __read(getReplaceArgs("js")), false)))
-        .replace.apply(_a, __spreadArray([], __read(getReplaceArgs("css")), false)).replace(/([a-zA-Z]+\.[a-zA-Z]+)\+"static\//g, function () {
-        var _a = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            _a[_i] = arguments[_i];
-        }
-        var _b = __read(_a, 2), group = _b[1];
-        return buildOptions.isStandalone
-            ? "window.".concat(ftlValuesGlobalName_1.ftlValuesGlobalName, ".url.resourcesPath + \"/build/static/")
-            : "(\"".concat(ftlValuesGlobalName_1.ftlValuesGlobalName, "\" in window ? \"").concat(buildOptions.urlOrigin, "/\" : ").concat(group, ") + \"static/");
-    })
+        .replace.apply(_a, __spreadArray([], __read(getReplaceArgs("css")), false)).replace(/[a-zA-Z]+\.[a-zA-Z]+\+"static\//g, "window.".concat(ftlValuesGlobalName_1.ftlValuesGlobalName, ".url.resourcesPath + \"/build/static/"))
         //TODO: Write a test case for this
-        .replace(/".chunk.css",([a-zA-Z])+=([a-zA-Z]+\.[a-zA-Z]+)\+([a-zA-Z]+),/, function () {
+        .replace(/".chunk.css",([a-zA-Z])+=[a-zA-Z]+\.[a-zA-Z]+\+([a-zA-Z]+),/, function () {
         var _a = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             _a[_i] = arguments[_i];
         }
-        var _b = __read(_a, 4), group1 = _b[1], group2 = _b[2], group3 = _b[3];
-        return buildOptions.isStandalone
-            ? "\".chunk.css\",".concat(group1, " = window.").concat(ftlValuesGlobalName_1.ftlValuesGlobalName, ".url.resourcesPath + \"/build/\" + ").concat(group3, ",")
-            : "\".chunk.css\",".concat(group1, " = (\"").concat(ftlValuesGlobalName_1.ftlValuesGlobalName, "\" in window ? \"").concat(buildOptions.urlOrigin, "/\" : ").concat(group2, ") + ").concat(group3, ",");
+        var _b = __read(_a, 3), group1 = _b[1], group2 = _b[2];
+        return "\".chunk.css\",".concat(group1, " = window.").concat(ftlValuesGlobalName_1.ftlValuesGlobalName, ".url.resourcesPath + \"/build/\" + ").concat(group2, ",");
     });
     return { fixedJsCode: fixedJsCode };
 }

package/bin/keycloakify/replacers/replaceImportsFromStaticInJsCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"replaceImportsFromStaticInJsCode.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/replacers/replaceImportsFromStaticInJsCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA6D;AAE7D,uCAAsC;AACtC,+BAA8B;AAC9B,yCAAwC;AAexC;IACI,IAAM,YAAY,GAAG,IAAA,iBAAO,GAAgB,CAAC;IAE7C,IAAA,eAAM,EAAC,CAAC,IAAA,OAAE,EAAmD,YAAY,CAAC,CAAC,CAAC;IAE5E,IAAA,eAAM,GAA+D,CAAC;CACzE;AAED,SAAgB,gCAAgC,CAAC,MAA0D;IACvG;;;;;;;;;;MAUD;;IAES,IAAA,MAAM,GAAmB,MAAM,OAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;IAExC,IAAM,cAAc,GAAG,UAAC,QAAsB,IAAkD,OAAA;QAC5F,IAAI,MAAM,CAAC,gFAAwE,QAAQ,UAAM,EAAE,GAAG,CAAC;QACvG;YAAC,YAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,uBAAc;;YAAd,IAAA,KAAA,aAAc,EAAR,CAAC,QAAA,EAAE,CAAC,QAAA,EAAE,CAAC,QAAA,CAAC;YAAK,OAAA,kBACvB,CAAC,oFACoD,CAAC,oGAGvC,YAAY,CAAC,YAAY;gBACrB,CAAC,CAAC,0DACsB,CAAC,qFACa,yCAAmB,8HAG5D;gBACG,CAAC,CAAC,wFAEkB,CAAC,4EACO,yCAAmB,8BAAkB,YAAY,CAAC,SAAS,2HAG1F,mDAGP,CAAC,yCACO,CAAC,0BAAe,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,oBAAU,QAAQ,QAAI;QAtB1E,CAsB0E;KACjG,EAzB+F,CAyB/F,CAAC;IAEF,IAAM,WAAW,GAAG,CAAA,KAAA,MAAM;SACrB,OAAO,OADQ,MAAM,2BACV,cAAc,CAAC,IAAI,CAAC,UAAC,CAAA;SAChC,OAAO,oCAAI,cAAc,CAAC,KAAK,CAAC,WAChC,OAAO,CAAC,oCAAoC,EAAE;QAAC,YAAY;aAAZ,UAAY,EAAZ,qBAAY,EAAZ,IAAY;YAAZ,uBAAY;;QAAZ,IAAA,KAAA,aAAY,EAAN,KAAK,QAAA,CAAC;QACxD,OAAA,YAAY,CAAC,YAAY;YACrB,CAAC,CAAC,iBAAU,yCAAmB,0CAAsC;YACrE,CAAC,CAAC,aAAK,yCAAmB,8BAAkB,YAAY,CAAC,SAAS,mBAAQ,KAAK,kBAAc;IAFjG,CAEiG,CACpG;QACD,kCAAkC;SACjC,OAAO,CAAC,+DAA+D,EAAE;QAAC,YAA6B;aAA7B,UAA6B,EAA7B,qBAA6B,EAA7B,IAA6B;YAA7B,uBAA6B;;QAA7B,IAAA,KAAA,aAA6B,EAAvB,MAAM,QAAA,EAAE,MAAM,QAAA,EAAE,MAAM,QAAA,CAAC;QACpG,OAAA,YAAY,CAAC,YAAY;YACrB,CAAC,CAAC,yBAAgB,MAAM,uBAAa,yCAAmB,gDAAoC,MAAM,MAAG;YACrG,CAAC,CAAC,yBAAgB,MAAM,mBAAQ,yCAAmB,8BAAkB,YAAY,CAAC,SAAS,mBAAQ,MAAM,iBAAO,MAAM,MAAG;IAF7H,CAE6H,CAChI,CAAC;IAEN,OAAO,EAAE,WAAW,aAAA,EAAE,CAAC;AAC3B,CAAC;AA1DD,4EA0DC"}
+{"version":3,"file":"replaceImportsFromStaticInJsCode.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/replacers/replaceImportsFromStaticInJsCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA6D;AAE7D,SAAgB,gCAAgC,CAAC,MAA0B;IACvE;;;;;;;;;;MAUD;;IAES,IAAA,MAAM,GAAK,MAAM,OAAX,CAAY;IAE1B,IAAM,cAAc,GAAG,UAAC,QAAsB,IAAkD,OAAA;QAC5F,IAAI,MAAM,CAAC,gFAAwE,QAAQ,UAAM,EAAE,GAAG,CAAC;QACvG;YAAC,YAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,uBAAc;;YAAd,IAAA,KAAA,aAAc,EAAR,CAAC,QAAA,EAAE,CAAC,QAAA,EAAE,CAAC,QAAA,CAAC;YAAK,OAAA,kBACvB,CAAC,oFACoD,CAAC,8HAEf,CAAC,iFACa,yCAAmB,8IAI/D,CAAC,yCACO,CAAC,0BAAe,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,oBAAU,QAAQ,QAAI;QAVrD,CAUqD;KAC5E,EAb+F,CAa/F,CAAC;IAEF,IAAM,WAAW,GAAG,CAAA,KAAA,MAAM;SACrB,OAAO,OADQ,MAAM,2BACV,cAAc,CAAC,IAAI,CAAC,UAAC,CAAA;SAChC,OAAO,oCAAI,cAAc,CAAC,KAAK,CAAC,WAChC,OAAO,CAAC,kCAAkC,EAAE,iBAAU,yCAAmB,0CAAsC,CAAC;QACjH,kCAAkC;SACjC,OAAO,CACJ,6DAA6D,EAC7D;QAAC,YAAqB;aAArB,UAAqB,EAArB,qBAAqB,EAArB,IAAqB;YAArB,uBAAqB;;QAArB,IAAA,KAAA,aAAqB,EAAf,MAAM,QAAA,EAAE,MAAM,QAAA,CAAC;QAAK,OAAA,yBAAgB,MAAM,uBAAa,yCAAmB,gDAAoC,MAAM,MAAG;IAAnG,CAAmG,CACjI,CAAC;IAEN,OAAO,EAAE,WAAW,aAAA,EAAE,CAAC;AAC3B,CAAC;AAzCD,4EAyCC"}

package/bin/keycloakify/replacers/replaceImportsInCssCode.js

@@ -51,13 +51,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCssCodeToDefineGlobals = exports.replaceImportsInCssCode = void 0;
 var crypto = __importStar(require("crypto"));
 var assert_1 = require("tsafe/assert");
-var is_1 = require("tsafe/is");
-var Reflect_1 = require("tsafe/Reflect");
-{
-    var buildOptions = (0, Reflect_1.Reflect)();
-    (0, assert_1.assert)(!(0, is_1.is)(buildOptions));
-    (0, assert_1.assert)();
-}
+(0, assert_1.assert)();
 function replaceImportsInCssCode(params) {
     var _a;
     var cssCode = params.cssCode;

package/bin/keycloakify/replacers/replaceImportsInCssCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"replaceImportsInCssCode.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/replacers/replaceImportsInCssCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAiC;AAEjC,uCAAsC;AACtC,+BAA8B;AAC9B,yCAAwC;AAMxC;IACI,IAAM,YAAY,GAAG,IAAA,iBAAO,GAAgB,CAAC;IAE7C,IAAA,eAAM,EAAC,CAAC,IAAA,OAAE,EAAmD,YAAY,CAAC,CAAC,CAAC;IAE5E,IAAA,eAAM,GAA+D,CAAC;CACzE;AAED,SAAgB,uBAAuB,CAAC,MAA2B;;IAIvD,IAAA,OAAO,GAAK,MAAM,QAAX,CAAY;IAE3B,IAAM,kBAAkB,GAA2B,EAAE,CAAC;IAEtD,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,mCAAI,EAAE,CAAC,CAAC,OAAO,CACzE,UAAA,KAAK,IAAI,OAAA,CAAC,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,EAA9G,CAA8G,CAC1H,CAAC;IAEF,IAAI,YAAY,GAAG,OAAO,CAAC;IAE3B,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,CACnC,UAAA,eAAe;QACX,wCAAwC;QACxC,OAAA,CAAC,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAS,eAAe,MAAG,CAAC,CAAC;IAA1G,CAA0G,CACjH,CAAC;IAEF,OAAO,EAAE,YAAY,cAAA,EAAE,kBAAkB,oBAAA,EAAE,CAAC;AAChD,CAAC;AArBD,0DAqBC;AAED,SAAgB,8BAA8B,CAAC,MAAsF;IAGzH,IAAA,kBAAkB,GAAmB,MAAM,mBAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;IAEpD,OAAO;QACH,wBAAwB,EAAE;YACtB,SAAS;kBACN,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;aAC7B,GAAG,CAAC,UAAA,eAAe;;YAChB,OAAA;gBACI,YAAK,eAAe,MAAG;gBACvB,kBAAkB,CAAC,eAAe,CAAC,CAAC,OAAO,CACvC,IAAI,MAAM,CAAC,gBAAS,CAAC,MAAA,YAAY,CAAC,WAAW,mCAAI,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAE,EAAE,GAAG,CAAC,EACnF,iCAAiC,CACpC;aACJ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAAA,CACd;aACA,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,cAAO,IAAI,MAAG,EAAd,CAAc,CAAC;YAChC,GAAG;kBACL,IAAI,CAAC,IAAI,CAAC;KACf,CAAC;AACN,CAAC;AAtBD,wEAsBC"}
+{"version":3,"file":"replaceImportsInCssCode.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/replacers/replaceImportsInCssCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAiC;AAEjC,uCAAsC;AAMtC,IAAA,eAAM,GAAwD,CAAC;AAE/D,SAAgB,uBAAuB,CAAC,MAA2B;;IAIvD,IAAA,OAAO,GAAK,MAAM,QAAX,CAAY;IAE3B,IAAM,kBAAkB,GAA2B,EAAE,CAAC;IAEtD,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,uCAAuC,CAAC,mCAAI,EAAE,CAAC,CAAC,OAAO,CACzE,UAAA,KAAK,IAAI,OAAA,CAAC,kBAAkB,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,EAA9G,CAA8G,CAC1H,CAAC;IAEF,IAAI,YAAY,GAAG,OAAO,CAAC;IAE3B,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,CACnC,UAAA,eAAe;QACX,wCAAwC;QACxC,OAAA,CAAC,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAS,eAAe,MAAG,CAAC,CAAC;IAA1G,CAA0G,CACjH,CAAC;IAEF,OAAO,EAAE,YAAY,cAAA,EAAE,kBAAkB,oBAAA,EAAE,CAAC;AAChD,CAAC;AArBD,0DAqBC;AAED,SAAgB,8BAA8B,CAAC,MAAsF;IAGzH,IAAA,kBAAkB,GAAmB,MAAM,mBAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;IAEpD,OAAO;QACH,wBAAwB,EAAE;YACtB,SAAS;kBACN,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;aAC7B,GAAG,CAAC,UAAA,eAAe;;YAChB,OAAA;gBACI,YAAK,eAAe,MAAG;gBACvB,kBAAkB,CAAC,eAAe,CAAC,CAAC,OAAO,CACvC,IAAI,MAAM,CAAC,gBAAS,CAAC,MAAA,YAAY,CAAC,WAAW,mCAAI,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAE,EAAE,GAAG,CAAC,EACnF,iCAAiC,CACpC;aACJ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAAA,CACd;aACA,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,cAAO,IAAI,MAAG,EAAd,CAAc,CAAC;YAChC,GAAG;kBACL,IAAI,CAAC,IAAI,CAAC;KACf,CAAC;AACN,CAAC;AAtBD,wEAsBC"}

package/bin/keycloakify/replacers/replaceImportsInInlineCssCode.d.ts

@@ -1,16 +1,6 @@
-export type BuildOptionsLike = BuildOptionsLike.Standalone | BuildOptionsLike.ExternalAssets;
-export declare namespace BuildOptionsLike {
-    type Common = {
-        urlPathname: string | undefined;
-    };
-    type Standalone = Common & {
-        isStandalone: true;
-    };
-    type ExternalAssets = Common & {
-        isStandalone: false;
-        urlOrigin: string;
-    };
-}
+export type BuildOptionsLike = {
+    urlPathname: string | undefined;
+};
 export declare function replaceImportsInInlineCssCode(params: {
     cssCode: string;
     buildOptions: BuildOptionsLike;

package/bin/keycloakify/replacers/replaceImportsInInlineCssCode.js

@@ -18,25 +18,18 @@ var __read = (this && this.__read) || function (o, n) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceImportsInInlineCssCode = void 0;
 var assert_1 = require("tsafe/assert");
-var is_1 = require("tsafe/is");
-var Reflect_1 = require("tsafe/Reflect");
-{
-    var buildOptions = (0, Reflect_1.Reflect)();
-    (0, assert_1.assert)(!(0, is_1.is)(buildOptions));
-    (0, assert_1.assert)();
-}
+(0, assert_1.assert)();
 function replaceImportsInInlineCssCode(params) {
     var cssCode = params.cssCode, buildOptions = params.buildOptions;
     var fixedCssCode = cssCode.replace(buildOptions.urlPathname === undefined
         ? /url\(["']?\/([^/][^)"']+)["']?\)/g
         : new RegExp("url\\([\"']?".concat(buildOptions.urlPathname, "([^)\"']+)[\"']?\\)"), "g"), function () {
-        var _a;
-        var _b = [];
+        var _a = [];
         for (var _i = 0; _i < arguments.length; _i++) {
-            _b[_i] = arguments[_i];
+            _a[_i] = arguments[_i];
         }
-        var _c = __read(_b, 2), group = _c[1];
-        return "url(".concat(buildOptions.isStandalone ? "${url.resourcesPath}/build/" + group : buildOptions.urlOrigin + ((_a = buildOptions.urlPathname) !== null && _a !== void 0 ? _a : "/") + group, ")");
+        var _b = __read(_a, 2), group = _b[1];
+        return "url(${url.resourcesPath}/build/".concat(group, ")");
     });
     return { fixedCssCode: fixedCssCode };
 }

package/bin/keycloakify/replacers/replaceImportsInInlineCssCode.js.map

@@ -1 +1 @@
-{"version":3,"file":"replaceImportsInInlineCssCode.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/replacers/replaceImportsInInlineCssCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AACA,uCAAsC;AACtC,+BAA8B;AAC9B,yCAAwC;AAmBxC;IACI,IAAM,YAAY,GAAG,IAAA,iBAAO,GAAgB,CAAC;IAE7C,IAAA,eAAM,EAAC,CAAC,IAAA,OAAE,EAAmD,YAAY,CAAC,CAAC,CAAC;IAE5E,IAAA,eAAM,GAA+D,CAAC;CACzE;AAED,SAAgB,6BAA6B,CAAC,MAA2D;IAG7F,IAAA,OAAO,GAAmB,MAAM,QAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;IAEzC,IAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAChC,YAAY,CAAC,WAAW,KAAK,SAAS;QAClC,CAAC,CAAC,mCAAmC;QACrC,CAAC,CAAC,IAAI,MAAM,CAAC,sBAAc,YAAY,CAAC,WAAW,wBAAmB,EAAE,GAAG,CAAC,EAChF;;QAAC,YAAY;aAAZ,UAAY,EAAZ,qBAAY,EAAZ,IAAY;YAAZ,uBAAY;;QAAZ,IAAA,KAAA,aAAY,EAAN,KAAK,QAAA,CAAC;QACT,OAAA,cACI,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,6BAA6B,GAAG,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,GAAG,CAAC,MAAA,YAAY,CAAC,WAAW,mCAAI,GAAG,CAAC,GAAG,KAAK,MACvI,CAAA;KAAA,CACV,CAAC;IAEF,OAAO,EAAE,YAAY,cAAA,EAAE,CAAC;AAC5B,CAAC;AAhBD,sEAgBC"}
+{"version":3,"file":"replaceImportsInInlineCssCode.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/replacers/replaceImportsInInlineCssCode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AACA,uCAAsC;AAMtC,IAAA,eAAM,GAAwD,CAAC;AAE/D,SAAgB,6BAA6B,CAAC,MAA2D;IAG7F,IAAA,OAAO,GAAmB,MAAM,QAAzB,EAAE,YAAY,GAAK,MAAM,aAAX,CAAY;IAEzC,IAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAChC,YAAY,CAAC,WAAW,KAAK,SAAS;QAClC,CAAC,CAAC,mCAAmC;QACrC,CAAC,CAAC,IAAI,MAAM,CAAC,sBAAc,YAAY,CAAC,WAAW,wBAAmB,EAAE,GAAG,CAAC,EAChF;QAAC,YAAY;aAAZ,UAAY,EAAZ,qBAAY,EAAZ,IAAY;YAAZ,uBAAY;;QAAZ,IAAA,KAAA,aAAY,EAAN,KAAK,QAAA,CAAC;QAAK,OAAA,yCAAmC,KAAK,MAAG;IAA3C,CAA2C,CAChE,CAAC;IAEF,OAAO,EAAE,YAAY,cAAA,EAAE,CAAC;AAC5B,CAAC;AAbD,sEAaC"}

package/bin/tools/downloadAndUnzip.d.ts

@@ -1,5 +1,16 @@
 export declare function downloadAndUnzip(params: {
     url: string;
     destDirPath: string;
-    pathOfDirToExtractInArchive?: string;
-}): Promise<void>;
+    specificDirsToExtract?: string[];
+    preCacheTransform?: {
+        actionCacheId: string;
+        action: (params: {
+            destDirPath: string;
+        }) => Promise<void>;
+    };
+} & ({
+    doUseCache: true;
+    projectDirPath: string;
+} | {
+    doUseCache: false;
+})): Promise<void>;

package/bin/tools/downloadAndUnzip.js

@@ -46,6 +46,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__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;
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -83,12 +94,32 @@ var make_fetch_happen_1 = __importDefault(require("make-fetch-happen"));
 var path_1 = require("path");
 var assert_1 = require("tsafe/assert");
 var util_1 = require("util");
-var getProjectRoot_1 = require("./getProjectRoot");
 var transformCodebase_1 = require("./transformCodebase");
 var unzip_1 = require("./unzip");
 var exec = (0, util_1.promisify)(child_process_1.exec);
-function hash(s) {
-    return (0, crypto_1.createHash)("sha256").update(s).digest("hex");
+function generateFileNameFromURL(params) {
+    var preCacheTransform = params.preCacheTransform;
+    // Parse the URL
+    var url = new URL(params.url);
+    // Extract pathname and remove leading slashes
+    var fileName = url.pathname.replace(/^\//, "").replace(/\//g, "_");
+    // Optionally, add query parameters replacing special characters
+    if (url.search) {
+        fileName += url.search.replace(/[&=?]/g, "-");
+    }
+    // Replace any characters that are not valid in filenames
+    fileName = fileName.replace(/[^a-zA-Z0-9-_]/g, "");
+    // Trim or pad the fileName to a specific length
+    fileName = fileName.substring(0, 50);
+    add_pre_cache_transform: {
+        if (preCacheTransform === undefined) {
+            break add_pre_cache_transform;
+        }
+        // Sanitize actionCacheId the same way as other components
+        var sanitizedActionCacheId = preCacheTransform.actionCacheId.replace(/[^a-zA-Z0-9-_]/g, "_");
+        fileName += "_".concat(sanitizedActionCacheId, "_").concat((0, crypto_1.createHash)("sha256").update(preCacheTransform.actionFootprint).digest("hex").substring(0, 5));
+    }
+    return fileName;
 }
 function exists(path) {
     return __awaiter(this, void 0, void 0, function () {
@@ -158,7 +189,6 @@ function readNpmConfig() {
                         return [3 /*break*/, 4];
                     case 3:
                         error_2 = _a.sent();
-                        console.log(String(error_2), error_2);
                         if (String(error_2).includes("ENOWORKSPACES")) {
                             (0, assert_1.assert)(cwd !== path_1.sep);
                             return [2 /*return*/, callee(depth + 1)];
@@ -235,19 +265,28 @@ function getFetchOptions() {
 function downloadAndUnzip(params) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var url, destDirPath, pathOfDirToExtractInArchive, downloadHash, projectRoot, cacheRoot, zipFilePath, extractDirPath, opts, response;
+        var url, destDirPath, specificDirsToExtract, preCacheTransform, rest, zipFileBasename, cacheRoot, zipFilePath, extractDirPath, opts, response;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    url = params.url, destDirPath = params.destDirPath, pathOfDirToExtractInArchive = params.pathOfDirToExtractInArchive;
-                    downloadHash = hash(JSON.stringify({ url: url })).substring(0, 15);
-                    projectRoot = (0, getProjectRoot_1.getProjectRoot)();
-                    cacheRoot = (_a = process.env.XDG_CACHE_HOME) !== null && _a !== void 0 ? _a : (0, path_1.join)(projectRoot, "node_modules", ".cache");
-                    zipFilePath = (0, path_1.join)(cacheRoot, "keycloakify", "zip", "_".concat(downloadHash, ".zip"));
-                    extractDirPath = (0, path_1.join)(cacheRoot, "keycloakify", "unzip", "_".concat(downloadHash));
+                    url = params.url, destDirPath = params.destDirPath, specificDirsToExtract = params.specificDirsToExtract, preCacheTransform = params.preCacheTransform, rest = __rest(params, ["url", "destDirPath", "specificDirsToExtract", "preCacheTransform"]);
+                    zipFileBasename = generateFileNameFromURL({
+                        url: url,
+                        "preCacheTransform": preCacheTransform === undefined
+                            ? undefined
+                            : {
+                                "actionCacheId": preCacheTransform.actionCacheId,
+                                "actionFootprint": preCacheTransform.action.toString()
+                            }
+                    });
+                    cacheRoot = !rest.doUseCache
+                        ? "tmp_".concat(Math.random().toString().slice(2, 12))
+                        : (0, path_1.join)((_a = process.env.XDG_CACHE_HOME) !== null && _a !== void 0 ? _a : (0, path_1.join)(rest.projectDirPath, "node_modules", ".cache"), "keycloakify");
+                    zipFilePath = (0, path_1.join)(cacheRoot, "".concat(zipFileBasename, ".zip"));
+                    extractDirPath = (0, path_1.join)(cacheRoot, "tmp_unzip_".concat(zipFileBasename));
                     return [4 /*yield*/, exists(zipFilePath)];
                 case 1:
-                    if (!!(_c.sent())) return [3 /*break*/, 6];
+                    if (!!(_c.sent())) return [3 /*break*/, 11];
                     return [4 /*yield*/, getFetchOptions()];
                 case 2:
                     opts = _c.sent();
@@ -269,15 +308,42 @@ function downloadAndUnzip(params) {
                     return [4 /*yield*/, (0, promises_1.writeFile)(zipFilePath, response.body)];
                 case 5:
                     _c.sent();
-                    _c.label = 6;
-                case 6: return [4 /*yield*/, (0, unzip_1.unzip)(zipFilePath, extractDirPath, pathOfDirToExtractInArchive)];
+                    if (!(specificDirsToExtract !== undefined || preCacheTransform !== undefined)) return [3 /*break*/, 11];
+                    return [4 /*yield*/, (0, unzip_1.unzip)(zipFilePath, extractDirPath, specificDirsToExtract)];
+                case 6:
+                    _c.sent();
+                    return [4 /*yield*/, (preCacheTransform === null || preCacheTransform === void 0 ? void 0 : preCacheTransform.action({
+                            "destDirPath": extractDirPath
+                        }))];
                 case 7:
+                    _c.sent();
+                    return [4 /*yield*/, (0, promises_1.unlink)(zipFilePath)];
+                case 8:
+                    _c.sent();
+                    return [4 /*yield*/, (0, unzip_1.zip)(extractDirPath, zipFilePath)];
+                case 9:
+                    _c.sent();
+                    return [4 /*yield*/, (0, promises_1.rm)(extractDirPath, { "recursive": true })];
+                case 10:
+                    _c.sent();
+                    _c.label = 11;
+                case 11: return [4 /*yield*/, (0, unzip_1.unzip)(zipFilePath, extractDirPath)];
+                case 12:
                     _c.sent();
                     (0, transformCodebase_1.transformCodebase)({
                         "srcDirPath": extractDirPath,
                         "destDirPath": destDirPath
                     });
-                    return [2 /*return*/];
+                    if (!!rest.doUseCache) return [3 /*break*/, 14];
+                    return [4 /*yield*/, (0, promises_1.rm)(cacheRoot, { "recursive": true })];
+                case 13:
+                    _c.sent();
+                    return [3 /*break*/, 16];
+                case 14: return [4 /*yield*/, (0, promises_1.rm)(extractDirPath, { "recursive": true })];
+                case 15:
+                    _c.sent();
+                    _c.label = 16;
+                case 16: return [2 /*return*/];
             }
         });
     });