refactor: extract addExtensionToProject method

Author: KristianDD

lib/definitions/xcode.d.ts

@@ -27,5 +27,34 @@ declare module "nativescript-dev-xcode" {
         updateBuildProperty(key: string, value: any): void;
 
         pbxXCBuildConfigurationSection(): any;
+
+        addTarget(targetName: string, targetType: string, targetPath?: string): target;
+        addBuildPhase(filePathsArray: string[],
+            buildPhaseType: string,
+            comment: string,
+            target?: string,
+            optionsOrFolderType?: Object|string,
+            subfolderPath?: string
+        ): any;
+        addToBuildSettings(buildSetting: string, value: any, targetUuid?: string): void;
+        addPbxGroup(
+            filePathsArray: string[],
+            name: string,
+            path: string,
+            sourceTree: string,
+            opt: {filesRelativeToProject?: boolean, target?: string, uuid?: string, isMain?: boolean }
+        ): group;
+        addBuildProperty(prop: string, value: any, build_name?: string, productName?: string): void;
+        addToHeaderSearchPaths(file: string|Object, productName?: string): void;
+    }
+
+    class target {
+        uuid: string;
+        pbxNativeTarget: {productName: string}
+    }
+
+    class group {
+        uuid: string;
+        pbxGroup: Object;
     }
 }

lib/node/xcode.ts

@@ -3,7 +3,8 @@ import * as xcode from "nativescript-dev-xcode";
 declare global {
 	type IXcode = typeof xcode;
 	export namespace IXcode {
-		export type project = typeof xcode.project;
+		export type target = xcode.target;
+		export type project = xcode.project;
 		export interface Options extends xcode.Options {} // tslint:disable-line
 	}
 }

lib/services/ios-project-service.ts

@@ -1126,39 +1126,45 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 				return stats.isDirectory() && !fileName.startsWith(".");
 			})
 			.forEach(extensionFolder => {
-				const extensionPath = path.join(extensionsFolderPath, extensionFolder);
-				const extensionRelativePath = path.relative(this.getPlatformData(projectData).projectRoot, extensionPath);
-				const group = this.getRootGroup(extensionFolder,  extensionPath);
-				const target = project.addTarget(extensionFolder, 'app_extension', extensionRelativePath);
-				project.addBuildPhase([], 'PBXSourcesBuildPhase', 'Sources', target.uuid);
-				project.addBuildPhase([], 'PBXResourcesBuildPhase', 'Resources', target.uuid);
-				project.addBuildPhase([], 'PBXFrameworksBuildPhase', 'Frameworks', target.uuid);
-
-				const extJsonPath = path.join(extensionsFolderPath, extensionFolder, "extension.json");
-				if(this.$fs.exists(extJsonPath)) {
-					const extensionJson = this.$fs.readJson(extJsonPath);
-					_.forEach(extensionJson.frameworks, framework => {
-						project.addFramework(
-							framework,
-							{ target: target.uuid }
-						);
-					});
-					if(extensionJson.assetcatalogCompilerAppiconName){
-						project.addToBuildSettings("ASSETCATALOG_COMPILER_APPICON_NAME", extensionJson.assetcatalogCompilerAppiconName, target.uuid);
-					}
-				}
-
-				project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true, target: target.uuid, filesRelativeToProject: true });
-				project.addBuildProperty("PRODUCT_BUNDLE_IDENTIFIER", `${projectData.projectIdentifiers.ios}.${extensionFolder}`, "Debug", extensionFolder);
-				project.addBuildProperty("PRODUCT_BUNDLE_IDENTIFIER", `${projectData.projectIdentifiers.ios}.${extensionFolder}`, "Release", extensionFolder);
-				targetUuids.push(target.uuid);
-				project.addToHeaderSearchPaths(group.path, target.pbxNativeTarget.productName);
+				const targetUuid = this.addExtensionToProject(extensionsFolderPath, extensionFolder, project, projectData);
+				targetUuids.push(targetUuid);
 			});
 
 		this.savePbxProj(project, projectData, true);
 		this.prepareExtensionSigning(targetUuids, projectData);
 	}
 
+	private addExtensionToProject(extensionsFolderPath: string, extensionFolder: string, project: IXcode.project, projectData: IProjectData): string {
+		const extensionPath = path.join(extensionsFolderPath, extensionFolder);
+		const extensionRelativePath = path.relative(this.getPlatformData(projectData).projectRoot, extensionPath);
+		const group = this.getRootGroup(extensionFolder,  extensionPath);
+		const target = project.addTarget(extensionFolder, 'app_extension', extensionRelativePath);
+		project.addBuildPhase([], 'PBXSourcesBuildPhase', 'Sources', target.uuid);
+		project.addBuildPhase([], 'PBXResourcesBuildPhase', 'Resources', target.uuid);
+		project.addBuildPhase([], 'PBXFrameworksBuildPhase', 'Frameworks', target.uuid);
+
+		const extJsonPath = path.join(extensionsFolderPath, extensionFolder, "extension.json");
+		if(this.$fs.exists(extJsonPath)) {
+			const extensionJson = this.$fs.readJson(extJsonPath);
+			_.forEach(extensionJson.frameworks, framework => {
+				project.addFramework(
+					framework,
+					{ target: target.uuid }
+				);
+			});
+			if(extensionJson.assetcatalogCompilerAppiconName){
+				project.addToBuildSettings("ASSETCATALOG_COMPILER_APPICON_NAME", extensionJson.assetcatalogCompilerAppiconName, target.uuid);
+			}
+		}
+
+		project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true, target: target.uuid, filesRelativeToProject: true });
+		project.addBuildProperty("PRODUCT_BUNDLE_IDENTIFIER", `${projectData.projectIdentifiers.ios}.${extensionFolder}`, "Debug", extensionFolder);
+		project.addBuildProperty("PRODUCT_BUNDLE_IDENTIFIER", `${projectData.projectIdentifiers.ios}.${extensionFolder}`, "Release", extensionFolder);
+		project.addToHeaderSearchPaths(group.path, target.pbxNativeTarget.productName);
+
+		return target.uuid
+	}
+
 	private prepareExtensionSigning(targetUuids: string[], projectData:IProjectData) {
 		const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData));
 		const signing = xcode.getSigning(projectData.projectName);