nativescript 9.1.0-alpha.0 → 9.1.0-alpha.10

package/lib/services/ios-project-service.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IOSProjectService = exports.MacOSPlatformSdkName = exports.VisionSimulatorPlatformSdkName = exports.VisionDevicePlatformSdkName = exports.SimulatorPlatformSdkName = exports.DevicePlatformSdkName = void 0;
+exports.IOSProjectService = exports.VisionSimulatorPlatformSdkName = exports.VisionDevicePlatformSdkName = exports.SimulatorPlatformSdkName = exports.DevicePlatformSdkName = void 0;
 const path = require("path");
 const shell = require("shelljs");
 const _ = require("lodash");
@@ -26,24 +26,17 @@ exports.DevicePlatformSdkName = "iphoneos";
 exports.SimulatorPlatformSdkName = "iphonesimulator";
 exports.VisionDevicePlatformSdkName = "xros";
 exports.VisionSimulatorPlatformSdkName = "xrsimulator";
-exports.MacOSPlatformSdkName = "macosx";
 const FRAMEWORK_EXTENSIONS = [".framework", ".xcframework"];
 const getPlatformSdkName = (buildData) => {
     const forDevice = !buildData || buildData.buildForDevice || buildData.buildForAppStore;
     const isvisionOS = yok_1.injector
         .resolve("devicePlatformsConstants")
         .isvisionOS(buildData.platform);
-    const ismacOS = yok_1.injector
-        .resolve("devicePlatformsConstants")
-        .ismacOS(buildData.platform);
     if (isvisionOS) {
         return forDevice
             ? exports.VisionDevicePlatformSdkName
             : exports.VisionSimulatorPlatformSdkName;
     }
-    if (ismacOS) {
-        return exports.MacOSPlatformSdkName;
-    }
     return forDevice ? exports.DevicePlatformSdkName : exports.SimulatorPlatformSdkName;
 };
 const getConfigurationName = (release) => {
@@ -79,6 +72,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$mobileHelper = $mobileHelper;
         this.$projectConfigService = $projectConfigService;
         this._platformsDirCache = null;
+        this._platformOverrideCache = null;
         this._platformData = null;
         // Track added frameworks by name to prevent duplicates in monorepo/workspace setups
         // where the same plugin may exist in multiple node_modules paths
@@ -87,19 +81,20 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this._addedStaticLibs = new Set();
     }
     getPlatformData(projectData) {
-        var _a;
+        var _a, _b;
         if (!projectData && !this._platformData) {
             throw new Error("First call of getPlatformData without providing projectData.");
         }
+        const currentOverride = (_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : null;
         if (projectData &&
             projectData.platformsDir &&
-            this._platformsDirCache !== projectData.platformsDir) {
-            const platform = this.$mobileHelper.normalizePlatformName((_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : this.$devicePlatformsConstants.iOS);
+            (this._platformsDirCache !== projectData.platformsDir ||
+                this._platformOverrideCache !== currentOverride)) {
+            const platform = this.$mobileHelper.normalizePlatformName((_b = this.$options.platformOverride) !== null && _b !== void 0 ? _b : this.$devicePlatformsConstants.iOS);
             const projectRoot = this.$options.hostProjectPath
                 ? this.$options.hostProjectPath
                 : path.join(projectData.platformsDir, platform.toLowerCase());
             const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, platform.toLowerCase());
-            const isMacOSPlatform = this.$devicePlatformsConstants.ismacOS(platform);
             this._platformData = {
                 frameworkPackageName: runtimePackage.name,
                 normalizedPlatformName: platform,
@@ -109,22 +104,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 projectRoot: projectRoot,
                 getBuildOutputPath: (options) => {
                     const config = getConfigurationName(!options || options.release);
-                    if (isMacOSPlatform) {
-                        return path.join(projectRoot, constants.BUILD_DIR, config);
-                    }
                     return path.join(projectRoot, constants.BUILD_DIR, `${config}-${getPlatformSdkName(options)}`);
                 },
                 getValidBuildOutputData: (buildOptions) => {
-                    const isMacOS = !!buildOptions &&
-                        this.$devicePlatformsConstants.ismacOS(buildOptions.platform);
-                    if (isMacOS) {
-                        return {
-                            packageNames: [
-                                `${projectData.projectName}.app`,
-                                `${projectData.projectName}.zip`,
-                            ],
-                        };
-                    }
                     const forDevice = !buildOptions ||
                         !!buildOptions.buildForDevice ||
                         !!buildOptions.buildForAppStore;
@@ -166,15 +148,11 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     ".xbm",
                 ], // https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/
             };
+            this._platformsDirCache = projectData.platformsDir;
+            this._platformOverrideCache = currentOverride;
         }
         return this._platformData;
     }
-    getPluginPlatform(projectData) {
-        var _a;
-        const platformData = this.getPlatformData(projectData);
-        return (((_a = platformData.normalizedPlatformName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ||
-            platformData.platformNameLowerCase);
-    }
     async validateOptions(projectId, provision, teamId) {
         if (provision && teamId) {
             this.$errors.fail("The options --provision and --teamId are mutually exclusive.");
@@ -287,8 +265,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         return Promise.resolve();
     }
     async isDynamicFramework(frameworkPath) {
-        const isDynamicFrameworkBundle = async (bundlePath, frameworkName) => {
-            const frameworkBinaryPath = path.join(bundlePath, frameworkName);
+        const isDynamicFrameworkBundle = async (frameworkBinaryPath) => {
             const fileResult = (await this.$childProcess.spawnFromEvent("file", [frameworkBinaryPath], "close")).stdout;
             const isDynamicallyLinked = _.includes(fileResult, "dynamically linked");
             return isDynamicallyLinked;
@@ -300,7 +277,11 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 const singlePlatformFramework = path.join(frameworkPath, library.LibraryIdentifier, library.LibraryPath);
                 if (this.$fs.exists(singlePlatformFramework)) {
                     const frameworkName = path.basename(singlePlatformFramework, path.extname(singlePlatformFramework));
-                    isDynamic = await isDynamicFrameworkBundle(singlePlatformFramework, frameworkName);
+                    let frameworkBinaryPath = path.join(singlePlatformFramework, frameworkName);
+                    if (library.BinaryPath) {
+                        frameworkBinaryPath = path.join(frameworkPath, library.LibraryIdentifier, library.BinaryPath);
+                    }
+                    isDynamic = await isDynamicFrameworkBundle(frameworkBinaryPath);
                     break;
                 }
             }
@@ -308,7 +289,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         }
         else {
             const frameworkName = path.basename(frameworkPath, path.extname(frameworkPath));
-            return await isDynamicFrameworkBundle(frameworkPath, frameworkName);
+            return await isDynamicFrameworkBundle(path.join(frameworkPath, frameworkName));
         }
     }
     /**
@@ -379,10 +360,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.savePbxProj(project, projectData);
     }
     async prepareProject(projectData, prepareData) {
+        const platformData = this.getPlatformData(projectData);
         const projectRoot = this.$options.hostProjectPath
             ? this.$options.hostProjectPath
-            : path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
-        const platformData = this.getPlatformData(projectData);
+            : platformData.projectRoot;
         const pluginsData = this.getAllProductionPlugins(projectData);
         const pbxProjPath = this.getPbxProjPath(projectData);
         this.$iOSExtensionsService.removeExtensions({ pbxProjPath });
@@ -490,7 +471,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 }
             }
         }
-        this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
         const addedWatchApp = await this.$iOSWatchAppService.addWatchAppFromPath({
             watchAppFolderPath: path.join(resourcesDirectoryPath, platformData.normalizedPlatformName),
             projectData,
@@ -522,13 +502,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, constants.NATIVE_EXTENSION_FOLDER));
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "watchapp"));
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "watchextension"));
-        const macOSPlatformName = this.$devicePlatformsConstants.macOS &&
-            this.$devicePlatformsConstants.macOS.toLowerCase();
-        if (macOSPlatformName &&
-            platformData.platformNameLowerCase === macOSPlatformName) {
-            // macOS apps do not use iOS launch storyboards.
-            this.$fs.deleteFile(path.join(platformsAppResourcesPath, "LaunchScreen.storyboard"));
-        }
     }
     async processConfigurationFilesFromAppResources(projectData, opts) {
         await this.mergeInfoPlists(projectData, opts);
@@ -560,9 +533,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             });
         };
         const allPlugins = this.getAllProductionPlugins(projectData);
-        const pluginPlatform = this.getPluginPlatform(projectData);
         for (const plugin of allPlugins) {
-            const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(pluginPlatform), this.getPlatformData(projectData).configurationFileName);
+            const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME), this.getPlatformData(projectData).configurationFileName);
             makePatch(pluginInfoPlistPath);
         }
         makePatch(infoPlistPath);
@@ -647,17 +619,37 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         return this.$fs.writeFile(this.getPbxProjPath(projectData), project.writeSync({ omitEmptyValues }));
     }
     async preparePluginNativeCode(pluginData, projectData, opts) {
-        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(this.getPluginPlatform(projectData));
-        const sourcePath = this.getPluginNativeSourcePath(pluginData, projectData, pluginPlatformsFolderPath);
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+        const sourcePath = path.join(pluginPlatformsFolderPath, "src");
         await this.prepareNativeSourceCode(pluginData.name, sourcePath, projectData);
         await this.prepareResources(pluginPlatformsFolderPath, pluginData, projectData);
         await this.prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
         await this.prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
     }
+    shouldRepreparePlugin(pluginData, projectData) {
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, ".a")) {
+            const staticLibPath = path.join(pluginPlatformsFolderPath, fileName);
+            const libraryName = path.basename(staticLibPath, ".a");
+            const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
+            if (!this.$fs.exists(headersSubpath)) {
+                continue;
+            }
+            const headerFiles = this.$fs
+                .readDirectory(headersSubpath)
+                .filter((f) => path.extname(f) === ".h" &&
+                this.$fs.getFsStats(path.join(headersSubpath, f)).isFile());
+            if (headerFiles.length > 0 &&
+                !this.$fs.exists(path.join(headersSubpath, "module.modulemap"))) {
+                this.$logger.trace(`Plugin ${pluginData.name}: modulemap missing at ${headersSubpath}, will re-prepare`);
+                return true;
+            }
+        }
+        return false;
+    }
     async removePluginNativeCode(pluginData, projectData) {
-        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(this.getPluginPlatform(projectData));
-        const sourcePath = this.getPluginNativeSourcePath(pluginData, projectData, pluginPlatformsFolderPath);
-        this.removeNativeSourceCode(sourcePath, pluginData, projectData);
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+        this.removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData);
         this.removeFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
         this.removeStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
         const projectRoot = this.getPlatformData(projectData).projectRoot;
@@ -762,12 +754,12 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         ], projectData.projectName, project);
         this.savePbxProj(project, projectData);
     }
-    getAllLibsForPluginWithFileExtension(pluginData, fileExtension, projectData) {
+    getAllLibsForPluginWithFileExtension(pluginData, fileExtension) {
         const fileExtensions = _.isArray(fileExtension)
             ? fileExtension
             : [fileExtension];
         const filterCallback = (fileName, pluginPlatformsFolderPath) => fileExtensions.indexOf(path.extname(fileName)) !== -1;
-        return this.getAllNativeLibrariesForPlugin(pluginData, this.getPluginPlatform(projectData), filterCallback);
+        return this.getAllNativeLibrariesForPlugin(pluginData, IOSProjectService.IOS_PLATFORM_NAME, filterCallback);
     }
     validateFramework(libraryPath) {
         const infoPlistPath = path.join(libraryPath, constants.INFO_PLIST_FILE_NAME);
@@ -807,21 +799,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         }
         this.savePbxProj(project, projectData);
     }
-    getPluginNativeSourcePath(pluginData, projectData, pluginPlatformsFolderPath) {
-        const sourcePath = path.join(pluginPlatformsFolderPath, "src");
-        if (this.$fs.exists(sourcePath)) {
-            return sourcePath;
-        }
-        // For macOS only, allow reusing plugin native source code from iOS.
-        // Framework/static library discovery remains strict to `platforms/macos`.
-        if (this.$devicePlatformsConstants.ismacOS(this.getPlatformData(projectData).normalizedPlatformName)) {
-            const iosSourcePath = path.join(pluginData.pluginPlatformsFolderPath("ios" /* constants.PlatformTypes.ios */), "src");
-            if (this.$fs.exists(iosSourcePath)) {
-                return iosSourcePath;
-            }
-        }
-        return sourcePath;
-    }
     async addExtensions(projectData, pluginsData) {
         const resorcesExtensionsPath = path.join(projectData.getAppResourcesDirectoryPath(), this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_EXTENSION_FOLDER);
         const platformData = this.getPlatformData(projectData);
@@ -835,7 +812,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         let addedExtensionsFromPlugins = false;
         for (const pluginIndex in pluginsData) {
             const pluginData = pluginsData[pluginIndex];
-            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(this.getPluginPlatform(projectData));
+            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
             const extensionPath = path.join(pluginPlatformsFolderPath, constants.NATIVE_EXTENSION_FOLDER);
             const addedExtensionFromPlugin = await this.$iOSExtensionsService.addExtensionsFromPath({
                 extensionsFolderPath: extensionPath,
@@ -890,25 +867,25 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.savePbxProj(project, projectData);
     }
     async prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData) {
-        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS, projectData)) {
+        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS)) {
             await this.addFramework(path.join(pluginPlatformsFolderPath, fileName), projectData);
         }
     }
     async prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData) {
-        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, ".a", projectData)) {
+        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, ".a")) {
             await this.addStaticLibrary(path.join(pluginPlatformsFolderPath, fileName), projectData);
         }
     }
-    async removeNativeSourceCode(sourceFolderPath, pluginData, projectData) {
+    async removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        const group = await this.getRootGroup(pluginData.name, sourceFolderPath);
+        const group = await this.getRootGroup(pluginData.name, pluginPlatformsFolderPath);
         project.removePbxGroup(group.name, group.path);
         project.removeFromHeaderSearchPaths(group.path);
         this.savePbxProj(project, projectData);
     }
     removeFrameworks(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS, projectData), (fileName) => {
+        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS), (fileName) => {
             const relativeFrameworkPath = this.getLibSubpathRelativeToProjectPath(fileName, projectData);
             project.removeFramework(relativeFrameworkPath, {
                 customFramework: true,
@@ -919,7 +896,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     removeStaticLibs(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, ".a", projectData), (fileName) => {
+        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, ".a"), (fileName) => {
             const staticLibPath = path.join(pluginPlatformsFolderPath, fileName);
             const relativeStaticLibPath = this.getLibSubpathRelativeToProjectPath(path.basename(staticLibPath), projectData);
             project.removeFramework(relativeStaticLibPath);
@@ -953,9 +930,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             this.$fs.deleteFile(pluginsXcconfigFilePath);
         }
         const allPlugins = this.getAllProductionPlugins(projectData);
-        const pluginPlatform = this.getPluginPlatform(projectData);
         for (const plugin of allPlugins) {
-            const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(pluginPlatform);
+            const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
             const pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, constants_2.BUILD_XCCONFIG_FILE_NAME);
             if (this.$fs.exists(pluginXcconfigFilePath)) {
                 for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
@@ -1018,6 +994,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 }
 exports.IOSProjectService = IOSProjectService;
 IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER = "__PROJECT_NAME__";
+IOSProjectService.IOS_PLATFORM_NAME = "ios";
 __decorate([
     (0, helpers_2.hook)("buildIOS")
 ], IOSProjectService.prototype, "buildProject", null);