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

package/lib/commands/clean.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.CleanCommand = void 0;
 const color_1 = require("../color");
@@ -75,197 +66,191 @@ class CleanCommand {
         this.$staticConfig = $staticConfig;
         this.allowedParameters = [];
     }
-    execute(args) {
+    async execute(args) {
         var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const isDryRun = (_a = this.$options.dryRun) !== null && _a !== void 0 ? _a : false;
-            const isJSON = (_b = this.$options.json) !== null && _b !== void 0 ? _b : false;
-            const spinner = this.$terminalSpinnerService.createSpinner({
-                isSilent: isJSON,
-            });
-            if (!this.$projectService.isValidNativeScriptProject()) {
-                return this.cleanMultipleProjects(spinner);
-            }
-            spinner.start("Cleaning project...\n");
-            let pathsToClean = [
-                constants.HOOKS_DIR_NAME,
-                constants.PLATFORMS_DIR_NAME,
-                constants.NODE_MODULES_FOLDER_NAME,
-                constants.PACKAGE_LOCK_JSON_FILE_NAME,
-            ];
-            try {
-                const overridePathsToClean = this.$projectConfigService.getValue("cli.pathsToClean");
-                const additionalPaths = this.$projectConfigService.getValue("cli.additionalPathsToClean");
-                // allow overriding default paths to clean
-                if (Array.isArray(overridePathsToClean)) {
-                    pathsToClean = overridePathsToClean;
-                }
-                if (Array.isArray(additionalPaths)) {
-                    pathsToClean.push(...additionalPaths);
-                }
+        const isDryRun = (_a = this.$options.dryRun) !== null && _a !== void 0 ? _a : false;
+        const isJSON = (_b = this.$options.json) !== null && _b !== void 0 ? _b : false;
+        const spinner = this.$terminalSpinnerService.createSpinner({
+            isSilent: isJSON,
+        });
+        if (!this.$projectService.isValidNativeScriptProject()) {
+            return this.cleanMultipleProjects(spinner);
+        }
+        spinner.start("Cleaning project...\n");
+        let pathsToClean = [
+            constants.HOOKS_DIR_NAME,
+            constants.PLATFORMS_DIR_NAME,
+            constants.NODE_MODULES_FOLDER_NAME,
+            constants.PACKAGE_LOCK_JSON_FILE_NAME,
+        ];
+        try {
+            const overridePathsToClean = this.$projectConfigService.getValue("cli.pathsToClean");
+            const additionalPaths = this.$projectConfigService.getValue("cli.additionalPathsToClean");
+            // allow overriding default paths to clean
+            if (Array.isArray(overridePathsToClean)) {
+                pathsToClean = overridePathsToClean;
             }
-            catch (err) {
-                // ignore
+            if (Array.isArray(additionalPaths)) {
+                pathsToClean.push(...additionalPaths);
             }
-            const res = yield this.$projectCleanupService.clean(pathsToClean, {
+        }
+        catch (err) {
+            // ignore
+        }
+        const res = await this.$projectCleanupService.clean(pathsToClean, {
+            dryRun: isDryRun,
+            silent: isJSON,
+            stats: isJSON,
+        });
+        if (res.stats && isJSON) {
+            console.log(JSON.stringify({
+                ok: res.ok,
                 dryRun: isDryRun,
-                silent: isJSON,
-                stats: isJSON,
+                stats: Object.fromEntries(res.stats.entries()),
+            }, null, 2));
+            return;
+        }
+        if (res.ok) {
+            spinner.succeed("Project successfully cleaned.");
+        }
+        else {
+            spinner.fail(color_1.color.red("Project unsuccessfully cleaned."));
+        }
+    }
+    async cleanMultipleProjects(spinner) {
+        if (!(0, helpers_1.isInteractive)() || this.$options.json) {
+            // interactive terminal is required, and we can't output json in an interactive command.
+            this.$logger.warn("No project found in the current directory.");
+            return;
+        }
+        const shouldScan = await this.$prompter.confirm("No project found in the current directory. Would you like to scan for all projects in sub-directories instead?");
+        if (!shouldScan) {
+            return;
+        }
+        spinner.start("Scanning for projects... Please wait.");
+        const paths = await this.getNSProjectPathsInDirectory();
+        spinner.succeed(`Found ${paths.length} projects.`);
+        let computed = 0;
+        const updateProgress = () => {
+            const current = color_1.color.grey(`${computed}/${paths.length}`);
+            spinner.start(`Gathering cleanable sizes. This may take a while... ${current}`);
+        };
+        // update the progress initially
+        updateProgress();
+        const projects = new Map();
+        await promiseMap(paths, (p) => {
+            return this.$childProcess
+                .exec(`node ${this.$staticConfig.cliBinPath} clean --dry-run --json --disable-analytics`, {
+                cwd: p,
+            })
+                .then((res) => {
+                const paths = JSON.parse(res).stats;
+                return Object.values(paths).reduce((a, b) => a + b, 0);
+            })
+                .catch((err) => {
+                this.$logger.trace("Failed to get project size for %s, Error is:", p, err);
+                return -1;
+            })
+                .then((size) => {
+                if (size > 0 || size === -1) {
+                    // only store size if it's larger than 0 or -1 (error while getting size)
+                    projects.set(p, size);
+                }
+                // update the progress after each processed project
+                computed++;
+                updateProgress();
             });
-            if (res.stats && isJSON) {
-                console.log(JSON.stringify({
-                    ok: res.ok,
-                    dryRun: isDryRun,
-                    stats: Object.fromEntries(res.stats.entries()),
-                }, null, 2));
-                return;
-            }
-            if (res.ok) {
-                spinner.succeed("Project successfully cleaned.");
+        }, os.cpus().length);
+        spinner.clear();
+        spinner.stop();
+        this.$logger.clearScreen();
+        const totalSize = Array.from(projects.values())
+            .filter((s) => s > 0)
+            .reduce((a, b) => a + b, 0);
+        const pathsToClean = await this.$prompter.promptForChoice(`Found ${projects.size} cleanable project(s) with a total size of: ${color_1.color.green(bytesToHumanReadable(totalSize))}. Select projects to clean`, Array.from(projects.keys()).map((p) => {
+            const size = projects.get(p);
+            let description;
+            if (size === -1) {
+                description = " - could not get size";
             }
             else {
-                spinner.fail(color_1.color.red("Project unsuccessfully cleaned."));
+                description = ` - ${bytesToHumanReadable(size)}`;
             }
+            return {
+                title: `${p}${color_1.color.grey(description)}`,
+                value: p,
+            };
+        }), true, {
+            optionsPerPage: process.stdout.rows - 6, // 6 lines are taken up by the instructions
         });
-    }
-    cleanMultipleProjects(spinner) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(0, helpers_1.isInteractive)() || this.$options.json) {
-                // interactive terminal is required, and we can't output json in an interactive command.
-                this.$logger.warn("No project found in the current directory.");
-                return;
+        this.$logger.clearScreen();
+        spinner.warn(`This will run "${color_1.color.yellow(`ns clean`)}" in all the selected projects and ${color_1.color.red.bold("delete files from your system")}!`);
+        spinner.warn(`This action cannot be undone!`);
+        let confirmed = await this.$prompter.confirm("Are you sure you want to clean the selected projects?");
+        if (!confirmed) {
+            return;
+        }
+        spinner.info("Cleaning... This might take a while...");
+        let totalSizeCleaned = 0;
+        for (let i = 0; i < pathsToClean.length; i++) {
+            const currentPath = pathsToClean[i];
+            spinner.start(`Cleaning ${color_1.color.cyan(currentPath)}... ${i + 1}/${pathsToClean.length}`);
+            const ok = await this.$childProcess
+                .exec(`node ${this.$staticConfig.cliBinPath} clean ${this.$options.dryRun ? "--dry-run" : ""} --json --disable-analytics`, {
+                cwd: currentPath,
+            })
+                .then((res) => {
+                const cleanupRes = JSON.parse(res);
+                return cleanupRes.ok;
+            })
+                .catch((err) => {
+                this.$logger.trace('Failed to clean project "%s"', currentPath, err);
+                return false;
+            });
+            if (ok) {
+                const cleanedSize = projects.get(currentPath);
+                const cleanedSizeStr = color_1.color.grey(`- ${bytesToHumanReadable(cleanedSize)}`);
+                spinner.succeed(`Cleaned ${color_1.color.cyan(currentPath)} ${cleanedSizeStr}`);
+                totalSizeCleaned += cleanedSize;
+            }
+            else {
+                spinner.fail(`Failed to clean ${color_1.color.cyan(currentPath)} - skipped`);
             }
-            const shouldScan = yield this.$prompter.confirm("No project found in the current directory. Would you like to scan for all projects in sub-directories instead?");
-            if (!shouldScan) {
+        }
+        spinner.clear();
+        spinner.stop();
+        spinner.succeed(`Done! We've just freed up ${color_1.color.green(bytesToHumanReadable(totalSizeCleaned))}! Woohoo! 🎉`);
+        if (this.$options.dryRun) {
+            spinner.info('Note: the "--dry-run" flag was used, so no files were actually deleted.');
+        }
+    }
+    async getNSProjectPathsInDirectory(dir = process.cwd()) {
+        let nsDirs = [];
+        const getFiles = async (dir) => {
+            if (dir.includes("node_modules")) {
+                // skip traversing node_modules
                 return;
             }
-            spinner.start("Scanning for projects... Please wait.");
-            const paths = yield this.getNSProjectPathsInDirectory();
-            spinner.succeed(`Found ${paths.length} projects.`);
-            let computed = 0;
-            const updateProgress = () => {
-                const current = color_1.color.grey(`${computed}/${paths.length}`);
-                spinner.start(`Gathering cleanable sizes. This may take a while... ${current}`);
-            };
-            // update the progress initially
-            updateProgress();
-            const projects = new Map();
-            yield promiseMap(paths, (p) => {
-                return this.$childProcess
-                    .exec(`node ${this.$staticConfig.cliBinPath} clean --dry-run --json --disable-analytics`, {
-                    cwd: p,
-                })
-                    .then((res) => {
-                    const paths = JSON.parse(res).stats;
-                    return Object.values(paths).reduce((a, b) => a + b, 0);
-                })
-                    .catch((err) => {
-                    this.$logger.trace("Failed to get project size for %s, Error is:", p, err);
-                    return -1;
-                })
-                    .then((size) => {
-                    if (size > 0 || size === -1) {
-                        // only store size if it's larger than 0 or -1 (error while getting size)
-                        projects.set(p, size);
-                    }
-                    // update the progress after each processed project
-                    computed++;
-                    updateProgress();
-                });
-            }, os.cpus().length);
-            spinner.clear();
-            spinner.stop();
-            this.$logger.clearScreen();
-            const totalSize = Array.from(projects.values())
-                .filter((s) => s > 0)
-                .reduce((a, b) => a + b, 0);
-            const pathsToClean = yield this.$prompter.promptForChoice(`Found ${projects.size} cleanable project(s) with a total size of: ${color_1.color.green(bytesToHumanReadable(totalSize))}. Select projects to clean`, Array.from(projects.keys()).map((p) => {
-                const size = projects.get(p);
-                let description;
-                if (size === -1) {
-                    description = " - could not get size";
-                }
-                else {
-                    description = ` - ${bytesToHumanReadable(size)}`;
-                }
-                return {
-                    title: `${p}${color_1.color.grey(description)}`,
-                    value: p,
-                };
-            }), true, {
-                optionsPerPage: process.stdout.rows - 6, // 6 lines are taken up by the instructions
+            const dirents = await (0, promises_1.readdir)(dir, { withFileTypes: true }).catch((err) => {
+                this.$logger.trace('Failed to read directory "%s". Error is:', dir, err);
+                return [];
             });
-            this.$logger.clearScreen();
-            spinner.warn(`This will run "${color_1.color.yellow(`ns clean`)}" in all the selected projects and ${color_1.color.red.bold("delete files from your system")}!`);
-            spinner.warn(`This action cannot be undone!`);
-            let confirmed = yield this.$prompter.confirm("Are you sure you want to clean the selected projects?");
-            if (!confirmed) {
+            const hasNSConfig = dirents.some((ent) => ent.name.includes("nativescript.config.ts") ||
+                ent.name.includes("nativescript.config.js"));
+            if (hasNSConfig) {
+                nsDirs.push(dir);
+                // found a NativeScript project, stop traversing
                 return;
             }
-            spinner.info("Cleaning... This might take a while...");
-            let totalSizeCleaned = 0;
-            for (let i = 0; i < pathsToClean.length; i++) {
-                const currentPath = pathsToClean[i];
-                spinner.start(`Cleaning ${color_1.color.cyan(currentPath)}... ${i + 1}/${pathsToClean.length}`);
-                const ok = yield this.$childProcess
-                    .exec(`node ${this.$staticConfig.cliBinPath} clean ${this.$options.dryRun ? "--dry-run" : ""} --json --disable-analytics`, {
-                    cwd: currentPath,
-                })
-                    .then((res) => {
-                    const cleanupRes = JSON.parse(res);
-                    return cleanupRes.ok;
-                })
-                    .catch((err) => {
-                    this.$logger.trace('Failed to clean project "%s"', currentPath, err);
-                    return false;
-                });
-                if (ok) {
-                    const cleanedSize = projects.get(currentPath);
-                    const cleanedSizeStr = color_1.color.grey(`- ${bytesToHumanReadable(cleanedSize)}`);
-                    spinner.succeed(`Cleaned ${color_1.color.cyan(currentPath)} ${cleanedSizeStr}`);
-                    totalSizeCleaned += cleanedSize;
-                }
-                else {
-                    spinner.fail(`Failed to clean ${color_1.color.cyan(currentPath)} - skipped`);
-                }
-            }
-            spinner.clear();
-            spinner.stop();
-            spinner.succeed(`Done! We've just freed up ${color_1.color.green(bytesToHumanReadable(totalSizeCleaned))}! Woohoo! 🎉`);
-            if (this.$options.dryRun) {
-                spinner.info('Note: the "--dry-run" flag was used, so no files were actually deleted.');
-            }
-        });
-    }
-    getNSProjectPathsInDirectory(dir = process.cwd()) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let nsDirs = [];
-            const getFiles = (dir) => __awaiter(this, void 0, void 0, function* () {
-                if (dir.includes("node_modules")) {
-                    // skip traversing node_modules
-                    return;
+            await Promise.all(dirents.map((dirent) => {
+                const res = (0, path_1.resolve)(dir, dirent.name);
+                if (dirent.isDirectory()) {
+                    return getFiles(res);
                 }
-                const dirents = yield (0, promises_1.readdir)(dir, { withFileTypes: true }).catch((err) => {
-                    this.$logger.trace('Failed to read directory "%s". Error is:', dir, err);
-                    return [];
-                });
-                const hasNSConfig = dirents.some((ent) => ent.name.includes("nativescript.config.ts") ||
-                    ent.name.includes("nativescript.config.js"));
-                if (hasNSConfig) {
-                    nsDirs.push(dir);
-                    // found a NativeScript project, stop traversing
-                    return;
-                }
-                yield Promise.all(dirents.map((dirent) => {
-                    const res = (0, path_1.resolve)(dir, dirent.name);
-                    if (dirent.isDirectory()) {
-                        return getFiles(res);
-                    }
-                }));
-            });
-            yield getFiles(dir);
-            return nsDirs;
-        });
+            }));
+        };
+        await getFiles(dir);
+        return nsDirs;
     }
 }
 exports.CleanCommand = CleanCommand;

package/lib/commands/command-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.ValidatePlatformCommandBase = void 0;
 class ValidatePlatformCommandBase {
@@ -17,25 +8,21 @@ class ValidatePlatformCommandBase {
         this.$platformValidationService = $platformValidationService;
         this.$projectData = $projectData;
     }
-    canExecuteCommandBase(platform, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            options = options || {};
-            const validatePlatformOutput = yield this.validatePlatformBase(platform, options.notConfiguredEnvOptions);
-            const canExecute = this.canExecuteCommand(validatePlatformOutput);
-            let result = canExecute;
-            if (canExecute && options.validateOptions) {
-                result = yield this.$platformValidationService.validateOptions(this.$options.provision, this.$options.teamId, this.$projectData, platform);
-            }
-            return result;
-        });
+    async canExecuteCommandBase(platform, options) {
+        options = options || {};
+        const validatePlatformOutput = await this.validatePlatformBase(platform, options.notConfiguredEnvOptions);
+        const canExecute = this.canExecuteCommand(validatePlatformOutput);
+        let result = canExecute;
+        if (canExecute && options.validateOptions) {
+            result = await this.$platformValidationService.validateOptions(this.$options.provision, this.$options.teamId, this.$projectData, platform);
+        }
+        return result;
     }
-    validatePlatformBase(platform, notConfiguredEnvOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platformData = this.$platformsDataService.getPlatformData(platform, this.$projectData);
-            const platformProjectService = platformData.platformProjectService;
-            const result = yield platformProjectService.validate(this.$projectData, this.$options, notConfiguredEnvOptions);
-            return result;
-        });
+    async validatePlatformBase(platform, notConfiguredEnvOptions) {
+        const platformData = this.$platformsDataService.getPlatformData(platform, this.$projectData);
+        const platformProjectService = platformData.platformProjectService;
+        const result = await platformProjectService.validate(this.$projectData, this.$options, notConfiguredEnvOptions);
+        return result;
     }
     canExecuteCommand(validatePlatformOutput) {
         return (validatePlatformOutput &&

package/lib/commands/config.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.ConfigSetCommand = exports.ConfigGetCommand = exports.ConfigListCommand = void 0;
 const yok_1 = require("../common/yok");
@@ -18,16 +9,14 @@ class ConfigListCommand {
         this.$logger = $logger;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const config = this.$projectConfigService.readConfig();
-                this.$logger.info(this.getValueString(config));
-            }
-            catch (error) {
-                this.$logger.info("Failed to read config. Error is: ", error);
-            }
-        });
+    async execute(args) {
+        try {
+            const config = this.$projectConfigService.readConfig();
+            this.$logger.info(this.getValueString(config));
+        }
+        catch (error) {
+            this.$logger.info("Failed to read config. Error is: ", error);
+        }
     }
     getValueString(value, depth = 0) {
         const indent = () => "  ".repeat(depth);
@@ -54,25 +43,21 @@ class ConfigGetCommand {
         this.$errors = $errors;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const [key] = args;
-                const current = this.$projectConfigService.getValue(key);
-                this.$logger.info(current);
-            }
-            catch (err) {
-                // ignore
-            }
-        });
+    async execute(args) {
+        try {
+            const [key] = args;
+            const current = this.$projectConfigService.getValue(key);
+            this.$logger.info(current);
+        }
+        catch (err) {
+            // ignore
+        }
     }
-    canExecute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args[0]) {
-                this.$errors.failWithHelp("You must specify a key. Eg: ios.id");
-            }
-            return true;
-        });
+    async canExecute(args) {
+        if (!args[0]) {
+            this.$errors.failWithHelp("You must specify a key. Eg: ios.id");
+        }
+        return true;
     }
 }
 exports.ConfigGetCommand = ConfigGetCommand;
@@ -83,38 +68,34 @@ class ConfigSetCommand {
         this.$errors = $errors;
         this.allowedParameters = [];
     }
-    execute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [key, value] = args;
-            const current = this.$projectConfigService.getValue(key);
-            if (current && typeof current === "object") {
-                this.$errors.fail(`Unable to change object values. Please update individual values instead.\nEg: ns config set android.codeCache true`);
-            }
-            const convertedValue = this.getConvertedValue(value);
-            const existingKey = current !== undefined;
-            const keyDisplay = color_1.color.green(key);
-            const currentDisplay = color_1.color.yellow(current);
-            const updatedDisplay = color_1.color.cyan(convertedValue);
-            this.$logger.info(`${existingKey ? "Updating" : "Setting"} ${keyDisplay}${existingKey ? ` from ${currentDisplay} ` : " "}to ${updatedDisplay}`);
-            try {
-                yield this.$projectConfigService.setValue(key, convertedValue);
-                this.$logger.info("Done");
-            }
-            catch (error) {
-                this.$logger.info("Could not update conifg. Error is: ", error);
-            }
-        });
+    async execute(args) {
+        const [key, value] = args;
+        const current = this.$projectConfigService.getValue(key);
+        if (current && typeof current === "object") {
+            this.$errors.fail(`Unable to change object values. Please update individual values instead.\nEg: ns config set android.codeCache true`);
+        }
+        const convertedValue = this.getConvertedValue(value);
+        const existingKey = current !== undefined;
+        const keyDisplay = color_1.color.green(key);
+        const currentDisplay = color_1.color.yellow(current);
+        const updatedDisplay = color_1.color.cyan(convertedValue);
+        this.$logger.info(`${existingKey ? "Updating" : "Setting"} ${keyDisplay}${existingKey ? ` from ${currentDisplay} ` : " "}to ${updatedDisplay}`);
+        try {
+            await this.$projectConfigService.setValue(key, convertedValue);
+            this.$logger.info("Done");
+        }
+        catch (error) {
+            this.$logger.info("Could not update conifg. Error is: ", error);
+        }
     }
-    canExecute(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args[0]) {
-                this.$errors.failWithHelp("You must specify a key. Eg: ios.id");
-            }
-            if (!args[1]) {
-                this.$errors.failWithHelp("You must specify a value.");
-            }
-            return true;
-        });
+    async canExecute(args) {
+        if (!args[0]) {
+            this.$errors.failWithHelp("You must specify a key. Eg: ios.id");
+        }
+        if (!args[1]) {
+            this.$errors.failWithHelp("You must specify a value.");
+        }
+        return true;
     }
     getConvertedValue(v) {
         try {