@akylas/nativescript-cli 8.8.2 → 8.8.3

package/lib/common/services/project-files-manager.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.ProjectFilesManager = void 0;
 const minimatch_1 = require("minimatch");
@@ -35,20 +26,16 @@ class ProjectFilesManager {
         const isInExcludedList = !!_.find(excludedProjectDirsAndFiles, (pattern) => (0, minimatch_1.minimatch)(filePath, pattern, { nocase: true }));
         return (isInExcludedList || this.$projectFilesProvider.isFileExcluded(filePath));
     }
-    createLocalToDevicePaths(deviceAppData, projectFilesPath, files, excludedProjectDirsAndFiles, projectFilesConfig) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const deviceProjectRootPath = yield deviceAppData.getDeviceProjectRootPath();
-            files =
-                files ||
-                    this.getProjectFiles(projectFilesPath, excludedProjectDirsAndFiles, null, { enumerateDirectories: true });
-            const localToDevicePaths = Promise.all(files
-                .map((projectFile) => this.$projectFilesProvider.getProjectFileInfo(projectFile, deviceAppData.platform, projectFilesConfig))
-                .filter((projectFileInfo) => projectFileInfo.shouldIncludeFile)
-                .map((projectFileInfo) => __awaiter(this, void 0, void 0, function* () {
-                return this.$localToDevicePathDataFactory.create(projectFileInfo.filePath, projectFilesPath, projectFileInfo.onDeviceFileName, deviceProjectRootPath);
-            })));
-            return localToDevicePaths;
-        });
+    async createLocalToDevicePaths(deviceAppData, projectFilesPath, files, excludedProjectDirsAndFiles, projectFilesConfig) {
+        const deviceProjectRootPath = await deviceAppData.getDeviceProjectRootPath();
+        files =
+            files ||
+                this.getProjectFiles(projectFilesPath, excludedProjectDirsAndFiles, null, { enumerateDirectories: true });
+        const localToDevicePaths = Promise.all(files
+            .map((projectFile) => this.$projectFilesProvider.getProjectFileInfo(projectFile, deviceAppData.platform, projectFilesConfig))
+            .filter((projectFileInfo) => projectFileInfo.shouldIncludeFile)
+            .map(async (projectFileInfo) => this.$localToDevicePathDataFactory.create(projectFileInfo.filePath, projectFilesPath, projectFileInfo.onDeviceFileName, deviceProjectRootPath)));
+        return localToDevicePaths;
     }
     processPlatformSpecificFiles(directoryPath, platform, projectFilesConfig, excludedDirs) {
         const contents = this.$fs.readDirectory(directoryPath);

package/lib/common/services/proxy-service.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.ProxyService = void 0;
 const path = require("path");
@@ -42,22 +33,20 @@ class ProxyService {
         };
         return proxyLib.clearProxySettings(settings);
     }
-    getInfo() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let message = "";
-            const proxyCache = yield this.getCache();
-            if (proxyCache) {
-                message = `Proxy Url: ${proxyCache.protocol}//${proxyCache.hostname}:${proxyCache.port}`;
-                if (proxyCache.username) {
-                    message += `${os_1.EOL}Username: ${proxyCache.username}`;
-                }
-                message += `${os_1.EOL}Proxy is Enabled`;
+    async getInfo() {
+        let message = "";
+        const proxyCache = await this.getCache();
+        if (proxyCache) {
+            message = `Proxy Url: ${proxyCache.protocol}//${proxyCache.hostname}:${proxyCache.port}`;
+            if (proxyCache.username) {
+                message += `${os_1.EOL}Username: ${proxyCache.username}`;
             }
-            else {
-                message = "No proxy set";
-            }
-            return message;
-        });
+            message += `${os_1.EOL}Proxy is Enabled`;
+        }
+        else {
+            message = "No proxy set";
+        }
+        return message;
     }
 }
 exports.ProxyService = ProxyService;

package/lib/common/services/qr.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.QrCodeGenerator = void 0;
 const qr_image_1 = require("qr-image");
@@ -18,21 +9,19 @@ class QrCodeGenerator {
         this.$staticConfig = $staticConfig;
         this.$logger = $logger;
     }
-    generateDataUri(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = null;
-            try {
-                const qrSvg = (0, qr_image_1.imageSync)(data, {
-                    size: this.$staticConfig.QR_SIZE,
-                    type: "svg",
-                }).toString();
-                result = `data:image/svg+xml;utf-8,${(0, querystring_1.escape)(qrSvg)}`;
-            }
-            catch (err) {
-                this.$logger.trace(`Failed to generate QR code for ${data}`, err);
-            }
-            return result;
-        });
+    async generateDataUri(data) {
+        let result = null;
+        try {
+            const qrSvg = (0, qr_image_1.imageSync)(data, {
+                size: this.$staticConfig.QR_SIZE,
+                type: "svg",
+            }).toString();
+            result = `data:image/svg+xml;utf-8,${(0, querystring_1.escape)(qrSvg)}`;
+        }
+        catch (err) {
+            this.$logger.trace(`Failed to generate QR code for ${data}`, err);
+        }
+        return result;
     }
 }
 exports.QrCodeGenerator = QrCodeGenerator;

package/lib/common/services/settings-service.js

@@ -35,8 +35,8 @@ class SettingsService {
         return path.join(defaultProfileDirLocation, this.$staticConfig.PROFILE_DIR_NAME);
     }
 }
+exports.SettingsService = SettingsService;
 __decorate([
     (0, decorators_1.exported)("settingsService")
 ], SettingsService.prototype, "setSettings", null);
-exports.SettingsService = SettingsService;
 yok_1.injector.register("settingsService", SettingsService);

package/lib/common/services/xcode-select-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.XcodeSelectService = void 0;
 const path = require("path");
@@ -26,37 +17,31 @@ class XcodeSelectService {
         this.$hostInfo = $hostInfo;
         this.$injector = $injector;
     }
-    getDeveloperDirectoryPath() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.$hostInfo.isDarwin) {
-                this.$errors.fail("xcode-select is only available on Mac OS X.");
-            }
-            const childProcess = yield this.$childProcess.spawnFromEvent("xcode-select", ["-print-path"], "close", {}, { throwError: false }), result = childProcess.stdout.trim();
-            if (!result) {
-                this.$errors.fail("Cannot find path to Xcode.app - make sure you've installed Xcode correctly.");
-            }
-            return result;
-        });
+    async getDeveloperDirectoryPath() {
+        if (!this.$hostInfo.isDarwin) {
+            this.$errors.fail("xcode-select is only available on Mac OS X.");
+        }
+        const childProcess = await this.$childProcess.spawnFromEvent("xcode-select", ["-print-path"], "close", {}, { throwError: false }), result = childProcess.stdout.trim();
+        if (!result) {
+            this.$errors.fail("Cannot find path to Xcode.app - make sure you've installed Xcode correctly.");
+        }
+        return result;
     }
-    getContentsDirectoryPath() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return path.join(yield this.getDeveloperDirectoryPath(), "..");
-        });
+    async getContentsDirectoryPath() {
+        return path.join(await this.getDeveloperDirectoryPath(), "..");
     }
-    getXcodeVersion() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sysInfo = this.$injector.resolve("sysInfo");
-            const xcodeVer = yield sysInfo.getXcodeVersion();
-            if (!xcodeVer) {
-                this.$errors.fail("xcodebuild execution failed. Make sure that you have latest Xcode and tools installed.");
-            }
-            const [major, minor, patch] = xcodeVer.split(".");
-            return { major, minor, patch };
-        });
+    async getXcodeVersion() {
+        const sysInfo = this.$injector.resolve("sysInfo");
+        const xcodeVer = await sysInfo.getXcodeVersion();
+        if (!xcodeVer) {
+            this.$errors.fail("xcodebuild execution failed. Make sure that you have latest Xcode and tools installed.");
+        }
+        const [major, minor, patch] = xcodeVer.split(".");
+        return { major, minor, patch };
     }
 }
+exports.XcodeSelectService = XcodeSelectService;
 __decorate([
     (0, decorators_1.cache)()
 ], XcodeSelectService.prototype, "getXcodeVersion", null);
-exports.XcodeSelectService = XcodeSelectService;
 yok_1.injector.register("xcodeSelectService", XcodeSelectService);

package/lib/common/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalizeFirstLetter = exports.Utils = void 0;
+exports.Utils = void 0;
+exports.capitalizeFirstLetter = capitalizeFirstLetter;
 const yok_1 = require("./yok");
 class Utils {
     constructor($options, $logger) {
@@ -34,5 +35,4 @@ function capitalizeFirstLetter(value) {
     }
     return value.charAt(0).toUpperCase() + value.slice(1);
 }
-exports.capitalizeFirstLetter = capitalizeFirstLetter;
 yok_1.injector.register("utils", Utils);

package/lib/common/validators/project-name-validator.js

@@ -49,6 +49,7 @@ class ProjectNameValidator {
         return isSuccessful;
     }
 }
+exports.ProjectNameValidator = ProjectNameValidator;
 ProjectNameValidator.MAX_FILENAME_LENGTH = 30;
 ProjectNameValidator.EMPTY_FILENAME_ERROR_MESSAGE = "Name cannot be empty.";
 ProjectNameValidator.NOT_VALID_NAME_ERROR_MESSAGE = "Name should contain only the following symbols: A-Z, a-z, 0-9, _, ., - and space";
@@ -84,5 +85,4 @@ ProjectNameValidator.INVALID_FILENAMES = [
     "LPT9",
 ];
 ProjectNameValidator.INVALID_EXTENSIONS = [];
-exports.ProjectNameValidator = ProjectNameValidator;
 yok_1.injector.register("projectNameValidator", ProjectNameValidator);

package/lib/common/validators/validation-result.js

@@ -12,5 +12,5 @@ class ValidationResult {
         return !this.errorMsg;
     }
 }
-ValidationResult.Successful = new ValidationResult(null);
 exports.ValidationResult = ValidationResult;
+ValidationResult.Successful = new ValidationResult(null);

package/lib/common/verify-node-version.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeWarning = exports.verifyNodeVersion = void 0;
+exports.verifyNodeVersion = verifyNodeVersion;
+exports.getNodeWarning = getNodeWarning;
 const color_1 = require("../color");
 var os = require("os");
 var semver = require("semver");
@@ -31,7 +32,6 @@ function verifyNodeVersion() {
         process.exit(1);
     }
 }
-exports.verifyNodeVersion = verifyNodeVersion;
 var nodeWarn = undefined;
 function getNodeWarning() {
     if (nodeWarn === undefined) {
@@ -75,4 +75,3 @@ function getNodeWarning() {
     }
     return nodeWarn;
 }
-exports.getNodeWarning = getNodeWarning;

package/lib/common/yok.js

@@ -1,15 +1,8 @@
 "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.setGlobalInjector = exports.Yok = exports.register = exports.injector = void 0;
+exports.Yok = exports.injector = void 0;
+exports.register = register;
+exports.setGlobalInjector = setGlobalInjector;
 const path = require("path");
 const _ = require("lodash");
 const helpers_1 = require("./helpers");
@@ -36,7 +29,6 @@ function register(...rest) {
         exports.injector.register(rest[0], target);
     };
 }
-exports.register = register;
 class Yok {
     constructor() {
         this.overrideAlreadyRequiredModule = false;
@@ -187,7 +179,7 @@ class Yok {
             return {
                 disableAnalytics: true,
                 isHierarchicalCommand: true,
-                execute: (args) => __awaiter(this, void 0, void 0, function* () {
+                execute: async (args) => {
                     const commandsService = exports.injector.resolve("commandsService");
                     let commandName = null;
                     const defaultCommand = this.getDefaultCommand(name, args);
@@ -220,8 +212,8 @@ class Yok {
                             options.help = true;
                         }
                     }
-                    yield commandsService.tryExecuteCommand(commandName, commandName === "help" ? [name] : commandArguments);
-                }),
+                    await commandsService.tryExecuteCommand(commandName, commandName === "help" ? [name] : commandArguments);
+                },
             };
         };
         exports.injector.registerCommand(name, factory);
@@ -229,21 +221,19 @@ class Yok {
     getHierarchicalCommandName(parentCommandName, subCommandName) {
         return [parentCommandName, subCommandName].join("|");
     }
-    isValidHierarchicalCommand(commandName, commandArguments) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (_.includes(Object.keys(this.hierarchicalCommands), commandName)) {
-                const subCommands = this.hierarchicalCommands[commandName];
-                if (subCommands) {
-                    const fullCommandName = this.buildHierarchicalCommand(commandName, commandArguments);
-                    if (!fullCommandName) {
-                        const errors = exports.injector.resolve("errors");
-                        errors.failWithHelp(constants_1.ERROR_NO_VALID_SUBCOMMAND_FORMAT, commandName);
-                    }
-                    return true;
+    async isValidHierarchicalCommand(commandName, commandArguments) {
+        if (_.includes(Object.keys(this.hierarchicalCommands), commandName)) {
+            const subCommands = this.hierarchicalCommands[commandName];
+            if (subCommands) {
+                const fullCommandName = this.buildHierarchicalCommand(commandName, commandArguments);
+                if (!fullCommandName) {
+                    const errors = exports.injector.resolve("errors");
+                    errors.failWithHelp(constants_1.ERROR_NO_VALID_SUBCOMMAND_FORMAT, commandName);
                 }
+                return true;
             }
-            return false;
-        });
+        }
+        return false;
     }
     isDefaultCommand(commandName) {
         return (commandName.indexOf("*") > 0 &&
@@ -305,14 +295,12 @@ class Yok {
         }
         return module[parsed[2]].apply(module, args);
     }
-    dynamicCall(call, args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = this.getDynamicCallData(call, args);
-            if ((0, helpers_1.isPromise)(data)) {
-                return yield data;
-            }
-            return data;
-        });
+    async dynamicCall(call, args) {
+        const data = this.getDynamicCallData(call, args);
+        if ((0, helpers_1.isPromise)(data)) {
+            return await data;
+        }
+        return data;
     }
     resolveConstructor(ctor, ctorArguments) {
         (0, helpers_1.annotate)(ctor);
@@ -423,4 +411,3 @@ function setGlobalInjector(inj) {
     global.$injector = exports.injector = inj;
     return inj;
 }
-exports.setGlobalInjector = setGlobalInjector;

package/lib/config.js

@@ -1,19 +1,8 @@
 "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.StaticConfig = exports.Configuration = void 0;
-const path = require("path");
-const shelljs = require("shelljs");
-const os = require("os");
 const _ = require("lodash");
+const path = require("path");
 const yok_1 = require("./common/yok");
 class Configuration {
     constructor($fs) {
@@ -67,16 +56,12 @@ class StaticConfig {
     get PATH_TO_BOOTSTRAP() {
         return path.join(__dirname, "bootstrap.js");
     }
-    getAdbFilePath() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._adbFilePath) {
-                const androidToolsInfo = this.$injector.resolve("androidToolsInfo");
-                this._adbFilePath =
-                    (yield androidToolsInfo.getPathToAdbFromAndroidHome()) ||
-                        (yield this.getAdbFilePathCore());
-            }
-            return this._adbFilePath;
-        });
+    async getAdbFilePath() {
+        if (!this._adbFilePath) {
+            const androidToolsInfo = this.$injector.resolve("androidToolsInfo");
+            this._adbFilePath = await androidToolsInfo.getPathToAdbFromAndroidHome();
+        }
+        return this._adbFilePath;
     }
     get USER_AGENT_NAME() {
         if (!this._userAgent) {
@@ -96,42 +81,6 @@ class StaticConfig {
     get HTML_COMMON_HELPERS_DIR() {
         return path.join(__dirname, "common", "docs", "helpers");
     }
-    getAdbFilePathCore() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const $childProcess = this.$injector.resolve("$childProcess");
-            try {
-                const proc = yield $childProcess.spawnFromEvent("adb", ["version"], "exit", undefined, { throwError: false });
-                if (proc.stderr) {
-                    return yield this.spawnPrivateAdb();
-                }
-            }
-            catch (e) {
-                if (e.code === "ENOENT") {
-                    return yield this.spawnPrivateAdb();
-                }
-            }
-            return "adb";
-        });
-    }
-    spawnPrivateAdb() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const $fs = this.$injector.resolve("$fs"), $childProcess = this.$injector.resolve("$childProcess"), $hostInfo = this.$injector.resolve("$hostInfo");
-            const defaultAdbDirPath = path.join(__dirname, "common", "resources", "platform-tools", "android", process.platform);
-            const pathToPackageJson = path.join(__dirname, "..", "package.json");
-            const nsCliVersion = require(pathToPackageJson).version;
-            const tmpDir = path.join(os.tmpdir(), `nativescript-cli-${nsCliVersion}`);
-            $fs.createDirectory(tmpDir);
-            const targetAdb = path.join(tmpDir, "adb");
-            if (!$fs.exists(tmpDir) || !$fs.readDirectory(tmpDir).length) {
-                shelljs.cp(path.join(defaultAdbDirPath, "*"), tmpDir);
-                if (!$hostInfo.isWindows) {
-                    shelljs.chmod("+x", targetAdb);
-                }
-            }
-            yield $childProcess.spawnFromEvent(targetAdb, ["start-server"], "exit");
-            return targetAdb;
-        });
-    }
 }
 exports.StaticConfig = StaticConfig;
 yok_1.injector.register("staticConfig", StaticConfig);