@akylas/nativescript-cli 8.7.2 → 8.8.3

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IOSSigningService = void 0;
 const path = require("path");
@@ -27,108 +18,102 @@ class IOSSigningService {
         this.$xcconfigService = $xcconfigService;
         this.$xcprojService = $xcprojService;
     }
-    setupSigningForDevice(projectRoot, projectData, iOSBuildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData, projectRoot));
-            const signing = xcode.getSigning(projectData.projectName);
-            const hasProvisioningProfileInXCConfig = this.readXCConfigProvisioningProfileSpecifierForIPhoneOs(projectData) ||
-                this.readXCConfigProvisioningProfileSpecifier(projectData) ||
-                this.readXCConfigProvisioningProfileForIPhoneOs(projectData) ||
-                this.readXCConfigProvisioningProfile(projectData);
-            if (hasProvisioningProfileInXCConfig &&
-                (!signing || signing.style !== "Manual")) {
-                xcode.setManualSigningStyle(projectData.projectName);
-                this.getExtensionNames(projectData).forEach((name) => {
-                    xcode.setManualSigningStyle(name);
-                });
-                xcode.save();
-            }
-            else if (!iOSBuildData.provision &&
-                !(signing && signing.style === "Manual" && !iOSBuildData.teamId)) {
-                const teamId = yield this.getDevelopmentTeam(projectData, projectRoot, iOSBuildData.teamId);
-                yield this.setupSigningFromTeam(projectRoot, projectData, teamId);
-            }
-        });
+    async setupSigningForDevice(projectRoot, projectData, iOSBuildData) {
+        const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData, projectRoot));
+        const signing = xcode.getSigning(projectData.projectName);
+        const hasProvisioningProfileInXCConfig = this.readXCConfigProvisioningProfileSpecifierForIPhoneOs(projectData) ||
+            this.readXCConfigProvisioningProfileSpecifier(projectData) ||
+            this.readXCConfigProvisioningProfileForIPhoneOs(projectData) ||
+            this.readXCConfigProvisioningProfile(projectData);
+        if (hasProvisioningProfileInXCConfig &&
+            (!signing || signing.style !== "Manual")) {
+            xcode.setManualSigningStyle(projectData.projectName);
+            this.getExtensionNames(projectData).forEach((name) => {
+                xcode.setManualSigningStyle(name);
+            });
+            xcode.save();
+        }
+        else if (!iOSBuildData.provision &&
+            !(signing && signing.style === "Manual" && !iOSBuildData.teamId)) {
+            const teamId = await this.getDevelopmentTeam(projectData, projectRoot, iOSBuildData.teamId);
+            await this.setupSigningFromTeam(projectRoot, projectData, teamId);
+        }
     }
-    setupSigningFromTeam(projectRoot, projectData, teamId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData, projectRoot));
-            const signing = xcode.getSigning(projectData.projectName);
-            let shouldUpdateXcode = false;
-            if (signing && signing.style === "Automatic") {
-                if (signing.team !== teamId) {
-                    const teamIdsForName = yield this.$iOSProvisionService.getTeamIdsWithName(teamId);
-                    if (!teamIdsForName.some((id) => id === signing.team)) {
-                        shouldUpdateXcode = true;
-                    }
+    async setupSigningFromTeam(projectRoot, projectData, teamId) {
+        const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData, projectRoot));
+        const signing = xcode.getSigning(projectData.projectName);
+        let shouldUpdateXcode = false;
+        if (signing && signing.style === "Automatic") {
+            if (signing.team !== teamId) {
+                const teamIdsForName = await this.$iOSProvisionService.getTeamIdsWithName(teamId);
+                if (!teamIdsForName.some((id) => id === signing.team)) {
+                    shouldUpdateXcode = true;
                 }
             }
-            else {
-                shouldUpdateXcode = true;
-            }
-            if (shouldUpdateXcode) {
-                const teamIdsForName = yield this.$iOSProvisionService.getTeamIdsWithName(teamId);
-                if (teamIdsForName.length > 0) {
-                    this.$logger.trace(`Team id ${teamIdsForName[0]} will be used for team name "${teamId}".`);
-                    teamId = teamIdsForName[0];
-                }
-                xcode.setAutomaticSigningStyle(projectData.projectName, teamId);
-                xcode.setAutomaticSigningStyleByTargetProductTypesList([
-                    constants_1.IOSNativeTargetProductTypes.appExtension,
-                    constants_1.IOSNativeTargetProductTypes.watchApp,
-                    constants_1.IOSNativeTargetProductTypes.watchExtension,
-                ], teamId);
-                this.getExtensionNames(projectData).forEach((name) => {
-                    xcode.setAutomaticSigningStyle(name, teamId);
-                });
-                xcode.save();
-                this.$logger.trace(`Set Automatic signing style and team id ${teamId}.`);
-            }
-            else {
-                this.$logger.trace(`The specified ${teamId} is already set in the Xcode.`);
+        }
+        else {
+            shouldUpdateXcode = true;
+        }
+        if (shouldUpdateXcode) {
+            const teamIdsForName = await this.$iOSProvisionService.getTeamIdsWithName(teamId);
+            if (teamIdsForName.length > 0) {
+                this.$logger.trace(`Team id ${teamIdsForName[0]} will be used for team name "${teamId}".`);
+                teamId = teamIdsForName[0];
             }
-        });
+            xcode.setAutomaticSigningStyle(projectData.projectName, teamId);
+            xcode.setAutomaticSigningStyleByTargetProductTypesList([
+                constants_1.IOSNativeTargetProductTypes.appExtension,
+                constants_1.IOSNativeTargetProductTypes.watchApp,
+                constants_1.IOSNativeTargetProductTypes.watchExtension,
+            ], teamId);
+            this.getExtensionNames(projectData).forEach((name) => {
+                xcode.setAutomaticSigningStyle(name, teamId);
+            });
+            xcode.save();
+            this.$logger.trace(`Set Automatic signing style and team id ${teamId}.`);
+        }
+        else {
+            this.$logger.trace(`The specified ${teamId} is already set in the Xcode.`);
+        }
     }
-    setupSigningFromProvision(projectRoot, projectData, provision, mobileProvisionData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!provision) {
-                return;
-            }
-            const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData, projectRoot));
-            const signing = xcode.getSigning(projectData.projectName);
-            let shouldUpdateXcode = false;
-            if (signing && signing.style === "Manual") {
-                for (const config in signing.configurations) {
-                    const options = signing.configurations[config];
-                    if (options.name !== provision && options.uuid !== provision) {
-                        shouldUpdateXcode = true;
-                        break;
-                    }
+    async setupSigningFromProvision(projectRoot, projectData, provision, mobileProvisionData) {
+        if (!provision) {
+            return;
+        }
+        const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData, projectRoot));
+        const signing = xcode.getSigning(projectData.projectName);
+        let shouldUpdateXcode = false;
+        if (signing && signing.style === "Manual") {
+            for (const config in signing.configurations) {
+                const options = signing.configurations[config];
+                if (options.name !== provision && options.uuid !== provision) {
+                    shouldUpdateXcode = true;
+                    break;
                 }
             }
-            else {
-                shouldUpdateXcode = true;
-            }
-            if (shouldUpdateXcode) {
-                const projectSigningConfig = yield this.getManualSigningConfiguration(projectData, provision, mobileProvisionData);
-                xcode.setManualSigningStyle(projectData.projectName, projectSigningConfig);
-                xcode.setManualSigningStyleByTargetProductTypesList([
-                    constants_1.IOSNativeTargetProductTypes.appExtension,
-                    constants_1.IOSNativeTargetProductTypes.watchApp,
-                    constants_1.IOSNativeTargetProductTypes.watchExtension,
-                ], projectSigningConfig);
-                this.$logger.trace(`Set Manual signing style and provisioning profile: ${projectSigningConfig.name} (${projectSigningConfig.uuid})`);
-                const extensionSigningConfig = yield Promise.all(this.getExtensionsManualSigningConfiguration(projectData));
-                extensionSigningConfig.forEach(({ name, configuration }) => {
-                    xcode.setManualSigningStyle(name, configuration);
-                    this.$logger.trace(`Set Manual signing style and provisioning profile: ${configuration.name} (${configuration.uuid})`);
-                });
-                xcode.save();
-            }
-            else {
-                this.$logger.trace(`The specified provisioning profile is already set in the Xcode: ${provision}`);
-            }
-        });
+        }
+        else {
+            shouldUpdateXcode = true;
+        }
+        if (shouldUpdateXcode) {
+            const projectSigningConfig = await this.getManualSigningConfiguration(projectData, provision, mobileProvisionData);
+            xcode.setManualSigningStyle(projectData.projectName, projectSigningConfig);
+            xcode.setManualSigningStyleByTargetProductTypesList([
+                constants_1.IOSNativeTargetProductTypes.appExtension,
+                constants_1.IOSNativeTargetProductTypes.watchApp,
+                constants_1.IOSNativeTargetProductTypes.watchExtension,
+            ], projectSigningConfig);
+            this.$logger.trace(`Set Manual signing style and provisioning profile: ${projectSigningConfig.name} (${projectSigningConfig.uuid})`);
+            const extensionSigningConfig = await Promise.all(this.getExtensionsManualSigningConfiguration(projectData));
+            extensionSigningConfig.forEach(({ name, configuration }) => {
+                xcode.setManualSigningStyle(name, configuration);
+                this.$logger.trace(`Set Manual signing style and provisioning profile: ${configuration.name} (${configuration.uuid})`);
+            });
+            xcode.save();
+        }
+        else {
+            this.$logger.trace(`The specified provisioning profile is already set in the Xcode: ${provision}`);
+        }
     }
     getExtensionNames(projectData) {
         const extensionFolderPath = path.join(projectData.getAppResourcesDirectoryPath(), constants.iOSAppResourcesFolderName, constants.NATIVE_EXTENSION_FOLDER);
@@ -149,45 +134,43 @@ class IOSSigningService {
         if (this.$fs.exists(provisioningJSONPath)) {
             const provisioningJSON = this.$fs.readJson(provisioningJSONPath);
             const extensionNames = this.getExtensionNames(projectData);
-            const provisioning = Object.entries(provisioningJSON).map(([id, provision]) => __awaiter(this, void 0, void 0, function* () {
+            const provisioning = Object.entries(provisioningJSON).map(async ([id, provision]) => {
                 const name = id.split(".").at(-1);
                 if (extensionNames.includes(name)) {
-                    const configuration = yield this.getManualSigningConfiguration(projectData, provision);
+                    const configuration = await this.getManualSigningConfiguration(projectData, provision);
                     return { name, configuration };
                 }
                 return null;
-            }));
+            });
             return provisioning;
         }
         return [];
     }
-    getManualSigningConfiguration(projectData, provision, mobileProvisionData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pickStart = Date.now();
-            const mobileprovision = mobileProvisionData ||
-                (yield this.$iOSProvisionService.pick(provision, projectData.projectIdentifiers.ios));
-            const pickEnd = Date.now();
-            this.$logger.trace("Searched and " +
-                (mobileprovision ? "found" : "failed to find ") +
-                " matching provisioning profile. (" +
-                (pickEnd - pickStart) +
-                "ms.)");
-            if (!mobileprovision) {
-                this.$errors.fail("Failed to find mobile provision with UUID or Name: " + provision);
-            }
-            const configuration = {
-                team: mobileprovision.TeamIdentifier &&
-                    mobileprovision.TeamIdentifier.length > 0
-                    ? mobileprovision.TeamIdentifier[0]
-                    : undefined,
-                uuid: mobileprovision.UUID,
-                name: mobileprovision.Name,
-                identity: mobileprovision.Type === "Development"
-                    ? "iPhone Developer"
-                    : "iPhone Distribution",
-            };
-            return configuration;
-        });
+    async getManualSigningConfiguration(projectData, provision, mobileProvisionData) {
+        const pickStart = Date.now();
+        const mobileprovision = mobileProvisionData ||
+            (await this.$iOSProvisionService.pick(provision, projectData.projectIdentifiers.ios));
+        const pickEnd = Date.now();
+        this.$logger.trace("Searched and " +
+            (mobileprovision ? "found" : "failed to find ") +
+            " matching provisioning profile. (" +
+            (pickEnd - pickStart) +
+            "ms.)");
+        if (!mobileprovision) {
+            this.$errors.fail("Failed to find mobile provision with UUID or Name: " + provision);
+        }
+        const configuration = {
+            team: mobileprovision.TeamIdentifier &&
+                mobileprovision.TeamIdentifier.length > 0
+                ? mobileprovision.TeamIdentifier[0]
+                : undefined,
+            uuid: mobileprovision.UUID,
+            name: mobileprovision.Name,
+            identity: mobileprovision.Type === "Development"
+                ? "iPhone Developer"
+                : "iPhone Distribution",
+        };
+        return configuration;
     }
     getBuildXCConfigFilePath(projectData) {
         return path.join(projectData.appResourcesDirectoryPath, constants_1.iOSAppResourcesFolderName, constants_1.BUILD_XCCONFIG_FILE_NAME);
@@ -195,55 +178,53 @@ class IOSSigningService {
     getPbxProjPath(projectData, projectRoot) {
         return path.join(this.$xcprojService.getXcodeprojPath(projectData, projectRoot), "project.pbxproj");
     }
-    getDevelopmentTeam(projectData, projectRoot, teamId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            teamId = teamId || this.readXCConfigDevelopmentTeam(projectData);
-            if (!teamId) {
-                const teams = yield this.$iOSProvisionService.getDevelopmentTeams();
-                this.$logger.warn("Xcode requires a team id to be specified when building for device.");
-                this.$logger.warn("You can specify the team id by setting the DEVELOPMENT_TEAM setting in build.xcconfig file located in App_Resources folder of your app, or by using the --teamId option when calling run, debug or livesync commands.");
-                if (teams.length === 1) {
-                    teamId = teams[0].id;
-                    this.$logger.warn("Found and using the following development team installed on your system: " +
-                        teams[0].name +
-                        " (" +
-                        teams[0].id +
-                        ")");
+    async getDevelopmentTeam(projectData, projectRoot, teamId) {
+        teamId = teamId || this.readXCConfigDevelopmentTeam(projectData);
+        if (!teamId) {
+            const teams = await this.$iOSProvisionService.getDevelopmentTeams();
+            this.$logger.warn("Xcode requires a team id to be specified when building for device.");
+            this.$logger.warn("You can specify the team id by setting the DEVELOPMENT_TEAM setting in build.xcconfig file located in App_Resources folder of your app, or by using the --teamId option when calling run, debug or livesync commands.");
+            if (teams.length === 1) {
+                teamId = teams[0].id;
+                this.$logger.warn("Found and using the following development team installed on your system: " +
+                    teams[0].name +
+                    " (" +
+                    teams[0].id +
+                    ")");
+            }
+            else if (teams.length > 0) {
+                if (!helpers.isInteractive()) {
+                    this.$errors.fail(`Unable to determine default development team. Available development teams are: ${_.map(teams, (team) => team.id)}. Specify team in app/App_Resources/iOS/build.xcconfig file in the following way: DEVELOPMENT_TEAM = <team id>`);
+                }
+                const choices = [];
+                for (const team of teams) {
+                    choices.push(team.name + " (" + team.id + ")");
                 }
-                else if (teams.length > 0) {
-                    if (!helpers.isInteractive()) {
-                        this.$errors.fail(`Unable to determine default development team. Available development teams are: ${_.map(teams, (team) => team.id)}. Specify team in app/App_Resources/iOS/build.xcconfig file in the following way: DEVELOPMENT_TEAM = <team id>`);
-                    }
-                    const choices = [];
-                    for (const team of teams) {
-                        choices.push(team.name + " (" + team.id + ")");
-                    }
-                    const choice = yield this.$prompter.promptForChoice("Found multiple development teams, select one:", choices);
-                    teamId = teams[choices.indexOf(choice)].id;
-                    const choicesPersist = [
-                        "Yes, set the DEVELOPMENT_TEAM setting in build.xcconfig file.",
-                        "Yes, persist the team id in platforms folder.",
-                        "No, don't persist this setting.",
-                    ];
-                    const choicePersist = yield this.$prompter.promptForChoice("Do you want to make teamId: " +
-                        teamId +
-                        " a persistent choice for your app?", choicesPersist);
-                    switch (choicesPersist.indexOf(choicePersist)) {
-                        case 0:
-                            const xcconfigFile = path.join(projectData.appResourcesDirectoryPath, "iOS", constants_1.BUILD_XCCONFIG_FILE_NAME);
-                            this.$fs.appendFile(xcconfigFile, "\nDEVELOPMENT_TEAM = " + teamId + "\n");
-                            break;
-                        case 1:
-                            this.$fs.writeFile(path.join(projectRoot, "teamid"), teamId);
-                            break;
-                        default:
-                            break;
-                    }
+                const choice = await this.$prompter.promptForChoice("Found multiple development teams, select one:", choices);
+                teamId = teams[choices.indexOf(choice)].id;
+                const choicesPersist = [
+                    "Yes, set the DEVELOPMENT_TEAM setting in build.xcconfig file.",
+                    "Yes, persist the team id in platforms folder.",
+                    "No, don't persist this setting.",
+                ];
+                const choicePersist = await this.$prompter.promptForChoice("Do you want to make teamId: " +
+                    teamId +
+                    " a persistent choice for your app?", choicesPersist);
+                switch (choicesPersist.indexOf(choicePersist)) {
+                    case 0:
+                        const xcconfigFile = path.join(projectData.appResourcesDirectoryPath, "iOS", constants_1.BUILD_XCCONFIG_FILE_NAME);
+                        this.$fs.appendFile(xcconfigFile, "\nDEVELOPMENT_TEAM = " + teamId + "\n");
+                        break;
+                    case 1:
+                        this.$fs.writeFile(path.join(projectRoot, "teamid"), teamId);
+                        break;
+                    default:
+                        break;
                 }
             }
-            this.$logger.trace(`Selected teamId is '${teamId}'.`);
-            return teamId;
-        });
+        }
+        this.$logger.trace(`Selected teamId is '${teamId}'.`);
+        return teamId;
     }
     readXCConfigDevelopmentTeam(projectData) {
         return this.$xcconfigService.readPropertyValue(this.getBuildXCConfigFilePath(projectData), "DEVELOPMENT_TEAM");

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SPMService = void 0;
 const yok_1 = require("../../common/yok");
@@ -24,53 +15,49 @@ class SPMService {
         const spmPackages = this.$projectConfigService.getValue(`${platform}.SPMPackages`, []);
         return spmPackages;
     }
-    applySPMPackages(platformData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const spmPackages = this.getSPMPackages(projectData, platformData.platformNameLowerCase);
-                if (!spmPackages.length) {
-                    this.$logger.trace("SPM: no SPM packages to apply.");
-                    return;
-                }
-                const project = new trapezedev_project_1.MobileProject(platformData.projectRoot, {
-                    ios: {
-                        path: ".",
-                    },
-                    enableAndroid: false,
-                });
-                yield project.load();
-                if (!project.ios) {
-                    this.$logger.trace("SPM: no iOS project found via trapeze.");
-                    return;
-                }
-                for (const pkg of spmPackages) {
-                    if ("path" in pkg) {
-                        this.$logger.trace("SPM: resolving path for package: ", pkg.path);
-                        pkg.path = path.resolve(projectData.projectDir, pkg.path);
-                    }
-                    this.$logger.trace(`SPM: adding package ${pkg.name} to project.`, pkg);
-                    yield project.ios.addSPMPackage(projectData.projectName, pkg);
-                }
-                yield project.commit();
-                yield this.resolveSPMDependencies(platformData, projectData);
+    async applySPMPackages(platformData, projectData) {
+        try {
+            const spmPackages = this.getSPMPackages(projectData, platformData.platformNameLowerCase);
+            if (!spmPackages.length) {
+                this.$logger.trace("SPM: no SPM packages to apply.");
+                return;
+            }
+            const project = new trapezedev_project_1.MobileProject(platformData.projectRoot, {
+                ios: {
+                    path: ".",
+                },
+                enableAndroid: false,
+            });
+            await project.load();
+            if (!project.ios) {
+                this.$logger.trace("SPM: no iOS project found via trapeze.");
+                return;
             }
-            catch (err) {
-                this.$logger.trace("SPM: error applying SPM packages: ", err);
+            for (const pkg of spmPackages) {
+                if ("path" in pkg) {
+                    this.$logger.trace("SPM: resolving path for package: ", pkg.path);
+                    pkg.path = path.resolve(projectData.projectDir, pkg.path);
+                }
+                this.$logger.trace(`SPM: adding package ${pkg.name} to project.`, pkg);
+                await project.ios.addSPMPackage(projectData.projectName, pkg);
             }
-        });
+            await project.commit();
+            await this.resolveSPMDependencies(platformData, projectData);
+        }
+        catch (err) {
+            this.$logger.trace("SPM: error applying SPM packages: ", err);
+        }
     }
-    resolveSPMDependencies(platformData, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$xcodebuildCommandService.executeCommand(this.$xcodebuildArgsService
-                .getXcodeProjectArgs(platformData, projectData)
-                .concat([
-                "-destination",
-                "generic/platform=iOS",
-                "-resolvePackageDependencies",
-            ]), {
-                cwd: projectData.projectDir,
-                message: "Resolving SPM dependencies...",
-            });
+    async resolveSPMDependencies(platformData, projectData) {
+        await this.$xcodebuildCommandService.executeCommand(this.$xcodebuildArgsService
+            .getXcodeProjectArgs(platformData, projectData)
+            .concat([
+            "-destination",
+            "generic/platform=iOS",
+            "-resolvePackageDependencies",
+        ]), {
+            cwd: projectData.projectDir,
+            message: "Resolving SPM dependencies...",
         });
     }
 }