Refactor: Extract SPM merge logic to improve code quality

Co-authored-by: farfromrefug <655344+farfromrefug@users.noreply.github.com>

Author: Copilot

lib/services/ios/spm-service.ts

@@ -24,6 +24,29 @@ export class SPMService implements ISPMService {
 		return spmPackages;
 	}
 
+	/**
+	 * Merges plugin SPM packages with app SPM packages.
+	 * App packages take precedence over plugin packages with the same name.
+	 * @param appPackages - Array of app SPM packages (modified in place)
+	 * @param pluginPackages - Array of plugin SPM packages to merge
+	 */
+	private mergePluginSPMPackages(
+		appPackages: IosSPMPackage[],
+		pluginPackages: IosSPMPackage[],
+	): void {
+		// include swift packages from plugin configs
+		// but allow app packages to override plugin packages with the same name
+		const appPackageNames = new Set(appPackages.map(pkg => pkg.name));
+		
+		for (const pluginPkg of pluginPackages) {
+			if (appPackageNames.has(pluginPkg.name)) {
+				this.$logger.trace(`SPM: app package overrides plugin package: ${pluginPkg.name}`);
+			} else {
+				appPackages.push(pluginPkg);
+			}
+		}
+	}
+
 	// note: this is not used anywhere at the moment.
 	// public hasSPMPackages(projectData: IProjectData): boolean {
 	// 	return this.getSPMPackages(projectData).length > 0;
@@ -41,17 +64,7 @@ export class SPMService implements ISPMService {
 			);
 
 			if (pluginSpmPackages?.length) {
-				// include swift packages from plugin configs
-				// but allow app packages to override plugin packages with the same name
-				const appPackageNames = new Set(spmPackages.map(pkg => pkg.name));
-				
-				for (const pluginPkg of pluginSpmPackages) {
-					if (appPackageNames.has(pluginPkg.name)) {
-						this.$logger.trace(`SPM: app package overrides plugin package: ${pluginPkg.name}`);
-					} else {
-						spmPackages.push(pluginPkg);
-					}
-				}
+				this.mergePluginSPMPackages(spmPackages, pluginSpmPackages);
 			}
 
 			if (!spmPackages.length) {

test/spm-service.ts

@@ -1,5 +1,22 @@
 import { assert } from "chai";
 
+/**
+ * Helper function to merge app and plugin SPM packages.
+ * App packages take precedence over plugin packages with the same name.
+ */
+function mergeSPMPackages(appPackages: any[], pluginPackages: any[]): any[] {
+	const spmPackages = [...appPackages];
+	const appPackageNames = new Set(spmPackages.map(pkg => pkg.name));
+	
+	for (const pluginPkg of pluginPackages) {
+		if (!appPackageNames.has(pluginPkg.name)) {
+			spmPackages.push(pluginPkg);
+		}
+	}
+	
+	return spmPackages;
+}
+
 describe("SPM Service - Package Override Logic", () => {
 	describe("merging app and plugin SPM packages", () => {
 		it("should allow app packages to override plugin packages with the same name", () => {
@@ -28,15 +45,7 @@ describe("SPM Service - Package Override Logic", () => {
 				},
 			];
 
-			// Simulate the merge logic from spm-service.ts
-			const spmPackages = [...appPackages];
-			const appPackageNames = new Set(spmPackages.map(pkg => pkg.name));
-			
-			for (const pluginPkg of pluginPackages) {
-				if (!appPackageNames.has(pluginPkg.name)) {
-					spmPackages.push(pluginPkg);
-				}
-			}
+			const spmPackages = mergeSPMPackages(appPackages, pluginPackages);
 
 			// Verify the result
 			assert.equal(spmPackages.length, 2, "Should have 2 packages total");
@@ -72,15 +81,7 @@ describe("SPM Service - Package Override Logic", () => {
 				},
 			];
 
-			// Simulate the merge logic
-			const spmPackages = [...appPackages];
-			const appPackageNames = new Set(spmPackages.map(pkg => pkg.name));
-			
-			for (const pluginPkg of pluginPackages) {
-				if (!appPackageNames.has(pluginPkg.name)) {
-					spmPackages.push(pluginPkg);
-				}
-			}
+			const spmPackages = mergeSPMPackages(appPackages, pluginPackages);
 
 			// Verify the result
 			assert.equal(spmPackages.length, 2, "Should include both plugin packages");
@@ -107,15 +108,7 @@ describe("SPM Service - Package Override Logic", () => {
 				},
 			];
 
-			// Simulate the merge logic
-			const spmPackages = [...appPackages];
-			const appPackageNames = new Set(spmPackages.map(pkg => pkg.name));
-			
-			for (const pluginPkg of pluginPackages) {
-				if (!appPackageNames.has(pluginPkg.name)) {
-					spmPackages.push(pluginPkg);
-				}
-			}
+			const spmPackages = mergeSPMPackages(appPackages, pluginPackages);
 
 			// Verify the result
 			assert.equal(spmPackages.length, 1, "Should have exactly 1 package");
@@ -154,15 +147,7 @@ describe("SPM Service - Package Override Logic", () => {
 				},
 			];
 
-			// Simulate the merge logic
-			const spmPackages = [...appPackages];
-			const appPackageNames = new Set(spmPackages.map(pkg => pkg.name));
-			
-			for (const pluginPkg of pluginPackages) {
-				if (!appPackageNames.has(pluginPkg.name)) {
-					spmPackages.push(pluginPkg);
-				}
-			}
+			const spmPackages = mergeSPMPackages(appPackages, pluginPackages);
 
 			// Verify the result
 			assert.equal(spmPackages.length, 3, "Should have all 3 packages");