@ui5/webcomponents-tools 0.0.0-453158269 → 0.0.0-47cc17a26
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 +2086 -0
- package/LICENSE.txt +201 -0
- package/README.md +7 -10
- package/assets-meta.js +12 -11
- package/bin/dev.js +3 -6
- package/bin/ui5nps.js +265 -0
- package/components-package/eslint.js +66 -2
- package/components-package/nps.js +148 -69
- 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 -18
- package/lib/amd-to-es6/index.js +107 -0
- package/lib/amd-to-es6/no-remaining-require.js +33 -0
- package/lib/cem/cem.js +12 -0
- package/lib/cem/custom-elements-manifest.config.mjs +530 -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 +423 -0
- package/lib/cem/validate.js +76 -0
- package/lib/copy-and-watch/index.js +105 -97
- package/lib/copy-list/index.js +16 -10
- package/lib/create-icons/index.js +74 -25
- package/lib/create-illustrations/index.js +88 -45
- 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 +92 -0
- package/lib/css-processors/css-processor-themes.mjs +102 -0
- package/lib/css-processors/scope-variables.mjs +49 -0
- package/lib/css-processors/shared.mjs +46 -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/generate-js-imports/illustrations.js +85 -0
- package/lib/generate-json-imports/i18n.js +62 -69
- package/lib/generate-json-imports/themes.js +34 -43
- package/lib/hbs2lit/src/compiler.js +16 -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 +23 -6
- package/lib/i18n/defaults.js +30 -8
- package/lib/i18n/toJSON.js +15 -11
- package/lib/icons-hash/icons-hash.mjs +149 -0
- package/lib/postcss-combine-duplicated-selectors/index.js +12 -5
- 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 +71 -0
- package/package.json +45 -33
- package/tsconfig.json +18 -0
- package/components-package/rollup-plugins/empty-module.js +0 -15
- package/components-package/rollup.js +0 -150
- package/components-package/wdio.sync.js +0 -360
- package/lib/documentation/index.js +0 -168
- 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 -58
- package/lib/jsdoc/config.json +0 -29
- package/lib/jsdoc/plugin.js +0 -2436
- package/lib/jsdoc/template/publish.js +0 -4112
- 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/postcss-p/postcss-p.mjs +0 -11
- package/lib/replace-global-core/index.js +0 -25
- package/lib/serve/index.js +0 -46
- package/lib/serve/serve.json +0 -3
- package/package-lock.json +0 -48
|
@@ -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,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.
|
|
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) {
|
package/lib/i18n/defaults.js
CHANGED
|
@@ -3,12 +3,14 @@ const path = require('path');
|
|
|
3
3
|
const PropertiesReader = require('properties-reader');
|
|
4
4
|
const assets = require('../../assets-meta.js');
|
|
5
5
|
|
|
6
|
-
const generate = async () => {
|
|
6
|
+
const generate = async (argv) => {
|
|
7
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
|
+
|
|
13
|
+
const outputFile = path.normalize(`${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,14 +68,21 @@ 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
|
-
|
|
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
|
|
|
60
77
|
await fs.mkdir(path.dirname(outputFile), { recursive: true });
|
|
61
78
|
await fs.writeFile(outputFile, getOutputFileContent(properties, defaultLanguageProperties));
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
console.log("i18n default file generated.")
|
|
62
82
|
};
|
|
63
83
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}
|
|
84
|
+
if (require.main === module) {
|
|
85
|
+
generate(process.argv)
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
exports._ui5mainFn = generate;
|
package/lib/i18n/toJSON.js
CHANGED
|
@@ -14,10 +14,7 @@ const assets = require('../../assets-meta.js');
|
|
|
14
14
|
|
|
15
15
|
const allLanguages = assets.languages.all;
|
|
16
16
|
|
|
17
|
-
const
|
|
18
|
-
const messagesJSONDist = path.normalize(`${process.argv[3]}`);
|
|
19
|
-
|
|
20
|
-
const convertToJSON = async (file) => {
|
|
17
|
+
const convertToJSON = async (file, distPath) => {
|
|
21
18
|
const properties = PropertiesReader(file)._properties;
|
|
22
19
|
const filename = path.basename(file, path.extname(file));
|
|
23
20
|
const language = filename.match(/^messagebundle_(.*?)$/)[1];
|
|
@@ -25,19 +22,26 @@ const convertToJSON = async (file) => {
|
|
|
25
22
|
console.log("Not supported language: ", language);
|
|
26
23
|
return;
|
|
27
24
|
}
|
|
28
|
-
const outputFile = path.normalize(`${
|
|
25
|
+
const outputFile = path.normalize(`${distPath}/${filename}.json`);
|
|
29
26
|
|
|
30
27
|
return fs.writeFile(outputFile, JSON.stringify(properties));
|
|
31
28
|
// console.log(`[i18n]: "${filename}.json" has been generated!`);
|
|
32
29
|
};
|
|
33
30
|
|
|
34
|
-
const generate = async () => {
|
|
31
|
+
const generate = async (agrv) => {
|
|
35
32
|
const { globby } = await import("globby");
|
|
33
|
+
const messagesBundles = path.normalize(`${agrv[2]}/messagebundle_*.properties`);
|
|
34
|
+
const messagesJSONDist = path.normalize(`${agrv[3]}`);
|
|
36
35
|
await fs.mkdir(messagesJSONDist, { recursive: true });
|
|
37
|
-
const files = await globby(messagesBundles);
|
|
38
|
-
return Promise.all(files.map(convertToJSON))
|
|
36
|
+
const files = await globby(messagesBundles.replace(/\\/g, "/"));
|
|
37
|
+
return Promise.all(files.map(file => convertToJSON(file, messagesJSONDist)))
|
|
38
|
+
.then(() => {
|
|
39
|
+
console.log("Message bundle JSON files generated.");
|
|
40
|
+
});
|
|
39
41
|
};
|
|
40
42
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
43
|
+
if (require.main === module) {
|
|
44
|
+
generate(process.argv)
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
exports._ui5mainFn = generate;
|
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
import fs from "fs/promises";
|
|
2
|
+
import path from "path";
|
|
3
|
+
import ignore from "ignore";
|
|
4
|
+
import { fileURLToPath } from "url";
|
|
5
|
+
|
|
6
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
7
|
+
const __dirname = path.dirname(__filename);
|
|
8
|
+
|
|
9
|
+
// -------------------
|
|
10
|
+
// FNV-1a 32-bit hash
|
|
11
|
+
// -------------------
|
|
12
|
+
function fnv1aHash(str) {
|
|
13
|
+
let hash = 0x811c9dc5;
|
|
14
|
+
for (let i = 0; i < str.length; i++) {
|
|
15
|
+
hash ^= str.charCodeAt(i);
|
|
16
|
+
hash = (hash * 0x01000193) >>> 0;
|
|
17
|
+
}
|
|
18
|
+
return hash.toString(16);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
async function findGitignoreFiles(startDir) {
|
|
22
|
+
const gitignores = [];
|
|
23
|
+
let currentDir = path.resolve(startDir);
|
|
24
|
+
while (true) {
|
|
25
|
+
const candidate = path.join(currentDir, ".gitignore");
|
|
26
|
+
try {
|
|
27
|
+
await fs.access(candidate);
|
|
28
|
+
gitignores.push(candidate);
|
|
29
|
+
} catch { }
|
|
30
|
+
const parentDir = path.dirname(currentDir);
|
|
31
|
+
if (parentDir === currentDir) break;
|
|
32
|
+
currentDir = parentDir;
|
|
33
|
+
}
|
|
34
|
+
return gitignores;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
async function loadIgnoreRules(dir) {
|
|
38
|
+
const files = await findGitignoreFiles(dir);
|
|
39
|
+
const ig = ignore();
|
|
40
|
+
for (const file of files) {
|
|
41
|
+
const content = await fs.readFile(file, "utf8");
|
|
42
|
+
ig.add(content);
|
|
43
|
+
}
|
|
44
|
+
return ig;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
async function walkDir(dir, ig, baseDir) {
|
|
48
|
+
const results = [];
|
|
49
|
+
const entries = await fs.readdir(dir, { withFileTypes: true });
|
|
50
|
+
|
|
51
|
+
for (const entry of entries) {
|
|
52
|
+
const absPath = path.join(dir, entry.name);
|
|
53
|
+
let relPath = path.relative(baseDir, absPath).replace(/\\/g, "/"); // normalize for .gitignore
|
|
54
|
+
|
|
55
|
+
if (ig.ignores(relPath) || relPath.startsWith("dist/")) continue;
|
|
56
|
+
|
|
57
|
+
if (entry.isDirectory()) {
|
|
58
|
+
results.push(...await walkDir(absPath, ig, baseDir));
|
|
59
|
+
} else {
|
|
60
|
+
results.push(relPath);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return results;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
// Hash file content + mtime
|
|
67
|
+
async function hashFile(filePath) {
|
|
68
|
+
const stat = await fs.stat(filePath);
|
|
69
|
+
const content = await fs.readFile(filePath, "utf8");
|
|
70
|
+
return fnv1aHash(String(stat.mtimeMs) + content);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
function getRepoName(repoPath) {
|
|
74
|
+
return repoPath.split("/").pop();
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
async function computeHashes(repoPath, ig) {
|
|
78
|
+
const files = await walkDir(repoPath, ig, repoPath);
|
|
79
|
+
const hashEntries = await Promise.all(
|
|
80
|
+
files.map(async (file) => {
|
|
81
|
+
const absPath = path.join(repoPath, file);
|
|
82
|
+
const hash = await hashFile(absPath);
|
|
83
|
+
return [path.relative(process.cwd(), absPath), hash];
|
|
84
|
+
})
|
|
85
|
+
);
|
|
86
|
+
return Object.fromEntries(hashEntries);
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
async function saveHashes(repoPath, ig) {
|
|
90
|
+
const distPath = path.join(repoPath, "dist");
|
|
91
|
+
await fs.mkdir(distPath, { recursive: true });
|
|
92
|
+
const ui5iconsHashPath = path.join(distPath, ".ui5iconsHash");
|
|
93
|
+
|
|
94
|
+
// Cache the hashes for both the icons and tools packages, since the output depends on the content of both.
|
|
95
|
+
const hashes = {
|
|
96
|
+
...(await computeHashes(repoPath, ig)),
|
|
97
|
+
...(await computeHashes(path.resolve(__dirname, "../../"), ig)),
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
await fs.writeFile(ui5iconsHashPath, JSON.stringify(hashes, null, 2), "utf8");
|
|
101
|
+
console.log(`Saved build hashes for the ${getRepoName(repoPath)} package.`);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
async function checkHashes(repoPath, ig) {
|
|
105
|
+
const ui5iconsHashPath = path.join(repoPath, "dist", ".ui5iconsHash");
|
|
106
|
+
let oldHashes = {};
|
|
107
|
+
try {
|
|
108
|
+
const raw = await fs.readFile(ui5iconsHashPath, "utf8");
|
|
109
|
+
oldHashes = JSON.parse(raw);
|
|
110
|
+
} catch {
|
|
111
|
+
console.log(`No build hashes found for the ${getRepoName(repoPath)} package. Building it now.`);
|
|
112
|
+
process.exit(1);
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// Compare the hashes for both the icons and tools packages, since the output depends on the content of both.
|
|
116
|
+
const newHashes = {
|
|
117
|
+
...(await computeHashes(repoPath, ig)),
|
|
118
|
+
...(await computeHashes(path.resolve(__dirname, "../../"), ig)),
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
let changed = false;
|
|
122
|
+
for (const file of new Set([...Object.keys(oldHashes), ...Object.keys(newHashes)])) {
|
|
123
|
+
if (oldHashes[file] !== newHashes[file]) {
|
|
124
|
+
changed = true;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
if (!changed) {
|
|
129
|
+
console.log(`No changes detected in the ${getRepoName(repoPath)} package.`);
|
|
130
|
+
} else {
|
|
131
|
+
console.log(`Changes detected in the ${getRepoName(repoPath)} package. Rebuilding it.`);
|
|
132
|
+
process.exit(1);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
async function main() {
|
|
137
|
+
const mode = process.argv[2];
|
|
138
|
+
if (!["save", "check"].includes(mode)) {
|
|
139
|
+
throw new Error("Usage: node hashes.js <save|check>");
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
const repoPath = process.cwd();
|
|
143
|
+
const ig = await loadIgnoreRules(repoPath);
|
|
144
|
+
|
|
145
|
+
if (mode === "save") await saveHashes(repoPath, ig);
|
|
146
|
+
if (mode === "check") await checkHashes(repoPath, ig);
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
main().catch(console.error);
|
|
@@ -154,22 +154,29 @@ module.exports = (options) => {
|
|
|
154
154
|
options.removeDuplicatedProperties ||
|
|
155
155
|
options.removeDuplicatedValues
|
|
156
156
|
) {
|
|
157
|
-
removeDupProperties(
|
|
158
|
-
|
|
159
|
-
|
|
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,51 @@
|
|
|
1
|
+
import { globby } from "globby";
|
|
2
|
+
import * as esbuild from 'esbuild'
|
|
3
|
+
import * as fs from "fs";
|
|
4
|
+
import { pathToFileURL } from "url";
|
|
5
|
+
|
|
6
|
+
const generate = async () => {
|
|
7
|
+
let customPlugin = {
|
|
8
|
+
name: 'ui5-tools',
|
|
9
|
+
setup(build) {
|
|
10
|
+
build.onLoad({ filter: /UI5Element.ts$/ }, async (args) => {
|
|
11
|
+
let text = await fs.promises.readFile(args.path, 'utf8');
|
|
12
|
+
text = text.replaceAll(/const DEV_MODE = true/g, "");
|
|
13
|
+
text = text.replaceAll(/if \(DEV_MODE\)/g, "if (false)");
|
|
14
|
+
return {
|
|
15
|
+
contents: text,
|
|
16
|
+
loader: 'ts',
|
|
17
|
+
}
|
|
18
|
+
})
|
|
19
|
+
},
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const getConfig = async () => {
|
|
23
|
+
const config = {
|
|
24
|
+
entryPoints: await globby("src/**/*.ts"),
|
|
25
|
+
bundle: false,
|
|
26
|
+
minify: true,
|
|
27
|
+
sourcemap: true,
|
|
28
|
+
outdir: 'dist/prod',
|
|
29
|
+
outbase: 'src',
|
|
30
|
+
plugins: [
|
|
31
|
+
customPlugin,
|
|
32
|
+
]
|
|
33
|
+
};
|
|
34
|
+
return config;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
const config = await getConfig();
|
|
39
|
+
const result = await esbuild.build(config);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const filePath = process.argv[1];
|
|
43
|
+
const fileUrl = pathToFileURL(filePath).href;
|
|
44
|
+
|
|
45
|
+
if (import.meta.url === fileUrl) {
|
|
46
|
+
generate()
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export default {
|
|
50
|
+
_ui5mainFn: generate
|
|
51
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
const fs = require('fs');
|
|
2
|
+
const path = require('path');
|
|
3
|
+
|
|
4
|
+
const rimraf = dir => {
|
|
5
|
+
if (fs.existsSync(dir)) {
|
|
6
|
+
fs.readdirSync(dir).forEach(entry => {
|
|
7
|
+
const entryPath = path.join(dir, entry);
|
|
8
|
+
if (fs.lstatSync(entryPath).isDirectory()) {
|
|
9
|
+
rimraf(entryPath);
|
|
10
|
+
} else {
|
|
11
|
+
fs.unlinkSync(entryPath);
|
|
12
|
+
}
|
|
13
|
+
});
|
|
14
|
+
fs.rmdirSync(dir);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
const main = argv => {
|
|
19
|
+
if (argv.length < 3) {
|
|
20
|
+
console.error("rimraf <dir>");
|
|
21
|
+
process.exit(1);
|
|
22
|
+
}
|
|
23
|
+
const dir = argv[2];
|
|
24
|
+
rimraf(dir);
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
if (require.main === module) {
|
|
28
|
+
main(process.argv)
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
exports._ui5mainFn = main;
|
|
@@ -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
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
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, "/**/*.
|
|
20
|
+
return glob.sync(path.join(srcDir, "/**/*.ts")).flatMap(file => {
|
|
20
21
|
const tag = getTag(file);
|
|
21
|
-
|
|
22
|
-
return [tag, altTag];
|
|
22
|
+
return [tag];
|
|
23
23
|
}).filter(item => !!item);
|
|
24
24
|
};
|
|
25
25
|
|
package/lib/scoping/lint-src.js
CHANGED
|
@@ -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(
|
|
16
|
+
errors.push(`${tag} found in ${file}`);
|
|
15
17
|
}
|
|
16
18
|
});
|
|
17
19
|
});
|
|
18
20
|
|
|
19
|
-
glob.sync(path.join(process.cwd(), "src/**/*.
|
|
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(`
|
|
25
|
+
errors.push(`querySelector for ${tag} found in ${file}`);
|
|
24
26
|
}
|
|
25
27
|
});
|
|
26
28
|
});
|
|
27
29
|
|
|
28
30
|
if (errors.length) {
|
|
29
|
-
errors.
|
|
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(
|
|
31
|
+
content = content.replace("%VITE_BUNDLE_PATH%", "%VITE_BUNDLE_PATH_SCOPED%");
|
|
31
32
|
content = replaceTagsHTML(content);
|
|
32
33
|
fs.writeFileSync(file, content);
|
|
33
34
|
});
|