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

package/lib/services/assets-generation/assets-generation-service.js

@@ -5,9 +5,18 @@ 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.AssetsGenerationService = void 0;
-const jimp_1 = require("jimp");
+const Jimp = require("jimp");
 const Color = require("color");
 const decorators_1 = require("../../common/decorators");
 const constants_1 = require("../../constants");
@@ -27,121 +36,136 @@ class AssetsGenerationService {
         this.$fs = $fs;
         this.$options = $options;
     }
-    async generateIcons(resourceGenerationData) {
-        if (this.$options.hostProjectPath) {
-            return;
-        }
-        this.$logger.info("Generating icons ...");
-        await this.generateImagesForDefinitions(resourceGenerationData, this.propertiesToEnumerate.icon);
-        this.$logger.info("Icons generation completed.");
+    generateIcons(resourceGenerationData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.$options.hostProjectPath) {
+                return;
+            }
+            this.$logger.info("Generating icons ...");
+            yield this.generateImagesForDefinitions(resourceGenerationData, this.propertiesToEnumerate.icon);
+            this.$logger.info("Icons generation completed.");
+        });
     }
-    async generateSplashScreens(splashesGenerationData) {
-        this.$logger.info("Generating splash screens ...");
-        await this.generateImagesForDefinitions(splashesGenerationData, this.propertiesToEnumerate.splash);
-        this.$logger.info("Splash screens generation completed.");
+    generateSplashScreens(splashesGenerationData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.$logger.info("Generating splash screens ...");
+            yield this.generateImagesForDefinitions(splashesGenerationData, this.propertiesToEnumerate.splash);
+            this.$logger.info("Splash screens generation completed.");
+        });
     }
-    async generateImagesForDefinitions(generationData, propertiesToEnumerate) {
+    generateImagesForDefinitions(generationData, propertiesToEnumerate) {
         var _a, _b, _c, _d, _e, _f;
-        const background = generationData.background || "white";
-        const assetsStructure = await this.$projectDataService.getAssetsStructure(generationData);
-        const assetItems = _(assetsStructure)
-            .filter((assetGroup, platform) => !generationData.platform ||
-            platform.toLowerCase() === generationData.platform.toLowerCase())
-            .map((assetGroup) => _.filter(assetGroup, (assetSubGroup, imageTypeKey) => assetSubGroup && propertiesToEnumerate.indexOf(imageTypeKey) !== -1))
-            .flatten()
-            .map((assetSubGroup) => assetSubGroup.images)
-            .flatten()
-            .filter((assetItem) => !!assetItem.filename)
-            .value();
-        for (const assetItem of assetItems) {
-            if (assetItem.operation === "delete") {
-                if (this.$fs.exists(assetItem.path)) {
-                    this.$fs.deleteFile(assetItem.path);
+        return __awaiter(this, void 0, void 0, function* () {
+            const background = generationData.background || "white";
+            const assetsStructure = yield this.$projectDataService.getAssetsStructure(generationData);
+            const assetItems = _(assetsStructure)
+                .filter((assetGroup, platform) => !generationData.platform ||
+                platform.toLowerCase() === generationData.platform.toLowerCase())
+                .map((assetGroup) => _.filter(assetGroup, (assetSubGroup, imageTypeKey) => assetSubGroup && propertiesToEnumerate.indexOf(imageTypeKey) !== -1))
+                .flatten()
+                .map((assetSubGroup) => assetSubGroup.images)
+                .flatten()
+                .filter((assetItem) => !!assetItem.filename)
+                .value();
+            for (const assetItem of assetItems) {
+                if (assetItem.operation === "delete") {
+                    if (this.$fs.exists(assetItem.path)) {
+                        this.$fs.deleteFile(assetItem.path);
+                    }
+                    continue;
                 }
-                continue;
-            }
-            if (assetItem.operation === "writeXMLColor") {
-                const colorName = (_a = assetItem.data) === null || _a === void 0 ? void 0 : _a.colorName;
-                if (!colorName) {
+                if (assetItem.operation === "writeXMLColor") {
+                    const colorName = (_a = assetItem.data) === null || _a === void 0 ? void 0 : _a.colorName;
+                    if (!colorName) {
+                        continue;
+                    }
+                    try {
+                        const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
+                        const colorHEX = Jimp.cssColorToHex(color);
+                        const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
+                        this.$fs.writeFile(assetItem.path, [
+                            `<?xml version="1.0" encoding="utf-8"?>`,
+                            `<resources>`,
+                            `    <color name="${colorName}">#${hex.toUpperCase()}</color>`,
+                            `</resources>`,
+                        ].join(os_1.EOL));
+                    }
+                    catch (err) {
+                        this.$logger.info(`Failed to write provided color to ${assetItem.path} -> ${colorName}. See --log trace for more info.`);
+                        this.$logger.trace(err);
+                    }
                     continue;
                 }
-                try {
-                    const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
-                    const colorHEX = (0, jimp_1.cssColorToHex)(color);
-                    const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
-                    this.$fs.writeFile(assetItem.path, [
-                        `<?xml version="1.0" encoding="utf-8"?>`,
-                        `<resources>`,
-                        `    <color name="${colorName}">#${hex.toUpperCase()}</color>`,
-                        `</resources>`,
-                    ].join(os_1.EOL));
+                const operation = assetItem.resizeOperation || "resize" /* Operations.Resize */;
+                let tempScale = null;
+                if (assetItem.scale) {
+                    if (_.isNumber(assetItem.scale)) {
+                        tempScale = assetItem.scale;
+                    }
+                    else {
+                        const splittedElements = `${assetItem.scale}`.split(constants_1.AssetConstants.sizeDelimiter);
+                        tempScale =
+                            splittedElements &&
+                                splittedElements.length &&
+                                splittedElements[0] &&
+                                +splittedElements[0];
+                    }
                 }
-                catch (err) {
-                    this.$logger.info(`Failed to write provided color to ${assetItem.path} -> ${colorName}. See --log trace for more info.`);
-                    this.$logger.trace(err);
+                const scale = tempScale || constants_1.AssetConstants.defaultScale;
+                const outputPath = assetItem.path;
+                const width = assetItem.width * scale;
+                const height = assetItem.height * scale;
+                if (!width || !height) {
+                    this.$logger.warn(`Image ${assetItem.filename} is skipped as its width and height are invalid.`);
+                    continue;
                 }
-                continue;
-            }
-            const operation = assetItem.resizeOperation || "resize";
-            let tempScale = null;
-            if (assetItem.scale) {
-                if (_.isNumber(assetItem.scale)) {
-                    tempScale = assetItem.scale;
+                let image;
+                switch (operation) {
+                    case "overlayWith" /* Operations.OverlayWith */:
+                        const overlayImageScale = assetItem.overlayImageScale ||
+                            constants_1.AssetConstants.defaultOverlayImageScale;
+                        const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
+                        image = yield this.resize(generationData.imagePath, imageResize, imageResize);
+                        image = this.generateImage(background, width, height, outputPath, image);
+                        break;
+                    case "blank" /* Operations.Blank */:
+                        image = this.generateImage(background, width, height, outputPath);
+                        break;
+                    case "resize" /* Operations.Resize */:
+                        image = yield this.resize(generationData.imagePath, width, height);
+                        break;
+                    case "outerScale" /* Operations.OuterScale */:
+                        // Resize image without applying scale
+                        image = yield this.resize(generationData.imagePath, assetItem.width, assetItem.height);
+                        // The scale will apply to the underlying layer of the generated image
+                        image = this.generateImage("#00000000", width, height, outputPath, image);
+                        break;
+                    default:
+                        throw new Error(`Invalid image generation operation: ${operation}`);
                 }
-                else {
-                    const splittedElements = `${assetItem.scale}`.split(constants_1.AssetConstants.sizeDelimiter);
-                    tempScale =
-                        splittedElements &&
-                            splittedElements.length &&
-                            splittedElements[0] &&
-                            +splittedElements[0];
+                // This code disables the alpha chanel, as some images for the Apple App Store must not have transparency.
+                if (assetItem.rgba === false) {
+                    //
+                    // The original code here became broken at some time and there is an issue posted here..
+                    //    https://github.com/oliver-moran/jimp/issues/954
+                    // But NathanaelA recommended the below change and it works so maybe that's just what we go with.
+                    //
+                    // image = image.rgba(false);
+                    image = image.colorType(2);
                 }
+                image.write(outputPath);
             }
-            const scale = tempScale || constants_1.AssetConstants.defaultScale;
-            const outputPath = assetItem.path;
-            const width = assetItem.width * scale;
-            const height = assetItem.height * scale;
-            if (!width || !height) {
-                this.$logger.warn(`Image ${assetItem.filename} is skipped as its width and height are invalid.`);
-                continue;
-            }
-            let image;
-            switch (operation) {
-                case "overlayWith":
-                    const overlayImageScale = assetItem.overlayImageScale ||
-                        constants_1.AssetConstants.defaultOverlayImageScale;
-                    const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
-                    image = await this.resize(generationData.imagePath, imageResize, imageResize);
-                    image = this.generateImage(background, width, height, outputPath, image);
-                    break;
-                case "blank":
-                    image = this.generateImage(background, width, height, outputPath);
-                    break;
-                case "resize":
-                    image = await this.resize(generationData.imagePath, width, height);
-                    break;
-                case "outerScale":
-                    image = await this.resize(generationData.imagePath, assetItem.width, assetItem.height);
-                    image = this.generateImage("#00000000", width, height, outputPath, image);
-                    break;
-                default:
-                    throw new Error(`Invalid image generation operation: ${operation}`);
-            }
-            if (assetItem.rgba === false) {
-                image = image.colorType(2);
-            }
-            image.write(outputPath);
-        }
+        });
     }
-    async resize(imagePath, width, height) {
-        const image = await jimp_1.Jimp.read(imagePath);
-        return image.scaleToFit({
-            w: width,
-            h: height,
+    resize(imagePath, width, height) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const image = yield Jimp.read(imagePath);
+            return image.scaleToFit(width, height);
         });
     }
     generateImage(background, width, height, outputPath, overlayImage) {
-        const J = jimp_1.Jimp;
+        // Typescript declarations for Jimp are not updated to define the constructor with backgroundColor so we workaround it by casting it to <any> for this case only.
+        const J = Jimp;
         const backgroundColor = this.getRgbaNumber(background);
         let image = new J(width, height, backgroundColor);
         if (overlayImage) {
@@ -155,14 +179,15 @@ class AssetsGenerationService {
         const color = new Color(colorString);
         const colorRgb = color.rgb();
         const alpha = Math.round(colorRgb.alpha() * 255);
-        return (0, jimp_1.rgbaToInt)(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
+        return Jimp.rgbaToInt(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
     }
 }
-exports.AssetsGenerationService = AssetsGenerationService;
 __decorate([
     (0, decorators_1.exported)("assetsGenerationService")
 ], AssetsGenerationService.prototype, "generateIcons", null);
 __decorate([
     (0, decorators_1.exported)("assetsGenerationService")
 ], AssetsGenerationService.prototype, "generateSplashScreens", null);
+exports.AssetsGenerationService = AssetsGenerationService;
 yok_1.injector.register("assetsGenerationService", AssetsGenerationService);
+//# sourceMappingURL=assets-generation-service.js.map

package/lib/services/build-artifacts-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.BuildArtifactsService = void 0;
 const path = require("path");
@@ -10,15 +19,17 @@ class BuildArtifactsService {
         this.$fs = $fs;
         this.$logger = $logger;
     }
-    async getLatestAppPackagePath(platformData, buildOutputOptions) {
-        const outputPath = buildOutputOptions.outputPath ||
-            platformData.getBuildOutputPath(buildOutputOptions);
-        const applicationPackage = this.getLatestApplicationPackage(outputPath, platformData.getValidBuildOutputData(buildOutputOptions));
-        const packageFile = applicationPackage.packageName;
-        if (!packageFile || !this.$fs.exists(packageFile)) {
-            this.$errors.fail(`Unable to find built application. Try 'ns build ${platformData.platformNameLowerCase}'.`);
-        }
-        return packageFile;
+    getLatestAppPackagePath(platformData, buildOutputOptions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const outputPath = buildOutputOptions.outputPath ||
+                platformData.getBuildOutputPath(buildOutputOptions);
+            const applicationPackage = this.getLatestApplicationPackage(outputPath, platformData.getValidBuildOutputData(buildOutputOptions));
+            const packageFile = applicationPackage.packageName;
+            if (!packageFile || !this.$fs.exists(packageFile)) {
+                this.$errors.fail(`Unable to find built application. Try 'ns build ${platformData.platformNameLowerCase}'.`);
+            }
+            return packageFile;
+        });
     }
     getAllAppPackages(buildOutputPath, validBuildOutputData) {
         const rootFiles = this.$fs
@@ -64,7 +75,7 @@ class BuildArtifactsService {
         if (packages.length > 1) {
             this.$logger.warn(`More than one ${packageExtName} found in ${buildOutputPath} directory. Using the last one produced from build.`);
         }
-        packages = _.sortBy(packages, (pkg) => pkg.time).reverse();
+        packages = _.sortBy(packages, (pkg) => pkg.time).reverse(); // We need to reverse because sortBy always sorts in ascending order
         return packages[0];
     }
     getApplicationPackagesCore(candidates, validPackageNames) {
@@ -85,3 +96,4 @@ class BuildArtifactsService {
 }
 exports.BuildArtifactsService = BuildArtifactsService;
 yok_1.injector.register("buildArtifactsService", BuildArtifactsService);
+//# sourceMappingURL=build-artifacts-service.js.map

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

@@ -18,3 +18,4 @@ class BuildDataService {
 }
 exports.BuildDataService = BuildDataService;
 yok_1.injector.register("buildDataService", BuildDataService);
+//# sourceMappingURL=build-data-service.js.map

package/lib/services/build-info-file-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.BuildInfoFileService = void 0;
 const path = require("path");
@@ -26,15 +35,17 @@ class BuildInfoFileService {
         }
         return null;
     }
-    async getDeviceBuildInfo(device, projectData) {
-        const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
-        try {
-            const deviceFileContent = await this.$mobileHelper.getDeviceFileContent(device, deviceFilePath, projectData);
-            return JSON.parse(deviceFileContent);
-        }
-        catch (e) {
-            return null;
-        }
+    getDeviceBuildInfo(device, projectData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deviceFilePath = yield this.getDeviceBuildInfoFilePath(device, projectData);
+            try {
+                const deviceFileContent = yield this.$mobileHelper.getDeviceFileContent(device, deviceFilePath, projectData);
+                return JSON.parse(deviceFileContent);
+            }
+            catch (e) {
+                return null;
+            }
+        });
     }
     saveLocalBuildInfo(platformData, buildInfoFileDirname) {
         const buildInfoFile = path.join(buildInfoFileDirname, buildInfoFileName);
@@ -45,20 +56,25 @@ class BuildInfoFileService {
         };
         this.$fs.writeJson(buildInfoFile, buildInfo);
     }
-    async saveDeviceBuildInfo(device, projectData, outputFilePath) {
-        const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
-        const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
-        await device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
+    saveDeviceBuildInfo(device, projectData, outputFilePath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deviceFilePath = yield this.getDeviceBuildInfoFilePath(device, projectData);
+            const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
+            yield device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
+        });
     }
-    async getDeviceBuildInfoFilePath(device, projectData) {
-        const platform = device.deviceInfo.platform.toLowerCase();
-        const deviceRootPath = await this.$devicePathProvider.getDeviceProjectRootPath(device, {
-            appIdentifier: projectData.projectIdentifiers[platform],
-            getDirname: true,
+    getDeviceBuildInfoFilePath(device, projectData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const platform = device.deviceInfo.platform.toLowerCase();
+            const deviceRootPath = yield this.$devicePathProvider.getDeviceProjectRootPath(device, {
+                appIdentifier: projectData.projectIdentifiers[platform],
+                getDirname: true,
+            });
+            const result = helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
+            return result;
         });
-        const result = helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
-        return result;
     }
 }
 exports.BuildInfoFileService = BuildInfoFileService;
 yok_1.injector.register("buildInfoFileService", BuildInfoFileService);
+//# sourceMappingURL=build-info-file-service.js.map

package/lib/services/cleanup-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.CleanupService = void 0;
 const path = require("path");
@@ -17,69 +26,89 @@ class CleanupService {
         this.shouldDispose = true;
         this.pathToCleanupLogFile = $options.cleanupLogFile;
     }
-    async addCleanupCommand(commandInfo) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "AddCleanCommand",
-            commandInfo,
+    addCleanupCommand(commandInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "AddCleanCommand" /* CleanupProcessMessage.AddCleanCommand */,
+                commandInfo,
+            });
         });
     }
-    async removeCleanupCommand(commandInfo) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "RemoveCleanCommand",
-            commandInfo,
+    removeCleanupCommand(commandInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "RemoveCleanCommand" /* CleanupProcessMessage.RemoveCleanCommand */,
+                commandInfo,
+            });
         });
     }
-    async addRequest(requestInfo) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "AddRequest",
-            requestInfo,
+    addRequest(requestInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "AddRequest" /* CleanupProcessMessage.AddRequest */,
+                requestInfo,
+            });
         });
     }
-    async removeRequest(requestInfo) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "RemoveRequest",
-            requestInfo,
+    removeRequest(requestInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "RemoveRequest" /* CleanupProcessMessage.RemoveRequest */,
+                requestInfo,
+            });
         });
     }
-    async addCleanupDeleteAction(filePath) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "AddDeleteFileAction",
-            filePath,
+    addCleanupDeleteAction(filePath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "AddDeleteFileAction" /* CleanupProcessMessage.AddDeleteFileAction */,
+                filePath,
+            });
         });
     }
-    async removeCleanupDeleteAction(filePath) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "RemoveDeleteFileAction",
-            filePath,
+    removeCleanupDeleteAction(filePath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "RemoveDeleteFileAction" /* CleanupProcessMessage.RemoveDeleteFileAction */,
+                filePath,
+            });
         });
     }
-    async addCleanupJS(jsCommand) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "AddJSFileToRequire",
-            jsCommand,
+    addCleanupJS(jsCommand) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "AddJSFileToRequire" /* CleanupProcessMessage.AddJSFileToRequire */,
+                jsCommand,
+            });
         });
     }
-    async removeCleanupJS(jsCommand) {
-        const cleanupProcess = await this.getCleanupProcess();
-        cleanupProcess.send({
-            messageType: "RemoveJSFileToRequire",
-            jsCommand,
+    removeCleanupJS(jsCommand) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cleanupProcess = yield this.getCleanupProcess();
+            cleanupProcess.send({
+                messageType: "RemoveJSFileToRequire" /* CleanupProcessMessage.RemoveJSFileToRequire */,
+                jsCommand,
+            });
         });
     }
-    async addKillProcess(pid) {
-        const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
-        await this.addCleanupCommand(killSpawnCommandInfo);
+    addKillProcess(pid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
+            yield this.addCleanupCommand(killSpawnCommandInfo);
+        });
     }
-    async removeKillProcess(pid) {
-        const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
-        await this.removeCleanupCommand(killSpawnCommandInfo);
+    removeKillProcess(pid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
+            yield this.removeCleanupCommand(killSpawnCommandInfo);
+        });
     }
     setCleanupLogFile(filePath) {
         this.pathToCleanupLogFile = filePath;
@@ -92,6 +121,8 @@ class CleanupService {
     setShouldDispose(shouldDispose) {
         this.shouldDispose = shouldDispose;
     }
+    // TODO: Consider extracting this method to a separate service
+    // as it has the same logic as the one used in analytics-service
     getCleanupProcess() {
         return new Promise((resolve, reject) => {
             const cleanupProcessArgs = this.getCleanupProcessArgs();
@@ -110,11 +141,12 @@ class CleanupService {
                 clearTimeout(timeoutId);
                 if (!isSettled) {
                     isSettled = true;
+                    // In case we throw error here, CLI will break its execution.
                     reject(err);
                 }
             });
             cleanupProcess.on("message", (data) => {
-                if (data === "ProcessReadyToReceive") {
+                if (data === "ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */) {
                     clearTimeout(timeoutId);
                     if (!isSettled) {
                         isSettled = true;
@@ -154,7 +186,6 @@ class CleanupService {
         };
     }
 }
-exports.CleanupService = CleanupService;
 CleanupService.CLEANUP_PROCESS_START_TIMEOUT = 10 * 1000;
 __decorate([
     (0, decorators_1.exported)("cleanupService")
@@ -162,4 +193,6 @@ __decorate([
 __decorate([
     (0, decorators_1.cache)()
 ], CleanupService.prototype, "getCleanupProcess", null);
+exports.CleanupService = CleanupService;
 yok_1.injector.register("cleanupService", CleanupService);
+//# sourceMappingURL=cleanup-service.js.map

package/lib/services/cocoapods-platform-manager.js

@@ -82,6 +82,7 @@ class CocoaPodsPlatformManager {
         _.each(allPodfiles, (podfileContent) => {
             const platformMatch = platformRowRegExp.exec(podfileContent);
             const podfilePathMatch = podfilePathRegExp.exec(podfileContent) || [];
+            // platform without version -> select it with highest priority
             if (platformMatch && platformMatch[0] && !platformMatch[2]) {
                 selectedPlatformData = {
                     version: null,
@@ -90,6 +91,7 @@ class CocoaPodsPlatformManager {
                 };
                 return false;
             }
+            // platform with version
             if (platformMatch && platformMatch[0] && platformMatch[2]) {
                 if (!selectedPlatformData ||
                     semver.gt(semver.coerce(platformMatch[2]), semver.coerce(selectedPlatformData.version))) {
@@ -104,6 +106,12 @@ class CocoaPodsPlatformManager {
         return selectedPlatformData;
     }
     shouldReplacePlatformSection(projectData, oldPodfilePlatformData, currentPodfilePlatformData) {
+        // The selected platform should be replaced in the following cases:
+        // 1. When the pod file is from App_Resources and the selected platform is not from App_Resources
+        // 2. When the pod file is from App_Resources, the selected platform is also from App_Resources
+        // and the pod's version is greater than the selected one
+        // 3. When the pod file doesn't have platform's version -> `platform :ios`
+        // 4. When the pod file has a version greater than the selected platform's version
         const appResourcesPodfilePath = path.join(projectData.getAppResourcesDirectoryPath(), "iOS", constants_1.PODFILE_NAME);
         const isFromAppResources = oldPodfilePlatformData.path !== appResourcesPodfilePath &&
             currentPodfilePlatformData.path === appResourcesPodfilePath;
@@ -135,3 +143,4 @@ class CocoaPodsPlatformManager {
 }
 exports.CocoaPodsPlatformManager = CocoaPodsPlatformManager;
 yok_1.injector.register("cocoaPodsPlatformManager", CocoaPodsPlatformManager);
+//# sourceMappingURL=cocoapods-platform-manager.js.map