@ui5/webcomponents-tools 0.0.0-a3eca7ade → 0.0.0-a8a75c830
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.
- package/CHANGELOG.md +2343 -0
- package/LICENSE.txt +201 -0
- package/README.md +7 -10
- package/assets-meta.js +13 -8
- package/bin/dev.js +10 -8
- package/bin/ui5nps.js +301 -0
- package/components-package/eslint.js +66 -2
- package/components-package/nps.js +141 -80
- package/components-package/postcss.components.js +1 -21
- package/components-package/postcss.themes.js +1 -26
- package/components-package/vite.config.js +9 -0
- package/components-package/wdio.js +69 -17
- package/icons-collection/nps.js +32 -24
- package/lib/amd-to-es6/index.js +109 -0
- package/lib/amd-to-es6/no-remaining-require.js +33 -0
- package/lib/cem/cem.js +16 -0
- package/lib/cem/custom-elements-manifest.config.mjs +575 -0
- package/lib/cem/event.mjs +168 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/cli.js +128 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/package.json +59 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/browser-entrypoint.js +23 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/create.js +117 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/arrow-function.js +26 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/class-jsdoc.js +157 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/classes.js +20 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/createArrowFunction.js +17 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/createAttribute.js +24 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/createClass.js +301 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/createClassField.js +26 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/createFunctionLike.js +73 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/createMixin.js +33 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/createVariable.js +22 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/creators/handlers.js +338 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/custom-elements-define-calls.js +90 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/exports.js +156 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/function-like.js +24 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/mixins.js +29 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/reexported-wrapped-mixin-exports.js +84 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/analyse-phase/variables.js +34 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/collect-phase/collect-imports.js +101 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/catalyst/catalyst.js +11 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/catalyst/controller.js +34 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/catalyst-major-2/catalyst.js +11 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/catalyst-major-2/controller.js +34 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/decorators/attr.js +53 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/decorators/custom-element-decorator.js +36 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/fast/fast.js +7 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/lit/lit.js +13 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/lit/member-denylist.js +21 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/lit/method-denylist.js +20 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/lit/property-decorator.js +94 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/lit/static-properties.js +121 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/lit/utils.js +66 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/framework-plugins/stencil/stencil.js +129 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/index.js +80 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/link-phase/cleanup-classes.js +25 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/link-phase/field-denylist.js +22 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/link-phase/method-denylist.js +25 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/post-processing/apply-inheritance.js +78 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/post-processing/is-custom-element.js +34 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/post-processing/link-class-to-tagname.js +27 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/post-processing/remove-unexported-declarations.js +23 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/features/post-processing/resolve-initializers.js +52 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/ast-helpers.js +186 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/cli-helpers.js +164 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/exports.js +44 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/find-external-manifests.js +67 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/imports.js +25 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/index.js +71 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/jsdoc.js +19 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/manifest-helpers.js +194 -0
- package/lib/cem/patch/@custom-elements-manifest/analyzer/src/utils/mixins.js +112 -0
- package/lib/cem/schema-internal.json +1422 -0
- package/lib/cem/schema.json +1098 -0
- package/lib/cem/types-internal.d.ts +808 -0
- package/lib/cem/types.d.ts +736 -0
- package/lib/cem/utils.mjs +429 -0
- package/lib/cem/validate.js +81 -0
- package/lib/chokidar/chokidar.js +28 -0
- package/lib/copy-and-watch/index.js +133 -97
- package/lib/copy-list/index.js +27 -19
- package/lib/create-icons/index.js +131 -72
- package/lib/create-illustrations/index.js +174 -114
- package/lib/create-new-component/Component.js +74 -0
- package/lib/create-new-component/ComponentTemplate.js +12 -0
- package/lib/create-new-component/index.js +62 -101
- package/lib/css-processors/css-processor-components.mjs +103 -0
- package/lib/css-processors/css-processor-themes.mjs +122 -0
- package/lib/css-processors/postcss-plugin.mjs +153 -0
- package/lib/css-processors/scope-variables.mjs +74 -0
- package/lib/css-processors/shared.mjs +47 -0
- package/lib/dev-server/custom-hot-update-plugin.js +39 -0
- package/lib/dev-server/dev-server.mjs +78 -0
- package/lib/dev-server/virtual-index-html-plugin.js +56 -0
- package/lib/eslint/eslint.js +44 -0
- package/lib/generate-js-imports/illustrations.js +87 -0
- package/lib/generate-json-imports/i18n.js +71 -69
- package/lib/generate-json-imports/themes.js +50 -48
- package/lib/hbs2lit/src/compiler.js +24 -4
- package/lib/hbs2lit/src/includesReplacer.js +5 -5
- package/lib/hbs2lit/src/litVisitor2.js +85 -22
- package/lib/hbs2lit/src/svgProcessor.js +12 -5
- package/lib/hbs2ui5/RenderTemplates/LitRenderer.js +39 -6
- package/lib/hbs2ui5/index.js +57 -24
- package/lib/i18n/defaults.js +76 -60
- package/lib/i18n/toJSON.js +47 -18
- package/lib/icons-hash/icons-hash.mjs +149 -0
- package/lib/postcss-combine-duplicated-selectors/index.js +185 -0
- package/lib/remove-dev-mode/remove-dev-mode.mjs +51 -0
- package/lib/rimraf/rimraf.js +31 -0
- package/lib/scoping/get-all-tags.js +11 -11
- package/lib/scoping/lint-src.js +8 -7
- package/lib/scoping/scope-test-pages.js +2 -1
- package/lib/test-runner/test-runner.js +79 -0
- package/lib/vite-bundler/vite-bundler.mjs +35 -0
- package/package.json +47 -43
- package/tsconfig.json +18 -0
- package/components-package/rollup-plugins/empty-module.js +0 -15
- package/components-package/rollup.js +0 -239
- package/components-package/wdio.sync.js +0 -360
- package/lib/documentation/index.js +0 -165
- package/lib/documentation/templates/api-component-since.js +0 -3
- package/lib/documentation/templates/api-css-variables-section.js +0 -24
- package/lib/documentation/templates/api-events-section.js +0 -35
- package/lib/documentation/templates/api-methods-section.js +0 -26
- package/lib/documentation/templates/api-properties-section.js +0 -42
- package/lib/documentation/templates/api-slots-section.js +0 -28
- package/lib/documentation/templates/template.js +0 -39
- package/lib/esm-abs-to-rel/index.js +0 -54
- package/lib/hash/config.js +0 -10
- package/lib/hash/generate.js +0 -19
- package/lib/hash/upToDate.js +0 -31
- package/lib/jsdoc/config.json +0 -29
- package/lib/jsdoc/plugin.js +0 -2436
- package/lib/jsdoc/template/publish.js +0 -4112
- package/lib/polyfill-placeholder/index.js +0 -5
- package/lib/postcss-css-to-esm/index.js +0 -45
- package/lib/postcss-css-to-json/index.js +0 -36
- package/lib/postcss-new-files/index.js +0 -36
- package/lib/replace-global-core/index.js +0 -20
- package/lib/serve/index.js +0 -46
- package/lib/serve/serve.json +0 -3
- package/package-lock.json +0 -48
|
@@ -28,14 +28,18 @@ if (!String.prototype.replaceAll) {
|
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
function HTMLLitVisitor(debug) {
|
|
31
|
+
function HTMLLitVisitor(componentName, debug) {
|
|
32
32
|
this.blockCounter = 0;
|
|
33
33
|
this.keys = [];
|
|
34
34
|
this.blocks = {};
|
|
35
35
|
this.result = "";
|
|
36
36
|
this.mainBlock = "";
|
|
37
|
-
this.
|
|
38
|
-
this.
|
|
37
|
+
this.blockLevel = 0;
|
|
38
|
+
this.componentName = componentName
|
|
39
|
+
const blockParametersDefinitionTS = [`this: ${componentName}`, "context: UI5Element", "tags: string[]", "suffix: string | undefined"];
|
|
40
|
+
const blockParametersDefinitionJS = ["context", "tags", "suffix"];
|
|
41
|
+
this.blockParametersDefinition = process.env.UI5_TS ? blockParametersDefinitionTS : blockParametersDefinitionJS;
|
|
42
|
+
this.blockParametersUsage = ["this", "context", "tags", "suffix"];
|
|
39
43
|
this.paths = []; //contains all normalized relative paths
|
|
40
44
|
this.debug = debug;
|
|
41
45
|
if (this.debug) {
|
|
@@ -51,18 +55,18 @@ HTMLLitVisitor.prototype.Program = function(program) {
|
|
|
51
55
|
this.keys.push(key);
|
|
52
56
|
this.debug && this.blockByNumber.push(key);
|
|
53
57
|
|
|
54
|
-
this.blocks[this.currentKey()] = "
|
|
58
|
+
// this.blocks[this.currentKey()] = "function " + this.currentKey() + ` (this: any, ` + this.blockParametersDefinition.join(", ") + ") { ";
|
|
59
|
+
this.blocks[this.currentKey()] = `function ${this.currentKey()} (${this.blockParametersDefinition.join(", ")}) { `;
|
|
55
60
|
|
|
56
61
|
if (this.keys.length > 1) { //it's a nested block
|
|
57
|
-
this.blocks[this.prevKey()] += this.currentKey() + "(" + this.
|
|
62
|
+
this.blocks[this.prevKey()] += this.currentKey() + ".call(" + this.blockParametersUsage.join(", ") + ")";
|
|
58
63
|
} else {
|
|
59
64
|
this.mainBlock = this.currentKey();
|
|
60
|
-
this.paths.push(this.blockPath);
|
|
61
65
|
}
|
|
62
66
|
|
|
63
|
-
this.blocks[this.currentKey()] += "html`";
|
|
67
|
+
this.blocks[this.currentKey()] += "return html`";
|
|
64
68
|
Visitor.prototype.Program.call(this, program);
|
|
65
|
-
this.blocks[this.currentKey()] += "`;";
|
|
69
|
+
this.blocks[this.currentKey()] += "`;}";
|
|
66
70
|
|
|
67
71
|
this.keys.pop(key);
|
|
68
72
|
};
|
|
@@ -99,14 +103,18 @@ HTMLLitVisitor.prototype.MustacheStatement = function(mustache) {
|
|
|
99
103
|
this.blocks[this.currentKey()] += "${index}";
|
|
100
104
|
} else {
|
|
101
105
|
const path = normalizePath.call(this, mustache.path.original);
|
|
102
|
-
const hasCalculatingClasses = path.includes("
|
|
106
|
+
const hasCalculatingClasses = path.includes("this.classes");
|
|
103
107
|
|
|
104
108
|
let parsedCode = "";
|
|
105
109
|
|
|
106
110
|
if (isNodeValue && !mustache.escaped) {
|
|
107
111
|
parsedCode = `\${unsafeHTML(${path})}`;
|
|
108
112
|
} else if (hasCalculatingClasses) {
|
|
109
|
-
|
|
113
|
+
if (process.env.UI5_TS) {
|
|
114
|
+
parsedCode = `\${classMap(${path} as ClassMapValue)}`;
|
|
115
|
+
} else {
|
|
116
|
+
parsedCode = `\${classMap(${path})}`;
|
|
117
|
+
}
|
|
110
118
|
} else if (isStyleAttribute) {
|
|
111
119
|
parsedCode = `\${styleMap(${path})}`;
|
|
112
120
|
} else if (skipIfDefined){
|
|
@@ -171,22 +179,37 @@ function visitEachBlock(block) {
|
|
|
171
179
|
var bParamAdded = false;
|
|
172
180
|
visitSubExpression.call(this, block);
|
|
173
181
|
|
|
174
|
-
|
|
182
|
+
const reapeatDirectiveParamsTS = "(item, index) => (item as typeof item & {_id?: any})._id || index, (item, index: number)";
|
|
183
|
+
const reapeatDirectiveParamsJS = "(item, index) => item._id || index, (item, index)";
|
|
184
|
+
const repleatDirectiveParams = process.env.UI5_TS ? reapeatDirectiveParamsTS : reapeatDirectiveParamsJS;
|
|
185
|
+
this.blocks[this.currentKey()] += "${ repeat(" + normalizePath.call(this, block.params[0].original) + ", " + repleatDirectiveParams + " => ";
|
|
175
186
|
this.paths.push(normalizePath.call(this, block.params[0].original));
|
|
176
|
-
this.
|
|
187
|
+
this.blockLevel++;
|
|
177
188
|
|
|
178
|
-
|
|
189
|
+
// block params is [this, context, tags, suffix] for top level blocks
|
|
190
|
+
// blcok params is [this, context, tags, suffix, item, index] for nested blocks
|
|
191
|
+
if (!this.blockParametersUsage.includes("index")) {
|
|
192
|
+
// last item is not index, but an each block is processed, add the paramters for further nested blocks
|
|
179
193
|
bParamAdded = true;
|
|
180
|
-
|
|
181
|
-
|
|
194
|
+
if (process.env.UI5_TS) {
|
|
195
|
+
this.blockParametersDefinition.push("item: any");
|
|
196
|
+
this.blockParametersDefinition.push("index: number");
|
|
197
|
+
} else {
|
|
198
|
+
this.blockParametersDefinition.push("item");
|
|
199
|
+
this.blockParametersDefinition.push("index");
|
|
200
|
+
}
|
|
201
|
+
this.blockParametersUsage.push("item");
|
|
202
|
+
this.blockParametersUsage.push("index");
|
|
182
203
|
}
|
|
183
204
|
this.acceptKey(block, "program");
|
|
184
205
|
if (bParamAdded) {
|
|
185
|
-
this
|
|
186
|
-
this.
|
|
206
|
+
// if parameters were added at this step, remove the last two
|
|
207
|
+
this.blockParametersDefinition.pop();
|
|
208
|
+
this.blockParametersDefinition.pop();
|
|
209
|
+
this.blockParametersUsage.pop();
|
|
210
|
+
this.blockParametersUsage.pop();
|
|
187
211
|
}
|
|
188
|
-
this.
|
|
189
|
-
|
|
212
|
+
this.blockLevel--;
|
|
190
213
|
this.blocks[this.currentKey()] += ") }";
|
|
191
214
|
}
|
|
192
215
|
|
|
@@ -195,12 +218,52 @@ function normalizePath(sPath) {
|
|
|
195
218
|
|
|
196
219
|
//read carefully - https://github.com/wycats/handlebars.js/issues/1028
|
|
197
220
|
//kpdecker commented on May 20, 2015
|
|
198
|
-
|
|
199
|
-
|
|
221
|
+
|
|
222
|
+
if (result.indexOf("@root") === 0) {
|
|
223
|
+
// Trying to access root context via the HBS "@root" variable.
|
|
224
|
+
// Example: {{@root.property}} compiles to "context.property" - called from anywhere within the template.
|
|
225
|
+
result = result.replace("@root", "this");
|
|
226
|
+
|
|
227
|
+
} else if (result.indexOf("../") === 0) {
|
|
228
|
+
let absolutePath;
|
|
229
|
+
const levelsUp = (result.match(/..\//g) || []).length;
|
|
230
|
+
|
|
231
|
+
if (this.blockLevel <= levelsUp) {
|
|
232
|
+
// Trying to access root context from nested loops.
|
|
233
|
+
// Example: {{../../property}} compiles to "context.property" - when currently in a nested level loop.
|
|
234
|
+
// Example: {{../../../property}} compile to "context.property" - when requested levels are not present. fallback to root context.
|
|
235
|
+
absolutePath = `this.${replaceAll(result,"../", "")}`;
|
|
236
|
+
} else {
|
|
237
|
+
// Trying to access upper context (one-level-up) and based on the current lelev, that could be "context" or "item".
|
|
238
|
+
// Example: {{../property}} compiles to "context.property" - when called in a top level loop.
|
|
239
|
+
// Example: {{../property}} compiles to "item.property" - when called in a nested level loop.
|
|
240
|
+
// TODO: the second example, although correctly generated to "item.property", "item" will point to the current object within the nested loop,
|
|
241
|
+
// not the upper level loop as intended. So accessing the upper loop from nested loop is currently not working.
|
|
242
|
+
absolutePath = replaceAll(this.paths[this.paths.length - 1 - levelsUp], ".", "/") + "/" + result;
|
|
243
|
+
}
|
|
244
|
+
|
|
200
245
|
result = replaceAll(path.normalize(absolutePath), path.sep, ".");
|
|
246
|
+
|
|
201
247
|
} else {
|
|
202
|
-
|
|
248
|
+
// When neither "@root", nor "../" are used, use the following contexts:
|
|
249
|
+
// - use "context" - for the top level of execution, e.g "this.blockLevel = 0".
|
|
250
|
+
// - use "item" - for any nested level, e.g "this.blockLevel > 0".
|
|
251
|
+
// Example:
|
|
252
|
+
//
|
|
253
|
+
// {{text}} -> compiles to "context.text"
|
|
254
|
+
// {{#each items}}
|
|
255
|
+
// Item text: {{text}}</div> -> compiles to "item.text"
|
|
256
|
+
// {{#each words}}
|
|
257
|
+
// Word text: {{text}}</div> -> compiles to "item.text"
|
|
258
|
+
// {{/each}}
|
|
259
|
+
// Item text: {{text}}</div> -> compiles to "item.text"
|
|
260
|
+
// {{/each}}
|
|
261
|
+
// {{text}} -> compiles to "context.text"
|
|
262
|
+
|
|
263
|
+
const blockPath = this.blockLevel > 0 ? "item" : "this";
|
|
264
|
+
result = result ? replaceAll(blockPath + "/" + result, "/", ".") : blockPath;
|
|
203
265
|
}
|
|
266
|
+
|
|
204
267
|
return result;
|
|
205
268
|
}
|
|
206
269
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
const svgrx = new RegExp(/<svg[\s\S]*?>([\s\S]*?)<\/svg>/, 'g');
|
|
3
3
|
const blockrx = /block[0-9]+/g;
|
|
4
4
|
|
|
5
|
-
function
|
|
5
|
+
function processSVG(input) {
|
|
6
6
|
let matches;
|
|
7
7
|
let template = input;
|
|
8
8
|
let blockCounter = 0;
|
|
@@ -45,9 +45,16 @@ function getSVGMatches(template) {
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
function getSVGBlock(input, blockCounter) {
|
|
48
|
+
const definitionTS = `\nfunction blockSVG${blockCounter} (this: any, context: UI5Element, tags: string[], suffix: string | undefined) {
|
|
49
|
+
return svg\`${input}\`;
|
|
50
|
+
};`;
|
|
51
|
+
const definitionJS = `\nfunction blockSVG${blockCounter} (context, tags, suffix) {
|
|
52
|
+
return svg\`${input}\`;
|
|
53
|
+
};`;
|
|
54
|
+
|
|
48
55
|
return {
|
|
49
|
-
usage: `\${blockSVG${blockCounter}(context, tags, suffix)}`,
|
|
50
|
-
definition:
|
|
56
|
+
usage: `\${blockSVG${blockCounter}.call(this, context, tags, suffix)}`,
|
|
57
|
+
definition: process.env.UI5_TS ? definitionTS : definitionJS,
|
|
51
58
|
};
|
|
52
59
|
}
|
|
53
60
|
|
|
@@ -55,7 +62,7 @@ function replaceInternalBlocks(template, svgContent) {
|
|
|
55
62
|
const internalBlocks = svgContent.match(blockrx) || [];
|
|
56
63
|
|
|
57
64
|
internalBlocks.forEach(blockName => {
|
|
58
|
-
const rx = new RegExp(`
|
|
65
|
+
const rx = new RegExp(`function ${blockName}.*(html\`).*;`);
|
|
59
66
|
template = template.replace(rx, (match, p1) => {
|
|
60
67
|
return match.replace(p1, "svg\`");
|
|
61
68
|
});
|
|
@@ -65,5 +72,5 @@ function replaceInternalBlocks(template, svgContent) {
|
|
|
65
72
|
}
|
|
66
73
|
|
|
67
74
|
module.exports = {
|
|
68
|
-
process:
|
|
75
|
+
process: processSVG,
|
|
69
76
|
};
|
|
@@ -1,12 +1,45 @@
|
|
|
1
|
-
const
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
const tsImports = (controlName, hasTypes) => {
|
|
2
|
+
if (!process.env.UI5_TS) {
|
|
3
|
+
return "";
|
|
4
|
+
}
|
|
4
5
|
|
|
5
|
-
|
|
6
|
+
const importPrefix = process.env.UI5_BASE ? "../../../../../src/" : "@ui5/webcomponents-base/dist/"
|
|
7
|
+
|
|
8
|
+
return `import type UI5Element from "${importPrefix}UI5Element.js";
|
|
9
|
+
${importForControl(controlName, hasTypes)}
|
|
10
|
+
import type { ClassMapValue } from "${importPrefix}types.js";
|
|
11
|
+
`;
|
|
12
|
+
}
|
|
13
|
+
const importForControl = (controlName, hasTypes) => {
|
|
14
|
+
|
|
15
|
+
if (!hasTypes) {
|
|
16
|
+
return `type ${controlName} = any;`;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
if (process.env.UI5_BASE) {
|
|
20
|
+
// base package has a component in `test/elements` instead of `src`
|
|
21
|
+
return `import type ${controlName} from "../../../${controlName}.js";`
|
|
22
|
+
}
|
|
23
|
+
return `import type ${controlName} from "../../${controlName}.js";`
|
|
24
|
+
}
|
|
6
25
|
|
|
7
|
-
|
|
26
|
+
const buildRenderer = (controlName, litTemplate, hasTypes) => {
|
|
27
|
+
const importPrefix = process.env.UI5_BASE ? "../../../../../src/" : "@ui5/webcomponents-base/dist/";
|
|
28
|
+
|
|
29
|
+
const mainTemplateFunction = process.env.UI5_TS ?
|
|
30
|
+
`function template(this: ${controlName}) { return block0.call(this, this, (this.constructor as typeof UI5Element).tagsToScope, getCustomElementsScopingSuffix()); }` :
|
|
31
|
+
`function template() { return block0.call(this, this, this.constructor.tagsToScope, getCustomElementsScopingSuffix()); }`;
|
|
32
|
+
|
|
33
|
+
// typescript cannot process package imports for the same package and the paths are changed to relative for base package templates
|
|
34
|
+
return `/* eslint no-unused-vars: 0 */
|
|
35
|
+
import { html, svg, repeat, classMap, styleMap, ifDefined, unsafeHTML, scopeTag } from "${importPrefix}renderer/LitRenderer.js";
|
|
36
|
+
import { getCustomElementsScopingSuffix } from "${importPrefix}CustomElementsScopeUtils.js";
|
|
37
|
+
${tsImports(controlName, hasTypes)}
|
|
38
|
+
${litTemplate}
|
|
39
|
+
${mainTemplateFunction}
|
|
40
|
+
export default template;`;
|
|
8
41
|
};
|
|
9
42
|
|
|
10
43
|
module.exports = {
|
|
11
44
|
generateTemplate: buildRenderer
|
|
12
|
-
};
|
|
45
|
+
};
|
package/lib/hbs2ui5/index.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
const fs = require('fs');
|
|
1
|
+
const fs = require('fs').promises;
|
|
2
|
+
const existsSync = require('fs').existsSync;
|
|
2
3
|
const getopts = require('getopts');
|
|
3
4
|
const hbs2lit = require('../hbs2lit');
|
|
4
5
|
const path = require('path');
|
|
5
6
|
const litRenderer = require('./RenderTemplates/LitRenderer');
|
|
6
7
|
const recursiveReadDir = require("recursive-readdir");
|
|
7
|
-
|
|
8
|
+
|
|
9
|
+
let missingTypesReported = false;
|
|
8
10
|
|
|
9
11
|
const args = getopts(process.argv.slice(2), {
|
|
10
12
|
alias: {
|
|
@@ -22,15 +24,29 @@ const onError = (place) => {
|
|
|
22
24
|
console.log(`A problem occoured when reading ${place}. Please recheck passed parameters.`);
|
|
23
25
|
};
|
|
24
26
|
|
|
25
|
-
const isHandlebars = (fileName) => fileName.
|
|
27
|
+
const isHandlebars = (fileName) => fileName.endsWith('.hbs');
|
|
26
28
|
|
|
27
|
-
const
|
|
28
|
-
const
|
|
29
|
-
const
|
|
29
|
+
const hasTypes = (file, componentName) => {
|
|
30
|
+
const tsFile = path.join(path.dirname(file), componentName + ".ts")
|
|
31
|
+
const dtsFile = path.join(path.dirname(file), componentName + ".d.ts")
|
|
32
|
+
return existsSync(tsFile) || existsSync(dtsFile);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const processFile = async (file, outputDir) => {
|
|
30
36
|
const componentNameMatcher = /(\w+)(\.hbs)/gim;
|
|
31
37
|
const componentName = componentNameMatcher.exec(file)[1];
|
|
38
|
+
const componentHasTypes = hasTypes(file, componentName);
|
|
39
|
+
if (!componentHasTypes) {
|
|
40
|
+
if (!missingTypesReported) {
|
|
41
|
+
console.warn("[Warn] The following templates do not have a corresponging .ts or .d.ts file and won't be type checked:")
|
|
42
|
+
missingTypesReported = true;
|
|
43
|
+
}
|
|
44
|
+
console.log(" -> " + componentName + ".hbs");
|
|
45
|
+
}
|
|
46
|
+
const litCode = await hbs2lit(file, componentName);
|
|
47
|
+
const absoluteOutputDir = composeAbsoluteOutputDir(file, outputDir);
|
|
32
48
|
|
|
33
|
-
writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode));
|
|
49
|
+
return writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode, componentHasTypes));
|
|
34
50
|
};
|
|
35
51
|
|
|
36
52
|
const composeAbsoluteOutputDir = (file, outputDir) => {
|
|
@@ -40,39 +56,54 @@ const composeAbsoluteOutputDir = (file, outputDir) => {
|
|
|
40
56
|
const fileDir = file.split(path.sep).slice(1, -1).join(path.sep);
|
|
41
57
|
|
|
42
58
|
// (2) Compose full output dir - "dist/generated/templates/lvl1/lvl2"
|
|
43
|
-
return `${outputDir}${path.sep}${fileDir}`;
|
|
59
|
+
return `${outputDir}${path.sep}${fileDir}`;
|
|
44
60
|
};
|
|
45
61
|
|
|
46
62
|
const wrapDirectory = (directory, outputDir) => {
|
|
47
63
|
directory = path.normalize(directory);
|
|
48
64
|
outputDir = path.normalize(outputDir);
|
|
49
65
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
if (err) {
|
|
53
|
-
onError('directory');
|
|
54
|
-
}
|
|
66
|
+
return new Promise((resolve, reject) => {
|
|
67
|
+
recursiveReadDir(directory, (err, files) => {
|
|
55
68
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
69
|
+
if (err) {
|
|
70
|
+
onError('directory');
|
|
71
|
+
reject();
|
|
59
72
|
}
|
|
73
|
+
|
|
74
|
+
const promises = files.map(fileName => {
|
|
75
|
+
if (isHandlebars(fileName)) {
|
|
76
|
+
return processFile(fileName, outputDir);
|
|
77
|
+
}
|
|
78
|
+
}).filter(x => !!x);
|
|
79
|
+
|
|
80
|
+
resolve(Promise.all(promises));
|
|
60
81
|
});
|
|
61
|
-
})
|
|
82
|
+
});
|
|
62
83
|
};
|
|
63
84
|
|
|
64
|
-
const writeRenderers = (outputDir, controlName, fileContent) => {
|
|
85
|
+
const writeRenderers = async (outputDir, controlName, fileContent) => {
|
|
65
86
|
try {
|
|
66
|
-
if (!fs.existsSync(outputDir)) {
|
|
67
|
-
mkdirp.sync(outputDir);
|
|
68
|
-
}
|
|
69
87
|
|
|
70
|
-
|
|
88
|
+
await fs.mkdir(outputDir, { recursive: true });
|
|
89
|
+
|
|
90
|
+
const compiledFilePath = `${outputDir}${path.sep}${controlName}Template.lit.${process.env.UI5_TS ? "ts" : "js"}`;
|
|
71
91
|
|
|
72
92
|
// strip DOS line endings because the break the source maps
|
|
73
93
|
let fileContentUnix = fileContent.replace(/\r\n/g, "\n");
|
|
74
94
|
fileContentUnix = fileContentUnix.replace(/\r/g, "\n");
|
|
75
|
-
|
|
95
|
+
|
|
96
|
+
// Only write to the file system actual changes - each updated file, no matter if the same or not, triggers an expensive operation for rollup
|
|
97
|
+
// Note: .hbs files that include a changed .hbs file will also be recompiled as their content will be updated too
|
|
98
|
+
|
|
99
|
+
let existingFileContent = "";
|
|
100
|
+
try {
|
|
101
|
+
existingFileContent = (await fs.readFile(compiledFilePath)).toString();
|
|
102
|
+
} catch (e) {}
|
|
103
|
+
|
|
104
|
+
if (existingFileContent !== fileContentUnix) {
|
|
105
|
+
return fs.writeFile(compiledFilePath, fileContentUnix);
|
|
106
|
+
}
|
|
76
107
|
|
|
77
108
|
} catch (e) {
|
|
78
109
|
console.log(e);
|
|
@@ -82,5 +113,7 @@ const writeRenderers = (outputDir, controlName, fileContent) => {
|
|
|
82
113
|
if (!args['d'] || !args['o']) {
|
|
83
114
|
console.log('Please provide an input and output directory (-d and -o)');
|
|
84
115
|
} else {
|
|
85
|
-
wrapDirectory(args['d'], args['o'])
|
|
116
|
+
wrapDirectory(args['d'], args['o']).then(() => {
|
|
117
|
+
console.log("Templates generated");
|
|
118
|
+
});
|
|
86
119
|
}
|
package/lib/i18n/defaults.js
CHANGED
|
@@ -1,74 +1,90 @@
|
|
|
1
|
-
const fs = require('fs');
|
|
1
|
+
const fs = require('fs').promises;
|
|
2
2
|
const path = require('path');
|
|
3
3
|
const PropertiesReader = require('properties-reader');
|
|
4
|
-
const mkdirp = require("mkdirp");
|
|
5
4
|
const assets = require('../../assets-meta.js');
|
|
6
5
|
|
|
7
|
-
const
|
|
6
|
+
const generate = async (argv) => {
|
|
7
|
+
const defaultLanguage = assets.languages.default;
|
|
8
8
|
|
|
9
|
-
const messageBundle = path.normalize(`${
|
|
10
|
-
const messageBundleDefaultLanguage = path.normalize(`${
|
|
11
|
-
const
|
|
9
|
+
const messageBundle = path.normalize(`${argv[2]}/messagebundle.properties`);
|
|
10
|
+
const messageBundleDefaultLanguage = path.normalize(`${argv[2]}/messagebundle_${defaultLanguage}.properties`);
|
|
11
|
+
const tsMode = process.env.UI5_TS === "true"; // In Typescript mode, we output .ts files and set the required types, otherwise - output pure .js files
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
13
|
+
const outputFile = path.normalize(`${argv[3]}/i18n-defaults.${tsMode ? "ts" : "js"}`);
|
|
16
14
|
|
|
17
|
-
|
|
15
|
+
if (!messageBundle || !outputFile) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
try {
|
|
21
|
-
defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
|
|
22
|
-
}
|
|
23
|
-
catch (e) {}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
/*
|
|
27
|
-
* Returns the single text object to enable single export.
|
|
28
|
-
*
|
|
29
|
-
* Example:
|
|
30
|
-
* const ARIA_LABEL_CARD_CONTENT = {
|
|
31
|
-
* key: "ARIA_LABEL_CARD_CONTENT",
|
|
32
|
-
* defaultText: "Card Content",
|
|
33
|
-
* };
|
|
34
|
-
*/
|
|
35
|
-
const getTextInfo = (key, value, defaultLanguageValue) => {
|
|
36
|
-
let effectiveValue = defaultLanguageValue || value;
|
|
37
|
-
effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
|
|
38
|
-
|
|
39
|
-
return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
|
|
40
|
-
};
|
|
19
|
+
const properties = PropertiesReader(messageBundle)._properties;
|
|
41
20
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
21
|
+
let defaultLanguageProperties;
|
|
22
|
+
try {
|
|
23
|
+
defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
|
|
24
|
+
} catch (e) {
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
// Merge messagebundle.properties and messagebundle_en.properties files to generate the default texts.
|
|
28
|
+
// Note:
|
|
29
|
+
// (1) at DEV time, it's intuituve to work with the source bundle file - the messagebundle.properties,
|
|
30
|
+
// and see the changes there take effect.
|
|
31
|
+
// (2) as the messagebundle.properties file is always written in English,
|
|
32
|
+
// it makes sense to consider the messagebundle.properties content only when the default language is "en".
|
|
33
|
+
if (defaultLanguage === "en") {
|
|
34
|
+
// use messagebundle_en.properties to overwrite all developer properties, only the not translated ones will remain
|
|
35
|
+
defaultLanguageProperties = Object.assign({}, properties, defaultLanguageProperties);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/*
|
|
39
|
+
* Returns the single text object to enable single export.
|
|
40
|
+
*
|
|
41
|
+
* Example:
|
|
42
|
+
* const ARIA_LABEL_CARD_CONTENT = {
|
|
43
|
+
* key: "ARIA_LABEL_CARD_CONTENT",
|
|
44
|
+
* defaultText: "Card Content",
|
|
45
|
+
* };
|
|
46
|
+
*/
|
|
47
|
+
const getTextInfo = (key, value, defaultLanguageValue) => {
|
|
48
|
+
let effectiveValue = defaultLanguageValue || value;
|
|
49
|
+
effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
|
|
59
50
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
*/
|
|
63
|
-
const writeI18nDefaultsFile = (file, content) => {
|
|
64
|
-
fs.writeFile(file, content, (err) => {
|
|
65
|
-
if (err) {
|
|
66
|
-
return console.log(err);
|
|
51
|
+
if (tsMode) {
|
|
52
|
+
return `const ${key}: I18nText = {key: "${key}", defaultText: "${effectiveValue}"};`;
|
|
67
53
|
}
|
|
54
|
+
return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
|
|
55
|
+
};
|
|
68
56
|
|
|
69
|
-
|
|
70
|
-
|
|
57
|
+
/*
|
|
58
|
+
* Returns the complete content of i18n-defaults.js file:
|
|
59
|
+
* (1) the single text objects
|
|
60
|
+
* (2) the export statement at the end of the file
|
|
61
|
+
*
|
|
62
|
+
* Example:
|
|
63
|
+
* export {
|
|
64
|
+
* ARIA_LABEL_CARD_CONTENT,
|
|
65
|
+
* }
|
|
66
|
+
*/
|
|
67
|
+
const getOutputFileContent = (properties, defaultLanguageProperties) => {
|
|
68
|
+
const textKeys = Object.keys(properties);
|
|
69
|
+
const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
|
|
70
|
+
|
|
71
|
+
// tabs are intentionally mixed to have proper identation in the produced file
|
|
72
|
+
return `${tsMode ? `import type { I18nText } from "@ui5/webcomponents-base/dist/i18nBundle.js";` : ""}
|
|
73
|
+
${texts}
|
|
74
|
+
export {${textKeys.join()}};`;
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
await fs.mkdir(path.dirname(outputFile), { recursive: true });
|
|
78
|
+
await fs.writeFile(outputFile, getOutputFileContent(properties, defaultLanguageProperties));
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
if (process.env.UI5_VERBOSE === "true") {
|
|
82
|
+
console.log("i18n default file generated.");
|
|
83
|
+
}
|
|
71
84
|
};
|
|
72
85
|
|
|
73
|
-
|
|
74
|
-
|
|
86
|
+
if (require.main === module) {
|
|
87
|
+
generate(process.argv)
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
exports._ui5mainFn = generate;
|
package/lib/i18n/toJSON.js
CHANGED
|
@@ -8,35 +8,64 @@
|
|
|
8
8
|
* The 2nd param './../dist/generated/assets/i18n' is where the JSON files would be written to.
|
|
9
9
|
*/
|
|
10
10
|
const path = require("path");
|
|
11
|
-
const glob = require("glob");
|
|
12
11
|
const PropertiesReader = require('properties-reader');
|
|
13
|
-
const fs = require('fs');
|
|
12
|
+
const fs = require('fs').promises;
|
|
14
13
|
const assets = require('../../assets-meta.js');
|
|
15
|
-
const mkdirp = require("mkdirp");
|
|
16
14
|
|
|
17
15
|
const allLanguages = assets.languages.all;
|
|
18
16
|
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
/**
|
|
18
|
+
* The translation system has a configuration whether to return UTF-8 sequences
|
|
19
|
+
* or the actual characters. This function inlines UTF-8 sequences to actual characters.
|
|
20
|
+
*
|
|
21
|
+
* For example, it converts "Keine Produkte erf\u00FCgbar" to "Keine Produkte verfügbar"
|
|
22
|
+
* This makes the JSON files more readable and smaller.
|
|
23
|
+
*/
|
|
24
|
+
function inlineUTF(properties) {
|
|
25
|
+
for (const key in properties) {
|
|
26
|
+
if (Object.prototype.hasOwnProperty.call(properties, key)) {
|
|
27
|
+
try {
|
|
28
|
+
// escape double quotes to avoid JSON parse error
|
|
29
|
+
const escaped = properties[key].replaceAll("\"", "\\\"");
|
|
30
|
+
properties[key] = JSON.parse(`"${escaped}"`); // utilize JSON parser to decode UTF-8 sequences
|
|
31
|
+
} catch (e) {
|
|
32
|
+
// in case of error, just keep the original string
|
|
33
|
+
console.log(`Warning: failed to inline UTF-8 for key "${key}" with value "${properties[key]}"`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return properties;
|
|
38
|
+
}
|
|
21
39
|
|
|
22
|
-
|
|
23
|
-
const properties = PropertiesReader(file)._properties;
|
|
40
|
+
const convertToJSON = async (file, distPath) => {
|
|
41
|
+
const properties = inlineUTF(PropertiesReader(file)._properties);
|
|
24
42
|
const filename = path.basename(file, path.extname(file));
|
|
25
43
|
const language = filename.match(/^messagebundle_(.*?)$/)[1];
|
|
26
44
|
if (!allLanguages.includes(language)) {
|
|
27
|
-
console.
|
|
28
|
-
return;
|
|
45
|
+
console.warn("Not supported language or script: ", language);
|
|
29
46
|
}
|
|
30
|
-
const outputFile = path.normalize(`${
|
|
47
|
+
const outputFile = path.normalize(`${distPath}/${filename}.json`);
|
|
31
48
|
|
|
32
|
-
fs.
|
|
49
|
+
return fs.writeFile(outputFile, JSON.stringify(properties));
|
|
33
50
|
// console.log(`[i18n]: "${filename}.json" has been generated!`);
|
|
34
51
|
};
|
|
35
52
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
files.
|
|
42
|
-
|
|
53
|
+
const generate = async (agrv) => {
|
|
54
|
+
const { globby } = await import("globby");
|
|
55
|
+
const messagesBundles = path.normalize(`${agrv[2]}/messagebundle_*.properties`);
|
|
56
|
+
const messagesJSONDist = path.normalize(`${agrv[3]}`);
|
|
57
|
+
await fs.mkdir(messagesJSONDist, { recursive: true });
|
|
58
|
+
const files = await globby(messagesBundles.replace(/\\/g, "/"));
|
|
59
|
+
return Promise.all(files.map(file => convertToJSON(file, messagesJSONDist)))
|
|
60
|
+
.then(() => {
|
|
61
|
+
if (process.env.UI5_VERBOSE === "true") {
|
|
62
|
+
console.log("Message bundle JSON files generated.");
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
if (require.main === module) {
|
|
68
|
+
generate(process.argv)
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
exports._ui5mainFn = generate;
|