@akylas/nativescript-cli 8.8.2 → 8.8.3

package/lib/services/project-changes-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.ProjectChangesService = void 0;
 const path = require("path");
@@ -48,83 +39,81 @@ class ProjectChangesService {
     get currentChanges() {
         return this._changesInfo;
     }
-    checkForChanges(platformData, projectData, prepareData, filesChangedData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._changesInfo = new ProjectChangesInfo();
-            const isNewPrepareInfo = yield this.ensurePrepareInfo(platformData, projectData, prepareData);
-            if (!isNewPrepareInfo) {
-                let platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, platformData.normalizedPlatformName);
-                if (!this.$fs.exists(platformResourcesDir) &&
-                    platformData.platformNameLowerCase ===
-                        this.$devicePlatformsConstants.visionOS.toLowerCase()) {
-                    platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS);
-                }
-                this._changesInfo.appResourcesChanged = this.containsNewerFiles(platformResourcesDir, projectData);
-                this.$nodeModulesDependenciesBuilder
-                    .getProductionDependencies(projectData.projectDir, projectData.ignoredDependencies)
-                    .filter((dep) => dep.nativescript &&
-                    this.$fs.exists(path.join(dep.directory, constants_1.PLATFORMS_DIR_NAME, platformData.platformNameLowerCase)))
-                    .forEach((dep) => {
-                    this._changesInfo.nativeChanged =
-                        this._changesInfo.nativeChanged ||
-                            this.containsNewerFiles(path.join(dep.directory, constants_1.PLATFORMS_DIR_NAME, platformData.platformNameLowerCase), projectData) ||
-                            this.isFileModified(path.join(dep.directory, constants_1.PACKAGE_JSON_FILE_NAME));
-                });
-                if (!this._changesInfo.nativeChanged) {
-                    this._prepareInfo.projectFileHash = this.getProjectFileStrippedHash(projectData.projectDir, platformData);
-                    this._changesInfo.nativeChanged = this.isProjectFileChanged(projectData.projectDir, platformData);
-                }
-                this._changesInfo.nsConfigChanged = this.filesChanged([
-                    path.join(projectData.projectDir, constants_1.CONFIG_FILE_NAME_JS),
-                    path.join(projectData.projectDir, constants_1.CONFIG_FILE_NAME_TS),
-                    path.join(projectData.projectDir, constants_1.CONFIG_NS_FILE_NAME),
-                ]);
-                this._changesInfo.nativeChanged =
-                    this._changesInfo.nativeChanged || this._changesInfo.nsConfigChanged;
-                this.$logger.trace(`Set nativeChanged to ${this._changesInfo.nativeChanged}.`);
-                if (platformData.platformNameLowerCase ===
-                    this.$devicePlatformsConstants.iOS.toLowerCase()) {
-                    this._changesInfo.configChanged = this.filesChanged([
-                        path.join(platformResourcesDir, platformData.configurationFileName),
-                        path.join(platformResourcesDir, "LaunchScreen.storyboard"),
-                        path.join(platformResourcesDir, constants_1.BUILD_XCCONFIG_FILE_NAME),
-                    ]);
-                }
-                else {
-                    this._changesInfo.configChanged = this.filesChanged([
-                        path.join(platformResourcesDir, platformData.configurationFileName),
-                        path.join(platformResourcesDir, constants_1.APP_GRADLE_FILE_NAME),
-                    ]);
-                }
-                this.$logger.trace(`Set value of configChanged to ${this._changesInfo.configChanged}`);
+    async checkForChanges(platformData, projectData, prepareData, filesChangedData) {
+        this._changesInfo = new ProjectChangesInfo();
+        const isNewPrepareInfo = await this.ensurePrepareInfo(platformData, projectData, prepareData);
+        if (!isNewPrepareInfo) {
+            let platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, platformData.normalizedPlatformName);
+            if (!this.$fs.exists(platformResourcesDir) &&
+                platformData.platformNameLowerCase ===
+                    this.$devicePlatformsConstants.visionOS.toLowerCase()) {
+                platformResourcesDir = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS);
             }
-            if (!prepareData.nativePrepare ||
-                !prepareData.nativePrepare.skipNativePrepare) {
-                yield platformData.platformProjectService.checkForChanges(this._changesInfo, prepareData, projectData);
+            this._changesInfo.appResourcesChanged = this.containsNewerFiles(platformResourcesDir, projectData);
+            this.$nodeModulesDependenciesBuilder
+                .getProductionDependencies(projectData.projectDir, projectData.ignoredDependencies)
+                .filter((dep) => dep.nativescript &&
+                this.$fs.exists(path.join(dep.directory, constants_1.PLATFORMS_DIR_NAME, platformData.platformNameLowerCase)))
+                .forEach((dep) => {
+                this._changesInfo.nativeChanged =
+                    this._changesInfo.nativeChanged ||
+                        this.containsNewerFiles(path.join(dep.directory, constants_1.PLATFORMS_DIR_NAME, platformData.platformNameLowerCase), projectData) ||
+                        this.isFileModified(path.join(dep.directory, constants_1.PACKAGE_JSON_FILE_NAME));
+            });
+            if (!this._changesInfo.nativeChanged) {
+                this._prepareInfo.projectFileHash = this.getProjectFileStrippedHash(projectData.projectDir, platformData);
+                this._changesInfo.nativeChanged = this.isProjectFileChanged(projectData.projectDir, platformData);
             }
-            if (!!prepareData.release !== !!this._prepareInfo.release) {
-                this.$logger.trace(`Setting all setting to true. Current options are: `, prepareData, " old prepare info is: ", this._prepareInfo);
-                this._changesInfo.appResourcesChanged = true;
-                this._changesInfo.configChanged = true;
-                this._prepareInfo.release = prepareData.release;
+            this._changesInfo.nsConfigChanged = this.filesChanged([
+                path.join(projectData.projectDir, constants_1.CONFIG_FILE_NAME_JS),
+                path.join(projectData.projectDir, constants_1.CONFIG_FILE_NAME_TS),
+                path.join(projectData.projectDir, constants_1.CONFIG_NS_FILE_NAME),
+            ]);
+            this._changesInfo.nativeChanged =
+                this._changesInfo.nativeChanged || this._changesInfo.nsConfigChanged;
+            this.$logger.trace(`Set nativeChanged to ${this._changesInfo.nativeChanged}.`);
+            if (platformData.platformNameLowerCase ===
+                this.$devicePlatformsConstants.iOS.toLowerCase()) {
+                this._changesInfo.configChanged = this.filesChanged([
+                    path.join(platformResourcesDir, platformData.configurationFileName),
+                    path.join(platformResourcesDir, "LaunchScreen.storyboard"),
+                    path.join(platformResourcesDir, constants_1.BUILD_XCCONFIG_FILE_NAME),
+                ]);
             }
-            if (this._changesInfo.appResourcesChanged) {
-                this.$logger.trace(`Set configChanged to true, appResourcesChanged is: ${this._changesInfo.appResourcesChanged}`);
-                this._changesInfo.configChanged = true;
+            else {
+                this._changesInfo.configChanged = this.filesChanged([
+                    path.join(platformResourcesDir, platformData.configurationFileName),
+                    path.join(platformResourcesDir, constants_1.APP_GRADLE_FILE_NAME),
+                ]);
             }
-            if (this._changesInfo.hasChanges) {
-                this._prepareInfo.changesRequireBuild =
-                    this._changesInfo.changesRequireBuild;
-                this._prepareInfo.time = new Date().toString();
-                if (this._prepareInfo.changesRequireBuild) {
-                    this._prepareInfo.changesRequireBuildTime = this._prepareInfo.time;
-                }
+            this.$logger.trace(`Set value of configChanged to ${this._changesInfo.configChanged}`);
+        }
+        if (!prepareData.nativePrepare ||
+            !prepareData.nativePrepare.skipNativePrepare) {
+            await platformData.platformProjectService.checkForChanges(this._changesInfo, prepareData, projectData);
+        }
+        if (!!prepareData.release !== !!this._prepareInfo.release) {
+            this.$logger.trace(`Setting all setting to true. Current options are: `, prepareData, " old prepare info is: ", this._prepareInfo);
+            this._changesInfo.appResourcesChanged = true;
+            this._changesInfo.configChanged = true;
+            this._prepareInfo.release = prepareData.release;
+        }
+        if (this._changesInfo.appResourcesChanged) {
+            this.$logger.trace(`Set configChanged to true, appResourcesChanged is: ${this._changesInfo.appResourcesChanged}`);
+            this._changesInfo.configChanged = true;
+        }
+        if (this._changesInfo.hasChanges) {
+            this._prepareInfo.changesRequireBuild =
+                this._changesInfo.changesRequireBuild;
+            this._prepareInfo.time = new Date().toString();
+            if (this._prepareInfo.changesRequireBuild) {
+                this._prepareInfo.changesRequireBuildTime = this._prepareInfo.time;
             }
-            this._changesInfo.nativePlatformStatus =
-                this._prepareInfo.nativePlatformStatus;
-            this.$logger.trace("checkForChanges returns", this._changesInfo);
-            return this._changesInfo;
-        });
+        }
+        this._changesInfo.nativePlatformStatus =
+            this._prepareInfo.nativePlatformStatus;
+        this.$logger.trace("checkForChanges returns", this._changesInfo);
+        return this._changesInfo;
     }
     getPrepareInfoFilePath(platformData) {
         const prepareInfoFilePath = path.join(platformData.projectRoot, prepareInfoFileName);
@@ -146,68 +135,62 @@ class ProjectChangesService {
         }
         return prepareInfo;
     }
-    savePrepareInfo(platformData, projectData, prepareData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._prepareInfo) {
-                yield this.ensurePrepareInfo(platformData, projectData, prepareData);
-            }
-            if (this.$options.hostProjectPath) {
-                return null;
-            }
-            const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
-            this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);
-        });
-    }
-    setNativePlatformStatus(platformData, projectData, addedPlatform) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._prepareInfo = this._prepareInfo || this.getPrepareInfo(platformData);
-            if (this._prepareInfo &&
-                addedPlatform.nativePlatformStatus ===
-                    "3") {
-                this._prepareInfo.nativePlatformStatus =
-                    addedPlatform.nativePlatformStatus;
-            }
-            else {
-                this._prepareInfo = {
-                    nativePlatformStatus: addedPlatform.nativePlatformStatus,
-                };
-            }
-            yield this.savePrepareInfo(platformData, projectData, null);
-        });
+    async savePrepareInfo(platformData, projectData, prepareData) {
+        if (!this._prepareInfo) {
+            await this.ensurePrepareInfo(platformData, projectData, prepareData);
+        }
+        if (this.$options.hostProjectPath) {
+            return null;
+        }
+        const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
+        this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);
     }
-    ensurePrepareInfo(platformData, projectData, prepareData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._prepareInfo = this.getPrepareInfo(platformData);
-            if (this._prepareInfo) {
-                const prepareInfoFile = path.join(platformData.projectRoot, prepareInfoFileName);
-                this._outputProjectMtime = this.$fs
-                    .getFsStats(prepareInfoFile)
-                    .mtime.getTime();
-                this._outputProjectCTime = this.$fs
-                    .getFsStats(prepareInfoFile)
-                    .ctime.getTime();
-                return false;
-            }
-            const nativePlatformStatus = !prepareData.nativePrepare || !prepareData.nativePrepare.skipNativePrepare
-                ? "2"
-                : "1";
+    async setNativePlatformStatus(platformData, projectData, addedPlatform) {
+        this._prepareInfo = this._prepareInfo || this.getPrepareInfo(platformData);
+        if (this._prepareInfo &&
+            addedPlatform.nativePlatformStatus ===
+                "3") {
+            this._prepareInfo.nativePlatformStatus =
+                addedPlatform.nativePlatformStatus;
+        }
+        else {
             this._prepareInfo = {
-                time: "",
-                nativePlatformStatus,
-                release: prepareData.release,
-                changesRequireBuild: true,
-                projectFileHash: this.getProjectFileStrippedHash(projectData.projectDir, platformData),
-                changesRequireBuildTime: null,
+                nativePlatformStatus: addedPlatform.nativePlatformStatus,
             };
-            this._outputProjectMtime = 0;
-            this._outputProjectCTime = 0;
-            this._changesInfo = this._changesInfo || new ProjectChangesInfo();
-            this._changesInfo.appResourcesChanged = true;
-            this._changesInfo.configChanged = true;
-            this._changesInfo.nativeChanged = true;
-            this._changesInfo.nsConfigChanged = true;
-            return true;
-        });
+        }
+        await this.savePrepareInfo(platformData, projectData, null);
+    }
+    async ensurePrepareInfo(platformData, projectData, prepareData) {
+        this._prepareInfo = this.getPrepareInfo(platformData);
+        if (this._prepareInfo) {
+            const prepareInfoFile = path.join(platformData.projectRoot, prepareInfoFileName);
+            this._outputProjectMtime = this.$fs
+                .getFsStats(prepareInfoFile)
+                .mtime.getTime();
+            this._outputProjectCTime = this.$fs
+                .getFsStats(prepareInfoFile)
+                .ctime.getTime();
+            return false;
+        }
+        const nativePlatformStatus = !prepareData.nativePrepare || !prepareData.nativePrepare.skipNativePrepare
+            ? "2"
+            : "1";
+        this._prepareInfo = {
+            time: "",
+            nativePlatformStatus,
+            release: prepareData.release,
+            changesRequireBuild: true,
+            projectFileHash: this.getProjectFileStrippedHash(projectData.projectDir, platformData),
+            changesRequireBuildTime: null,
+        };
+        this._outputProjectMtime = 0;
+        this._outputProjectCTime = 0;
+        this._changesInfo = this._changesInfo || new ProjectChangesInfo();
+        this._changesInfo.appResourcesChanged = true;
+        this._changesInfo.configChanged = true;
+        this._changesInfo.nativeChanged = true;
+        this._changesInfo.nsConfigChanged = true;
+        return true;
     }
     getProjectFileStrippedHash(projectDir, platformData) {
         const projectFilePath = path.join(projectDir, constants_1.PACKAGE_JSON_FILE_NAME);
@@ -274,8 +257,8 @@ class ProjectChangesService {
         return changed;
     }
 }
+exports.ProjectChangesService = ProjectChangesService;
 __decorate([
     (0, helpers_1.hook)("checkForChanges")
 ], ProjectChangesService.prototype, "checkForChanges", null);
-exports.ProjectChangesService = ProjectChangesService;
 yok_1.injector.register("projectChangesService", ProjectChangesService);

package/lib/services/project-cleanup-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.ProjectCleanupService = void 0;
 const yok_1 = require("../common/yok");
@@ -20,82 +11,78 @@ class ProjectCleanupService {
         this.$projectHelper = $projectHelper;
         this.$terminalSpinnerService = $terminalSpinnerService;
     }
-    clean(pathsToClean, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.spinner = this.$terminalSpinnerService.createSpinner({
-                isSilent: options === null || options === void 0 ? void 0 : options.silent,
+    async clean(pathsToClean, options) {
+        this.spinner = this.$terminalSpinnerService.createSpinner({
+            isSilent: options === null || options === void 0 ? void 0 : options.silent,
+        });
+        let stats = (options === null || options === void 0 ? void 0 : options.stats) ? new Map() : false;
+        let success = true;
+        for (const pathToClean of pathsToClean) {
+            const cleanRes = await this.cleanPath(pathToClean, options).catch((error) => {
+                this.$logger.trace(`Encountered error while cleaning. Error is: ${error.message}.`, error);
+                return { ok: false };
             });
-            let stats = (options === null || options === void 0 ? void 0 : options.stats) ? new Map() : false;
-            let success = true;
-            for (const pathToClean of pathsToClean) {
-                const cleanRes = yield this.cleanPath(pathToClean, options).catch((error) => {
-                    this.$logger.trace(`Encountered error while cleaning. Error is: ${error.message}.`, error);
-                    return { ok: false };
-                });
-                if (stats && "size" in cleanRes) {
-                    stats.set(pathToClean, cleanRes.size);
-                }
-                success = success && cleanRes.ok;
-            }
-            if (!(options === null || options === void 0 ? void 0 : options.silent)) {
-                console.log();
+            if (stats && "size" in cleanRes) {
+                stats.set(pathToClean, cleanRes.size);
             }
-            if (stats) {
-                return { ok: success, stats };
-            }
-            return { ok: success };
-        });
+            success = success && cleanRes.ok;
+        }
+        if (!(options === null || options === void 0 ? void 0 : options.silent)) {
+            console.log();
+        }
+        if (stats) {
+            return { ok: success, stats };
+        }
+        return { ok: success };
     }
-    cleanPath(pathToClean, options) {
+    async cleanPath(pathToClean, options) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const dryRun = (_a = options === null || options === void 0 ? void 0 : options.dryRun) !== null && _a !== void 0 ? _a : false;
-            const logPrefix = dryRun ? color_1.color.grey("(dry run) ") : "";
-            this.spinner.clear();
-            let fileType;
-            if (!pathToClean || pathToClean.trim().length === 0) {
-                this.$logger.trace(`${logPrefix}cleanPath called with no pathToClean.`);
-                return { ok: true };
+        const dryRun = (_a = options === null || options === void 0 ? void 0 : options.dryRun) !== null && _a !== void 0 ? _a : false;
+        const logPrefix = dryRun ? color_1.color.grey("(dry run) ") : "";
+        this.spinner.clear();
+        let fileType;
+        if (!pathToClean || pathToClean.trim().length === 0) {
+            this.$logger.trace(`${logPrefix}cleanPath called with no pathToClean.`);
+            return { ok: true };
+        }
+        const filePath = path.resolve(this.$projectHelper.projectDir, pathToClean);
+        const displayPath = color_1.color.yellow(`${path.relative(this.$projectHelper.projectDir, filePath)}`);
+        this.$logger.trace(`${logPrefix}Trying to clean '${filePath}'`);
+        if (this.$fs.exists(filePath)) {
+            const stat = this.$fs.getFsStats(filePath);
+            let size = 0;
+            if (options === null || options === void 0 ? void 0 : options.stats) {
+                size = this.$fs.getSize(filePath);
             }
-            const filePath = path.resolve(this.$projectHelper.projectDir, pathToClean);
-            const displayPath = color_1.color.yellow(`${path.relative(this.$projectHelper.projectDir, filePath)}`);
-            this.$logger.trace(`${logPrefix}Trying to clean '${filePath}'`);
-            if (this.$fs.exists(filePath)) {
-                const stat = this.$fs.getFsStats(filePath);
-                let size = 0;
-                if (options === null || options === void 0 ? void 0 : options.stats) {
-                    size = this.$fs.getSize(filePath);
-                }
-                if (stat.isDirectory()) {
-                    this.$logger.trace(`${logPrefix}Path '${filePath}' is a directory, deleting.`);
-                    !dryRun && this.$fs.deleteDirectorySafe(filePath);
-                    fileType = "directory";
-                }
-                else {
-                    this.$logger.trace(`${logPrefix}Path '${filePath}' is a file, deleting.`);
-                    !dryRun && this.$fs.deleteFile(filePath);
-                    fileType = "file";
-                }
-                const success = dryRun || !this.$fs.exists(filePath);
-                if (success) {
-                    this.spinner.succeed(`${logPrefix}Cleaned ${fileType} ${displayPath}`);
-                }
-                else {
-                    const message = color_1.color.red(`Failed to Clean ${fileType}`);
-                    this.spinner.fail(`${logPrefix}${message} ${displayPath}`);
-                }
-                if (options === null || options === void 0 ? void 0 : options.stats) {
-                    return { ok: success, size };
-                }
-                return { ok: success };
+            if (stat.isDirectory()) {
+                this.$logger.trace(`${logPrefix}Path '${filePath}' is a directory, deleting.`);
+                !dryRun && this.$fs.deleteDirectorySafe(filePath);
+                fileType = "directory";
+            }
+            else {
+                this.$logger.trace(`${logPrefix}Path '${filePath}' is a file, deleting.`);
+                !dryRun && this.$fs.deleteFile(filePath);
+                fileType = "file";
+            }
+            const success = dryRun || !this.$fs.exists(filePath);
+            if (success) {
+                this.spinner.succeed(`${logPrefix}Cleaned ${fileType} ${displayPath}`);
+            }
+            else {
+                const message = color_1.color.red(`Failed to Clean ${fileType}`);
+                this.spinner.fail(`${logPrefix}${message} ${displayPath}`);
             }
-            this.$logger.trace(`${logPrefix}Path '${filePath}' not found, skipping.`);
-            this.spinner.info(`${logPrefix}Skipping ${displayPath} because it doesn't exist.`);
             if (options === null || options === void 0 ? void 0 : options.stats) {
-                return { ok: true, size: 0 };
+                return { ok: success, size };
             }
-            return { ok: true };
-        });
+            return { ok: success };
+        }
+        this.$logger.trace(`${logPrefix}Path '${filePath}' not found, skipping.`);
+        this.spinner.info(`${logPrefix}Skipping ${displayPath} because it doesn't exist.`);
+        if (options === null || options === void 0 ? void 0 : options.stats) {
+            return { ok: true, size: 0 };
+        }
+        return { ok: true };
     }
 }
 exports.ProjectCleanupService = ProjectCleanupService;