fix(ios): resolve NativeSource paths against the project

They were resolved against the working directory, so running from outside the project with --path found no files and left the group empty, and the build failed on the missing types.

Author: rigor789

lib/services/ios-project-service.ts

@@ -1532,7 +1532,11 @@ export class IOSProjectService
 		projectData: IProjectData,
 	): Promise<void> {
 		const project = this.createPbxProj(projectData);
-		const group = await this.getRootGroup(groupName, sourceFolderPath);
+		const group = await this.getRootGroup(
+			groupName,
+			sourceFolderPath,
+			projectData.projectDir,
+		);
 		// pin the sources to the main app target: without an explicit target the
 		// underlying xcode lib picks whichever "Sources" build phase it finds
 		// first, which can be an extension target (e.g. a widget) once one
@@ -1597,7 +1601,11 @@ export class IOSProjectService
 		}
 	}
 
-	private async getRootGroup(name: string, rootPath: string) {
+	private async getRootGroup(
+		name: string,
+		rootPath: string,
+		projectRoot: string,
+	) {
 		const filePathsArr: string[] = [];
 		const rootGroup: INativeSourceCodeGroup = {
 			name: name,
@@ -1606,17 +1614,19 @@ export class IOSProjectService
 		};
 
 		if (fastGlob.isDynamicPattern(rootPath)) {
-			const projectRoot = this.$projectDataService.getProjectData().projectDir;
-			const filePaths = await fastGlob(rootPath);
+			// Relative to the project: --path can run the CLI from anywhere.
+			const filePaths = await fastGlob(rootPath, { cwd: projectRoot });
 			for (const filePath of filePaths) {
 				const sourceFilePath = path.normalize(path.join(projectRoot, filePath));
 				filePathsArr.push(sourceFilePath);
 			}
 		} else {
-			if (this.$fs.exists(rootPath)) {
-				const stats = this.$fs.getFsStats(rootPath);
-				if (stats.isDirectory() && !this.$fs.isEmptyDir(rootPath)) {
-					this.$fs.readDirectory(rootPath).forEach((fileName) => {
+			const folderPath = path.resolve(projectRoot, rootPath);
+			rootGroup.path = folderPath;
+			if (this.$fs.exists(folderPath)) {
+				const stats = this.$fs.getFsStats(folderPath);
+				if (stats.isDirectory() && !this.$fs.isEmptyDir(folderPath)) {
+					this.$fs.readDirectory(folderPath).forEach((fileName) => {
 						const filePath = path.join(rootGroup.path, fileName);
 						filePathsArr.push(filePath);
 					});
@@ -1684,6 +1694,7 @@ export class IOSProjectService
 		const group = await this.getRootGroup(
 			pluginData.name,
 			pluginPlatformsFolderPath,
+			projectData.projectDir,
 		);
 		project.removePbxGroup(group.name, group.path);
 		project.removeFromHeaderSearchPaths(group.path);

test/ios-project-service-native-source.ts

@@ -0,0 +1,50 @@
+import { assert } from "chai";
+import * as fs from "fs";
+import * as os from "os";
+import * as path from "path";
+import { FileSystem } from "../lib/common/file-system";
+import { IOSProjectService } from "../lib/services/ios-project-service";
+
+describe("iOSProjectService getRootGroup", () => {
+	let projectDir: string;
+	let sourcesDir: string;
+	let cwd: string;
+
+	beforeEach(() => {
+		const root = fs.mkdtempSync(path.join(os.tmpdir(), "native-source-"));
+		projectDir = path.join(root, "apps", "app");
+		sourcesDir = path.join(root, "libs", "native");
+		fs.mkdirSync(projectDir, { recursive: true });
+		fs.mkdirSync(sourcesDir, { recursive: true });
+		fs.writeFileSync(path.join(sourcesDir, "Source.swift"), "");
+		cwd = process.cwd();
+		process.chdir(root);
+	});
+
+	afterEach(() => {
+		process.chdir(cwd);
+	});
+
+	const getFiles = async (rootPath: string): Promise<string[]> => {
+		const { files } = await (<any>IOSProjectService.prototype).getRootGroup.call(
+			{ $fs: new FileSystem(<any>{}) },
+			"Native",
+			rootPath,
+			projectDir,
+		);
+		return files.map((file: string) => fs.realpathSync(file));
+	};
+
+	const expectedSource = () =>
+		fs.realpathSync(path.join(sourcesDir, "Source.swift"));
+
+	it("resolves a glob against the project, not the working directory", async () => {
+		assert.deepEqual(await getFiles("../../libs/native/*.swift"), [
+			expectedSource(),
+		]);
+	});
+
+	it("resolves a folder against the project, not the working directory", async () => {
+		assert.deepEqual(await getFiles("../../libs/native"), [expectedSource()]);
+	});
+});