nativescript 8.9.0-alpha.3 → 8.9.0-dev.1

package/lib/common/commands/device/list-files.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.ListFilesCommand = void 0;
 const yok_1 = require("../../yok");
@@ -23,32 +14,30 @@ class ListFilesCommand {
             this.$stringParameter,
         ];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$devicesService.initialize({
-                deviceId: this.$options.device,
-                skipInferPlatform: true,
-            });
-            const pathToList = args[0];
-            let appIdentifier = args[1];
-            if (!appIdentifier) {
-                try {
-                    this.$projectData.initializeProjectData();
-                }
-                catch (err) {
-                }
-                if (!this.$projectData.projectIdentifiers) {
-                    this.$errors.fail("Please enter application identifier or execute this command in project.");
-                }
-            }
-            const action = (device) => __awaiter(this, void 0, void 0, function* () {
-                appIdentifier =
-                    appIdentifier ||
-                        this.$projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
-                yield device.fileSystem.listFiles(pathToList, appIdentifier);
-            });
-            yield this.$devicesService.execute(action);
+    async execute(args) {
+        await this.$devicesService.initialize({
+            deviceId: this.$options.device,
+            skipInferPlatform: true,
         });
+        const pathToList = args[0];
+        let appIdentifier = args[1];
+        if (!appIdentifier) {
+            try {
+                this.$projectData.initializeProjectData();
+            }
+            catch (err) {
+            }
+            if (!this.$projectData.projectIdentifiers) {
+                this.$errors.fail("Please enter application identifier or execute this command in project.");
+            }
+        }
+        const action = async (device) => {
+            appIdentifier =
+                appIdentifier ||
+                    this.$projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
+            await device.fileSystem.listFiles(pathToList, appIdentifier);
+        };
+        await this.$devicesService.execute(action);
     }
 }
 exports.ListFilesCommand = ListFilesCommand;

package/lib/common/commands/device/put-file.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.PutFileCommand = void 0;
 const yok_1 = require("../../yok");
@@ -24,31 +15,29 @@ class PutFileCommand {
             this.$stringParameter,
         ];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$devicesService.initialize({
-                deviceId: this.$options.device,
-                skipInferPlatform: true,
-            });
-            let appIdentifier = args[2];
-            if (!appIdentifier) {
-                try {
-                    this.$projectData.initializeProjectData();
-                }
-                catch (err) {
-                }
-                if (!this.$projectData.projectIdentifiers) {
-                    this.$errors.fail("Please enter application identifier or execute this command in project.");
-                }
-            }
-            const action = (device) => __awaiter(this, void 0, void 0, function* () {
-                appIdentifier =
-                    appIdentifier ||
-                        this.$projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
-                yield device.fileSystem.putFile(args[0], args[1], appIdentifier);
-            });
-            yield this.$devicesService.execute(action);
+    async execute(args) {
+        await this.$devicesService.initialize({
+            deviceId: this.$options.device,
+            skipInferPlatform: true,
         });
+        let appIdentifier = args[2];
+        if (!appIdentifier) {
+            try {
+                this.$projectData.initializeProjectData();
+            }
+            catch (err) {
+            }
+            if (!this.$projectData.projectIdentifiers) {
+                this.$errors.fail("Please enter application identifier or execute this command in project.");
+            }
+        }
+        const action = async (device) => {
+            appIdentifier =
+                appIdentifier ||
+                    this.$projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
+            await device.fileSystem.putFile(args[0], args[1], appIdentifier);
+        };
+        await this.$devicesService.execute(action);
     }
 }
 exports.PutFileCommand = PutFileCommand;

package/lib/common/commands/device/run-application.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.RunApplicationOnDeviceCommand = void 0;
 const yok_1 = require("../../yok");
@@ -23,23 +14,19 @@ class RunApplicationOnDeviceCommand {
             this.$stringParameter,
         ];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$devicesService.initialize({
-                deviceId: this.$options.device,
-                skipInferPlatform: true,
-            });
-            if (this.$devicesService.deviceCount > 1) {
-                this.$errors.failWithHelp("More than one device found. Specify device explicitly with --device option. To discover device ID, use $%s device command.", this.$staticConfig.CLIENT_NAME.toLowerCase());
-            }
-            yield this.$devicesService.execute((device) => __awaiter(this, void 0, void 0, function* () {
-                return yield device.applicationManager.startApplication({
-                    appId: args[0],
-                    projectName: args[1],
-                    projectDir: null,
-                });
-            }));
+    async execute(args) {
+        await this.$devicesService.initialize({
+            deviceId: this.$options.device,
+            skipInferPlatform: true,
         });
+        if (this.$devicesService.deviceCount > 1) {
+            this.$errors.failWithHelp("More than one device found. Specify device explicitly with --device option. To discover device ID, use $%s device command.", this.$staticConfig.CLIENT_NAME.toLowerCase());
+        }
+        await this.$devicesService.execute(async (device) => await device.applicationManager.startApplication({
+            appId: args[0],
+            projectName: args[1],
+            projectDir: null,
+        }));
     }
 }
 exports.RunApplicationOnDeviceCommand = RunApplicationOnDeviceCommand;

package/lib/common/commands/device/stop-application.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.StopApplicationOnDeviceCommand = void 0;
 const yok_1 = require("../../yok");
@@ -22,20 +13,18 @@ class StopApplicationOnDeviceCommand {
             this.$stringParameter,
         ];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$devicesService.initialize({
-                deviceId: this.$options.device,
-                skipInferPlatform: true,
-                platform: args[1],
-            });
-            const action = (device) => device.applicationManager.stopApplication({
-                appId: args[0],
-                projectName: args[2],
-                projectDir: null,
-            });
-            yield this.$devicesService.execute(action);
+    async execute(args) {
+        await this.$devicesService.initialize({
+            deviceId: this.$options.device,
+            skipInferPlatform: true,
+            platform: args[1],
         });
+        const action = (device) => device.applicationManager.stopApplication({
+            appId: args[0],
+            projectName: args[2],
+            projectDir: null,
+        });
+        await this.$devicesService.execute(action);
     }
 }
 exports.StopApplicationOnDeviceCommand = StopApplicationOnDeviceCommand;

package/lib/common/commands/device/uninstall-application.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.UninstallApplicationCommand = void 0;
 const yok_1 = require("../../yok");
@@ -18,15 +9,13 @@ class UninstallApplicationCommand {
         this.$options = $options;
         this.allowedParameters = [this.$stringParameter];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$devicesService.initialize({
-                deviceId: this.$options.device,
-                skipInferPlatform: true,
-            });
-            const action = (device) => device.applicationManager.uninstallApplication(args[0]);
-            yield this.$devicesService.execute(action);
+    async execute(args) {
+        await this.$devicesService.initialize({
+            deviceId: this.$options.device,
+            skipInferPlatform: true,
         });
+        const action = (device) => device.applicationManager.uninstallApplication(args[0]);
+        await this.$devicesService.execute(action);
     }
 }
 exports.UninstallApplicationCommand = UninstallApplicationCommand;

package/lib/common/commands/generate-messages.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.GenerateMessages = void 0;
 const path = require("path");
@@ -19,27 +10,25 @@ class GenerateMessages {
         this.$options = $options;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.$messageContractGenerator.generate();
-            const innerMessagesDirectory = path.join(__dirname, "../messages");
-            const outerMessagesDirectory = path.join(__dirname, "../..");
-            let interfaceFilePath;
-            let implementationFilePath;
-            if (this.$options.default) {
-                interfaceFilePath = path.join(innerMessagesDirectory, GenerateMessages.MESSAGES_DEFINITIONS_FILE_NAME);
-                implementationFilePath = path.join(innerMessagesDirectory, GenerateMessages.MESSAGES_IMPLEMENTATION_FILE_NAME);
-            }
-            else {
-                interfaceFilePath = path.join(outerMessagesDirectory, GenerateMessages.MESSAGES_DEFINITIONS_FILE_NAME);
-                implementationFilePath = path.join(outerMessagesDirectory, GenerateMessages.MESSAGES_IMPLEMENTATION_FILE_NAME);
-            }
-            this.$fs.writeFile(interfaceFilePath, result.interfaceFile);
-            this.$fs.writeFile(implementationFilePath, result.implementationFile);
-        });
+    async execute(args) {
+        const result = await this.$messageContractGenerator.generate();
+        const innerMessagesDirectory = path.join(__dirname, "../messages");
+        const outerMessagesDirectory = path.join(__dirname, "../..");
+        let interfaceFilePath;
+        let implementationFilePath;
+        if (this.$options.default) {
+            interfaceFilePath = path.join(innerMessagesDirectory, GenerateMessages.MESSAGES_DEFINITIONS_FILE_NAME);
+            implementationFilePath = path.join(innerMessagesDirectory, GenerateMessages.MESSAGES_IMPLEMENTATION_FILE_NAME);
+        }
+        else {
+            interfaceFilePath = path.join(outerMessagesDirectory, GenerateMessages.MESSAGES_DEFINITIONS_FILE_NAME);
+            implementationFilePath = path.join(outerMessagesDirectory, GenerateMessages.MESSAGES_IMPLEMENTATION_FILE_NAME);
+        }
+        this.$fs.writeFile(interfaceFilePath, result.interfaceFile);
+        this.$fs.writeFile(implementationFilePath, result.implementationFile);
     }
 }
+exports.GenerateMessages = GenerateMessages;
 GenerateMessages.MESSAGES_DEFINITIONS_FILE_NAME = "messages.interface.d.ts";
 GenerateMessages.MESSAGES_IMPLEMENTATION_FILE_NAME = "messages.ts";
-exports.GenerateMessages = GenerateMessages;
 yok_1.injector.registerCommand("dev-generate-messages", GenerateMessages);

package/lib/common/commands/help.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.HelpCommand = void 0;
 const _ = require("lodash");
@@ -20,31 +11,27 @@ class HelpCommand {
         this.enableHooks = false;
         this.allowedParameters = [];
     }
-    canExecute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return true;
-        });
+    async canExecute(args) {
+        return true;
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let commandName = (args[0] || "").toLowerCase();
-            let commandArguments = _.tail(args);
-            const hierarchicalCommand = this.$injector.buildHierarchicalCommand(args[0], commandArguments);
-            if (hierarchicalCommand) {
-                commandName = hierarchicalCommand.commandName;
-                commandArguments = hierarchicalCommand.remainingArguments;
-            }
-            const commandData = {
-                commandName,
-                commandArguments,
-            };
-            if (this.$options.help) {
-                yield this.$helpService.showCommandLineHelp(commandData);
-            }
-            else {
-                yield this.$helpService.openHelpForCommandInBrowser(commandData);
-            }
-        });
+    async execute(args) {
+        let commandName = (args[0] || "").toLowerCase();
+        let commandArguments = _.tail(args);
+        const hierarchicalCommand = this.$injector.buildHierarchicalCommand(args[0], commandArguments);
+        if (hierarchicalCommand) {
+            commandName = hierarchicalCommand.commandName;
+            commandArguments = hierarchicalCommand.remainingArguments;
+        }
+        const commandData = {
+            commandName,
+            commandArguments,
+        };
+        if (this.$options.help) {
+            await this.$helpService.showCommandLineHelp(commandData);
+        }
+        else {
+            await this.$helpService.openHelpForCommandInBrowser(commandData);
+        }
     }
 }
 exports.HelpCommand = HelpCommand;

package/lib/common/commands/package-manager-get.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.PackageManagerGetCommand = void 0;
 const yok_1 = require("../yok");
@@ -18,14 +9,12 @@ class PackageManagerGetCommand {
         this.$userSettingsService = $userSettingsService;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (args && args.length) {
-                this.$errors.failWithHelp(`The arguments '${args.join(" ")}' are not valid for the 'package-manager get' command.`);
-            }
-            const result = yield this.$userSettingsService.getSettingValue("packageManager");
-            this.$logger.printMarkdown(`Your current package manager is \`${result || "npm"}\`.`);
-        });
+    async execute(args) {
+        if (args && args.length) {
+            this.$errors.failWithHelp(`The arguments '${args.join(" ")}' are not valid for the 'package-manager get' command.`);
+        }
+        const result = await this.$userSettingsService.getSettingValue("packageManager");
+        this.$logger.printMarkdown(`Your current package manager is \`${result || "npm"}\`.`);
     }
 }
 exports.PackageManagerGetCommand = PackageManagerGetCommand;

package/lib/common/commands/package-manager-set.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.PackageManagerCommand = void 0;
 const constants_1 = require("../../constants");
@@ -20,17 +11,15 @@ class PackageManagerCommand {
         this.$stringParameter = $stringParameter;
         this.allowedParameters = [this.$stringParameter];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const packageManagerName = args[0];
-            const supportedPackageManagers = Object.keys(constants_1.PackageManagers);
-            if (supportedPackageManagers.indexOf(packageManagerName) === -1) {
-                this.$errors.fail(`${packageManagerName} is not a valid package manager. Supported values are: ${supportedPackageManagers.join(", ")}.`);
-            }
-            yield this.$userSettingsService.saveSetting("packageManager", packageManagerName);
-            this.$logger.printMarkdown(`Please ensure you have the directory containing \`${packageManagerName}\` executable available in your PATH.`);
-            this.$logger.printMarkdown(`You've successfully set \`${packageManagerName}\` as your package manager.`);
-        });
+    async execute(args) {
+        const packageManagerName = args[0];
+        const supportedPackageManagers = Object.keys(constants_1.PackageManagers);
+        if (supportedPackageManagers.indexOf(packageManagerName) === -1) {
+            this.$errors.fail(`${packageManagerName} is not a valid package manager. Supported values are: ${supportedPackageManagers.join(", ")}.`);
+        }
+        await this.$userSettingsService.saveSetting("packageManager", packageManagerName);
+        this.$logger.printMarkdown(`Please ensure you have the directory containing \`${packageManagerName}\` executable available in your PATH.`);
+        this.$logger.printMarkdown(`You've successfully set \`${packageManagerName}\` as your package manager.`);
     }
 }
 exports.PackageManagerCommand = PackageManagerCommand;

package/lib/common/commands/post-install.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.PostInstallCommand = void 0;
 const yok_1 = require("../yok");
@@ -17,10 +8,8 @@ class PostInstallCommand {
         this.disableAnalytics = true;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$errors.fail("This command is deprecated. Use `ns dev-post-install-cli` instead");
-        });
+    async execute(args) {
+        this.$errors.fail("This command is deprecated. Use `ns dev-post-install-cli` instead");
     }
 }
 exports.PostInstallCommand = PostInstallCommand;

package/lib/common/commands/preuninstall.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.PreUninstallCommand = void 0;
 const path = require("path");
@@ -23,38 +14,32 @@ class PreUninstallCommand {
         this.$settingsService = $settingsService;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const isIntentionalUninstall = (0, helpers_1.doesCurrentNpmCommandMatch)([
-                /^uninstall$/,
-                /^remove$/,
-                /^rm$/,
-                /^r$/,
-                /^un$/,
-                /^unlink$/,
-            ]);
-            yield this.$analyticsService.trackEventActionInGoogleAnalytics({
-                action: "Uninstall CLI",
-                additionalData: `isIntentionalUninstall${constants_1.AnalyticsEventLabelDelimiter}${isIntentionalUninstall}${constants_1.AnalyticsEventLabelDelimiter}isInteractive${constants_1.AnalyticsEventLabelDelimiter}${!!(0, helpers_1.isInteractive)()}`,
-            });
-            if (isIntentionalUninstall) {
-                yield this.handleIntentionalUninstall();
-            }
-            this.$fs.deleteFile(path.join(this.$settingsService.getProfileDir(), "KillSwitches", "cli"));
-            yield this.$analyticsService.finishTracking();
+    async execute(args) {
+        const isIntentionalUninstall = (0, helpers_1.doesCurrentNpmCommandMatch)([
+            /^uninstall$/,
+            /^remove$/,
+            /^rm$/,
+            /^r$/,
+            /^un$/,
+            /^unlink$/,
+        ]);
+        await this.$analyticsService.trackEventActionInGoogleAnalytics({
+            action: "Uninstall CLI",
+            additionalData: `isIntentionalUninstall${constants_1.AnalyticsEventLabelDelimiter}${isIntentionalUninstall}${constants_1.AnalyticsEventLabelDelimiter}isInteractive${constants_1.AnalyticsEventLabelDelimiter}${!!(0, helpers_1.isInteractive)()}`,
         });
+        if (isIntentionalUninstall) {
+            await this.handleIntentionalUninstall();
+        }
+        this.$fs.deleteFile(path.join(this.$settingsService.getProfileDir(), "KillSwitches", "cli"));
+        await this.$analyticsService.finishTracking();
     }
-    handleIntentionalUninstall() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$extensibilityService.removeAllExtensions();
-            this.$packageInstallationManager.clearInspectorCache();
-            yield this.handleFeedbackForm();
-        });
+    async handleIntentionalUninstall() {
+        this.$extensibilityService.removeAllExtensions();
+        this.$packageInstallationManager.clearInspectorCache();
+        await this.handleFeedbackForm();
     }
-    handleFeedbackForm() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return Promise.resolve();
-        });
+    async handleFeedbackForm() {
+        return Promise.resolve();
     }
 }
 exports.PreUninstallCommand = PreUninstallCommand;

package/lib/common/commands/proxy/proxy-base.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.ProxyCommandBase = void 0;
 class ProxyCommandBase {
@@ -19,16 +10,14 @@ class ProxyCommandBase {
         this.disableAnalytics = true;
         this.allowedParameters = [];
     }
-    tryTrackUsage() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.$logger.trace(this.commandName);
-            }
-            catch (ex) {
-                this.$logger.trace("Error in trying to track proxy command usage:");
-                this.$logger.trace(ex);
-            }
-        });
+    async tryTrackUsage() {
+        try {
+            this.$logger.trace(this.commandName);
+        }
+        catch (ex) {
+            this.$logger.trace("Error in trying to track proxy command usage:");
+            this.$logger.trace(ex);
+        }
     }
 }
 exports.ProxyCommandBase = ProxyCommandBase;

package/lib/common/commands/proxy/proxy-clear.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.ProxyClearCommand = void 0;
 const proxy_base_1 = require("./proxy-base");
@@ -20,12 +11,10 @@ class ProxyClearCommand extends proxy_base_1.ProxyCommandBase {
         this.$logger = $logger;
         this.$proxyService = $proxyService;
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.$proxyService.clearCache();
-            this.$logger.info("Successfully cleared proxy.");
-            yield this.tryTrackUsage();
-        });
+    async execute(args) {
+        await this.$proxyService.clearCache();
+        this.$logger.info("Successfully cleared proxy.");
+        await this.tryTrackUsage();
     }
 }
 exports.ProxyClearCommand = ProxyClearCommand;