JSModuleAnalyzer: Conditional handling of LogicalExpression

Author: matz3

lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -116,7 +116,7 @@ const EnrichedVisitorKeys = (function() {
 		ImportSpecifier: [], // imported, local
 		Literal: [],
 		LabeledStatement: [],
-		LogicalExpression: [],
+		LogicalExpression: ["right"],
 		MemberExpression: [],
 		MetaProperty: toBeDone(["meta", "property"]),
 		MethodDefinition: [],

test/fixtures/lbt/modules/es6-syntax.js

@@ -78,10 +78,7 @@ sap.ui.define([
 
 	};
 
-	// TODO: This is not detected as a conditional dependency -> Currently, these kind of logical operators are not analyzed
-	// m1 ?? sap.ui.require(['conditional/module11']);
-	// m1 && sap.ui.require(['conditional/module11']);
-	// m1 || sap.ui.require(['conditional/module11']);
+	m1 ?? sap.ui.require(['conditional/module11']);
 
 	// ObjectPattern as Id
 	const {module11, module12} = {

test/lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -496,7 +496,7 @@ test("ES6 Syntax", async (t) => {
 	const expected = [
 		"conditional/module1.js",
 		"conditional/module10.js",
-		// "conditional/module11.js", // TODO: see es6-syntax.js
+		"conditional/module11.js",
 		"conditional/module2.js",
 		"conditional/module3.js",
 		"conditional/module4.js",
@@ -674,6 +674,47 @@ test("ChainExpression", (t) => {
 		`ui5 module`);
 });
 
+test("LogicalExpression", (t) => {
+	const content = `
+	sap.ui.define(['require', 'static/module1'], (require, module1) => {
+		module1 && sap.ui.require(['conditional/module2']);
+		module1 || sap.ui.requireSync('conditional/module3');
+		module1 ?? jQuery.sap.require('conditional.module4');
+		!module1 && require(['conditional/module5']);
+
+		sap.ui.require(['static/module2']) && module1;
+		sap.ui.requireSync('static/module3') || module1;
+		jQuery.sap.require('static.module4') ?? module1;
+		require(['static/module5']) && module1;
+	});`;
+	const info = analyzeString(content, "modules/LogicalExpression.js");
+
+	const expected = [
+		"conditional/module2.js",
+		"conditional/module3.js",
+		"conditional/module4.js",
+		"conditional/module5.js",
+		"jquery.sap.global.js",
+		"static/module1.js",
+		"static/module2.js",
+		"static/module3.js",
+		"static/module4.js",
+		"static/module5.js",
+	];
+	const actual = info.dependencies.sort();
+	t.deepEqual(actual, expected, "module dependencies should match");
+	expected.forEach((dep) => {
+		t.is(info.isConditionalDependency(dep), /^conditional\//.test(dep),
+			`only dependencies to 'conditional/*' modules should be conditional (${dep})`);
+		t.is(info.isImplicitDependency(dep), !/^(?:conditional|static)\//.test(dep),
+			`all dependencies other than 'conditional/*' and 'static/*' should be implicit (${dep})`);
+	});
+	t.false(info.dynamicDependencies,
+		`no use of dynamic dependencies should have been detected`);
+	t.false(info.rawModule,
+		`ui5 module`);
+});
+
 test("Dynamic import (declare/require)", async (t) => {
 	const info = await analyze("modules/declare_dynamic_require.js");
 	t.true(info.dynamicDependencies,