@ui5/builder 3.0.0-alpha.10 → 3.0.0-alpha.12

package/lib/lbt/analyzer/XMLCompositeAnalyzer.js

@@ -1,10 +1,10 @@
-"use strict";
 
-const {Syntax} = require("../utils/parseUtils");
-const SapUiDefine = require("../calls/SapUiDefine");
-const {getValue, isMethodCall, isString} = require("../utils/ASTUtils");
-const ModuleName = require("../utils/ModuleName");
-const log = require("@ui5/logger").getLogger("lbt:analyzer:XMLCompositeAnalyzer");
+import {Syntax} from "../utils/parseUtils.js";
+import SapUiDefine from "../calls/SapUiDefine.js";
+import {getValue, isMethodCall, getStringValue} from "../utils/ASTUtils.js";
+import {fromUI5LegacyName} from "../utils/ModuleName.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:analyzer:XMLCompositeAnalyzer");
 
 const CALL_DEFINE = ["define"];
 const CALL_SAP_UI_DEFINE = ["sap", "ui", "define"];
@@ -19,18 +19,30 @@ class XMLCompositeAnalyzer {
 			const XMLC = defineCall.findImportName("sap/ui/core/XMLComposite.js");
 			// console.log("local name for XMLComposite: %s", XMLC);
 			if ( XMLC && defineCall.factory ) {
-				defineCall.factory.body.body.forEach( (stmt) => {
-					if ( stmt.type === Syntax.VariableDeclaration ) {
-						stmt.declarations.forEach( (decl) => {
-							fragmentName = this._checkForXMLCClassDefinition( XMLC, decl.init ) || fragmentName;
-						});
-					} else if ( stmt.type === Syntax.ExpressionStatement &&
-								stmt.expression.type === Syntax.AssignmentExpression ) {
-						fragmentName = this._checkForXMLCClassDefinition( XMLC, stmt.expression.right ) || fragmentName;
-					}
-				});
-				if ( fragmentName ) {
-					const fragmentModule = ModuleName.fromUI5LegacyName( fragmentName, ".control.xml" );
+				if (defineCall.factory.type === Syntax.ArrowFunctionExpression &&
+					defineCall.factory.expression === true) {
+					fragmentName = this._checkForXMLCClassDefinition(XMLC, defineCall.factory.body);
+				} else {
+					defineCall.factory.body.body.forEach((stmt) => {
+						if (stmt.type === Syntax.VariableDeclaration) {
+							stmt.declarations.forEach((decl) => {
+								fragmentName = this._checkForXMLCClassDefinition(XMLC, decl.init) || fragmentName;
+							});
+						} else if (
+							stmt.type === Syntax.ReturnStatement &&
+							( stmt?.argument?.type === Syntax.CallExpression && stmt.argument.arguments?.length > 1 &&
+								stmt.argument.arguments[1].type === Syntax.ObjectExpression)) {
+							fragmentName =
+								this._checkForXMLCClassDefinition(XMLC, stmt.argument) || fragmentName;
+						} else if (stmt.type === Syntax.ExpressionStatement &&
+							stmt.expression.type === Syntax.AssignmentExpression) {
+							fragmentName =
+								this._checkForXMLCClassDefinition(XMLC, stmt.expression.right) || fragmentName;
+						}
+					});
+				}
+				if (fragmentName) {
+					const fragmentModule = fromUI5LegacyName(fragmentName, ".control.xml");
 					log.verbose("fragment control: add dependency to template fragment %s", fragmentModule);
 					info.addDependency(fragmentModule);
 				}
@@ -42,8 +54,9 @@ class XMLCompositeAnalyzer {
 		let fragmentName;
 		if ( isMethodCall(stmt, [XMLC, "extend"]) ) {
 			// log.verbose(stmt);
-			if ( stmt.arguments.length > 0 && isString(stmt.arguments[0]) ) {
-				fragmentName = stmt.arguments[0].value;
+			const value = getStringValue(stmt.arguments[0]);
+			if ( stmt.arguments.length > 0 && value ) {
+				fragmentName = value;
 			}
 			if ( stmt.arguments.length > 1 && stmt.arguments[1].type === Syntax.ObjectExpression ) {
 				fragmentName = this._analyzeXMLCClassDefinition(stmt.arguments[1]) || fragmentName;
@@ -54,12 +67,9 @@ class XMLCompositeAnalyzer {
 
 	_analyzeXMLCClassDefinition(clazz) {
 		// log.verbose(clazz);
-		const fragmentName = getValue(clazz, ["fragment"]);
-		if ( isString(fragmentName) ) {
-			return fragmentName.value;
-		}
+		return getStringValue(getValue(clazz, ["fragment"]));
 	}
 }
 
 
-module.exports = XMLCompositeAnalyzer;
+export default XMLCompositeAnalyzer;

package/lib/lbt/analyzer/XMLTemplateAnalyzer.js

@@ -1,4 +1,11 @@
-"use strict";
+
+import xml2js from "xml2js";
+import {fromUI5LegacyName, fromRequireJSName} from "../utils/ModuleName.js";
+import JSTokenizer from "../utils/JSTokenizer.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:analyzer:XMLTemplateAnalyzer");
+
+// ---------------------------------------------------------------------------------------------------------
 
 /*
  * TODOS
@@ -10,11 +17,6 @@
  * - move UI5 specific constants to UI5ClientConstants?
  */
 
-const xml2js = require("xml2js");
-const ModuleName = require("../utils/ModuleName");
-const JSTokenizer = require("../utils/JSTokenizer");
-const log = require("@ui5/logger").getLogger("lbt:analyzer:XMLTemplateAnalyzer");
-
 // ---------------------------------------------------------------------------------------------------------
 
 const XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
@@ -195,12 +197,12 @@ class XMLTemplateAnalyzer {
 
 		const controllerName = getAttribute(node, XMLVIEW_CONTROLLERNAME_ATTRIBUTE);
 		if ( controllerName ) {
-			this._addDependency( ModuleName.fromUI5LegacyName(controllerName, ".controller.js"), this.conditional );
+			this._addDependency( fromUI5LegacyName(controllerName, ".controller.js"), this.conditional );
 		}
 
 		const resourceBundleName = getAttribute(node, XMLVIEW_RESBUNDLENAME_ATTRIBUTE);
 		if ( resourceBundleName ) {
-			const resourceBundleModuleName = ModuleName.fromUI5LegacyName(resourceBundleName, ".properties");
+			const resourceBundleModuleName = fromUI5LegacyName(resourceBundleName, ".properties");
 			log.verbose("found dependency to resource bundle %s", resourceBundleModuleName);
 			// TODO locale dependent dependencies: this._addDependency(resourceBundleModuleName);
 			this._addDependency( resourceBundleModuleName, this.conditional );
@@ -229,7 +231,7 @@ class XMLTemplateAnalyzer {
 
 		} else if ( PATTERN_LIBRARY_NAMESPACES.test(namespace) ) {
 			// looks like a UI5 library or package name
-			const moduleName = ModuleName.fromUI5LegacyName( (namespace ? namespace + "." : "") + localName );
+			const moduleName = fromUI5LegacyName( (namespace ? namespace + "." : "") + localName );
 
 			this._analyzeCoreRequire(node);
 
@@ -283,7 +285,7 @@ class XMLTemplateAnalyzer {
 				Object.keys(requireContext).forEach((key) => {
 					const requireJsName = requireContext[key];
 					if ( requireJsName && typeof requireJsName === "string" ) {
-						this._addDependency(ModuleName.fromRequireJSName(requireJsName), this.conditional);
+						this._addDependency(fromRequireJSName(requireJsName), this.conditional);
 					} else {
 						log.error(`Ignoring core:require: '${key}' refers to invalid module name '${requireJsName}'`);
 					}
@@ -307,7 +309,7 @@ class XMLTemplateAnalyzer {
 				const componentName = getAttribute(node, COMPONENTCONTAINER_COMPONENTNAME_ATTRIBUTE);
 				if ( componentName ) {
 					const componentModuleName =
-						ModuleName.fromUI5LegacyName( componentName, "/Component.js" );
+						fromUI5LegacyName( componentName, "/Component.js" );
 					this._addDependency(componentModuleName, conditional);
 				}
 				// TODO what about component.json? handle it transitively via Component.js?
@@ -316,35 +318,35 @@ class XMLTemplateAnalyzer {
 				const type = getAttribute(node, FRAGMENT_TYPE_ATTRIBUTE);
 				if ( fragmentName && type ) {
 					const fragmentModuleName =
-						ModuleName.fromUI5LegacyName( fragmentName, this._getFragmentExtension(type) );
+						fromUI5LegacyName( fragmentName, this._getFragmentExtension(type) );
 					// console.log("child fragment detected %s", fragmentModuleName);
 					this._addDependency(fragmentModuleName, conditional);
 				}
 			} else if ( moduleName === HTMLVIEW_MODULE ) {
 				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
 				if ( viewName ) {
-					const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.html" );
+					const childViewModuleName = fromUI5LegacyName( viewName, ".view.html" );
 					// console.log("child view detected %s", childViewModuleName);
 					this._addDependency(childViewModuleName, conditional);
 				}
 			} else if ( moduleName === JSVIEW_MODULE ) {
 				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
 				if ( viewName ) {
-					const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.js" );
+					const childViewModuleName = fromUI5LegacyName( viewName, ".view.js" );
 					// console.log("child view detected %s", childViewModuleName);
 					this._addDependency(childViewModuleName, conditional);
 				}
 			} else if ( moduleName === JSONVIEW_MODULE ) {
 				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
 				if ( viewName ) {
-					const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.json" );
+					const childViewModuleName = fromUI5LegacyName( viewName, ".view.json" );
 					// console.log("child view detected %s", childViewModuleName);
 					this._addDependency(childViewModuleName, conditional);
 				}
 			} else if ( moduleName === XMLVIEW_MODULE ) {
 				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
 				if ( viewName ) {
-					const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.xml" );
+					const childViewModuleName = fromUI5LegacyName( viewName, ".view.xml" );
 					// console.log("child view detected %s", childViewModuleName);
 					this._addDependency(childViewModuleName, conditional);
 				}
@@ -361,4 +363,4 @@ class XMLTemplateAnalyzer {
 }
 
 
-module.exports = XMLTemplateAnalyzer;
+export default XMLTemplateAnalyzer;

package/lib/lbt/analyzer/analyzeLibraryJS.js

@@ -1,6 +1,8 @@
-"use strict";
-const {parseJS, Syntax, VisitorKeys} = require("../utils/parseUtils");
-const {getPropertyKey, isMethodCall, isIdentifier, getStringArray} = require("../utils/ASTUtils");
+
+import {parseJS, Syntax, VisitorKeys} from "../utils/parseUtils.js";
+import {getPropertyKey, isMethodCall, isIdentifier, getStringArray} from "../utils/ASTUtils.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:analyzer:LibraryJS");
 
 const CALL__SAP_UI_GETCORE = ["sap", "ui", "getCore"];
 
@@ -25,8 +27,14 @@ async function analyze(resource) {
 				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;
+				}
+
 				const key = getPropertyKey(prop);
 				const value = prop.value;
+
 				if ( key === "noLibraryCSS" &&
 						(value.type === Syntax.Literal && typeof value.value === "boolean") ) {
 					libInfo.noLibraryCSS = value.value;
@@ -38,6 +46,14 @@ async function analyze(resource) {
 					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() + "'"
+					);
 				}
 			});
 
@@ -81,12 +97,12 @@ async function analyze(resource) {
  *
  * Note: only the first initLibrary() call that is found with a DFS on the AST, will be evaluated.
  *
- * @param {module:@ui5/fs.Resource} resource library.js resource whose content should be analyzed
+ * @param {@ui5/fs/Resource} resource library.js resource whose content should be analyzed
  * @returns {Promise<object>} A Promise on the extract info object
  */
-module.exports = function(resource) {
+export default function(resource) {
 	if ( resource == null ) {
 		return Promise.resolve({});
 	}
 	return analyze(resource);
-};
+}

package/lib/lbt/bundle/AutoSplitter.js

@@ -1,11 +1,10 @@
-"use strict";
 
-const {pd} = require("pretty-data");
-
-const ModuleName = require("../utils/ModuleName");
-const {SectionType} = require("./BundleDefinition");
-const escapePropertiesFile = require("../utils/escapePropertiesFile");
-const log = require("@ui5/logger").getLogger("lbt:bundle:AutoSplitter");
+import {pd} from "pretty-data";
+import {toRequireJSName} from "../utils/ModuleName.js";
+import {SectionType} from "./BundleDefinition.js";
+import escapePropertiesFile from "../utils/escapePropertiesFile.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:bundle:AutoSplitter");
 
 const xmlHtmlPrePattern = /<(?:\w+:)?pre\b/;
 
@@ -72,7 +71,7 @@ class AutoSplitter {
 				break;
 			case SectionType.Require:
 				section.modules.forEach( (module) => {
-					totalSize += "sap.ui.requireSync('');".length + ModuleName.toRequireJSName(module).length;
+					totalSize += "sap.ui.requireSync('');".length + toRequireJSName(module).length;
 				});
 				break;
 			default:
@@ -90,7 +89,7 @@ class AutoSplitter {
 		const splittedModules = [];
 		let moduleNameWithPart = moduleDef.name;
 		if ( !/__part__/.test(moduleNameWithPart) ) {
-			moduleNameWithPart = ModuleName.toRequireJSName(moduleNameWithPart) + "-__part__.js";
+			moduleNameWithPart = toRequireJSName(moduleNameWithPart) + "-__part__.js";
 		}
 		// vars = Object.create(null);
 
@@ -177,7 +176,7 @@ class AutoSplitter {
 				currentModule.sections.push( currentSection );
 				section.modules.forEach( (module) => {
 					currentSection.filters.push( module );
-					totalSize += 21 + ModuleName.toRequireJSName(module).length;
+					totalSize += 21 + toRequireJSName(module).length;
 				});
 				break;
 			default:
@@ -257,4 +256,4 @@ class AutoSplitter {
 	} */
 }
 
-module.exports = AutoSplitter;
+export default AutoSplitter;

package/lib/lbt/bundle/Builder.js

@@ -1,22 +1,22 @@
 /* eslint quotes: ["error", "double", { "allowTemplateLiterals": true }] */
 // for consistency of write calls, we generally allow template literals
-"use strict";
 
-const path = require("path");
-const {pd} = require("pretty-data");
-const {parseJS, Syntax} = require("../utils/parseUtils");
-const {encode: encodeMappings, decode: decodeMappings} = require("@jridgewell/sourcemap-codec");
-
-const {isMethodCall} = require("../utils/ASTUtils");
-const ModuleName = require("../utils/ModuleName");
-const UI5ClientConstants = require("../UI5ClientConstants");
-const escapePropertiesFile = require("../utils/escapePropertiesFile");
-
-const BundleResolver = require("./Resolver");
-const BundleSplitter = require("./AutoSplitter");
-const {SectionType} = require("./BundleDefinition");
-const BundleWriter = require("./BundleWriter");
-const log = require("@ui5/logger").getLogger("lbt:bundle:Builder");
+import path from "node:path";
+import {pd} from "pretty-data";
+import {parseJS, Syntax} from "../utils/parseUtils.js";
+import {encode as encodeMappings, decode as decodeMappings} from "@jridgewell/sourcemap-codec";
+import {isMethodCall} from "../utils/ASTUtils.js";
+import {toUI5LegacyName, toRequireJSName} from "../utils/ModuleName.js";
+import {
+	MODULE__UI5LOADER, MODULE__UI5LOADER_AUTOCONFIG,
+	MODULE__JQUERY_SAP_GLOBAL, MODULE__SAP_UI_CORE_CORE} from "../UI5ClientConstants.js";
+import escapePropertiesFile from "../utils/escapePropertiesFile.js";
+import BundleResolver from "./Resolver.js";
+import BundleSplitter from "./AutoSplitter.js";
+import {SectionType} from "./BundleDefinition.js";
+import BundleWriter from "./BundleWriter.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:bundle:Builder");
 
 const sourceMappingUrlPattern = /\/\/# sourceMappingURL=(.+)\s*$/;
 const httpPattern = /^https?:\/\//i;
@@ -63,14 +63,14 @@ const EVOBundleFormat = {
 	},
 
 	requireSync(moduleName) {
-		return `sap.ui.requireSync("${ModuleName.toRequireJSName(moduleName)}");\n`;
+		return `sap.ui.requireSync("${toRequireJSName(moduleName)}");\n`;
 	},
 
 	shouldDecorate(resolvedModule) {
-		return resolvedModule.executes(UI5ClientConstants.MODULE__UI5LOADER) ||
-			resolvedModule.executes(UI5ClientConstants.MODULE__UI5LOADER_AUTOCONFIG) ||
-			resolvedModule.executes(UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL) ||
-			resolvedModule.executes(UI5ClientConstants.MODULE__SAP_UI_CORE_CORE);
+		return resolvedModule.executes(MODULE__UI5LOADER) ||
+			resolvedModule.executes(MODULE__UI5LOADER_AUTOCONFIG) ||
+			resolvedModule.executes(MODULE__JQUERY_SAP_GLOBAL) ||
+			resolvedModule.executes(MODULE__SAP_UI_CORE_CORE);
 	}
 };
 
@@ -232,11 +232,11 @@ class BundleBuilder {
 			/* NODE-TODO, moduleName is not defined
 				It should contain the name of the module which is currently build (1st parameter of _createBundle).
 				But when the ui5loader is present, declareRawModules should be forced to false anyhow.
-			this.outW.writeln("jQuery.sap.declare('", ModuleName.toUI5LegacyName(moduleName), "');");
+			this.outW.writeln("jQuery.sap.declare('", toUI5LegacyName(moduleName), "');");
 			*/
 			this.missingRawDeclarations.forEach( (module) => {
 				// 2nd parameter set to 'false': do not create namespaces - they nevertheless would come too late
-				this.outW.writeln(`jQuery.sap.declare('${ModuleName.toUI5LegacyName(module)}', false);`);
+				this.outW.writeln(`jQuery.sap.declare('${toUI5LegacyName(module)}', false);`);
 			});
 			this.missingRawDeclarations = [];
 		}
@@ -258,7 +258,7 @@ class BundleBuilder {
 				if ( section.declareRawModules ) {
 					this.missingRawDeclarations.push(moduleName);
 				}
-				if ( moduleName === UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL ) {
+				if ( moduleName === MODULE__JQUERY_SAP_GLOBAL ) {
 					this.jqglobalAvailable = true;
 				}
 			} else {
@@ -413,7 +413,7 @@ class BundleBuilder {
 	 *
 	 * @param {string} moduleName module name
 	 * @param {ModuleInfo} info
-	 * @param {module:@ui5/fs.Resource} resource
+	 * @param {@ui5/fs/Resource} resource
 	 * @returns {Promise<boolean>}
 	 */
 	async writePreloadModule(moduleName, info, resource) {
@@ -648,8 +648,8 @@ async function rewriteDefine({moduleName, moduleContent, moduleSourceMap}) {
 
 		// Inject module name if missing
 		if ( defineCall.arguments.length == 0 ||
-			defineCall.arguments[0].type !== Syntax.Literal ) {
-			let value = `"${ModuleName.toRequireJSName(moduleName)}"`;
+			![Syntax.Literal, Syntax.TemplateLiteral].includes(defineCall.arguments[0].type)) {
+			let value = `"${toRequireJSName(moduleName)}"`;
 			let index;
 
 			if (defineCall.arguments.length == 0) {
@@ -773,10 +773,7 @@ function createTransientSourceMap({moduleName, moduleContent, includeContent = f
 	return sourceMap;
 }
 
-module.exports = BundleBuilder;
+export default BundleBuilder;
 
-// Export local functions for testing only
-/* istanbul ignore else */
-if (process.env.NODE_ENV === "test") {
-	module.exports.__localFunctions__ = {rewriteDefine, createTransientSourceMap};
-}
+export const __localFunctions__ = (process.env.NODE_ENV === "test") ?
+	{rewriteDefine, createTransientSourceMap} : undefined;

package/lib/lbt/bundle/BundleDefinition.js

@@ -1,6 +1,4 @@
-"use strict";
-
-const SectionType = {
+export const SectionType = {
 	/**
 	 * The modules are assumed to exist already in the loading environment.
 	 */
@@ -31,5 +29,3 @@ const SectionType = {
 	 */
 	Require: "require"
 };
-
-module.exports.SectionType = SectionType;

package/lib/lbt/bundle/BundleWriter.js

@@ -1,4 +1,3 @@
-"use strict";
 
 
 const NL = "\n";
@@ -101,4 +100,4 @@ class BundleWriter {
 	}
 }
 
-module.exports = BundleWriter;
+export default BundleWriter;

package/lib/lbt/bundle/ResolvedBundleDefinition.js

@@ -1,8 +1,7 @@
-"use strict";
 
-const UI5ClientConstants = require("../UI5ClientConstants");
-const ModuleInfo = require("../resources/ModuleInfo");
-const {SectionType} = require("./BundleDefinition");
+import {MODULE__JQUERY_SAP_GLOBAL, MODULE__SAP_UI_CORE_CORE} from "../UI5ClientConstants.js";
+import ModuleInfo from "../resources/ModuleInfo.js";
+import {SectionType} from "./BundleDefinition.js";
 
 class ResolvedBundleDefinition {
 	constructor( bundleDefinition /* , vars*/) {
@@ -18,7 +17,7 @@ class ResolvedBundleDefinition {
 		return this.sections.some(
 			(section) =>
 				(section.mode === SectionType.Raw || section.mode === SectionType.Require) &&
-				section.modules.some((module) => module === UI5ClientConstants.MODULE__SAP_UI_CORE_CORE)
+				section.modules.some((module) => module === MODULE__SAP_UI_CORE_CORE)
 		);
 	}
 
@@ -26,7 +25,7 @@ class ResolvedBundleDefinition {
 		return this.sections.some(
 			(section) =>
 				section.mode === SectionType.Raw &&
-				section.modules.some((module) => module === UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL)
+				section.modules.some((module) => module === MODULE__JQUERY_SAP_GLOBAL)
 		);
 	}
 
@@ -108,4 +107,4 @@ class ResolvedSection {
 	}
 }
 
-module.exports = ResolvedBundleDefinition;
+export default ResolvedBundleDefinition;

package/lib/lbt/bundle/Resolver.js

@@ -1,15 +1,14 @@
 /**
  * Takes a bundle definition and resolves it against the given pool.
  */
-"use strict";
 
-const topologicalSort = require("../graph/topologicalSort");
-const UI5ClientConstants = require("../UI5ClientConstants");
-const ResourceFilterList = require("../resources/ResourceFilterList");
-
-const {SectionType} = require("./BundleDefinition");
-const ResolvedBundleDefinition = require("./ResolvedBundleDefinition");
-const log = require("@ui5/logger").getLogger("lbt:bundle:Resolver");
+import topologicalSort from "../graph/topologicalSort.js";
+import {getRendererName} from "../UI5ClientConstants.js";
+import ResourceFilterList from "../resources/ResourceFilterList.js";
+import {SectionType} from "./BundleDefinition.js";
+import ResolvedBundleDefinition from "./ResolvedBundleDefinition.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:bundle:Resolver");
 
 let dependencyTracker;
 
@@ -144,7 +143,7 @@ class BundleResolver {
 
 								// add renderer, if 'renderer' is configured and if it exists
 								if ( section.renderer ) {
-									const rendererModuleName = UI5ClientConstants.getRendererName( resourceName );
+									const rendererModuleName = getRendererName( resourceName );
 									promises.push( checkAndAddResource( rendererModuleName, depth + 1) );
 								}
 							}
@@ -324,5 +323,5 @@ class BundleResolver {
 }
 
 
-module.exports = BundleResolver;
+export default BundleResolver;
 

package/lib/lbt/calls/SapUiDefine.js

@@ -1,8 +1,7 @@
-"use strict";
 
-const {Syntax} = require("../utils/parseUtils");
-const ModuleName = require("../utils/ModuleName");
-const {isString, isBoolean} = require("../utils/ASTUtils");
+import {Syntax} from "../utils/parseUtils.js";
+import {resolveRelativeRequireJSName} from "../utils/ModuleName.js";
+import {isBoolean, getStringValue} from "../utils/ASTUtils.js";
 
 class SapUiDefineCall {
 	constructor(node, moduleName) {
@@ -11,6 +10,7 @@ class SapUiDefineCall {
 		this.dependencyArray = null;
 		this.factory = null;
 		this.exportAsGlobal = false;
+		this.paramNames = null;
 
 		const args = node.arguments;
 		if ( args == null ) {
@@ -27,28 +27,33 @@ class SapUiDefineCall {
 		let i = 0;
 		let params;
 
-		if ( i < args.length && isString(args[i]) ) {
+		const name = getStringValue(args[i]);
+		if ( i < args.length && name ) {
 			// assert(String)
-			this.name = args[i++].value;
+			this.name = name;
+			i++;
 		}
 
 		if ( i < args.length && args[i].type === Syntax.ArrayExpression ) {
 			this.dependencyArray = args[i++];
 			this.dependencies = this.dependencyArray.elements.map( (elem) => {
-				if ( !isString(elem) ) {
+				const value = getStringValue(elem);
+				if ( !value ) {
 					throw new TypeError();
 				}
-				return ModuleName.resolveRelativeRequireJSName(this.name, elem.value);
+				return resolveRelativeRequireJSName(this.name, value);
 			});
 			this.dependencyInsertionIdx = this.dependencyArray.elements.length;
 		}
 
-		if ( i < args.length && args[i].type === Syntax.FunctionExpression ) {
+		if ( i < args.length && (
+			args[i].type === Syntax.FunctionExpression || args[i].type === Syntax.ArrowFunctionExpression)
+		) {
 			this.factory = args[i++];
 			params = this.factory.params;
 			this.paramNames = params.map( (param) => {
 				if ( param.type !== Syntax.Identifier ) {
-					throw new TypeError();
+					return null;
 				}
 				return param.name;
 			});
@@ -88,4 +93,4 @@ class SapUiDefineCall {
 	}
 }
 
-module.exports = SapUiDefineCall;
+export default SapUiDefineCall;

package/lib/lbt/graph/dependencyGraph.js

@@ -1,6 +1,5 @@
-"use strict";
-
-const log = require("@ui5/logger").getLogger("lbt:graph:dependencyGraph");
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:graph:dependencyGraph");
 
 class Node {
 	constructor(name) {
@@ -64,7 +63,7 @@ async function createDependencyGraph(pool, roots, options) {
 	});
 }
 
-module.exports = createDependencyGraph;
+export default createDependencyGraph;
 
 // TODO introduce class Graph
 // TODO remove n0 here, only introduce it in dominator tree (using the Graph API)

package/lib/lbt/graph/dominatorTree.js

@@ -1,4 +1,5 @@
-"use strict";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:graph:dominatorTree");
 
 /**
  * Creates a dependency graph starting from the given set of root modules.
@@ -16,7 +17,6 @@
  * @private
  */
 function calculateDominatorTree({n0, nodes}) {
-	const log = require("@ui5/logger").getLogger("lbt:graph:dominatorTree");
 	// initialize set of dominators for each node
 	for ( const n of nodes.values() ) {
 		if ( n === n0 ) {
@@ -113,4 +113,4 @@ function calculateDominatorTree({n0, nodes}) {
 	return n0;
 }
 
-module.exports = calculateDominatorTree;
+export default calculateDominatorTree;

package/lib/lbt/graph/topologicalSort.js

@@ -1,6 +1,6 @@
-"use strict";
 
-const log = require("@ui5/logger").getLogger("lbt:graph:topologicalSort");
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:graph:topologicalSort");
 
 /**
  * Represents a module and its dependencies in a dependency graph.
@@ -186,4 +186,4 @@ function topologicalSort(pool, moduleNames) {
 		});
 }
 
-module.exports = topologicalSort;
+export default topologicalSort;