nativescript 8.9.0-dev.2 → 8.9.0-dev.3

package/lib/common/prompter.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.Prompter = void 0;
 const prompt = require("prompts");
@@ -25,122 +16,113 @@ class Prompter {
             this.ctrlcReader.close();
         }
     }
-    get(questions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.muteStdout();
-                if (!helpers.isInteractive()) {
-                    if (_.some(questions, (s) => !s.default)) {
-                        throw new Error("Console is not interactive and no default action specified.");
-                    }
-                    else {
-                        const result = {};
-                        _.each(questions, (s) => {
-                            // Curly brackets needed because s.default() may return false and break the loop
-                            result[s.name] = s.default();
-                        });
-                        return result;
-                    }
+    async get(questions) {
+        try {
+            this.muteStdout();
+            if (!helpers.isInteractive()) {
+                if (_.some(questions, (s) => !s.default)) {
+                    throw new Error("Console is not interactive and no default action specified.");
                 }
                 else {
-                    const result = yield prompt.prompt(questions);
+                    const result = {};
+                    _.each(questions, (s) => {
+                        result[s.name] = s.default();
+                    });
                     return result;
                 }
             }
-            finally {
-                this.unmuteStdout();
+            else {
+                const result = await prompt.prompt(questions);
+                return result;
             }
-        });
+        }
+        finally {
+            this.unmuteStdout();
+        }
     }
-    getPassword(message, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const schema = {
-                message,
-                type: "password",
-                name: "password",
-                validate: (value) => {
-                    const allowEmpty = options && options.allowEmpty;
-                    return !allowEmpty && !value ? "Password must be non-empty" : true;
-                },
-            };
-            const result = yield this.get([schema]);
-            return result.password;
-        });
+    async getPassword(message, options) {
+        const schema = {
+            message,
+            type: "password",
+            name: "password",
+            validate: (value) => {
+                const allowEmpty = options && options.allowEmpty;
+                return !allowEmpty && !value ? "Password must be non-empty" : true;
+            },
+        };
+        const result = await this.get([schema]);
+        return result.password;
     }
-    getString(message, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const schema = {
-                message,
-                type: "text",
-                name: "inputString",
-                validate: (value) => {
-                    const doesNotAllowEmpty = options && _.has(options, "allowEmpty") && !options.allowEmpty;
-                    return doesNotAllowEmpty && !value
-                        ? `${message} must be non-empty`
-                        : true;
-                },
-                default: options && options.defaultAction,
-            };
-            const result = yield this.get([schema]);
-            return result.inputString;
-        });
+    async getString(message, options) {
+        const schema = {
+            message,
+            type: "text",
+            name: "inputString",
+            validate: (value) => {
+                const doesNotAllowEmpty = options && _.has(options, "allowEmpty") && !options.allowEmpty;
+                return doesNotAllowEmpty && !value
+                    ? `${message} must be non-empty`
+                    : true;
+            },
+            default: options && options.defaultAction,
+        };
+        const result = await this.get([schema]);
+        return result.inputString;
     }
-    promptForChoice(promptMessage, choices, multiple = false, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const schema = Object.assign({ message: promptMessage, type: multiple ? "multiselect" : "select", name: "userAnswer", choices }, options);
-            const result = yield this.get([schema]);
-            const extractValue = (choice) => {
-                if (typeof choice === "object") {
-                    return choice.value || choice;
-                }
-                if (typeof choice === "string") {
-                    return choice;
-                }
-                if (typeof choice === "number") {
-                    return choices[choice];
-                }
-            };
-            return multiple
-                ? result.userAnswer.map(extractValue)
-                : extractValue(result.userAnswer);
-        });
+    async promptForChoice(promptMessage, choices, multiple = false, options = {}) {
+        const schema = {
+            message: promptMessage,
+            type: multiple ? "multiselect" : "select",
+            name: "userAnswer",
+            choices,
+            ...options,
+        };
+        const result = await this.get([schema]);
+        const extractValue = (choice) => {
+            if (typeof choice === "object") {
+                return choice.value || choice;
+            }
+            if (typeof choice === "string") {
+                return choice;
+            }
+            if (typeof choice === "number") {
+                return choices[choice];
+            }
+        };
+        return multiple
+            ? result.userAnswer.map(extractValue)
+            : extractValue(result.userAnswer);
     }
-    promptForDetailedChoice(promptMessage, choices) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const inquirerChoices = choices.map((choice) => {
-                return {
-                    title: choice.key,
-                    value: choice.key,
-                    description: choice.description,
-                };
-            });
-            const schema = {
-                message: promptMessage,
-                type: "select",
-                name: "userAnswer",
-                choices: inquirerChoices,
+    async promptForDetailedChoice(promptMessage, choices) {
+        const inquirerChoices = choices.map((choice) => {
+            return {
+                title: choice.key,
+                value: choice.key,
+                description: choice.description,
             };
-            const result = yield this.get([schema]);
-            return result.userAnswer;
         });
+        const schema = {
+            message: promptMessage,
+            type: "select",
+            name: "userAnswer",
+            choices: inquirerChoices,
+        };
+        const result = await this.get([schema]);
+        return result.userAnswer;
     }
-    confirm(message, defaultAction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const schema = {
-                type: "confirm",
-                name: "prompt",
-                default: defaultAction,
-                message,
-            };
-            const result = yield this.get([schema]);
-            return result.prompt;
-        });
+    async confirm(message, defaultAction) {
+        const schema = {
+            type: "confirm",
+            name: "prompt",
+            default: defaultAction,
+            message,
+        };
+        const result = await this.get([schema]);
+        return result.prompt;
     }
     muteStdout() {
         if (helpers.isInteractive()) {
-            process.stdin.setRawMode(true); // After setting rawMode to true, Ctrl+C doesn't work for non node.js events loop i.e device log command
-            // We need to create mute-stream and to pass it as output to ctrlcReader
-            // This will prevent the prompter to show the user's text twice on the console
+            process.stdin.setRawMode(true);
             this.muteStreamInstance = new MuteStream();
             this.muteStreamInstance.pipe(process.stdout);
             this.muteStreamInstance.mute();
@@ -149,7 +131,6 @@ class Prompter {
                 output: this.muteStreamInstance,
             });
             this.ctrlcReader.on("SIGINT", () => {
-                // enable terminal cursor
                 process.stdout.write("\x1B[?25h");
                 process.exit();
             });
@@ -159,7 +140,6 @@ class Prompter {
         if (helpers.isInteractive()) {
             process.stdin.setRawMode(false);
             if (this.muteStreamInstance) {
-                // We need to clean the event listeners from the process.stdout because the MuteStream.pipe function calls the pipe function of the Node js Stream which adds event listeners and this can cause memory leak if we display more than ~10 prompts.
                 this.cleanEventListeners(process.stdout);
                 this.muteStreamInstance.unmute();
                 this.muteStreamInstance = null;
@@ -168,8 +148,6 @@ class Prompter {
         }
     }
     cleanEventListeners(stream) {
-        // The events names and listeners names can be found here https://github.com/nodejs/node/blob/master/lib/stream.js
-        // Which event cause memory leak can be tested with stream.listeners("event-name") and if the listeners count keeps increasing with each prompt we need to remove the listener.
         const memoryLeakEvents = [
             {
                 eventName: "close",
@@ -196,4 +174,3 @@ class Prompter {
 }
 exports.Prompter = Prompter;
 yok_1.injector.register("prompter", Prompter);
-//# sourceMappingURL=prompter.js.map

package/lib/common/queue.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.Queue = void 0;
 class Queue {
@@ -21,18 +12,15 @@ class Queue {
             this.promiseResolve();
         }
     }
-    dequeue() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.items.length) {
-                const promise = new Promise((resolve, reject) => {
-                    this.promiseResolve = resolve;
-                });
-                yield promise;
-                this.promiseResolve = null;
-            }
-            return this.items.pop();
-        });
+    async dequeue() {
+        if (!this.items.length) {
+            const promise = new Promise((resolve, reject) => {
+                this.promiseResolve = resolve;
+            });
+            await promise;
+            this.promiseResolve = null;
+        }
+        return this.items.pop();
     }
 }
 exports.Queue = Queue;
-//# sourceMappingURL=queue.js.map

package/lib/common/resource-loader.js

@@ -23,4 +23,3 @@ class ResourceLoader {
 }
 exports.ResourceLoader = ResourceLoader;
 yok_1.injector.register("resources", ResourceLoader);
-//# sourceMappingURL=resource-loader.js.map

package/lib/common/services/auto-completion-service.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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.AutoCompletionService = void 0;
 const os_1 = require("os");
@@ -36,15 +27,12 @@ class AutoCompletionService {
     get shellProfiles() {
         return [
             this.getHomePath(".bashrc"),
-            this.getHomePath(".zshrc"), // zsh - http://www.acm.uiuc.edu/workshops/zsh/startup_files.html
+            this.getHomePath(".zshrc"),
         ];
     }
     get cliRunCommandsFile() {
         let cliRunCommandsFile = this.getHomePath(util.format(".%src", this.$staticConfig.CLIENT_NAME.toLowerCase()));
         if (this.$hostInfo.isWindows) {
-            // on Windows bash, file is incorrectly written as C:\Users\<username>, which leads to errors when trying to execute the script:
-            // $ source ~/.bashrc
-            // sh.exe": C:Usersusername.appbuilderrc: No such file or directory
             cliRunCommandsFile = cliRunCommandsFile.replace(/\\/g, "/");
         }
         return cliRunCommandsFile;
@@ -59,9 +47,7 @@ class AutoCompletionService {
         return new RegExp(util.format("%s[\\s\\S]*%s", AutoCompletionService.GENERATED_TABTAB_COMPLETION_START, AutoCompletionService.GENERATED_TABTAB_COMPLETION_END));
     }
     removeObsoleteAutoCompletion() {
-        // In previous releases we were writing directly in .bash_profile, .bashrc, .zshrc and .profile - remove this old code
         const shellProfilesToBeCleared = this.shellProfiles;
-        // Add .profile only here as we do not want new autocompletion in this file, but we have to remove our old code from it.
         shellProfilesToBeCleared.push(this.getHomePath(".profile"));
         shellProfilesToBeCleared.forEach((file) => {
             try {
@@ -114,7 +100,6 @@ class AutoCompletionService {
                 this.isNewAutoCompletionEnabledInFile(filePath) ||
                     this.isObsoleteAutoCompletionEnabledInFile(filePath);
             if (!result) {
-                // break each
                 return false;
             }
         });
@@ -127,22 +112,19 @@ class AutoCompletionService {
             this.$logger.info("Restart your shell to disable command auto-completion.");
         }
     }
-    enableAutoCompletion() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.updateCLIShellScript();
-            _.each(this.shellProfiles, (shellFile) => this.addAutoCompletionToShellScript(shellFile));
-            this.removeObsoleteAutoCompletion();
-            if (this.scriptsOk && this.scriptsUpdated) {
-                this.$logger.info("Restart your shell to enable command auto-completion.");
-            }
-        });
+    async enableAutoCompletion() {
+        await this.updateCLIShellScript();
+        _.each(this.shellProfiles, (shellFile) => this.addAutoCompletionToShellScript(shellFile));
+        this.removeObsoleteAutoCompletion();
+        if (this.scriptsOk && this.scriptsUpdated) {
+            this.$logger.info("Restart your shell to enable command auto-completion.");
+        }
     }
     isObsoleteAutoCompletionEnabled() {
         let result = true;
         _.each(this.shellProfiles, (shellProfile) => {
             result = this.isObsoleteAutoCompletionEnabledInFile(shellProfile);
             if (!result) {
-                // break each
                 return false;
             }
         });
@@ -181,8 +163,6 @@ class AutoCompletionService {
         }
         catch (err) {
             this.$logger.info("Unable to update %s. Command-line completion might not work.", fileName);
-            // When npm is installed with sudo, in some cases the installation cannot write to shell profiles
-            // Advise the user how to enable autocompletion after the installation is completed.
             if ((err.code === "EPERM" || err.code === "EACCES") &&
                 !this.$hostInfo.isWindows &&
                 process.env.SUDO_USER) {
@@ -203,7 +183,6 @@ class AutoCompletionService {
             }
         }
         catch (err) {
-            // If file does not exist, autocompletion was not working for it, so ignore this error.
             if (err.code !== "ENOENT") {
                 this.$logger.info("Failed to update %s. Auto-completion may still work or work incorrectly. ", fileName);
                 this.$logger.info(err);
@@ -211,49 +190,47 @@ class AutoCompletionService {
             }
         }
     }
-    updateCLIShellScript() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const filePath = this.cliRunCommandsFile;
-            try {
-                let doUpdate = true;
-                if (this.$fs.exists(filePath)) {
-                    const contents = this.$fs.readText(filePath);
-                    const regExp = new RegExp(AutoCompletionService.GENERATED_TABTAB_COMPLETION_START);
-                    let matchCondition = contents.match(regExp);
-                    if (matchCondition) {
-                        doUpdate = false;
-                    }
+    async updateCLIShellScript() {
+        const filePath = this.cliRunCommandsFile;
+        try {
+            let doUpdate = true;
+            if (this.$fs.exists(filePath)) {
+                const contents = this.$fs.readText(filePath);
+                const regExp = new RegExp(AutoCompletionService.GENERATED_TABTAB_COMPLETION_START);
+                let matchCondition = contents.match(regExp);
+                if (matchCondition) {
+                    doUpdate = false;
                 }
-                if (doUpdate) {
-                    const clientExecutableFileName = (this.$staticConfig.CLIENT_NAME_ALIAS || this.$staticConfig.CLIENT_NAME).toLowerCase();
-                    const pathToExecutableFile = path.join(__dirname, `../../../bin/${clientExecutableFileName}.js`);
-                    if (this.$fs.exists(filePath)) {
-                        const existingText = this.$fs.readText(filePath);
-                        let newText = existingText.replace(this.getTabTabCompletionsRegex(), "");
-                        newText = this.removeOboleteTabTabCompletion(newText);
-                        if (newText !== existingText) {
-                            this.$logger.trace("Remove existing AutoCompletion from file %s.", filePath);
-                            this.$fs.writeFile(filePath, newText);
-                        }
+            }
+            if (doUpdate) {
+                const clientExecutableFileName = (this.$staticConfig.CLIENT_NAME_ALIAS || this.$staticConfig.CLIENT_NAME).toLowerCase();
+                const pathToExecutableFile = path.join(__dirname, `../../../bin/${clientExecutableFileName}.js`);
+                if (this.$fs.exists(filePath)) {
+                    const existingText = this.$fs.readText(filePath);
+                    let newText = existingText.replace(this.getTabTabCompletionsRegex(), "");
+                    newText = this.removeOboleteTabTabCompletion(newText);
+                    if (newText !== existingText) {
+                        this.$logger.trace("Remove existing AutoCompletion from file %s.", filePath);
+                        this.$fs.writeFile(filePath, newText);
                     }
-                    // The generated seems to be inconsistent in it's start/end markers so adding our own.
-                    this.$fs.appendFile(filePath, `\n${AutoCompletionService.GENERATED_TABTAB_COMPLETION_START}\n`);
-                    yield this.$childProcess.exec(`"${process.argv[0]}" "${pathToExecutableFile}" completion_generate_script >> "${filePath}"`);
-                    this.$fs.appendFile(filePath, this.completionAliasDefinition);
-                    this.$fs.chmod(filePath, "0644");
                 }
+                this.$fs.appendFile(filePath, `\n${AutoCompletionService.GENERATED_TABTAB_COMPLETION_START}\n`);
+                await this.$childProcess.exec(`"${process.argv[0]}" "${pathToExecutableFile}" completion_generate_script >> "${filePath}"`);
+                this.$fs.appendFile(filePath, this.completionAliasDefinition);
+                this.$fs.chmod(filePath, "0644");
             }
-            catch (err) {
-                this.$logger.info("Failed to update %s. Auto-completion may not work. ", filePath);
-                this.$logger.trace(err);
-                this.scriptsOk = false;
-            }
-        });
+        }
+        catch (err) {
+            this.$logger.info("Failed to update %s. Auto-completion may not work. ", filePath);
+            this.$logger.trace(err);
+            this.scriptsOk = false;
+        }
     }
     getHomePath(fileName) {
         return path.join((0, os_1.homedir)(), fileName);
     }
 }
+exports.AutoCompletionService = AutoCompletionService;
 AutoCompletionService.COMPLETION_START_COMMENT_PATTERN = "###-%s-completion-start-###";
 AutoCompletionService.COMPLETION_END_COMMENT_PATTERN = "###-%s-completion-end-###";
 AutoCompletionService.TABTAB_COMPLETION_START_REGEX_PATTERN = "###-begin-%s-completion-###";
@@ -272,6 +249,4 @@ __decorate([
 __decorate([
     (0, decorators_1.cache)()
 ], AutoCompletionService.prototype, "completionShellScriptContent", null);
-exports.AutoCompletionService = AutoCompletionService;
 yok_1.injector.register("autoCompletionService", AutoCompletionService);
-//# sourceMappingURL=auto-completion-service.js.map

package/lib/common/services/cancellation.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 });
 const choki = require("chokidar");
 const path = require("path");
@@ -24,26 +15,24 @@ class CancellationService {
             this.$fs.createDirectory(CancellationService.killSwitchDir);
         }
     }
-    begin(name) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.$hostInfo.isWindows) {
-                return;
-            }
-            const triggerFile = CancellationService.makeKillSwitchFileName(name);
-            if (!this.$fs.exists(triggerFile)) {
-                this.$fs.writeFile(triggerFile, "");
-            }
-            this.$logger.trace("Starting watch on killswitch %s", triggerFile);
-            const watcher = choki
-                .watch(triggerFile, { ignoreInitial: true })
-                .on("unlink", (filePath) => {
-                this.$logger.info(`Exiting process as the file ${filePath} has been deleted. Probably reinstalling CLI while there's a working instance.`);
-                process.exit(132 /* ErrorCodes.DELETED_KILL_FILE */);
-            });
-            if (watcher) {
-                this.watches[name] = watcher;
-            }
+    async begin(name) {
+        if (!this.$hostInfo.isWindows) {
+            return;
+        }
+        const triggerFile = CancellationService.makeKillSwitchFileName(name);
+        if (!this.$fs.exists(triggerFile)) {
+            this.$fs.writeFile(triggerFile, "");
+        }
+        this.$logger.trace("Starting watch on killswitch %s", triggerFile);
+        const watcher = choki
+            .watch(triggerFile, { ignoreInitial: true })
+            .on("unlink", (filePath) => {
+            this.$logger.info(`Exiting process as the file ${filePath} has been deleted. Probably reinstalling CLI while there's a working instance.`);
+            process.exit(132);
         });
+        if (watcher) {
+            this.watches[name] = watcher;
+        }
     }
     end(name) {
         const watcher = this.watches[name];
@@ -65,4 +54,3 @@ class CancellationService {
     }
 }
 yok_1.injector.register("cancellation", CancellationService);
-//# sourceMappingURL=cancellation.js.map