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

package/lib/key-commands/index.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.QuestionMark = exports.N = exports.C = exports.W = exports.CtrlC = exports.ShiftR = exports.R = exports.OpenVisionOSCommand = exports.ShiftV = exports.V = exports.OpenIOSCommand = exports.ShiftI = exports.I = exports.OpenAndroidCommand = exports.ShiftA = exports.A = void 0;
 const fs = require("fs");
@@ -23,10 +14,8 @@ class A {
         this.description = "Run Android app";
         this.group = "Android";
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$startService.runAndroid();
-        });
+    async execute() {
+        this.$startService.runAndroid();
     }
     canExecute(processType) {
         return processType === "start";
@@ -65,42 +54,40 @@ class ShiftA {
         }
         return null;
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$liveSyncCommandHelper.validatePlatform(this.platform);
-            this.$projectData.initializeProjectData();
-            const androidDir = `${this.$projectData.platformsDir}/android`;
-            if (!fs.existsSync(androidDir)) {
-                const prepareCommand = yok_1.injector.resolveCommand("prepare");
-                yield prepareCommand.execute([this.platform]);
-                if (this.isInteractive) {
-                    process.stdin.resume();
-                }
+    async execute() {
+        this.$liveSyncCommandHelper.validatePlatform(this.platform);
+        this.$projectData.initializeProjectData();
+        const androidDir = `${this.$projectData.platformsDir}/android`;
+        if (!fs.existsSync(androidDir)) {
+            const prepareCommand = yok_1.injector.resolveCommand("prepare");
+            await prepareCommand.execute([this.platform]);
+            if (this.isInteractive) {
+                process.stdin.resume();
             }
-            let studioPath = null;
-            studioPath = process.env.NATIVESCRIPT_ANDROID_STUDIO_PATH;
+        }
+        let studioPath = null;
+        studioPath = process.env.NATIVESCRIPT_ANDROID_STUDIO_PATH;
+        if (!studioPath) {
+            studioPath = this.getAndroidStudioPath();
             if (!studioPath) {
-                studioPath = this.getAndroidStudioPath();
-                if (!studioPath) {
-                    this.$logger.error("Android Studio is not installed, or is not in a standard location. Use NATIVESCRIPT_ANDROID_STUDIO_PATH.");
-                    return;
-                }
-            }
-            const os = (0, os_1.platform)();
-            if (os === "darwin") {
-                this.$childProcess.exec(`open -a "${studioPath}" ${androidDir}`);
+                this.$logger.error("Android Studio is not installed, or is not in a standard location. Use NATIVESCRIPT_ANDROID_STUDIO_PATH.");
+                return;
             }
-            else if (os === "win32") {
-                const child = this.$childProcess.spawn(studioPath, [androidDir], {
-                    detached: true,
-                    stdio: "ignore",
-                });
-                child.unref();
-            }
-            else if (os === "linux") {
-                this.$childProcess.exec(`${studioPath} ${androidDir}`);
-            }
-        });
+        }
+        const os = (0, os_1.platform)();
+        if (os === "darwin") {
+            this.$childProcess.exec(`open -a "${studioPath}" ${androidDir}`);
+        }
+        else if (os === "win32") {
+            const child = this.$childProcess.spawn(studioPath, [androidDir], {
+                detached: true,
+                stdio: "ignore",
+            });
+            child.unref();
+        }
+        else if (os === "linux") {
+            this.$childProcess.exec(`${studioPath} ${androidDir}`);
+        }
     }
 }
 exports.ShiftA = ShiftA;
@@ -110,14 +97,9 @@ class OpenAndroidCommand extends ShiftA {
         this.$options = $options;
         this.isInteractive = false;
     }
-    execute() {
-        const _super = Object.create(null, {
-            execute: { get: () => super.execute }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$options.watch = false;
-            _super.execute.call(this);
-        });
+    async execute() {
+        this.$options.watch = false;
+        super.execute();
     }
 }
 exports.OpenAndroidCommand = OpenAndroidCommand;
@@ -129,10 +111,8 @@ class I {
         this.description = "Run iOS app";
         this.group = "iOS";
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$startService.runIOS();
-        });
+    async execute() {
+        this.$startService.runIOS();
     }
     canExecute(processType) {
         return processType === "start";
@@ -154,37 +134,35 @@ class ShiftI {
         this.willBlockKeyCommandExecution = true;
         this.isInteractive = true;
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const os = (0, os_1.platform)();
-            if (os === "darwin") {
-                this.$projectData.initializeProjectData();
-                const iosDir = path.resolve(this.$projectData.platformsDir, "ios");
-                if (!fs.existsSync(iosDir)) {
-                    const prepareCommand = yok_1.injector.resolveCommand("prepare");
-                    yield prepareCommand.execute(["ios"]);
-                    if (this.isInteractive) {
-                        process.stdin.resume();
-                    }
-                }
-                const platformData = this.$iOSProjectService.getPlatformData(this.$projectData);
-                const xcprojectFile = this.$xcodebuildArgsService.getXcodeProjectArgs(platformData, this.$projectData)[1];
-                if (fs.existsSync(xcprojectFile)) {
-                    this.$xcodeSelectService
-                        .getDeveloperDirectoryPath()
-                        .then(() => this.$childProcess.exec(`open ${xcprojectFile}`, {}))
-                        .catch((e) => {
-                        this.$logger.error(e.message);
-                    });
-                }
-                else {
-                    this.$logger.error(`Unable to open project file: ${xcprojectFile}`);
+    async execute() {
+        const os = (0, os_1.platform)();
+        if (os === "darwin") {
+            this.$projectData.initializeProjectData();
+            const iosDir = path.resolve(this.$projectData.platformsDir, "ios");
+            if (!fs.existsSync(iosDir)) {
+                const prepareCommand = yok_1.injector.resolveCommand("prepare");
+                await prepareCommand.execute(["ios"]);
+                if (this.isInteractive) {
+                    process.stdin.resume();
                 }
             }
+            const platformData = this.$iOSProjectService.getPlatformData(this.$projectData);
+            const xcprojectFile = this.$xcodebuildArgsService.getXcodeProjectArgs(platformData, this.$projectData)[1];
+            if (fs.existsSync(xcprojectFile)) {
+                this.$xcodeSelectService
+                    .getDeveloperDirectoryPath()
+                    .then(() => this.$childProcess.exec(`open ${xcprojectFile}`, {}))
+                    .catch((e) => {
+                    this.$logger.error(e.message);
+                });
+            }
             else {
-                this.$logger.error("Opening a project in XCode requires macOS.");
+                this.$logger.error(`Unable to open project file: ${xcprojectFile}`);
             }
-        });
+        }
+        else {
+            this.$logger.error("Opening a project in XCode requires macOS.");
+        }
     }
 }
 exports.ShiftI = ShiftI;
@@ -194,14 +172,9 @@ class OpenIOSCommand extends ShiftI {
         this.$options = $options;
         this.isInteractive = false;
     }
-    execute() {
-        const _super = Object.create(null, {
-            execute: { get: () => super.execute }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$options.watch = false;
-            _super.execute.call(this);
-        });
+    async execute() {
+        this.$options.watch = false;
+        super.execute();
     }
 }
 exports.OpenIOSCommand = OpenIOSCommand;
@@ -213,10 +186,8 @@ class V {
         this.description = "Run visionOS app";
         this.group = "visionOS";
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$startService.runVisionOS();
-        });
+    async execute() {
+        this.$startService.runVisionOS();
     }
     canExecute(processType) {
         return processType === "start";
@@ -239,39 +210,37 @@ class ShiftV {
         this.willBlockKeyCommandExecution = true;
         this.isInteractive = true;
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$options.platformOverride = "visionOS";
-            const os = (0, os_1.platform)();
-            if (os === "darwin") {
-                this.$projectData.initializeProjectData();
-                const visionOSDir = path.resolve(this.$projectData.platformsDir, "visionos");
-                if (!fs.existsSync(visionOSDir)) {
-                    const prepareCommand = yok_1.injector.resolveCommand("prepare");
-                    yield prepareCommand.execute(["visionos"]);
-                    if (this.isInteractive) {
-                        process.stdin.resume();
-                    }
-                }
-                const platformData = this.$iOSProjectService.getPlatformData(this.$projectData);
-                const xcprojectFile = this.$xcodebuildArgsService.getXcodeProjectArgs(platformData, this.$projectData)[1];
-                if (fs.existsSync(xcprojectFile)) {
-                    this.$xcodeSelectService
-                        .getDeveloperDirectoryPath()
-                        .then(() => this.$childProcess.exec(`open ${xcprojectFile}`, {}))
-                        .catch((e) => {
-                        this.$logger.error(e.message);
-                    });
-                }
-                else {
-                    this.$logger.error(`Unable to open project file: ${xcprojectFile}`);
+    async execute() {
+        this.$options.platformOverride = "visionOS";
+        const os = (0, os_1.platform)();
+        if (os === "darwin") {
+            this.$projectData.initializeProjectData();
+            const visionOSDir = path.resolve(this.$projectData.platformsDir, "visionos");
+            if (!fs.existsSync(visionOSDir)) {
+                const prepareCommand = yok_1.injector.resolveCommand("prepare");
+                await prepareCommand.execute(["visionos"]);
+                if (this.isInteractive) {
+                    process.stdin.resume();
                 }
             }
+            const platformData = this.$iOSProjectService.getPlatformData(this.$projectData);
+            const xcprojectFile = this.$xcodebuildArgsService.getXcodeProjectArgs(platformData, this.$projectData)[1];
+            if (fs.existsSync(xcprojectFile)) {
+                this.$xcodeSelectService
+                    .getDeveloperDirectoryPath()
+                    .then(() => this.$childProcess.exec(`open ${xcprojectFile}`, {}))
+                    .catch((e) => {
+                    this.$logger.error(e.message);
+                });
+            }
             else {
-                this.$logger.error("Opening a project in XCode requires macOS.");
+                this.$logger.error(`Unable to open project file: ${xcprojectFile}`);
             }
-            this.$options.platformOverride = null;
-        });
+        }
+        else {
+            this.$logger.error("Opening a project in XCode requires macOS.");
+        }
+        this.$options.platformOverride = null;
     }
 }
 exports.ShiftV = ShiftV;
@@ -281,14 +250,9 @@ class OpenVisionOSCommand extends ShiftV {
         this.$options = $options;
         this.isInteractive = false;
     }
-    execute() {
-        const _super = Object.create(null, {
-            execute: { get: () => super.execute }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$options.watch = false;
-            _super.execute.call(this);
-        });
+    async execute() {
+        this.$options.watch = false;
+        super.execute();
     }
 }
 exports.OpenVisionOSCommand = OpenVisionOSCommand;
@@ -301,12 +265,10 @@ class R {
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = true;
     }
-    execute(platform) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const devices = yield this.$liveSyncCommandHelper.getDeviceInstances(platform);
-            yield this.$liveSyncCommandHelper.executeLiveSyncOperation(devices, platform, {
-                restartLiveSync: true,
-            });
+    async execute(platform) {
+        const devices = await this.$liveSyncCommandHelper.getDeviceInstances(platform);
+        await this.$liveSyncCommandHelper.executeLiveSyncOperation(devices, platform, {
+            restartLiveSync: true,
         });
     }
 }
@@ -320,14 +282,12 @@ class ShiftR {
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = true;
     }
-    execute(platform) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const devices = yield this.$liveSyncCommandHelper.getDeviceInstances(platform);
-            yield this.$liveSyncCommandHelper.executeLiveSyncOperation(devices, platform, {
-                skipNativePrepare: false,
-                forceRebuildNativeApp: true,
-                restartLiveSync: true,
-            });
+    async execute(platform) {
+        const devices = await this.$liveSyncCommandHelper.getDeviceInstances(platform);
+        await this.$liveSyncCommandHelper.executeLiveSyncOperation(devices, platform, {
+            skipNativePrepare: false,
+            forceRebuildNativeApp: true,
+            restartLiveSync: true,
         });
     }
 }
@@ -339,10 +299,8 @@ class CtrlC {
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = false;
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            process.exit();
-        });
+    async execute() {
+        process.exit();
     }
 }
 exports.CtrlC = CtrlC;
@@ -355,16 +313,14 @@ class W {
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = true;
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const paused = yield this.$prepareController.toggleFileWatcher();
-                process.stdout.write(paused
-                    ? color_1.color.gray("Paused watching file changes... Press 'w' to resume.")
-                    : color_1.color.bgGreen("Resumed watching file changes"));
-            }
-            catch (e) { }
-        });
+    async execute() {
+        try {
+            const paused = await this.$prepareController.toggleFileWatcher();
+            process.stdout.write(paused
+                ? color_1.color.gray("Paused watching file changes... Press 'w' to resume.")
+                : color_1.color.bgGreen("Resumed watching file changes"));
+        }
+        catch (e) { }
     }
 }
 exports.W = W;
@@ -378,17 +334,15 @@ class C {
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = true;
     }
-    execute() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$liveSyncCommandHelper.stop();
-            const clean = this.$childProcess.spawn("ns", ["clean"]);
-            clean.stdout.on("data", (data) => {
-                process.stdout.write(data);
-                if (data.toString().includes("Project successfully cleaned.") ||
-                    data.toString().includes("Project unsuccessfully cleaned.")) {
-                    clean.kill("SIGINT");
-                }
-            });
+    async execute() {
+        await this.$liveSyncCommandHelper.stop();
+        const clean = this.$childProcess.spawn("ns", ["clean"]);
+        clean.stdout.on("data", (data) => {
+            process.stdout.write(data);
+            if (data.toString().includes("Project successfully cleaned.") ||
+                data.toString().includes("Project unsuccessfully cleaned.")) {
+                clean.kill("SIGINT");
+            }
         });
     }
 }
@@ -401,12 +355,10 @@ class N {
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = true;
     }
-    execute(platform) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const install = yok_1.injector.resolveCommand("install");
-            yield install.execute([]);
-            process.stdin.resume();
-        });
+    async execute(platform) {
+        const install = yok_1.injector.resolveCommand("install");
+        await install.execute([]);
+        process.stdin.resume();
     }
 }
 exports.N = N;
@@ -419,27 +371,25 @@ class QuestionMark {
         this.group = "Development Workflow";
         this.willBlockKeyCommandExecution = true;
     }
-    execute(platform_) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let platform;
-            switch (platform_.toLowerCase()) {
-                case "android":
-                    platform = "Android";
-                    break;
-                case "ios":
-                    platform = "iOS";
-                    break;
-                case "visionOS":
-                case "vision":
-                    platform = "visionOS";
-                    break;
-                default:
-                    platform = "all";
-                    break;
-            }
-            this.$keyCommandHelper.printCommands(platform);
-            process.stdin.resume();
-        });
+    async execute(platform_) {
+        let platform;
+        switch (platform_.toLowerCase()) {
+            case "android":
+                platform = "Android";
+                break;
+            case "ios":
+                platform = "iOS";
+                break;
+            case "visionOS":
+            case "vision":
+                platform = "visionOS";
+                break;
+            default:
+                platform = "all";
+                break;
+        }
+        this.$keyCommandHelper.printCommands(platform);
+        process.stdin.resume();
     }
 }
 exports.QuestionMark = QuestionMark;

package/lib/nativescript-cli.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.originalProcessOn = void 0;
 require("./bootstrap");
@@ -33,7 +24,7 @@ process.on = (event, listener) => {
     }
 };
 /* tslint:disable:no-floating-promises */
-(() => __awaiter(void 0, void 0, void 0, function* () {
+(async () => {
     if (process.argv.includes("--get-yargs-completions")) {
         // This is a special case when we want to get the yargs completions as fast as possible...
         yok_1.injector.resolve("$options");
@@ -43,10 +34,10 @@ process.on = (event, listener) => {
     const err = yok_1.injector.resolve("$errors");
     err.printCallStack = config.DEBUG;
     const $initializeService = yok_1.injector.resolve("initializeService");
-    yield $initializeService.initialize();
+    await $initializeService.initialize();
     const extensibilityService = yok_1.injector.resolve("extensibilityService");
     try {
-        yield (0, helpers_1.settlePromises)(extensibilityService.loadExtensions());
+        await (0, helpers_1.settlePromises)(extensibilityService.loadExtensions());
     }
     catch (err) {
         logger.trace("Unable to load extensions. Error is: ", err);
@@ -57,8 +48,8 @@ process.on = (event, listener) => {
     // messages.pathsToMessageJsonFiles = [
     // 	/* Place client-specific json message file paths here */
     // ];
-    yield commandDispatcher.dispatchCommand();
+    await commandDispatcher.dispatchCommand();
     yok_1.injector.dispose();
-}))();
+})();
 /* tslint:enable:no-floating-promises */
 //# sourceMappingURL=nativescript-cli.js.map