keycloakify 8.2.0 → 8.2.1

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.
@@ -6,6 +6,5 @@ export declare function downloadKeycloakStaticResources(params: {
6
6
  keycloakVersion: string;
7
7
  usedResources: {
8
8
  resourcesCommonFilePaths: string[];
9
- resourcesFilePaths: string[];
10
9
  } | undefined;
11
10
  }): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"downloadKeycloakStaticResources.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAkE;AAClE,qCAAyB;AACzB,6BAA0F;AAE1F,yFAAqF;AACrF,2EAIwC;AACxC,6CAAiC;AACjC,uCAAsC;AAEtC,SAAsB,+BAA+B;AACjD,kBAAkB;AAClB,MASC;;;;;;oBAEO,cAAc,GAA+C,MAAM,eAArD,EAAE,SAAS,GAAoC,MAAM,UAA1C,EAAE,YAAY,GAAsB,MAAM,aAA5B,EAAE,eAAe,GAAK,MAAM,gBAAX,CAAY;oBAGtE,aAAa,GAAG,CAAC;wBACX,IAAA,aAAa,GAAK,MAAM,cAAX,CAAY;wBAEjC,IAAI,aAAa,KAAK,SAAS,EAAE;4BAC7B,OAAO,SAAS,CAAC;yBACpB;wBAED,IAAA,eAAM,EAAC,aAAa,KAAK,SAAS,CAAC,CAAC;wBAEpC,OAAO;4BACH,yBAAyB,EAAE,aAAa,CAAC,wBAAwB,CAAC,GAAG,CAAC,UAAA,QAAQ;gCAC1E;oCACI,IAAM,QAAQ,GAAG,QAAQ,CAAC;oCAE1B,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wCAC7B,OAAO,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;qCACjD;iCACJ;gCAED,OAAO,IAAA,cAAW,EAAC,QAAQ,CAAC,CAAC;4BACjC,CAAC,CAAC;yBACL,CAAC;oBACN,CAAC,CAAC,EAAE,CAAC;oBAEC,UAAU,GAAG,IAAA,WAAQ,EACvB,YAAY,EACZ,IAAI,EACJ,wBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAG,SAAS,cAAI,eAAe,CAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,CACrH,CAAC;oBAEF,qBAAM,IAAA,8DAA4B,EAAC;4BAC/B,cAAc,gBAAA;4BACd,eAAe,iBAAA;4BACf,aAAa,EAAE,UAAU;yBAC5B,CAAC,EAAA;;oBAJF,SAIE,CAAC;oBAEH,IAAA,qCAAiB,EAAC;wBACd,YAAY,EAAE,IAAA,WAAQ,EAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC;wBACtE,aAAa,EAAE,IAAA,WAAQ,EAAC,YAAY,EAAE,IAAA,eAAY,EAAC,2DAAgC,EAAE,8DAAmC,CAAC,CAAC;qBAC7H,CAAC,CAAC;oBAEH,IAAA,qCAAiB,EAAC;wBACd,YAAY,EAAE,IAAA,WAAQ,EAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC;wBACrE,aAAa,EAAE,IAAA,WAAQ,EAAC,YAAY,EAAE,IAAA,eAAY,EAAC,2DAAgC,EAAE,oEAAyC,CAAC,CAAC;wBAChI,qBAAqB,EACjB,aAAa,KAAK,SAAS;4BACvB,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,UAAC,EAAgC;oCAA9B,gBAAgB,sBAAA,EAAE,UAAU,gBAAA;gCAC3B,IAAI,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAA,OAAO,IAAI,OAAA,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,EAApC,CAAoC,CAAC,KAAK,SAAS,EAAE;oCAC3G,OAAO,SAAS,CAAC;iCACpB;gCAED,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAC;4BAChD,CAAC;qBACd,CAAC,CAAC;oBAEH,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;;;;;CAC/D;AAzED,0EAyEC"}
1
+ {"version":3,"file":"downloadKeycloakStaticResources.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAkE;AAClE,qCAAyB;AACzB,6BAA0F;AAE1F,yFAAqF;AACrF,2EAIwC;AACxC,6CAAiC;AACjC,uCAAsC;AAEtC,SAAsB,+BAA+B;AACjD,kBAAkB;AAClB,MAQC;;;;;;oBAEO,cAAc,GAA+C,MAAM,eAArD,EAAE,SAAS,GAAoC,MAAM,UAA1C,EAAE,YAAY,GAAsB,MAAM,aAA5B,EAAE,eAAe,GAAK,MAAM,gBAAX,CAAY;oBAGtE,aAAa,GAAG,CAAC;wBACX,IAAA,aAAa,GAAK,MAAM,cAAX,CAAY;wBAEjC,IAAI,aAAa,KAAK,SAAS,EAAE;4BAC7B,OAAO,SAAS,CAAC;yBACpB;wBAED,IAAA,eAAM,EAAC,aAAa,KAAK,SAAS,CAAC,CAAC;wBAEpC,OAAO;4BACH,yBAAyB,EAAE,aAAa,CAAC,wBAAwB,CAAC,GAAG,CAAC,UAAA,QAAQ;gCAC1E;oCACI,IAAM,QAAQ,GAAG,QAAQ,CAAC;oCAE1B,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;wCAC7B,OAAO,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;qCACjD;iCACJ;gCAED,OAAO,IAAA,cAAW,EAAC,QAAQ,CAAC,CAAC;4BACjC,CAAC,CAAC;yBACL,CAAC;oBACN,CAAC,CAAC,EAAE,CAAC;oBAEC,UAAU,GAAG,IAAA,WAAQ,EACvB,YAAY,EACZ,IAAI,EACJ,wBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAG,SAAS,cAAI,eAAe,CAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,CACrH,CAAC;oBAEF,qBAAM,IAAA,8DAA4B,EAAC;4BAC/B,cAAc,gBAAA;4BACd,eAAe,iBAAA;4BACf,aAAa,EAAE,UAAU;yBAC5B,CAAC,EAAA;;oBAJF,SAIE,CAAC;oBAEH,IAAA,qCAAiB,EAAC;wBACd,YAAY,EAAE,IAAA,WAAQ,EAAC,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC;wBACtE,aAAa,EAAE,IAAA,WAAQ,EAAC,YAAY,EAAE,IAAA,eAAY,EAAC,2DAAgC,EAAE,8DAAmC,CAAC,CAAC;qBAC7H,CAAC,CAAC;oBAEH,IAAA,qCAAiB,EAAC;wBACd,YAAY,EAAE,IAAA,WAAQ,EAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC;wBACrE,aAAa,EAAE,IAAA,WAAQ,EAAC,YAAY,EAAE,IAAA,eAAY,EAAC,2DAAgC,EAAE,oEAAyC,CAAC,CAAC;wBAChI,qBAAqB,EACjB,aAAa,KAAK,SAAS;4BACvB,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,UAAC,EAAgC;oCAA9B,gBAAgB,sBAAA,EAAE,UAAU,gBAAA;gCAC3B,IAAI,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,UAAA,OAAO,IAAI,OAAA,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,EAApC,CAAoC,CAAC,KAAK,SAAS,EAAE;oCAC3G,OAAO,SAAS,CAAC;iCACpB;gCAED,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAC;4BAChD,CAAC;qBACd,CAAC,CAAC;oBAEH,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;;;;;CAC/D;AAxED,0EAwEC"}
@@ -6,12 +6,10 @@ export declare function readStaticResourcesUsage(params: {
6
6
  themeType: ThemeType;
7
7
  }): {
8
8
  resourcesCommonFilePaths: string[];
9
- resourcesFilePaths: string[];
10
9
  };
11
10
  /** Exported for testing purpose */
12
11
  export declare function readPaths(params: {
13
12
  rawSourceFile: string;
14
13
  }): {
15
14
  resourcesCommonFilePaths: string[];
16
- resourcesFilePaths: string[];
17
15
  };
@@ -68,7 +68,6 @@ function readStaticResourcesUsage(params) {
68
68
  var e_1, _a, e_2, _b;
69
69
  var keycloakifySrcDirPath = params.keycloakifySrcDirPath, themeSrcDirPath = params.themeSrcDirPath, themeType = params.themeType;
70
70
  var resourcesCommonFilePaths = new Set();
71
- var resourcesFilePaths = new Set();
72
71
  try {
73
72
  for (var _c = __values([(0, path_1.join)(keycloakifySrcDirPath, themeType), (0, path_1.join)(themeSrcDirPath, themeType)]), _d = _c.next(); !_d.done; _d = _c.next()) {
74
73
  var srcDirPath = _d.value;
@@ -82,7 +81,6 @@ function readStaticResourcesUsage(params) {
82
81
  }
83
82
  var wrap = readPaths({ rawSourceFile: rawSourceFile });
84
83
  wrap.resourcesCommonFilePaths.forEach(function (filePath) { return resourcesCommonFilePaths.add(filePath); });
85
- wrap.resourcesFilePaths.forEach(function (filePath) { return resourcesFilePaths.add(filePath); });
86
84
  }
87
85
  }
88
86
  catch (e_2_1) { e_2 = { error: e_2_1 }; }
@@ -102,70 +100,58 @@ function readStaticResourcesUsage(params) {
102
100
  finally { if (e_1) throw e_1.error; }
103
101
  }
104
102
  return {
105
- "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths),
106
- "resourcesFilePaths": Array.from(resourcesFilePaths)
103
+ "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths)
107
104
  };
108
105
  }
109
106
  exports.readStaticResourcesUsage = readStaticResourcesUsage;
110
107
  /** Exported for testing purpose */
111
108
  function readPaths(params) {
112
- var e_3, _a, e_4, _b, e_5, _c;
109
+ var e_3, _a, e_4, _b;
113
110
  var rawSourceFile = params.rawSourceFile;
114
111
  var resourcesCommonFilePaths = new Set();
115
- var resourcesFilePaths = new Set();
116
- try {
117
- for (var _d = __values([true, false]), _e = _d.next(); !_e.done; _e = _d.next()) {
118
- var isCommon = _e.value;
119
- var set = isCommon ? resourcesCommonFilePaths : resourcesFilePaths;
120
- {
121
- var regexp = new RegExp("resources".concat(isCommon ? "Common" : "", "Path\\s*}([^`]+)`"), "g");
122
- var matches = __spreadArray([], __read(rawSourceFile.matchAll(regexp)), false);
123
- try {
124
- 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()) {
125
- var match = matches_1_1.value;
126
- var filePath = match[1];
127
- set.add(filePath);
128
- }
129
- }
130
- catch (e_4_1) { e_4 = { error: e_4_1 }; }
131
- finally {
132
- try {
133
- if (matches_1_1 && !matches_1_1.done && (_b = matches_1.return)) _b.call(matches_1);
134
- }
135
- finally { if (e_4) throw e_4.error; }
136
- }
112
+ {
113
+ var regexp = new RegExp("resourcesCommonPath\\s*}([^`]+)`", "g");
114
+ var matches = __spreadArray([], __read(rawSourceFile.matchAll(regexp)), false);
115
+ try {
116
+ for (var matches_1 = __values(matches), matches_1_1 = matches_1.next(); !matches_1_1.done; matches_1_1 = matches_1.next()) {
117
+ var match = matches_1_1.value;
118
+ var filePath = match[1];
119
+ resourcesCommonFilePaths.add(filePath);
137
120
  }
138
- {
139
- var regexp = new RegExp("resources".concat(isCommon ? "Common" : "", "Path\\s*[+,]\\s*[\"']([^\"'`]+)[\"'`]"), "g");
140
- var matches = __spreadArray([], __read(rawSourceFile.matchAll(regexp)), false);
141
- try {
142
- 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()) {
143
- var match = matches_2_1.value;
144
- var filePath = match[1];
145
- set.add(filePath);
146
- }
147
- }
148
- catch (e_5_1) { e_5 = { error: e_5_1 }; }
149
- finally {
150
- try {
151
- if (matches_2_1 && !matches_2_1.done && (_c = matches_2.return)) _c.call(matches_2);
152
- }
153
- finally { if (e_5) throw e_5.error; }
154
- }
121
+ }
122
+ catch (e_3_1) { e_3 = { error: e_3_1 }; }
123
+ finally {
124
+ try {
125
+ if (matches_1_1 && !matches_1_1.done && (_a = matches_1.return)) _a.call(matches_1);
155
126
  }
127
+ finally { if (e_3) throw e_3.error; }
156
128
  }
157
129
  }
158
- catch (e_3_1) { e_3 = { error: e_3_1 }; }
159
- finally {
130
+ {
131
+ var regexp = new RegExp("resourcesCommonPath\\s*[+,]\\s*[\"']([^\"'`]+)[\"'`]", "g");
132
+ var matches = __spreadArray([], __read(rawSourceFile.matchAll(regexp)), false);
160
133
  try {
161
- if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
134
+ for (var matches_2 = __values(matches), matches_2_1 = matches_2.next(); !matches_2_1.done; matches_2_1 = matches_2.next()) {
135
+ var match = matches_2_1.value;
136
+ var filePath = match[1];
137
+ resourcesCommonFilePaths.add(filePath);
138
+ }
139
+ }
140
+ catch (e_4_1) { e_4 = { error: e_4_1 }; }
141
+ finally {
142
+ try {
143
+ if (matches_2_1 && !matches_2_1.done && (_b = matches_2.return)) _b.call(matches_2);
144
+ }
145
+ finally { if (e_4) throw e_4.error; }
162
146
  }
163
- finally { if (e_3) throw e_3.error; }
164
147
  }
165
- var removePrefixSlash = function (filePath) { return (filePath.startsWith("/") ? filePath.slice(1) : filePath); };
148
+ var normalizePath = function (filePath) {
149
+ filePath = filePath.startsWith("/") ? filePath.slice(1) : filePath;
150
+ filePath = filePath.replace(/\//g, path_1.sep);
151
+ return filePath;
152
+ };
166
153
  return {
167
- "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths).map(removePrefixSlash),
168
- "resourcesFilePaths": Array.from(resourcesFilePaths).map(removePrefixSlash)
154
+ "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths).map(normalizePath)
169
155
  };
170
156
  }
171
157
  exports.readPaths = readPaths;
@@ -1 +1 @@
1
- {"version":3,"file":"readStaticResourcesUsage.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/readStaticResourcesUsage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"readStaticResourcesUsage.js","sourceRoot":"","sources":["../../../src/bin/keycloakify/generateTheme/readStaticResourcesUsage.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "keycloakify",
3
- "version": "8.2.0",
3
+ "version": "8.2.1",
4
4
  "description": "Create Keycloak themes using React",
5
5
  "repository": {
6
6
  "type": "git",
@@ -20,7 +20,6 @@ export async function downloadKeycloakStaticResources(
20
20
  keycloakVersion: string;
21
21
  usedResources: {
22
22
  resourcesCommonFilePaths: string[];
23
- resourcesFilePaths: string[];
24
23
  } | undefined
25
24
  }
26
25
  ) {
@@ -1,17 +1,15 @@
1
1
  import { crawl } from "../../tools/crawl";
2
- import { join as pathJoin } from "path";
2
+ import { join as pathJoin, sep as pathSep } from "path";
3
3
  import * as fs from "fs";
4
4
  import type { ThemeType } from "../generateFtl";
5
5
 
6
6
  /** Assumes the theme type exists */
7
7
  export function readStaticResourcesUsage(params: { keycloakifySrcDirPath: string; themeSrcDirPath: string; themeType: ThemeType }): {
8
8
  resourcesCommonFilePaths: string[];
9
- resourcesFilePaths: string[];
10
9
  } {
11
10
  const { keycloakifySrcDirPath, themeSrcDirPath, themeType } = params;
12
11
 
13
12
  const resourcesCommonFilePaths = new Set<string>();
14
- const resourcesFilePaths = new Set<string>();
15
13
 
16
14
  for (const srcDirPath of [pathJoin(keycloakifySrcDirPath, themeType), pathJoin(themeSrcDirPath, themeType)]) {
17
15
  const filePaths = crawl({ "dirPath": srcDirPath, "returnedPathsType": "absolute" }).filter(filePath => /\.(ts|tsx|js|jsx)$/.test(filePath));
@@ -26,58 +24,53 @@ export function readStaticResourcesUsage(params: { keycloakifySrcDirPath: string
26
24
  const wrap = readPaths({ rawSourceFile });
27
25
 
28
26
  wrap.resourcesCommonFilePaths.forEach(filePath => resourcesCommonFilePaths.add(filePath));
29
- wrap.resourcesFilePaths.forEach(filePath => resourcesFilePaths.add(filePath));
30
27
  }
31
28
  }
32
29
 
33
30
  return {
34
- "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths),
35
- "resourcesFilePaths": Array.from(resourcesFilePaths)
31
+ "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths)
36
32
  };
37
33
  }
38
34
 
39
35
  /** Exported for testing purpose */
40
36
  export function readPaths(params: { rawSourceFile: string }): {
41
37
  resourcesCommonFilePaths: string[];
42
- resourcesFilePaths: string[];
43
38
  } {
44
39
  const { rawSourceFile } = params;
45
40
 
46
41
  const resourcesCommonFilePaths = new Set<string>();
47
- const resourcesFilePaths = new Set<string>();
48
42
 
49
- for (const isCommon of [true, false]) {
50
- const set = isCommon ? resourcesCommonFilePaths : resourcesFilePaths;
43
+ {
44
+ const regexp = new RegExp(`resourcesCommonPath\\s*}([^\`]+)\``, "g");
51
45
 
52
- {
53
- const regexp = new RegExp(`resources${isCommon ? "Common" : ""}Path\\s*}([^\`]+)\``, "g");
46
+ const matches = [...rawSourceFile.matchAll(regexp)];
54
47
 
55
- const matches = [...rawSourceFile.matchAll(regexp)];
48
+ for (const match of matches) {
49
+ const filePath = match[1];
56
50
 
57
- for (const match of matches) {
58
- const filePath = match[1];
59
-
60
- set.add(filePath);
61
- }
51
+ resourcesCommonFilePaths.add(filePath);
62
52
  }
53
+ }
63
54
 
64
- {
65
- const regexp = new RegExp(`resources${isCommon ? "Common" : ""}Path\\s*[+,]\\s*["']([^"'\`]+)["'\`]`, "g");
55
+ {
56
+ const regexp = new RegExp(`resourcesCommonPath\\s*[+,]\\s*["']([^"'\`]+)["'\`]`, "g");
66
57
 
67
- const matches = [...rawSourceFile.matchAll(regexp)];
58
+ const matches = [...rawSourceFile.matchAll(regexp)];
68
59
 
69
- for (const match of matches) {
70
- const filePath = match[1];
60
+ for (const match of matches) {
61
+ const filePath = match[1];
71
62
 
72
- set.add(filePath);
73
- }
63
+ resourcesCommonFilePaths.add(filePath);
74
64
  }
75
65
  }
76
66
 
77
- const removePrefixSlash = (filePath: string) => (filePath.startsWith("/") ? filePath.slice(1) : filePath);
67
+ const normalizePath = (filePath: string) => {
68
+ filePath = filePath.startsWith("/") ? filePath.slice(1) : filePath;
69
+ filePath = filePath.replace(/\//g, pathSep);
70
+ return filePath;
71
+ };
78
72
 
79
73
  return {
80
- "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths).map(removePrefixSlash),
81
- "resourcesFilePaths": Array.from(resourcesFilePaths).map(removePrefixSlash)
74
+ "resourcesCommonFilePaths": Array.from(resourcesCommonFilePaths).map(normalizePath)
82
75
  };
83
76
  }