@ui5/builder 3.0.0-beta.3 → 3.0.0-beta.5

package/CHANGELOG.md

@@ -2,10 +2,26 @@
 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-builder/compare/v3.0.0-beta.3...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.5...HEAD).
+
+<a name="v3.0.0-beta.5"></a>
+## [v3.0.0-beta.5] - 2022-12-12
+### Breaking Changes
+- **generateJsDoc:** Remove internal 'buildContext' parameter [`4ec80c8`](https://github.com/SAP/ui5-builder/commit/4ec80c874e177b658b1cd819431b6cb0660ded87)
+
+### Dependency Updates
+- Bump less-openui5 from 0.11.4 to 0.11.5 [`bf46354`](https://github.com/SAP/ui5-builder/commit/bf463541b7651db1dee167057eddc94181f5c1da)
+
+
+<a name="v3.0.0-beta.4"></a>
+## [v3.0.0-beta.4] - 2022-12-01
+### Dependency Updates
+- Bump less-openui5 from 0.11.3 to 0.11.4 [`b7a507f`](https://github.com/SAP/ui5-builder/commit/b7a507fbc34076f5bf95f92f058fd2c58d79a455)
+- Bump less-openui5 from 0.11.2 to 0.11.3 [`28e684b`](https://github.com/SAP/ui5-builder/commit/28e684b85e7eb621f210041702e2a316d1d0eb62)
+
 
 <a name="v3.0.0-beta.3"></a>
-## [v3.0.0-beta.3] - 2022-11-29
+## [v3.0.0-beta.3] - 2022-11-30
 ### Features
 - **jsdoc:** Support destructuring of enums for defaultValue ([#775](https://github.com/SAP/ui5-builder/issues/775)) [`523f365`](https://github.com/SAP/ui5-builder/commit/523f365cb917997c5031d245309c21e9e4b3e311)
 
@@ -809,6 +825,8 @@ to load the custom bundle file instead.
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
 
 
+[v3.0.0-beta.5]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.4...v3.0.0-beta.5
+[v3.0.0-beta.4]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.3...v3.0.0-beta.4
 [v3.0.0-beta.3]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.2...v3.0.0-beta.3
 [v3.0.0-beta.2]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.1...v3.0.0-beta.2
 [v3.0.0-beta.1]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.12...v3.0.0-beta.1

package/lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -19,7 +19,7 @@ const log = logger.getLogger("lbt:analyzer:JSModuleAnalyzer");
 
 // ------------------------------------------------------------------------------------------------------------------
 
-const EnrichedVisitorKeys = (function() {
+export const EnrichedVisitorKeys = (function() {
 	function toBeDone() {
 		return null;
 	}
@@ -184,36 +184,23 @@ const EnrichedVisitorKeys = (function() {
 
 	// merge with 'official' visitor keys
 	Object.keys(VisitorKeys).forEach( (type) => {
-		// Ignore deprecated keys:
-		// - ExperimentalSpreadProperty => SpreadElement
-		// - ExperimentalRestProperty => RestElement
-		// They are about to be removed, see: https://github.com/eslint/eslint-visitor-keys/pull/36
-		if (type === "ExperimentalSpreadProperty" || type === "ExperimentalRestProperty") {
-			return;
-		}
-		// Ignore JSX visitor-keys because they aren't used.
-		if (type.startsWith("JSX")) {
-			return;
-		}
-
 		const visitorKeys = VisitorKeys[type];
 		const condKeys = TempKeys[type];
-		if ( condKeys === undefined ) {
-			// configuration missing in ConditionalKeys, maybe a new syntax ?
-			throw new Error(`unknown estree node type '${type}', new syntax?`);
-		} else if ( Array.isArray(condKeys) ) {
+		if ( Array.isArray(condKeys) ) {
 			// check configured keys against visitor keys
 			condKeys.forEach( (key) => {
-				if ( visitorKeys.indexOf(key) < 0 ) {
+				if ( !visitorKeys.includes(key) ) {
 					throw new Error(`configuration for type '${type}' contains unknown key '${key}'`);
 				}
 			});
 			TempKeys[type] = visitorKeys.map( (key) => ({
 				key: key,
-				conditional: condKeys.indexOf(key) >= 0
+				conditional: condKeys.includes(key)
 			}) );
-		} else {
+		} else if (condKeys === null) {
 			// this is a 'toBeDone' node type, keep null and complain at runtime when such a node occurs
+		} else {
+			// undefined => ignored node type (see JSModuleAnalyzer consistency test)
 		}
 	});
 
@@ -749,7 +736,7 @@ class JSModuleAnalyzer {
 				const value = getStringValue(item);
 				if ( value !== undefined ) {
 					// ignore special AMD dependencies (require, exports, module)
-					if ( SPECIAL_AMD_DEPENDENCIES.indexOf(value) >= 0 ) {
+					if ( SPECIAL_AMD_DEPENDENCIES.includes(value) ) {
 						return;
 					}
 					let requiredModule;

package/lib/lbt/utils/parseUtils.js

@@ -3,11 +3,19 @@ import {parse} from "espree";
 
 const hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
 
+/*
+ * NOTE: After updating the ecmaVersion:
+ * - Adopt JSModuleAnalyzer to handle new Syntax / VisitorKeys.
+ * - Adjust the JSModuleAnalyzer test "Check for consistency between VisitorKeys and EnrichedVisitorKeys"
+ *   (See comments in test for details)
+*/
+export const ecmaVersion = 2022;
+
 export function parseJS(code, userOptions = {}) {
 	// allowed options and their defaults
 	const options = {
 		comment: false,
-		ecmaVersion: 2022, // NOTE: Adopt JSModuleAnalyzer.js to allow new Syntax when upgrading to newer ECMA versions
+		ecmaVersion,
 		range: false,
 		sourceType: "script",
 	};

package/lib/tasks/bundlers/generateStandaloneAppBundle.js

@@ -91,18 +91,22 @@ export default async function({workspace, dependencies, taskUtil, options}) {
 			`unable to generate complete bundles for such projects.`);
 	}
 
-	let combo = new ReaderCollectionPrioritized({
+	const combo = new ReaderCollectionPrioritized({
 		name: `generateStandaloneAppBundle - prioritize workspace over dependencies: ${projectName}`,
 		readers: [workspace, dependencies]
 	});
 
+	let resourceReader = combo;
 	if (taskUtil) {
 		// Omit -dbg files
-		combo = await combo.filter(function(resource) {
-			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant);
+		resourceReader = await taskUtil.resourceFactory.createFilterReader({
+			reader: combo,
+			callback: function(resource) {
+				return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant);
+			}
 		});
 	}
-	const resources = await combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
+	const resources = await resourceReader.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
 
 	const isEvo = resources.find((resource) => {
 		return resource.getPath() === "/resources/ui5loader.js";
@@ -117,13 +121,16 @@ export default async function({workspace, dependencies, taskUtil, options}) {
 	let unoptimizedModuleNameMapping;
 	let unoptimizedResources = resources;
 	if (taskUtil) {
-		unoptimizedResources = await (await new ReaderCollectionPrioritized({
-			name: `generateStandaloneAppBundle - prioritize workspace over dependencies: ${projectName}`,
-			readers: [workspace, dependencies]
-		}).filter(function(resource) {
-			// Remove any non-debug variants
-			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.HasDebugVariant);
-		})).byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
+		const unoptimizedResourceReader = await taskUtil.resourceFactory.createFilterReader({
+			reader: combo,
+			callback: function(resource) {
+				// Remove any non-debug variants
+				return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.HasDebugVariant);
+			}
+		});
+
+		unoptimizedResources = await unoptimizedResourceReader
+			.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
 
 		unoptimizedModuleNameMapping = createModuleNameMapping({
 			resources: unoptimizedResources,

package/lib/tasks/jsdoc/generateJsdoc.js

@@ -1,12 +1,12 @@
 import logger from "@ui5/logger";
 const log = logger.getLogger("builder:tasks:jsdoc:generateJsdoc");
 import path from "node:path";
-import makeDir from "make-dir";
 import os from "node:os";
 import fs from "graceful-fs";
 import _rimraf from "rimraf";
 import {promisify} from "node:util";
 const mkdtemp = promisify(fs.mkdtemp);
+const mkdir = promisify(fs.mkdir);
 const rimraf = promisify(_rimraf);
 import jsdocGenerator from "../../processors/jsdoc/jsdocGenerator.js";
 import {createAdapter} from "@ui5/fs/resourceFactory";
@@ -38,12 +38,10 @@ import {createAdapter} from "@ui5/fs/resourceFactory";
  * @param {@ui5/fs/AbstractReader} parameters.dependencies Reader or Collection to read dependency files
  * @param {module:@ui5/builder/tasks/jsdoc/generateJsdoc~GenerateJsdocOptions} parameters.options Options
  * @param {@ui5/project/build/helpers/TaskUtil|object} [parameters.taskUtil] TaskUtil
- * @param {object} [parameters.buildContext] Internal, deprecated parameter
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
 export default async function generateJsdoc({
 	taskUtil,
-	buildContext,
 	workspace,
 	dependencies,
 	options = {}
@@ -58,11 +56,7 @@ export default async function generateJsdoc({
 	const {sourcePath: resourcePath, targetPath, tmpPath, cleanup} =
 		await utils.createTmpDirs(projectName);
 
-	// TODO 3.0: remove buildContext
-	const _taskUtil = taskUtil || buildContext;
-	if (_taskUtil) {
-		_taskUtil.registerCleanupTask(cleanup);
-	}
+	taskUtil?.registerCleanupTask(cleanup);
 
 	const [writtenResourcesCount] = await Promise.all([
 		utils.writeResourcesToDir({
@@ -111,12 +105,12 @@ const utils = {
 		const tmpDirPath = await utils.createTmpDir(projectName);
 
 		const sourcePath = path.join(tmpDirPath, "src"); // dir will be created by writing project resources below
-		await makeDir(sourcePath, {fs});
+		await mkdir(sourcePath, {recursive: true});
 		const targetPath = path.join(tmpDirPath, "target"); // dir will be created by jsdoc itself
-		await makeDir(targetPath, {fs});
+		await mkdir(targetPath, {recursive: true});
 
 		const tmpPath = path.join(tmpDirPath, "tmp"); // dir needs to be created by us
-		await makeDir(tmpPath, {fs});
+		await mkdir(tmpPath, {recursive: true});
 
 		return {
 			sourcePath,
@@ -139,7 +133,7 @@ const utils = {
 		const sanitizedProjectName = projectName.replace(/[^A-Za-z0-9]/g, "");
 
 		const tmpRootPath = path.join(os.tmpdir(), "ui5-tooling");
-		await makeDir(tmpRootPath, {fs});
+		await mkdir(tmpRootPath, {recursive: true});
 
 		// Appending minus sign also because node docs advise to "avoid trailing X characters in prefix"
 		return mkdtemp(path.join(tmpRootPath, `jsdoc-${sanitizedProjectName}-`));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "3.0.0-beta.3",
+	"version": "3.0.0-beta.5",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -119,7 +119,7 @@
 	},
 	"dependencies": {
 		"@jridgewell/sourcemap-codec": "^1.4.14",
-		"@ui5/fs": "^3.0.0-beta.3",
+		"@ui5/fs": "^3.0.0-beta.4",
 		"@ui5/logger": "^3.0.1-beta.1",
 		"cheerio": "1.0.0-rc.12",
 		"escape-unicode": "^0.2.0",
@@ -127,18 +127,17 @@
 		"espree": "^9.4.1",
 		"graceful-fs": "^4.2.10",
 		"jsdoc": "^3.6.11",
-		"less-openui5": "^0.11.2",
-		"make-dir": "^3.1.0",
+		"less-openui5": "^0.11.5",
 		"pretty-data": "^0.40.0",
 		"replacestream": "^4.0.3",
 		"rimraf": "^3.0.2",
 		"semver": "^7.3.8",
-		"terser": "^5.16.0",
+		"terser": "^5.16.1",
 		"xml2js": "^0.4.23"
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.0.0-beta.3",
+		"@ui5/project": "^3.0.0-beta.4",
 		"ava": "^5.1.0",
 		"chai": "^4.3.7",
 		"chai-fs": "^2.0.0",
@@ -146,15 +145,15 @@
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
 		"docdash": "^2.0.0",
-		"eslint": "^8.28.0",
+		"eslint": "^8.29.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^13.2.0",
 		"eslint-plugin-jsdoc": "^39.6.4",
-		"esmock": "^2.0.9",
+		"esmock": "^2.1.0",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.1.0",
 		"recursive-readdir": "^2.2.3",
-		"sinon": "^14.0.2",
+		"sinon": "^15.0.0",
 		"tap-nyan": "^1.1.0",
 		"tap-xunit": "^2.4.1"
 	}