@ui5/webcomponents-tools 0.0.0-f2abb18c2 → 0.0.0-f651a470c
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 +408 -4
- package/README.md +5 -6
- package/assets-meta.js +16 -1
- package/bin/dev.js +1 -5
- package/components-package/eslint.js +34 -0
- package/components-package/nps.js +103 -50
- package/components-package/postcss.components.js +13 -13
- package/components-package/postcss.themes.js +19 -16
- package/components-package/vite.config.js +13 -0
- package/components-package/wdio.js +393 -344
- package/components-package/wdio.sync.js +360 -0
- package/icons-collection/nps.js +51 -10
- package/lib/copy-and-watch/index.js +30 -5
- package/lib/copy-list/index.js +28 -0
- package/lib/create-icons/index.js +124 -52
- package/lib/create-illustrations/index.js +161 -0
- package/lib/create-new-component/index.js +108 -103
- package/lib/create-new-component/jsFileContentTemplate.js +77 -0
- package/lib/create-new-component/tsFileContentTemplate.js +84 -0
- package/lib/dev-server/dev-server.js +66 -0
- package/lib/dev-server/virtual-index-html-plugin.js +52 -0
- package/lib/esm-abs-to-rel/index.js +58 -0
- package/lib/generate-custom-elements-manifest/index.js +327 -0
- package/lib/generate-js-imports/illustrations.js +72 -0
- package/lib/generate-json-imports/i18n.js +75 -30
- package/lib/generate-json-imports/themes.js +62 -24
- package/lib/hbs2lit/src/compiler.js +20 -3
- package/lib/hbs2lit/src/includesReplacer.js +5 -5
- package/lib/hbs2lit/src/litVisitor2.js +77 -14
- package/lib/hbs2lit/src/svgProcessor.js +3 -3
- package/lib/hbs2ui5/RenderTemplates/LitRenderer.js +4 -11
- package/lib/hbs2ui5/index.js +37 -21
- package/lib/i18n/defaults.js +65 -57
- package/lib/i18n/toJSON.js +13 -12
- package/lib/jsdoc/configTypescript.json +29 -0
- package/lib/jsdoc/plugin.js +62 -1
- package/lib/jsdoc/preprocess.js +146 -0
- package/lib/jsdoc/template/publish.js +30 -2
- package/lib/postcss-combine-duplicated-selectors/index.js +178 -0
- package/lib/postcss-css-to-esm/index.js +64 -16
- package/lib/postcss-css-to-json/index.js +31 -11
- package/lib/postcss-new-files/index.js +36 -0
- package/lib/postcss-p/postcss-p.mjs +14 -0
- package/lib/replace-global-core/index.js +25 -0
- package/lib/scoping/get-all-tags.js +1 -8
- package/lib/scoping/lint-src.js +1 -1
- package/lib/scoping/missing-dependencies.js +65 -0
- package/lib/scoping/report-tags-usage.js +28 -0
- package/lib/scoping/scope-test-pages.js +1 -1
- package/lib/test-runner/test-runner.js +71 -0
- package/package.json +51 -53
- package/bin/init-ui5-package.js +0 -3
- package/components-package/rollup.js +0 -147
- package/components-package/serve.json +0 -3
- package/lib/documentation/index.js +0 -143
- 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 -40
- package/lib/documentation/templates/api-slots-section.js +0 -28
- package/lib/documentation/templates/template.js +0 -38
- package/lib/init-package/index.js +0 -123
- package/lib/init-package/resources/.eslintignore +0 -3
- package/lib/init-package/resources/bundle.es5.js +0 -25
- package/lib/init-package/resources/bundle.esm.js +0 -34
- package/lib/init-package/resources/config/.eslintrc.js +0 -1
- package/lib/init-package/resources/config/postcss.components/postcss.config.js +0 -1
- package/lib/init-package/resources/config/postcss.themes/postcss.config.js +0 -1
- package/lib/init-package/resources/config/rollup.config.js +0 -1
- package/lib/init-package/resources/config/wdio.conf.js +0 -1
- package/lib/init-package/resources/package-scripts.js +0 -11
- package/lib/init-package/resources/src/Assets.js +0 -5
- package/lib/init-package/resources/src/MyFirstComponent.hbs +0 -1
- package/lib/init-package/resources/src/MyFirstComponent.js +0 -56
- package/lib/init-package/resources/src/i18n/messagebundle.properties +0 -2
- package/lib/init-package/resources/src/i18n/messagebundle_de.properties +0 -1
- package/lib/init-package/resources/src/i18n/messagebundle_en.properties +0 -1
- package/lib/init-package/resources/src/i18n/messagebundle_es.properties +0 -1
- package/lib/init-package/resources/src/i18n/messagebundle_fr.properties +0 -1
- package/lib/init-package/resources/src/themes/MyFirstComponent.css +0 -11
- package/lib/init-package/resources/src/themes/sap_belize/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_belize_hcb/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_belize_hcw/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3_dark/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3_hcb/parameters-bundle.css +0 -3
- package/lib/init-package/resources/src/themes/sap_fiori_3_hcw/parameters-bundle.css +0 -3
- package/lib/init-package/resources/test/pages/index.html +0 -56
- package/lib/init-package/resources/test/specs/Demo.spec.js +0 -12
- package/package-lock.json +0 -48
package/lib/i18n/defaults.js
CHANGED
@@ -1,74 +1,82 @@
|
|
1
|
-
const fs = require('fs');
|
1
|
+
const fs = require('fs').promises;
|
2
2
|
const path = require('path');
|
3
3
|
const PropertiesReader = require('properties-reader');
|
4
|
-
const mkdirp = require("mkdirp");
|
5
4
|
const assets = require('../../assets-meta.js');
|
6
5
|
|
7
|
-
const
|
6
|
+
const generate = async () => {
|
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
|
9
|
+
const messageBundle = path.normalize(`${process.argv[2]}/messagebundle.properties`);
|
10
|
+
const messageBundleDefaultLanguage = path.normalize(`${process.argv[2]}/messagebundle_${defaultLanguage}.properties`);
|
11
|
+
const tsMode = process.env.UI5_TS === "true"; // In Typescript mode, we output .ts files and set the required types, otherwise - output pure .js files
|
12
12
|
|
13
|
-
|
14
|
-
return;
|
15
|
-
}
|
13
|
+
const outputFile = path.normalize(`${process.argv[3]}/i18n-defaults.${tsMode ? "ts": "js"}`);
|
16
14
|
|
17
|
-
|
15
|
+
if (!messageBundle || !outputFile) {
|
16
|
+
return;
|
17
|
+
}
|
18
18
|
|
19
|
-
|
20
|
-
try {
|
21
|
-
defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
|
22
|
-
}
|
23
|
-
catch (e) {}
|
19
|
+
const properties = PropertiesReader(messageBundle)._properties;
|
24
20
|
|
21
|
+
let defaultLanguageProperties;
|
22
|
+
try {
|
23
|
+
defaultLanguageProperties = PropertiesReader(messageBundleDefaultLanguage)._properties;
|
24
|
+
} catch (e) {
|
25
|
+
}
|
25
26
|
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
const getTextInfo = (key, value, defaultLanguageValue) => {
|
36
|
-
let effectiveValue = defaultLanguageValue || value;
|
37
|
-
effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
|
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
|
+
defaultLanguageProperties = Object.assign({}, defaultLanguageProperties, properties);
|
35
|
+
}
|
38
36
|
|
39
|
-
|
40
|
-
|
37
|
+
/*
|
38
|
+
* Returns the single text object to enable single export.
|
39
|
+
*
|
40
|
+
* Example:
|
41
|
+
* const ARIA_LABEL_CARD_CONTENT = {
|
42
|
+
* key: "ARIA_LABEL_CARD_CONTENT",
|
43
|
+
* defaultText: "Card Content",
|
44
|
+
* };
|
45
|
+
*/
|
46
|
+
const getTextInfo = (key, value, defaultLanguageValue) => {
|
47
|
+
let effectiveValue = defaultLanguageValue || value;
|
48
|
+
effectiveValue = effectiveValue.replace(/\"/g, "\\\""); // escape double quotes in translations
|
41
49
|
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
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('');
|
50
|
+
if (tsMode) {
|
51
|
+
return `const ${key}: I18nText = {key: "${key}", defaultText: "${effectiveValue}"};`;
|
52
|
+
}
|
53
|
+
return `const ${key} = {key: "${key}", defaultText: "${effectiveValue}"};`;
|
54
|
+
};
|
55
55
|
|
56
|
-
|
57
|
-
|
58
|
-
|
56
|
+
/*
|
57
|
+
* Returns the complete content of i18n-defaults.js file:
|
58
|
+
* (1) the single text objects
|
59
|
+
* (2) the export statement at the end of the file
|
60
|
+
*
|
61
|
+
* Example:
|
62
|
+
* export {
|
63
|
+
* ARIA_LABEL_CARD_CONTENT,
|
64
|
+
* }
|
65
|
+
*/
|
66
|
+
const getOutputFileContent = (properties, defaultLanguageProperties) => {
|
67
|
+
const textKeys = Object.keys(properties);
|
68
|
+
const texts = textKeys.map(prop => getTextInfo(prop, properties[prop], defaultLanguageProperties && defaultLanguageProperties[prop])).join('');
|
59
69
|
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
if (err) {
|
66
|
-
return console.log(err);
|
67
|
-
}
|
70
|
+
// tabs are intentionally mixed to have proper identation in the produced file
|
71
|
+
return `${tsMode ? `import { I18nText } from "@ui5/webcomponents-base/dist/i18nBundle.js";` : ""}
|
72
|
+
${texts}
|
73
|
+
export {${textKeys.join()}};`;
|
74
|
+
};
|
68
75
|
|
69
|
-
|
70
|
-
|
76
|
+
await fs.mkdir(path.dirname(outputFile), { recursive: true });
|
77
|
+
await fs.writeFile(outputFile, getOutputFileContent(properties, defaultLanguageProperties));
|
71
78
|
};
|
72
79
|
|
73
|
-
|
74
|
-
|
80
|
+
generate().then(() => {
|
81
|
+
console.log("i18n default file generated.");
|
82
|
+
});
|
package/lib/i18n/toJSON.js
CHANGED
@@ -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
|
-
|
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.
|
33
|
-
console.log(`[i18n]: "${filename}.json" has been generated!`);
|
30
|
+
return fs.writeFile(outputFile, JSON.stringify(properties));
|
31
|
+
// console.log(`[i18n]: "${filename}.json" has been generated!`);
|
34
32
|
};
|
35
33
|
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
34
|
+
const generate = async () => {
|
35
|
+
const { globby } = await import("globby");
|
36
|
+
await fs.mkdir(messagesJSONDist, { recursive: true });
|
37
|
+
const files = await globby(messagesBundles.replace(/\\/g, "/"));
|
38
|
+
return Promise.all(files.map(convertToJSON));
|
39
|
+
};
|
40
|
+
|
41
|
+
generate().then(() => {
|
42
|
+
console.log("Message bundle JSON files generated.");
|
42
43
|
});
|
@@ -0,0 +1,29 @@
|
|
1
|
+
{
|
2
|
+
"source": {
|
3
|
+
"include": "jsdoc-dist",
|
4
|
+
"excludePattern": "(/|\\\\)library-all\\.js|(/|\\\\).*-preload\\.js|^jquery-.*\\.js|^sap-.*\\.js|.+Renderer\\.lit\\.js|.*library\\.js|thirdparty"
|
5
|
+
},
|
6
|
+
"opts" : {
|
7
|
+
"recurse": true,
|
8
|
+
"template" : "template",
|
9
|
+
"destination": ""
|
10
|
+
},
|
11
|
+
"plugins": [
|
12
|
+
"./plugin.js"
|
13
|
+
],
|
14
|
+
"templates" : {
|
15
|
+
"ui5" : {
|
16
|
+
"variants": [
|
17
|
+
"apijson"
|
18
|
+
],
|
19
|
+
"version": "1.62",
|
20
|
+
"apiJsonFolder": "",
|
21
|
+
"apiJsonFile": "dist/api.json",
|
22
|
+
"includeSettingsInConstructor": false
|
23
|
+
}
|
24
|
+
},
|
25
|
+
"tags": {
|
26
|
+
"allowUnknownTags": true,
|
27
|
+
"dictionaries": ["jsdoc"]
|
28
|
+
}
|
29
|
+
}
|
package/lib/jsdoc/plugin.js
CHANGED
@@ -31,6 +31,16 @@
|
|
31
31
|
*
|
32
32
|
* tagname
|
33
33
|
*
|
34
|
+
* native
|
35
|
+
*
|
36
|
+
* noattribute
|
37
|
+
*
|
38
|
+
* formEvents
|
39
|
+
*
|
40
|
+
* formProperty
|
41
|
+
*
|
42
|
+
* allowPreventDefault
|
43
|
+
*
|
34
44
|
* It furthermore listens to the following JSDoc3 events to implement additional functionality
|
35
45
|
*
|
36
46
|
* parseBegin
|
@@ -2060,9 +2070,11 @@ exports.defineTags = function(dictionary) {
|
|
2060
2070
|
});
|
2061
2071
|
|
2062
2072
|
dictionary.defineTag('slot', {
|
2063
|
-
mustNotHaveValue: true,
|
2064
2073
|
onTagged: function(doclet, tag) {
|
2065
2074
|
doclet.slot = true;
|
2075
|
+
if (tag.value) {
|
2076
|
+
doclet.propertyName = tag.value;
|
2077
|
+
}
|
2066
2078
|
}
|
2067
2079
|
});
|
2068
2080
|
|
@@ -2079,6 +2091,55 @@ exports.defineTags = function(dictionary) {
|
|
2079
2091
|
doclet.tagname = tag.value;
|
2080
2092
|
}
|
2081
2093
|
});
|
2094
|
+
|
2095
|
+
dictionary.defineTag('allowPreventDefault', {
|
2096
|
+
mustHaveValue: false,
|
2097
|
+
onTagged: function(doclet, tag) {
|
2098
|
+
doclet.allowPreventDefault = true;
|
2099
|
+
}
|
2100
|
+
});
|
2101
|
+
|
2102
|
+
dictionary.defineTag('native', {
|
2103
|
+
mustHaveValue: false,
|
2104
|
+
onTagged: function(doclet, tag) {
|
2105
|
+
doclet.native = true;
|
2106
|
+
}
|
2107
|
+
});
|
2108
|
+
|
2109
|
+
dictionary.defineTag('noattribute', {
|
2110
|
+
mustHaveValue: false,
|
2111
|
+
onTagged: function(doclet, tag) {
|
2112
|
+
doclet.noattribute = true;
|
2113
|
+
}
|
2114
|
+
});
|
2115
|
+
|
2116
|
+
dictionary.defineTag('formEvents', {
|
2117
|
+
mustHaveValue: false,
|
2118
|
+
onTagged: function(doclet, tag) {
|
2119
|
+
if (tag.value) {
|
2120
|
+
doclet.formEvents = doclet.formEvents || [];
|
2121
|
+
tag.value.split(" ").forEach(function($) {
|
2122
|
+
if ( doclet.formEvents.indexOf($) < 0 ) {
|
2123
|
+
doclet.formEvents.push($);
|
2124
|
+
}
|
2125
|
+
});
|
2126
|
+
}
|
2127
|
+
}
|
2128
|
+
});
|
2129
|
+
|
2130
|
+
dictionary.defineTag('formProperty', {
|
2131
|
+
mustHaveValue: false,
|
2132
|
+
onTagged: function(doclet, tag) {
|
2133
|
+
doclet.formProperty = true;
|
2134
|
+
}
|
2135
|
+
});
|
2136
|
+
|
2137
|
+
dictionary.defineTag('formAssociated', {
|
2138
|
+
mustHaveValue: false,
|
2139
|
+
onTagged: function(doclet, tag) {
|
2140
|
+
doclet.formAssociated = doclet.formAssociated || true;
|
2141
|
+
}
|
2142
|
+
});
|
2082
2143
|
};
|
2083
2144
|
|
2084
2145
|
exports.handlers = {
|
@@ -0,0 +1,146 @@
|
|
1
|
+
const process = require("process");
|
2
|
+
const path = require("path");
|
3
|
+
const fs = require("fs/promises");
|
4
|
+
|
5
|
+
const inputDir = process.argv[2];
|
6
|
+
const sourceDir = process.argv[3];
|
7
|
+
|
8
|
+
const preprocessTypes = async () => {
|
9
|
+
try {
|
10
|
+
const { globby } = await import("globby");
|
11
|
+
const fileNames = await globby(inputDir.replace(/\\/g, "/") + "**/types/*.js");
|
12
|
+
|
13
|
+
return Promise.all(fileNames.map(processTypeFile));
|
14
|
+
} catch(e) {
|
15
|
+
console.log("JSDoc types preprocess failed: ", e);
|
16
|
+
}
|
17
|
+
};
|
18
|
+
|
19
|
+
const processTypeFile = async (fileName) => {
|
20
|
+
let fileContent = `${await fs.readFile(fileName)}`;
|
21
|
+
|
22
|
+
const re = new RegExp(`(\\/\\*\\*\\s*\\n([^\\*]|(\\*(?!\\/)))*\\*\\/)\\s+[\\w\\d]+\\[\\"([\\w\\d]+)\\"\\]\\s*=\\s*\\"([\\w\\d]+)\\";`, "gm")
|
23
|
+
let matches = [...fileContent.matchAll(re)];
|
24
|
+
|
25
|
+
// Get all type values
|
26
|
+
const typeData = matches.map(match => {
|
27
|
+
return {
|
28
|
+
comment: match[1],
|
29
|
+
key: match[4],
|
30
|
+
value: match[5],
|
31
|
+
};
|
32
|
+
});
|
33
|
+
if (typeData.length === 0) {
|
34
|
+
return;
|
35
|
+
}
|
36
|
+
|
37
|
+
const typeName = path.parse(fileName).name;
|
38
|
+
|
39
|
+
matches = fileContent.match(/\/\*\*\s*\n([^\*]|(\*(?!\/)))*\*\//gm);
|
40
|
+
const comment = matches[0];
|
41
|
+
|
42
|
+
const propsCode = typeData.map(item => {
|
43
|
+
return `${item.comment}\n get ${item.key}() { return "${item.value}"; }`;
|
44
|
+
}).join("\n");
|
45
|
+
|
46
|
+
const newClassCode = `
|
47
|
+
${comment}
|
48
|
+
class ${typeName} {
|
49
|
+
${propsCode}
|
50
|
+
};
|
51
|
+
|
52
|
+
export default ${typeName};`;
|
53
|
+
|
54
|
+
fileContent = newClassCode;
|
55
|
+
|
56
|
+
return fs.writeFile(fileName, fileContent);
|
57
|
+
};
|
58
|
+
|
59
|
+
const preprocessComponents = async () => {
|
60
|
+
if (!sourceDir) {
|
61
|
+
return; // if the second param was not passed, there are no components
|
62
|
+
}
|
63
|
+
|
64
|
+
try {
|
65
|
+
const { globby } = await import("globby");
|
66
|
+
const fileNames = await globby(sourceDir.replace(/\\/g, "/") + "/*.ts");
|
67
|
+
|
68
|
+
return Promise.all(fileNames.map(processComponentFile));
|
69
|
+
} catch(e) {
|
70
|
+
console.log("JSDoc components preprocess failed: ", e);
|
71
|
+
}
|
72
|
+
};
|
73
|
+
|
74
|
+
const isClass = text => {
|
75
|
+
return text.includes("@abstract") || text.includes("@class");
|
76
|
+
};
|
77
|
+
|
78
|
+
const isAnnotationComment = (comment) => {
|
79
|
+
return comment.includes("@name");
|
80
|
+
}
|
81
|
+
|
82
|
+
const processComponentFile = async (fileName) => {
|
83
|
+
// source file (src/*.ts)
|
84
|
+
let tsFileContent = `${await fs.readFile(fileName)}`;
|
85
|
+
|
86
|
+
// Skip all non-component files
|
87
|
+
if (!isClass(tsFileContent)) {
|
88
|
+
return;
|
89
|
+
}
|
90
|
+
|
91
|
+
// Gather all JSDocs from the original .ts file
|
92
|
+
const allJSDocsRegExp = new RegExp(`\\/\\*\\*(.|\\n)+?\\s+\\*\\/`, "gm");
|
93
|
+
let allJSDocs = [...tsFileContent.matchAll(allJSDocsRegExp)];
|
94
|
+
allJSDocs = allJSDocs.map(match => match[0]); // all /** ..... */ comments
|
95
|
+
|
96
|
+
// Find where the class is defined in the original file
|
97
|
+
const tsClassDefinitionRegExp = new RegExp(`^(abstract\\s)?class [\\w\\d_]+`, "gm");
|
98
|
+
let tsClassDefinitionMatch = tsFileContent.match(tsClassDefinitionRegExp);
|
99
|
+
if (!tsClassDefinitionMatch) {
|
100
|
+
return; // no class defined in this .ts file
|
101
|
+
}
|
102
|
+
const tsClassDefinition = tsClassDefinitionMatch[0];
|
103
|
+
const tsClassDefinitionIndex = tsFileContent.indexOf(tsClassDefinition);
|
104
|
+
|
105
|
+
// Gather all JSDocs that are before the class definition (except for the @class one)
|
106
|
+
const JSDocsToAppend = [];
|
107
|
+
allJSDocs.forEach(JSDoc => {
|
108
|
+
if (!isClass(JSDoc) && (tsFileContent.indexOf(JSDoc) < tsClassDefinitionIndex || isAnnotationComment(JSDoc, tsFileContent))) {
|
109
|
+
JSDocsToAppend.push(JSDoc);
|
110
|
+
}
|
111
|
+
});
|
112
|
+
|
113
|
+
|
114
|
+
|
115
|
+
// destination file (jsdoc-dist/*.js)
|
116
|
+
const destFileName = fileName.replace(sourceDir, inputDir).replace(/\.ts$/, ".js");
|
117
|
+
let jsFileContent = `${await fs.readFile(destFileName)}`;
|
118
|
+
|
119
|
+
const classDefinitionRegExp = new RegExp(`let.*? = class`, "gm");
|
120
|
+
let classDefinitionMatch = jsFileContent.match(classDefinitionRegExp);
|
121
|
+
if (!classDefinitionMatch) {
|
122
|
+
return; // not a file, generated by typescript, nothing to do here
|
123
|
+
}
|
124
|
+
|
125
|
+
const classDefinition = classDefinitionMatch[0];
|
126
|
+
const classDefinitionIndex = jsFileContent.indexOf(classDefinition); // classDefinitionIndex is the position in the file where the class is defined
|
127
|
+
|
128
|
+
// All comments before the class definition, except for the @class comment, must be removed
|
129
|
+
allJSDocs.forEach(JSDoc => {
|
130
|
+
if (!isClass(JSDoc) && jsFileContent.indexOf(JSDoc) < classDefinitionIndex) {
|
131
|
+
jsFileContent = jsFileContent.replace(JSDoc, "");
|
132
|
+
}
|
133
|
+
});
|
134
|
+
|
135
|
+
// Put all other comments at the end of the file
|
136
|
+
jsFileContent = jsFileContent + "\n\n" + JSDocsToAppend.join("\n\n");
|
137
|
+
return fs.writeFile(destFileName, jsFileContent);
|
138
|
+
};
|
139
|
+
|
140
|
+
Promise.all([
|
141
|
+
preprocessTypes(),
|
142
|
+
preprocessComponents(),
|
143
|
+
]).then(() => {
|
144
|
+
console.log("JSDoc preprocess ready.");
|
145
|
+
});
|
146
|
+
|
@@ -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,22 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
|
|
2815
2819
|
if ( member.since ) {
|
2816
2820
|
attrib("since", extractVersion(member.since));
|
2817
2821
|
}
|
2818
|
-
|
2822
|
+
|
2823
|
+
if ( member.formEvents ) {
|
2824
|
+
attrib("formEvents", member.formEvents);
|
2825
|
+
}
|
2826
|
+
|
2827
|
+
if ( member.formEvents ) {
|
2828
|
+
attrib("formProperty", member.formProperty);
|
2829
|
+
}
|
2830
|
+
|
2831
|
+
var type = listTypes(member.type);
|
2832
|
+
attrib("type", type);
|
2833
|
+
|
2834
|
+
if ((type === "object" || type === "Object") && visibility(member) === "public") {
|
2835
|
+
attrib("noattribute", true);
|
2836
|
+
}
|
2837
|
+
|
2819
2838
|
tag("description", normalizeWS(member.description), true);
|
2820
2839
|
if (member.defaultvalue) {
|
2821
2840
|
attrib("defaultValue", member.defaultvalue);
|
@@ -2838,6 +2857,9 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
|
|
2838
2857
|
if (member.slot) {
|
2839
2858
|
tag("property");
|
2840
2859
|
attrib("name", member.name);
|
2860
|
+
if (member.propertyName) {
|
2861
|
+
attrib("propertyName", member.propertyName);
|
2862
|
+
}
|
2841
2863
|
if (member.__ui5.module && member.__ui5.module !== symbol.__ui5.module) {
|
2842
2864
|
attrib("module", member.__ui5.module);
|
2843
2865
|
attrib("export", undefined, '', true);
|
@@ -2879,6 +2901,12 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
|
|
2879
2901
|
attrib("module", member.__ui5.module);
|
2880
2902
|
attrib("export", undefined, '', true);
|
2881
2903
|
}
|
2904
|
+
if (member.allowPreventDefault) {
|
2905
|
+
attrib("allowPreventDefault", true);
|
2906
|
+
}
|
2907
|
+
if (member.native) {
|
2908
|
+
attrib("native", true);
|
2909
|
+
}
|
2882
2910
|
attrib("visibility", visibility(member), 'public');
|
2883
2911
|
if ( member.scope === 'static' ) {
|
2884
2912
|
attrib("static", true, false, /* raw = */true);
|
@@ -3845,7 +3873,7 @@ function createAPIJS(symbols, filename) {
|
|
3845
3873
|
|
3846
3874
|
var output = [];
|
3847
3875
|
|
3848
|
-
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)$/;
|
3876
|
+
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|formEvents|formProperty|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)$/;
|
3849
3877
|
|
3850
3878
|
function isNoKeyword($) { return !rkeywords.test($.name); }
|
3851
3879
|
|
@@ -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;
|