refactor(autofix): Fix handling for existing dependencies w/o argument

Author: RandomByte

src/autofix/solutions/amdImports.ts

@@ -17,8 +17,8 @@ interface DependencyMapValue {
 	trailingComma?: ts.Token<ts.SyntaxKind.CommaToken>;
 }
 
-const NO_PARAM_FOR_DEPENDENCY = Symbol("noParamForDependency");
-const UNSUPPORTED_PARAM_FOR_DEPENDENCY = Symbol("unsupportedParamForDependency");
+export const NO_PARAM_FOR_DEPENDENCY = Symbol("noParamForDependency");
+export const UNSUPPORTED_PARAM_FOR_DEPENDENCY = Symbol("unsupportedParamForDependency");
 type ModuleName = string;
 export type Dependencies = Map<ModuleName,
 	string | typeof NO_PARAM_FOR_DEPENDENCY | typeof UNSUPPORTED_PARAM_FOR_DEPENDENCY>;
@@ -211,27 +211,12 @@ export function addDependencies(
 
 	// Check whether requested imports are already available in the list of dependencies
 	for (const [dependencyModuleName, importRequest] of importRequests) {
-		// const dependencyModuleName = requestedModuleName;
-		// const existingDependency = dependenciesToRemove.has(requestedModuleName) ?
-		// 	undefined :
-		// 		dependencyMap.get(requestedModuleName);
-
-		// if (existingDependency) {
-		// 	// Reuse the existing dependency
-		// 	// Check whether a parameter name already exists for this dependency
-		// 	// Lookup needs to be based on the same index of the parameter in the factory function
-		// 	const existingParameter = parameters[existingDependency.index];
-		// 	if (existingParameter) {
-		// 		// Existing parameter can be reused
-		// 		importRequest.identifier = getParameterDeclarationText(existingParameter);
-		// 		continue;
-		// 	}
-		// }
-		// Add a new module dependency. Handing of missing parameters is done later
-		// const identifier = resolveUniqueName(dependencyModuleName, declaredIdentifiers);
-		// declaredIdentifiers.add(identifier);
-		// importRequest.identifier = identifier;
+		const existingDependency = dependenciesToRemove.has(dependencyModuleName) ?
+			undefined :
+				dependencyMap.get(dependencyModuleName);
+		// Add a new dependency
 		newDependencies.push({
+			existingDependency,
 			moduleName: dependencyModuleName,
 			identifier: importRequest.identifier,
 		});

src/autofix/solutions/generateChanges.ts

@@ -11,7 +11,7 @@ import parseModuleDeclaration from "../../linter/ui5Types/amdTranspiler/parseMod
 import parseRequire from "../../linter/ui5Types/amdTranspiler/parseRequire.js";
 import {getLogger} from "@ui5/logger";
 import Fix from "../../linter/ui5Types/fix/Fix.js";
-import {addDependencies, Dependencies, getDependencies, removeDependencies} from "./amdImports.js";
+import {addDependencies, Dependencies, getDependencies, NO_PARAM_FOR_DEPENDENCY, removeDependencies} from "./amdImports.js";
 import {resolveUniqueName} from "../../linter/ui5Types/utils/utils.js";
 
 const log = getLogger("linter:autofix:NoGlobals");
@@ -325,6 +325,19 @@ function mergeDependencyRequests(dependencyRequests: Set<DependencyRequest>,
 				fix.setIdentifierForDependency(depIdentifier, moduleName);
 				dependencyRequests.delete(dependencyRequest); // Request fulfilled
 				break;
+			} else if (depIdentifier === NO_PARAM_FOR_DEPENDENCY) {
+				// A dependency is declared, but the parameter is missing
+				// Create a unique name if the preferred identifier is already in use
+				// Use the first preferred identifier
+				const identifier = resolveUniqueName(moduleName, identifiers);
+
+				identifiers.add(identifier);
+				decl.moduleDeclarationInfo.importRequests.set(moduleName, {
+					identifier,
+				});
+				dependencyRequest.fix.setIdentifierForDependency(identifier, moduleName);
+				dependencyRequests.delete(dependencyRequest); // Request fulfilled
+				break;
 			}
 		}
 	}