nativescript 8.9.0-dev.2 → 8.9.0-dev.4

package/lib/commands/appstore-list.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.ListiOSApps = void 0;
 const helpers_1 = require("../common/helpers");
@@ -31,44 +22,42 @@ class ListiOSApps {
         ];
         this.$projectData.initializeProjectData();
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.$platformValidationService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
-                this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
-            }
-            let username = args[0];
-            let password = args[1];
-            if (!username) {
-                username = yield this.$prompter.getString("Apple ID", {
-                    allowEmpty: false,
-                });
-            }
-            if (!password) {
-                password = yield this.$prompter.getPassword("Apple ID password");
-            }
-            const user = yield this.$applePortalSessionService.createUserSession({ username, password }, {
-                sessionBase64: this.$options.appleSessionBase64,
+    async execute(args) {
+        if (!this.$platformValidationService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+            this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
+        }
+        let username = args[0];
+        let password = args[1];
+        if (!username) {
+            username = await this.$prompter.getString("Apple ID", {
+                allowEmpty: false,
             });
-            if (!user.areCredentialsValid) {
-                this.$errors.fail(`Invalid username and password combination. Used '${username}' as the username.`);
-            }
-            const applications = yield this.$applePortalApplicationService.getApplications(user);
-            if (!applications || !applications.length) {
-                this.$logger.info("Seems you don't have any applications yet.");
-            }
-            else {
-                const table = (0, helpers_1.createTable)(["Application Name", "Bundle Identifier", "In Flight Version"], applications.map((application) => {
-                    const version = (application &&
-                        application.versionSets &&
-                        application.versionSets.length &&
-                        application.versionSets[0].inFlightVersion &&
-                        application.versionSets[0].inFlightVersion.version) ||
-                        "";
-                    return [application.name, application.bundleId, version];
-                }));
-                this.$logger.info(table.toString());
-            }
+        }
+        if (!password) {
+            password = await this.$prompter.getPassword("Apple ID password");
+        }
+        const user = await this.$applePortalSessionService.createUserSession({ username, password }, {
+            sessionBase64: this.$options.appleSessionBase64,
         });
+        if (!user.areCredentialsValid) {
+            this.$errors.fail(`Invalid username and password combination. Used '${username}' as the username.`);
+        }
+        const applications = await this.$applePortalApplicationService.getApplications(user);
+        if (!applications || !applications.length) {
+            this.$logger.info("Seems you don't have any applications yet.");
+        }
+        else {
+            const table = (0, helpers_1.createTable)(["Application Name", "Bundle Identifier", "In Flight Version"], applications.map((application) => {
+                const version = (application &&
+                    application.versionSets &&
+                    application.versionSets.length &&
+                    application.versionSets[0].inFlightVersion &&
+                    application.versionSets[0].inFlightVersion.version) ||
+                    "";
+                return [application.name, application.bundleId, version];
+            }));
+            this.$logger.info(table.toString());
+        }
     }
 }
 exports.ListiOSApps = ListiOSApps;

package/lib/commands/appstore-upload.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.PublishIOS = void 0;
 const path = require("path");
@@ -36,70 +27,66 @@ class PublishIOS {
         ];
         this.$projectData.initializeProjectData();
     }
-    execute(args) {
+    async execute(args) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$itmsTransporterService.validate(this.$options.appleApplicationSpecificPassword);
-            const username = args[0] ||
-                (yield this.$prompter.getString("Apple ID", { allowEmpty: false }));
-            const password = args[1] || (yield this.$prompter.getPassword("Apple ID password"));
-            const user = yield this.$applePortalSessionService.createUserSession({ username, password }, {
-                applicationSpecificPassword: this.$options.appleApplicationSpecificPassword,
-                sessionBase64: this.$options.appleSessionBase64,
-                requireInteractiveConsole: true,
-                requireApplicationSpecificPassword: true,
-            });
-            if (!user.areCredentialsValid) {
-                this.$errors.fail(`Invalid username and password combination. Used '${username}' as the username.`);
-            }
-            const mobileProvisionIdentifier = (_a = this.$options.provision) !== null && _a !== void 0 ? _a : args[2];
-            let ipaFilePath = this.$options.ipa
-                ? path.resolve(this.$options.ipa)
-                : null;
-            if (!mobileProvisionIdentifier && !ipaFilePath) {
-                this.$logger.warn("No mobile provision identifier set. A default mobile provision will be used. You can set one in app/App_Resources/iOS/build.xcconfig");
-            }
-            this.$options.release = true;
-            if (!ipaFilePath) {
-                const platform = this.$devicePlatformsConstants.iOS.toLowerCase();
-                // No .ipa path provided, build .ipa on out own.
-                if (mobileProvisionIdentifier) {
-                    // This is not very correct as if we build multiple targets we will try to sign all of them using the signing identity here.
-                    this.$logger.info("Building .ipa with the selected mobile provision and/or certificate. " +
-                        mobileProvisionIdentifier);
-                    this.$options.provision = mobileProvisionIdentifier;
-                    const buildData = new build_data_1.IOSBuildData(this.$projectData.projectDir, platform, Object.assign(Object.assign({}, this.$options.argv), { buildForAppStore: true, watch: false }));
-                    ipaFilePath = yield this.$buildController.prepareAndBuild(buildData);
-                }
-                else {
-                    this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");
-                    const buildData = new build_data_1.IOSBuildData(this.$projectData.projectDir, platform, Object.assign(Object.assign({}, this.$options.argv), { buildForAppStore: true, watch: false }));
-                    ipaFilePath = yield this.$buildController.prepareAndBuild(buildData);
-                    this.$logger.info(`Export at: ${ipaFilePath}`);
-                }
-            }
-            yield this.$itmsTransporterService.upload({
-                credentials: { username, password },
-                user,
-                applicationSpecificPassword: this.$options.appleApplicationSpecificPassword,
-                ipaFilePath,
-                shouldExtractIpa: !!this.$options.ipa,
-                verboseLogging: this.$logger.getLevel() === "TRACE",
-                teamId: this.$options.teamId,
-            });
+        await this.$itmsTransporterService.validate(this.$options.appleApplicationSpecificPassword);
+        const username = args[0] ||
+            (await this.$prompter.getString("Apple ID", { allowEmpty: false }));
+        const password = args[1] || (await this.$prompter.getPassword("Apple ID password"));
+        const user = await this.$applePortalSessionService.createUserSession({ username, password }, {
+            applicationSpecificPassword: this.$options.appleApplicationSpecificPassword,
+            sessionBase64: this.$options.appleSessionBase64,
+            requireInteractiveConsole: true,
+            requireApplicationSpecificPassword: true,
         });
-    }
-    canExecute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.$hostInfo.isDarwin) {
-                this.$errors.fail("iOS publishing is only available on macOS.");
+        if (!user.areCredentialsValid) {
+            this.$errors.fail(`Invalid username and password combination. Used '${username}' as the username.`);
+        }
+        const mobileProvisionIdentifier = (_a = this.$options.provision) !== null && _a !== void 0 ? _a : args[2];
+        let ipaFilePath = this.$options.ipa
+            ? path.resolve(this.$options.ipa)
+            : null;
+        if (!mobileProvisionIdentifier && !ipaFilePath) {
+            this.$logger.warn("No mobile provision identifier set. A default mobile provision will be used. You can set one in app/App_Resources/iOS/build.xcconfig");
+        }
+        this.$options.release = true;
+        if (!ipaFilePath) {
+            const platform = this.$devicePlatformsConstants.iOS.toLowerCase();
+            // No .ipa path provided, build .ipa on out own.
+            if (mobileProvisionIdentifier) {
+                // This is not very correct as if we build multiple targets we will try to sign all of them using the signing identity here.
+                this.$logger.info("Building .ipa with the selected mobile provision and/or certificate. " +
+                    mobileProvisionIdentifier);
+                this.$options.provision = mobileProvisionIdentifier;
+                const buildData = new build_data_1.IOSBuildData(this.$projectData.projectDir, platform, { ...this.$options.argv, buildForAppStore: true, watch: false });
+                ipaFilePath = await this.$buildController.prepareAndBuild(buildData);
             }
-            if (!this.$platformValidationService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
-                this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
+            else {
+                this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");
+                const buildData = new build_data_1.IOSBuildData(this.$projectData.projectDir, platform, { ...this.$options.argv, buildForAppStore: true, watch: false });
+                ipaFilePath = await this.$buildController.prepareAndBuild(buildData);
+                this.$logger.info(`Export at: ${ipaFilePath}`);
             }
-            return true;
+        }
+        await this.$itmsTransporterService.upload({
+            credentials: { username, password },
+            user,
+            applicationSpecificPassword: this.$options.appleApplicationSpecificPassword,
+            ipaFilePath,
+            shouldExtractIpa: !!this.$options.ipa,
+            verboseLogging: this.$logger.getLevel() === "TRACE",
+            teamId: this.$options.teamId,
         });
     }
+    async canExecute(args) {
+        if (!this.$hostInfo.isDarwin) {
+            this.$errors.fail("iOS publishing is only available on macOS.");
+        }
+        if (!this.$platformValidationService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+            this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
+        }
+        return true;
+    }
 }
 exports.PublishIOS = PublishIOS;
 yok_1.injector.registerCommand(["publish|ios", "appstore|upload"], PublishIOS);

package/lib/commands/build.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.BuildVisionOsCommand = exports.BuildAndroidCommand = exports.BuildIosCommand = exports.BuildCommandBase = void 0;
 const constants_1 = require("../constants");
@@ -32,27 +23,23 @@ class BuildCommandBase extends command_base_1.ValidatePlatformCommandBase {
         };
         this.$projectData.initializeProjectData();
     }
-    executeCore(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platform = args[0].toLowerCase();
-            const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, platform, this.$options);
-            const outputPath = yield this.$buildController.prepareAndBuild(buildData);
-            return outputPath;
-        });
+    async executeCore(args) {
+        const platform = args[0].toLowerCase();
+        const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, platform, this.$options);
+        const outputPath = await this.$buildController.prepareAndBuild(buildData);
+        return outputPath;
     }
     validatePlatform(platform) {
         if (!this.$platformValidationService.isPlatformSupportedForOS(platform, this.$projectData)) {
             this.$errors.fail(`Applications for platform ${platform} can not be built on this OS`);
         }
     }
-    validateArgs(args, platform) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (args.length !== 0) {
-                this.$errors.failWithHelp(`The arguments '${args.join(" ")}' are not valid for the current command.`);
-            }
-            const result = yield this.$platformValidationService.validateOptions(this.$options.provision, this.$options.teamId, this.$projectData, platform);
-            return result;
-        });
+    async validateArgs(args, platform) {
+        if (args.length !== 0) {
+            this.$errors.failWithHelp(`The arguments '${args.join(" ")}' are not valid for the current command.`);
+        }
+        const result = await this.$platformValidationService.validateOptions(this.$options.provision, this.$options.teamId, this.$projectData, platform);
+        return result;
     }
 }
 exports.BuildCommandBase = BuildCommandBase;
@@ -63,32 +50,23 @@ class BuildIosCommand extends BuildCommandBase {
         this.$migrateController = $migrateController;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.executeCore([this.$devicePlatformsConstants.iOS.toLowerCase()]);
-        });
+    async execute(args) {
+        await this.executeCore([this.$devicePlatformsConstants.iOS.toLowerCase()]);
     }
-    canExecute(args) {
-        const _super = Object.create(null, {
-            validatePlatform: { get: () => super.validatePlatform },
-            canExecuteCommandBase: { get: () => super.canExecuteCommandBase },
-            validateArgs: { get: () => super.validateArgs }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const platform = this.$devicePlatformsConstants.iOS;
-            if (!this.$options.force) {
-                yield this.$migrateController.validate({
-                    projectDir: this.$projectData.projectDir,
-                    platforms: [platform],
-                });
-            }
-            _super.validatePlatform.call(this, platform);
-            let canExecute = yield _super.canExecuteCommandBase.call(this, platform);
-            if (canExecute) {
-                canExecute = yield _super.validateArgs.call(this, args, platform);
-            }
-            return canExecute;
-        });
+    async canExecute(args) {
+        const platform = this.$devicePlatformsConstants.iOS;
+        if (!this.$options.force) {
+            await this.$migrateController.validate({
+                projectDir: this.$projectData.projectDir,
+                platforms: [platform],
+            });
+        }
+        super.validatePlatform(platform);
+        let canExecute = await super.canExecuteCommandBase(platform);
+        if (canExecute) {
+            canExecute = await super.validateArgs(args, platform);
+        }
+        return canExecute;
     }
 }
 exports.BuildIosCommand = BuildIosCommand;
@@ -103,42 +81,34 @@ class BuildAndroidCommand extends BuildCommandBase {
         this.$migrateController = $migrateController;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.executeCore([
-                this.$devicePlatformsConstants.Android.toLowerCase(),
-            ]);
-            if (this.$options.aab) {
-                this.$logger.info(constants_1.AndroidAppBundleMessages.ANDROID_APP_BUNDLE_DOCS_MESSAGE);
-                if (this.$options.release) {
-                    this.$logger.info(constants_1.AndroidAppBundleMessages.ANDROID_APP_BUNDLE_PUBLISH_DOCS_MESSAGE);
-                }
+    async execute(args) {
+        await this.executeCore([
+            this.$devicePlatformsConstants.Android.toLowerCase(),
+        ]);
+        if (this.$options.aab) {
+            this.$logger.info(constants_1.AndroidAppBundleMessages.ANDROID_APP_BUNDLE_DOCS_MESSAGE);
+            if (this.$options.release) {
+                this.$logger.info(constants_1.AndroidAppBundleMessages.ANDROID_APP_BUNDLE_PUBLISH_DOCS_MESSAGE);
             }
-        });
+        }
     }
-    canExecute(args) {
-        const _super = Object.create(null, {
-            canExecuteCommandBase: { get: () => super.canExecuteCommandBase },
-            validateArgs: { get: () => super.validateArgs }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const platform = this.$devicePlatformsConstants.Android;
-            if (!this.$options.force) {
-                yield this.$migrateController.validate({
-                    projectDir: this.$projectData.projectDir,
-                    platforms: [platform],
-                });
-            }
-            this.$androidBundleValidatorHelper.validateRuntimeVersion(this.$projectData);
-            let canExecute = yield _super.canExecuteCommandBase.call(this, platform);
-            if (canExecute) {
-                if (this.$options.release && !(0, helpers_1.hasValidAndroidSigning)(this.$options)) {
-                    this.$errors.failWithHelp(constants_1.ANDROID_RELEASE_BUILD_ERROR_MESSAGE);
-                }
-                canExecute = yield _super.validateArgs.call(this, args, platform);
+    async canExecute(args) {
+        const platform = this.$devicePlatformsConstants.Android;
+        if (!this.$options.force) {
+            await this.$migrateController.validate({
+                projectDir: this.$projectData.projectDir,
+                platforms: [platform],
+            });
+        }
+        this.$androidBundleValidatorHelper.validateRuntimeVersion(this.$projectData);
+        let canExecute = await super.canExecuteCommandBase(platform);
+        if (canExecute) {
+            if (this.$options.release && !(0, helpers_1.hasValidAndroidSigning)(this.$options)) {
+                this.$errors.failWithHelp(constants_1.ANDROID_RELEASE_BUILD_ERROR_MESSAGE);
             }
-            return canExecute;
-        });
+            canExecute = await super.validateArgs(args, platform);
+        }
+        return canExecute;
     }
 }
 exports.BuildAndroidCommand = BuildAndroidCommand;
@@ -149,11 +119,9 @@ class BuildVisionOsCommand extends BuildIosCommand {
         this.$options = $options;
         this.$migrateController = $migrateController;
     }
-    canExecute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$errors.fail('Building for "visionOS" platform is not supported via the CLI. Please open the project in Xcode and build it from there.');
-            return false;
-        });
+    async canExecute(args) {
+        this.$errors.fail('Building for "visionOS" platform is not supported via the CLI. Please open the project in Xcode and build it from there.');
+        return false;
     }
 }
 exports.BuildVisionOsCommand = BuildVisionOsCommand;