@ui5/builder 3.0.5 → 3.0.7

package/CHANGELOG.md

@@ -2,10 +2,19 @@
 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.5...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
 
 <a name="v3.0.5"></a>
-## [v3.0.5] - 2023-06-02
+## [v3.0.5] - 2023-06-05
 ### Bug Fixes
 - **bundle/Builder:** Remove sourceMappingURL from modules embedded as string [`a2f410c`](https://github.com/SAP/ui5-builder/commit/a2f410c32945a6a25fdf47b7b06ccb7f21ef5716)
 
@@ -800,6 +809,8 @@ 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
 [v3.0.3]: https://github.com/SAP/ui5-builder/compare/v3.0.2...v3.0.3

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/analyzer/analyzeLibraryJS.js

@@ -1,10 +1,18 @@
 
 import {parseJS, Syntax, VisitorKeys} from "../utils/parseUtils.js";
 import {getPropertyKey, isMethodCall, isIdentifier, getStringArray} from "../utils/ASTUtils.js";
+import SapUiDefineCall from "../calls/SapUiDefine.js";
 import {getLogger} from "@ui5/logger";
 const log = getLogger("lbt:analyzer:LibraryJS");
 
 const CALL__SAP_UI_GETCORE = ["sap", "ui", "getCore"];
+const CALL_SAP_UI_DEFINE = ["sap", "ui", "define"];
+const CALL_AMD_DEFINE = ["define"];
+const AMD__LIB_INIT_RESOURCES = [
+	// Dependency definition, init library method name
+	["sap/ui/core/Core.js", "initLibrary"],
+	["sap/ui/core/Lib.js", "init"]
+];
 
 /*
  * Static Code Analyzer that extracts library information from the sap.ui.getCore().initLibrary()
@@ -19,45 +27,51 @@ async function analyze(resource) {
 		interfaces: []
 	};
 
+	const code = await resource.getBuffer();
+	const rootNode = parseJS(code);
+	let analyzedDefineCall = null;
+	visit( rootNode );
+
 	function visit(node) {
-		if ( node.type == Syntax.CallExpression &&
-				node.callee.type === Syntax.MemberExpression &&
-				isMethodCall(node.callee.object, CALL__SAP_UI_GETCORE) &&
-				isIdentifier(node.callee.property, "initLibrary") &&
-				node.arguments.length === 1 &&
-				node.arguments[0].type === Syntax.ObjectExpression ) {
-			node.arguments[0].properties.forEach( (prop) => {
-				if (prop.type === Syntax.SpreadElement) {
-					// SpreadElements are currently not supported
-					return;
-				}
+		if ( node.type === Syntax.CallExpression ) {
+			// Define call would always be at the top of the tree, so it'd
+			// be the first significant thing that's been found.
+			analyzedDefineCall = analyzedDefineCall || analyzeSapUiDefineCalls(node);
 
-				const key = getPropertyKey(prop);
-				const value = prop.value;
-
-				if ( key === "noLibraryCSS" &&
-						(value.type === Syntax.Literal && typeof value.value === "boolean") ) {
-					libInfo.noLibraryCSS = value.value;
-				} else if ( key === "types" && value.type == Syntax.ArrayExpression ) {
-					libInfo.types = getStringArray(value, true);
-				} else if ( key === "interfaces" && value.type == Syntax.ArrayExpression ) {
-					libInfo.interfaces = getStringArray(value, true);
-				} else if ( key === "controls" && value.type == Syntax.ArrayExpression ) {
-					libInfo.controls = getStringArray(value, true);
-				} else if ( key === "elements" && value.type == Syntax.ArrayExpression ) {
-					libInfo.elements = getStringArray(value, true);
-				} else if ( ["designtime", "dependencies", "extensions", "name", "version"].includes(key) ) {
-					// do nothing, for all other supported properties
-				} else {
-					log.error(
-						"Unexpected property '" + key +
-						"' or wrong type for '" + key +
-						"' in sap.ui.getCore().initLibrary call in '" + resource.getPath() + "'"
-					);
-				}
-			});
+			if (isInitLibraryCall(node)) {
+				node.arguments[0].properties.forEach( (prop) => {
+					if (prop.type === Syntax.SpreadElement) {
+						// SpreadElements are currently not supported
+						return;
+					}
+
+					const key = getPropertyKey(prop);
+					const value = prop.value;
 
-			return true; // abort, we're done
+					if ( key === "noLibraryCSS" &&
+							(value.type === Syntax.Literal && typeof value.value === "boolean") ) {
+						libInfo.noLibraryCSS = value.value;
+					} else if ( key === "types" && value.type == Syntax.ArrayExpression ) {
+						libInfo.types = getStringArray(value, true);
+					} else if ( key === "interfaces" && value.type == Syntax.ArrayExpression ) {
+						libInfo.interfaces = getStringArray(value, true);
+					} else if ( key === "controls" && value.type == Syntax.ArrayExpression ) {
+						libInfo.controls = getStringArray(value, true);
+					} else if ( key === "elements" && value.type == Syntax.ArrayExpression ) {
+						libInfo.elements = getStringArray(value, true);
+					} else if ( ["designtime", "dependencies", "extensions", "name", "version"].includes(key) ) {
+						// do nothing, for all other supported properties
+					} else {
+						log.error(
+							"Unexpected property '" + key +
+							"' or wrong type for '" + key +
+							"' for a library initialization call in '" + resource.getPath() + "'"
+						);
+					}
+				});
+
+				return true; // abort, we're done
+			}
 		}
 
 		for ( const key of VisitorKeys[node.type] ) {
@@ -76,8 +90,64 @@ async function analyze(resource) {
 		return false;
 	}
 
-	const code = await resource.getBuffer();
-	visit( parseJS(code) );
+	/**
+	 * Finds and extracts dependencies from sap.ui.define call
+	 *
+	 * @param {Node} node
+	 * @returns {SapUiDefineCall}
+	 */
+	function analyzeSapUiDefineCalls(node) {
+		// Analyze sap.ui.define calls
+		if ( [CALL_AMD_DEFINE, CALL_SAP_UI_DEFINE].some(
+			(defCall) => isMethodCall(node, defCall)) ) {
+			const defCall = new SapUiDefineCall(node, resource.getName());
+
+			return AMD__LIB_INIT_RESOURCES
+				// Resolve dependency variable names.
+				.map((dependency) => [defCall.findImportName(dependency[0]), dependency[1]])
+				// Remove potential dependencies that are not actually present.
+				.filter((dependency) => dependency[0]);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Determines whether the node is an initLibrary call.
+	 *
+	 * @param {Node} node
+	 * @returns {boolean}
+	 */
+	function isInitLibraryCall(node) {
+		// sap.ui.getCore()
+		if (
+			node.type == Syntax.CallExpression &&
+			node.callee.type === Syntax.MemberExpression &&
+			isMethodCall(node.callee.object, CALL__SAP_UI_GETCORE) &&
+			isIdentifier(node.callee.property, "initLibrary") &&
+			node.arguments.length === 1 &&
+			node.arguments[0].type === Syntax.ObjectExpression
+		) {
+			return true;
+		}
+
+		// Find a CallExpression that is initLibrary
+		// i.e. node.callee.object === "Core" && node.callee.property === "initLibrary"
+		if (
+			node.type === Syntax.CallExpression &&
+			node.callee.type === Syntax.MemberExpression &&
+			analyzedDefineCall &&
+			analyzedDefineCall.some((potentialDependency) =>
+				isMethodCall(node, potentialDependency)
+			) &&
+			node.arguments.length === 1 &&
+			node.arguments[0].type === Syntax.ObjectExpression
+		) {
+			return true;
+		}
+
+		return false;
+	}
 
 	return libInfo;
 }

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/lib/lbt/resources/ResourcePool.js

@@ -1,7 +1,6 @@
 import {parseJS} from "../utils/parseUtils.js";
 import ComponentAnalyzer from "../analyzer/ComponentAnalyzer.js";
 import SmartTemplateAnalyzer from "../analyzer/SmartTemplateAnalyzer.js";
-import FioriElementsAnalyzer from "../analyzer/FioriElementsAnalyzer.js";
 import XMLCompositeAnalyzer from "../analyzer/XMLCompositeAnalyzer.js";
 import JSModuleAnalyzer from "../analyzer/JSModuleAnalyzer.js";
 import XMLTemplateAnalyzer from "../analyzer/XMLTemplateAnalyzer.js";
@@ -94,8 +93,7 @@ async function determineDependencyInfo(resource, rawInfo, pool) {
 		if ( /(?:^|\/)Component\.js/.test(resource.name) ) {
 			promises.push(
 				new ComponentAnalyzer(pool).analyze(resource, info),
-				new SmartTemplateAnalyzer(pool).analyze(resource, info),
-				new FioriElementsAnalyzer(pool).analyze(resource, info)
+				new SmartTemplateAnalyzer(pool).analyze(resource, info)
 			);
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "3.0.5",
+	"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,36 +123,36 @@
 		"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.1",
-		"terser": "^5.17.7",
+		"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.1",
-		"ava": "^5.3.0",
+		"@ui5/project": "^3.4.1",
+		"ava": "^5.3.1",
 		"chai": "^4.3.7",
 		"chai-fs": "^2.0.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
 		"docdash": "^2.0.1",
-		"eslint": "^8.42.0",
+		"eslint": "^8.44.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
-		"eslint-plugin-jsdoc": "^46.2.2",
+		"eslint-plugin-jsdoc": "^46.4.3",
 		"esmock": "^2.3.1",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.2.0",
 		"recursive-readdir": "^2.2.3",
-		"sinon": "^15.1.0",
+		"sinon": "^15.2.0",
 		"tap-xunit": "^2.4.1"
 	}
 }

package/lib/lbt/analyzer/FioriElementsAnalyzer.js

@@ -1,201 +0,0 @@
-/**
- * Analyzes a FioriElements app and its underlying template components to collect dependency information.
- *
- * Tries to find a manifest.json in the same package. If it is found and if
- * it is a valid JSON, an "sap.fe" section is searched and evaluated in the following way
- * - for each entity set in the "entitySets" object, each sub-entry is checked for a "default"."template" property
- * - when found, that string is interpreted as the short name of a template component in package sap.fe.templates
- * - a dependency to that template component is added to the analyzed app
- *
- * For a full analysis, "routing" also should be taken into account. Only when a sub-entry of the entity set
- * is referenced by a route, then the template for that entry will be used. Routes thereby could form entry points.
- *
- * <pre>
- *  {
- *      ...
- *
- *      "sap.fe" : {
- *          "entitySets" : {
- *              "C_AIVS_MDBU_ArtistTP" : {
- *                  "feed": {
- *                      "default": {
- *                          "template": "ListReport"
- *                      }
- *                  },
- *                  "entry" : {
- *                      "default" : {
- *                          "outbound" : "musicV2Display"
- *                      }
- *                  }
- *              }
- *          },
- *          "routing" : {
- *              "routes" :{
- *                  "ArtistList": {
- *                      "target": "C_AIVS_MDBU_ArtistTP/feed"
- *                  }
- *              }
- *          }
- *      }
- *
- *      ...
- * </pre>
- *
- * The template component is analyzed in the following way:
- * - precondition: template component class is defined in an AMD-style module, using define or sap.ui.define
- * - precondition: the module 'sap/fe/core/TemplateAssembler' is imported
- * - precondition: a call to TemplateAssembler.getTemplateComponent is used to define the component class
- * - precondition: that call is used in a top level return statement of the factory function
- * - precondition: necessary parameters to that call are given as an object literal (no further coding)
- * - precondition: the settings define a managed property property 'metadata.properties.templateName' with a
- *                 defaultValue of type string
- * The default value of the property represents the template view of the template component.
- * The manifest of the template app in theory could specify an alternative template as setting.templateName,
- * but as of June 2017, this possibility is currently not used.
- *
- * This class can handle multiple concurrent analysis calls, it has no instance state other than the pool
- * (which is readonly).
- */
-
-import {fromUI5LegacyName} from "../utils/ModuleName.js";
-import SapUiDefine from "../calls/SapUiDefine.js";
-import {parseJS, Syntax} from "../utils/parseUtils.js";
-import {getValue, isMethodCall, getStringValue} from "../utils/ASTUtils.js";
-import {getLogger} from "@ui5/logger";
-const log = getLogger("lbt:analyzer:FioriElementAnalyzer");
-
-// ---------------------------------------------------------------------------------------------------------
-
-function each(obj, fn) {
-	if ( obj ) {
-		Object.keys(obj).forEach(
-			(key) => fn(obj[key], key, obj)
-		);
-	}
-}
-
-const CALL_DEFINE = ["define"];
-const CALL_SAP_UI_DEFINE = ["sap", "ui", "define"];
-
-/**
- * Analyzes the manifest for a Fiori Elements application (next to its Component.js) to find more dependencies.
- *
- * @private
- */
-class FioriElementsAnalyzer {
-	constructor(pool) {
-		this._pool = pool;
-	}
-
-	async analyze(resource, info) {
-		// ignore base class for components
-		if ( resource.name === "sap/ui/core/Component.js" ) {
-			return info;
-		}
-
-		const manifestName = resource.name.replace(/Component\.js$/, "manifest.json");
-		try {
-			const manifestResource = await this._pool.findResource(manifestName).catch(() => null);
-			if ( manifestResource ) {
-				const fileContent = await manifestResource.buffer();
-				await this._analyzeManifest( JSON.parse(fileContent.toString()), info );
-			} else {
-				log.verbose(`No manifest found for '${resource.name}', skipping analysis`);
-			}
-		} catch (err) {
-			log.error(`An error occurred while analyzing template app ${resource.name} (ignored): ${err.message}`);
-			log.verbose(err.stack);
-		}
-
-		return info;
-	}
-
-	/**
-	 * Evaluates a manifest after it has been read and parsed
-	 * and adds any newly found dependencies to the given info object.
-	 *
-	 * @param {object} manifest JSON with app descriptor structure
-	 * @param {ModuleInfo} info ModuleInfo object that should be enriched
-	 * @returns {ModuleInfo} ModuleInfo object that should be enriched
-	 * @private
-	 */
-	async _analyzeManifest( manifest, info ) {
-		const promises = [];
-		const st = (manifest && manifest["sap.fe"]) || {};
-
-		each(st.entitySets, (entitySetCfg) => {
-			each(entitySetCfg, (activityCfg, activity) => {
-				if ( activity === "entitySet" ) {
-					return;
-				}
-				each(activityCfg, (actionCfg) => {
-					if ( actionCfg.template ) {
-						const module = fromUI5LegacyName( "sap.fe.templates." +
-										actionCfg.template + ".Component" );
-						log.verbose(`Template app: Add dependency to template component ${module}`);
-						info.addDependency(module);
-						promises.push( this._analyzeTemplateComponent(module, actionCfg, info) );
-					}
-				});
-			});
-		});
-
-		return Promise.all(promises);
-	}
-
-	async _analyzeTemplateComponent(moduleName, pageConfig, appInfo) {
-		// console.log("analyzing template component %s", moduleName);
-		const resource = await this._pool.findResource(moduleName);
-		const code = await resource.buffer();
-		const ast = parseJS(code);
-		const defaultTemplateName = this._analyzeAST(moduleName, ast);
-		const templateName = (pageConfig.component && pageConfig.component.settings &&
-								pageConfig.component.settings.templateName) || defaultTemplateName;
-		if ( templateName ) {
-			const templateModuleName = fromUI5LegacyName( templateName, ".view.xml" );
-			log.verbose(`Template app: Add dependency to template view ${templateModuleName}`);
-			appInfo.addDependency(templateModuleName);
-		}
-	}
-
-	_analyzeAST(moduleName, ast) {
-		let templateName = "";
-		if ( ast.body.length > 0 && (isMethodCall(ast.body[0].expression, CALL_SAP_UI_DEFINE) ||
-				isMethodCall(ast.body[0].expression, CALL_DEFINE)) ) {
-			const defineCall = new SapUiDefine(ast.body[0].expression, moduleName);
-			const TA = defineCall.findImportName("sap/fe/core/TemplateAssembler.js");
-			// console.log("local name for TemplateAssembler: %s", TA);
-			if ( TA && defineCall.factory ) {
-				if (defineCall.factory.type === Syntax.ArrowFunctionExpression &&
-					defineCall.factory.expression === true) {
-					if ( this._isTemplateClassDefinition(TA, defineCall.factory.body) ) {
-						templateName =
-							this._analyzeTemplateClassDefinition(defineCall.factory.body.arguments[2]) || templateName;
-					}
-				} else {
-					defineCall.factory.body.body.forEach( (stmt) => {
-						if ( stmt.type === Syntax.ReturnStatement &&
-							this._isTemplateClassDefinition(TA, stmt.argument)
-						) {
-							templateName =
-								this._analyzeTemplateClassDefinition(stmt.argument.arguments[2]) || templateName;
-						}
-					});
-				}
-			}
-		}
-		return templateName;
-	}
-
-	_isTemplateClassDefinition(TA, node) {
-		return isMethodCall(node, [TA, "getTemplateComponent"]) &&
-			node.arguments.length > 2 &&
-			node.arguments[2].type === "ObjectExpression";
-	}
-
-	_analyzeTemplateClassDefinition(clazz) {
-		return getStringValue(getValue(clazz, ["metadata", "properties", "templateName", "defaultValue"]));
-	}
-}
-
-export default FioriElementsAnalyzer;