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

package/lib/pnpm-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.PnpmPackageManager = void 0;
 const path = require("path");
@@ -20,82 +29,93 @@ class PnpmPackageManager extends base_package_manager_1.BasePackageManager {
         this.$httpClient = $httpClient;
         this.$logger = $logger;
     }
-    async install(packageName, pathToSave, config) {
-        if (config.disableNpmInstall) {
-            return;
-        }
-        delete config.dev;
-        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 = ["i", "--shamefully-hoist"];
-        const isInstallingAllDependencies = packageName === pathToSave;
-        if (!isInstallingAllDependencies) {
-            params.push(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;
+            }
+            delete config.dev; // temporary fix for unsupported yarn flag
+            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);
+            // With pnpm we need to install as "flat" or some imports wont be found
+            let params = ["i", "--shamefully-hoist"];
+            const isInstallingAllDependencies = packageName === pathToSave;
+            if (!isInstallingAllDependencies) {
+                params.push(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) {
+        // pnpm does not want save option in remove. It saves it by default
         delete config["save"];
         const flags = this.getFlagsString(config, false);
         return this.$childProcess.exec(`pnpm remove ${packageName} ${flags}`, {
             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(`pnpm info ${packageName} ${flags}`);
-        }
-        catch (e) {
-            this.$errors.fail(e.message);
-        }
-        try {
-            return JSON.parse(viewResult);
-        }
-        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(`pnpm info ${packageName} ${flags}`);
+            }
+            catch (e) {
+                this.$errors.fail(e.message);
+            }
+            try {
+                return JSON.parse(viewResult);
+            }
+            catch (err) {
+                return null;
+            }
+        });
     }
     search(filter, config) {
         const flags = this.getFlagsString(config, false);
         return this.$childProcess.exec(`pnpm search ${filter.join(" ")} ${flags}`);
     }
-    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(`pnpm config get registry`);
-        const url = `${registry.trim()}/${packageName}`;
-        this.$logger.trace(`Trying to get data from pnpm registry for package ${packageName}, url is: ${url}`);
-        const responseData = (await this.$httpClient.httpRequest(url)).body;
-        this.$logger.trace(`Successfully received data from pnpm registry for package ${packageName}. Response data is: ${responseData}`);
-        const jsonData = JSON.parse(responseData);
-        this.$logger.trace(`Successfully parsed data from pnpm registry for package ${packageName}.`);
-        return jsonData;
+    getRegistryPackageData(packageName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const registry = yield this.$childProcess.exec(`pnpm config get registry`);
+            const url = `${registry.trim()}/${packageName}`;
+            this.$logger.trace(`Trying to get data from pnpm registry for package ${packageName}, url is: ${url}`);
+            const responseData = (yield this.$httpClient.httpRequest(url)).body;
+            this.$logger.trace(`Successfully received data from pnpm registry for package ${packageName}. Response data is: ${responseData}`);
+            const jsonData = JSON.parse(responseData);
+            this.$logger.trace(`Successfully parsed data from pnpm registry for package ${packageName}.`);
+            return jsonData;
+        });
     }
-    async getCachePath() {
-        const cachePath = await this.$childProcess.exec(`pnpm config get cache`);
-        return path.join(cachePath.trim(), constants_1.CACACHE_DIRECTORY_NAME);
+    getCachePath() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cachePath = yield this.$childProcess.exec(`pnpm config get cache`);
+            return path.join(cachePath.trim(), constants_1.CACACHE_DIRECTORY_NAME);
+        });
     }
 }
-exports.PnpmPackageManager = PnpmPackageManager;
 __decorate([
     (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "install", null);
@@ -114,4 +134,6 @@ __decorate([
 __decorate([
     (0, decorators_1.exported)("pnpm")
 ], PnpmPackageManager.prototype, "getCachePath", null);
+exports.PnpmPackageManager = PnpmPackageManager;
 yok_1.injector.register("pnpm", PnpmPackageManager);
+//# sourceMappingURL=pnpm-package-manager.js.map

package/lib/project-data.js

@@ -19,6 +19,7 @@ class ProjectData {
         this.warnProjectId();
         return this.projectIdentifiers.ios;
     }
+    //just in case hook/extension modifies it.
     set projectId(identifier) {
         this.warnProjectId();
         this.projectIdentifiers.ios = identifier;
@@ -44,6 +45,7 @@ class ProjectData {
             return;
         }
         projectDir = projectDir || this.$projectHelper.projectDir;
+        // If no project found, projectDir should be null
         if (projectDir) {
             const projectFilePath = this.getProjectFilePath(projectDir);
             if (this.$fs.exists(projectFilePath)) {
@@ -110,6 +112,7 @@ class ProjectData {
     errorInvalidProject(projectDir) {
         const currentDir = path.resolve(".");
         this.$logger.trace(`Unable to find project. projectDir: ${projectDir}, options.path: ${this.$options.path}, ${currentDir}`);
+        // This is the case when no project file found
         this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", projectDir || this.$options.path || currentDir);
     }
     getProjectFilePath(projectDir) {
@@ -125,6 +128,10 @@ class ProjectData {
             return this.nsConfig[constants.CONFIG_NS_APP_RESOURCES_ENTRY];
         }
         return constants.APP_RESOURCES_FOLDER_NAME;
+        // return path.join(
+        // 	this.getAppDirectoryRelativePath(),
+        // 	constants.APP_RESOURCES_FOLDER_NAME
+        // );
     }
     getAppDirectoryPath(projectDir) {
         const appRelativePath = this.getAppDirectoryRelativePath();
@@ -138,6 +145,7 @@ class ProjectData {
             return constants.SRC_DIR;
         }
         else {
+            // legacy project setup often uses app folder
             return constants.APP_FOLDER_NAME;
         }
     }
@@ -194,7 +202,9 @@ class ProjectData {
         this.$logger.warn("[WARNING]: IProjectData.projectId is deprecated. Please use IProjectData.projectIdentifiers[platform].");
     }
 }
-exports.ProjectData = ProjectData;
+/**
+ * NOTE: Order of the elements is important as the TypeScript dependencies are commonly included in Angular project as well.
+ */
 ProjectData.PROJECT_TYPES = [
     {
         type: constants.ProjectTypes.JsFlavorName,
@@ -231,4 +241,6 @@ __decorate([
 __decorate([
     (0, decorators_1.cache)()
 ], ProjectData.prototype, "warnProjectId", null);
+exports.ProjectData = ProjectData;
 yok_1.injector.register("projectData", ProjectData, true);
+//# sourceMappingURL=project-data.js.map

package/lib/providers/project-files-provider.js

@@ -41,6 +41,7 @@ class ProjectFilesProvider extends project_files_provider_base_1.ProjectFilesPro
         return !!_.find(ProjectFilesProvider.INTERNAL_NONPROJECT_FILES, (pattern) => (0, minimatch_1.minimatch)(filePath, pattern, { nocase: true }));
     }
 }
-exports.ProjectFilesProvider = ProjectFilesProvider;
 ProjectFilesProvider.INTERNAL_NONPROJECT_FILES = ["**/*.ts"];
+exports.ProjectFilesProvider = ProjectFilesProvider;
 yok_1.injector.register("projectFilesProvider", ProjectFilesProvider);
+//# sourceMappingURL=project-files-provider.js.map

package/lib/resolvers/livesync-service-resolver.js

@@ -20,3 +20,4 @@ class LiveSyncServiceResolver {
 }
 exports.LiveSyncServiceResolver = LiveSyncServiceResolver;
 yok_1.injector.register("liveSyncServiceResolver", LiveSyncServiceResolver);
+//# sourceMappingURL=livesync-service-resolver.js.map

package/lib/services/analytics/analytics-broker-process.js

@@ -1,5 +1,16 @@
 "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 });
+// NOTE: This file is used to track data in a separate process.
+// The instances here are not shared with the ones in main CLI process.
 const fs = require("fs");
 const analytics_broker_1 = require("./analytics-broker");
 const file_log_service_1 = require("../../detached-processes/file-log-service");
@@ -9,6 +20,7 @@ if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
     throw new Error("Invalid path to bootstrap.");
 }
 const logFile = process.argv[3];
+// After requiring the bootstrap we can use $injector
 require(pathToBootstrap);
 const analyticsLoggingService = yok_1.injector.resolve(file_log_service_1.FileLogService, { logFile });
 analyticsLoggingService.logData({ message: "Initializing AnalyticsBroker." });
@@ -17,52 +29,53 @@ const analyticsBroker = yok_1.injector.resolve(analytics_broker_1.AnalyticsBroke
     analyticsLoggingService,
 });
 let trackingQueue = Promise.resolve();
-const sendDataForTracking = async (data) => {
+const sendDataForTracking = (data) => __awaiter(void 0, void 0, void 0, function* () {
     trackingQueue = trackingQueue.then(() => analyticsBroker.sendDataForTracking(data));
-    await trackingQueue;
-};
-const finishTracking = async (data) => {
+    yield trackingQueue;
+});
+const finishTracking = (data) => __awaiter(void 0, void 0, void 0, function* () {
     analyticsLoggingService.logData({
         message: `analytics-broker-process finish tracking started`,
     });
-    await trackingQueue;
+    yield trackingQueue;
     analyticsLoggingService.logData({
         message: `analytics-broker-process tracking finished`,
     });
-};
+});
 const killCurrentProcessGracefully = () => {
     yok_1.injector.dispose();
     process.exit();
 };
-process.on("message", async (data) => {
+process.on("message", (data) => __awaiter(void 0, void 0, void 0, function* () {
     analyticsLoggingService.logData({
         message: `analytics-broker-process received message of type: ${JSON.stringify(data)}`,
     });
-    if (data.type === "FinishTracking") {
-        await finishTracking();
+    if (data.type === "FinishTracking" /* TrackingTypes.FinishTracking */) {
+        yield finishTracking();
         if (process.connected) {
             analyticsLoggingService.logData({
-                message: `analytics-broker-process will send ${"ProcessFinishedTasks"} message`,
+                message: `analytics-broker-process will send ${"ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */} message`,
             });
-            process.send("ProcessFinishedTasks", () => {
+            process.send("ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */, () => {
                 analyticsLoggingService.logData({
-                    message: `analytics-broker-process sent ${"ProcessFinishedTasks"} message and will exit gracefully now`,
+                    message: `analytics-broker-process sent ${"ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */} message and will exit gracefully now`,
                 });
                 killCurrentProcessGracefully();
             });
         }
         return;
     }
-    await sendDataForTracking(data);
-});
-process.on("disconnect", async () => {
+    yield sendDataForTracking(data);
+}));
+process.on("disconnect", () => __awaiter(void 0, void 0, void 0, function* () {
     analyticsLoggingService.logData({
         message: "analytics-broker-process received process.disconnect event",
     });
-    await finishTracking();
+    yield finishTracking();
     killCurrentProcessGracefully();
-});
+}));
 analyticsLoggingService.logData({
-    message: `analytics-broker-process will send ${"ProcessReadyToReceive"} message`,
+    message: `analytics-broker-process will send ${"ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */} message`,
 });
-process.send("ProcessReadyToReceive");
+process.send("ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */);
+//# sourceMappingURL=analytics-broker-process.js.map

package/lib/services/analytics/analytics-broker.js

@@ -5,15 +5,26 @@ 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.AnalyticsBroker = void 0;
 const decorators_1 = require("../../common/decorators");
 class AnalyticsBroker {
-    async getGoogleAnalyticsProvider() {
-        const clientId = await this.$analyticsSettingsService.getClientId();
-        return this.$injector.resolve("googleAnalyticsProvider", {
-            clientId,
-            analyticsLoggingService: this.analyticsLoggingService,
+    getGoogleAnalyticsProvider() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clientId = yield this.$analyticsSettingsService.getClientId();
+            return this.$injector.resolve("googleAnalyticsProvider", {
+                clientId,
+                analyticsLoggingService: this.analyticsLoggingService,
+            });
         });
     }
     constructor($analyticsSettingsService, $injector, analyticsLoggingService) {
@@ -21,20 +32,23 @@ class AnalyticsBroker {
         this.$injector = $injector;
         this.analyticsLoggingService = analyticsLoggingService;
     }
-    async sendDataForTracking(trackInfo) {
-        try {
-            const googleProvider = await this.getGoogleAnalyticsProvider();
-            await googleProvider.trackHit(trackInfo);
-        }
-        catch (err) {
-            this.analyticsLoggingService.logData({
-                message: `AnalyticsBroker unable to execute action in sendDataForTracking: ${err}`,
-                type: "Error",
-            });
-        }
+    sendDataForTracking(trackInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const googleProvider = yield this.getGoogleAnalyticsProvider();
+                yield googleProvider.trackHit(trackInfo);
+            }
+            catch (err) {
+                this.analyticsLoggingService.logData({
+                    message: `AnalyticsBroker unable to execute action in sendDataForTracking: ${err}`,
+                    type: "Error" /* FileLogMessageType.Error */,
+                });
+            }
+        });
     }
 }
-exports.AnalyticsBroker = AnalyticsBroker;
 __decorate([
     (0, decorators_1.cache)()
 ], AnalyticsBroker.prototype, "getGoogleAnalyticsProvider", null);
+exports.AnalyticsBroker = AnalyticsBroker;
+//# sourceMappingURL=analytics-broker.js.map