@ui5/webcomponents-tools 2.15.0-rc.2 → 2.15.0

package/lib/copy-and-watch/index.js

@@ -30,116 +30,124 @@ const globParent = require('glob-parent');
 
 /* CODE */
 
-const args = process.argv.slice(2);
-const options = {};
-
-['watch', 'clean', 'skip-initial-copy', 'safe',  'silent'].forEach(key => {
-	const index = args.indexOf(`--${key}`);
-	if (index >= 0) {
-		options[key] = true;
-		args.splice(index, 1);
+const copyAndWatchFn = async (argv) => {
+	const args = argv.slice(2);
+	const options = {};
+
+	['watch', 'clean', 'skip-initial-copy', 'safe', 'silent'].forEach(key => {
+		const index = args.indexOf(`--${key}`);
+		if (index >= 0) {
+			options[key] = true;
+			args.splice(index, 1);
+		}
+	});
+
+	if (args.length < 2) {
+		console.error('Not enough arguments: copy-and-watch [options] <sources> <target>');
+		process.exit(1);
 	}
-});
 
-if (args.length < 2) {
-	console.error('Not enough arguments: copy-and-watch [options] <sources> <target>'.red);
-	process.exit(1);
-}
+	if (options['skip-initial-copy'] && !options['watch']) {
+		console.error('--skip-initial-copy argument is meant to be used with --watch, otherwise no files will be copied');
+		process.exit(1);
+	}
 
-if (options['skip-initial-copy'] && !options['watch']) {
-	console.error('--skip-initial-copy argument is meant to be used with --watch, otherwise no files will be copied'.red);
-	process.exit(1);
-}
+	const target = args.pop();
+	const sources = args;
+	const parents = [...new Set(sources.map(globParent))];
 
-const target = args.pop();
-const sources = args;
-const parents = [...new Set(sources.map(globParent))];
-
-const findTarget = from => {
-	const parent = parents
-		.filter(p => from.indexOf(p) >= 0)
-		.sort()
-		.reverse()[0];
-	return path.join(target, path.relative(parent, from));
-};
-const createDirIfNotExist = to => {
-	'use strict';
-
-	const dirs = [];
-	let dir = path.dirname(to);
-
-	while (dir !== path.dirname(dir)) {
-		dirs.unshift(dir);
-		dir = path.dirname(dir);
-	}
+	const findTarget = from => {
+		const parent = parents
+			.filter(p => from.indexOf(p) >= 0)
+			.sort()
+			.reverse()[0];
+		return path.join(target, path.relative(parent, from));
+	};
+	const createDirIfNotExist = to => {
+		'use strict';
+
+		const dirs = [];
+		let dir = path.dirname(to);
 
-	dirs.forEach(dir => {
-		if (!fs.existsSync(dir)) {
-			fs.mkdirSync(dir);
+		while (dir !== path.dirname(dir)) {
+			dirs.unshift(dir);
+			dir = path.dirname(dir);
 		}
-	});
-};
-const copy = from => {
-	const to = findTarget(from);
-	createDirIfNotExist(to);
-	const stats = fs.statSync(from);
-	if (stats.isDirectory()) {
-		return;
-	}
-	fs.writeFileSync(to, fs.readFileSync(from));
-	options.silent || console.log('[COPY]'.yellow, from, 'to'.yellow, to);
-};
-const remove = from => {
-	const to = findTarget(from);
-	fs.unlinkSync(to);
-	options.silent || console.log('[DELETE]'.yellow, to);
-};
-const rimraf = dir => {
-	if (fs.existsSync(dir)) {
-		fs.readdirSync(dir).forEach(entry => {
-			const entryPath = path.join(dir, entry);
-			if (fs.lstatSync(entryPath).isDirectory()) {
-				rimraf(entryPath);
-			} else {
-				fs.unlinkSync(entryPath);
+
+		dirs.forEach(dir => {
+			if (!fs.existsSync(dir)) {
+				fs.mkdirSync(dir);
 			}
 		});
-		fs.rmdirSync(dir);
+	};
+	const copy = from => {
+		const to = findTarget(from);
+		createDirIfNotExist(to);
+		const stats = fs.statSync(from);
+		if (stats.isDirectory()) {
+			return;
+		}
+		fs.writeFileSync(to, fs.readFileSync(from));
+		options.silent || console.log('[COPY]', from, 'to', to);
+	};
+	const remove = from => {
+		const to = findTarget(from);
+		fs.unlinkSync(to);
+		options.silent || console.log('[DELETE]', to);
+	};
+	const rimraf = dir => {
+		if (fs.existsSync(dir)) {
+			fs.readdirSync(dir).forEach(entry => {
+				const entryPath = path.join(dir, entry);
+				if (fs.lstatSync(entryPath).isDirectory()) {
+					rimraf(entryPath);
+				} else {
+					fs.unlinkSync(entryPath);
+				}
+			});
+			fs.rmdirSync(dir);
+		}
+	};
+
+	// clean
+	if (options.clean) {
+		rimraf(target);
 	}
-};
 
-// clean
-if (options.clean) {
-	rimraf(target);
-}
+	// initial copy
+	if (!options['skip-initial-copy']) {
+		sources.forEach(s => glob.sync(s).forEach(copy));
+	}
 
-// initial copy
-if (!options['skip-initial-copy']) {
-	sources.forEach(s => glob.sync(s).forEach(copy));
-}
+	// watch
+	if (options.watch) {
+		const chokidarOptions = {
+			ignoreInitial: true
+		};
 
-// watch
-if (options.watch) {
-	const chokidarOptions = {
-		ignoreInitial: true
-	};
+		if (options.safe) {
+			chokidarOptions.awaitWriteFinish = {
+				stabilityThreshold: 500,
+				pollInterval: 100
+			};
+		}
 
-	if (options.safe) {
-		chokidarOptions.awaitWriteFinish = {
-			stabilityThreshold: 500,
-			pollInterval: 100
-		};
+		chokidar
+			.watch(sources, chokidarOptions)
+			.on('ready', () => sources.forEach(s => {
+				options.silent || console.log('[WATCH]', s);
+			}))
+			.on('add', copy)
+			.on('addDir', copy)
+			.on('change', copy)
+			.on('unlink', remove)
+			.on('unlinkDir', remove)
+			.on('error', e => console.log('[ERROR]', e));
 	}
+}
 
-	chokidar
-		.watch(sources, chokidarOptions)
-		.on('ready', () => sources.forEach(s => {
-			options.silent || console.log('[WATCH]'.yellow, s);
-		}))
-		.on('add', copy)
-		.on('addDir', copy)
-		.on('change', copy)
-		.on('unlink', remove)
-		.on('unlinkDir', remove)
-		.on('error', e => console.log('[ERROR]'.red, e));
+if (require.main === module) {
+	copyAndWatchFn(process.argv)
 }
+
+exports._ui5mainFn = copyAndWatchFn;

package/lib/copy-list/index.js

@@ -1,11 +1,10 @@
 const fs = require("fs").promises;
 const path = require("path");
 
-const fileList = process.argv[2];
-const dest = process.argv[3];
-const src = "@openui5/sap.ui.core/src/";
-
-const generate = async () => {
+const generate = async (argv) => {
+	const fileList = argv[2];
+	const dest = argv[3];
+	const src = "@openui5/sap.ui.core/src/";
 	const filesToCopy = (await fs.readFile(fileList)).toString();
 	// console.log(filesToCopy);
 
@@ -14,15 +13,22 @@ const generate = async () => {
 
 	const trimFile = file => file.trim();
 
-	return filesToCopy.split("\n").map(trimFile).filter(shouldCopy).map(async moduleName => {
-		const srcPath = require.resolve(path.join(src, moduleName), {paths: [process.cwd()]});
+	const promises = filesToCopy.split("\n").map(trimFile).filter(shouldCopy).map(async moduleName => {
+		const srcPath = require.resolve(path.join(src, moduleName), { paths: [process.cwd()] });
 		const destPath = path.join(dest, moduleName);
 
 		await fs.mkdir(path.dirname(destPath), { recursive: true });
 		return fs.copyFile(srcPath, destPath);
 	});
+
+	return Promise.all(promises).then(() => {
+		console.log("Files copied.");
+	});
 };
 
-generate().then(() => {
-	console.log("Files copied.");
-});
+
+if (require.main === module) {
+	generate(process.argv)
+}
+
+exports._ui5mainFn = generate;

package/lib/create-icons/index.js

@@ -1,11 +1,6 @@
 const fs = require("fs").promises;
 const path = require("path");
 
-const collectionName = process.argv[2] || "SAP-icons-v4";
-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}";
@@ -71,10 +66,14 @@ const svgTemplate = (pathData) => `<svg xmlns="http://www.w3.org/2000/svg" viewB
 	<path d="${pathData}"/>
 </svg>`;
 
-const createIcons = async (file) => {
+const createIcons = async (argv) => {
+	const collectionName = argv[2] || "SAP-icons-v4";
+	const collectionVersion = 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/");
 	await fs.mkdir(destDir, { recursive: true });
 
-	const json = JSON.parse(await fs.readFile(file));
+	const json = JSON.parse(await fs.readFile(srcFile));
 
 	const promises = [];
 	for (let name in json.data) {
@@ -82,8 +81,8 @@ const createIcons = async (file) => {
 		const pathData = iconData.path;
 		const ltr = !!iconData.ltr;
 		const acc = iconData.acc;
-		const packageName =  json.packageName;
-		const collection =  json.collection;
+		const packageName = json.packageName;
+		const collection = json.collection;
 		const versioned = json.version;
 
 		const content = acc ? iconAccTemplate(name, pathData, ltr, acc, collection, packageName, versioned) : iconTemplate(name, pathData, ltr, collection, packageName);
@@ -104,14 +103,17 @@ const createIcons = async (file) => {
 			// For non-default collections (SAPTNTIcons and SAPBSIcons) we export the full name - "export default { 'tnt/actor' }"
 			const effectiveName = isDefaultCollection(collection) ? name : getUnversionedFullIconName(name, collection);
 			promises.push(fs.writeFile(path.join(path.normalize("dist/"), `${name}.js`), collectionTemplate(name, json.versions, effectiveName)));
-            promises.push(fs.writeFile(path.join(path.normalize("dist/"), `${name}.d.ts`), collectionTypeDefinitionTemplate(effectiveName, acc)));
+			promises.push(fs.writeFile(path.join(path.normalize("dist/"), `${name}.d.ts`), collectionTypeDefinitionTemplate(effectiveName, acc)));
 		}
 	}
 
-	return Promise.all(promises);
+	return Promise.all(promises)
+		.then(() => {
+			console.log("Icons created.");
+		});
 };
 
-const isDefaultCollection = collectionName => collectionName === "SAP-icons-v4"  || collectionName === "SAP-icons-v5";
+const isDefaultCollection = collectionName => collectionName === "SAP-icons-v4" || collectionName === "SAP-icons-v5";
 const getUnversionedFullIconName = (name, collection) => `${getUnversionedCollectionName(collection)}/${name}`;
 const getUnversionedCollectionName = collectionName => CollectionVersionedToUnversionedMap[collectionName] || collectionName;
 
@@ -122,6 +124,8 @@ const CollectionVersionedToUnversionedMap = {
 	"business-suite-v2": "business-suite",
 };
 
-createIcons(srcFile).then(() => {
-	console.log("Icons created.");
-});
+if (require.main === module) {
+	createIcons(process.argv)
+}
+
+exports._ui5mainFn = createIcons;

package/lib/create-illustrations/index.js

@@ -1,11 +1,10 @@
 const fs = require("fs").promises;
 const path = require("path");
 
-if (process.argv.length < 7) {
-	throw new Error("Not enough arguments");
-}
-
-const generate = async () => {
+const generate = async (argv) => {
+	if (argv.length < 7) {
+		throw new Error("Not enough arguments");
+	}
 
 	const ORIGINAL_TEXTS = {
 		UnableToLoad: "UnableToLoad",
@@ -70,12 +69,12 @@ const generate = async () => {
 		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 collection = process.argv[7];
+	const srcPath = argv[2];
+	const defaultText = argv[3] === "true";
+	const illustrationsPrefix = argv[4];
+	const illustrationSet = argv[5];
+	const destPath = argv[6];
+	const collection = argv[7];
 	const fileNamePattern = new RegExp(`${illustrationsPrefix}-.+-(.+).svg`);
 	// collect each illustration name because each one should have Sample.js file
 	const fileNames = new Set();
@@ -126,8 +125,7 @@ const generate = async () => {
 import dialogSvg from "./${illustrationsPrefix}-Dialog-${illustrationName}.js";
 import sceneSvg from "./${illustrationsPrefix}-Scene-${illustrationName}.js";
 import spotSvg from "./${illustrationsPrefix}-Spot-${illustrationName}.js";
-import dotSvg from "./${illustrationsPrefix}-${hasDot}-${illustrationName}.js";${
-	defaultText ? `import {
+import dotSvg from "./${illustrationsPrefix}-${hasDot}-${illustrationName}.js";${defaultText ? `import {
 	IM_TITLE_${illustrationNameUpperCase},
 	IM_SUBTITLE_${illustrationNameUpperCase},
 } from "../generated/i18n/i18n-defaults.js";` : ``}
@@ -184,17 +182,23 @@ export { dialogSvg, sceneSvg, spotSvg, dotSvg };`
 		}
 	});
 
-	return Promise.all(promises).then(() => {
-		const nestedPromises = [];
-		for (let illustrationName of fileNames) {
-			nestedPromises.push(fs.writeFile(path.join(destPath, `${illustrationName}.js`), illustrationImportTemplate(illustrationName)));
-			nestedPromises.push(fs.writeFile(path.join(destPath, `${illustrationName}.d.ts`), illustrationTypeDefinition(illustrationName)));
-		}
+	return Promise.all(promises)
+		.then(() => {
+			const nestedPromises = [];
+			for (let illustrationName of fileNames) {
+				nestedPromises.push(fs.writeFile(path.join(destPath, `${illustrationName}.js`), illustrationImportTemplate(illustrationName)));
+				nestedPromises.push(fs.writeFile(path.join(destPath, `${illustrationName}.d.ts`), illustrationTypeDefinition(illustrationName)));
+			}
 
-		return Promise.all(nestedPromises);
-	});
+			return Promise.all(nestedPromises);
+		})
+		.then(() => {
+			console.log("Illustrations generated.");
+		});
 };
 
-generate().then(() => {
-	console.log("Illustrations generated.");
-});
+if (require.main === module) {
+	generate(process.argv)
+}
+
+exports._ui5mainFn = generate;

package/lib/css-processors/css-processor-components.mjs

@@ -7,72 +7,82 @@ import chokidar from "chokidar";
 import scopeVariables from "./scope-variables.mjs";
 import { writeFileIfChanged, getFileContent } from "./shared.mjs";
 
-const tsMode = process.env.UI5_TS === "true";
-const extension = tsMode ? ".css.ts" : ".css.js";
+const generate = async (argv) => {
+    const tsMode = process.env.UI5_TS === "true";
+    const extension = tsMode ? ".css.ts" : ".css.js";
 
-const packageJSON = JSON.parse(fs.readFileSync("./package.json"))
-const inputFilesGlob = "src/themes/*.css";
-const restArgs = process.argv.slice(2);
+    const packageJSON = JSON.parse(fs.readFileSync("./package.json"))
+    const inputFilesGlob = "src/themes/*.css";
+    const restArgs = argv.slice(2);
 
-let customPlugin = {
-    name: 'ui5-tools',
-    setup(build) {
-        build.initialOptions.write = false;
+    let customPlugin = {
+        name: 'ui5-tools',
+        setup(build) {
+            build.initialOptions.write = false;
 
-        build.onEnd(result => {
-            result.outputFiles.forEach(async f => {
-                // scoping
-                let newText = scopeVariables(f.text, packageJSON);
-                newText = newText.replaceAll(/\\/g, "\\\\"); // Escape backslashes as they might appear in css rules
-                await mkdir(path.dirname(f.path), {recursive: true});
-                writeFile(f.path, newText);
+            build.onEnd(result => {
+                result.outputFiles.forEach(async f => {
+                    // scoping
+                    let newText = scopeVariables(f.text, packageJSON);
+                    newText = newText.replaceAll(/\\/g, "\\\\"); // Escape backslashes as they might appear in css rules
+                    await mkdir(path.dirname(f.path), { recursive: true });
+                    writeFile(f.path, newText);
 
-                // JS/TS
-                const jsPath = f.path.replace(/dist[\/\\]css/, "src/generated/").replace(".css", extension);
-                const jsContent = getFileContent(packageJSON.name, "\`" + newText + "\`", true);
-                writeFileIfChanged(jsPath, jsContent);
-            });
-        })
-    },
-}
+                    // JS/TS
+                    const jsPath = f.path.replace(/dist[\/\\]css/, "src/generated/").replace(".css", extension);
+                    const jsContent = getFileContent(packageJSON.name, "\`" + newText + "\`", true);
+                    writeFileIfChanged(jsPath, jsContent);
+                });
+            })
+        },
+    }
 
-const getConfig = async () => {
-    const config = {
-        entryPoints: await globby(inputFilesGlob),
-        bundle: true,
-        minify: true,
-        outdir: 'dist/css',
-        outbase: 'src',
-        plugins: [
-            customPlugin,
-        ]
-    };
-    return config;
-}
+    const getConfig = async () => {
+        const config = {
+            entryPoints: await globby(inputFilesGlob),
+            bundle: true,
+            minify: true,
+            outdir: 'dist/css',
+            outbase: 'src',
+            plugins: [
+                customPlugin,
+            ]
+        };
+        return config;
+    }
 
-if (restArgs.includes("-w")) {
-    let ready;
-    let config = await getConfig();
-    let ctx = await esbuild.context(config);
-    await ctx.watch()
-    console.log('watching...')
+    if (restArgs.includes("-w")) {
+        let ready;
+        let config = await getConfig();
+        let ctx = await esbuild.context(config);
+        await ctx.watch()
+        console.log('watching...')
 
-    // when new component css files are added, they do not trigger a build as no one directly imports them
-    // restart the watch mode with the new entry points if a css file is added.
-    const watcher = chokidar.watch(inputFilesGlob);
-    watcher.on("ready", () => {
-        ready = true; // Initial scan is over -> waiting for new files
-    });
-    watcher.on("add", async path => {
-        if (ready) {
-            // new file
-            ctx.dispose();
-            config = await getConfig();
-            ctx = await esbuild.context(config);
-            ctx.watch();
-        }
-    });
-} else {
-    const config = await getConfig();
-    const result = await esbuild.build(config);
+        // when new component css files are added, they do not trigger a build as no one directly imports them
+        // restart the watch mode with the new entry points if a css file is added.
+        const watcher = chokidar.watch(inputFilesGlob);
+        watcher.on("ready", () => {
+            ready = true; // Initial scan is over -> waiting for new files
+        });
+        watcher.on("add", async path => {
+            if (ready) {
+                // new file
+                ctx.dispose();
+                config = await getConfig();
+                ctx = await esbuild.context(config);
+                ctx.watch();
+            }
+        });
+    } else {
+        const config = await getConfig();
+        const result = await esbuild.build(config);
+    }
 }
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+    generate(process.argv)
+}
+
+export default {
+    _ui5mainFn: generate
+}