fix(ios): use the folders of a NativeSource glob's headers as search paths

The glob itself ended up in HEADER_SEARCH_PATHS, where it matches nothing, relative to the Xcode project rather than the app. Folder paths now use the path resolved against the project for the search path and for the module map check as well.

Author: rigor789

lib/services/ios-project-service.ts

@@ -1547,16 +1547,26 @@ export class IOSProjectService
 			filesRelativeToProject: true,
 			target: project.getFirstTarget()?.uuid,
 		});
-		project.addToHeaderSearchPaths(group.path);
-		const headerFiles = this.$fs.exists(sourceFolderPath)
+		// A glob is no use as a search path, the folders of its headers are.
+		const headerSearchPaths = fastGlob.isDynamicPattern(sourceFolderPath)
+			? _.uniq(
+					group.files
+						.filter((file) => path.extname(file) === ".h")
+						.map((file) => path.dirname(file)),
+				)
+			: [group.path];
+		headerSearchPaths.forEach((searchPath) =>
+			project.addToHeaderSearchPaths(searchPath),
+		);
+		const headerFiles = this.$fs.exists(group.path)
 			? this.$fs.enumerateFilesInDirectorySync(
-					sourceFolderPath,
+					group.path,
 					(file, stat) => stat.isDirectory() || path.extname(file) === ".h",
 				)
 			: [];
 		if (
 			headerFiles.length > 0 &&
-			!this.$fs.exists(path.join(sourceFolderPath, "module.modulemap"))
+			!this.$fs.exists(path.join(group.path, "module.modulemap"))
 		) {
 			this.$logger.warn(
 				`warning: Directory ${sourceFolderPath} with native iOS source code doesn't contain a modulemap file. Metadata for it will not be generated and it will not be accessible from JavaScript. To learn more see https://docs.nativescript.org/guides/ios-source-code`,

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

@@ -47,4 +47,50 @@ describe("iOSProjectService getRootGroup", () => {
 	it("resolves a folder against the project, not the working directory", async () => {
 		assert.deepEqual(await getFiles("../../libs/native"), [expectedSource()]);
 	});
+
+	describe("header search paths", () => {
+		const prepare = async (rootPath: string): Promise<string[]> => {
+			const searchPaths: string[] = [];
+			const proto = <any>IOSProjectService.prototype;
+			await proto.prepareNativeSourceCode.call(
+				{
+					$fs: new FileSystem(<any>{}),
+					$logger: { warn: () => {} },
+					getRootGroup: proto.getRootGroup,
+					savePbxProj: () => {},
+					createPbxProj: () => ({
+						addPbxGroup: () => {},
+						getFirstTarget: () => ({ uuid: "target" }),
+						addToHeaderSearchPaths: (searchPath: string) =>
+							searchPaths.push(searchPath),
+					}),
+				},
+				"Native",
+				rootPath,
+				{ projectDir },
+			);
+			return searchPaths.map((searchPath) => fs.realpathSync(searchPath));
+		};
+
+		it("uses the folders of the headers a glob matches", async () => {
+			const nested = path.join(sourcesDir, "nested");
+			fs.mkdirSync(nested);
+			fs.writeFileSync(path.join(nested, "One.h"), "");
+			fs.writeFileSync(path.join(nested, "Two.h"), "");
+
+			assert.deepEqual(await prepare("../../libs/native/**/*.{h,swift}"), [
+				fs.realpathSync(nested),
+			]);
+		});
+
+		it("adds nothing for a glob without headers", async () => {
+			assert.deepEqual(await prepare("../../libs/native/*.swift"), []);
+		});
+
+		it("uses the folder itself, against the project", async () => {
+			assert.deepEqual(await prepare("../../libs/native"), [
+				fs.realpathSync(sourcesDir),
+			]);
+		});
+	});
 });