@ui5/webcomponents-tools 0.0.0-cc312800a → 0.0.0-cf50976ce

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 (86) hide show
  1. package/CHANGELOG.md +184 -0
  2. package/README.md +5 -6
  3. package/assets-meta.js +7 -1
  4. package/bin/dev.js +1 -5
  5. package/components-package/nps.js +55 -51
  6. package/components-package/postcss.themes.js +6 -3
  7. package/components-package/vite.config.js +12 -0
  8. package/components-package/wdio.js +71 -29
  9. package/components-package/wdio.sync.js +360 -0
  10. package/icons-collection/nps.js +41 -13
  11. package/lib/copy-and-watch/index.js +24 -1
  12. package/lib/copy-list/index.js +28 -0
  13. package/lib/create-icons/index.js +101 -58
  14. package/lib/create-illustrations/index.js +161 -0
  15. package/lib/create-new-component/index.js +12 -4
  16. package/lib/dev-server/dev-server.js +66 -0
  17. package/lib/dev-server/virtual-index-html-plugin.js +52 -0
  18. package/lib/esm-abs-to-rel/index.js +58 -0
  19. package/lib/generate-json-imports/i18n.js +38 -31
  20. package/lib/generate-json-imports/themes.js +31 -24
  21. package/lib/hbs2lit/src/compiler.js +12 -3
  22. package/lib/hbs2lit/src/includesReplacer.js +5 -5
  23. package/lib/hbs2lit/src/litVisitor2.js +31 -6
  24. package/lib/hbs2lit/src/svgProcessor.js +3 -3
  25. package/lib/hbs2ui5/RenderTemplates/LitRenderer.js +4 -11
  26. package/lib/hbs2ui5/index.js +37 -21
  27. package/lib/i18n/defaults.js +49 -57
  28. package/lib/i18n/toJSON.js +12 -11
  29. package/lib/jsdoc/plugin.js +9 -0
  30. package/lib/jsdoc/template/publish.js +13 -2
  31. package/lib/postcss-combine-duplicated-selectors/index.js +178 -0
  32. package/lib/postcss-css-to-esm/index.js +16 -4
  33. package/lib/postcss-css-to-json/index.js +18 -2
  34. package/lib/postcss-p/postcss-p.mjs +14 -0
  35. package/lib/replace-global-core/index.js +25 -0
  36. package/lib/scoping/lint-src.js +1 -1
  37. package/lib/scoping/missing-dependencies.js +65 -0
  38. package/lib/scoping/report-tags-usage.js +28 -0
  39. package/lib/scoping/scope-test-pages.js +1 -1
  40. package/lib/test-runner/test-runner.js +63 -0
  41. package/package.json +26 -39
  42. package/bin/init-ui5-package.js +0 -3
  43. package/components-package/rollup.js +0 -195
  44. package/lib/documentation/index.js +0 -165
  45. package/lib/documentation/templates/api-component-since.js +0 -3
  46. package/lib/documentation/templates/api-css-variables-section.js +0 -24
  47. package/lib/documentation/templates/api-events-section.js +0 -35
  48. package/lib/documentation/templates/api-methods-section.js +0 -26
  49. package/lib/documentation/templates/api-properties-section.js +0 -40
  50. package/lib/documentation/templates/api-slots-section.js +0 -28
  51. package/lib/documentation/templates/template.js +0 -38
  52. package/lib/hash/config.js +0 -10
  53. package/lib/hash/generate.js +0 -19
  54. package/lib/hash/upToDate.js +0 -31
  55. package/lib/init-package/index.js +0 -123
  56. package/lib/init-package/resources/.eslintignore +0 -3
  57. package/lib/init-package/resources/bundle.es5.js +0 -25
  58. package/lib/init-package/resources/bundle.esm.js +0 -31
  59. package/lib/init-package/resources/config/.eslintrc.js +0 -1
  60. package/lib/init-package/resources/config/postcss.components/postcss.config.js +0 -1
  61. package/lib/init-package/resources/config/postcss.themes/postcss.config.js +0 -1
  62. package/lib/init-package/resources/config/rollup.config.js +0 -1
  63. package/lib/init-package/resources/config/wdio.conf.js +0 -1
  64. package/lib/init-package/resources/package-scripts.js +0 -11
  65. package/lib/init-package/resources/src/Assets.js +0 -5
  66. package/lib/init-package/resources/src/MyFirstComponent.hbs +0 -1
  67. package/lib/init-package/resources/src/MyFirstComponent.js +0 -56
  68. package/lib/init-package/resources/src/i18n/messagebundle.properties +0 -2
  69. package/lib/init-package/resources/src/i18n/messagebundle_de.properties +0 -1
  70. package/lib/init-package/resources/src/i18n/messagebundle_en.properties +0 -1
  71. package/lib/init-package/resources/src/i18n/messagebundle_es.properties +0 -1
  72. package/lib/init-package/resources/src/i18n/messagebundle_fr.properties +0 -1
  73. package/lib/init-package/resources/src/themes/MyFirstComponent.css +0 -11
  74. package/lib/init-package/resources/src/themes/sap_belize/parameters-bundle.css +0 -3
  75. package/lib/init-package/resources/src/themes/sap_belize_hcb/parameters-bundle.css +0 -3
  76. package/lib/init-package/resources/src/themes/sap_belize_hcw/parameters-bundle.css +0 -3
  77. package/lib/init-package/resources/src/themes/sap_fiori_3/parameters-bundle.css +0 -3
  78. package/lib/init-package/resources/src/themes/sap_fiori_3_dark/parameters-bundle.css +0 -3
  79. package/lib/init-package/resources/src/themes/sap_fiori_3_hcb/parameters-bundle.css +0 -3
  80. package/lib/init-package/resources/src/themes/sap_fiori_3_hcw/parameters-bundle.css +0 -3
  81. package/lib/init-package/resources/test/pages/index.html +0 -56
  82. package/lib/init-package/resources/test/specs/Demo.spec.js +0 -12
  83. package/lib/polyfill-placeholder/index.js +0 -5
  84. package/lib/serve/index.js +0 -46
  85. package/lib/serve/serve.json +0 -3
  86. package/package-lock.json +0 -48
@@ -8,9 +8,26 @@ let skipIfDefined = false;
8
8
  // when true => an HTML node value, when false => an attribute value
9
9
  let isNodeValue = false;
10
10
 
11
+ // when true => the current attribute is "style"
12
+ let isStyleAttribute = false;
13
+
11
14
  // matches event handlers @click= and boolean attrs ?disabled=
12
15
  const dynamicAttributeRgx = /\s(\?|@)([a-zA-Z|-]+)="?\s*$/;
13
16
 
17
+ if (!String.prototype.replaceAll) {
18
+ String.prototype.replaceAll = function(str, newStr){
19
+
20
+ // If a regex pattern
21
+ if (Object.prototype.toString.call(str).toLowerCase() === '[object regexp]') {
22
+ return this.replace(str, newStr);
23
+ }
24
+
25
+ // If a string
26
+ return this.replace(new RegExp(str, 'g'), newStr);
27
+
28
+ };
29
+ }
30
+
14
31
  function HTMLLitVisitor(debug) {
15
32
  this.blockCounter = 0;
16
33
  this.keys = [];
@@ -18,7 +35,7 @@ function HTMLLitVisitor(debug) {
18
35
  this.result = "";
19
36
  this.mainBlock = "";
20
37
  this.blockPath = "context";
21
- this.blockParameters = ["context"];
38
+ this.blockParameters = ["context", "tags", "suffix"];
22
39
  this.paths = []; //contains all normalized relative paths
23
40
  this.debug = debug;
24
41
  if (this.debug) {
@@ -34,7 +51,7 @@ HTMLLitVisitor.prototype.Program = function(program) {
34
51
  this.keys.push(key);
35
52
  this.debug && this.blockByNumber.push(key);
36
53
 
37
- this.blocks[this.currentKey()] = "const " + this.currentKey() + " = (" + this.blockParameters.join(", ") + ") => { return ";
54
+ this.blocks[this.currentKey()] = "const " + this.currentKey() + " = (" + this.blockParameters.join(", ") + ") => ";
38
55
 
39
56
  if (this.keys.length > 1) { //it's a nested block
40
57
  this.blocks[this.prevKey()] += this.currentKey() + "(" + this.blockParameters.join(", ") + ")";
@@ -45,7 +62,7 @@ HTMLLitVisitor.prototype.Program = function(program) {
45
62
 
46
63
  this.blocks[this.currentKey()] += "html`";
47
64
  Visitor.prototype.Program.call(this, program);
48
- this.blocks[this.currentKey()] += "`; };";
65
+ this.blocks[this.currentKey()] += "`;";
49
66
 
50
67
  this.keys.pop(key);
51
68
  };
@@ -54,7 +71,7 @@ HTMLLitVisitor.prototype.ContentStatement = function(content) {
54
71
  Visitor.prototype.ContentStatement.call(this, content);
55
72
  // let content = content.orgiinal; // attribute="__ attribute = "__ attribute ="__
56
73
 
57
- const contentStatement = content.original;
74
+ let contentStatement = content.original;
58
75
  skipIfDefined = !!dynamicAttributeRgx.exec(contentStatement);
59
76
 
60
77
  const closingIndex = contentStatement.lastIndexOf(">");
@@ -63,6 +80,15 @@ HTMLLitVisitor.prototype.ContentStatement = function(content) {
63
80
  isNodeValue = closingIndex > openingIndex;
64
81
  }
65
82
 
83
+ isStyleAttribute = !isNodeValue && contentStatement.match(/style *= *["']? *$/);
84
+
85
+ if (!isStyleAttribute && contentStatement.match(/style=/)) {
86
+ console.log("WARNING: style hard-coded", contentStatement);
87
+ }
88
+
89
+ // Scope custom element tags
90
+ contentStatement = contentStatement.replaceAll(/(<\/?\s*)([a-zA-Z0-9_]+-[a-zA-Z0-9_-]+)/g, "$1\${scopeTag(\"$2\", tags, suffix)}");
91
+
66
92
  this.blocks[this.currentKey()] += contentStatement;
67
93
  };
68
94
 
@@ -74,7 +100,6 @@ HTMLLitVisitor.prototype.MustacheStatement = function(mustache) {
74
100
  } else {
75
101
  const path = normalizePath.call(this, mustache.path.original);
76
102
  const hasCalculatingClasses = path.includes("context.classes");
77
- const hasStylesCalculation = path.includes("context.styles");
78
103
 
79
104
  let parsedCode = "";
80
105
 
@@ -82,7 +107,7 @@ HTMLLitVisitor.prototype.MustacheStatement = function(mustache) {
82
107
  parsedCode = `\${unsafeHTML(${path})}`;
83
108
  } else if (hasCalculatingClasses) {
84
109
  parsedCode = `\${classMap(${path})}`;
85
- } else if (hasStylesCalculation) {
110
+ } else if (isStyleAttribute) {
86
111
  parsedCode = `\${styleMap(${path})}`;
87
112
  } else if (skipIfDefined){
88
113
  parsedCode = `\${${path}}`;
@@ -46,8 +46,8 @@ function getSVGMatches(template) {
46
46
 
47
47
  function getSVGBlock(input, blockCounter) {
48
48
  return {
49
- usage: `\${blockSVG${blockCounter}(context)}`,
50
- definition: `\nconst blockSVG${blockCounter} = (context) => {return svg\`${input}\`};`,
49
+ usage: `\${blockSVG${blockCounter}(context, tags, suffix)}`,
50
+ definition: `\nconst blockSVG${blockCounter} = (context, tags, suffix) => svg\`${input}\`;`,
51
51
  };
52
52
  }
53
53
 
@@ -55,7 +55,7 @@ function replaceInternalBlocks(template, svgContent) {
55
55
  const internalBlocks = svgContent.match(blockrx) || [];
56
56
 
57
57
  internalBlocks.forEach(blockName => {
58
- const rx = new RegExp(`const ${blockName}.*(html\`).*};`);
58
+ const rx = new RegExp(`const ${blockName}.*(html\`).*;`);
59
59
  template = template.replace(rx, (match, p1) => {
60
60
  return match.replace(p1, "svg\`");
61
61
  });
@@ -1,17 +1,10 @@
1
1
  const buildRenderer = (controlName, litTemplate) => {
2
- return `
3
- /* eslint no-unused-vars: 0 */
4
- import ifDefined from '@ui5/webcomponents-base/dist/renderer/ifDefined.js';
5
- import { html, svg, repeat, classMap, styleMap, unsafeHTML, setTags, setSuffix } from '@ui5/webcomponents-base/dist/renderer/LitRenderer.js';
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";
4
+
6
5
  ${litTemplate}
7
6
 
8
- const main = (context, tags, suffix) => {
9
- setTags(tags);
10
- setSuffix(suffix);
11
- return block0(context);
12
- };
13
-
14
- export default main;`
7
+ export default block0;`;
15
8
  };
16
9
 
17
10
  module.exports = {
@@ -1,10 +1,9 @@
1
- const fs = require('fs');
1
+ const fs = require('fs').promises;
2
2
  const getopts = require('getopts');
3
3
  const hbs2lit = require('../hbs2lit');
4
4
  const path = require('path');
5
5
  const litRenderer = require('./RenderTemplates/LitRenderer');
6
6
  const recursiveReadDir = require("recursive-readdir");
7
- const mkdirp = require('mkdirp');
8
7
 
9
8
  const args = getopts(process.argv.slice(2), {
10
9
  alias: {
@@ -24,13 +23,13 @@ const onError = (place) => {
24
23
 
25
24
  const isHandlebars = (fileName) => fileName.indexOf('.hbs') !== -1;
26
25
 
27
- const processFile = (file, outputDir) => {
28
- const litCode = hbs2lit(file);
26
+ const processFile = async (file, outputDir) => {
27
+ const litCode = await hbs2lit(file);
29
28
  const absoluteOutputDir = composeAbsoluteOutputDir(file, outputDir);
30
29
  const componentNameMatcher = /(\w+)(\.hbs)/gim;
31
30
  const componentName = componentNameMatcher.exec(file)[1];
32
31
 
33
- writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode));
32
+ return writeRenderers(absoluteOutputDir, componentName, litRenderer.generateTemplate(componentName, litCode));
34
33
  };
35
34
 
36
35
  const composeAbsoluteOutputDir = (file, outputDir) => {
@@ -40,39 +39,54 @@ const composeAbsoluteOutputDir = (file, outputDir) => {
40
39
  const fileDir = file.split(path.sep).slice(1, -1).join(path.sep);
41
40
 
42
41
  // (2) Compose full output dir - "dist/generated/templates/lvl1/lvl2"
43
- return `${outputDir}${path.sep}${fileDir}`;
42
+ return `${outputDir}${path.sep}${fileDir}`;
44
43
  };
45
44
 
46
45
  const wrapDirectory = (directory, outputDir) => {
47
46
  directory = path.normalize(directory);
48
47
  outputDir = path.normalize(outputDir);
49
48
 
50
- recursiveReadDir(directory, (err, files) => {
49
+ return new Promise((resolve, reject) => {
50
+ recursiveReadDir(directory, (err, files) => {
51
51
 
52
- if (err) {
53
- onError('directory');
54
- }
55
-
56
- files.forEach(fileName => {
57
- if (isHandlebars(fileName)) {
58
- processFile(fileName, outputDir);
52
+ if (err) {
53
+ onError('directory');
54
+ reject();
59
55
  }
56
+
57
+ const promises = files.map(fileName => {
58
+ if (isHandlebars(fileName)) {
59
+ return processFile(fileName, outputDir);
60
+ }
61
+ }).filter(x => !!x);
62
+
63
+ resolve(Promise.all(promises));
60
64
  });
61
- })
65
+ });
62
66
  };
63
67
 
64
- const writeRenderers = (outputDir, controlName, fileContent) => {
68
+ const writeRenderers = async (outputDir, controlName, fileContent) => {
65
69
  try {
66
- if (!fs.existsSync(outputDir)) {
67
- mkdirp.sync(outputDir);
68
- }
70
+
71
+ await fs.mkdir(outputDir, { recursive: true });
69
72
 
70
73
  const compiledFilePath = `${outputDir}${path.sep}${controlName}Template.lit.js`;
71
74
 
72
75
  // strip DOS line endings because the break the source maps
73
76
  let fileContentUnix = fileContent.replace(/\r\n/g, "\n");
74
77
  fileContentUnix = fileContentUnix.replace(/\r/g, "\n");
75
- fs.writeFileSync(compiledFilePath, fileContentUnix);
78
+
79
+ // Only write to the file system actual changes - each updated file, no matter if the same or not, triggers an expensive operation for rollup
80
+ // Note: .hbs files that include a changed .hbs file will also be recompiled as their content will be updated too
81
+
82
+ let existingFileContent = "";
83
+ try {
84
+ existingFileContent = await fs.readFile(compiledFilePath);
85
+ } catch (e) {}
86
+
87
+ if (existingFileContent !== fileContentUnix) {
88
+ return fs.writeFile(compiledFilePath, fileContentUnix);
89
+ }
76
90
 
77
91
  } catch (e) {
78
92
  console.log(e);
@@ -82,5 +96,7 @@ const writeRenderers = (outputDir, controlName, fileContent) => {
82
96
  if (!args['d'] || !args['o']) {
83
97
  console.log('Please provide an input and output directory (-d and -o)');
84
98
  } else {
85
- wrapDirectory(args['d'], args['o']);
99
+ wrapDirectory(args['d'], args['o']).then(() => {
100
+ console.log("Templates generated");
101
+ });
86
102
  }
@@ -1,74 +1,66 @@
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 defaultLanguage = assets.languages.default;
6
+ const generate = async () => {
7
+ const defaultLanguage = assets.languages.default;
8
8
 
9
- const messageBundle = path.normalize(`${process.argv[2]}/messagebundle.properties`);
10
- const messageBundleDefaultLanguage = path.normalize(`${process.argv[2]}/messagebundle_${defaultLanguage}.properties`);
11
- const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.js`);
9
+ const messageBundle = path.normalize(`${process.argv[2]}/messagebundle.properties`);
10
+ const messageBundleDefaultLanguage = path.normalize(`${process.argv[2]}/messagebundle_${defaultLanguage}.properties`);
11
+ const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.js`);
12
12
 
13
- if (!messageBundle || !outputFile) {
14
- return;
15
- }
13
+ if (!messageBundle || !outputFile) {
14
+ return;
15
+ }
16
16
 
17
- const properties = PropertiesReader(messageBundle)._properties;
17
+ const properties = PropertiesReader(messageBundle)._properties;
18
18
 
19
- let defaultLanguageProperties;
20
- try {
21
- defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
22
- }
23
- catch (e) {}
19
+ let defaultLanguageProperties;
20
+ try {
21
+ defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
22
+ } catch (e) {
23
+ }
24
24
 
25
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
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
38
 
39
- return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
40
- };
39
+ return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
40
+ };
41
41
 
42
- /*
43
- * Returns the complete content of i18n-defaults.js file:
44
- * (1) the single text objects
45
- * (2) the export statement at the end of the file
46
- *
47
- * Example:
48
- * export {
49
- * ARIA_LABEL_CARD_CONTENT,
50
- * }
51
- */
52
- const getOutputFileContent = (properties, defaultLanguageProperties) => {
53
- const textKeys = Object.keys(properties);
54
- const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
42
+ /*
43
+ * Returns the complete content of i18n-defaults.js file:
44
+ * (1) the single text objects
45
+ * (2) the export statement at the end of the file
46
+ *
47
+ * Example:
48
+ * export {
49
+ * ARIA_LABEL_CARD_CONTENT,
50
+ * }
51
+ */
52
+ const getOutputFileContent = (properties, defaultLanguageProperties) => {
53
+ const textKeys = Object.keys(properties);
54
+ const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
55
55
 
56
- return `${texts}
56
+ return `${texts}
57
57
  export {${textKeys.join()}};`;
58
- };
59
-
60
- /*
61
- * Writes the i18n-defaults.js.
62
- */
63
- const writeI18nDefaultsFile = (file, content) => {
64
- fs.writeFile(file, content, (err) => {
65
- if (err) {
66
- return console.log(err);
67
- }
58
+ };
68
59
 
69
- console.log(`[i18n]: "${file}" file has been created`);
70
- });
60
+ await fs.mkdir(path.dirname(outputFile), { recursive: true });
61
+ await fs.writeFile(outputFile, getOutputFileContent(properties, defaultLanguageProperties));
71
62
  };
72
63
 
73
- mkdirp.sync(path.dirname(outputFile));
74
- writeI18nDefaultsFile(outputFile, getOutputFileContent(properties, defaultLanguageProperties));
64
+ generate().then(() => {
65
+ console.log("i18n default file generated.");
66
+ });
@@ -8,18 +8,16 @@
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
17
  const messagesBundles = path.normalize(`${process.argv[2]}/messagebundle_*.properties`);
20
18
  const messagesJSONDist = path.normalize(`${process.argv[3]}`);
21
19
 
22
- const convertToJSON = (file) => {
20
+ const convertToJSON = async (file) => {
23
21
  const properties = PropertiesReader(file)._properties;
24
22
  const filename = path.basename(file, path.extname(file));
25
23
  const language = filename.match(/^messagebundle_(.*?)$/)[1];
@@ -29,14 +27,17 @@ const messagesJSONDist = path.normalize(`${process.argv[3]}`);
29
27
  }
30
28
  const outputFile = path.normalize(`${messagesJSONDist}/${filename}.json`);
31
29
 
32
- fs.writeFileSync(outputFile, JSON.stringify(properties));
30
+ return fs.writeFile(outputFile, JSON.stringify(properties));
33
31
  // console.log(`[i18n]: "${filename}.json" has been generated!`);
34
32
  };
35
33
 
36
- mkdirp.sync(messagesJSONDist);
37
- glob(messagesBundles, {}, (err, files) => {
38
- if (err) {
39
- return console.log("No messagebundle files found!");
40
- }
41
- files.forEach(convertToJSON);
34
+ const generate = async () => {
35
+ const { globby } = await import("globby");
36
+ await fs.mkdir(messagesJSONDist, { recursive: true });
37
+ const files = await globby(messagesBundles);
38
+ return Promise.all(files.map(convertToJSON));
39
+ };
40
+
41
+ generate().then(() => {
42
+ console.log("Message bundle JSON files generated.");
42
43
  });
@@ -33,6 +33,8 @@
33
33
  *
34
34
  * native
35
35
  *
36
+ * noattribute
37
+ *
36
38
  * allowPreventDefault
37
39
  *
38
40
  * It furthermore listens to the following JSDoc3 events to implement additional functionality
@@ -2099,6 +2101,13 @@ exports.defineTags = function(dictionary) {
2099
2101
  doclet.native = true;
2100
2102
  }
2101
2103
  });
2104
+
2105
+ dictionary.defineTag('noattribute', {
2106
+ mustHaveValue: false,
2107
+ onTagged: function(doclet, tag) {
2108
+ doclet.noattribute = true;
2109
+ }
2110
+ });
2102
2111
  };
2103
2112
 
2104
2113
  exports.handlers = {
@@ -2804,6 +2804,10 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
2804
2804
  attrib("export", undefined, '', true);
2805
2805
  }
2806
2806
 
2807
+ if (member.noattribute) {
2808
+ attrib("noattribute", true);
2809
+ }
2810
+
2807
2811
  if (member.readonly) {
2808
2812
  attrib("readonly", member.readonly, null);
2809
2813
  }
@@ -2815,7 +2819,14 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
2815
2819
  if ( member.since ) {
2816
2820
  attrib("since", extractVersion(member.since));
2817
2821
  }
2818
- attrib("type", listTypes(member.type));
2822
+
2823
+ var type = listTypes(member.type);
2824
+ attrib("type", type);
2825
+
2826
+ if ((type === "object" || type === "Object") && visibility(member) === "public") {
2827
+ attrib("noattribute", true);
2828
+ }
2829
+
2819
2830
  tag("description", normalizeWS(member.description), true);
2820
2831
  if (member.defaultvalue) {
2821
2832
  attrib("defaultValue", member.defaultvalue);
@@ -3854,7 +3865,7 @@ function createAPIJS(symbols, filename) {
3854
3865
 
3855
3866
  var output = [];
3856
3867
 
3857
- var rkeywords = /^(?:abstract|as|boolean|break|byte|case|catch|char|class|continue|const|debugger|default|delete|do|double|else|enum|export|extends|false|final|finally|float|for|function|goto|if|implements|import|in|instanceof|int|interface|is|long|namespace|native|new|null|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|true|try|typeof|use|var|void|volatile|while|with)$/;
3868
+ var rkeywords = /^(?:abstract|as|boolean|break|byte|case|catch|char|class|continue|const|debugger|default|delete|do|double|else|enum|export|extends|false|final|finally|float|for|function|goto|if|implements|import|in|instanceof|int|interface|is|long|namespace|native|new|null|noattribute|package|private|protected|public|return|short|static|super|switch|synchronized|this|throw|throws|transient|true|try|typeof|use|var|void|volatile|while|with)$/;
3858
3869
 
3859
3870
  function isNoKeyword($) { return !rkeywords.test($.name); }
3860
3871
 
@@ -0,0 +1,178 @@
1
+ /*
2
+ The MIT License (MIT)
3
+
4
+ Copyright (c) 2016 Christian Murphy
5
+
6
+ Permission is hereby granted, free of charge, to any person obtaining a copy
7
+ of this software and associated documentation files (the "Software"), to deal
8
+ in the Software without restriction, including without limitation the rights
9
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
+ copies of the Software, and to permit persons to whom the Software is
11
+ furnished to do so, subject to the following conditions:
12
+
13
+ The above copyright notice and this permission notice shall be included in all
14
+ copies or substantial portions of the Software.
15
+
16
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22
+ SOFTWARE.
23
+ */
24
+
25
+ const parser = require('postcss-selector-parser');
26
+ const name = "postcss-combine-duplicated-selectors";
27
+
28
+ /**
29
+ * Ensure that attributes with different quotes match.
30
+ * @param {Object} selector - postcss selector node
31
+ */
32
+ function normalizeAttributes(selector) {
33
+ selector.walkAttributes((node) => {
34
+ if (node.value) {
35
+ // remove quotes
36
+ node.value = node.value.replace(/'|\\'|"|\\"/g, '');
37
+ }
38
+ });
39
+ }
40
+
41
+ /**
42
+ * Sort class and id groups alphabetically
43
+ * @param {Object} selector - postcss selector node
44
+ */
45
+ function sortGroups(selector) {
46
+ selector.each((subSelector) => {
47
+ subSelector.nodes.sort((a, b) => {
48
+ // different types cannot be sorted
49
+ if (a.type !== b.type) {
50
+ return 0;
51
+ }
52
+
53
+ // sort alphabetically
54
+ return a.value < b.value ? -1 : 1;
55
+ });
56
+ });
57
+
58
+ selector.sort((a, b) => (a.nodes.join('') < b.nodes.join('') ? -1 : 1));
59
+ }
60
+
61
+ /**
62
+ * Remove duplicated properties
63
+ * @param {Object} selector - postcss selector node
64
+ * @param {Boolean} exact
65
+ */
66
+ function removeDupProperties(selector, exact) {
67
+ if (!exact) { // Remove duplicated properties, regardless of value
68
+ const retainedProps = new Set();
69
+
70
+ for (let actIndex = selector.nodes.length - 1; actIndex >= 1; actIndex--) {
71
+ const prop = selector.nodes[actIndex].prop;
72
+ if (prop !== undefined) {
73
+ if (!retainedProps.has(prop)) {
74
+ retainedProps.add(prop); // Mark the prop as retained, all other occurrences must be removed
75
+ } else {
76
+ selector.nodes[actIndex].remove(); // This occurrence of the prop must be removed
77
+ }
78
+ }
79
+ }
80
+ } else {
81
+ // Remove duplicated properties from bottom to top ()
82
+ for (let actIndex = selector.nodes.length - 1; actIndex >= 1; actIndex--) {
83
+ for (let befIndex = actIndex - 1; befIndex >= 0; befIndex--) {
84
+ if (
85
+ selector.nodes[actIndex].prop === selector.nodes[befIndex].prop &&
86
+ selector.nodes[actIndex].value === selector.nodes[befIndex].value
87
+ ) {
88
+ selector.nodes[befIndex].remove();
89
+ actIndex--;
90
+ }
91
+ }
92
+ }
93
+ }
94
+ }
95
+
96
+ const uniformStyle = parser((selector) => {
97
+ normalizeAttributes(selector);
98
+ sortGroups(selector);
99
+ });
100
+
101
+ const defaultOptions = {
102
+ removeDuplicatedProperties: false,
103
+ };
104
+
105
+ module.exports = (options) => {
106
+ options = Object.assign({}, defaultOptions, options);
107
+ return {
108
+ postcssPlugin: name,
109
+ prepare() {
110
+ // Create a map to store maps
111
+ const mapTable = new Map();
112
+ // root map to store root selectors
113
+ mapTable.set('root', new Map());
114
+
115
+ return {
116
+ Rule: (rule) => {
117
+ let map;
118
+ // Check selector parent for any at rule
119
+ if (rule.parent.type === 'atrule') {
120
+ // Use name and query params as the key
121
+ const query =
122
+ rule.parent.name.toLowerCase() +
123
+ rule.parent.params.replace(/\s+/g, '');
124
+
125
+ // See if this query key is already in the map table
126
+ map = mapTable.has(query) ? // If it is use it
127
+ mapTable.get(query) : // if not set it and get it
128
+ mapTable.set(query, new Map()).get(query);
129
+ } else {
130
+ // Otherwise we are dealing with a selector in the root
131
+ map = mapTable.get('root');
132
+ }
133
+
134
+ // create a uniform selector
135
+ const selector = uniformStyle.processSync(rule.selector, {
136
+ lossless: false,
137
+ });
138
+
139
+ if (map.has(selector)) {
140
+ // store original rule as destination
141
+ const destination = map.get(selector);
142
+
143
+ // check if node has already been processed
144
+ if (destination === rule) return;
145
+
146
+ // move declarations to original rule
147
+ while (rule.nodes.length > 0) {
148
+ destination.append(rule.nodes[0]);
149
+ }
150
+ // remove duplicated rule
151
+ rule.remove();
152
+
153
+ if (
154
+ options.removeDuplicatedProperties ||
155
+ options.removeDuplicatedValues
156
+ ) {
157
+ removeDupProperties(
158
+ destination,
159
+ options.removeDuplicatedValues,
160
+ );
161
+ }
162
+ } else {
163
+ if (
164
+ options.removeDuplicatedProperties ||
165
+ options.removeDuplicatedValues
166
+ ) {
167
+ removeDupProperties(rule, options.removeDuplicatedValues);
168
+ }
169
+ // add new selector to symbol table
170
+ map.set(selector, rule);
171
+ }
172
+ },
173
+ };
174
+ },
175
+ };
176
+ };
177
+
178
+ module.exports.postcss = true;