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

package/CHANGELOG.md

@@ -2,10 +2,26 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.10...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.11...HEAD).
+
+<a name="v3.0.0-alpha.11"></a>
+## [v3.0.0-alpha.11] - 2022-10-12
+### Bug Fixes
+- **package.json:** Downgrade es5-ext dependency [`2b71707`](https://github.com/SAP/ui5-builder/commit/2b71707683480b26aab9957c09e5d22bce8a6450)
+
+### Dependency Updates
+- Bump escope from 3.6.0 to 4.0.0 [`e25af0d`](https://github.com/SAP/ui5-builder/commit/e25af0d9c1184916aa037b4b4ca23d15c5f2a408)
+
+### Features
+- **builder:** Improve support for ES6+ syntax  ([#774](https://github.com/SAP/ui5-builder/issues/774)) [`90385fe`](https://github.com/SAP/ui5-builder/commit/90385feb7cea1e5b864cff035b01263a492972a9)
+- **jsdoc:** Improve support for ES6+ syntax  ([#785](https://github.com/SAP/ui5-builder/issues/785)) [`187a6a3`](https://github.com/SAP/ui5-builder/commit/187a6a35000145d70bf41e0d8b724e5ea8d8dc78)
+
+### Reverts
+- [FIX] package.json: Downgrade es5-ext dependency
+
 
 <a name="v3.0.0-alpha.10"></a>
-## [v3.0.0-alpha.10] - 2022-08-08
+## [v3.0.0-alpha.10] - 2022-08-09
 
 <a name="v3.0.0-alpha.9"></a>
 ## [v3.0.0-alpha.9] - 2022-07-27
@@ -753,6 +769,7 @@ to load the custom bundle file instead.
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
 
 
+[v3.0.0-alpha.11]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.10...v3.0.0-alpha.11
 [v3.0.0-alpha.10]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.9...v3.0.0-alpha.10
 [v3.0.0-alpha.9]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.8...v3.0.0-alpha.9
 [v3.0.0-alpha.8]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.7...v3.0.0-alpha.8

package/lib/lbt/analyzer/FioriElementsAnalyzer.js

@@ -61,7 +61,7 @@
 const ModuleName = require("../utils/ModuleName");
 const SapUiDefine = require("../calls/SapUiDefine");
 const {parseJS, Syntax} = require("../utils/parseUtils");
-const {getValue, isMethodCall, isString} = require("../utils/ASTUtils");
+const {getValue, isMethodCall, getStringValue} = require("../utils/ASTUtils");
 const log = require("@ui5/logger").getLogger("lbt:analyzer:FioriElementAnalyzer");
 
 // ---------------------------------------------------------------------------------------------------------
@@ -165,24 +165,35 @@ class FioriElementsAnalyzer {
 			const TA = defineCall.findImportName("sap/fe/core/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"]));
 	}
 }
 

package/lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -5,7 +5,9 @@ const escope = require("escope");
 const ModuleName = require("../utils/ModuleName");
 const {Format: ModuleFormat} = require("../resources/ModuleInfo");
 const UI5ClientConstants = require("../UI5ClientConstants");
-const {findOwnProperty, getLocation, getPropertyKey, isMethodCall, isString} = require("../utils/ASTUtils");
+const {
+	findOwnProperty, getLocation, getPropertyKey,
+	isMethodCall, isString, getStringValue} = require("../utils/ASTUtils");
 const log = require("@ui5/logger").getLogger("lbt:analyzer:JSModuleAnalyzer");
 
 // ------------------------------------------------------------------------------------------------------------------
@@ -64,7 +66,7 @@ const EnrichedVisitorKeys = (function() {
 		BreakStatement: [],
 		CallExpression: [], // special handling
 		CatchClause: ["param", "body"],
-		ChainExpression: [],
+		ChainExpression: ["expression"],
 		ClassBody: [],
 		ClassDeclaration: [],
 		ClassExpression: [],
@@ -114,7 +116,7 @@ const EnrichedVisitorKeys = (function() {
 		ImportSpecifier: [], // imported, local
 		Literal: [],
 		LabeledStatement: [],
-		LogicalExpression: [],
+		LogicalExpression: ["right"],
 		MemberExpression: [],
 		MetaProperty: toBeDone(["meta", "property"]),
 		MethodDefinition: [],
@@ -541,21 +543,27 @@ class JSModuleAnalyzer {
 
 		function onDeclare(node) {
 			const args = node.arguments;
-			if ( args.length > 0 && isString(args[0]) ) {
-				const name = ModuleName.fromUI5LegacyName( args[0].value );
-				if ( nModuleDeclarations === 1 && !mainModuleFound) {
-					// if this is the first declaration, then this is the main module declaration
-					// note that this overrides an already given name
-					setMainModuleInfo(name, getDocumentation(node));
-				} else if ( nModuleDeclarations > 1 && name === info.name ) {
-					// ignore duplicate declarations (e.g. in behavior file of design time controls)
-					log.warn(`duplicate declaration of module name at ${getLocation(args)} in ${name}`);
+			if (args.length > 0) {
+				const value = getStringValue(args[0]);
+				if (value !== undefined) {
+					const name = ModuleName.fromUI5LegacyName(value);
+					if ( nModuleDeclarations === 1 && !mainModuleFound) {
+						// if this is the first declaration, then this is the main module declaration
+						// note that this overrides an already given name
+						setMainModuleInfo(name, getDocumentation(node));
+					} else if ( nModuleDeclarations > 1 && name === info.name ) {
+						// ignore duplicate declarations (e.g. in behavior file of design time controls)
+						log.warn(`duplicate declaration of module name at ${getLocation(args)} in ${name}`);
+					} else {
+						// otherwise it is just a submodule declaration
+						info.addSubModule(name);
+					}
+					return;
 				} else {
-					// otherwise it is just a submodule declaration
-					info.addSubModule(name);
+					log.error("jQuery.sap.declare: module name could not be determined from first argument:", args[0]);
 				}
 			} else {
-				log.error("jQuery.sap.declare: module name could not be determined from first argument:", args[0]);
+				log.error("jQuery.sap.declare: module name could not be determined, no arguments are given");
 			}
 		}
 
@@ -569,20 +577,26 @@ class JSModuleAnalyzer {
 
 			// determine the name of the module
 			let name = null;
-			if ( i < nArgs && isString(args[i]) ) {
-				name = ModuleName.fromRequireJSName( args[i++].value );
-				if ( name === defaultName ) {
-					// hardcoded name equals the file name, so this definition qualifies as main module definition
-					setMainModuleInfo(name, desc);
-				} else {
-					info.addSubModule(name);
-					if ( candidateName == null ) {
-						// remember the name and description in case no other module qualifies as main module
-						candidateName = name;
-						candidateDescription = desc;
+			if ( i < nArgs ) {
+				const value = getStringValue( args[i] );
+				if ( value !== undefined ) {
+					name = ModuleName.fromRequireJSName(value);
+					if ( name === defaultName ) {
+						// hardcoded name equals the file name, so this definition qualifies as main module definition
+						setMainModuleInfo(name, desc);
+					} else {
+						info.addSubModule(name);
+						if ( candidateName == null ) {
+							// remember the name and description in case no other module qualifies as main module
+							candidateName = name;
+							candidateDescription = desc;
+						}
 					}
+					i++;
 				}
-			} else {
+			}
+
+			if ( !name ) {
 				nUnnamedDefines++;
 				if ( nUnnamedDefines > 1 ) {
 					throw new Error(
@@ -614,15 +628,25 @@ class JSModuleAnalyzer {
 				// UI5 signature with one or many required modules
 				for (let i = 0; i < nArgs; i++) {
 					const arg = args[i];
-					if ( isString(arg) ) {
-						const requiredModuleName = ModuleName.fromUI5LegacyName( arg.value );
+					const value = getStringValue(arg);
+					if ( value !== undefined ) {
+						const requiredModuleName = ModuleName.fromUI5LegacyName( value );
 						info.addDependency(requiredModuleName, conditional);
-					} else if ( arg.type == Syntax.ConditionalExpression &&
-									isString(arg.consequent) && isString(arg.alternate) ) {
-						const requiredModuleName1 = ModuleName.fromUI5LegacyName( arg.consequent.value );
-						info.addDependency(requiredModuleName1, true);
-						const requiredModuleName2 = ModuleName.fromUI5LegacyName( arg.alternate.value );
-						info.addDependency(requiredModuleName2, true);
+					} else if ( arg.type == Syntax.ConditionalExpression) {
+						const consequentValue = getStringValue(arg.consequent);
+						const alternateValue = getStringValue(arg.alternate);
+						if ( consequentValue !== undefined ) {
+							const requiredModuleName1 = ModuleName.fromUI5LegacyName( consequentValue );
+							info.addDependency(requiredModuleName1, true);
+						}
+						if ( alternateValue !== undefined ) {
+							const requiredModuleName2 = ModuleName.fromUI5LegacyName( alternateValue );
+							info.addDependency(requiredModuleName2, true);
+						}
+						if ( consequentValue === undefined || alternateValue === undefined ) {
+							log.verbose("jQuery.sap.require: cannot evaluate dynamic arguments: ", arg && arg.type);
+							info.dynamicDependencies = true;
+						}
 					} else {
 						log.verbose("jQuery.sap.require: cannot evaluate dynamic arguments: ", arg && arg.type);
 						info.dynamicDependencies = true;
@@ -637,9 +661,10 @@ class JSModuleAnalyzer {
 			const i = 0;
 
 			if ( i < nArgs ) {
-				if ( isString(args[i]) ) {
+				const value = getStringValue(args[i]);
+				if ( value !== undefined ) {
 					// sap.ui.requireSync does not support relative dependencies
-					const moduleName = ModuleName.fromRequireJSName( args[i].value );
+					const moduleName = ModuleName.fromRequireJSName( value );
 					info.addDependency(moduleName, conditional);
 				} else {
 					log.verbose("sap.ui.requireSync: cannot evaluate dynamic arguments: ", args[i] && args[i].type);
@@ -654,18 +679,24 @@ class JSModuleAnalyzer {
 			let i = 0;
 
 			// determine the name of the module
-			if ( i < nArgs && isString(args[i]) ) {
-				const moduleName = ModuleName.fromRequireJSName( args[i++].value );
-				info.addSubModule(moduleName);
-
-				// add dependencies
-				// to correctly identify dependencies e.g. of a library-preload
-				const elementArg = args[i++];
-				if (elementArg && elementArg.type === Syntax.ArrayExpression) {
-					elementArg.elements.forEach((element) => {
-						const dependencyName = ModuleName.resolveRelativeRequireJSName(moduleName, element.value);
-						info.addDependency(dependencyName, conditional);
-					});
+			if ( i < nArgs ) {
+				const value = getStringValue(args[i++]);
+				if ( value !== undefined ) {
+					const moduleName = ModuleName.fromRequireJSName( value );
+					info.addSubModule(moduleName);
+
+					// add dependencies
+					// to correctly identify dependencies e.g. of a library-preload
+					const elementArg = args[i++];
+					if (elementArg && elementArg.type === Syntax.ArrayExpression) {
+						elementArg.elements.forEach((element) => {
+							const dependencyName = ModuleName.resolveRelativeRequireJSName(moduleName,
+								getStringValue(element));
+							info.addDependency(dependencyName, conditional);
+						});
+					}
+				} else {
+					log.warn("sap.ui.predefine call has a non supported type for module name (ignored)");
 				}
 			} else {
 				log.warn("sap.ui.predefine call is missing a module name (ignored)");
@@ -692,6 +723,9 @@ class JSModuleAnalyzer {
 			if ( modules && modules.type == Syntax.ObjectExpression ) {
 				modules.properties.forEach( function(property) {
 					let	moduleName = getPropertyKey(property);
+					if ( !moduleName ) {
+						return;
+					}
 					if ( namesUseLegacyNotation ) {
 						moduleName = ModuleName.fromUI5LegacyName(moduleName);
 					}
@@ -705,16 +739,17 @@ class JSModuleAnalyzer {
 		function analyzeDependencyArray(array, conditional, name) {
 			// console.log(array);
 			array.forEach( (item) => {
-				if ( isString(item) ) {
+				const value = getStringValue(item);
+				if ( value !== undefined ) {
 					// ignore special AMD dependencies (require, exports, module)
-					if ( SPECIAL_AMD_DEPENDENCIES.indexOf(item.value) >= 0 ) {
+					if ( SPECIAL_AMD_DEPENDENCIES.indexOf(value) >= 0 ) {
 						return;
 					}
 					let requiredModule;
 					if (name == null) {
-						requiredModule = ModuleName.fromRequireJSName( item.value );
+						requiredModule = ModuleName.fromRequireJSName( value );
 					} else {
-						requiredModule = ModuleName.resolveRelativeRequireJSName(name, item.value);
+						requiredModule = ModuleName.resolveRelativeRequireJSName(name, value);
 					}
 					info.addDependency( requiredModule, conditional );
 				} else {

package/lib/lbt/analyzer/SmartTemplateAnalyzer.js

@@ -28,7 +28,7 @@
 const ModuleName = require("../utils/ModuleName");
 const SapUiDefine = require("../calls/SapUiDefine");
 const {parseJS, Syntax} = require("../utils/parseUtils");
-const {getValue, isMethodCall, isString} = require("../utils/ASTUtils");
+const {getValue, isMethodCall, getStringValue} = require("../utils/ASTUtils");
 const log = require("@ui5/logger").getLogger("lbt:analyzer:SmartTemplateAnalyzer");
 
 // ---------------------------------------------------------------------------------------------------------
@@ -134,24 +134,35 @@ 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"]));
 	}
 }
 

package/lib/lbt/analyzer/XMLCompositeAnalyzer.js

@@ -2,7 +2,7 @@
 
 const {Syntax} = require("../utils/parseUtils");
 const SapUiDefine = require("../calls/SapUiDefine");
-const {getValue, isMethodCall, isString} = require("../utils/ASTUtils");
+const {getValue, isMethodCall, getStringValue} = require("../utils/ASTUtils");
 const ModuleName = require("../utils/ModuleName");
 const log = require("@ui5/logger").getLogger("lbt:analyzer:XMLCompositeAnalyzer");
 
@@ -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 = ModuleName.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,10 +67,7 @@ class XMLCompositeAnalyzer {
 
 	_analyzeXMLCClassDefinition(clazz) {
 		// log.verbose(clazz);
-		const fragmentName = getValue(clazz, ["fragment"]);
-		if ( isString(fragmentName) ) {
-			return fragmentName.value;
-		}
+		return getStringValue(getValue(clazz, ["fragment"]));
 	}
 }
 

package/lib/lbt/analyzer/analyzeLibraryJS.js

@@ -1,6 +1,7 @@
 "use strict";
 const {parseJS, Syntax, VisitorKeys} = require("../utils/parseUtils");
 const {getPropertyKey, isMethodCall, isIdentifier, getStringArray} = require("../utils/ASTUtils");
+const log = require("@ui5/logger").getLogger("lbt:analyzer:LibraryJS");
 
 const CALL__SAP_UI_GETCORE = ["sap", "ui", "getCore"];
 
@@ -25,8 +26,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 +45,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() + "'"
+					);
 				}
 			});
 

package/lib/lbt/bundle/Builder.js

@@ -648,7 +648,7 @@ async function rewriteDefine({moduleName, moduleContent, moduleSourceMap}) {
 
 		// Inject module name if missing
 		if ( defineCall.arguments.length == 0 ||
-			defineCall.arguments[0].type !== Syntax.Literal ) {
+			![Syntax.Literal, Syntax.TemplateLiteral].includes(defineCall.arguments[0].type)) {
 			let value = `"${ModuleName.toRequireJSName(moduleName)}"`;
 			let index;
 

package/lib/lbt/calls/SapUiDefine.js

@@ -2,7 +2,7 @@
 
 const {Syntax} = require("../utils/parseUtils");
 const ModuleName = require("../utils/ModuleName");
-const {isString, isBoolean} = require("../utils/ASTUtils");
+const {isBoolean, getStringValue} = require("../utils/ASTUtils");
 
 class SapUiDefineCall {
 	constructor(node, moduleName) {
@@ -11,6 +11,7 @@ class SapUiDefineCall {
 		this.dependencyArray = null;
 		this.factory = null;
 		this.exportAsGlobal = false;
+		this.paramNames = null;
 
 		const args = node.arguments;
 		if ( args == null ) {
@@ -27,28 +28,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 ModuleName.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;
 			});

package/lib/lbt/utils/ASTUtils.js

@@ -13,10 +13,31 @@ const {Syntax} = require("../utils/parseUtils");
  * @returns {boolean} Whether the node is a literal and whether its value matches the given string
  */
 function isString(node, literal) {
-	if ( node == null || node.type !== Syntax.Literal || typeof node.value !== "string" ) {
+	const value = getStringValue(node);
+	if (value === undefined) {
 		return false;
 	}
-	return literal == null ? true : node.value === literal;
+	return literal == null ? true: value === literal;
+}
+
+function getStringValue(node) {
+	if (isLiteral(node)) {
+		return node.value;
+	} else if (isTemplateLiteralWithoutExpression(node)) {
+		return node?.quasis?.[0]?.value?.cooked;
+	} else {
+		return undefined;
+	}
+}
+
+function isLiteral(node) {
+	return node && node.type === Syntax.Literal && typeof node.value === "string";
+}
+
+function isTemplateLiteralWithoutExpression(node) {
+	return node?.type === Syntax.TemplateLiteral &&
+		node?.expressions?.length === 0 &&
+		node?.quasis?.length === 1;
 }
 
 function isBoolean(node, literal) {
@@ -47,27 +68,27 @@ function isNamedObject(node, objectPath, length) {
 }
 
 function isIdentifier(node, name) {
-	if ( node.type != Syntax.Identifier ) {
-		return false;
-	}
-	if ( typeof name == "string" ) {
+	if ( node.type === Syntax.Identifier && typeof name == "string" ) {
 		return name === node.name;
+	} else if ( node.type === Syntax.Identifier && Array.isArray(name) ) {
+		return name.find((name) => name === node.name || name === "*") !== undefined;
+	} else if ( node.type === Syntax.ObjectPattern ) {
+		return node.properties.filter((childnode) => isIdentifier(childnode.key, name)).length > 0;
+	} else if ( node.type === Syntax.ArrayPattern ) {
+		return node.elements.filter((childnode) => isIdentifier(childnode, name)).length > 0;
+	} else {
+		return false;
 	}
-	for (let i = 0; i < name.length; i++) {
-		if ( name[i] === node.name || name[i] === "*" ) {
-			return true;
-		}
-	}
-	return false;
 }
 
 function getPropertyKey(property) {
-	if ( property.key.type === Syntax.Identifier ) {
+	if ( property.type === Syntax.SpreadElement ) {
+		// TODO: Support interpreting SpreadElements
+		return;
+	} else if ( property.key.type === Syntax.Identifier && property.computed !== true ) {
 		return property.key.name;
 	} else if ( property.key.type === Syntax.Literal ) {
 		return String(property.key.value);
-	} else {
-		throw new Error();
 	}
 }
 
@@ -102,10 +123,15 @@ function getValue(obj, names) {
  */
 function getStringArray(array, skipNonStringLiterals) {
 	return array.elements.reduce( (result, item) => {
-		if ( isString(item) ) {
-			result.push(item.value);
+		const value = getStringValue(item);
+		if ( value !== undefined ) {
+			result.push(value);
 		} else if ( !skipNonStringLiterals ) {
-			throw new TypeError("array element is not a string literal:" + item.type);
+			if (item.type === Syntax.TemplateLiteral) {
+				throw new TypeError("array element is a template literal with expressions");
+			} else {
+				throw new TypeError("array element is not a string literal: " + item.type);
+			}
 		}
 		return result;
 	}, []);
@@ -113,6 +139,7 @@ function getStringArray(array, skipNonStringLiterals) {
 
 module.exports = {
 	isString,
+	getStringValue,
 	isBoolean,
 	isMethodCall,
 	isNamedObject,