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

package/lib/services/xcconfig-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.XcconfigService = void 0;
 const path = require("path");
@@ -21,20 +30,22 @@ class XcconfigService {
     getPluginsReleaseXcconfigFilePath(projectRoot) {
         return path.join(projectRoot, "plugins-release.xcconfig");
     }
-    async mergeFiles(sourceFile, destinationFile) {
-        if (!this.$fs.exists(destinationFile)) {
-            this.$fs.writeFile(destinationFile, "");
-        }
-        const escapedDestinationFile = destinationFile.replace(/'/g, "\\'");
-        const escapedSourceFile = sourceFile.replace(/'/g, "\\'");
-        const mergeScript = `require 'xcodeproj';
+    mergeFiles(sourceFile, destinationFile) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.$fs.exists(destinationFile)) {
+                this.$fs.writeFile(destinationFile, "");
+            }
+            const escapedDestinationFile = destinationFile.replace(/'/g, "\\'");
+            const escapedSourceFile = sourceFile.replace(/'/g, "\\'");
+            const mergeScript = `require 'xcodeproj';
 		userConfig = Xcodeproj::Config.new('${escapedDestinationFile}')
 		existingConfig = Xcodeproj::Config.new('${escapedSourceFile}')
 		userConfig.attributes.each do |key,|
   			existingConfig.attributes.delete(key) if (userConfig.attributes.key?(key) && existingConfig.attributes.key?(key))
 		end
 		userConfig.merge(existingConfig).save_as(Pathname.new('${escapedDestinationFile}'))`;
-        await this.$childProcess.exec(`ruby -e "${mergeScript}"`);
+            yield this.$childProcess.exec(`ruby -e "${mergeScript}"`);
+        });
     }
     readPropertyValue(xcconfigFilePath, propertyName) {
         if (this.$fs.exists(xcconfigFilePath)) {
@@ -55,6 +66,7 @@ class XcconfigService {
                 }
             });
             if (isPropertyParsed) {
+                // property can be an empty string, so we don't check for that.
                 return property;
             }
         }
@@ -63,3 +75,4 @@ class XcconfigService {
 }
 exports.XcconfigService = XcconfigService;
 yok_1.injector.register("xcconfigService", XcconfigService);
+//# sourceMappingURL=xcconfig-service.js.map

package/lib/services/xcproj-service.js

@@ -21,3 +21,4 @@ class XcprojService {
     }
 }
 yok_1.injector.register("xcprojService", XcprojService);
+//# sourceMappingURL=xcproj-service.js.map

package/lib/shared-event-bus.js

@@ -2,6 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = require("events");
 const yok_1 = require("./common/yok");
+/**
+ * Event Bus used by different services to emit state changes and
+ * allow listening for these state changes without needing a reference
+ * to the emitting service.
+ */
 class SharedEventBus extends events_1.EventEmitter {
 }
 yok_1.injector.register("sharedEventBus", SharedEventBus);
+//# sourceMappingURL=shared-event-bus.js.map

package/lib/sys-info.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.SysInfo = void 0;
 const path = require("path");
@@ -21,17 +30,19 @@ class SysInfo {
         this.$hostInfo = $hostInfo;
         this.sysInfo = null;
     }
-    async getSysInfo(config) {
-        if (!this.sysInfo) {
-            const pathToNativeScriptCliPackageJson = (config && config.pathToNativeScriptCliPackageJson) ||
-                path.join(__dirname, "..", "package.json");
-            const androidToolsInfo = config && config.androidToolsInfo;
-            this.sysInfo = await doctor_1.sysInfo.getSysInfo({
-                pathToNativeScriptCliPackageJson,
-                androidToolsInfo,
-            });
-        }
-        return this.sysInfo;
+    getSysInfo(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.sysInfo) {
+                const pathToNativeScriptCliPackageJson = (config && config.pathToNativeScriptCliPackageJson) ||
+                    path.join(__dirname, "..", "package.json");
+                const androidToolsInfo = config && config.androidToolsInfo;
+                this.sysInfo = yield doctor_1.sysInfo.getSysInfo({
+                    pathToNativeScriptCliPackageJson,
+                    androidToolsInfo,
+                });
+            }
+            return this.sysInfo;
+        });
     }
     getXcodeVersion() {
         return doctor_1.sysInfo.getXcodeVersion();
@@ -51,53 +62,60 @@ class SysInfo {
     getJavaVersionFromJavaHome() {
         return doctor_1.sysInfo.getJavaVersionFromJavaHome();
     }
-    async getSystemWarnings() {
-        const warnings = [];
-        const macOSWarningMessage = await this.getMacOSWarningMessage();
-        if (macOSWarningMessage) {
-            macOSWarningMessage.toString = function () {
-                return this.message;
-            };
-            warnings.push(macOSWarningMessage);
-        }
-        const nodeWarning = (0, verify_node_version_1.getNodeWarning)();
-        if (nodeWarning) {
-            nodeWarning.toString = function () {
-                return this.message;
-            };
-            warnings.push(nodeWarning);
-        }
-        return warnings;
+    getSystemWarnings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const warnings = [];
+            const macOSWarningMessage = yield this.getMacOSWarningMessage();
+            if (macOSWarningMessage) {
+                macOSWarningMessage.toString = function () {
+                    return this.message;
+                };
+                warnings.push(macOSWarningMessage);
+            }
+            const nodeWarning = (0, verify_node_version_1.getNodeWarning)();
+            if (nodeWarning) {
+                nodeWarning.toString = function () {
+                    return this.message;
+                };
+                warnings.push(nodeWarning);
+            }
+            return warnings;
+        });
     }
     getSupportedNodeVersionRange() {
         const pathToCLIPackageJson = path.join(__dirname, "..", "package.json");
         const jsonContent = this.$fs.readJson(pathToCLIPackageJson);
         return jsonContent && jsonContent.engines && jsonContent.engines.node;
     }
-    async getMacOSWarningMessage() {
-        const macOSVersion = await this.$hostInfo.getMacOSVersion();
-        if (macOSVersion && macOSVersion < constants_1.MacOSVersions.HighSierra) {
-            return {
-                message: (0, util_1.format)(constants_1.MacOSDeprecationStringFormat, macOSVersion),
-                severity: "high",
-            };
-        }
-        return null;
+    getMacOSWarningMessage() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const macOSVersion = yield this.$hostInfo.getMacOSVersion();
+            if (macOSVersion && macOSVersion < constants_1.MacOSVersions.HighSierra) {
+                return {
+                    message: (0, util_1.format)(constants_1.MacOSDeprecationStringFormat, macOSVersion),
+                    severity: "high" /* SystemWarningsSeverity.high */,
+                };
+            }
+            return null;
+        });
     }
-    async getXcodeWarning() {
-        const xcodeVersion = await this.getXcodeVersion();
-        if (xcodeVersion && semver.lt(semver.coerce(xcodeVersion), "11.0.0")) {
-            const message = (0, util_1.format)(constants_1.XcodeDeprecationStringFormat, xcodeVersion);
-            return message;
-        }
-        return null;
+    getXcodeWarning() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const xcodeVersion = yield this.getXcodeVersion();
+            if (xcodeVersion && semver.lt(semver.coerce(xcodeVersion), "11.0.0")) {
+                const message = (0, util_1.format)(constants_1.XcodeDeprecationStringFormat, xcodeVersion);
+                return message;
+            }
+            return null;
+        });
     }
 }
-exports.SysInfo = SysInfo;
 __decorate([
     (0, decorators_1.exported)("sysInfo")
 ], SysInfo.prototype, "getSystemWarnings", null);
 __decorate([
     (0, decorators_1.exported)("sysInfo")
 ], SysInfo.prototype, "getSupportedNodeVersionRange", null);
+exports.SysInfo = SysInfo;
 yok_1.injector.register("sysInfo", SysInfo);
+//# sourceMappingURL=sys-info.js.map

package/lib/tools/config-manipulation/config-transformer.js

@@ -55,6 +55,7 @@ class ConfigTransformer {
             const parts = key.split(".");
             const name = parts.shift();
             const property = this.getProperty(name, parent);
+            // no android key, add it to parent to root
             if (!property) {
                 return undefined;
             }
@@ -64,11 +65,14 @@ class ConfigTransformer {
             if (!_parent) {
                 return undefined;
             }
+            // add nonExistent.deep to android: {}
             return this.getProperty(parts.join("."), _parent);
         }
+        // if we have a parent, we are reading the property from it
         if (parent) {
             return parent.getProperty(key);
         }
+        // otherwise we just read it from the root exports object
         return this.getProperty(key, this.getDefaultExportValue());
     }
     addProperty(key, value, parent = null) {
@@ -102,6 +106,15 @@ class ConfigTransformer {
         else if (typeof value === "number" || typeof value === "boolean") {
             return `${value}`;
         }
+        else if (Array.isArray(value)) {
+            return `[${value.map((v) => this.createInitializer(v)).join(", ")}]`;
+        }
+        else if (typeof value === "object" && value !== null) {
+            const properties = Object.entries(value)
+                .map(([key, val]) => `${key}: ${this.createInitializer(val)}`)
+                .join(", ");
+            return `{ ${properties} }`;
+        }
         return `{}`;
     }
     setInitializerValue(initializer, newValue) {
@@ -181,15 +194,22 @@ class ConfigTransformer {
         }
         this.setInitializerValue(initializer, newValue);
     }
+    /**
+     * @internal
+     */
     getFullText() {
         return this.config.getFullText();
     }
+    /**
+     * @internal
+     */
     getValue(key) {
         return this.getPropertyValue(this.getProperty(key));
     }
     setValue(key, value) {
         const property = this.getProperty(key);
         if (!property) {
+            // add new property
             this.addProperty(key, value);
         }
         else {
@@ -199,3 +219,4 @@ class ConfigTransformer {
     }
 }
 exports.ConfigTransformer = ConfigTransformer;
+//# sourceMappingURL=config-transformer.js.map

package/lib/tools/node-modules/node-modules-builder.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.NodeModulesBuilder = void 0;
 const _ = require("lodash");
@@ -9,23 +18,26 @@ class NodeModulesBuilder {
         this.$nodeModulesDependenciesBuilder = $nodeModulesDependenciesBuilder;
         this.$pluginsService = $pluginsService;
     }
-    async prepareNodeModules({ platformData, projectData, }) {
-        let dependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(projectData.projectDir, projectData.ignoredDependencies);
-        dependencies = await platformData.platformProjectService.beforePrepareAllPlugins(projectData, dependencies);
-        const pluginsData = this.$pluginsService.getAllProductionPlugins(projectData, platformData.platformNameLowerCase, dependencies);
-        if (_.isEmpty(pluginsData)) {
-            return;
-        }
-        for (let i = 0; i < pluginsData.length; i++) {
-            const pluginData = pluginsData[i];
-            await this.$pluginsService.preparePluginNativeCode({
-                pluginData,
-                platform: platformData.normalizedPlatformName.toLowerCase(),
-                projectData,
-            });
-            this.$logger.trace(`Successfully prepared plugin ${pluginData.name} for ${platformData.normalizedPlatformName.toLowerCase()}.`);
-        }
+    prepareNodeModules({ platformData, projectData, }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let dependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(projectData.projectDir, projectData.ignoredDependencies);
+            dependencies = yield platformData.platformProjectService.beforePrepareAllPlugins(projectData, dependencies);
+            const pluginsData = this.$pluginsService.getAllProductionPlugins(projectData, platformData.platformNameLowerCase, dependencies);
+            if (_.isEmpty(pluginsData)) {
+                return;
+            }
+            for (let i = 0; i < pluginsData.length; i++) {
+                const pluginData = pluginsData[i];
+                yield this.$pluginsService.preparePluginNativeCode({
+                    pluginData,
+                    platform: platformData.normalizedPlatformName.toLowerCase(),
+                    projectData,
+                });
+                this.$logger.trace(`Successfully prepared plugin ${pluginData.name} for ${platformData.normalizedPlatformName.toLowerCase()}.`);
+            }
+        });
     }
 }
 exports.NodeModulesBuilder = NodeModulesBuilder;
 yok_1.injector.register("nodeModulesBuilder", NodeModulesBuilder);
+//# sourceMappingURL=node-modules-builder.js.map

package/lib/tools/node-modules/node-modules-dependencies-builder.js

@@ -56,14 +56,18 @@ class NodeModulesDependenciesBuilder {
             let modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
                 paths: [parentModulesPath],
             });
+            // perhaps traverse up the tree here?
             if (!modulePath) {
+                // fallback to searching in the root path
                 modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
                     paths: [rootPath],
                 });
             }
+            // if we failed to find the module...
             if (!modulePath) {
                 return null;
             }
+            // if we already resolved this dependency, we return null to avoid a duplicate resolution
             if (resolvedDependencies.some((r) => {
                 return r.name === depDescription.name && r.directory === modulePath;
             })) {
@@ -88,6 +92,7 @@ class NodeModulesDependenciesBuilder {
             const packageJsonContents = this.$fs.readJson(packageJsonPath);
             dependency.version = packageJsonContents.version;
             if (!!packageJsonContents.nativescript) {
+                // add `nativescript` property, necessary for resolving plugins
                 dependency.nativescript = packageJsonContents.nativescript;
             }
             dependency.dependencies = _.keys(packageJsonContents.dependencies);
@@ -98,3 +103,4 @@ class NodeModulesDependenciesBuilder {
 }
 exports.NodeModulesDependenciesBuilder = NodeModulesDependenciesBuilder;
 yok_1.injector.register("nodeModulesDependenciesBuilder", NodeModulesDependenciesBuilder);
+//# sourceMappingURL=node-modules-dependencies-builder.js.map

package/lib/yarn-package-manager.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.YarnPackageManager = void 0;
 const path = require("path");
@@ -19,31 +28,33 @@ class YarnPackageManager extends base_package_manager_1.BasePackageManager {
         this.$httpClient = $httpClient;
         this.$logger = $logger;
     }
-    async install(packageName, pathToSave, config) {
-        if (config.disableNpmInstall) {
-            return;
-        }
-        if (config.ignoreScripts) {
-            config["ignore-scripts"] = true;
-        }
-        const packageJsonPath = path.join(pathToSave, "package.json");
-        const jsonContentBefore = this.$fs.readJson(packageJsonPath);
-        const flags = this.getFlagsString(config, true);
-        let params = [];
-        const isInstallingAllDependencies = packageName === pathToSave;
-        if (!isInstallingAllDependencies) {
-            params.push("add", packageName);
-        }
-        params = params.concat(flags);
-        const cwd = pathToSave;
-        try {
-            const result = await this.processPackageManagerInstall(packageName, params, { cwd, isInstallingAllDependencies });
-            return result;
-        }
-        catch (e) {
-            this.$fs.writeJson(packageJsonPath, jsonContentBefore);
-            throw e;
-        }
+    install(packageName, pathToSave, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (config.disableNpmInstall) {
+                return;
+            }
+            if (config.ignoreScripts) {
+                config["ignore-scripts"] = true;
+            }
+            const packageJsonPath = path.join(pathToSave, "package.json");
+            const jsonContentBefore = this.$fs.readJson(packageJsonPath);
+            const flags = this.getFlagsString(config, true);
+            let params = [];
+            const isInstallingAllDependencies = packageName === pathToSave;
+            if (!isInstallingAllDependencies) {
+                params.push("add", packageName);
+            }
+            params = params.concat(flags);
+            const cwd = pathToSave;
+            try {
+                const result = yield this.processPackageManagerInstall(packageName, params, { cwd, isInstallingAllDependencies });
+                return result;
+            }
+            catch (e) {
+                this.$fs.writeJson(packageJsonPath, jsonContentBefore);
+                throw e;
+            }
+        });
     }
     uninstall(packageName, config, cwd) {
         const flags = this.getFlagsString(config, false);
@@ -51,49 +62,56 @@ class YarnPackageManager extends base_package_manager_1.BasePackageManager {
             cwd,
         });
     }
-    async view(packageName, config) {
-        const wrappedConfig = _.extend({}, config, { json: true });
-        const flags = this.getFlagsString(wrappedConfig, false);
-        let viewResult;
-        try {
-            viewResult = await this.$childProcess.exec(`yarn info ${packageName} ${flags}`);
-        }
-        catch (e) {
-            this.$errors.fail(e.message);
-        }
-        try {
-            const result = JSON.parse(viewResult);
-            return result.data;
-        }
-        catch (err) {
-            return null;
-        }
+    view(packageName, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const wrappedConfig = _.extend({}, config, { json: true });
+            const flags = this.getFlagsString(wrappedConfig, false);
+            let viewResult;
+            try {
+                viewResult = yield this.$childProcess.exec(`yarn info ${packageName} ${flags}`);
+            }
+            catch (e) {
+                this.$errors.fail(e.message);
+            }
+            try {
+                const result = JSON.parse(viewResult);
+                return result.data;
+            }
+            catch (err) {
+                return null;
+            }
+        });
     }
     search(filter, config) {
         this.$errors.fail("Method not implemented. Yarn does not support searching for packages in the registry.");
         return null;
     }
-    async searchNpms(keyword) {
-        const httpRequestResult = await this.$httpClient.httpRequest(`https://api.npms.io/v2/search?q=keywords:${keyword}`);
-        const result = JSON.parse(httpRequestResult.body);
-        return result;
+    searchNpms(keyword) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const httpRequestResult = yield this.$httpClient.httpRequest(`https://api.npms.io/v2/search?q=keywords:${keyword}`);
+            const result = JSON.parse(httpRequestResult.body);
+            return result;
+        });
     }
-    async getRegistryPackageData(packageName) {
-        const registry = await this.$childProcess.exec(`yarn config get registry`);
-        const url = `${registry.trim()}/${packageName}`;
-        this.$logger.trace(`Trying to get data from yarn registry for package ${packageName}, url is: ${url}`);
-        const responseData = (await this.$httpClient.httpRequest(url)).body;
-        this.$logger.trace(`Successfully received data from yarn registry for package ${packageName}. Response data is: ${responseData}`);
-        const jsonData = JSON.parse(responseData);
-        this.$logger.trace(`Successfully parsed data from yarn registry for package ${packageName}.`);
-        return jsonData;
+    getRegistryPackageData(packageName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const registry = yield this.$childProcess.exec(`yarn config get registry`);
+            const url = `${registry.trim()}/${packageName}`;
+            this.$logger.trace(`Trying to get data from yarn registry for package ${packageName}, url is: ${url}`);
+            const responseData = (yield this.$httpClient.httpRequest(url)).body;
+            this.$logger.trace(`Successfully received data from yarn registry for package ${packageName}. Response data is: ${responseData}`);
+            const jsonData = JSON.parse(responseData);
+            this.$logger.trace(`Successfully parsed data from yarn registry for package ${packageName}.`);
+            return jsonData;
+        });
     }
-    async getCachePath() {
-        const result = await this.$childProcess.exec(`yarn cache dir`);
-        return result.toString().trim();
+    getCachePath() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield this.$childProcess.exec(`yarn cache dir`);
+            return result.toString().trim();
+        });
     }
 }
-exports.YarnPackageManager = YarnPackageManager;
 __decorate([
     (0, decorators_1.exported)("yarn")
 ], YarnPackageManager.prototype, "install", null);
@@ -112,4 +130,6 @@ __decorate([
 __decorate([
     (0, decorators_1.exported)("yarn")
 ], YarnPackageManager.prototype, "getCachePath", null);
+exports.YarnPackageManager = YarnPackageManager;
 yok_1.injector.register("yarn", YarnPackageManager);
+//# sourceMappingURL=yarn-package-manager.js.map