refactor: Fix handling of non-string-literal dependencies

Author: matz3

src/autofix/solutions/amdImports.ts

@@ -98,6 +98,7 @@ export function addDependencies(
 
 	const dependencies = moduleDeclaration.dependencies?.elements;
 	const {dependencyMap, mostUsedQuoteStyle} = createDependencyInfo(dependencies, resourcePath);
+	let numberOfDependencies = dependencies?.length ?? 0;
 
 	const parameters = factory.parameters;
 	const parameterSyntax = getParameterSyntax(factory);
@@ -138,6 +139,9 @@ export function addDependencies(
 				});
 				dependencyMap.delete(requestedModuleName);
 
+				// Update number of dependencies
+				numberOfDependencies--;
+
 				// Ensure that the new dependency will be the same, e.g. in case it is a relative path
 				dependencyModuleName = existingDependency.node.text;
 			}
@@ -160,8 +164,8 @@ export function addDependencies(
 
 		const insertAfterDependencyElement = dependencies?.[insertAfterIndex];
 		if (insertAfterDependencyElement || (dependencies && insertAfterIndex === -1)) {
-			const existingDependenciesLeft = insertAfterIndex > -1 && dependencyMap.size > 0;
-			const existingDependenciesRight = insertAfterIndex === -1 && dependencyMap.size > 0;
+			const existingDependenciesLeft = insertAfterIndex > -1 && numberOfDependencies > 0;
+			const existingDependenciesRight = insertAfterIndex === -1 && numberOfDependencies > 0;
 			let value = existingDependenciesLeft ? (depsSeparator + newDependencyValue) : newDependencyValue;
 			value += existingDependenciesRight ? ", " : "";
 			const start = insertAfterDependencyElement?.getEnd() ?? dependencies.pos;

test/fixtures/autofix/GlobalsExistingDefineNonStringLiteralDeps.js

@@ -0,0 +1,11 @@
+sap.ui.define([
+	someModuleName
+], function(someModule) {
+
+	new sap.m.Button();
+
+	sap.ui.require([someOtherModuleName], function(someOtherModule) {
+		new sap.m.Input();
+	});
+
+});

test/lib/autofix/snapshots/autofix.fixtures.ts.md

@@ -128,6 +128,37 @@ Generated by [AVA](https://avajs.dev).
     });␊
     `
 
+## General: GlobalsExistingDefineNonStringLiteralDeps.js
+
+> Snapshot 1
+
+    [
+      {
+        coverageInfo: [],
+        errorCount: 0,
+        fatalErrorCount: 0,
+        filePath: 'GlobalsExistingDefineNonStringLiteralDeps.js',
+        messages: [],
+        warningCount: 0,
+      },
+    ]
+
+> AutofixResult: /GlobalsExistingDefineNonStringLiteralDeps.js
+
+    `sap.ui.define([␊
+    	someModuleName,␊
+    	"sap/m/Button"␊
+    ], function(someModule, Button) {␊
+    ␊
+    	new Button();␊
+    ␊
+    	sap.ui.require([someOtherModuleName, "sap/m/Input"], function(someOtherModule, Input) {␊
+    		new Input();␊
+    	});␊
+    ␊
+    });␊
+    `
+
 ## General: GlobalsExistingDefineSpecialGlobalAccess.js
 
 > Snapshot 1