@akylas/nativescript-cli 8.8.7 → 8.10.0

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

@@ -18,6 +18,7 @@ const projectServiceBaseLib = require("./platform-project-service-base");
 const plist_merge_patch_1 = require("plist-merge-patch");
 const os_1 = require("os");
 const plist = require("plist");
+const fastGlob = require("fast-glob");
 const constants_2 = require("../constants");
 const helpers_2 = require("../common/helpers");
 const yok_1 = require("../common/yok");
@@ -42,7 +43,7 @@ const getConfigurationName = (release) => {
     return release ? constants_1.Configurations.Release : constants_1.Configurations.Debug;
 };
 class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase {
-    constructor($fs, $options, $childProcess, $cocoapodsService, $errors, $logger, $injector, $projectDataService, $devicePlatformsConstants, $hostInfo, $xcprojService, $iOSProvisionService, $iOSSigningService, $pbxprojDomXcode, $xcode, $iOSEntitlementsService, $platformEnvironmentRequirements, $plistParser, $xcconfigService, $xcodebuildService, $iOSExtensionsService, $iOSWatchAppService, $iOSNativeTargetService, $sysInfo, $tempService, $spmService, $mobileHelper) {
+    constructor($fs, $options, $childProcess, $cocoapodsService, $errors, $logger, $injector, $projectDataService, $devicePlatformsConstants, $hostInfo, $xcprojService, $iOSProvisionService, $iOSSigningService, $pbxprojDomXcode, $xcode, $iOSEntitlementsService, $platformEnvironmentRequirements, $plistParser, $xcconfigService, $xcodebuildService, $iOSExtensionsService, $iOSWatchAppService, $iOSNativeTargetService, $sysInfo, $tempService, $spmService, $mobileHelper, $projectConfigService) {
         super($fs, $projectDataService);
         this.$options = $options;
         this.$childProcess = $childProcess;
@@ -69,6 +70,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$tempService = $tempService;
         this.$spmService = $spmService;
         this.$mobileHelper = $mobileHelper;
+        this.$projectConfigService = $projectConfigService;
         this._platformsDirCache = null;
         this._platformData = null;
     }
@@ -362,8 +364,13 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 resourcesNativeCodePath = path.join(resourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.NATIVE_SOURCE_FOLDER);
             }
             await this.prepareNativeSourceCode(constants.TNS_NATIVE_SOURCE_GROUP_NAME, resourcesNativeCodePath, projectData);
+            const nativeSource = this.$projectConfigService.getValue(`${this._platformData.platformNameLowerCase}.NativeSource`, []);
+            if (nativeSource === null || nativeSource === void 0 ? void 0 : nativeSource.length) {
+                for (const source of nativeSource) {
+                    await this.prepareNativeSourceCode(source.name, source.path, projectData);
+                }
+            }
         }
-        this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
         const addedWatchApp = await this.$iOSWatchAppService.addWatchAppFromPath({
             watchAppFolderPath: path.join(resourcesDirectoryPath, platformData.normalizedPlatformName),
             projectData,
@@ -532,7 +539,20 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             await this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
             await this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
         }
-        await this.$spmService.applySPMPackages(platformData, projectData);
+        const pluginSpmPackages = [];
+        for (const plugin of pluginsData) {
+            if (plugin.fullPath) {
+                const pluginConfigPath = path.join(plugin.fullPath, constants.CONFIG_FILE_NAME_TS);
+                if (this.$fs.exists(pluginConfigPath)) {
+                    const config = this.$projectConfigService.readConfig(plugin.fullPath);
+                    const packages = _.get(config, `${platformData.platformNameLowerCase}.SPMPackages`, []);
+                    if (packages.length) {
+                        pluginSpmPackages.push(...packages);
+                    }
+                }
+            }
+        }
+        await this.$spmService.applySPMPackages(platformData, projectData, pluginSpmPackages);
     }
     beforePrepareAllPlugins(projectData, dependencies) {
         return Promise.resolve(dependencies);
@@ -626,7 +646,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     async prepareNativeSourceCode(groupName, sourceFolderPath, projectData) {
         const project = this.createPbxProj(projectData);
-        const group = this.getRootGroup(groupName, sourceFolderPath);
+        const group = await this.getRootGroup(groupName, sourceFolderPath);
         project.addPbxGroup(group.files, group.name, group.path, null, {
             isMain: true,
             filesRelativeToProject: true,
@@ -666,23 +686,33 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 addedExtensionsFromPlugins || addedExtensionFromPlugin;
         }
         if (addedExtensionsFromResources || addedExtensionsFromPlugins) {
-            this.$logger.warn("The support for iOS App Extensions is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/nativescript-cli/issues/4472");
+            this.$logger.warn("Let us know if there are other Extension features you'd like! https://github.com/NativeScript/NativeScript/issues");
         }
     }
-    getRootGroup(name, rootPath) {
+    async getRootGroup(name, rootPath) {
         const filePathsArr = [];
         const rootGroup = {
             name: name,
             files: filePathsArr,
             path: rootPath,
         };
-        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 filePath = path.join(rootGroup.path, fileName);
-                    filePathsArr.push(filePath);
-                });
+        if (fastGlob.isDynamicPattern(rootPath)) {
+            const projectRoot = this.$projectDataService.getProjectData().projectDir;
+            const filePaths = await fastGlob(rootPath);
+            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 filePath = path.join(rootGroup.path, fileName);
+                        filePathsArr.push(filePath);
+                    });
+                }
             }
         }
         return rootGroup;
@@ -708,9 +738,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             await this.addStaticLibrary(path.join(pluginPlatformsFolderPath, fileName), projectData);
         }
     }
-    removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData) {
+    async removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        const group = this.getRootGroup(pluginData.name, pluginPlatformsFolderPath);
+        const group = await this.getRootGroup(pluginData.name, pluginPlatformsFolderPath);
         project.removePbxGroup(group.name, group.path);
         project.removeFromHeaderSearchPaths(group.path);
         this.savePbxProj(project, projectData);