nativescript 8.9.0-dev.2 → 8.9.0-dev.4

package/lib/services/project-config-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.ProjectConfigService = void 0;
 const constants = require("../constants");
@@ -160,65 +151,66 @@ export default {
     getValue(key, defaultValue) {
         return _.get(this.readConfig(), key, defaultValue);
     }
-    setValue(key, value) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { hasTSConfig, hasNSConfig, TSConfigPath, JSConfigPath, usingNSConfig, NSConfigPath, } = this.detectProjectConfigs();
-            const configFilePath = TSConfigPath || JSConfigPath;
-            if (this.forceUsingLegacyConfig ||
-                (usingNSConfig && !this.forceUsingNewConfig)) {
-                try {
-                    this.$logger.trace("Project Config Service -> setValue writing to legacy config.");
-                    const NSConfig = hasNSConfig ? this.$fs.readJson(NSConfigPath) : {};
-                    _.set(NSConfig, key, value);
-                    this.$fs.writeJson(NSConfigPath, NSConfig);
-                    return true;
-                }
-                catch (error) {
-                    this.$logger.trace(`Failed to setValue on legacy config. Error is ${error.message}`, error);
-                    return false;
-                }
-            }
-            if (!this.$fs.exists(configFilePath)) {
-                this.writeDefaultConfig(this.projectHelper.projectDir);
-            }
-            if (!Array.isArray(value) && typeof value === "object") {
-                let allSuccessful = true;
-                for (const prop of this.flattenObjectToPaths(value)) {
-                    if (!(yield this.setValue(prop.key, prop.value))) {
-                        allSuccessful = false;
-                    }
-                }
-                return allSuccessful;
-            }
-            const configContent = this.$fs.readText(configFilePath);
+    async setValue(key, value) {
+        const { hasTSConfig, hasNSConfig, TSConfigPath, JSConfigPath, usingNSConfig, NSConfigPath, } = this.detectProjectConfigs();
+        const configFilePath = TSConfigPath || JSConfigPath;
+        if (this.forceUsingLegacyConfig ||
+            (usingNSConfig && !this.forceUsingNewConfig)) {
             try {
-                const transformer = new config_transformer_1.ConfigTransformer(configContent);
-                const newContent = transformer.setValue(key, value);
-                const prettierOptions = (yield (0, prettier_1.resolveConfig)(this.projectHelper.projectDir, { editorconfig: true })) || {
-                    semi: false,
-                    singleQuote: true,
-                };
-                this.$logger.trace("updating config, prettier options: ", prettierOptions);
-                this.$fs.writeFile(configFilePath, (0, prettier_1.format)(newContent, Object.assign(Object.assign({}, prettierOptions), { parser: "typescript", 
-                    // note: we don't use plugins here, since we are only formatting ts files, and they are supported by default
-                    // and this also causes issues with certain plugins, like prettier-plugin-tailwindcss.
-                    plugins: [] })));
+                this.$logger.trace("Project Config Service -> setValue writing to legacy config.");
+                const NSConfig = hasNSConfig ? this.$fs.readJson(NSConfigPath) : {};
+                _.set(NSConfig, key, value);
+                this.$fs.writeJson(NSConfigPath, NSConfig);
+                return true;
             }
             catch (error) {
-                this.$logger.error(`Failed to update config.` + error);
+                this.$logger.trace(`Failed to setValue on legacy config. Error is ${error.message}`, error);
+                return false;
             }
-            finally {
-                // verify config is updated correctly
-                if (!Array.isArray(this.getValue(key)) && this.getValue(key) !== value) {
-                    this.$logger.error(`${os_1.EOL}Failed to update ${hasTSConfig ? constants_1.CONFIG_FILE_NAME_TS : constants_1.CONFIG_FILE_NAME_JS}.${os_1.EOL}`);
-                    this.$logger.printMarkdown(`Please manually update \`${hasTSConfig ? constants_1.CONFIG_FILE_NAME_TS : constants_1.CONFIG_FILE_NAME_JS}\` and set \`${key}\` to \`${value}\`.${os_1.EOL}`);
-                    // restore original content
-                    this.$fs.writeFile(configFilePath, configContent);
-                    return false;
+        }
+        if (!this.$fs.exists(configFilePath)) {
+            this.writeDefaultConfig(this.projectHelper.projectDir);
+        }
+        if (!Array.isArray(value) && typeof value === "object") {
+            let allSuccessful = true;
+            for (const prop of this.flattenObjectToPaths(value)) {
+                if (!(await this.setValue(prop.key, prop.value))) {
+                    allSuccessful = false;
                 }
-                return true;
             }
-        });
+            return allSuccessful;
+        }
+        const configContent = this.$fs.readText(configFilePath);
+        try {
+            const transformer = new config_transformer_1.ConfigTransformer(configContent);
+            const newContent = transformer.setValue(key, value);
+            const prettierOptions = (await (0, prettier_1.resolveConfig)(this.projectHelper.projectDir, { editorconfig: true })) || {
+                semi: false,
+                singleQuote: true,
+            };
+            this.$logger.trace("updating config, prettier options: ", prettierOptions);
+            this.$fs.writeFile(configFilePath, await (0, prettier_1.format)(newContent, {
+                ...prettierOptions,
+                parser: "typescript",
+                // note: we don't use plugins here, since we are only formatting ts files, and they are supported by default
+                // and this also causes issues with certain plugins, like prettier-plugin-tailwindcss.
+                plugins: [],
+            }));
+        }
+        catch (error) {
+            this.$logger.error(`Failed to update config.` + error);
+        }
+        finally {
+            // verify config is updated correctly
+            if (!Array.isArray(this.getValue(key)) && this.getValue(key) !== value) {
+                this.$logger.error(`${os_1.EOL}Failed to update ${hasTSConfig ? constants_1.CONFIG_FILE_NAME_TS : constants_1.CONFIG_FILE_NAME_JS}.${os_1.EOL}`);
+                this.$logger.printMarkdown(`Please manually update \`${hasTSConfig ? constants_1.CONFIG_FILE_NAME_TS : constants_1.CONFIG_FILE_NAME_JS}\` and set \`${key}\` to \`${value}\`.${os_1.EOL}`);
+                // restore original content
+                this.$fs.writeFile(configFilePath, configContent);
+                return false;
+            }
+            return true;
+        }
     }
     writeDefaultConfig(projectDir, appId) {
         const TSConfigPath = path.resolve(projectDir, constants_1.CONFIG_FILE_NAME_TS);
@@ -291,35 +283,33 @@ export default {
         return _.defaultsDeep({}, ...additionalData, NSConfig);
         // return Object.assign({}, ...additionalData, NSConfig);
     }
-    writeLegacyNSConfigIfNeeded(projectDir, runtimePackage) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { usingNSConfig } = this.detectProjectConfigs(projectDir);
-            if (usingNSConfig) {
-                return;
-            }
-            if (runtimePackage.version &&
-                semver.gte(semver.coerce(runtimePackage.version), "7.0.0-rc.5")) {
-                // runtimes >= 7.0.0-rc.5 support passing appPath and appResourcesPath through gradle project flags
-                // so writing an nsconfig is not necessary.
-                return;
-            }
-            const runtimePackageDisplay = `${runtimePackage.name}${runtimePackage.version ? " v" + runtimePackage.version : ""}`;
-            this.$logger.info();
-            this.$logger.printMarkdown(`
+    async writeLegacyNSConfigIfNeeded(projectDir, runtimePackage) {
+        const { usingNSConfig } = this.detectProjectConfigs(projectDir);
+        if (usingNSConfig) {
+            return;
+        }
+        if (runtimePackage.version &&
+            semver.gte(semver.coerce(runtimePackage.version), "7.0.0-rc.5")) {
+            // runtimes >= 7.0.0-rc.5 support passing appPath and appResourcesPath through gradle project flags
+            // so writing an nsconfig is not necessary.
+            return;
+        }
+        const runtimePackageDisplay = `${runtimePackage.name}${runtimePackage.version ? " v" + runtimePackage.version : ""}`;
+        this.$logger.info();
+        this.$logger.printMarkdown(`
 Using __${runtimePackageDisplay}__ which requires \`nsconfig.json\` to be present.
 Writing \`nsconfig.json\` based on the values set in \`${constants_1.CONFIG_FILE_NAME_DISPLAY}\`.
 You may add \`nsconfig.json\` to \`.gitignore\` as the CLI will regenerate it as necessary.`);
-            const nsConfigPath = path.join(projectDir || this.projectHelper.projectDir, "nsconfig.json");
-            this.$fs.writeJson(nsConfigPath, {
-                _info1: `Auto Generated for backwards compatibility with the currently used runtime.`,
-                _info2: `Do not edit this file manually, as any changes will be ignored.`,
-                _info3: `Config changes should be done in ${constants_1.CONFIG_FILE_NAME_DISPLAY} instead.`,
-                appPath: this.getValue("appPath"),
-                appResourcesPath: this.getValue("appResourcesPath"),
-            });
-            // mark the file for cleanup after the CLI exits
-            yield this.$cleanupService.addCleanupDeleteAction(nsConfigPath);
+        const nsConfigPath = path.join(projectDir || this.projectHelper.projectDir, "nsconfig.json");
+        this.$fs.writeJson(nsConfigPath, {
+            _info1: `Auto Generated for backwards compatibility with the currently used runtime.`,
+            _info2: `Do not edit this file manually, as any changes will be ignored.`,
+            _info3: `Config changes should be done in ${constants_1.CONFIG_FILE_NAME_DISPLAY} instead.`,
+            appPath: this.getValue("appPath"),
+            appResourcesPath: this.getValue("appResourcesPath"),
         });
+        // mark the file for cleanup after the CLI exits
+        await this.$cleanupService.addCleanupDeleteAction(nsConfigPath);
     }
     // todo: move into config manipulation
     flattenObjectToPaths(obj, basePath) {
@@ -347,6 +337,7 @@ You may add \`nsconfig.json\` to \`.gitignore\` as the CLI will regenerate it as
         }, []);
     }
 }
+exports.ProjectConfigService = ProjectConfigService;
 __decorate([
     (0, decorators_1.cache)() // @cache should prevent the message being printed multiple times
 ], ProjectConfigService.prototype, "warnUsingLegacyNSConfig", null);
@@ -359,6 +350,5 @@ __decorate([
 __decorate([
     (0, decorators_1.exported)("projectConfigService")
 ], ProjectConfigService.prototype, "setValue", null);
-exports.ProjectConfigService = ProjectConfigService;
 yok_1.injector.register("projectConfigService", ProjectConfigService);
 //# sourceMappingURL=project-config-service.js.map

package/lib/services/project-data-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.ProjectDataService = void 0;
 const path = require("path");
@@ -90,73 +81,67 @@ class ProjectDataService {
         this.projectDataCache[projectDir].initializeProjectDataFromContent(packageJsonContent, projectDir);
         return this.projectDataCache[projectDir];
     }
-    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 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,
+        };
     }
-    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,
-            };
-        });
+    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,
+        };
     }
     removeNSConfigProperty(projectDir, propertyName) {
         this.$logger.trace(`Removing "${propertyName}" property from nsconfig.`);
         this.updateNsConfigValue(projectDir, null, [propertyName]);
         this.$logger.trace(`"${propertyName}" property successfully removed.`);
     }
-    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,
-            };
-        });
+    async getAndroidAssetsStructure(opts) {
+        // 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);
@@ -223,70 +208,68 @@ class ProjectDataService {
         const imageDefinitions = this.$fs.readJson(pathToImageDefinitions);
         return imageDefinitions;
     }
-    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);
-                }
-                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;
-                    }
+    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;
+            // 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);
+            }
+            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;
                 }
-                // 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);
+            }
+            // 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;
                 }
             });
-            return finalContent;
+            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;
     }
     getAndroidAssetSubGroup(assetItems, basePath) {
         const assetSubGroup = {
@@ -463,6 +446,7 @@ class ProjectDataService {
         return JSON.stringify(config);
     }
 }
+exports.ProjectDataService = ProjectDataService;
 ProjectDataService.DEPENDENCIES_KEY_NAME = "dependencies";
 __decorate([
     (0, decorators_1.exported)("projectDataService")
@@ -497,6 +481,5 @@ __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,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.ProjectNameService = void 0;
 const helpers_1 = require("../common/helpers");
@@ -19,48 +10,42 @@ class ProjectNameService {
         this.$logger = $logger;
         this.$prompter = $prompter;
     }
-    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);
+    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.");
             }
-            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("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.");
             }
-            return projectName;
-        });
+            return await this.promptForNewName("You cannot build applications named 'app' in Xcode. Consider creating a project with different name.", projectName, validateOptions);
+        }
+        return projectName;
     }
     checkIfNameStartsWithLetter(projectName) {
         const startsWithLetterExpression = /^[a-zA-Z]/;
         return startsWithLetterExpression.test(projectName);
     }
-    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 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);
     }
-    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?");
-        });
+    async promptForForceNameConfirm(warningMessage) {
+        this.$logger.warn(warningMessage);
+        return await this.$prompter.confirm("Do you want to create the project with this name?");
     }
 }
 exports.ProjectNameService = ProjectNameService;