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

package/lib/create-icons/index.js

@@ -1,56 +1,76 @@
-const fs = require("fs");
-const path = require("path");
-const mkdirp = require("mkdirp");
-
-const collectionName = process.argv[2] || "SAP-icons";
-const srcFile = path.normalize(`src/${collectionName}.json`);
-const destDir = path.normalize("dist/");
-
-mkdirp.sync(destDir);
-
-const template = (name, pathData, ltr, collection) => `import { registerIcon } from "@ui5/webcomponents-base/dist/SVGIconRegistry.js";
-
-const name = "${name}";
-const pathData = "${pathData}";
-const ltr = ${ltr};
-const collection = "${collection}";
-
-registerIcon(name, { pathData, ltr, collection});
-
-export default { pathData };`;
-
-
-const accTemplate = (name, pathData, ltr, accData, collection) => `import { registerIcon } from "@ui5/webcomponents-base/dist/SVGIconRegistry.js";
-import { ${accData.key} } from "./generated/i18n/i18n-defaults.js";
-
-const name = "${name}";
-const pathData = "${pathData}";
-const ltr = ${ltr};
-const accData = ${accData.key};
-const collection = "${collection}";
-
-registerIcon(name, { pathData, ltr, accData, collection });
-
-export default { pathData, accData };`;
-
-const svgTemplate = (pathData) => `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-	<path d="${pathData}"/>
-</svg>`;
-
-const createIcons = (file) => {
-	const json = JSON.parse(fs.readFileSync(file));
-
-	for (let name in json.data) {
-		const iconData = json.data[name];
-		const pathData = iconData.path;
-		const ltr = !!iconData.ltr;
-		const acc = iconData.acc;
-
-		const content = acc ? accTemplate(name, pathData, ltr, acc, json.collection) : template(name, pathData, ltr, json.collection);
-
-		fs.writeFileSync(path.join(destDir, `${name}.js`), content);
-		fs.writeFileSync(path.join(destDir, `${name}.svg`), svgTemplate(pathData));
-	}
-};
-
-createIcons(srcFile);
+const fs = require("fs").promises;
+const path = require("path");
+
+const collectionName = process.argv[2] || "SAP-icons";
+const collectionVersion = process.argv[3];
+const srcFile = collectionVersion ? path.normalize(`src/${collectionVersion}/${collectionName}.json`) : path.normalize(`src/${collectionName}.json`);
+const destDir = collectionVersion ? path.normalize(`dist/${collectionVersion}/`) : path.normalize("dist/");
+
+const iconTemplate = (name, pathData, ltr, collection, packageName) => `import { registerIcon } from "@ui5/webcomponents-base/dist/asset-registries/Icons.js";
+
+const name = "${name}";
+const pathData = "${pathData}";
+const ltr = ${ltr};
+const collection = "${collection}";
+const packageName = "${packageName}";
+
+registerIcon(name, { pathData, ltr, collection, packageName });
+
+export default { pathData };`;
+
+
+const iconAccTemplate = (name, pathData, ltr, accData, collection, packageName) => `import { registerIcon } from "@ui5/webcomponents-base/dist/asset-registries/Icons.js";
+import { ${accData.key} } from "../generated/i18n/i18n-defaults.js";
+
+const name = "${name}";
+const pathData = "${pathData}";
+const ltr = ${ltr};
+const accData = ${accData.key};
+const collection = "${collection}";
+const packageName = "${packageName}";
+
+registerIcon(name, { pathData, ltr, accData, collection, packageName });
+
+export default { pathData, accData };`;
+
+
+
+const collectionTemplate = (name) => `import { isThemeFamily } from "@ui5/webcomponents-base/dist/config/Theme.js";
+import pathDataV4 from "./v5/${name}.js";
+import pathDataV5 from "./v4/${name}.js";
+const pathData = isThemeFamily("sap_horizon") ? pathDataV5 : pathDataV4;
+export default { pathData };`;
+
+
+const svgTemplate = (pathData) => `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+	<path d="${pathData}"/>
+</svg>`;
+
+const createIcons = async (file) => {
+	await fs.mkdir(destDir, { recursive: true });
+
+	const json = JSON.parse(await fs.readFile(file));
+
+	const promises = [];
+	for (let name in json.data) {
+		const iconData = json.data[name];
+		const pathData = iconData.path;
+		const ltr = !!iconData.ltr;
+		const acc = iconData.acc;
+
+		const content = acc ? iconAccTemplate(name, pathData, ltr, acc, json.collection, json.packageName) : iconTemplate(name, pathData, ltr, json.collection, json.packageName);
+
+		promises.push(fs.writeFile(path.join(destDir, `${name}.js`), content));
+		promises.push(fs.writeFile(path.join(destDir, `${name}.svg`), svgTemplate(pathData)));
+
+		if (json.version) {
+			promises.push(fs.writeFile(path.join(path.normalize("dist/"), `${name}.js`), collectionTemplate(name)));
+		}
+	}
+
+	return Promise.all(promises);
+};
+
+createIcons(srcFile).then(() => {
+	console.log("Icons created.");
+});

package/lib/create-illustrations/index.js

@@ -0,0 +1,161 @@
+const fs = require("fs").promises;
+const path = require("path");
+
+if (process.argv.length < 7) {
+	throw new Error("Not enough arguments");
+}
+
+const generate = async () => {
+
+	const ORIGINAL_TEXTS = {
+		UnableToLoad: "UnableToLoad",
+		UnableToUpload: "UnableToUpload",
+		NoActivities: "NoActivities",
+		BeforeSearch: "BeforeSearch",
+		NoSearchResults: "NoSearchResults",
+		NoEntries: "NoEntries",
+		NoData: "NoData",
+		NoNotifications: "NoNotifications",
+		BalloonSky: "BalloonSky",
+		SuccessScreen: "SuccessScreen",
+		NoMail: "NoMail",
+		NoSavedItems: "NoSavedItems",
+		NoTasks: "NoTasks"
+	};
+
+	const FALLBACK_TEXTS = {
+		ReloadScreen: ORIGINAL_TEXTS.UnableToLoad,
+		Connection: ORIGINAL_TEXTS.UnableToLoad,
+		ErrorScreen: ORIGINAL_TEXTS.UnableToUpload,
+		EmptyCalendar: ORIGINAL_TEXTS.NoActivities,
+		SearchEarth: ORIGINAL_TEXTS.BeforeSearch,
+		SearchFolder: ORIGINAL_TEXTS.NoSearchResults,
+		EmptyList: ORIGINAL_TEXTS.NoEntries,
+		Tent: ORIGINAL_TEXTS.NoData,
+		SleepingBell: ORIGINAL_TEXTS.NoNotifications,
+		SimpleBalloon: ORIGINAL_TEXTS.BalloonSky,
+		SimpleBell: ORIGINAL_TEXTS.NoNotifications,
+		SimpleCalendar: ORIGINAL_TEXTS.NoActivities,
+		SimpleCheckMark: ORIGINAL_TEXTS.SuccessScreen,
+		SimpleConnection: ORIGINAL_TEXTS.UnableToLoad,
+		SimpleEmptyDoc: ORIGINAL_TEXTS.NoData,
+		SimpleEmptyList: ORIGINAL_TEXTS.NoEntries,
+		SimpleError: ORIGINAL_TEXTS.UnableToUpload,
+		SimpleMagnifier: ORIGINAL_TEXTS.BeforeSearch,
+		SimpleMail: ORIGINAL_TEXTS.NoMail,
+		SimpleNoSavedItems: ORIGINAL_TEXTS.NoSavedItems,
+		SimpleNotFoundMagnifier: ORIGINAL_TEXTS.NoSearchResults,
+		SimpleReload: ORIGINAL_TEXTS.UnableToLoad,
+		SimpleTask: ORIGINAL_TEXTS.NoTasks,
+		SuccessBalloon: ORIGINAL_TEXTS.BalloonSky,
+		SuccessCheckMark: ORIGINAL_TEXTS.SuccessScreen,
+		SuccessHighFive: ORIGINAL_TEXTS.BalloonSky
+	};
+
+	const srcPath = process.argv[2];
+	const defaultText = process.argv[3] === "true";
+	const illustrationsPrefix = process.argv[4];
+	const illustrationSet = process.argv[5];
+	const destPath = process.argv[6];
+	const fileNamePattern = new RegExp(`${illustrationsPrefix}-.+-(.+).svg`);
+// collect each illustration name because each one should have Sample.js file
+	const fileNames = new Set();
+
+	const svgImportTemplate = svgContent => {
+		return `export default \`${svgContent}\`;`
+	};
+	const svgToJs = async fileName => {
+		const svg = await fs.readFile(path.join(srcPath, fileName), {encoding: "utf-8"});
+		const fileContent = svgImportTemplate(svg);
+		fileName = fileName.replace(/\.svg$/, ".js");
+
+		return fs.writeFile(path.join(destPath, fileName), fileContent);
+	};
+	const illustrationImportTemplate = illustrationName => {
+		let illustrationNameForTranslation = illustrationName;
+
+		if (defaultText) {
+			if (FALLBACK_TEXTS[illustrationNameForTranslation]) {
+				illustrationNameForTranslation = FALLBACK_TEXTS[illustrationNameForTranslation];
+			} else if (illustrationName.indexOf("_v") !== -1) {
+				illustrationNameForTranslation = illustrationNameForTranslation.substr(0, illustrationNameForTranslation.indexOf('_v'));
+			}
+		}
+
+		const illustrationNameUpperCase = illustrationNameForTranslation.toUpperCase();
+
+		return defaultText ? `import { registerIllustration } from "@ui5/webcomponents-base/dist/asset-registries/Illustrations.js";
+import dialogSvg from "./${illustrationsPrefix}-Dialog-${illustrationName}.js";
+import sceneSvg from "./${illustrationsPrefix}-Scene-${illustrationName}.js";
+import spotSvg from "./${illustrationsPrefix}-Spot-${illustrationName}.js";
+import {
+	IM_TITLE_${illustrationNameUpperCase},
+	IM_SUBTITLE_${illustrationNameUpperCase},
+} from "../generated/i18n/i18n-defaults.js";
+
+const name = "${illustrationName}";
+const set = "${illustrationSet}";
+const title = IM_TITLE_${illustrationNameUpperCase};
+const subtitle = IM_SUBTITLE_${illustrationNameUpperCase};
+
+registerIllustration(name, {
+	dialogSvg,
+	sceneSvg,
+	spotSvg,
+	title,
+	subtitle,
+	set,
+});
+
+export {
+	dialogSvg,
+	sceneSvg,
+	spotSvg,
+};` :
+			`import { registerIllustration } from "@ui5/webcomponents-base/dist/asset-registries/Illustrations.js";
+import dialogSvg from "./${illustrationsPrefix}-Dialog-${illustrationName}.js";
+import sceneSvg from "./${illustrationsPrefix}-Scene-${illustrationName}.js";
+import spotSvg from "./${illustrationsPrefix}-Spot-${illustrationName}.js";
+
+const name = "${illustrationName}";
+const set = "${illustrationSet}";
+
+registerIllustration(name, {
+	dialogSvg,
+	sceneSvg,
+	spotSvg,
+	set,
+});
+
+export {
+	dialogSvg,
+	sceneSvg,
+	spotSvg,
+};`
+	};
+
+	await fs.mkdir(destPath, { recursive: true });
+
+	const illustrationFileNames = await fs.readdir(path.normalize(srcPath));
+
+	// convert SVG to JS imports
+	const promises = [];
+	illustrationFileNames.forEach(illustration => {
+		if (fileNamePattern.test(illustration)) {
+			let [fileName, illustrationName] = illustration.match(fileNamePattern);
+
+			promises.push(svgToJs(fileName));
+			fileNames.add(illustrationName);
+		}
+	});
+
+	for (let illustrationName of fileNames) {
+		promises.push(fs.writeFile(path.join(destPath, `${illustrationName}.js`), illustrationImportTemplate(illustrationName)));
+	}
+
+	return Promise.all(promises);
+};
+
+generate().then(() => {
+	console.log("Illustrations generated.");
+});

package/lib/create-new-component/index.js

@@ -139,8 +139,16 @@ console.log(`Successfully generated ${componentName}.js`);
 console.log(`Successfully generated ${componentName}.css`);
 console.log(`Successfully generated ${componentName}.hbs`);
 
+const bundleLogger = fs.createWriteStream("./bundle.common.js", {
+	flags: "a" // appending
+});
+
+bundleLogger.write(`
+// TODO: Move this line in order to keep the file sorted alphabetically
+import ${componentName} from "./dist/${componentName}.js";`);
+
 // Change the color of the output
-console.warn('\x1b[33m%s\x1b[0m', `
-Please import the generated component in bundle.esm.js:
-import ${componentName} from "./dist/${componentName}.js";
-`);
+	console.warn('\x1b[33m%s\x1b[0m', `
+Component is imported in bundle.common.js.
+Do NOT forget to sort the file in alphabeticall order.
+`);

package/lib/documentation/index.js

@@ -7,149 +7,162 @@ const eventsTemplate = require('./templates/api-events-section').template;
 const methodsTemplate = require('./templates/api-methods-section').template;
 const cssVariablesTemplate = require('./templates/api-css-variables-section').template;
 const Handlebars = require('handlebars/dist/handlebars.min.js');
-const fs = require('fs');
+const fs = require('fs').promises;
 const path = require('path');
-const mkdirp = require('mkdirp');
+const beautify = require("json-beautify");
 
-const api = JSON.parse(fs.readFileSync(path.normalize(process.argv[2])));
+const generate = async () => {
 
-const entries = api['symbols'];
-const compiledHandlebars = Handlebars.compile(template);
-const compiledSinceTemplate = Handlebars.compile(sinceTemplate);
-const linkMatcher = /{@link(\s)(\w+)\s*}/gi;
-const sinceMarker = "<!--since_tag_marker-->";
+	const apiJSONPath = path.normalize(process.argv[2]);
+	const api = JSON.parse(await fs.readFile(apiJSONPath));
 
-const getComponentByName = name => {
-	return entries.find(element => {
-		return element.basename === name;
-	})
-};
+	await fs.writeFile(apiJSONPath, beautify(api, null, 2, 100));
 
-const getCSSVarsByName = name => {
-	return cssVariables[name] || [];
-};
+	const entries = api['symbols'];
+	const compiledHandlebars = Handlebars.compile(template);
+	const compiledSinceTemplate = Handlebars.compile(sinceTemplate);
+	const linkMatcher = /{@link(\s)(\w+)\s*}/gi;
+	const sinceMarker = "<!--since_tag_marker-->";
 
-const capitalize = str => {
-	return str.replace(/^./, str => str.toUpperCase());
-};
+	const getComponentByName = name => {
+		return entries.find(element => {
+			return element.basename === name;
+		})
+	};
 
-Handlebars.registerHelper('toLowerCase', function (str) {
-	return str ? str.toLowerCase() : "";
-});
+	const getCSSVarsByName = name => {
+		return cssVariables[name] || [];
+	};
 
-Handlebars.registerHelper('toKebabCase', function (str) {
-	const kebab = str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-	return kebab !== str ? kebab : undefined;
-});
+	const capitalize = str => {
+		return str.replace(/^./, str => str.toUpperCase());
+	};
 
-Handlebars.registerHelper('checkEven', function (iIndex) {
-	return (iIndex % 2 === 0) ? "api-table-roll-even" : "api-table-roll-odd";
-});
+	Handlebars.registerHelper('toLowerCase', function (str) {
+		return str ? str.toLowerCase() : "";
+	});
 
-Handlebars.registerPartial('properties', propertiesTemplate);
-Handlebars.registerPartial('slots', slotsTemplate);
-Handlebars.registerPartial('events', eventsTemplate);
-Handlebars.registerPartial('methods', methodsTemplate);
-Handlebars.registerPartial('cssVariables', cssVariablesTemplate);
+	Handlebars.registerHelper('toKebabCase', function (str) {
+		const kebab = str.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+		return kebab !== str ? kebab : undefined;
+	});
 
-mkdirp.sync(`dist/test-resources/api`);
+	Handlebars.registerHelper('checkEven', function (iIndex) {
+		return (iIndex % 2 === 0) ? "api-table-roll-even" : "api-table-roll-odd";
+	});
 
-let entriesAPI = [];
+	Handlebars.registerPartial('properties', propertiesTemplate);
+	Handlebars.registerPartial('slots', slotsTemplate);
+	Handlebars.registerPartial('events', eventsTemplate);
+	Handlebars.registerPartial('methods', methodsTemplate);
+	Handlebars.registerPartial('cssVariables', cssVariablesTemplate);
 
-const appendCSSVarsAPI = entry => {
-	entry.cssVariables = getCSSVarsByName(entry.basename);
-	return entry;
-}
+	await fs.mkdir(`dist/test-resources/api`, { recursive: true });
 
-const componentHasEntityItem = (component, entity, name) => {
-	return component[entity].some(x => x && x.name === name);
-};
-const removeEmpty = arr => arr.filter(x => x);
+	let entriesAPI = [];
 
-const calculateAPI = component => {
-	if (entriesAPI.indexOf(component.basename) !== -1) {
-		return component;
+	const appendCSSVarsAPI = entry => {
+		entry.cssVariables = getCSSVarsByName(entry.basename);
+		return entry;
 	}
-	const entities = ["properties", "slots", "events", "methods", "cssVariables"];
 
-	// Initialize all entities with [] if necessary, and remove undefined things, and only leave public things
-	entities.forEach(entity => {
-		component[entity] = removeEmpty(component[entity] || []).filter(x => x.visibility === "public");
-	});
+	const componentHasEntityItem = (component, entity, name) => {
+		return component[entity].some(x => x && x.name === name);
+	};
+	const removeEmpty = arr => arr.filter(x => x);
 
-	component = appendCSSVarsAPI(component);
+	const calculateAPI = component => {
+		if (entriesAPI.indexOf(component.basename) !== -1) {
+			return component;
+		}
+		const entities = ["properties", "slots", "events", "methods", "cssVariables"];
 
-	let parent = getComponentByName(component.extends);
-	if (parent) {
-		let parentComponent = calculateAPI(parent);
+		// Initialize all entities with [] if necessary, and remove undefined things, and only leave public things
 		entities.forEach(entity => {
-			parentComponent[entity].forEach( x => {
-				if (!componentHasEntityItem(component, entity, x.name)) {
-					component[entity].push(x);
-				}
-			});
+			component[entity] = removeEmpty(component[entity] || []).filter(x => x.visibility === "public");
 		});
-	}
 
-	entriesAPI.push(component.basename);
+		component = appendCSSVarsAPI(component);
+
+		let parent = getComponentByName(component.extends);
+		if (parent) {
+			let parentComponent = calculateAPI(parent);
+			entities.forEach(entity => {
+				parentComponent[entity].forEach(x => {
+					if (!componentHasEntityItem(component, entity, x.name)) {
+						component[entity].push(x);
+					}
+				});
+			});
+		}
+
+		entriesAPI.push(component.basename);
 
-	return component;
-};
+		return component;
+	};
 
-const appendAdditionalEntriesAPI = entry => {
-	if (entry.appenddocs) {
-		const additionalEntries = entry.appenddocs.split(" ");
-		entry.additionalDocs = [];
+	const appendAdditionalEntriesAPI = entry => {
+		if (entry.appenddocs) {
+			const additionalEntries = entry.appenddocs.split(" ");
+			entry.additionalDocs = [];
 
-		additionalEntries.forEach(entryName => {
-			let additionalEntry = getComponentByName(entryName);
-			additionalEntry = calculateAPI(additionalEntry);
-			entry.additionalDocs.push(additionalEntry);
-		});
-	}
+			additionalEntries.forEach(entryName => {
+				let additionalEntry = getComponentByName(entryName);
+				additionalEntry = calculateAPI(additionalEntry);
+				entry.additionalDocs.push(additionalEntry);
+			});
+		}
 
-	return entry;
-}
+		return entry;
+	}
 
-const generateSamplePage = entry => {
-	let content = "";
+	const generateSamplePage = async entry => {
+		let content = "";
 
-	try {
-		content = fs.readFileSync(`dist/test-resources/samples/${capitalize(entry.basename)}.sample.html`, 'utf8');
-	} catch (err) { }
+		try {
+			content = await fs.readFile(`dist/test-resources/samples/${capitalize(entry.basename)}.sample.html`, 'utf8');
+		} catch (err) {
+		}
 
-	if (content) {
-		const APIReference = compiledHandlebars(entry).replace(/\[\]/g, " [0..n]");
-		const EntitySince = compiledSinceTemplate(entry).replace(/\[\]/g, " [0..n]");
+		if (content) {
+			entry.slots.forEach(slotData => {
+				if (!slotData.type.startsWith("Node") && !slotData.type.startsWith("HTMLElement")) { // interface -> don't show in documentation
+					slotData.type = "HTMLElement" + (slotData.type.endsWith("[]") ? "[]" : "");
+				}
+			});
+			const APIReference = compiledHandlebars(entry).replace(/\[\]/g, " [0..n]");
+			const EntitySince = compiledSinceTemplate(entry).replace(/\[\]/g, " [0..n]");
 
-		content = content.replace('<!-- JSDoc marker -->', APIReference);
-		content = content.replace(sinceMarker, EntitySince);
+			content = content.replace('<!-- JSDoc marker -->', APIReference);
+			content = content.replace(sinceMarker, EntitySince);
 
-		content = content.replace(linkMatcher, match => {
-			const component = linkMatcher.exec(match)[2];
+			content = content.replace(linkMatcher, match => {
+				const component = linkMatcher.exec(match)[2];
 
-			// reset the regex
-			linkMatcher.lastIndex = 0;
+				// reset the regex
+				linkMatcher.lastIndex = 0;
 
-			return `<a href="#" onclick="redirect(event, '${component}')">${component}</a>`;
-		});
+				return `<a href="#" onclick="redirect(event, '${component}')">${component}</a>`;
+			});
 
-		fs.writeFile(`dist/test-resources/api/${entry.basename}.sample.html`, content, (err) => {
-			// console.log(err);
-		});
+			return fs.writeFile(`dist/test-resources/api/${entry.basename}.sample.html`, content);
+		}
 	}
-}
 
-const generateComponentAPI = entry => {
-	// (1) calculate the API
-	entry = calculateAPI(entry);
+	const generateComponentAPI = entry => {
+		// (1) calculate the API
+		entry = calculateAPI(entry);
 
-	// (2) append additional API for composition components - List -> ListIems, TabContainer -> Tabs, Table -> TableRow/Column/Cell
-	entry = appendAdditionalEntriesAPI(entry);
+		// (2) append additional API for composition components - List -> ListIems, TabContainer -> Tabs, Table -> TableRow/Column/Cell
+		entry = appendAdditionalEntriesAPI(entry);
 
-	// (3) generate sample page
-	generateSamplePage(entry);
-}
+		// (3) generate sample page
+		return generateSamplePage(entry);
+	}
+
+	return Promise.all(entries.map(generateComponentAPI));
+};
 
-entries.forEach(generateComponentAPI);
-entriesAPI = [];
+generate().then(() => {
+	console.log("Documentation generated.");
+});

package/lib/documentation/templates/api-properties-section.js

@@ -21,7 +21,9 @@ module.exports = {
               {{/if}}
                 <br>
               {{#if (toKebabCase this.name)}}
-                <code>{{toKebabCase this.name}}</code>
+                  {{#unless this.noattribute}}
+                     <code>{{toKebabCase this.name}}</code>
+                 {{/unless}}
               {{/if}}
             </div>
             <div class="cell api-table-content-cell">{{this.type}}</div>

package/lib/documentation/templates/template.js

@@ -23,6 +23,7 @@ module.exports = {
             {{> properties this}}
             {{> slots this}}
             {{> events this}}
+            {{> methods this}}
             {{> cssVariables this}} 
           </section>
         </section>
@@ -33,6 +34,6 @@ module.exports = {
         <a class="separator" href="https://www.sap.com/about/legal/privacy.html" target="_blank">Privacy Policy</a>
         <a href="https://www.sap.com/about/legal/impressum.html" target="_blank">Legal</a>
       </div>
-      <img src="../../../../../../assets/images/sap-logo-svg.svg" alt="Sap Logo" />
+      <img src="../../../assets/images/sap-logo-svg.svg" alt="Sap Logo" />
     </footer>`
 };