keycloakify 11.8.3 → 11.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/bin/712.index.js +32 -40
  2. package/package.json +1 -1
  3. package/src/bin/keycloakify/generateResources/generateResources.ts +51 -72
package/bin/712.index.js CHANGED
@@ -846,6 +846,7 @@ var isInside = __webpack_require__(90665);
846
846
 
847
847
 
848
848
 
849
+
849
850
  (0,assert/* assert */.h)();
850
851
  async function generateResources(params) {
851
852
  var _a;
@@ -1240,7 +1241,7 @@ async function generateResources(params) {
1240
1241
  ].join("\n\n"), "utf8"));
1241
1242
  }
1242
1243
  }
1243
- for (const themeVariantName of buildContext.themeNames) {
1244
+ for (const themeVariantName of [...buildContext.themeNames].reverse()) {
1244
1245
  for (const themeType of [...constants/* THEME_TYPES */.Jh, "email"]) {
1245
1246
  copy_main_theme_to_theme_variant_theme: {
1246
1247
  let isNative;
@@ -1251,25 +1252,42 @@ async function generateResources(params) {
1251
1252
  }
1252
1253
  isNative = !v.isImplemented && v.isImplemented_native;
1253
1254
  }
1254
- if (themeVariantName === themeName) {
1255
+ if (!isNative && themeVariantName === themeName) {
1255
1256
  break copy_main_theme_to_theme_variant_theme;
1256
1257
  }
1257
1258
  (0,transformCodebase/* transformCodebase */.N)({
1258
- srcDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeName, themeType),
1259
- destDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeVariantName, themeType),
1260
- transformSourceCode: isNative
1261
- ? undefined
1262
- : ({ fileRelativePath, sourceCode }) => {
1263
- if ((0,external_path_.extname)(fileRelativePath) === ".ftl" &&
1264
- fileRelativePath.split(external_path_.sep).length === 1) {
1265
- const modifiedSourceCode = Buffer.from(Buffer.from(sourceCode)
1266
- .toString("utf-8")
1267
- .replace(`"themeName": "${themeName}"`, `"themeName": "${themeVariantName}"`), "utf8");
1259
+ srcDirPath: getThemeTypeDirPath({ themeName, themeType }),
1260
+ destDirPath: getThemeTypeDirPath({
1261
+ themeName: themeVariantName,
1262
+ themeType
1263
+ }),
1264
+ transformSourceCode: ({ fileRelativePath, sourceCode }) => {
1265
+ patch_xKeycloakify_themeName: {
1266
+ if (!fileRelativePath.endsWith(".ftl")) {
1267
+ break patch_xKeycloakify_themeName;
1268
+ }
1269
+ if (!isNative &&
1270
+ (0,external_path_.basename)(fileRelativePath) !== fileRelativePath) {
1271
+ break patch_xKeycloakify_themeName;
1272
+ }
1273
+ const modifiedSourceCode = Buffer.from(Buffer.from(sourceCode)
1274
+ .toString("utf-8")
1275
+ .replace(...(0,id.id)(isNative
1276
+ ? [
1277
+ /xKeycloakify\.themeName/g,
1278
+ `"${themeVariantName}"`
1279
+ ]
1280
+ : [
1281
+ `"themeName": "${themeName}"`,
1282
+ `"themeName": "${themeVariantName}"`
1283
+ ])), "utf8");
1284
+ if (!isNative) {
1268
1285
  (0,assert/* assert */.h)(Buffer.compare(modifiedSourceCode, sourceCode) !== 0);
1269
- return { modifiedSourceCode };
1270
1286
  }
1271
- return { modifiedSourceCode: sourceCode };
1287
+ return { modifiedSourceCode };
1272
1288
  }
1289
+ return { modifiedSourceCode: sourceCode };
1290
+ }
1273
1291
  });
1274
1292
  }
1275
1293
  run_writeMessagePropertiesFiles: {
@@ -1282,32 +1300,6 @@ async function generateResources(params) {
1282
1300
  themeName: themeVariantName
1283
1301
  });
1284
1302
  }
1285
- replace_xKeycloakify_themeName_in_native_ftl_files: {
1286
- {
1287
- const v = buildContext.implementedThemeTypes[themeType];
1288
- if (v.isImplemented || !v.isImplemented_native) {
1289
- break replace_xKeycloakify_themeName_in_native_ftl_files;
1290
- }
1291
- }
1292
- const emailThemeDirPath = getThemeTypeDirPath({
1293
- themeName: themeVariantName,
1294
- themeType
1295
- });
1296
- (0,transformCodebase/* transformCodebase */.N)({
1297
- srcDirPath: emailThemeDirPath,
1298
- destDirPath: emailThemeDirPath,
1299
- transformSourceCode: ({ filePath, sourceCode }) => {
1300
- if (!filePath.endsWith(".ftl")) {
1301
- return { modifiedSourceCode: sourceCode };
1302
- }
1303
- return {
1304
- modifiedSourceCode: Buffer.from(sourceCode
1305
- .toString("utf8")
1306
- .replace(/xKeycloakify\.themeName/g, `"${themeVariantName}"`), "utf8")
1307
- };
1308
- }
1309
- });
1310
- }
1311
1303
  }
1312
1304
  }
1313
1305
  console.log(`Generated resources in ${Date.now() - start}ms`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "11.8.3",
3
+ "version": "11.8.4",
4
4
  "description": "Framework to create custom Keycloak UIs",
5
5
  "repository": {
6
6
  "type": "git",
package/src/bin/keycloakify/generateResources/generateResources.ts CHANGED
@@ -6,8 +6,7 @@ import {
6
6
  join as pathJoin,
7
7
  relative as pathRelative,
8
8
  dirname as pathDirname,
9
- extname as pathExtname,
10
- sep as pathSep
9
+ basename as pathBasename
11
10
  } from "path";
12
11
  import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
13
12
  import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
@@ -37,6 +36,7 @@ import propertiesParser from "properties-parser";
37
36
  import { createObjectThatThrowsIfAccessed } from "../../tools/createObjectThatThrowsIfAccessed";
38
37
  import { listInstalledModules } from "../../tools/listInstalledModules";
39
38
  import { isInside } from "../../tools/isInside";
39
+ import { id } from "tsafe/id";
40
40
 
41
41
  export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
42
42
  BuildContextLike_generateMessageProperties & {
@@ -663,7 +663,7 @@ export async function generateResources(params: {
663
663
  }
664
664
  }
665
665
 
666
- for (const themeVariantName of buildContext.themeNames) {
666
+ for (const themeVariantName of [...buildContext.themeNames].reverse()) {
667
667
  for (const themeType of [...THEME_TYPES, "email"] as const) {
668
668
  copy_main_theme_to_theme_variant_theme: {
669
669
  let isNative: boolean;
@@ -678,44 +678,59 @@ export async function generateResources(params: {
678
678
  isNative = !v.isImplemented && v.isImplemented_native;
679
679
  }
680
680
 
681
- if (themeVariantName === themeName) {
681
+ if (!isNative && themeVariantName === themeName) {
682
682
  break copy_main_theme_to_theme_variant_theme;
683
683
  }
684
684
 
685
685
  transformCodebase({
686
- srcDirPath: pathJoin(resourcesDirPath, "theme", themeName, themeType),
687
- destDirPath: pathJoin(
688
- resourcesDirPath,
689
- "theme",
690
- themeVariantName,
686
+ srcDirPath: getThemeTypeDirPath({ themeName, themeType }),
687
+ destDirPath: getThemeTypeDirPath({
688
+ themeName: themeVariantName,
691
689
  themeType
692
- ),
693
- transformSourceCode: isNative
694
- ? undefined
695
- : ({ fileRelativePath, sourceCode }) => {
696
- if (
697
- pathExtname(fileRelativePath) === ".ftl" &&
698
- fileRelativePath.split(pathSep).length === 1
699
- ) {
700
- const modifiedSourceCode = Buffer.from(
701
- Buffer.from(sourceCode)
702
- .toString("utf-8")
703
- .replace(
704
- `"themeName": "${themeName}"`,
705
- `"themeName": "${themeVariantName}"`
706
- ),
707
- "utf8"
708
- );
709
-
710
- assert(
711
- Buffer.compare(modifiedSourceCode, sourceCode) !== 0
712
- );
713
-
714
- return { modifiedSourceCode };
715
- }
716
-
717
- return { modifiedSourceCode: sourceCode };
718
- }
690
+ }),
691
+ transformSourceCode: ({ fileRelativePath, sourceCode }) => {
692
+ patch_xKeycloakify_themeName: {
693
+ if (!fileRelativePath.endsWith(".ftl")) {
694
+ break patch_xKeycloakify_themeName;
695
+ }
696
+
697
+ if (
698
+ !isNative &&
699
+ pathBasename(fileRelativePath) !== fileRelativePath
700
+ ) {
701
+ break patch_xKeycloakify_themeName;
702
+ }
703
+
704
+ const modifiedSourceCode = Buffer.from(
705
+ Buffer.from(sourceCode)
706
+ .toString("utf-8")
707
+ .replace(
708
+ ...id<[string | RegExp, string]>(
709
+ isNative
710
+ ? [
711
+ /xKeycloakify\.themeName/g,
712
+ `"${themeVariantName}"`
713
+ ]
714
+ : [
715
+ `"themeName": "${themeName}"`,
716
+ `"themeName": "${themeVariantName}"`
717
+ ]
718
+ )
719
+ ),
720
+ "utf8"
721
+ );
722
+
723
+ if (!isNative) {
724
+ assert(
725
+ Buffer.compare(modifiedSourceCode, sourceCode) !== 0
726
+ );
727
+ }
728
+
729
+ return { modifiedSourceCode };
730
+ }
731
+
732
+ return { modifiedSourceCode: sourceCode };
733
+ }
719
734
  });
720
735
  }
721
736
  run_writeMessagePropertiesFiles: {
@@ -734,42 +749,6 @@ export async function generateResources(params: {
734
749
  themeName: themeVariantName
735
750
  });
736
751
  }
737
- replace_xKeycloakify_themeName_in_native_ftl_files: {
738
- {
739
- const v = buildContext.implementedThemeTypes[themeType];
740
-
741
- if (v.isImplemented || !v.isImplemented_native) {
742
- break replace_xKeycloakify_themeName_in_native_ftl_files;
743
- }
744
- }
745
-
746
- const emailThemeDirPath = getThemeTypeDirPath({
747
- themeName: themeVariantName,
748
- themeType
749
- });
750
-
751
- transformCodebase({
752
- srcDirPath: emailThemeDirPath,
753
- destDirPath: emailThemeDirPath,
754
- transformSourceCode: ({ filePath, sourceCode }) => {
755
- if (!filePath.endsWith(".ftl")) {
756
- return { modifiedSourceCode: sourceCode };
757
- }
758
-
759
- return {
760
- modifiedSourceCode: Buffer.from(
761
- sourceCode
762
- .toString("utf8")
763
- .replace(
764
- /xKeycloakify\.themeName/g,
765
- `"${themeVariantName}"`
766
- ),
767
- "utf8"
768
- )
769
- };
770
- }
771
- });
772
- }
773
752
  }
774
753
  }
775
754