@ui5/cli 2.11.3 → 2.14.0

package/CHANGELOG.md

@@ -2,7 +2,42 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-cli/compare/v2.11.3...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-cli/compare/v2.14.0...HEAD).
+
+<a name="v2.14.0"></a>
+## [v2.14.0] - 2021-10-19
+### Dependency Updates
+- Bump [@ui5](https://github.com/ui5)/project from 2.5.0 to 2.6.0 [`2c42bba`](https://github.com/SAP/ui5-cli/commit/2c42bba826add655dd0bf44d4c78ff72258d10b2)
+- Bump [@ui5](https://github.com/ui5)/server from 2.3.1 to 2.4.0 [`063b2f7`](https://github.com/SAP/ui5-cli/commit/063b2f77c936b90f1a2cd9febb7a5aed0f17fa20)
+- Bump [@ui5](https://github.com/ui5)/builder from 2.11.0 to 2.11.1 [`11a0f5a`](https://github.com/SAP/ui5-cli/commit/11a0f5a391ca9e629b52b3046560678a8afeaf16)
+- Bump [@ui5](https://github.com/ui5)/builder from 2.10.0 to 2.11.0 [`6f13917`](https://github.com/SAP/ui5-cli/commit/6f139171d3bd46da7bdb1c4c8015589e60fa14f6)
+
+
+<a name="v2.13.0"></a>
+## [v2.13.0] - 2021-10-05
+### Bug Fixes
+- Allow Node.js pre-release versions ([#458](https://github.com/SAP/ui5-cli/issues/458)) [`f6351c6`](https://github.com/SAP/ui5-cli/commit/f6351c663975f4ea14f08fa9a655bb6bf0447080)
+
+### Dependency Updates
+- Bump [@ui5](https://github.com/ui5)/builder from 2.9.5 to 2.10.0 [`1d6a0f4`](https://github.com/SAP/ui5-cli/commit/1d6a0f423fc3fa782b341614d562c04292f00e1b)
+
+
+<a name="v2.12.1"></a>
+## [v2.12.1] - 2021-08-25
+### Dependency Updates
+- Bump [@ui5](https://github.com/ui5)/builder from 2.9.4 to 2.9.5 [`e25a630`](https://github.com/SAP/ui5-cli/commit/e25a630b03d0d68566b200e1346e25ed77f34c44)
+
+
+<a name="v2.12.0"></a>
+## [v2.12.0] - 2021-07-23
+### Dependency Updates
+- Bump [@ui5](https://github.com/ui5)/project from 2.4.0 to 2.5.0 [`0b4c2fb`](https://github.com/SAP/ui5-cli/commit/0b4c2fbc840024e30c1f85de441c5908a4774518)
+- Bump [@ui5](https://github.com/ui5)/server from 2.3.0 to 2.3.1 [`ffbd9a5`](https://github.com/SAP/ui5-cli/commit/ffbd9a5bc0e9ac0d3dca4f66d0ab5a7758aaec3a)
+- Bump [@ui5](https://github.com/ui5)/builder from 2.9.3 to 2.9.4 [`dfeb74e`](https://github.com/SAP/ui5-cli/commit/dfeb74ec96a5c14a500d56952f4727b1b7f0b4cd)
+
+### Features
+- Support to only build certain dependencies ([#442](https://github.com/SAP/ui5-cli/issues/442)) [`5f941f1`](https://github.com/SAP/ui5-cli/commit/5f941f1e5d3041fc94f2e9e9eed14ad44add78aa)
+
 
 <a name="v2.11.3"></a>
 ## [v2.11.3] - 2021-07-01
@@ -661,6 +696,10 @@ Only Node.js v10 or higher is supported.
 <a name="v0.0.1"></a>
 ## v0.0.1 - 2018-06-06
 
+[v2.14.0]: https://github.com/SAP/ui5-cli/compare/v2.13.0...v2.14.0
+[v2.13.0]: https://github.com/SAP/ui5-cli/compare/v2.12.1...v2.13.0
+[v2.12.1]: https://github.com/SAP/ui5-cli/compare/v2.12.0...v2.12.1
+[v2.12.0]: https://github.com/SAP/ui5-cli/compare/v2.11.3...v2.12.0
 [v2.11.3]: https://github.com/SAP/ui5-cli/compare/v2.11.2...v2.11.3
 [v2.11.2]: https://github.com/SAP/ui5-cli/compare/v2.11.1...v2.11.2
 [v2.11.1]: https://github.com/SAP/ui5-cli/compare/v2.11.0...v2.11.1

package/bin/ui5.js

@@ -14,7 +14,10 @@ try {
 }
 var nodeVersion = process.version;
 /* eslint-enable no-var */
-if (pkg.engines && pkg.engines.node && (!semver || !semver.satisfies(nodeVersion, pkg.engines.node))) {
+if (
+	pkg.engines && pkg.engines.node &&
+	(!semver || !semver.satisfies(nodeVersion, pkg.engines.node, {includePrerelease: true}))
+) {
 	console.log("==================== UNSUPPORTED NODE.JS VERSION ====================");
 	console.log("You are using an unsupported version of Node.js");
 	console.log("Detected version " + nodeVersion + " but " + pkg.name + " requires " + pkg.engines.node);
@@ -23,6 +26,17 @@ if (pkg.engines && pkg.engines.node && (!semver || !semver.satisfies(nodeVersion
 	console.log("=====================================================================");
 	process.exit(1);
 } else {
+	if (semver && semver.prerelease(nodeVersion)) {
+		console.log("====================== UNSTABLE NODE.JS VERSION =====================");
+		console.log("You are using an unstable version of Node.js");
+		console.log("Detected Node.js version " + nodeVersion);
+		console.log("");
+		console.log("=> Please note that an unstable version might cause unexpected");
+		console.log("   behavior. For productive use please consider using a stable");
+		console.log("   version of Node.js! For the release policy of Node.js, see");
+		console.log("   https://nodejs.org/en/about/releases");
+		console.log("=====================================================================");
+	}
 	// Timeout is required to log info when importing from local installation
 	setTimeout(() => {
 		if (!process.env.UI5_CLI_NO_LOCAL) {

package/lib/cli/commands/build.js

@@ -1,6 +1,7 @@
 // Build
 
 const baseMiddleware = require("../middlewares/base.js");
+const buildHelper = require("../../utils/buildHelper");
 
 const build = {
 	command: "build",
@@ -26,17 +27,51 @@ build.builder = function(cli) {
 			builder: noop,
 			middlewares: [baseMiddleware]
 		})
-		.command("self-contained", "Build project and create self-contained bundle", {
-			handler: handleBuild,
-			builder: noop,
-			middlewares: [baseMiddleware]
-		})
+		.command("self-contained",
+			"Build project and create self-contained bundle. " +
+			"Recommended to be used in conjunction with --all", {
+				handler: handleBuild,
+				builder: noop,
+				middlewares: [baseMiddleware]
+			})
 		.option("all", {
 			describe: "Include all project dependencies into build process",
 			alias: "a",
 			default: false,
 			type: "boolean"
 		})
+		.option("include-dependency", {
+			describe: "A list of dependencies to be included into the build process. You can use the asterisk '*' as" +
+				" an alias for including all dependencies into the build process. The listed dependencies cannot be" +
+				" overruled by dependencies defined in 'exclude-dependency'.",
+			type: "array"
+		})
+		.option("include-dependency-regexp", {
+			describe: "A list of regular expressions defining dependencies to be included into the build process." +
+				" This list is prioritized like 'include-dependency'.",
+			type: "array"
+		})
+		.option("include-dependency-tree", {
+			describe: "A list of dependencies to be included into the build process. Transitive dependencies are" +
+				" implicitly included and do not need to be part of this list. These dependencies overrule" +
+				" the selection of 'exclude-dependency-tree' but can be overruled by 'exclude-dependency'.",
+			type: "array"
+		})
+		.option("exclude-dependency", {
+			describe: "A list of dependencies to be excluded from the build process. The listed dependencies can" +
+				" be overruled by dependencies defined in 'include-dependency'.",
+			type: "array"
+		})
+		.option("exclude-dependency-regexp", {
+			describe: "A list of regular expressions defining dependencies to be excluded from the build process." +
+				" This list is prioritized like 'exclude-dependency'.",
+			type: "array"
+		})
+		.option("exclude-dependency-tree", {
+			describe: "A list of dependencies to be excluded from the build process. Transitive dependencies are" +
+				" implicitly included and do not need to be part of this list.",
+			type: "array"
+		})
 		.option("dest", {
 			describe: "Path of build destination",
 			default: "./dist",
@@ -65,7 +100,8 @@ build.builder = function(cli) {
 			describe: "Overrides the framework version defined by the project",
 			type: "string"
 		})
-		.example("ui5 build --all", "Preload build for project and dependencies to \"./dist\"")
+		.example("ui5 build", "Preload build for project without dependencies")
+		.example("ui5 build self-contained --all", "Self-contained build for project including dependencies")
 		.example("ui5 build --all --exclude-task=* --include-task=createDebugFiles generateAppPreload",
 			"Build project and dependencies but only apply the createDebugFiles- and generateAppPreload tasks")
 		.example("ui5 build --all --include-task=createDebugFiles --exclude-task=generateAppPreload",
@@ -98,11 +134,29 @@ async function handleBuild(argv) {
 	}
 
 	const tree = await normalizer.generateProjectTree(normalizerOptions);
+	const buildSettings = (tree.builder && tree.builder.settings) || {};
+
+	const {includedDependencies, excludedDependencies} = buildHelper.createDependencyLists({
+		tree: tree,
+		includeDependency: argv["include-dependency"],
+		includeDependencyRegExp: argv["include-dependency-regexp"],
+		includeDependencyTree: argv["include-dependency-tree"],
+		excludeDependency: argv["exclude-dependency"],
+		excludeDependencyRegExp: argv["exclude-dependency-regexp"],
+		excludeDependencyTree: argv["exclude-dependency-tree"],
+		defaultIncludeDependency: buildSettings.includeDependency,
+		defaultIncludeDependencyRegExp: buildSettings.includeDependencyRegExp,
+		defaultIncludeDependencyTree: buildSettings.includeDependencyTree
+	});
+	const buildAll = buildHelper.alignWithBuilderApi(argv.all, includedDependencies, excludedDependencies);
+
 	await builder.build({
 		tree: tree,
 		destPath: argv.dest,
 		cleanDest: argv["clean-dest"],
-		buildDependencies: argv.all,
+		buildDependencies: buildAll,
+		includedDependencies: includedDependencies,
+		excludedDependencies: excludedDependencies,
 		dev: command === "dev",
 		selfContained: command === "self-contained",
 		jsdoc: command === "jsdoc",

package/lib/init/init.js

@@ -66,7 +66,7 @@ function getProjectType(hasWebapp, hasSrc, hasTest) {
  */
 async function init({cwd = "./"} = {}) {
 	const projectConfig = {
-		specVersion: "2.4",
+		specVersion: "2.6",
 		metadata: {}
 	};
 	let pkg;

package/lib/utils/buildHelper.js

@@ -0,0 +1,216 @@
+const log = require("@ui5/logger").getLogger("cli:utils:buildHelper");
+
+/**
+ * Creates an object containing the flattened project dependency tree. Each dependency is defined as an object key while
+ * its value is an array of all of its transitive dependencies.
+ *
+ * @param {object} tree Project tree as generated by the [@ui5/project.normalizer]{@link module:@ui5/project.normalizer}
+ * @returns {object<string, string[]>} An object with dependency names as key and each with an array of its transitive
+ *   dependencies as value
+ */
+function getFlattenedDependencyTree(tree) {
+	const dependencyInfo = {};
+
+	function _getTransitiveDependencies(project, dependencies) {
+		project.dependencies.forEach((dep) => {
+			if (!dependencies.includes(dep.metadata.name)) {
+				dependencies.push(dep.metadata.name);
+				_getTransitiveDependencies(dep, dependencies);
+			}
+		});
+		return dependencies;
+	}
+	function _processDependencies(project) {
+		project.dependencies.forEach((dep) => {
+			if (!dependencyInfo[dep.metadata.name]) {
+				dependencyInfo[dep.metadata.name] = _getTransitiveDependencies(dep, []);
+				_processDependencies(dep);
+			}
+		});
+	}
+
+	_processDependencies(tree);
+	return dependencyInfo;
+}
+
+/**
+ * Creates dependency lists for 'includedDependencies' and 'excludedDependencies'. Regular expressions are directly
+ * applied to a list of all project dependencies so that they don't need to be evaluated in later processing steps.
+ * Generally, includes are handled with a higher priority than excludes. Additionally, operations for processing
+ * transitive dependencies are handled with a lower priority than explicitly mentioned dependencies. The default
+ * dependencies set in the build settings are appended in the end.
+ *
+ * The priority of the various dependency lists is applied in the following order, but note that a later list can't
+ * overrule earlier ones:
+ * <ol>
+ *   <li>includeDependency, includeDependencyRegExp</li>
+ *   <li>excludeDependency, excludeDependencyRegExp</li>
+ *   <li>includeDependencyTree</li>
+ *   <li>excludeDependencyTree</li>
+ *   <li>defaultIncludeDependency, defaultIncludeDependencyRegExp, defaultIncludeDependencyTree</li>
+ * </ol>
+ *
+ * @param {object} parameters Parameters
+ * @param {object} parameters.tree Project tree as generated by the
+ *   [@ui5/project.normalizer]{@link module:@ui5/project.normalizer}
+ * @param {string[]} parameters.includeDependency The dependencies to be considered in 'includedDependencies'; the
+ *   "*" character can be used as wildcard for all dependencies and is an alias for the CLI option "--all"
+ * @param {string[]} parameters.includeDependencyRegExp Strings which are interpreted as regular expressions
+ *   to describe the selection of dependencies to be considered in 'includedDependencies'
+ * @param {string[]} parameters.includeDependencyTree The dependencies to be considered in 'includedDependencies';
+ *   transitive dependencies are also appended
+ * @param {string[]} parameters.excludeDependency The dependencies to be considered in 'excludedDependencies'
+ * @param {string[]} parameters.excludeDependencyRegExp Strings which are interpreted as regular expressions
+ *   to describe the selection of dependencies to be considered in 'excludedDependencies'
+ * @param {string[]} parameters.excludeDependencyTree The dependencies to be considered in 'excludedDependencies';
+ *   transitive dependencies are also appended
+ * @param {string[]} parameters.defaultIncludeDependency Same as 'includeDependency' parameter; used for build
+ *   settings
+ * @param {string[]} parameters.defaultIncludeDependencyRegExp Same as 'includeDependencyRegExp' parameter; used
+ *   for build settings
+ * @param {string[]} parameters.defaultIncludeDependencyTree Same as 'includeDependencyTree' parameter; used for
+ *   build settings
+ * @returns {{includedDependencies:string[],excludedDependencies:string[]}} An object containing the
+ *   'includedDependencies' and 'excludedDependencies'
+ */
+function createDependencyLists({
+	tree,
+	includeDependency = [], includeDependencyRegExp = [], includeDependencyTree = [],
+	excludeDependency = [], excludeDependencyRegExp = [], excludeDependencyTree = [],
+	defaultIncludeDependency = [], defaultIncludeDependencyRegExp = [], defaultIncludeDependencyTree = []
+}) {
+	if (
+		!includeDependency.length && !includeDependencyRegExp.length && !includeDependencyTree.length &&
+		!excludeDependency.length && !excludeDependencyRegExp.length && !excludeDependencyTree.length &&
+		!defaultIncludeDependency.length && !defaultIncludeDependencyRegExp.length &&
+		!defaultIncludeDependencyTree.length
+	) {
+		return {includedDependencies: [], excludedDependencies: []};
+	}
+
+	const flattenedDependencyTree = getFlattenedDependencyTree(tree);
+
+	function isExcluded(excludeList, depName) {
+		return excludeList && excludeList.has(depName);
+	}
+	function processDependencies({targetList, dependencies, dependenciesRegExp = [], excludeList, handleSubtree}) {
+		if (handleSubtree && dependenciesRegExp.length) {
+			throw new Error("dependenciesRegExp can't be combined with handleSubtree:true option");
+		}
+		dependencies.forEach((depName) => {
+			if (depName === "*") {
+				targetList.add(depName);
+			} else if (flattenedDependencyTree[depName]) {
+				if (!isExcluded(excludeList, depName)) {
+					targetList.add(depName);
+				}
+				if (handleSubtree) {
+					flattenedDependencyTree[depName].forEach((dep) => {
+						if (!isExcluded(excludeList, dep)) {
+							targetList.add(dep);
+						}
+					});
+				}
+			} else {
+				log.warn(
+					`Could not find dependency "${depName}" for project ${tree.metadata.name}. Dependency filter is ` +
+					`ignored`);
+			}
+		});
+		dependenciesRegExp.map((exp) => new RegExp(exp)).forEach((regExp) => {
+			for (const depName in flattenedDependencyTree) {
+				if (regExp.test(depName) && !isExcluded(excludeList, depName)) {
+					targetList.add(depName);
+				}
+			}
+		});
+	}
+
+	const includedDependencies = new Set();
+	const excludedDependencies = new Set();
+
+	// add dependencies defined in includeDependency and includeDependencyRegExp to the list of includedDependencies
+	processDependencies({
+		targetList: includedDependencies,
+		dependencies: includeDependency,
+		dependenciesRegExp: includeDependencyRegExp
+	});
+	// add dependencies defined in excludeDependency and excludeDependencyRegExp to the list of excludedDependencies
+	processDependencies({
+		targetList: excludedDependencies,
+		dependencies: excludeDependency,
+		dependenciesRegExp: excludeDependencyRegExp
+	});
+	// add dependencies defined in includeDependencyTree with their transitive dependencies to the list of
+	// includedDependencies; due to prioritization only those dependencies are added which are not excluded
+	// by excludedDependencies
+	processDependencies({
+		targetList: includedDependencies,
+		dependencies: includeDependencyTree,
+		excludeList: excludedDependencies,
+		handleSubtree: true
+	});
+	// add dependencies defined in excludeDependencyTree with their transitive dependencies to the list of
+	// excludedDependencies; due to prioritization only those dependencies are added which are not excluded
+	// by includedDependencies
+	processDependencies({
+		targetList: excludedDependencies,
+		dependencies: excludeDependencyTree,
+		excludeList: includedDependencies,
+		handleSubtree: true
+	});
+	// due to the lowest priority only add the dependencies defined in build settings if they are not excluded
+	// by any other dependency defined in excludedDependencies
+	processDependencies({
+		targetList: includedDependencies,
+		dependencies: defaultIncludeDependency,
+		dependenciesRegExp: defaultIncludeDependencyRegExp,
+		excludeList: excludedDependencies
+	});
+	processDependencies({
+		targetList: includedDependencies,
+		dependencies: defaultIncludeDependencyTree,
+		excludeList: excludedDependencies,
+		handleSubtree: true
+	});
+
+	return {
+		includedDependencies: Array.from(includedDependencies),
+		excludedDependencies: Array.from(excludedDependencies)
+	};
+}
+
+/**
+ * Returns whether project dependencies have to be built influenced by <code>includedDependencies</code> and
+ * <code>excludedDependencies</code>.
+ * If only selected dependencies (via <code>includedDependencies</code>) have to be built, the "*" character
+ * is added to the <code>excludedDependencies</code> to make sure that all other dependencies are
+ * excluded.
+ * In case a "*" character is included in <code>includedDependencies</code>, it is removed and the
+ * <code>buildAll</code> flag is set to <code>true</code> as it behaves as an alias.
+ *
+ * @param {boolean} buildAll The value of the <code>all</code> command line parameter to decide if project
+ *   dependencies have to be built
+ * @param {string[]} includedDependencies The list of included dependencies
+ * @param {string[]} excludedDependencies The list of excluded dependencies
+ * @returns {boolean} Whether it is required to build project dependencies
+ */
+function alignWithBuilderApi(buildAll, includedDependencies, excludedDependencies) {
+	if ((!buildAll && !includedDependencies.includes("*")) && includedDependencies.length) {
+		excludedDependencies.push("*");
+	}
+	if (includedDependencies.includes("*")) {
+		buildAll = true;
+		includedDependencies.splice(includedDependencies.indexOf("*"), 1);
+	}
+	if (!buildAll && includedDependencies.length) {
+		buildAll = true;
+	}
+	return buildAll;
+}
+
+module.exports = {
+	getFlattenedDependencyTree,
+	createDependencyLists,
+	alignWithBuilderApi
+};