@ui5/builder 3.0.6 → 3.0.7

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 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.6...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.7...HEAD).
+
+<a name="v3.0.7"></a>
+## [v3.0.7] - 2023-07-12
+### Bug Fixes
+- Don't report a missing module that's contained in another bundle ([#915](https://github.com/SAP/ui5-builder/issues/915)) [`8f23f38`](https://github.com/SAP/ui5-builder/commit/8f23f388f6d64f313ae8a89d0fcaf39ba905a70b)
+
 
 <a name="v3.0.6"></a>
 ## [v3.0.6] - 2023-06-21
@@ -803,6 +809,7 @@ to load the custom bundle file instead.
 
 ### Features
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
+[v3.0.7]: https://github.com/SAP/ui5-builder/compare/v3.0.6...v3.0.7
 [v3.0.6]: https://github.com/SAP/ui5-builder/compare/v3.0.5...v3.0.6
 [v3.0.5]: https://github.com/SAP/ui5-builder/compare/v3.0.4...v3.0.5
 [v3.0.4]: https://github.com/SAP/ui5-builder/compare/v3.0.3...v3.0.4

package/lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -3,7 +3,6 @@ import escope from "escope";
 import {fromUI5LegacyName, fromRequireJSName, resolveRelativeRequireJSName} from "../utils/ModuleName.js";
 import moduleInfo from "../resources/ModuleInfo.js";
 const ModuleFormat = moduleInfo.Format;
-import {MODULE__JQUERY_SAP_GLOBAL, MODULE__UI5LOADER_AUTOCONFIG} from "../UI5ClientConstants.js";
 import {
 	findOwnProperty,
 	getLocation,
@@ -335,17 +334,6 @@ class JSModuleAnalyzer {
 			}
 		}
 
-		// depending on the used module APIs, add an implicit dependency to the loader entry module
-		if ( info.format === ModuleFormat.UI5_LEGACY ) {
-			info.addImplicitDependency(MODULE__JQUERY_SAP_GLOBAL);
-		} else if ( info.format === ModuleFormat.UI5_DEFINE ) {
-			// Note: the implicit dependency for sap.ui.define modules points to the standard UI5
-			// loader config module. A more general approach would be to add a dependency to the loader
-			// only, but then standard configuration would be missed by dependency resolution
-			// (to be clarified)
-			info.addImplicitDependency(MODULE__UI5LOADER_AUTOCONFIG);
-		}
-
 		if ( !bIsUi5Module ) {
 			// when there are no indicators for module APIs, mark the module as 'raw' module
 			info.rawModule = true;

package/lib/lbt/analyzer/XMLTemplateAnalyzer.js

@@ -178,8 +178,6 @@ class XMLTemplateAnalyzer {
 				// console.log(result);
 				// clear();
 				if ( isFragment ) {
-					// all fragments implicitly depend on the fragment class
-					this.info.addImplicitDependency(FRAGMENT_MODULE);
 					this._analyzeNode(result);
 				} else {
 					// views require a special handling of the root node
@@ -196,8 +194,6 @@ class XMLTemplateAnalyzer {
 	}
 
 	_analyzeViewRootNode(node) {
-		this.info.addImplicitDependency(XMLVIEW_MODULE);
-
 		const controllerName = getAttribute(node, XMLVIEW_CONTROLLERNAME_ATTRIBUTE);
 		if ( controllerName ) {
 			this._addDependency( fromUI5LegacyName(controllerName, ".controller.js"), this.conditional );

package/lib/lbt/bundle/Resolver.js

@@ -51,6 +51,16 @@ class BundleResolver {
 		let selectedResources = Object.create(null);
 		let selectedResourcesSequence = [];
 		const pool = this.pool;
+		/**
+		 * Names of modules that are required in some way but could not be found
+		 * in the resource pool.
+		 */
+		const missingModules = Object.create(null);
+		/**
+		 * Names of modules that are included in non-decomposable bundles.
+		 * If they occur in the missingModules, then this is not an error.
+		 */
+		const includedModules = new Set();
 
 		/**
 		 * @param {JSModuleSectionDefinition} section
@@ -71,11 +81,16 @@ class BundleResolver {
 			}
 
 			function checkForDecomposableBundle(resource) {
-				if ( resource == null ||
-						resource.info == null ||
-						resource.info.subModules.length === 0 ||
-						/(?:^|\/)library.js$/.test(resource.info.name) ) {
-					return {resource, decomposable: false};
+				const isBundle =
+					resource?.info?.subModules.length > 0 &&
+					!/(?:^|\/)library.js$/.test(resource.info.name);
+
+				if (!isBundle) {
+					return {
+						resource,
+						isBundle,
+						decomposable: false
+					};
 				}
 
 				return Promise.all(
@@ -83,7 +98,11 @@ class BundleResolver {
 				).then((modules) => {
 					// it might look more natural to expect 'all' embedded modules to exist in the pool,
 					// but expecting only 'some' module to exist is a more conservative approach
-					return ({resource, decomposable: modules.some(($) => ($))});
+					return {
+						resource,
+						isBundle,
+						decomposable: modules.some(($) => ($))
+					};
 				});
 			}
 
@@ -105,20 +124,29 @@ class BundleResolver {
 						.catch( (err) => {
 							// if the caller provided an error message, log it
 							if ( msg ) {
-								log.error(msg);
+								missingModules[resourceName] ??= [];
+								missingModules[resourceName].push(msg);
 							}
 							// return undefined
 						})
 						.then( (resource) => checkForDecomposableBundle(resource) )
-						.then( ({resource, decomposable}) => {
+						.then( ({resource, isBundle, decomposable}) => {
 							const dependencyInfo = resource && resource.info;
 							let promises = [];
 
+							if ( isBundle && !decomposable ) {
+								resource.info.subModules.forEach(
+									(included) => {
+										includedModules.add(included);
+									}
+								);
+							}
+
 							if ( decomposable ) {
 								// bundles are not added, only their embedded modules
 								promises = dependencyInfo.subModules.map( (included) => {
 									return checkAndAddResource(included, depth + 1,
-										"**** error: missing submodule " + included + ", included by " + resourceName);
+										`**** error: missing submodule ${included}, included by ${resourceName}`);
 								});
 							} else if ( resource != null ) {
 								// trace.trace("    checking dependencies of " + resource.name );
@@ -136,8 +164,8 @@ class BundleResolver {
 											return;
 										}
 
-										return checkAndAddResource( required, depth + 1,
-											"**** error: missing module " + required + ", required by " + resourceName);
+										return checkAndAddResource(required, depth + 1,
+											`**** error: missing module ${required}, required by ${resourceName}`);
 									});
 								}
 
@@ -317,6 +345,17 @@ class BundleResolver {
 		// NODE-TODO if ( PerfMeasurement.ACTIVE ) PerfMeasurement.stop(PerfKeys.RESOLVE_MODULE);
 
 		return previous.then( function() {
+			// ignore missing modules that have been found in non-decomposable bundles
+			includedModules.forEach((included) => delete missingModules[included]);
+
+			// report the remaining missing modules
+			Object.keys(missingModules).sort().forEach((missing) => {
+				const messages = missingModules[missing];
+				messages.sort().forEach((msg) => {
+					log.error(msg);
+				});
+			});
+
 			log.verbose("  Resolving bundle done");
 
 			return resolved;

package/lib/lbt/resources/ModuleInfo.js

@@ -6,14 +6,6 @@
  */
 const STRICT = 0;
 
-/**
- * An implicit dependency is also strict, but has not been declared. E.g. each UI5 module depends on
- * jquery.sap.global.
- *
- * @private
- */
-const IMPLICIT = 1;
-
 /**
  * A conditional dependency has to be resolved only under certain conditions that typically are
  * checked at runtime.
@@ -112,7 +104,7 @@ class ModuleInfo {
 		// included already as a submodule.
 		// If the dependency was known already, update the kind
 		// only when the new kind is stronger than the current one.
-		// STRICT is stronger than IMPLICIT, IMPLICIT is stronger than CONDITIONAL
+		// STRICT is stronger than CONDITIONAL
 		if ( dependency &&
 				dependency !== this.name &&
 				this.subModules.indexOf(dependency) < 0 &&
@@ -121,10 +113,6 @@ class ModuleInfo {
 		}
 	}
 
-	addImplicitDependency(dependency) {
-		this._addDependency(dependency, IMPLICIT);
-	}
-
 	addDependency(dependency, conditional) {
 		this._addDependency(dependency, conditional ? CONDITIONAL : STRICT);
 	}
@@ -175,10 +163,6 @@ class ModuleInfo {
 		return this._dependencies[dependency] === CONDITIONAL;
 	}
 
-	isImplicitDependency(dependency) {
-		return this._dependencies[dependency] === IMPLICIT;
-	}
-
 	get name() {
 		return this._name;
 	}

package/lib/lbt/resources/ResourceCollector.js

@@ -124,7 +124,7 @@ class ResourceCollector {
 				moduleInfo.dependencies.forEach((dep) => {
 					if ( moduleInfo.isConditionalDependency(dep) ) {
 						resourceInfo.condRequired.add(dep);
-					} else if ( !moduleInfo.isImplicitDependency(dep) ) {
+					} else {
 						resourceInfo.required.add(dep);
 					}
 				});
@@ -158,7 +158,7 @@ class ResourceCollector {
 									if (!resourceInfo.required.has(dep)) {
 										resourceInfo.condRequired.add(dep);
 									}
-								} else if ( !subModuleInfo.isImplicitDependency(dep) ) {
+								} else {
 									// Move module from condRequired to required
 									if (resourceInfo.condRequired.has(dep)) {
 										resourceInfo.condRequired.delete(dep);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "3.0.6",
+	"version": "3.0.7",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -38,7 +38,7 @@
 		"unit": "rimraf test/tmp && ava",
 		"unit-verbose": "rimraf test/tmp && cross-env UI5_LOG_LVL=verbose ava --verbose --serial",
 		"unit-watch": "rimraf test/tmp && ava --watch",
-		"unit-xunit": "rimraf test/tmp && ava --node-arguments=\"--experimental-loader=@istanbuljs/esm-loader-hook\" --tap --timeout=1m | tap-xunit --dontUseCommentsAsTestNames=true > test-results.xml",
+		"unit-xunit": "rimraf test/tmp && ava --no-worker-threads --node-arguments=\"--experimental-loader=@istanbuljs/esm-loader-hook\" --tap --timeout=1m | tap-xunit --dontUseCommentsAsTestNames=true > test-results.xml",
 		"unit-inspect": "cross-env UI5_LOG_LVL=verbose ava debug --break",
 		"coverage": "rimraf test/tmp && nyc ava --node-arguments=\"--experimental-loader=@istanbuljs/esm-loader-hook\"",
 		"coverage-xunit": "nyc --reporter=text --reporter=text-summary --reporter=cobertura npm run unit-xunit",
@@ -123,20 +123,20 @@
 		"cheerio": "1.0.0-rc.12",
 		"escape-unicode": "^0.2.0",
 		"escope": "^4.0.0",
-		"espree": "^9.5.2",
+		"espree": "^9.6.0",
 		"graceful-fs": "^4.2.11",
 		"jsdoc": "^4.0.2",
 		"less-openui5": "^0.11.6",
 		"pretty-data": "^0.40.0",
 		"rimraf": "^5.0.1",
-		"semver": "^7.5.2",
-		"terser": "^5.18.1",
+		"semver": "^7.5.4",
+		"terser": "^5.18.2",
 		"workerpool": "^6.4.0",
 		"xml2js": "^0.6.0"
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.3.2",
+		"@ui5/project": "^3.4.1",
 		"ava": "^5.3.1",
 		"chai": "^4.3.7",
 		"chai-fs": "^2.0.0",
@@ -144,10 +144,10 @@
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
 		"docdash": "^2.0.1",
-		"eslint": "^8.43.0",
+		"eslint": "^8.44.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
-		"eslint-plugin-jsdoc": "^46.2.6",
+		"eslint-plugin-jsdoc": "^46.4.3",
 		"esmock": "^2.3.1",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.2.0",