getStringValue: Use explicit check for undefined

To ensure same behavior is before
SAP · Aug 17, 2022 · 098331c · 098331c
1 parent da93b4d
commit 098331c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/lib/lbt/analyzer/JSModuleAnalyzer.js b/lib/lbt/analyzer/JSModuleAnalyzer.js
@@ -545,7 +545,7 @@ class JSModuleAnalyzer {
 			const args = node.arguments;
 			if (args.length > 0) {
 				const value = getStringValue(args[0]);
-				if (value) {
+				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
@@ -579,7 +579,7 @@ class JSModuleAnalyzer {
 			let name = null;
 			if ( i < nArgs ) {
 				const value = getStringValue( args[i] );
-				if ( value ) {
+				if ( value !== undefined ) {
 					name = ModuleName.fromRequireJSName(value);
 					if ( name === defaultName ) {
 						// hardcoded name equals the file name, so this definition qualifies as main module definition
@@ -629,21 +629,21 @@ class JSModuleAnalyzer {
 				for (let i = 0; i < nArgs; i++) {
 					const arg = args[i];
 					const value = getStringValue(arg);
-					if ( value ) {
+					if ( value !== undefined ) {
 						const requiredModuleName = ModuleName.fromUI5LegacyName( value );
 						info.addDependency(requiredModuleName, conditional);
 					} else if ( arg.type == Syntax.ConditionalExpression) {
 						const consequentValue = getStringValue(arg.consequent);
 						const alternateValue = getStringValue(arg.alternate);
-						if ( consequentValue ) {
+						if ( consequentValue !== undefined ) {
 							const requiredModuleName1 = ModuleName.fromUI5LegacyName( consequentValue );
 							info.addDependency(requiredModuleName1, true);
 						}
-						if ( alternateValue ) {
+						if ( alternateValue !== undefined ) {
 							const requiredModuleName2 = ModuleName.fromUI5LegacyName( alternateValue );
 							info.addDependency(requiredModuleName2, true);
 						}
-						if ( !consequentValue || !alternateValue ) {
+						if ( consequentValue === undefined || alternateValue === undefined ) {
 							log.verbose("jQuery.sap.require: cannot evaluate dynamic arguments: ", arg && arg.type);
 							info.dynamicDependencies = true;
 						}
@@ -662,7 +662,7 @@ class JSModuleAnalyzer {
 
 			if ( i < nArgs ) {
 				const value = getStringValue(args[i]);
-				if ( value ) {
+				if ( value !== undefined ) {
 					// sap.ui.requireSync does not support relative dependencies
 					const moduleName = ModuleName.fromRequireJSName( value );
 					info.addDependency(moduleName, conditional);
@@ -681,7 +681,7 @@ class JSModuleAnalyzer {
 			// determine the name of the module
 			if ( i < nArgs ) {
 				const value = getStringValue(args[i++]);
-				if ( value ) {
+				if ( value !== undefined ) {
 					const moduleName = ModuleName.fromRequireJSName( value );
 					info.addSubModule(moduleName);
 
@@ -740,7 +740,7 @@ class JSModuleAnalyzer {
 			// console.log(array);
 			array.forEach( (item) => {
 				const value = getStringValue(item);
-				if ( value ) {
+				if ( value !== undefined ) {
 					// ignore special AMD dependencies (require, exports, module)
 					if ( SPECIAL_AMD_DEPENDENCIES.indexOf(value) >= 0 ) {
 						return;

diff --git a/lib/lbt/utils/ASTUtils.js b/lib/lbt/utils/ASTUtils.js
@@ -25,6 +25,8 @@ function getStringValue(node) {
 		return node.value;
 	} else if (isTemplateLiteralWithoutExpression(node)) {
 		return node?.quasis?.[0]?.value?.cooked;
+	} else {
+		return undefined;
 	}
 }