@akylas/nativescript-cli 8.7.2 → 8.8.3

package/lib/services/plugins-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.PluginsService = void 0;
 const path = require("path");
@@ -51,50 +42,46 @@ class PluginsService {
             return key;
         });
     }
-    add(plugin, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.ensure(projectData);
-            const possiblePackageName = path.resolve(plugin);
-            if (possiblePackageName.indexOf(".tgz") !== -1 &&
-                this.$fs.exists(possiblePackageName)) {
-                plugin = possiblePackageName;
-            }
-            const name = (yield this.$packageManager.install(plugin, projectData.projectDir, this.npmInstallOptions)).name;
-            const pathToRealNpmPackageJson = this.getPackageJsonFilePathForModule(name, projectData.projectDir);
-            const realNpmPackageJson = this.$fs.readJson(pathToRealNpmPackageJson);
-            if (realNpmPackageJson.nativescript) {
-                const pluginData = this.convertToPluginData(realNpmPackageJson, projectData.projectDir);
-                const action = (pluginDestinationPath, platform, platformData) => __awaiter(this, void 0, void 0, function* () {
-                    this.isPluginDataValidForPlatform(pluginData, platform, projectData);
-                });
-                yield this.executeForAllInstalledPlatforms(action, projectData);
-                this.$logger.info(`Successfully installed plugin ${realNpmPackageJson.name}.`);
-            }
-            else {
-                yield this.$packageManager.uninstall(realNpmPackageJson.name, { save: true }, projectData.projectDir);
-                this.$errors.fail(`${plugin} is not a valid NativeScript plugin. Verify that the plugin package.json file contains a nativescript key and try again.`);
-            }
-        });
+    async add(plugin, projectData) {
+        await this.ensure(projectData);
+        const possiblePackageName = path.resolve(plugin);
+        if (possiblePackageName.indexOf(".tgz") !== -1 &&
+            this.$fs.exists(possiblePackageName)) {
+            plugin = possiblePackageName;
+        }
+        const name = (await this.$packageManager.install(plugin, projectData.projectDir, this.npmInstallOptions)).name;
+        const pathToRealNpmPackageJson = this.getPackageJsonFilePathForModule(name, projectData.projectDir);
+        const realNpmPackageJson = this.$fs.readJson(pathToRealNpmPackageJson);
+        if (realNpmPackageJson.nativescript) {
+            const pluginData = this.convertToPluginData(realNpmPackageJson, projectData.projectDir);
+            const action = async (pluginDestinationPath, platform, platformData) => {
+                this.isPluginDataValidForPlatform(pluginData, platform, projectData);
+            };
+            await this.executeForAllInstalledPlatforms(action, projectData);
+            this.$logger.info(`Successfully installed plugin ${realNpmPackageJson.name}.`);
+        }
+        else {
+            await this.$packageManager.uninstall(realNpmPackageJson.name, { save: true }, projectData.projectDir);
+            this.$errors.fail(`${plugin} is not a valid NativeScript plugin. Verify that the plugin package.json file contains a nativescript key and try again.`);
+        }
     }
-    remove(pluginName, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const removePluginNativeCodeAction = (modulesDestinationPath, platform, platformData) => __awaiter(this, void 0, void 0, function* () {
-                const pluginData = this.convertToPluginData(this.getNodeModuleData(pluginName, projectData.projectDir), projectData.projectDir);
-                yield platformData.platformProjectService.removePluginNativeCode(pluginData, projectData);
-            });
-            yield this.executeForAllInstalledPlatforms(removePluginNativeCodeAction, projectData);
-            yield this.executeNpmCommand(PluginsService.UNINSTALL_COMMAND_NAME, pluginName, projectData);
-            let showMessage = true;
-            const action = (modulesDestinationPath, platform, platformData) => __awaiter(this, void 0, void 0, function* () {
-                shelljs.rm("-rf", path.join(modulesDestinationPath, pluginName));
-                this.$logger.info(`Successfully removed plugin ${pluginName} for ${platform}.`);
-                showMessage = false;
-            });
-            yield this.executeForAllInstalledPlatforms(action, projectData);
-            if (showMessage) {
-                this.$logger.info(`Successfully removed plugin ${pluginName}`);
-            }
-        });
+    async remove(pluginName, projectData) {
+        const removePluginNativeCodeAction = async (modulesDestinationPath, platform, platformData) => {
+            const pluginData = this.convertToPluginData(this.getNodeModuleData(pluginName, projectData.projectDir), projectData.projectDir);
+            await platformData.platformProjectService.removePluginNativeCode(pluginData, projectData);
+        };
+        await this.executeForAllInstalledPlatforms(removePluginNativeCodeAction, projectData);
+        await this.executeNpmCommand(PluginsService.UNINSTALL_COMMAND_NAME, pluginName, projectData);
+        let showMessage = true;
+        const action = async (modulesDestinationPath, platform, platformData) => {
+            shelljs.rm("-rf", path.join(modulesDestinationPath, pluginName));
+            this.$logger.info(`Successfully removed plugin ${pluginName} for ${platform}.`);
+            showMessage = false;
+        };
+        await this.executeForAllInstalledPlatforms(action, projectData);
+        if (showMessage) {
+            this.$logger.info(`Successfully removed plugin ${pluginName}`);
+        }
     }
     addToPackageJson(plugin, version, isDev, projectDir) {
         const packageJsonPath = this.getPackageJsonFilePath(projectDir);
@@ -118,62 +105,56 @@ class PluginsService {
             this.$fs.writeJson(packageJsonPath, result.packageJsonContent);
         }
     }
-    preparePluginNativeCode({ pluginData, platform, projectData, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
-            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(platform);
-            if (this.$fs.exists(pluginPlatformsFolderPath)) {
-                const pathToPluginsBuildFile = path.join(platformData.projectRoot, constants.PLUGINS_BUILD_DATA_FILENAME);
-                const allPluginsNativeHashes = this.getAllPluginsNativeHashes(pathToPluginsBuildFile);
-                const oldPluginNativeHashes = allPluginsNativeHashes[pluginData.name];
-                const currentPluginNativeHashes = yield this.getPluginNativeHashes(pluginPlatformsFolderPath);
-                if (!oldPluginNativeHashes ||
-                    this.$filesHashService.hasChangesInShasums(oldPluginNativeHashes, currentPluginNativeHashes)) {
-                    yield platformData.platformProjectService.preparePluginNativeCode(pluginData, projectData);
-                    const updatedPluginNativeHashes = yield this.getPluginNativeHashes(pluginPlatformsFolderPath);
-                    this.setPluginNativeHashes({
-                        pathToPluginsBuildFile,
-                        pluginData,
-                        currentPluginNativeHashes: updatedPluginNativeHashes,
-                        allPluginsNativeHashes,
-                    });
-                }
+    async preparePluginNativeCode({ pluginData, platform, projectData, }) {
+        const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(platform);
+        if (this.$fs.exists(pluginPlatformsFolderPath)) {
+            const pathToPluginsBuildFile = path.join(platformData.projectRoot, constants.PLUGINS_BUILD_DATA_FILENAME);
+            const allPluginsNativeHashes = this.getAllPluginsNativeHashes(pathToPluginsBuildFile);
+            const oldPluginNativeHashes = allPluginsNativeHashes[pluginData.name];
+            const currentPluginNativeHashes = await this.getPluginNativeHashes(pluginPlatformsFolderPath);
+            if (!oldPluginNativeHashes ||
+                this.$filesHashService.hasChangesInShasums(oldPluginNativeHashes, currentPluginNativeHashes)) {
+                await platformData.platformProjectService.preparePluginNativeCode(pluginData, projectData);
+                const updatedPluginNativeHashes = await this.getPluginNativeHashes(pluginPlatformsFolderPath);
+                this.setPluginNativeHashes({
+                    pathToPluginsBuildFile,
+                    pluginData,
+                    currentPluginNativeHashes: updatedPluginNativeHashes,
+                    allPluginsNativeHashes,
+                });
             }
-        });
+        }
     }
-    ensureAllDependenciesAreInstalled(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const packageJsonContent = this.$fs.readJson(this.getPackageJsonFilePath(projectData.projectDir));
-            const allDependencies = _.keys(packageJsonContent.dependencies).concat(_.keys(packageJsonContent.devDependencies));
-            const notInstalledDependencies = allDependencies
-                .map((dep) => {
-                this.$logger.trace(`Checking if ${dep} is installed...`);
-                const pathToPackage = (0, package_path_helper_1.resolvePackagePath)(dep, {
-                    paths: [projectData.projectDir],
-                });
-                if (pathToPackage) {
-                    return false;
-                }
-                this.$logger.trace(`${dep} is not installed, or couldn't be found`);
-                return dep;
-            })
-                .filter(Boolean);
-            if (this.$options.force || notInstalledDependencies.length) {
-                this.$logger.trace("Npm install will be called from CLI. Force option is: ", this.$options.force, " Not installed dependencies are: ", notInstalledDependencies);
-                yield this.$packageManager.install(projectData.projectDir, projectData.projectDir, {
-                    disableNpmInstall: this.$options.disableNpmInstall,
-                    frameworkPath: this.$options.frameworkPath,
-                    ignoreScripts: this.$options.ignoreScripts,
-                    path: this.$options.path,
-                });
+    async ensureAllDependenciesAreInstalled(projectData) {
+        const packageJsonContent = this.$fs.readJson(this.getPackageJsonFilePath(projectData.projectDir));
+        const allDependencies = _.keys(packageJsonContent.dependencies).concat(_.keys(packageJsonContent.devDependencies));
+        const notInstalledDependencies = allDependencies
+            .map((dep) => {
+            this.$logger.trace(`Checking if ${dep} is installed...`);
+            const pathToPackage = (0, package_path_helper_1.resolvePackagePath)(dep, {
+                paths: [projectData.projectDir],
+            });
+            if (pathToPackage) {
+                return false;
             }
-        });
+            this.$logger.trace(`${dep} is not installed, or couldn't be found`);
+            return dep;
+        })
+            .filter(Boolean);
+        if (this.$options.force || notInstalledDependencies.length) {
+            this.$logger.trace("Npm install will be called from CLI. Force option is: ", this.$options.force, " Not installed dependencies are: ", notInstalledDependencies);
+            await this.$packageManager.install(projectData.projectDir, projectData.projectDir, {
+                disableNpmInstall: this.$options.disableNpmInstall,
+                frameworkPath: this.$options.frameworkPath,
+                ignoreScripts: this.$options.ignoreScripts,
+                path: this.$options.path,
+            });
+        }
     }
-    getAllInstalledPlugins(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const nodeModules = (yield this.getAllInstalledModules(projectData)).map((nodeModuleData) => this.convertToPluginData(nodeModuleData, projectData.projectDir));
-            return _.filter(nodeModules, (nodeModuleData) => nodeModuleData && nodeModuleData.isPlugin);
-        });
+    async getAllInstalledPlugins(projectData) {
+        const nodeModules = (await this.getAllInstalledModules(projectData)).map((nodeModuleData) => this.convertToPluginData(nodeModuleData, projectData.projectDir));
+        return _.filter(nodeModules, (nodeModuleData) => nodeModuleData && nodeModuleData.isPlugin);
     }
     getAllProductionPlugins(projectData, platform, dependencies) {
         dependencies =
@@ -237,7 +218,11 @@ class PluginsService {
                 const contents = this.$fs.readDirectory(pathToPlatforms);
                 _.each(contents, (file) => {
                     if (path.extname(file) === ".framework") {
-                        dependenciesWithFrameworks.push(Object.assign(Object.assign({}, d), { frameworkName: path.basename(file), frameworkLocation: path.join(pathToPlatforms, file) }));
+                        dependenciesWithFrameworks.push({
+                            ...d,
+                            frameworkName: path.basename(file),
+                            frameworkLocation: path.join(pathToPlatforms, file),
+                        });
                     }
                 });
             }
@@ -378,45 +363,37 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
             nativescript: data.nativescript,
         };
     }
-    ensure(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.ensureAllDependenciesAreInstalled(projectData);
-            this.$fs.ensureDirectoryExists(this.getNodeModulesPath(projectData.projectDir));
-        });
+    async ensure(projectData) {
+        await this.ensureAllDependenciesAreInstalled(projectData);
+        this.$fs.ensureDirectoryExists(this.getNodeModulesPath(projectData.projectDir));
     }
-    getAllInstalledModules(projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.ensure(projectData);
-            const nodeModules = this.getDependencies(projectData.projectDir);
-            return _.map(nodeModules, (nodeModuleName) => this.getNodeModuleData(nodeModuleName, projectData.projectDir));
-        });
+    async getAllInstalledModules(projectData) {
+        await this.ensure(projectData);
+        const nodeModules = this.getDependencies(projectData.projectDir);
+        return _.map(nodeModules, (nodeModuleName) => this.getNodeModuleData(nodeModuleName, projectData.projectDir));
     }
-    executeNpmCommand(npmCommandName, npmCommandArguments, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (npmCommandName === PluginsService.INSTALL_COMMAND_NAME) {
-                yield this.$packageManager.install(npmCommandArguments, projectData.projectDir, this.npmInstallOptions);
-            }
-            else if (npmCommandName === PluginsService.UNINSTALL_COMMAND_NAME) {
-                yield this.$packageManager.uninstall(npmCommandArguments, PluginsService.NPM_CONFIG, projectData.projectDir);
-            }
-            return this.parseNpmCommandResult(npmCommandArguments);
-        });
+    async executeNpmCommand(npmCommandName, npmCommandArguments, projectData) {
+        if (npmCommandName === PluginsService.INSTALL_COMMAND_NAME) {
+            await this.$packageManager.install(npmCommandArguments, projectData.projectDir, this.npmInstallOptions);
+        }
+        else if (npmCommandName === PluginsService.UNINSTALL_COMMAND_NAME) {
+            await this.$packageManager.uninstall(npmCommandArguments, PluginsService.NPM_CONFIG, projectData.projectDir);
+        }
+        return this.parseNpmCommandResult(npmCommandArguments);
     }
     parseNpmCommandResult(npmCommandResult) {
         return npmCommandResult.split("@")[0];
     }
-    executeForAllInstalledPlatforms(action, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const availablePlatforms = this.$mobileHelper.platformNames.map((p) => p.toLowerCase());
-            for (const platform of availablePlatforms) {
-                const isPlatformInstalled = this.$fs.exists(path.join(projectData.platformsDir, platform.toLowerCase()));
-                if (isPlatformInstalled) {
-                    const platformData = this.$platformsDataService.getPlatformData(platform.toLowerCase(), projectData);
-                    const pluginDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, "tns_modules");
-                    yield action(pluginDestinationPath, platform.toLowerCase(), platformData);
-                }
+    async executeForAllInstalledPlatforms(action, projectData) {
+        const availablePlatforms = this.$mobileHelper.platformNames.map((p) => p.toLowerCase());
+        for (const platform of availablePlatforms) {
+            const isPlatformInstalled = this.$fs.exists(path.join(projectData.platformsDir, platform.toLowerCase()));
+            if (isPlatformInstalled) {
+                const platformData = this.$platformsDataService.getPlatformData(platform.toLowerCase(), projectData);
+                const pluginDestinationPath = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, "tns_modules");
+                await action(pluginDestinationPath, platform.toLowerCase(), platformData);
             }
-        });
+        }
     }
     getInstalledFrameworkVersion(platform, projectData) {
         const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, platform);
@@ -439,17 +416,18 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
         }
         return isValid;
     }
-    getPluginNativeHashes(pluginPlatformsDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let data = {};
-            if (this.$fs.exists(pluginPlatformsDir)) {
-                const pluginNativeDataFiles = this.$fs.enumerateFilesInDirectorySync(pluginPlatformsDir);
-                data = yield this.$filesHashService.generateHashes(pluginNativeDataFiles);
-            }
-            return data;
-        });
+    async getPluginNativeHashes(pluginPlatformsDir) {
+        let data = {};
+        if (this.$fs.exists(pluginPlatformsDir)) {
+            const pluginNativeDataFiles = this.$fs.enumerateFilesInDirectorySync(pluginPlatformsDir);
+            data = await this.$filesHashService.generateHashes(pluginNativeDataFiles);
+        }
+        return data;
     }
     getAllPluginsNativeHashes(pathToPluginsBuildFile) {
+        if (this.$options.hostProjectPath) {
+            return {};
+        }
         let data = {};
         if (this.$fs.exists(pathToPluginsBuildFile)) {
             data = this.$fs.readJson(pathToPluginsBuildFile);
@@ -457,11 +435,15 @@ This framework comes from ${dependencyName} plugin, which is installed multiple
         return data;
     }
     setPluginNativeHashes(opts) {
+        if (this.$options.hostProjectPath) {
+            return;
+        }
         opts.allPluginsNativeHashes[opts.pluginData.name] =
             opts.currentPluginNativeHashes;
         this.$fs.writeJson(opts.pathToPluginsBuildFile, opts.allPluginsNativeHashes);
     }
 }
+exports.PluginsService = PluginsService;
 PluginsService.INSTALL_COMMAND_NAME = "install";
 PluginsService.UNINSTALL_COMMAND_NAME = "uninstall";
 PluginsService.NPM_CONFIG = {
@@ -473,5 +455,4 @@ PluginsService.LOCK_FILES = [
     "yarn.lock",
     "pnpm-lock.yaml",
 ];
-exports.PluginsService = PluginsService;
 yok_1.injector.register("pluginsService", PluginsService);

package/lib/services/project-backup-service.js

@@ -22,6 +22,7 @@ class ProjectBackupService {
         return backup.restore();
     }
 }
+exports.ProjectBackupService = ProjectBackupService;
 ProjectBackupService.Backup = class Backup {
     constructor($super, name, pathsToBackup = [], basePath = $super.$projectHelper.projectDir) {
         this.$super = $super;
@@ -110,5 +111,4 @@ ProjectBackupService.Backup = class Backup {
         return this.$super.$fs.readJson(backupJSONPath);
     }
 };
-exports.ProjectBackupService = ProjectBackupService;
 yok_1.injector.register("projectBackupService", ProjectBackupService);