chore: fix comments

Author: KristianDD

lib/definitions/project.d.ts

@@ -472,12 +472,6 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS
 	getDeploymentTarget(projectData: IProjectData): any;
 }
 
-interface INativeSourceCodeGroup {
-	name: string;
-	path: string;
-	files: string[];
-}
-
 interface IValidatePlatformOutput {
 	checkEnvironmentRequirementsOutput: ICheckEnvironmentRequirementsOutput;
 }
@@ -576,8 +570,21 @@ interface ICocoaPodsPlatformManager {
  * Describes a service used to add and remove iOS extension
  */
 interface IIOSExtensionsService {
-	addExtensionsFromPath(extensionsFolderPath: string, projectData: IProjectData, platformData: IPlatformData, projectPath: string, project: IXcode.project): Promise<void>;
-	removeExtensions(project: IXcode.project, projectPath: string): void;
+	addExtensionsFromPath(options: IAddExtensionsFromPathOptions): Promise<void>;
+	removeExtensions(options: IRemoveExtensionsOptions): void;
+}
+
+interface IAddExtensionsFromPathOptions{
+	extensionsFolderPath: string;
+	projectData: IProjectData;
+	platformData: IPlatformData;
+	pbxProjPath: string;
+	project: IXcode.project;
+}
+
+interface IRemoveExtensionsOptions {
+	project: IXcode.project;
+	pbxProjPath: string
 }
 
 interface IRubyFunction {

lib/services/ios-extensions-service.ts

@@ -5,7 +5,7 @@ export class IOSExtensionsService implements IIOSExtensionsService {
 		private $pbxprojDomXcode: IPbxprojDomXcode) {
 	}
 
-	public async addExtensionsFromPath(extensionsFolderPath: string, projectData: IProjectData, platformData: IPlatformData, projectPath: string, project: IXcode.project): Promise<void> {
+	public async addExtensionsFromPath({extensionsFolderPath, projectData, platformData, pbxProjPath, project}: IAddExtensionsFromPathOptions): Promise<void> {
 		const targetUuids: string[] = [];
 		if (!this.$fs.exists(extensionsFolderPath)) {
 			return;
@@ -23,8 +23,8 @@ export class IOSExtensionsService implements IIOSExtensionsService {
 				targetUuids.push(targetUuid);
 			});
 
-		this.$fs.writeFile(projectPath, project.writeSync({omitEmptyValues: true}));
-		this.prepareExtensionSigning(targetUuids, projectData, projectPath);
+		this.$fs.writeFile(pbxProjPath, project.writeSync({omitEmptyValues: true}));
+		this.prepareExtensionSigning(targetUuids, projectData, pbxProjPath);
 	}
 
 	private addExtensionToProject(extensionsFolderPath: string, extensionFolder: string, project: IXcode.project, projectData: IProjectData, platformData: IPlatformData): string {
@@ -33,7 +33,6 @@ export class IOSExtensionsService implements IIOSExtensionsService {
 		const files = this.$fs.readDirectory(extensionPath)
 				.filter(filePath => !filePath.startsWith("."))
 				.map(filePath => path.join(extensionPath, filePath));
-		const group: INativeSourceCodeGroup = { name: extensionFolder, path: extensionPath, files};
 		const target = project.addTarget(extensionFolder, 'app_extension', extensionRelativePath);
 		project.addBuildPhase([], 'PBXSourcesBuildPhase', 'Sources', target.uuid);
 		project.addBuildPhase([], 'PBXResourcesBuildPhase', 'Resources', target.uuid);
@@ -53,10 +52,10 @@ export class IOSExtensionsService implements IIOSExtensionsService {
 			}
 		}
 
-		project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true, target: target.uuid, filesRelativeToProject: true });
+		project.addPbxGroup(files, extensionFolder, extensionPath, 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);
+		project.addToHeaderSearchPaths(extensionPath, target.pbxNativeTarget.productName);
 
 		return target.uuid;
 	}
@@ -80,9 +79,9 @@ export class IOSExtensionsService implements IIOSExtensionsService {
 		xcode.save();
 	}
 
-	public removeExtensions(project: IXcode.project, projectPath: string): void {
+	public removeExtensions({project, pbxProjPath}: IRemoveExtensionsOptions): void {
 		project.removeTargetsByProductType("com.apple.product-type.app-extension");
-		this.$fs.writeFile(projectPath, project.writeSync({omitEmptyValues: true}));
+		this.$fs.writeFile(pbxProjPath, project.writeSync({omitEmptyValues: true}));
 	}
 }
 

lib/services/ios-project-service.ts

@@ -15,6 +15,12 @@ import { IOSEntitlementsService } from "./ios-entitlements-service";
 import * as mobileprovision from "ios-mobileprovision-finder";
 import { BUILD_XCCONFIG_FILE_NAME, IosProjectConstants } from "../constants";
 
+interface INativeSourceCodeGroup {
+	name: string;
+	path: string;
+	files: string[];
+}
+
 const DevicePlatformSdkName = "iphoneos";
 const SimulatorPlatformSdkName = "iphonesimulator";
 
@@ -977,9 +983,9 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 			await this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
 		}
 
-		const pbxprojPath = this.getPbxProjPath(projectData);
+		const pbxProjPath = this.getPbxProjPath(projectData);
 		const project = this.createPbxProj(projectData);
-		this.$iOSExtensionsService.removeExtensions(project, pbxprojPath);
+		this.$iOSExtensionsService.removeExtensions({project, pbxProjPath});
 		await this.addExtensions(projectData);
 	}
 	public beforePrepareAllPlugins(): Promise<void> {
@@ -1102,16 +1108,16 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 			this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_EXTENSION_FOLDER
 		);
 		const platformData = this.getPlatformData(projectData);
-		const pbxProjectPath = this.getPbxProjPath(projectData);
+		const pbxProjPath = this.getPbxProjPath(projectData);
 		const project = this.createPbxProj(projectData);
-		await this.$iOSExtensionsService.addExtensionsFromPath(resorcesExtensionsPath, projectData, platformData, pbxProjectPath, project);
+		await this.$iOSExtensionsService.addExtensionsFromPath({extensionsFolderPath: resorcesExtensionsPath, projectData, platformData, pbxProjPath, project});
 		const plugins = await this.getAllInstalledPlugins(projectData);
 		for (const pluginIndex in plugins) {
 			const pluginData = plugins[pluginIndex];
 			const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
 
 			const extensionPath = path.join(pluginPlatformsFolderPath, constants.NATIVE_EXTENSION_FOLDER);
-			await this.$iOSExtensionsService.addExtensionsFromPath(extensionPath, projectData, platformData, pbxProjectPath, project);
+			await this.$iOSExtensionsService.addExtensionsFromPath({extensionsFolderPath: extensionPath, projectData, platformData, pbxProjPath, project});
 		}
 	}