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

package/lib/package-installation-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.PackageInstallationManager = void 0;
 const path = require("path");
@@ -24,141 +15,119 @@ class PackageInstallationManager {
         this.$staticConfig = $staticConfig;
         this.$projectDataService = $projectDataService;
     }
-    getLatestVersion(packageName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.getVersion(packageName, constants.PackageVersion.LATEST);
-        });
-    }
-    getNextVersion(packageName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.getVersion(packageName, constants.PackageVersion.NEXT);
-        });
-    }
-    getLatestCompatibleVersion(packageName, referenceVersion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            referenceVersion = referenceVersion || this.$staticConfig.version;
-            const isPreReleaseVersion = semver.prerelease(referenceVersion) !== null;
-            // if the user has some v.v.v-prerelease-xx.xx pre-release version, include pre-release versions in the search query.
-            const compatibleVersionRange = isPreReleaseVersion
-                ? `~${referenceVersion}`
-                : `~${semver.major(referenceVersion)}.${semver.minor(referenceVersion)}.0`;
-            const latestVersion = yield this.getLatestVersion(packageName);
-            if (semver.satisfies(latestVersion, compatibleVersionRange)) {
-                return latestVersion;
-            }
-            return ((yield this.getMaxSatisfyingVersion(packageName, compatibleVersionRange)) || latestVersion);
-        });
+    async getLatestVersion(packageName) {
+        return await this.getVersion(packageName, constants.PackageVersion.LATEST);
+    }
+    async getNextVersion(packageName) {
+        return await this.getVersion(packageName, constants.PackageVersion.NEXT);
+    }
+    async getLatestCompatibleVersion(packageName, referenceVersion) {
+        referenceVersion = referenceVersion || this.$staticConfig.version;
+        const isPreReleaseVersion = semver.prerelease(referenceVersion) !== null;
+        const compatibleVersionRange = isPreReleaseVersion
+            ? `~${referenceVersion}`
+            : `~${semver.major(referenceVersion)}.${semver.minor(referenceVersion)}.0`;
+        const latestVersion = await this.getLatestVersion(packageName);
+        if (semver.satisfies(latestVersion, compatibleVersionRange)) {
+            return latestVersion;
+        }
+        return ((await this.getMaxSatisfyingVersion(packageName, compatibleVersionRange)) || latestVersion);
     }
-    getMaxSatisfyingVersion(packageName, versionRange) {
+    async getMaxSatisfyingVersion(packageName, versionRange) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this.$packageManager.view(packageName, {
-                versions: true,
-            });
-            let versions;
-            if (typeof data === "string") {
-                versions = [data];
-            }
-            else if (data === null || data === void 0 ? void 0 : data.versions) {
-                versions = data.versions;
-            }
-            else {
-                versions = data;
-            }
-            if (!versions || !Array.isArray(versions)) {
-                return null;
-            }
-            return (_a = semver.maxSatisfying(versions, versionRange)) === null || _a === void 0 ? void 0 : _a.toString();
-        });
-    }
-    getMaxSatisfyingVersionSafe(packageName, versionIdentifier) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let maxDependencyVersion;
-            if (semver.valid(versionIdentifier)) {
-                maxDependencyVersion = versionIdentifier;
-            }
-            else if (semver.validRange(versionIdentifier)) {
-                maxDependencyVersion = yield this.getMaxSatisfyingVersion(packageName, versionIdentifier);
-            }
-            else {
-                maxDependencyVersion = yield this.$packageManager.getTagVersion(packageName, versionIdentifier);
-            }
-            return maxDependencyVersion;
-        });
-    }
-    getInstalledDependencyVersion(packageName, projectDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const projectData = this.$projectDataService.getProjectData(projectDir);
-            const devDependencies = projectData.devDependencies || {};
-            const dependencies = projectData.dependencies || {};
-            const referencedVersion = dependencies[packageName] || devDependencies[packageName];
-            const installedVersion = yield this.getMaxSatisfyingVersionSafe(packageName, referencedVersion);
-            return installedVersion;
+        const data = await this.$packageManager.view(packageName, {
+            versions: true,
         });
+        let versions;
+        if (typeof data === "string") {
+            versions = [data];
+        }
+        else if (data === null || data === void 0 ? void 0 : data.versions) {
+            versions = data.versions;
+        }
+        else {
+            versions = data;
+        }
+        if (!versions || !Array.isArray(versions)) {
+            return null;
+        }
+        return (_a = semver.maxSatisfying(versions, versionRange)) === null || _a === void 0 ? void 0 : _a.toString();
     }
-    getLatestCompatibleVersionSafe(packageName, referenceVersion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let version = "";
-            const canGetVersionFromNpm = yield this.$packageManager.isRegistered(packageName);
-            if (canGetVersionFromNpm) {
-                version = yield this.getLatestCompatibleVersion(packageName, referenceVersion);
-            }
-            return version;
-        });
+    async getMaxSatisfyingVersionSafe(packageName, versionIdentifier) {
+        let maxDependencyVersion;
+        if (semver.valid(versionIdentifier)) {
+            maxDependencyVersion = versionIdentifier;
+        }
+        else if (semver.validRange(versionIdentifier)) {
+            maxDependencyVersion = await this.getMaxSatisfyingVersion(packageName, versionIdentifier);
+        }
+        else {
+            maxDependencyVersion = await this.$packageManager.getTagVersion(packageName, versionIdentifier);
+        }
+        return maxDependencyVersion;
+    }
+    async getInstalledDependencyVersion(packageName, projectDir) {
+        const projectData = this.$projectDataService.getProjectData(projectDir);
+        const devDependencies = projectData.devDependencies || {};
+        const dependencies = projectData.dependencies || {};
+        const referencedVersion = dependencies[packageName] || devDependencies[packageName];
+        const installedVersion = await this.getMaxSatisfyingVersionSafe(packageName, referencedVersion);
+        return installedVersion;
+    }
+    async getLatestCompatibleVersionSafe(packageName, referenceVersion) {
+        let version = "";
+        const canGetVersionFromNpm = await this.$packageManager.isRegistered(packageName);
+        if (canGetVersionFromNpm) {
+            version = await this.getLatestCompatibleVersion(packageName, referenceVersion);
+        }
+        return version;
+    }
+    async install(packageToInstall, projectDir, opts) {
+        try {
+            const pathToSave = projectDir;
+            const version = (opts && opts.version) || null;
+            const dependencyType = (opts && opts.dependencyType) || null;
+            return await this.installCore(packageToInstall, pathToSave, version, dependencyType);
+        }
+        catch (error) {
+            this.$logger.trace(error);
+            throw error;
+        }
     }
-    install(packageToInstall, projectDir, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const pathToSave = projectDir;
-                const version = (opts && opts.version) || null;
-                const dependencyType = (opts && opts.dependencyType) || null;
-                return yield this.installCore(packageToInstall, pathToSave, version, dependencyType);
-            }
-            catch (error) {
-                this.$logger.trace(error);
-                throw error;
-            }
-        });
+    async uninstall(packageToUninstall, projectDir, opts) {
+        try {
+            return await this.$packageManager.uninstall(packageToUninstall, opts, projectDir);
+        }
+        catch (error) {
+            this.$logger.trace(error);
+            throw error;
+        }
     }
-    uninstall(packageToUninstall, projectDir, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async getInspectorFromCache(inspectorNpmPackageName, projectDir) {
+        const inspectorPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
+        if (this.inspectorAlreadyInstalled(inspectorPath)) {
+            return inspectorPath;
+        }
+        const cachePath = this.getInspectorCachePath();
+        this.prepareCacheDir(cachePath);
+        const pathToPackageInCache = path.join(cachePath, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
+        const iOSFrameworkNSValue = this.$projectDataService.getRuntimePackage(projectDir, "ios");
+        const version = await this.getLatestCompatibleVersion(inspectorNpmPackageName, iOSFrameworkNSValue.version);
+        let shouldInstall = !this.$fs.exists(pathToPackageInCache);
+        if (!shouldInstall) {
             try {
-                return yield this.$packageManager.uninstall(packageToUninstall, opts, projectDir);
+                const installedVersion = this.$fs.readJson(path.join(pathToPackageInCache, constants.PACKAGE_JSON_FILE_NAME)).version;
+                shouldInstall = version !== installedVersion;
             }
-            catch (error) {
-                this.$logger.trace(error);
-                throw error;
-            }
-        });
-    }
-    getInspectorFromCache(inspectorNpmPackageName, projectDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const inspectorPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
-            // local installation takes precedence over cache
-            if (this.inspectorAlreadyInstalled(inspectorPath)) {
-                return inspectorPath;
+            catch (err) {
+                shouldInstall = true;
             }
-            const cachePath = this.getInspectorCachePath();
-            this.prepareCacheDir(cachePath);
-            const pathToPackageInCache = path.join(cachePath, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
-            const iOSFrameworkNSValue = this.$projectDataService.getRuntimePackage(projectDir, "ios" /* constants.PlatformTypes.ios */);
-            const version = yield this.getLatestCompatibleVersion(inspectorNpmPackageName, iOSFrameworkNSValue.version);
-            let shouldInstall = !this.$fs.exists(pathToPackageInCache);
-            if (!shouldInstall) {
-                try {
-                    const installedVersion = this.$fs.readJson(path.join(pathToPackageInCache, constants.PACKAGE_JSON_FILE_NAME)).version;
-                    shouldInstall = version !== installedVersion;
-                }
-                catch (err) {
-                    shouldInstall = true;
-                }
-            }
-            if (shouldInstall) {
-                yield this.$childProcess.exec(`npm install ${inspectorNpmPackageName}@${version} --prefix ${cachePath}`, { maxBuffer: 250 * 1024 });
-            }
-            this.$logger.info("Using inspector from cache.");
-            return pathToPackageInCache;
-        });
+        }
+        if (shouldInstall) {
+            await this.$childProcess.exec(`npm install ${inspectorNpmPackageName}@${version} --prefix ${cachePath}`, { maxBuffer: 250 * 1024 });
+        }
+        this.$logger.info("Using inspector from cache.");
+        return pathToPackageInCache;
     }
     clearInspectorCache() {
         this.$fs.deleteDirectorySafe(this.getInspectorCachePath());
@@ -182,47 +151,36 @@ class PackageInstallationManager {
         }
         return false;
     }
-    installCore(packageName, pathToSave, version, dependencyType) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const possiblePackageName = path.resolve(packageName);
-            if (this.$fs.exists(possiblePackageName)) {
-                packageName = possiblePackageName;
-            }
-            version =
-                version || (yield this.getLatestCompatibleVersionSafe(packageName));
-            const installResultInfo = yield this.npmInstall(packageName, pathToSave, version, dependencyType);
-            const installedPackageName = installResultInfo.name;
-            const pathToInstalledPackage = path.join(pathToSave, "node_modules", installedPackageName);
-            return pathToInstalledPackage;
-        });
-    }
-    npmInstall(packageName, pathToSave, version, dependencyType) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$logger.info(`Installing ${packageName}`);
-            packageName = packageName + (version ? `@${version}` : "");
-            const npmOptions = { silent: true, "save-exact": true };
-            if (dependencyType) {
-                npmOptions[dependencyType] = true;
-            }
-            return yield this.$packageManager.install(packageName, pathToSave, npmOptions);
-        });
+    async installCore(packageName, pathToSave, version, dependencyType) {
+        const possiblePackageName = path.resolve(packageName);
+        if (this.$fs.exists(possiblePackageName)) {
+            packageName = possiblePackageName;
+        }
+        version =
+            version || (await this.getLatestCompatibleVersionSafe(packageName));
+        const installResultInfo = await this.npmInstall(packageName, pathToSave, version, dependencyType);
+        const installedPackageName = installResultInfo.name;
+        const pathToInstalledPackage = path.join(pathToSave, "node_modules", installedPackageName);
+        return pathToInstalledPackage;
+    }
+    async npmInstall(packageName, pathToSave, version, dependencyType) {
+        this.$logger.info(`Installing ${packageName}`);
+        packageName = packageName + (version ? `@${version}` : "");
+        const npmOptions = { silent: true, "save-exact": true };
+        if (dependencyType) {
+            npmOptions[dependencyType] = true;
+        }
+        return await this.$packageManager.install(packageName, pathToSave, npmOptions);
     }
-    /**
-     * This function must not be used with packageName being a URL or local file,
-     * because npm view doens't work with those
-     */
-    getVersion(packageName, version) {
+    async getVersion(packageName, version) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let data = yield this.$packageManager.view(packageName, {
-                "dist-tags": true,
-            });
-            data = (_a = data === null || data === void 0 ? void 0 : data["dist-tags"]) !== null && _a !== void 0 ? _a : data;
-            this.$logger.trace("Using version %s. ", data[version]);
-            return data[version];
+        let data = await this.$packageManager.view(packageName, {
+            "dist-tags": true,
         });
+        data = (_a = data === null || data === void 0 ? void 0 : data["dist-tags"]) !== null && _a !== void 0 ? _a : data;
+        this.$logger.trace("Using version %s. ", data[version]);
+        return data[version];
     }
 }
 exports.PackageInstallationManager = PackageInstallationManager;
 yok_1.injector.register("packageInstallationManager", PackageInstallationManager);
-//# sourceMappingURL=package-installation-manager.js.map

package/lib/package-manager.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.PackageManager = void 0;
 const decorators_1 = require("./common/decorators");
@@ -33,15 +24,11 @@ class PackageManager {
         this.$userSettingsService = $userSettingsService;
         this.$projectConfigService = $projectConfigService;
     }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.packageManager = yield this._determinePackageManager();
-        });
+    async init() {
+        this.packageManager = await this._determinePackageManager();
     }
-    getPackageManagerName() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._packageManagerName;
-        });
+    async getPackageManagerName() {
+        return this._packageManagerName;
     }
     install(packageName, pathToSave, config) {
         return this.packageManager.install(packageName, pathToSave, config);
@@ -58,20 +45,14 @@ class PackageManager {
     searchNpms(keyword) {
         return this.packageManager.searchNpms(keyword);
     }
-    isRegistered(packageName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.packageManager.isRegistered(packageName);
-        });
+    async isRegistered(packageName) {
+        return this.packageManager.isRegistered(packageName);
     }
-    getPackageFullName(packageNameParts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.packageManager.getPackageFullName(packageNameParts);
-        });
+    async getPackageFullName(packageNameParts) {
+        return this.packageManager.getPackageFullName(packageNameParts);
     }
-    getPackageNameParts(fullPackageName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.packageManager.getPackageNameParts(fullPackageName);
-        });
+    async getPackageNameParts(fullPackageName) {
+        return this.packageManager.getPackageNameParts(fullPackageName);
     }
     getRegistryPackageData(packageName) {
         return this.packageManager.getRegistryPackageData(packageName);
@@ -79,67 +60,63 @@ class PackageManager {
     getCachePath() {
         return this.packageManager.getCachePath();
     }
-    getTagVersion(packageName, tag) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let version = null;
-            if (!tag) {
-                return null;
-            }
-            try {
-                const result = yield this.view(packageName, { "dist-tags": true });
-                version = result[tag];
-            }
-            catch (err) {
-                this.$logger.trace(`Error while getting tag version from view command: ${err}`);
-                const registryData = yield this.getRegistryPackageData(packageName);
-                version = registryData["dist-tags"][tag];
-            }
-            return version;
-        });
+    async getTagVersion(packageName, tag) {
+        let version = null;
+        if (!tag) {
+            return null;
+        }
+        try {
+            const result = await this.view(packageName, { "dist-tags": true });
+            version = result[tag];
+        }
+        catch (err) {
+            this.$logger.trace(`Error while getting tag version from view command: ${err}`);
+            const registryData = await this.getRegistryPackageData(packageName);
+            version = registryData["dist-tags"][tag];
+        }
+        return version;
     }
-    _determinePackageManager() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let pm = null;
-            try {
-                pm = yield this.$userSettingsService.getSettingValue("packageManager");
-            }
-            catch (err) {
-                this.$errors.fail(`Unable to read package manager config from user settings ${err}`);
-            }
-            try {
-                const configPm = this.$projectConfigService.getValue("cli.packageManager");
-                if (configPm) {
-                    this.$logger.trace(`Determined packageManager to use from user config is: ${configPm}`);
-                    pm = configPm;
-                }
-            }
-            catch (err) {
-                // ignore error, but log info
-                this.$logger.trace("Tried to read cli.packageManager from project config and failed. Error is: ", err);
+    async _determinePackageManager() {
+        let pm = null;
+        try {
+            pm = await this.$userSettingsService.getSettingValue("packageManager");
+        }
+        catch (err) {
+            this.$errors.fail(`Unable to read package manager config from user settings ${err}`);
+        }
+        try {
+            const configPm = this.$projectConfigService.getValue("cli.packageManager");
+            if (configPm) {
+                this.$logger.trace(`Determined packageManager to use from user config is: ${configPm}`);
+                pm = configPm;
             }
-            if (pm === constants_1.PackageManagers.yarn || this.$options.yarn) {
-                this._packageManagerName = constants_1.PackageManagers.yarn;
-                return this.$yarn;
-            }
-            if (pm === constants_1.PackageManagers.yarn2 || this.$options.yarn2) {
-                this._packageManagerName = constants_1.PackageManagers.yarn2;
-                return this.$yarn2;
-            }
-            else if (pm === constants_1.PackageManagers.pnpm || this.$options.pnpm) {
-                this._packageManagerName = constants_1.PackageManagers.pnpm;
-                return this.$pnpm;
-            }
-            else if (pm === constants_1.PackageManagers.bun) {
-                this._packageManagerName = constants_1.PackageManagers.bun;
-                return this.$bun;
-            }
-            else {
-                this._packageManagerName = constants_1.PackageManagers.npm;
-                return this.$npm;
-            }
-        });
+        }
+        catch (err) {
+            this.$logger.trace("Tried to read cli.packageManager from project config and failed. Error is: ", err);
+        }
+        if (pm === constants_1.PackageManagers.yarn || this.$options.yarn) {
+            this._packageManagerName = constants_1.PackageManagers.yarn;
+            return this.$yarn;
+        }
+        if (pm === constants_1.PackageManagers.yarn2 || this.$options.yarn2) {
+            this._packageManagerName = constants_1.PackageManagers.yarn2;
+            return this.$yarn2;
+        }
+        else if (pm === constants_1.PackageManagers.pnpm || this.$options.pnpm) {
+            this._packageManagerName = constants_1.PackageManagers.pnpm;
+            return this.$pnpm;
+        }
+        else if (pm === constants_1.PackageManagers.bun) {
+            this._packageManagerName = constants_1.PackageManagers.bun;
+            return this.$bun;
+        }
+        else {
+            this._packageManagerName = constants_1.PackageManagers.npm;
+            return this.$npm;
+        }
     }
 }
+exports.PackageManager = PackageManager;
 __decorate([
     (0, decorators_1.cache)()
 ], PackageManager.prototype, "init", null);
@@ -181,6 +158,4 @@ __decorate([
 __decorate([
     (0, decorators_1.invokeInit)()
 ], PackageManager.prototype, "getCachePath", null);
-exports.PackageManager = PackageManager;
 yok_1.injector.register("packageManager", PackageManager);
-//# sourceMappingURL=package-manager.js.map

package/lib/platform-command-param.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.PlatformCommandParameter = void 0;
 const yok_1 = require("./common/yok");
@@ -17,14 +8,11 @@ class PlatformCommandParameter {
         this.$projectData = $projectData;
         this.mandatory = true;
     }
-    validate(value) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$projectData.initializeProjectData();
-            this.$platformValidationService.validatePlatform(value, this.$projectData);
-            return true;
-        });
+    async validate(value) {
+        this.$projectData.initializeProjectData();
+        this.$platformValidationService.validatePlatform(value, this.$projectData);
+        return true;
     }
 }
 exports.PlatformCommandParameter = PlatformCommandParameter;
 yok_1.injector.register("platformCommandParameter", PlatformCommandParameter);
-//# sourceMappingURL=platform-command-param.js.map