nativescript 8.9.0-dev.1 → 8.9.0-dev.2

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

@@ -5,6 +5,15 @@ 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.ProjectDataService = void 0;
 const path = require("path");
@@ -27,12 +36,14 @@ class ProjectDataService {
         this.$injector = $injector;
         this.projectDataCache = {};
         try {
+            // add the ProjectData of the default projectDir to the projectData cache
             const projectData = this.$injector.resolve("projectData");
             projectData.initializeProjectData();
             this.defaultProjectDir = projectData.projectDir;
             this.projectDataCache[this.defaultProjectDir] = projectData;
         }
         catch (e) {
+            // the CLI is required as a lib from a non-project folder
         }
     }
     get $pluginsService() {
@@ -61,6 +72,8 @@ class ProjectDataService {
         delete projectFileInfo.projectData[ProjectDataService.DEPENDENCIES_KEY_NAME][dependencyName];
         this.$fs.writeJson(projectFileInfo.projectFilePath, projectFileInfo.projectData);
     }
+    // TODO: Add tests
+    // TODO: Remove $projectData and replace it with $projectDataService.getProjectData
     getProjectData(projectDir) {
         projectDir = projectDir || this.defaultProjectDir;
         this.projectDataCache[projectDir] =
@@ -77,62 +90,73 @@ class ProjectDataService {
         this.projectDataCache[projectDir].initializeProjectDataFromContent(packageJsonContent, projectDir);
         return this.projectDataCache[projectDir];
     }
-    async getAssetsStructure(opts) {
-        const iOSAssetStructure = await this.getIOSAssetsStructure(opts);
-        const androidAssetStructure = await this.getAndroidAssetsStructure(opts);
-        this.$logger.trace("iOS Assets structure:", JSON.stringify(iOSAssetStructure, null, 2));
-        this.$logger.trace("Android Assets structure:", JSON.stringify(androidAssetStructure, null, 2));
-        return {
-            ios: iOSAssetStructure,
-            android: androidAssetStructure,
-        };
+    getAssetsStructure(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const iOSAssetStructure = yield this.getIOSAssetsStructure(opts);
+            const androidAssetStructure = yield this.getAndroidAssetsStructure(opts);
+            this.$logger.trace("iOS Assets structure:", JSON.stringify(iOSAssetStructure, null, 2));
+            this.$logger.trace("Android Assets structure:", JSON.stringify(androidAssetStructure, null, 2));
+            return {
+                ios: iOSAssetStructure,
+                android: androidAssetStructure,
+            };
+        });
     }
-    async getIOSAssetsStructure(opts) {
-        const projectDir = opts.projectDir;
-        const projectData = this.getProjectData(projectDir);
-        const basePath = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants_1.AssetConstants.iOSAssetsDirName);
-        const pathToIcons = path.join(basePath, constants_1.AssetConstants.iOSIconsDirName);
-        const icons = await this.getIOSAssetSubGroup(pathToIcons);
-        const pathToSplashBackgrounds = path.join(basePath, constants_1.AssetConstants.iOSSplashBackgroundsDirName);
-        const splashBackgrounds = await this.getIOSAssetSubGroup(pathToSplashBackgrounds);
-        const pathToSplashCenterImages = path.join(basePath, constants_1.AssetConstants.iOSSplashCenterImagesDirName);
-        const splashCenterImages = await this.getIOSAssetSubGroup(pathToSplashCenterImages);
-        const pathToSplashImages = path.join(basePath, constants_1.AssetConstants.iOSSplashImagesDirName);
-        const splashImages = await this.getIOSAssetSubGroup(pathToSplashImages);
-        return {
-            icons,
-            splashBackgrounds,
-            splashCenterImages,
-            splashImages,
-        };
+    getIOSAssetsStructure(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const projectDir = opts.projectDir;
+            const projectData = this.getProjectData(projectDir);
+            const basePath = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants_1.AssetConstants.iOSAssetsDirName);
+            const pathToIcons = path.join(basePath, constants_1.AssetConstants.iOSIconsDirName);
+            const icons = yield this.getIOSAssetSubGroup(pathToIcons);
+            const pathToSplashBackgrounds = path.join(basePath, constants_1.AssetConstants.iOSSplashBackgroundsDirName);
+            const splashBackgrounds = yield this.getIOSAssetSubGroup(pathToSplashBackgrounds);
+            const pathToSplashCenterImages = path.join(basePath, constants_1.AssetConstants.iOSSplashCenterImagesDirName);
+            const splashCenterImages = yield this.getIOSAssetSubGroup(pathToSplashCenterImages);
+            const pathToSplashImages = path.join(basePath, constants_1.AssetConstants.iOSSplashImagesDirName);
+            const splashImages = yield this.getIOSAssetSubGroup(pathToSplashImages);
+            return {
+                icons,
+                splashBackgrounds,
+                splashCenterImages,
+                splashImages,
+            };
+        });
     }
     removeNSConfigProperty(projectDir, propertyName) {
         this.$logger.trace(`Removing "${propertyName}" property from nsconfig.`);
         this.updateNsConfigValue(projectDir, null, [propertyName]);
         this.$logger.trace(`"${propertyName}" property successfully removed.`);
     }
-    async getAndroidAssetsStructure(opts) {
-        const projectDir = opts.projectDir;
-        const projectData = this.getProjectData(projectDir);
-        const pathToAndroidDir = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.Android);
-        const hasMigrated = this.$androidResourcesMigrationService.hasMigrated(projectData.appResourcesDirectoryPath);
-        const basePath = hasMigrated
-            ? path.join(pathToAndroidDir, constants_1.SRC_DIR, constants_1.MAIN_DIR, constants_1.RESOURCES_DIR)
-            : pathToAndroidDir;
-        let useLegacy = false;
-        try {
-            const manifest = this.$fs.readText(path.resolve(basePath, "../AndroidManifest.xml"));
-            useLegacy = !manifest.includes(`android:icon="@mipmap/ic_launcher"`);
-        }
-        catch (err) {
-        }
-        const content = this.getImageDefinitions()[useLegacy ? "android_legacy" : "android"];
-        return {
-            icons: this.getAndroidAssetSubGroup(content.icons, basePath),
-            splashBackgrounds: this.getAndroidAssetSubGroup(content.splashBackgrounds, basePath),
-            splashCenterImages: this.getAndroidAssetSubGroup(content.splashCenterImages, basePath),
-            splashImages: null,
-        };
+    getAndroidAssetsStructure(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // TODO: Use image-size package to get the width and height of an image.
+            // TODO: Parse the splash_screen.xml in nodpi directory and get from it the names of the background and center image.
+            // TODO: Parse the AndroidManifest.xml to get the name of the icon.
+            // This way we'll not use the image-definitions.json and the method will return the real android structure.
+            const projectDir = opts.projectDir;
+            const projectData = this.getProjectData(projectDir);
+            const pathToAndroidDir = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.Android);
+            const hasMigrated = this.$androidResourcesMigrationService.hasMigrated(projectData.appResourcesDirectoryPath);
+            const basePath = hasMigrated
+                ? path.join(pathToAndroidDir, constants_1.SRC_DIR, constants_1.MAIN_DIR, constants_1.RESOURCES_DIR)
+                : pathToAndroidDir;
+            let useLegacy = false;
+            try {
+                const manifest = this.$fs.readText(path.resolve(basePath, "../AndroidManifest.xml"));
+                useLegacy = !manifest.includes(`android:icon="@mipmap/ic_launcher"`);
+            }
+            catch (err) {
+                // ignore
+            }
+            const content = this.getImageDefinitions()[useLegacy ? "android_legacy" : "android"];
+            return {
+                icons: this.getAndroidAssetSubGroup(content.icons, basePath),
+                splashBackgrounds: this.getAndroidAssetSubGroup(content.splashBackgrounds, basePath),
+                splashCenterImages: this.getAndroidAssetSubGroup(content.splashCenterImages, basePath),
+                splashImages: null,
+            };
+        });
     }
     getAppExecutableFiles(projectDir) {
         const projectData = this.getProjectData(projectDir);
@@ -148,6 +172,8 @@ class ProjectDataService {
             }
             if (fstat.isDirectory()) {
                 if (filePath === pathToProjectNodeModules) {
+                    // we do not want to get the files from node_modules directory of the project.
+                    // We'll get here only when you have nativescript.config with appDirectoryPath set to "."
                     return false;
                 }
                 return true;
@@ -162,6 +188,9 @@ class ProjectDataService {
         }
     }
     updateNsConfigValue(projectDir, updateObject, propertiesToRemove) {
+        // todo: figure out a way to update js/ts configs
+        // most likely needs an ast parser/writer
+        // should be delegated to the config service
         const nsConfigPath = path.join(projectDir, constants.CONFIG_FILE_NAME_JS);
         const currentNsConfig = this.getNsConfig(nsConfigPath);
         let newNsConfig = currentNsConfig;
@@ -194,62 +223,70 @@ class ProjectDataService {
         const imageDefinitions = this.$fs.readJson(pathToImageDefinitions);
         return imageDefinitions;
     }
-    async getIOSAssetSubGroup(dirPath) {
-        const pathToContentJson = path.join(dirPath, constants_1.AssetConstants.iOSResourcesFileName);
-        const content = (this.$fs.exists(pathToContentJson) &&
-            this.$fs.readJson(pathToContentJson)) || { images: [] };
-        const finalContent = { images: [] };
-        const imageDefinitions = this.getImageDefinitions().ios;
-        _.each(content && content.images, (image) => {
-            let foundMatchingDefinition = false;
-            if (image.filename) {
-                image.path = path.join(dirPath, image.filename);
-            }
-            if (image.size) {
-                const [width, height] = image.size
-                    .toString()
-                    .split(constants_1.AssetConstants.sizeDelimiter);
-                if (width && height) {
-                    image.width = +width;
-                    image.height = +height;
+    getIOSAssetSubGroup(dirPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const pathToContentJson = path.join(dirPath, constants_1.AssetConstants.iOSResourcesFileName);
+            const content = (this.$fs.exists(pathToContentJson) &&
+                this.$fs.readJson(pathToContentJson)) || { images: [] };
+            const finalContent = { images: [] };
+            const imageDefinitions = this.getImageDefinitions().ios;
+            _.each(content && content.images, (image) => {
+                let foundMatchingDefinition = false;
+                // In some cases the image may not be available, it will just be described.
+                // When this happens, the filename will be empty.
+                // So we'll keep the path empty as well.
+                if (image.filename) {
+                    image.path = path.join(dirPath, image.filename);
                 }
-            }
-            _.each(imageDefinitions, (assetSubGroup) => {
-                const assetItem = _.find(assetSubGroup, (assetElement) => assetElement.filename === image.filename &&
-                    path.basename(assetElement.directory) === path.basename(dirPath));
-                if (assetItem) {
-                    foundMatchingDefinition = true;
-                    if (!image.width || !image.height) {
-                        image.width = assetItem.width;
-                        image.height = assetItem.height;
-                        image.size =
-                            image.size ||
-                                `${assetItem.width}${constants_1.AssetConstants.sizeDelimiter}${assetItem.height}`;
+                if (image.size) {
+                    // size is basically <width>x<height>
+                    const [width, height] = image.size
+                        .toString()
+                        .split(constants_1.AssetConstants.sizeDelimiter);
+                    if (width && height) {
+                        image.width = +width;
+                        image.height = +height;
                     }
-                    image.resizeOperation =
-                        image.resizeOperation || assetItem.resizeOperation;
-                    image.overlayImageScale =
-                        image.overlayImageScale || assetItem.overlayImageScale;
-                    image.scale = image.scale || assetItem.scale;
-                    image.rgba = assetItem.rgba;
-                    finalContent.images.push(image);
-                    return false;
-                }
-            });
-            if (!foundMatchingDefinition) {
-                if (image.height && image.width) {
-                    this.$logger.trace("Missing data for image", image, " in CLI's resource file, but we will try to generate images based on the size from Contents.json");
-                    finalContent.images.push(image);
                 }
-                else if (image.filename) {
-                    this.$logger.warn(`Didn't find a matching image definition for file ${path.join(path.basename(dirPath), image.filename)}. This file will be skipped from resources generation.`);
-                }
-                else {
-                    this.$logger.trace(`Unable to detect data for image generation of image`, image);
+                // Find the image size based on the hardcoded values in the image-definitions.json
+                _.each(imageDefinitions, (assetSubGroup) => {
+                    const assetItem = _.find(assetSubGroup, (assetElement) => assetElement.filename === image.filename &&
+                        path.basename(assetElement.directory) === path.basename(dirPath));
+                    if (assetItem) {
+                        foundMatchingDefinition = true;
+                        if (!image.width || !image.height) {
+                            image.width = assetItem.width;
+                            image.height = assetItem.height;
+                            image.size =
+                                image.size ||
+                                    `${assetItem.width}${constants_1.AssetConstants.sizeDelimiter}${assetItem.height}`;
+                        }
+                        image.resizeOperation =
+                            image.resizeOperation || assetItem.resizeOperation;
+                        image.overlayImageScale =
+                            image.overlayImageScale || assetItem.overlayImageScale;
+                        image.scale = image.scale || assetItem.scale;
+                        image.rgba = assetItem.rgba;
+                        finalContent.images.push(image);
+                        // break each
+                        return false;
+                    }
+                });
+                if (!foundMatchingDefinition) {
+                    if (image.height && image.width) {
+                        this.$logger.trace("Missing data for image", image, " in CLI's resource file, but we will try to generate images based on the size from Contents.json");
+                        finalContent.images.push(image);
+                    }
+                    else if (image.filename) {
+                        this.$logger.warn(`Didn't find a matching image definition for file ${path.join(path.basename(dirPath), image.filename)}. This file will be skipped from resources generation.`);
+                    }
+                    else {
+                        this.$logger.trace(`Unable to detect data for image generation of image`, image);
+                    }
                 }
-            }
+            });
+            return finalContent;
         });
-        return finalContent;
     }
     getAndroidAssetSubGroup(assetItems, basePath) {
         const assetSubGroup = {
@@ -335,13 +372,16 @@ class ProjectDataService {
     getRuntimePackage(projectDir, platform) {
         platform = platform.toLowerCase();
         const packageJson = this.$fs.readJson(path.join(projectDir, constants.PACKAGE_JSON_FILE_NAME));
-        const runtimeName = platform === "android"
+        const runtimeName = platform === "android" /* PlatformTypes.android */
             ? constants.TNS_ANDROID_RUNTIME_NAME
             : constants.TNS_IOS_RUNTIME_NAME;
         if (packageJson &&
             packageJson.nativescript &&
             packageJson.nativescript[runtimeName] &&
             packageJson.nativescript[runtimeName].version) {
+            // if we have a nativescript key with a runtime version in package.json
+            // that means we are dealing with a legacy project, and should respect
+            // that information
             return {
                 name: runtimeName,
                 version: packageJson.nativescript[runtimeName].version,
@@ -353,19 +393,19 @@ class ProjectDataService {
         const runtimePackage = this.$pluginsService
             .getDependenciesFromPackageJson(projectDir)
             .devDependencies.find((d) => {
-            if (platform === "ios") {
+            if (platform === "ios" /* constants.PlatformTypes.ios */) {
                 return [
                     constants.SCOPED_IOS_RUNTIME_NAME,
                     constants.TNS_IOS_RUNTIME_NAME,
                 ].includes(d.name);
             }
-            else if (platform === "android") {
+            else if (platform === "android" /* constants.PlatformTypes.android */) {
                 return [
                     constants.SCOPED_ANDROID_RUNTIME_NAME,
                     constants.TNS_ANDROID_RUNTIME_NAME,
                 ].includes(d.name);
             }
-            else if (platform === "visionos") {
+            else if (platform === "visionos" /* constants.PlatformTypes.visionos */) {
                 return d.name === constants.SCOPED_VISIONOS_RUNTIME_NAME;
             }
         });
@@ -373,12 +413,14 @@ class ProjectDataService {
             const coerced = semver.coerce(runtimePackage.version);
             const isRange = !!coerced && coerced.version !== runtimePackage.version;
             const isTag = !coerced;
+            // in case we are using a local tgz for the runtime or a range like ~8.0.0, ^8.0.0 etc. or a tag like JSC
             if (runtimePackage.version.includes("tgz") || isRange || isTag) {
                 try {
                     const runtimePackageJsonPath = (0, package_path_helper_1.resolvePackageJSONPath)(runtimePackage.name, {
                         paths: [projectDir],
                     });
                     if (!runtimePackageJsonPath) {
+                        // caught below
                         throw new Error("Runtime package.json not found.");
                     }
                     runtimePackage.version = this.$fs.readJson(runtimePackageJsonPath).version;
@@ -395,20 +437,21 @@ class ProjectDataService {
             }
             return runtimePackage;
         }
+        // default to the scoped runtimes
         this.$logger.trace("Could not find an installed runtime, falling back to default runtimes");
-        if (platform === "ios") {
+        if (platform === "ios" /* constants.PlatformTypes.ios */) {
             return {
                 name: constants.SCOPED_IOS_RUNTIME_NAME,
                 version: null,
             };
         }
-        else if (platform === "android") {
+        else if (platform === "android" /* constants.PlatformTypes.android */) {
             return {
                 name: constants.SCOPED_ANDROID_RUNTIME_NAME,
                 version: null,
             };
         }
-        else if (platform === "visionos") {
+        else if (platform === "visionos" /* constants.PlatformTypes.visionos */) {
             return {
                 name: constants.SCOPED_VISIONOS_RUNTIME_NAME,
                 version: null,
@@ -420,7 +463,6 @@ class ProjectDataService {
         return JSON.stringify(config);
     }
 }
-exports.ProjectDataService = ProjectDataService;
 ProjectDataService.DEPENDENCIES_KEY_NAME = "dependencies";
 __decorate([
     (0, decorators_1.exported)("projectDataService")
@@ -443,9 +485,11 @@ __decorate([
             return projectDir + ":" + platform;
         },
         shouldCache(result) {
+            // don't cache coerced versions
             if (result._coerced) {
                 return false;
             }
+            // only cache if version is defined
             return !!result.version;
         },
     })
@@ -453,4 +497,6 @@ __decorate([
 __decorate([
     (0, decorators_1.exported)("projectDataService")
 ], ProjectDataService.prototype, "getNsConfigDefaultContent", null);
+exports.ProjectDataService = ProjectDataService;
 yok_1.injector.register("projectDataService", ProjectDataService);
+//# sourceMappingURL=project-data-service.js.map

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

@@ -1,4 +1,13 @@
 "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.ProjectNameService = void 0;
 const helpers_1 = require("../common/helpers");
@@ -10,43 +19,50 @@ class ProjectNameService {
         this.$logger = $logger;
         this.$prompter = $prompter;
     }
-    async ensureValidName(projectName, validateOptions) {
-        if (validateOptions && validateOptions.force) {
-            return projectName;
-        }
-        if (!this.$projectNameValidator.validate(projectName)) {
-            return await this.promptForNewName("The project name is invalid.", projectName, validateOptions);
-        }
-        const userCanInteract = (0, helpers_1.isInteractive)();
-        if (!this.checkIfNameStartsWithLetter(projectName)) {
-            if (!userCanInteract) {
-                this.$errors.fail("The project name does not start with letter and will fail to build for Android. If You want to create project with this name add --force to the create command.");
+    ensureValidName(projectName, validateOptions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (validateOptions && validateOptions.force) {
+                return projectName;
+            }
+            if (!this.$projectNameValidator.validate(projectName)) {
+                return yield this.promptForNewName("The project name is invalid.", projectName, validateOptions);
+            }
+            const userCanInteract = (0, helpers_1.isInteractive)();
+            if (!this.checkIfNameStartsWithLetter(projectName)) {
+                if (!userCanInteract) {
+                    this.$errors.fail("The project name does not start with letter and will fail to build for Android. If You want to create project with this name add --force to the create command.");
+                }
+                return yield this.promptForNewName("The project name does not start with letter and will fail to build for Android.", projectName, validateOptions);
             }
-            return await this.promptForNewName("The project name does not start with letter and will fail to build for Android.", projectName, validateOptions);
-        }
-        if (projectName.toUpperCase() === "APP") {
-            if (!userCanInteract) {
-                this.$errors.fail("You cannot build applications named 'app' in Xcode. Consider creating a project with different name. If You want to create project with this name add --force to the create command.");
+            if (projectName.toUpperCase() === "APP") {
+                if (!userCanInteract) {
+                    this.$errors.fail("You cannot build applications named 'app' in Xcode. Consider creating a project with different name. If You want to create project with this name add --force to the create command.");
+                }
+                return yield this.promptForNewName("You cannot build applications named 'app' in Xcode. Consider creating a project with different name.", projectName, validateOptions);
             }
-            return await this.promptForNewName("You cannot build applications named 'app' in Xcode. Consider creating a project with different name.", projectName, validateOptions);
-        }
-        return projectName;
+            return projectName;
+        });
     }
     checkIfNameStartsWithLetter(projectName) {
         const startsWithLetterExpression = /^[a-zA-Z]/;
         return startsWithLetterExpression.test(projectName);
     }
-    async promptForNewName(warningMessage, projectName, validateOptions) {
-        if (await this.promptForForceNameConfirm(warningMessage)) {
-            return projectName;
-        }
-        const newProjectName = await this.$prompter.getString("Enter the new project name:");
-        return await this.ensureValidName(newProjectName, validateOptions);
+    promptForNewName(warningMessage, projectName, validateOptions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (yield this.promptForForceNameConfirm(warningMessage)) {
+                return projectName;
+            }
+            const newProjectName = yield this.$prompter.getString("Enter the new project name:");
+            return yield this.ensureValidName(newProjectName, validateOptions);
+        });
     }
-    async promptForForceNameConfirm(warningMessage) {
-        this.$logger.warn(warningMessage);
-        return await this.$prompter.confirm("Do you want to create the project with this name?");
+    promptForForceNameConfirm(warningMessage) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.$logger.warn(warningMessage);
+            return yield this.$prompter.confirm("Do you want to create the project with this name?");
+        });
     }
 }
 exports.ProjectNameService = ProjectNameService;
 yok_1.injector.register("projectNameService", ProjectNameService);
+//# sourceMappingURL=project-name-service.js.map