@ui5/webcomponents-tools 0.0.0-b6f02e4b3 → 0.0.0-b804b8982

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 (76) hide show
  1. package/CHANGELOG.md +1674 -0
  2. package/README.md +6 -9
  3. package/assets-meta.js +11 -10
  4. package/bin/dev.js +1 -5
  5. package/components-package/eslint.js +66 -2
  6. package/components-package/nps.js +111 -61
  7. package/components-package/postcss.components.js +1 -21
  8. package/components-package/postcss.themes.js +1 -26
  9. package/components-package/vite.config.js +9 -0
  10. package/components-package/wdio.js +61 -15
  11. package/icons-collection/nps.js +13 -8
  12. package/lib/amd-to-es6/index.js +102 -0
  13. package/lib/amd-to-es6/no-remaining-require.js +33 -0
  14. package/lib/cem/custom-elements-manifest.config.mjs +547 -0
  15. package/lib/cem/event.mjs +168 -0
  16. package/lib/cem/schema-internal.json +1422 -0
  17. package/lib/cem/schema.json +1098 -0
  18. package/lib/cem/types-internal.d.ts +808 -0
  19. package/lib/cem/types.d.ts +736 -0
  20. package/lib/cem/utils.mjs +423 -0
  21. package/lib/cem/validate.js +67 -0
  22. package/lib/copy-and-watch/index.js +0 -1
  23. package/lib/copy-list/index.js +2 -2
  24. package/lib/create-icons/index.js +65 -14
  25. package/lib/create-illustrations/index.js +51 -30
  26. package/lib/create-new-component/Component.js +74 -0
  27. package/lib/create-new-component/ComponentTemplate.js +12 -0
  28. package/lib/create-new-component/index.js +60 -101
  29. package/lib/css-processors/css-processor-components.mjs +77 -0
  30. package/lib/css-processors/css-processor-themes.mjs +74 -0
  31. package/lib/css-processors/scope-variables.mjs +49 -0
  32. package/lib/css-processors/shared.mjs +56 -0
  33. package/lib/dev-server/custom-hot-update-plugin.js +39 -0
  34. package/lib/dev-server/dev-server.mjs +66 -0
  35. package/lib/dev-server/virtual-index-html-plugin.js +56 -0
  36. package/lib/generate-js-imports/illustrations.js +86 -0
  37. package/lib/generate-json-imports/i18n.js +45 -61
  38. package/lib/generate-json-imports/themes.js +18 -35
  39. package/lib/hbs2lit/src/compiler.js +16 -5
  40. package/lib/hbs2lit/src/litVisitor2.js +85 -22
  41. package/lib/hbs2lit/src/svgProcessor.js +12 -5
  42. package/lib/hbs2ui5/RenderTemplates/LitRenderer.js +39 -6
  43. package/lib/hbs2ui5/index.js +23 -6
  44. package/lib/i18n/defaults.js +19 -2
  45. package/lib/i18n/toJSON.js +1 -1
  46. package/lib/postcss-combine-duplicated-selectors/index.js +12 -5
  47. package/lib/remove-dev-mode/remove-dev-mode.mjs +37 -0
  48. package/lib/scoping/get-all-tags.js +11 -11
  49. package/lib/scoping/lint-src.js +8 -7
  50. package/lib/scoping/scope-test-pages.js +2 -1
  51. package/lib/test-runner/test-runner.js +71 -0
  52. package/package.json +32 -22
  53. package/tsconfig.json +18 -0
  54. package/components-package/rollup-plugins/empty-module.js +0 -15
  55. package/components-package/rollup.js +0 -150
  56. package/components-package/wdio.sync.js +0 -360
  57. package/lib/documentation/index.js +0 -168
  58. package/lib/documentation/templates/api-component-since.js +0 -3
  59. package/lib/documentation/templates/api-css-variables-section.js +0 -24
  60. package/lib/documentation/templates/api-events-section.js +0 -35
  61. package/lib/documentation/templates/api-methods-section.js +0 -26
  62. package/lib/documentation/templates/api-properties-section.js +0 -42
  63. package/lib/documentation/templates/api-slots-section.js +0 -28
  64. package/lib/documentation/templates/template.js +0 -39
  65. package/lib/esm-abs-to-rel/index.js +0 -58
  66. package/lib/jsdoc/config.json +0 -29
  67. package/lib/jsdoc/plugin.js +0 -2436
  68. package/lib/jsdoc/template/publish.js +0 -4112
  69. package/lib/postcss-css-to-esm/index.js +0 -45
  70. package/lib/postcss-css-to-json/index.js +0 -36
  71. package/lib/postcss-new-files/index.js +0 -36
  72. package/lib/postcss-p/postcss-p.mjs +0 -11
  73. package/lib/replace-global-core/index.js +0 -25
  74. package/lib/serve/index.js +0 -46
  75. package/lib/serve/serve.json +0 -3
  76. 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.blockPath = "context";
38
- this.blockParameters = ["context", "tags", "suffix"];
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()] = "const " + this.currentKey() + " = (" + this.blockParameters.join(", ") + ") => ";
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.blockParameters.join(", ") + ")";
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("context.classes");
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
- parsedCode = `\${classMap(${path})}`;
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
- this.blocks[this.currentKey()] += "${ repeat(" + normalizePath.call(this, block.params[0].original) + ", (item, index) => item._id || index, (item, index) => ";
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.blockPath = "item";
187
+ this.blockLevel++;
177
188
 
178
- if (this.blockParameters.indexOf("item") === -1) {
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
- this.blockParameters.unshift("index");
181
- this.blockParameters.unshift("item");
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.blockParameters.shift("item");
186
- this.blockParameters.shift("index");
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.blockPath = "context";
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
- if (result.indexOf("../") === 0) {
199
- let absolutePath = replaceAll(this.paths[this.paths.length - 1], ".", "/") + "/" + result;
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
- result = result ? replaceAll(this.blockPath + "/" + result, "/", ".") : this.blockPath;
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 process(input) {
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: `\nconst blockSVG${blockCounter} = (context, tags, suffix) => svg\`${input}\`;`,
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(`const ${blockName}.*(html\`).*;`);
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: process
75
+ process: processSVG,
69
76
  };
@@ -1,12 +1,45 @@
1
- const buildRenderer = (controlName, litTemplate) => {
2
- return `/* eslint no-unused-vars: 0 */
3
- import { html, svg, repeat, classMap, styleMap, ifDefined, unsafeHTML, scopeTag } from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
1
+ const tsImports = (controlName, hasTypes) => {
2
+ if (!process.env.UI5_TS) {
3
+ return "";
4
+ }
4
5
 
5
- ${litTemplate}
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
- export default block0;`;
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
+ };
@@ -1,10 +1,13 @@
1
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;
10
+
8
11
  const args = getopts(process.argv.slice(2), {
9
12
  alias: {
10
13
  o: 'output',
@@ -21,15 +24,29 @@ const onError = (place) => {
21
24
  console.log(`A problem occoured when reading ${place}. Please recheck passed parameters.`);
22
25
  };
23
26
 
24
- const isHandlebars = (fileName) => fileName.indexOf('.hbs') !== -1;
27
+ const isHandlebars = (fileName) => fileName.endsWith('.hbs');
28
+
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
+ }
25
34
 
26
35
  const processFile = async (file, outputDir) => {
27
- const litCode = await hbs2lit(file);
28
- const absoluteOutputDir = composeAbsoluteOutputDir(file, outputDir);
29
36
  const componentNameMatcher = /(\w+)(\.hbs)/gim;
30
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);
31
48
 
32
- return writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode));
49
+ return writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode, componentHasTypes));
33
50
  };
34
51
 
35
52
  const composeAbsoluteOutputDir = (file, outputDir) => {
@@ -70,7 +87,7 @@ const writeRenderers = async (outputDir, controlName, fileContent) => {
70
87
 
71
88
  await fs.mkdir(outputDir, { recursive: true });
72
89
 
73
- const compiledFilePath = `${outputDir}${path.sep}${controlName}Template.lit.js`;
90
+ const compiledFilePath = `${outputDir}${path.sep}${controlName}Template.lit.${process.env.UI5_TS ? "ts" : "js"}`;
74
91
 
75
92
  // strip DOS line endings because the break the source maps
76
93
  let fileContentUnix = fileContent.replace(/\r\n/g, "\n");
@@ -81,7 +98,7 @@ const writeRenderers = async (outputDir, controlName, fileContent) => {
81
98
 
82
99
  let existingFileContent = "";
83
100
  try {
84
- existingFileContent = await fs.readFile(compiledFilePath);
101
+ existingFileContent = (await fs.readFile(compiledFilePath)).toString();
85
102
  } catch (e) {}
86
103
 
87
104
  if (existingFileContent !== fileContentUnix) {
@@ -8,7 +8,9 @@ const generate = async () => {
8
8
 
9
9
  const messageBundle = path.normalize(`${process.argv[2]}/messagebundle.properties`);
10
10
  const messageBundleDefaultLanguage = path.normalize(`${process.argv[2]}/messagebundle_${defaultLanguage}.properties`);
11
- const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.js`);
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
+
13
+ const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.${tsMode ? "ts": "js"}`);
12
14
 
13
15
  if (!messageBundle || !outputFile) {
14
16
  return;
@@ -22,6 +24,16 @@ const generate = async () => {
22
24
  } catch (e) {
23
25
  }
24
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
+ }
25
37
 
26
38
  /*
27
39
  * Returns the single text object to enable single export.
@@ -36,6 +48,9 @@ const generate = async () => {
36
48
  let effectiveValue = defaultLanguageValue || value;
37
49
  effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
38
50
 
51
+ if (tsMode) {
52
+ return `const ${key}: I18nText = {key: "${key}", defaultText: "${effectiveValue}"};`;
53
+ }
39
54
  return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
40
55
  };
41
56
 
@@ -53,7 +68,9 @@ const generate = async () => {
53
68
  const textKeys = Object.keys(properties);
54
69
  const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
55
70
 
56
- return `${texts}
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}
57
74
  export {${textKeys.join()}};`;
58
75
  };
59
76
 
@@ -34,7 +34,7 @@ const convertToJSON = async (file) => {
34
34
  const generate = async () => {
35
35
  const { globby } = await import("globby");
36
36
  await fs.mkdir(messagesJSONDist, { recursive: true });
37
- const files = await globby(messagesBundles);
37
+ const files = await globby(messagesBundles.replace(/\\/g, "/"));
38
38
  return Promise.all(files.map(convertToJSON));
39
39
  };
40
40
 
@@ -154,22 +154,29 @@ module.exports = (options) => {
154
154
  options.removeDuplicatedProperties ||
155
155
  options.removeDuplicatedValues
156
156
  ) {
157
- removeDupProperties(
158
- destination,
159
- options.removeDuplicatedValues,
160
- );
157
+ // removeDupProperties(
158
+ // destination,
159
+ // options.removeDuplicatedValues,
160
+ // );
161
161
  }
162
162
  } else {
163
163
  if (
164
164
  options.removeDuplicatedProperties ||
165
165
  options.removeDuplicatedValues
166
166
  ) {
167
- removeDupProperties(rule, options.removeDuplicatedValues);
167
+ // removeDupProperties(rule, options.removeDuplicatedValues);
168
168
  }
169
169
  // add new selector to symbol table
170
170
  map.set(selector, rule);
171
171
  }
172
172
  },
173
+ OnceExit(root) {
174
+ root.nodes.forEach(node => {
175
+ if (node.type === "rule") {
176
+ removeDupProperties(node, options.removeDuplicatedValues);
177
+ }
178
+ })
179
+ }
173
180
  };
174
181
  },
175
182
  };
@@ -0,0 +1,37 @@
1
+ import { globby } from "globby";
2
+ import * as esbuild from 'esbuild'
3
+ import * as fs from "fs";
4
+
5
+ let customPlugin = {
6
+ name: 'ui5-tools',
7
+ setup(build) {
8
+ build.onLoad({ filter: /UI5Element.ts$/ }, async (args) => {
9
+ let text = await fs.promises.readFile(args.path, 'utf8');
10
+ text = text.replaceAll(/const DEV_MODE = true/g, "");
11
+ text = text.replaceAll(/if \(DEV_MODE\)/g, "if (false)");
12
+ return {
13
+ contents: text,
14
+ loader: 'ts',
15
+ }
16
+ })
17
+ },
18
+ }
19
+
20
+ const getConfig = async () => {
21
+ const config = {
22
+ entryPoints: await globby("src/**/*.ts"),
23
+ bundle: false,
24
+ minify: true,
25
+ sourcemap: true,
26
+ outdir: 'dist/prod',
27
+ outbase: 'src',
28
+ plugins: [
29
+ customPlugin,
30
+ ]
31
+ };
32
+ return config;
33
+ }
34
+
35
+
36
+ const config = await getConfig();
37
+ const result = await esbuild.build(config);
@@ -4,22 +4,22 @@ const glob = require("glob");
4
4
 
5
5
  const getTag = file => {
6
6
  const fileContent = String(fs.readFileSync(file)).replace(/\n/g, "");
7
- const matches = fileContent.match(/\btag\b:\s*\"(.*?)\"/);
8
- return matches ? matches[1] : undefined;
9
- };
10
-
11
- const getAltTag = file => {
12
- const fileContent = String(fs.readFileSync(file)).replace(/\n/g, "");
13
- const matches = fileContent.match(/\baltTag\b:\s*\"(.*?)\"/);
14
- return matches ? matches[1] : undefined;
7
+ let matches = fileContent.match(/\btag\b:\s*\"(.*?)\"/);
8
+ if (matches) {
9
+ return matches[1];
10
+ }
11
+ matches = fileContent.match(/@customElement\("(.*?)"\)/);
12
+ if (matches) {
13
+ return matches[1];
14
+ }
15
+ return undefined;
15
16
  };
16
17
 
17
18
  const getPackageTags = (packageDir) => {
18
19
  const srcDir = path.join(packageDir, "src/");
19
- return glob.sync(path.join(srcDir, "/**/*.js")).flatMap(file => {
20
+ return glob.sync(path.join(srcDir, "/**/*.ts")).flatMap(file => {
20
21
  const tag = getTag(file);
21
- const altTag = getAltTag(file);
22
- return [tag, altTag];
22
+ return [tag];
23
23
  }).filter(item => !!item);
24
24
  };
25
25
 
@@ -7,25 +7,26 @@ const tags = getAllTags(process.cwd());
7
7
 
8
8
  const errors = [];
9
9
 
10
+ const removeComments = str => str.replaceAll(/\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm, "");
11
+
10
12
  glob.sync(path.join(process.cwd(), "src/**/*.css")).forEach(file => {
11
- let content = String(fs.readFileSync(file));
13
+ let content = removeComments(String(fs.readFileSync(file)));
12
14
  tags.forEach(tag => {
13
15
  if (content.match(new RegExp(`(^|[^\.\-_A-Za-z0-9"\[])(${tag})([^\-_A-Za-z0-9]|$)`, "g"))) {
14
- errors.push(`Warning! ${tag} found in ${file}`);
16
+ errors.push(`${tag} found in ${file}`);
15
17
  }
16
18
  });
17
19
  });
18
20
 
19
- glob.sync(path.join(process.cwd(), "src/**/*.js")).forEach(file => {
20
- let content = String(fs.readFileSync(file));
21
+ glob.sync(path.join(process.cwd(), "src/**/*.ts")).forEach(file => {
22
+ let content = removeComments(String(fs.readFileSync(file)));
21
23
  tags.forEach(tag => {
22
24
  if (content.match(new RegExp(`querySelector[A-Za-z]*..${tag}`, "g"))) {
23
- errors.push(`Warning! querySelector for ${tag} found in ${file}`);
25
+ errors.push(`querySelector for ${tag} found in ${file}`);
24
26
  }
25
27
  });
26
28
  });
27
29
 
28
30
  if (errors.length) {
29
- errors.forEach(error => console.log(error));
30
- throw new Error("Errors found.");
31
+ throw new Error(`Scoping-related errors found (f.e. used ui5-input instead of [ui5-input]): \n ${errors.join("\n")}`);
31
32
  }
@@ -18,6 +18,7 @@ const replaceTagsHTML = content => {
18
18
 
19
19
  // Replace tags in any content
20
20
  const replaceTagsAny = content => {
21
+ console.log(tags.length);
21
22
  tags.forEach(tag => {
22
23
  content = content.replace(new RegExp(`(^|[^\-_A-Za-z0-9])(${tag})([^\-_A-Za-z0-9]|$)`, "g"), `$1$2-${suffix}$3`);
23
24
  });
@@ -27,7 +28,7 @@ const replaceTagsAny = content => {
27
28
  // Replace bundle names and HTML tag names in test pages
28
29
  glob.sync(path.join(root, "/**/*.html")).forEach(file => {
29
30
  let content = String(fs.readFileSync(file));
30
- content = content.replace(/bundle\.(.*?)\.js/g, `bundle.scoped.$1.js`);
31
+ content = content.replace("%VITE_BUNDLE_PATH%", "%VITE_BUNDLE_PATH_SCOPED%");
31
32
  content = replaceTagsHTML(content);
32
33
  fs.writeFileSync(file, content);
33
34
  });
@@ -0,0 +1,71 @@
1
+ const child_process = require("child_process");
2
+ const { readFileSync } = require("fs");
3
+ const path = require("path");
4
+ const fs = require("fs");
5
+
6
+ // search for dev-server port
7
+ // start in current folder
8
+ // traversing upwards in case of mono repo tests and dev-server running in root folder of repository
9
+ let devServerFolder = process.cwd();
10
+ let devServerPort;
11
+ while (true) {
12
+ try {
13
+ devServerPort = readFileSync(path.join(devServerFolder, ".dev-server-port")).toString();
14
+ break; // found
15
+ } catch (e) {
16
+ // file not found
17
+ if (devServerFolder === path.dirname(devServerFolder)) {
18
+ break; // reached root folder "/"
19
+ }
20
+ devServerFolder = path.dirname(devServerFolder);
21
+ }
22
+ }
23
+
24
+ // check if we are in a monorepo and extract path from package.json
25
+ let packageRepositoryPath = "";
26
+ const pkg = require(path.join(process.cwd(), "package.json"));
27
+ packageRepositoryPath = pkg.repository ? pkg.repository.directory : "";
28
+
29
+ // construct base url
30
+ // use devServerPort if a dev server is running, otherwise let the baseUrl in the wdio config be used
31
+ // if a dev server is running in the root of a mono repo, append tha package path like this
32
+ // http://localhost:${devServerPort}/packages/main/
33
+ let baseUrl = "";
34
+ if (devServerPort) {
35
+ console.log(`Found port ${devServerPort} from '${path.join(devServerFolder, ".dev-server-port")}'`);
36
+ const devServerInRoot = !devServerFolder.includes(packageRepositoryPath);
37
+ if (devServerInRoot) {
38
+ baseUrl = `--base-url http://localhost:${devServerPort}/${packageRepositoryPath}/`;
39
+ } else {
40
+ baseUrl = `--base-url http://localhost:${devServerPort}/`;
41
+ }
42
+ }
43
+
44
+ if (!baseUrl) {
45
+ console.log("No dev server running, running tests served from `dist`, make sure it is up to date");
46
+ }
47
+
48
+ // add single spec parameter if passed
49
+ let spec = "";
50
+ if (process.argv.length === 3) {
51
+ const specFile = process.argv[2];
52
+ spec = `--spec ${specFile}`;
53
+ }
54
+
55
+ // more parameters - pass them to wdio
56
+ let restParams = "";
57
+ if (process.argv.length > 3) {
58
+ restParams = process.argv.slice(2).join(" ");
59
+ }
60
+
61
+ let wdioConfig = "";
62
+ if (fs.existsSync("config/wdio.conf.cjs")) {
63
+ wdioConfig = "config/wdio.conf.cjs";
64
+ } else if (fs.existsSync("config/wdio.conf.js")) {
65
+ wdioConfig = "config/wdio.conf.js";
66
+ }
67
+
68
+ // run wdio with calculated parameters
69
+ const cmd = `yarn cross-env WDIO_LOG_LEVEL=error wdio ${wdioConfig} ${spec} ${baseUrl} ${restParams}`;
70
+ console.log(`executing: ${cmd}`);
71
+ child_process.execSync(cmd, {stdio: 'inherit'});