@ui5/create-webcomponents-package 0.0.0-1acdb5da5 → 0.0.0-1c3388f4d

package/README.md

@@ -1,6 +1,4 @@
-![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-webcomponents/main/docs/images/UI5_logo_wide.png)
-
-# UI5 Web Components - Create Package
+# ![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-webcomponents/main/docs/images/UI5_logo_water.png)UI5 Web Components - Create Package
 
 [![npm Package Version](https://badge.fury.io/js/%40ui5%2Fwebcomponents.svg)](https://www.npmjs.com/package/@ui5/webcomponents)
 
@@ -17,10 +15,9 @@ Usage:
     npm init @ui5/webcomponents-package -- [OPTIONS]
 
 Options:
-    --name <string>     - defines the package name
-    --tag <string>      - defines the tag name of the sample web component that will be created in your new package
-    --enable-typescript - enables TypeScript support for the package
-    --skip              - skips configuration and generates package with a default value for each parameter that wasn't passed
+    --name <string>                      - defines the package name
+    --test-setup <"cypress" | "manual">  - defines whether the predefined test setup should be added or it will be configured manually.
+    --skip                               - skips configuration and generates package with a default value for each parameter that wasn't passed
 ```
 
 The script creates a new directory, and fills it with a `package.json` file and all necessary source files, and resources for a new
@@ -32,10 +29,9 @@ components package.
 Usage:
     yarn create @ui5/webcomponents-package [OPTIONS]
 Options:
-    --name <string>     - defines the package name
-    --tag <string>      - defines the tag name of the sample web component that will be created in your new package
-    --enable-typescript - enables TypeScript support for the package
-    --skip              - skips configuration and generates package with a default value for each parameter that wasn't passed
+    --name <string>                      - defines the package name
+    --test-setup <"cypress" | "manual">  - defines whether the predefined test setup should be added or it will be configured manually.
+    --skip                               - skips configuration and generates package with a default value for each parameter that wasn't passed
 ```
 
 The script creates a new directory, and fills it with a `package.json` file and all necessary source files, and resources for a new
@@ -44,10 +40,10 @@ components package.
 ## Resources
 - [UI5 Web Components - README.md](https://github.com/SAP/ui5-webcomponents/blob/main/README.md)
 - [UI5 Web Components - Home Page](https://sap.github.io/ui5-webcomponents)
-- [UI5 Web Components - Playground and API Reference](https://sap.github.io/ui5-webcomponents/playground/)
+- [UI5 Web Components - Playground and API Reference](https://sap.github.io/ui5-webcomponents/play/)
 
 ## Support
-We welcome all comments, suggestions, questions, and bug reports. Please follow our [Support Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/SUPPORT.md#-content) on how to report an issue, or chat with us in the `#webcomponents` channel of the [OpenUI5 Community Slack](https://join-ui5-slack.herokuapp.com/).
+We welcome all comments, suggestions, questions, and bug reports. Please follow our [Support Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/SUPPORT.md#-content) on how to report an issue, or chat with us in the `#webcomponents` channel of the [OpenUI5 Community Slack](https://ui5-slack-invite.cfapps.eu10.hana.ondemand.com/).
 
 ## Contribute
 Please check our [Contribution Guidelines](https://github.com/SAP/ui5-webcomponents/blob/main/docs/6-contributing/02-conventions-and-guidelines.md).

package/create-package.js

@@ -1,188 +1,216 @@
 #!/usr/bin/env node
-
-const fs = require("fs");
-const path = require("path");
-const mkdirp = require("mkdirp");
-const prompts = require("prompts");
-const parser = require("npm-config-user-agent-parser");
-const yargs = require("yargs/yargs");
-const { hideBin } = require("yargs/helpers");
-
+import fs from "fs/promises";
+import path, { dirname } from "path";
+import prompts from "prompts";
+import parser from "npm-config-user-agent-parser";
+import yargs from "yargs/yargs";
+import { hideBin } from "yargs/helpers";
+import { fileURLToPath } from "url";
+import * as prettier from "prettier";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 const argv = yargs(hideBin(process.argv)).argv;
-
-const version = JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"))).version;
-
-// from where all the files will be copied
-const TEMPLATE_DIR = path.join(`${__dirname}`, `template/`);
-
-// String utils
-const capitalizeFirst = str => str.substr(0,1).toUpperCase() + str.substr(1);
-const kebabToCamelCase = string => toCamelCase(string.split("-"));
-const toCamelCase = parts => {
-	return parts.map((string, index) => {
-		return index === 0 ? string.toLowerCase() : string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
-	}).join("");
-};
-const isTSRelatedFile = sourcePath => {
-	return ["Assets.ts", "MyFirstComponent.ts", "tsconfig.json", "global.d.ts"].some(fileName => sourcePath.includes(fileName));
+const VERSION = JSON.parse(
+	await fs.readFile(path.join(__dirname, "package.json")),
+).version;
+
+// Constants
+const SUPPORTED_TEST_SETUPS = ["cypress", "manual"];
+const SRC_DIR = path.join(__dirname, "template");
+const DEST_DIR = process.cwd();
+
+const FILES_TO_RENAME = {
+	[path.normalize("eslintignore")]: path.normalize(".eslintignore"),
+	[path.normalize("eslintrc.cjs")]: path.normalize(".eslintrc.cjs"),
+	[path.normalize("npsrc.json")]: path.normalize(".npsrc.json"),
+	[path.normalize("npmrc")]: path.normalize(".npmrc"),
+	[path.normalize("env")]: path.normalize(".env"),
+	[path.normalize("gitignore")]: path.normalize(".gitignore"),
+	[path.normalize("tsconfig.template.json")]: path.normalize("tsconfig.json"),
+	[path.normalize("cypress/tsconfig.template.json")]: path.normalize("cypress/tsconfig.json")
 };
-const isJSRelatedFile = sourcePath => {
-	return ["Assets.js", "MyFirstComponent.js"].some(fileName => sourcePath.includes(fileName));
-};
-const isGitIgnore = sourcePath => {
-	return sourcePath.includes("gitignore");
-};
-const isNPMRC = sourcePath => {
-	return sourcePath.includes("npmrc");
-};
-
-// Validation of user input
-const isNameValid = name => typeof name === "string" && name.match(/^[a-zA-Z0-9\-_]+$/);
-const isTagValid = tag => typeof tag === "string" && tag.match(/^[a-z0-9]+?-[a-zA-Z0-9\-_]+?[a-z0-9]$/);
-
-// Utils for building the file structure
-const replaceVarsInFileContent = (vars, content) => {
-	for (let key in vars) {
-		const re = new RegExp(key, "g");
-		content = content.replace(re, vars[key]);
+const FILES_TO_COPY = ["test/pages/img/logo.png"];
+
+// Validation Patterns
+const PackageNamePattern =
+	/^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
+const TagPattern = /^[a-z0-9]+?-[a-zA-Z0-9\-_]+?[a-z0-9]$/;
+
+// Utility Functions
+const isPackageNameValid = name =>
+	typeof name === "string" && PackageNamePattern.test(name);
+const isTagValid = tag => typeof tag === "string" && TagPattern.test(tag);
+const isTestSetupValid = setup =>
+	typeof setup === "string" && SUPPORTED_TEST_SETUPS.includes(setup);
+
+async function collectFiles(dir, fileList = []) {
+	const entries = await fs.readdir(dir, { withFileTypes: true });
+
+	for (const entry of entries) {
+		const fullPath = path.join(dir, entry.name);
+		if (entry.isDirectory()) {
+			await collectFiles(fullPath, fileList);
+		} else if (entry.isFile()) {
+			fileList.push(fullPath);
+		}
 	}
-	return content;
-};
 
-const replaceVarsInFileName = (vars, fileName) => {
-	return fileName.replace(/MyFirstComponent/, vars.INIT_PACKAGE_VAR_CLASS_NAME);
+	return fileList;
+}
+
+/**
+ * Hyphanates the given PascalCase string, f.e.:
+ * Foo -> "my-foo" (adds preffix)
+ * FooBar -> "foo-bar"
+ */
+const hyphenateComponentName = componentName => {
+	const result = componentName
+		.replace(/([a-z])([A-Z])/g, "$1-$2")
+		.toLowerCase();
+	return result.includes("-") ? result : `my-${result}`;
 };
 
-const copyFile = (vars, sourcePath, destPath) => {
-	const ignoreJsRelated = vars.INIT_PACKAGE_VAR_TYPESCRIPT && isJSRelatedFile(sourcePath);
-	const ignoreTsRelated = !vars.INIT_PACKAGE_VAR_TYPESCRIPT && isTSRelatedFile(sourcePath);
+const replacePlaceholders = (content, replacements) =>
+	content.replace(/{{(.*?)}}/g, (_, key) => replacements[key.trim()] || "");
 
-	if (ignoreJsRelated || ignoreTsRelated) {
-		return;
-	}
+const generateFilesContent = async (
+	packageName,
+	componentName,
+	skipSubfolder,
+	testSetup,
+) => {
+	// All variables that will be replaced in the content of the template folder/
+	const vars = {
+		INIT_PACKAGE_VAR_NAME: packageName,
+		INIT_PACKAGE_VERSION: VERSION,
+		INIT_PACKAGE_VAR_TAG: argv.tag || hyphenateComponentName(componentName),
+		INIT_PACKAGE_VAR_CLASS_NAME: componentName,
+		INIT_PACKAGE_CYPRESS_ROOT_TSCONFIG:
+			testSetup === "cypress"
+				? `"tsBuildInfoFile": "dist/.tsbuildinfo",\n"rootDir": "src",\n"composite": true,`
+				: "",
+		INIT_PACKAGE_CYPRESS_DEV_DEPS:
+			testSetup === "cypress"
+				? `"@ui5/cypress-ct-ui5-webc": "^0.0.4",\n"cypress": "^13.11.0",`
+				: "",
+		INIT_PACKAGE_CYPRESS_TEST_COMMANDS:
+			testSetup === "cypress"
+				? `"test": "cypress run --component --browser chrome",\n"test:open": "cypress open --component --browser chrome",`
+				: "",
+		INIT_PACKAGE_CYPRESS_ESLINT_IGNORES:
+			testSetup === "cypress" ? `cypress/*\ncypress.config.*` : "",
+	};
 
-	let content = fs.readFileSync(sourcePath, { encoding: "UTF-8" });
-	content = replaceVarsInFileContent(vars, content);
-	destPath = replaceVarsInFileName(vars, destPath);
+	const packageBaseName = packageName.includes("@")
+		? packageName.slice(packageName.lastIndexOf("/") + 1)
+		: packageName;
+	const destDir = skipSubfolder
+		? path.join(DEST_DIR)
+		: path.join(DEST_DIR, packageBaseName);
 
-	fs.writeFileSync(destPath, content);
+	await processFiles(destDir, vars, testSetup);
 
-	// Rename "gitignore" to ".gitignore" (npm init won't include ".gitignore", so we add it as "gitignore" and rename it later)
-	if (isGitIgnore(sourcePath)) {
-		fs.renameSync(destPath, destPath.replace("gitignore", ".gitignore"))
-	}
+	console.log("\nPackage successfully created!\nNext steps:\n");
+	console.log(`$ cd ${packageBaseName}`);
 
-	// Rename "npmrc" to ".npmrc" (npm init won't include ".npmrc", so we add it as "npmrc" and rename it later)
-	if (isNPMRC(sourcePath)) {
-		fs.renameSync(destPath, destPath.replace("npmrc", ".npmrc"));
+	try {
+		const userAgent = parser(process.env.npm_config_user_agent);
+		userAgent.yarn
+			? console.log(`$ yarn\n$ yarn start`)
+			: console.log(`$ npm i\n$ npm start`);
+	} catch {
+		console.log(`$ npm i\n$ npm start`);
 	}
-};
 
-const copyFiles = (vars, sourcePath, destPath) => {
-	const isDir = fs.lstatSync(sourcePath).isDirectory();
-	if (isDir) {
-		if (destPath) {
-			mkdirp.sync(destPath);
-		}
-		fs.readdirSync(sourcePath).forEach(file => {
-			copyFiles(vars, path.join(sourcePath, file), path.join(destPath, file));
-		});
-	} else {
-		copyFile(vars, sourcePath, destPath);
-	}
+	console.log("\n");
 };
 
-const generateFilesContent = (name, tag, typescript) => {
-	const className = capitalizeFirst(kebabToCamelCase(tag));
-
-	// All variables that will be replaced in the content of the resources/
-	const vars = {
-		INIT_PACKAGE_VAR_NAME: name,
-		INIT_PACKAGE_VAR_TAG: tag,
-		INIT_PACKAGE_VAR_CLASS_NAME: className,
-		INIT_PACKAGE_VAR_TYPESCRIPT: typescript,
-	};
+async function processFiles(destDir, replacements, testSetup) {
+	const files = await collectFiles(SRC_DIR);
+	const FILE_PATHS_TO_SKIP = [
+		testSetup !== "cypress" ? path.normalize("cypress") : undefined,
+	].filter(Boolean);
 
-	const packageContent = {
-		name,
-		version: "0.0.1",
-		ui5: {
-			webComponentsPackage: true,
-		},
-		scripts: {
-			"clean": "wc-dev clean",
-			"lint": "wc-dev lint",
-			"start": "wc-dev start",
-			"watch": "wc-dev watch",
-			"build": "wc-dev build",
-			"test": "wc-dev test",
-			"create-ui5-element": "wc-create-ui5-element",
-			"prepublishOnly": "npm run build",
-		},
-		exports: {
-			"./src/*": "./src/*",
-			"./dist/*": "./dist/*",
-			"./package.json": "./package.json",
-			"./bundle.js": "./bundle.js",
-			"./*": "./dist/*",
-		},
-		"dependencies": {
-			"@ui5/webcomponents-base": version,
-			"@ui5/webcomponents-theming": version,
-		},
-		"devDependencies": {
-			"@ui5/webcomponents-tools": version,
-			"chromedriver": "*",
-		},
-	};
+	for (const file of files) {
+		const relativePath = path.relative(SRC_DIR, file);
+		let destPath = path.join(destDir, relativePath);
 
-	if (typescript) {
-		packageContent.devDependencies.typescript = "^4.9.4";
-	}
+		if (FILE_PATHS_TO_SKIP.some(filePath => file.includes(filePath))) {
+			// console.log(`Skipped: ${file} -> ${destPath}`);
+			continue;
+		}
 
-	// Update package.json
-	const destDir = path.join(`./`, name);
-	mkdirp.sync(destDir);
-	fs.writeFileSync(path.join(destDir, "package.json"), JSON.stringify(packageContent, null, 2));
-	// Copy files
-	copyFiles(vars, TEMPLATE_DIR, destDir);
+		// // Component related file based on the user input
+		// destPath = destPath.replace(
+		// 	"MyFirstComponent",
+		// 	replacements.INIT_PACKAGE_VAR_CLASS_NAME,
+		// );
+
+		// Files that need to be renamed
+		if (FILES_TO_RENAME[relativePath]) {
+			destPath = destPath.replace(
+				relativePath,
+				FILES_TO_RENAME[relativePath],
+			);
+		}
 
-	console.log("\nPackage successfully created!\nNext steps:\n");
-	console.log(`$ cd ${name}`);
+		await fs.mkdir(path.dirname(destPath), { recursive: true });
+
+		if (FILES_TO_COPY.includes(relativePath)) {
+			// Image like files that doesn't need proccessing
+			await fs.copyFile(file, destPath);
+		} else {
+			const content = await fs.readFile(file, { encoding: "utf8" });
+			const replaced = replacePlaceholders(content, replacements);
+			let formatted;
+			try {
+				formatted = await prettier.format(replaced, {
+					useTabs: true,
+					tabWidth: 4,
+					quoteProps: "consistent",
+					arrowParens: "avoid",
+					filepath: file,
+				});
+				// console.log(`Formatted: ${file} -> ${destPath}`);
+			} catch {
+				// console.log(`Not formatted: ${file} -> ${destPath}`);
+				formatted = replaced;
+			}
+
+			await fs.writeFile(destPath, formatted);
+		}
 
-	let userAgentInfo;
-	try {
-		userAgentInfo = parser(process.env.npm_config_user_agent);
-	} catch (e) {}
-
-	if (userAgentInfo && userAgentInfo.yarn) {
-		console.log(`$ yarn`);
-		console.log(`$ yarn start`);
-	} else {
-		console.log(`$ npm i`);
-		console.log(`$ npm start`);
+		// console.log(`Processed: ${file} -> ${destPath}`);
 	}
+}
 
-	console.log("\n");
-};
-
-// Main function
 const createWebcomponentsPackage = async () => {
 	let response;
-	if (argv.name && !isNameValid(argv.name)) {
-		throw new Error("The package name should be a string (a-z, A-Z, 0-9).");
+	if (argv.name && !isPackageNameValid(argv.name)) {
+		throw new Error(
+			"The package name should be a string, starting with letter and containing the following symbols [a-z, A-Z, 0-9].",
+		);
 	}
 
-	if (argv.tag && !isTagValid(argv.tag) ) {
-		throw new Error("The tag should be in kebab-case (my-first-component f.e) and it can't be a single word.");
+	if (argv.testSetup && !isTestSetupValid(argv.testSetup)) {
+		throw new Error(
+			`The test setup should be a string and one of the following options: ${SUPPORTED_TEST_SETUPS.join(", ")}`,
+		);
 	}
 
-	let name = argv.name || "my-package";
-	let tag = argv.tag || "my-first-component";
-	let typescriptSupport = !!argv.enableTypescript;
+	let packageName = argv.name || "my-package";
+	let componentName = "MyFirstComponent";
+	let testSetup = argv.testSetup || "manual";
+	const skipSubfolder = !!argv.skipSubfolder;
 
 	if (argv.skip) {
-		return generateFilesContent(name, tag, typescriptSupport);
+		return generateFilesContent(
+			packageName,
+			componentName,
+			skipSubfolder,
+			testSetup,
+		);
 	}
 
 	if (!argv.name) {
@@ -190,42 +218,35 @@ const createWebcomponentsPackage = async () => {
 			type: "text",
 			name: "name",
 			message: "Package name:",
-			validate: isNameValid,
+			validate: value =>
+				isPackageNameValid(value)
+					? true
+					: "Package name should be a string, starting with a letter and containing the following symbols [a-z, A-Z ,0-9, _, -].",
 		});
-		name = response.name;
+		packageName = response.name;
 	}
 
-	if (!typescriptSupport) {
+	if (!argv.testSetup) {
 		response = await prompts({
 			type: "select",
-			name: "language",
-			message: "Project type:",
+			name: "testSetup",
+			message: "How would you like to set up testing?",
 			choices: [
-				{
-					title: "JavaScript",
-					value: false,
-				},
-				{
-					title: "TypeScript",
-					value: true,
-				},
+				{ title: "Cypress", value: "cypress" },
+				{ title: "I'll set it up manually", value: "manual" },
 			],
+			initial: 0,
 		});
-		typescriptSupport = response.language;
-	}
 
-	if (!argv.tag) {
-		response = await prompts({
-			type: "text",
-			name: "tag",
-			message: "Component name:",
-			initial: "my-first-component",
-			validate: isTagValid,
-		});
-		tag = response.tag;
+		testSetup = response.testSetup;
 	}
 
-	return generateFilesContent(name, tag, typescriptSupport);
+	return generateFilesContent(
+		packageName,
+		componentName,
+		skipSubfolder,
+		testSetup,
+	);
 };
 
 createWebcomponentsPackage();

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@ui5/create-webcomponents-package",
-  "version": "0.0.0-1acdb5da5",
+  "version": "0.0.0-1c3388f4d",
   "description": "UI5 Web Components: create package",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
+  "type": "module",
   "private": false,
   "keywords": [
     "openui5",
@@ -21,6 +22,7 @@
   "dependencies": {
     "mkdirp": "^1.0.4",
     "npm-config-user-agent-parser": "^1.0.0",
+    "prettier": "^3.5.3",
     "prompts": "^2.4.1",
     "yargs": "^17.5.1"
   }

package/template/.npsrc.json

@@ -0,0 +1,3 @@
+{
+	"config": "./package-scripts.cjs"
+}

package/template/cypress.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from "cypress";
+
+export default defineConfig({
+  component: {
+    devServer: {
+      framework: "@ui5/cypress-ct-ui5-webc" as any,
+      bundler: "vite",
+    },
+  },
+});

package/template/env

@@ -0,0 +1 @@
+VITE_BUNDLE_PATH="../../dist/bundle.esm.js"

package/template/gitignore

@@ -1,4 +1,4 @@
 node_modules
 dist
-jsdoc-dist
-src/generated
+src/generated
+.dev-server-port

package/template/{package-scripts.js → package-scripts.cjs}

@@ -2,7 +2,6 @@ const getScripts = require("@ui5/webcomponents-tools/components-package/nps.js")
 
 const options = {
 	port: 8080,
-	typescript: INIT_PACKAGE_VAR_TYPESCRIPT,
 };
 
 const scripts = getScripts(options);

package/template/package.json

@@ -0,0 +1,35 @@
+{
+    "name": "{{INIT_PACKAGE_VAR_NAME}}",
+    "version": "0.0.1",
+    "ui5": {
+        "webComponentsPackage": true
+    },
+    "type": "module",
+    "scripts": {
+        "clean": "wc-dev clean",
+        "lint": "wc-dev lint",
+        "start": "wc-dev start",
+        "watch": "wc-dev watch",
+        "build": "wc-dev build",
+        {{INIT_PACKAGE_CYPRESS_TEST_COMMANDS}}
+        "create-ui5-element": "wc-create-ui5-element",
+        "prepublishOnly": "npm run build"
+    },
+    "exports": {
+        "./src/*": "./src/*",
+        "./dist/*": "./dist/*",
+        "./package.json": "./package.json",
+        "./bundle.js": "./bundle.js",
+        "./*": "./dist/*"
+    },
+    "dependencies": {
+        "@ui5/webcomponents-base": "{{INIT_PACKAGE_VERSION}}",
+        "@ui5/webcomponents-theming": "{{INIT_PACKAGE_VERSION}}"
+    },
+    "devDependencies": {
+        {{INIT_PACKAGE_CYPRESS_DEV_DEPS}}
+        "@ui5/webcomponents-tools": "{{INIT_PACKAGE_VERSION}}",
+        "chromedriver": "*",
+        "typescript": "^5.6.2"
+    }
+}

package/template/src/Assets.ts

@@ -1,5 +1,5 @@
 import "@ui5/webcomponents-theming/dist/Assets.js"; // Theming
 
-// own INIT_PACKAGE_VAR_NAME package assets
+// own {{INIT_PACKAGE_VAR_NAME}} package assets
 import "./generated/json-imports/Themes.js";
 import "./generated/json-imports/i18n.js";