@ui5/builder 3.0.0-alpha.8 → 3.0.0-beta.1

package/lib/lbt/analyzer/SmartTemplateAnalyzer.js

@@ -23,13 +23,13 @@
  * This class can handle multiple concurrent analysis calls, it has no instance state other than the pool
  * (which is readonly).
  */
-"use strict";
 
-const ModuleName = require("../utils/ModuleName");
-const SapUiDefine = require("../calls/SapUiDefine");
-const {parseJS, Syntax} = require("../utils/parseUtils");
-const {getValue, isMethodCall, isString} = require("../utils/ASTUtils");
-const log = require("@ui5/logger").getLogger("lbt:analyzer:SmartTemplateAnalyzer");
+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 logger from "@ui5/logger";
+const log = logger.getLogger("lbt:analyzer:SmartTemplateAnalyzer");
 
 // ---------------------------------------------------------------------------------------------------------
 
@@ -84,7 +84,7 @@ class TemplateComponentAnalyzer {
 		const st = (manifest && manifest["sap.ui.generic.app"]) || {};
 		function recursePage(page) {
 			if ( page.component && page.component.name ) {
-				const module = ModuleName.fromUI5LegacyName( page.component.name + ".Component" );
+				const module = fromUI5LegacyName( page.component.name + ".Component" );
 				log.verbose("template app: add dependency to template component %s", module);
 				info.addDependency(module);
 				promises.push( that._analyzeTemplateComponent(module, page, info) );
@@ -113,7 +113,7 @@ class TemplateComponentAnalyzer {
 			const templateName = (pageConfig.component && pageConfig.component.settings &&
 									pageConfig.component.settings.templateName) || defaultTemplateName;
 			if ( templateName ) {
-				const templateModuleName = ModuleName.fromUI5LegacyName( templateName, ".view.xml" );
+				const templateModuleName = fromUI5LegacyName( templateName, ".view.xml" );
 				log.verbose("template app: add dependency to template view %s", templateModuleName);
 				appInfo.addDependency(templateModuleName);
 			}
@@ -134,25 +134,36 @@ class TemplateComponentAnalyzer {
 			const TA = defineCall.findImportName("sap/suite/ui/generic/template/lib/TemplateAssembler.js");
 			// console.log("local name for TemplateAssembler: %s", TA);
 			if ( TA && defineCall.factory ) {
-				defineCall.factory.body.body.forEach( (stmt) => {
-					if ( stmt.type === Syntax.ReturnStatement &&
-							isMethodCall(stmt.argument, [TA, "getTemplateComponent"]) &&
-							stmt.argument.arguments.length > 2 &&
-							stmt.argument.arguments[2].type === "ObjectExpression" ) {
-						templateName = this._analyzeTemplateClassDefinition(stmt.argument.arguments[2]) || templateName;
+				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) {
-		const defaultValue = getValue(clazz, ["metadata", "properties", "templateName", "defaultValue"]);
-		if ( isString(defaultValue) ) {
-			return defaultValue.value;
-		}
+		return getStringValue(getValue(clazz, ["metadata", "properties", "templateName", "defaultValue"]));
 	}
 }
 
-module.exports = TemplateComponentAnalyzer;
+export default TemplateComponentAnalyzer;

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";
@@ -22,7 +24,7 @@ const SVG_NAMESPACE = "http://www.w3.org/2000/svg";
 const TEMPLATING_NAMESPACE = "http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1";
 const TEMPLATING_CONDITONAL_TAGS = /^(?:if|repeat)$/;
 
-const PATTERN_LIBRARY_NAMESPACES = /^([a-zA-Z_$][a-zA-z0-9_$]*(\.[a-zA-Z_$][a-zA-z0-9_$]*)*)$/;
+const PATTERN_LIBRARY_NAMESPACES = /^([a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*)$/;
 
 // component container
 const COMPONENTCONTAINER_MODULE = "sap/ui/core/ComponentContainer.js";
@@ -37,10 +39,12 @@ const FRAGMENT_FRAGMENTNAME_ATTRIBUTE = "fragmentName";
 const FRAGMENT_TYPE_ATTRIBUTE = "type";
 
 // different view types
+const VIEW_MODULE = "sap/ui/core/mvc/View.js";
 const HTMLVIEW_MODULE = "sap/ui/core/mvc/HTMLView.js";
 const JSVIEW_MODULE = "sap/ui/core/mvc/JSView.js";
 const JSONVIEW_MODULE = "sap/ui/core/mvc/JSONView.js";
 const XMLVIEW_MODULE = "sap/ui/core/mvc/XMLView.js";
+const TEMPLATEVIEW_MODULE = "sap/ui/core/mvc/TemplateView.js";
 const ANYVIEW_VIEWNAME_ATTRIBUTE = "viewName";
 const XMLVIEW_CONTROLLERNAME_ATTRIBUTE = "controllerName";
 const XMLVIEW_RESBUNDLENAME_ATTRIBUTE = "resourceBundleName";
@@ -48,6 +52,7 @@ const XMLVIEW_CORE_REQUIRE_ATTRIBUTE_NS = {
 	uri: "sap.ui.core",
 	local: "require"
 };
+const VIEW_TYPE_ATTRIBUTE = "type";
 
 /*
  * Helper to simplify access to node attributes.
@@ -195,12 +200,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 +234,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 +288,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 +312,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,38 +321,86 @@ 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);
+				}
+			} else if ( moduleName === TEMPLATEVIEW_MODULE ) {
+				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
+				if ( viewName ) {
+					const childViewModuleName = fromUI5LegacyName( viewName, ".view.tmpl" );
 					// console.log("child view detected %s", childViewModuleName);
 					this._addDependency(childViewModuleName, conditional);
 				}
+			} else if ( moduleName === VIEW_MODULE ) {
+				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
+				if ( viewName ) {
+					let childViewModuleName;
+
+					if (viewName.startsWith("module:")) {
+						childViewModuleName = viewName.slice("module:".length) + ".js";
+					} else {
+						const viewType = getAttribute(node, VIEW_TYPE_ATTRIBUTE);
+
+						let viewTypeExtension;
+
+						switch (viewType) {
+						case "JS":
+							viewTypeExtension = ".view.js";
+							break;
+						case "JSON":
+							viewTypeExtension = ".view.json";
+							break;
+						case "Template":
+							viewTypeExtension = ".view.tmpl";
+							break;
+						case "XML":
+							viewTypeExtension = ".view.xml";
+							break;
+						case "HTML":
+							viewTypeExtension = ".view.html";
+							break;
+						default:
+							log.warn(`Unable to analyze sap.ui5/rootView: Unknown type '${viewType}'`);
+						}
+
+						if (viewTypeExtension) {
+							childViewModuleName = fromUI5LegacyName(viewName, viewTypeExtension);
+						}
+					}
+					if (childViewModuleName) {
+						// console.log("child view detected %s", childViewModuleName);
+						this._addDependency(childViewModuleName, conditional);
+					}
+				}
 			}
 		} catch (err) {
 			// ignore missing resources
@@ -361,4 +414,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) {
@@ -539,7 +539,7 @@ class BundleBuilder {
 		const sourceMapUrlMatch = moduleContent.match(sourceMappingUrlPattern);
 		if (sourceMapUrlMatch) {
 			const sourceMapUrl = sourceMapUrlMatch[1];
-			log.verbose(`Found source map reference in content of module ${moduleName}: ${sourceMapUrl}`);
+			log.silly(`Found source map reference in content of module ${moduleName}: ${sourceMapUrl}`);
 
 			// Strip sourceMappingURL from module code to be bundled
 			// It has no effect and might be cause for confusion
@@ -578,7 +578,7 @@ class BundleBuilder {
 			}
 		} else {
 			const sourceMapFileCandidate = resourcePath.slice("/resources/".length) + ".map";
-			log.verbose(`Could not find a sourceMappingURL reference in content of module ${moduleName}. ` +
+			log.silly(`Could not find a sourceMappingURL reference in content of module ${moduleName}. ` +
 				`Attempting to find a source map resource based on the module's path: ${sourceMapFileCandidate}`);
 			try {
 				const sourceMapResource = await this.pool.findResource(sourceMapFileCandidate);
@@ -587,7 +587,7 @@ class BundleBuilder {
 				}
 			} catch (e) {
 				// No input source map
-				log.verbose(`Could not find a source map for module ${moduleName}: ${e.message}`);
+				log.silly(`Could not find a source map for module ${moduleName}: ${e.message}`);
 			}
 		}
 
@@ -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;