[INTERNAL] XMLCompositeAnalyzer and JSModuleAnalyzer arrow function usage

Author: flovogt

lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -692,6 +692,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);
 					}

lib/lbt/analyzer/XMLCompositeAnalyzer.js

@@ -19,18 +19,24 @@ 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.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);
 				}

test/lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -702,6 +702,20 @@ jQuery.sap.registerPreloadedModules({
 		"submodule from jQuery.sap.registerPreloadedModules");
 });
 
+test("jQuery.sap.registerPreloadedModules (with ObjectExpression, version 1.0 and SpreadExpression)", (t) => {
+	const content = `
+jQuery.sap.registerPreloadedModules({
+	"modules": {
+		...foo
+	},
+	"version": "1.0"
+});
+`;
+	const info = analyzeString(content, "modules/registerPreloadedModules-ObjectExpression.js");
+	t.deepEqual(info.subModules, [],
+		"submodule from jQuery.sap.registerPreloadedModules are empty");
+});
+
 test("jQuery.sap.registerPreloadedModules (with ObjectExpression, version 2.0)", (t) => {
 	const content = `
 jQuery.sap.registerPreloadedModules({
@@ -716,6 +730,20 @@ jQuery.sap.registerPreloadedModules({
 		"submodule from jQuery.sap.registerPreloadedModules");
 });
 
+test("jQuery.sap.registerPreloadedModules (with ObjectExpression, version 2.0 and SpreadExpression)", (t) => {
+	const content = `
+jQuery.sap.registerPreloadedModules({
+	"modules": {
+		...foo
+	},
+	"version": "2.0"
+});
+`;
+	const info = analyzeString(content, "modules/registerPreloadedModules-ObjectExpression.js");
+	t.deepEqual(info.subModules, [],
+		"submodule from jQuery.sap.registerPreloadedModules are empty");
+});
+
 test("Module that contains jQuery.sap.declare should be derived as subModule", (t) => {
 	const content = `
 sap.ui.define([], function() {

test/lib/lbt/analyzer/XMLCompositeAnalyzer.js

@@ -23,6 +23,57 @@ test("integration: XMLComposite code", async (t) => {
 		"Dependency should be created from component name");
 });
 
+// TODO: Is it intended to be not supported to directly return the value
+test("integration: XMLComposite code without VariableDeclaration", async (t) => {
+	const code = `sap.ui.define([
+		'jquery.sap.global', 'sap/ui/core/XMLComposite'],
+		function(jQuery, XMLComposite) {
+		"use strict";
+		return XMLComposite.extend("composites.ButtonList", {});
+	});`;
+
+	const ast = parseJS(code);
+
+	const analyzer = new XMLCompositeAnalyzer();
+	const name = "composites.ButtonList";
+	const moduleInfo = new ModuleInfo();
+	await analyzer.analyze(ast, name, moduleInfo);
+	t.deepEqual(moduleInfo.dependencies, ["composites/ButtonList.control.xml"],
+		"Dependency should be created from component name");
+});
+
+test("integration: XMLComposite code with arrow function", async (t) => {
+	const code = `sap.ui.define([
+		'jquery.sap.global', 'sap/ui/core/XMLComposite'],
+		(jQuery, XMLComposite) => {
+		return XMLComposite.extend("composites.ButtonList", {});
+	});`;
+
+	const ast = parseJS(code);
+
+	const analyzer = new XMLCompositeAnalyzer();
+	const name = "composites.ButtonList";
+	const moduleInfo = new ModuleInfo();
+	await analyzer.analyze(ast, name, moduleInfo);
+	t.deepEqual(moduleInfo.dependencies, ["composites/ButtonList.control.xml"],
+		"Dependency should be created from component name");
+});
+
+test("integration: XMLComposite code with arrow function with implicit return", async (t) => {
+	const code = `sap.ui.define([
+		'jquery.sap.global', 'sap/ui/core/XMLComposite'],
+		(jQuery, XMLComposite) => XMLComposite.extend("composites.ButtonList", {}));`;
+
+	const ast = parseJS(code);
+
+	const analyzer = new XMLCompositeAnalyzer();
+	const name = "composites.ButtonList";
+	const moduleInfo = new ModuleInfo();
+	await analyzer.analyze(ast, name, moduleInfo);
+	t.deepEqual(moduleInfo.dependencies, ["composites/ButtonList.control.xml"],
+		"Dependency should be created from component name");
+});
+
 test("analyze: not an XMLComposite module", async (t) => {
 	const code = `sap.ui.define([
 		'jquery.sap.global', 'sap/ui/core/XMLComposite'],