nativescript 9.1.0-alpha.15 → 9.1.0-alpha.16

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

@@ -1,17 +1,16 @@
 "use strict";
 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");
 const yok_1 = require("../../common/yok");
+const enums_1 = require("../../common/enums");
+const detached_process_enums_1 = require("../../detached-processes/detached-process-enums");
 const pathToBootstrap = process.argv[2];
 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." });
@@ -41,15 +40,15 @@ process.on("message", async (data) => {
     analyticsLoggingService.logData({
         message: `analytics-broker-process received message of type: ${JSON.stringify(data)}`,
     });
-    if (data.type === "FinishTracking" /* TrackingTypes.FinishTracking */) {
+    if (data.type === enums_1.TrackingTypes.FinishTracking) {
         await finishTracking();
         if (process.connected) {
             analyticsLoggingService.logData({
-                message: `analytics-broker-process will send ${"ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */} message`,
+                message: `analytics-broker-process will send ${detached_process_enums_1.DetachedProcessMessages.ProcessFinishedTasks} message`,
             });
-            process.send("ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */, null, null, () => {
+            process.send(detached_process_enums_1.DetachedProcessMessages.ProcessFinishedTasks, null, null, () => {
                 analyticsLoggingService.logData({
-                    message: `analytics-broker-process sent ${"ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */} message and will exit gracefully now`,
+                    message: `analytics-broker-process sent ${detached_process_enums_1.DetachedProcessMessages.ProcessFinishedTasks} message and will exit gracefully now`,
                 });
                 killCurrentProcessGracefully();
             });
@@ -66,7 +65,6 @@ process.on("disconnect", async () => {
     killCurrentProcessGracefully();
 });
 analyticsLoggingService.logData({
-    message: `analytics-broker-process will send ${"ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */} message`,
+    message: `analytics-broker-process will send ${detached_process_enums_1.DetachedProcessMessages.ProcessReadyToReceive} message`,
 });
-process.send("ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */);
-//# sourceMappingURL=analytics-broker-process.js.map
+process.send(detached_process_enums_1.DetachedProcessMessages.ProcessReadyToReceive);

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

@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticsBroker = void 0;
 const decorators_1 = require("../../common/decorators");
+const detached_process_enums_1 = require("../../detached-processes/detached-process-enums");
 class AnalyticsBroker {
     async getGoogleAnalyticsProvider() {
         const clientId = await this.$analyticsSettingsService.getClientId();
@@ -29,7 +30,7 @@ class AnalyticsBroker {
         catch (err) {
             this.analyticsLoggingService.logData({
                 message: `AnalyticsBroker unable to execute action in sendDataForTracking: ${err}`,
-                type: "Error" /* FileLogMessageType.Error */,
+                type: detached_process_enums_1.FileLogMessageType.Error,
             });
         }
     }
@@ -38,4 +39,3 @@ exports.AnalyticsBroker = AnalyticsBroker;
 __decorate([
     (0, decorators_1.cache)()
 ], AnalyticsBroker.prototype, "getGoogleAnalyticsProvider", null);
-//# sourceMappingURL=analytics-broker.js.map

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

@@ -12,7 +12,11 @@ const _ = require("lodash");
 const decorators_1 = require("../../common/decorators");
 const helpers_1 = require("../../common/helpers");
 const constants_1 = require("../../common/constants");
+const constants_2 = require("../../constants");
+const enums_1 = require("../../common/enums");
 const yok_1 = require("../../common/yok");
+const detached_process_enums_1 = require("../../detached-processes/detached-process-enums");
+const google_analytics_custom_dimensions_1 = require("../../common/services/analytics/google-analytics-custom-dimensions");
 class AnalyticsService {
     constructor($logger, $options, $staticConfig, $prompter, $userSettingsService, $analyticsSettingsService, $childProcess, $projectDataService, $mobileHelper, $projectHelper) {
         this.$logger = $logger;
@@ -34,7 +38,7 @@ class AnalyticsService {
     async checkConsent() {
         if (await this.$analyticsSettingsService.canDoRequest()) {
             const initialTrackFeatureUsageStatus = await this.getStatus(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME);
-            let trackFeatureUsage = initialTrackFeatureUsageStatus === "enabled" /* AnalyticsStatus.enabled */;
+            let trackFeatureUsage = initialTrackFeatureUsageStatus === enums_1.AnalyticsStatus.enabled;
             if ((await this.isNotConfirmed(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) &&
                 (0, helpers_1.isInteractive)()) {
                 const message = `Do you want to help us improve ${this.$analyticsSettingsService.getClientName()} by automatically sending anonymous usage statistics? We will not use this information to identify or contact you.`;
@@ -53,13 +57,13 @@ class AnalyticsService {
     }
     async setStatus(settingName, enabled) {
         this.analyticsStatuses[settingName] = enabled
-            ? "enabled" /* AnalyticsStatus.enabled */
-            : "disabled" /* AnalyticsStatus.disabled */;
+            ? enums_1.AnalyticsStatus.enabled
+            : enums_1.AnalyticsStatus.disabled;
         await this.$userSettingsService.saveSetting(settingName, enabled.toString());
     }
     async isEnabled(settingName) {
         const analyticsStatus = await this.getStatus(settingName);
-        return analyticsStatus === "enabled" /* AnalyticsStatus.enabled */;
+        return analyticsStatus === enums_1.AnalyticsStatus.enabled;
     }
     getStatusMessage(settingName, jsonFormat, readableSettingName) {
         if (jsonFormat) {
@@ -70,8 +74,8 @@ class AnalyticsService {
     async trackAcceptFeatureUsage(settings) {
         const acceptTracking = !!(settings && settings.acceptTrackFeatureUsage);
         const googleAnalyticsEventData = {
-            googleAnalyticsDataType: "event" /* GoogleAnalyticsDataType.Event */,
-            action: "Accept Tracking" /* TrackActionNames.AcceptTracking */,
+            googleAnalyticsDataType: enums_1.GoogleAnalyticsDataType.Event,
+            action: constants_2.TrackActionNames.AcceptTracking,
             label: acceptTracking.toString(),
         };
         await this.forcefullyTrackInGoogleAnalytics(googleAnalyticsEventData);
@@ -79,7 +83,7 @@ class AnalyticsService {
     async trackInGoogleAnalytics(gaSettings) {
         await this.initAnalyticsStatuses();
         if (!this.$staticConfig.disableAnalytics &&
-            this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === "enabled" /* AnalyticsStatus.enabled */) {
+            this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === enums_1.AnalyticsStatus.enabled) {
             return this.forcefullyTrackInGoogleAnalytics(gaSettings);
         }
     }
@@ -92,8 +96,6 @@ class AnalyticsService {
         const isForDevice = device ? !device.isEmulator : data.isForDevice;
         let label = "";
         label = this.addDataToLabel(label, normalizedPlatform);
-        // In some cases (like in case action is Build and platform is Android), we do not know if the deviceType is emulator or device.
-        // Just exclude the device_type in this case.
         if (isForDevice !== null && isForDevice !== undefined) {
             const deviceType = isForDevice
                 ? constants_1.DeviceTypes.Device
@@ -111,7 +113,7 @@ class AnalyticsService {
         const customDimensions = {};
         this.setProjectRelatedCustomDimensions(customDimensions, data.projectDir);
         const googleAnalyticsEventData = {
-            googleAnalyticsDataType: "event" /* GoogleAnalyticsDataType.Event */,
+            googleAnalyticsDataType: enums_1.GoogleAnalyticsDataType.Event,
             action: data.action,
             label,
             customDimensions,
@@ -124,7 +126,7 @@ class AnalyticsService {
             if (this.brokerProcess && this.brokerProcess.connected) {
                 let timer;
                 const handler = (data) => {
-                    if (data === "ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */) {
+                    if (data === detached_process_enums_1.DetachedProcessMessages.ProcessFinishedTasks) {
                         this.brokerProcess.removeListener("message", handler);
                         clearTimeout(timer);
                         resolve();
@@ -135,7 +137,7 @@ class AnalyticsService {
                     resolve();
                 }, 3000);
                 this.brokerProcess.on("message", handler);
-                const msg = { type: "FinishTracking" /* TrackingTypes.FinishTracking */ };
+                const msg = { type: enums_1.TrackingTypes.FinishTracking };
                 this.brokerProcess.send(msg, (err) => this.$logger.trace(`Error while sending ${JSON.stringify(msg)}`));
             }
             else {
@@ -145,13 +147,13 @@ class AnalyticsService {
     }
     forcefullyTrackInGoogleAnalytics(gaSettings) {
         gaSettings.customDimensions = gaSettings.customDimensions || {};
-        gaSettings.customDimensions["cd5" /* GoogleAnalyticsCustomDimensions.client */] =
+        gaSettings.customDimensions[google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.client] =
             this.$options.analyticsClient ||
-                ((0, helpers_1.isInteractive)() ? "CLI" /* AnalyticsClients.Cli */ : "Unknown" /* AnalyticsClients.Unknown */);
+                ((0, helpers_1.isInteractive)() ? constants_1.AnalyticsClients.Cli : constants_1.AnalyticsClients.Unknown);
         this.setProjectRelatedCustomDimensions(gaSettings.customDimensions);
         const googleAnalyticsData = _.merge({
-            type: "googleAnalyticsData" /* TrackingTypes.GoogleAnalyticsData */,
-            category: "CLI" /* AnalyticsClients.Cli */,
+            type: enums_1.TrackingTypes.GoogleAnalyticsData,
+            category: constants_1.AnalyticsClients.Cli,
         }, gaSettings);
         this.$logger.trace("Will send the following information to Google Analytics:", googleAnalyticsData);
         return this.sendMessageToBroker(googleAnalyticsData);
@@ -162,15 +164,14 @@ class AnalyticsService {
                 projectDir = this.$projectHelper.projectDir;
             }
             catch (err) {
-                // In case there's no project dir here, the above getter will fail.
                 this.$logger.trace("Unable to get the projectDir from projectHelper", err);
             }
         }
         if (projectDir) {
             const projectData = this.$projectDataService.getProjectData(projectDir);
-            customDimensions["cd2" /* GoogleAnalyticsCustomDimensions.projectType */] =
+            customDimensions[google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.projectType] =
                 projectData.projectType;
-            customDimensions["cd9" /* GoogleAnalyticsCustomDimensions.isShared */] =
+            customDimensions[google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.isShared] =
                 projectData.isShared.toString();
         }
         return customDimensions;
@@ -208,7 +209,7 @@ class AnalyticsService {
                 }
             });
             broker.on("message", (data) => {
-                if (data === "ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */) {
+                if (data === detached_process_enums_1.DetachedProcessMessages.ProcessReadyToReceive) {
                     clearTimeout(timeoutId);
                     if (!isSettled) {
                         isSettled = true;
@@ -232,7 +233,7 @@ class AnalyticsService {
     async sendInfoForTracking(trackingInfo, settingName) {
         await this.initAnalyticsStatuses();
         if (!this.$staticConfig.disableAnalytics &&
-            this.analyticsStatuses[settingName] === "enabled" /* AnalyticsStatus.enabled */) {
+            this.analyticsStatuses[settingName] === enums_1.AnalyticsStatus.enabled) {
             return this.sendMessageToBroker(trackingInfo);
         }
     }
@@ -280,21 +281,21 @@ class AnalyticsService {
             if (settingValue) {
                 const isEnabled = (0, helpers_1.toBoolean)(settingValue);
                 if (isEnabled) {
-                    this.analyticsStatuses[settingName] = "enabled" /* AnalyticsStatus.enabled */;
+                    this.analyticsStatuses[settingName] = enums_1.AnalyticsStatus.enabled;
                 }
                 else {
-                    this.analyticsStatuses[settingName] = "disabled" /* AnalyticsStatus.disabled */;
+                    this.analyticsStatuses[settingName] = enums_1.AnalyticsStatus.disabled;
                 }
             }
             else {
-                this.analyticsStatuses[settingName] = "not confirmed" /* AnalyticsStatus.notConfirmed */;
+                this.analyticsStatuses[settingName] = enums_1.AnalyticsStatus.notConfirmed;
             }
         }
         return this.analyticsStatuses[settingName];
     }
     async isNotConfirmed(settingName) {
         const analyticsStatus = await this.getStatus(settingName);
-        return analyticsStatus === "not confirmed" /* AnalyticsStatus.notConfirmed */;
+        return analyticsStatus === enums_1.AnalyticsStatus.notConfirmed;
     }
     async getHumanReadableStatusMessage(settingName, readableSettingName) {
         let status = null;
@@ -308,14 +309,14 @@ class AnalyticsService {
     }
     async getJsonStatusMessage(settingName) {
         const status = await this.getStatus(settingName);
-        const enabled = status === "not confirmed" /* AnalyticsStatus.notConfirmed */
+        const enabled = status === enums_1.AnalyticsStatus.notConfirmed
             ? null
-            : status === "enabled" /* AnalyticsStatus.enabled */;
+            : status === enums_1.AnalyticsStatus.enabled;
         return JSON.stringify({ enabled });
     }
     trackException(exception, message) {
         const data = {
-            type: "exception" /* TrackingTypes.Exception */,
+            type: enums_1.TrackingTypes.Exception,
             exception,
             message,
         };
@@ -331,4 +332,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], AnalyticsService.prototype, "initAnalyticsStatuses", null);
 yok_1.injector.register("analyticsService", AnalyticsService);
-//# sourceMappingURL=analytics-service.js.map

package/lib/services/analytics/google-analytics-provider.js

@@ -9,9 +9,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleAnalyticsProvider = void 0;
 const uuid_1 = require("uuid");
 const ua = require("universal-analytics");
+const constants_1 = require("../../common/constants");
 const decorators_1 = require("../../common/decorators");
+const enums_1 = require("../../common/enums");
 const _ = require("lodash");
 const yok_1 = require("../../common/yok");
+const detached_process_enums_1 = require("../../detached-processes/detached-process-enums");
+const google_analytics_custom_dimensions_1 = require("../../common/services/analytics/google-analytics-custom-dimensions");
 class GoogleAnalyticsProvider {
     constructor(clientId, $staticConfig, $analyticsSettingsService, $logger, $proxyService, $config, analyticsLoggingService) {
         this.clientId = clientId;
@@ -29,7 +33,7 @@ class GoogleAnalyticsProvider {
         }
         catch (e) {
             this.analyticsLoggingService.logData({
-                type: "Error" /* FileLogMessageType.Error */,
+                type: detached_process_enums_1.FileLogMessageType.Error,
                 message: `Unable to track information ${JSON.stringify(trackInfo)}. Error is: ${e}`,
             });
             this.$logger.trace("Analytics exception: ", e);
@@ -61,23 +65,23 @@ class GoogleAnalyticsProvider {
         const visitor = this.getVisitor(gaTrackingId, proxy);
         await this.setCustomDimensions(visitor, trackInfo.customDimensions, sessionId);
         switch (trackInfo.googleAnalyticsDataType) {
-            case "pageview" /* GoogleAnalyticsDataType.Page */:
+            case enums_1.GoogleAnalyticsDataType.Page:
                 await this.trackPageView(visitor, trackInfo);
                 break;
-            case "event" /* GoogleAnalyticsDataType.Event */:
+            case enums_1.GoogleAnalyticsDataType.Event:
                 await this.trackEvent(visitor, trackInfo);
                 break;
         }
     }
     async setCustomDimensions(visitor, customDimensions, sessionId) {
         const defaultValues = {
-            ["cd1" /* GoogleAnalyticsCustomDimensions.cliVersion */]: this.$staticConfig.version,
-            ["cd6" /* GoogleAnalyticsCustomDimensions.nodeVersion */]: process.version,
-            ["cd3" /* GoogleAnalyticsCustomDimensions.clientID */]: this.clientId,
-            ["cd2" /* GoogleAnalyticsCustomDimensions.projectType */]: null,
-            ["cd9" /* GoogleAnalyticsCustomDimensions.isShared */]: null,
-            ["cd4" /* GoogleAnalyticsCustomDimensions.sessionID */]: sessionId,
-            ["cd5" /* GoogleAnalyticsCustomDimensions.client */]: "Unknown" /* AnalyticsClients.Unknown */,
+            [google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.cliVersion]: this.$staticConfig.version,
+            [google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.nodeVersion]: process.version,
+            [google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.clientID]: this.clientId,
+            [google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.projectType]: null,
+            [google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.isShared]: null,
+            [google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.sessionID]: sessionId,
+            [google_analytics_custom_dimensions_1.GoogleAnalyticsCustomDimensions.client]: constants_1.AnalyticsClients.Unknown,
         };
         customDimensions = _.merge(defaultValues, customDimensions);
         _.each(customDimensions, (value, key) => {
@@ -94,7 +98,7 @@ class GoogleAnalyticsProvider {
                     this.analyticsLoggingService.logData({
                         message: `Unable to track event with category: '${trackInfo.category}', action: '${trackInfo.action}', label: '${trackInfo.label}', ` +
                             `value: '${trackInfo.value}' attached page: ${this.currentPage}. Error is: ${err}.`,
-                        type: "Error" /* FileLogMessageType.Error */,
+                        type: detached_process_enums_1.FileLogMessageType.Error,
                     });
                     reject(err);
                     return;
@@ -117,7 +121,7 @@ class GoogleAnalyticsProvider {
                 if (err) {
                     this.analyticsLoggingService.logData({
                         message: `Unable to track pageview with path '${trackInfo.path}' and title: '${trackInfo.title}' Error is: ${err}.`,
-                        type: "Error" /* FileLogMessageType.Error */,
+                        type: detached_process_enums_1.FileLogMessageType.Error,
                     });
                     reject(err);
                     return;
@@ -135,4 +139,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], GoogleAnalyticsProvider.prototype, "getVisitor", null);
 yok_1.injector.register("googleAnalyticsProvider", GoogleAnalyticsProvider);
-//# sourceMappingURL=google-analytics-provider.js.map

package/lib/services/analytics-settings-service.js

@@ -62,10 +62,6 @@ class AnalyticsSettingsService {
         return userAgent;
     }
     getMacOSReleaseVersion(osRelease) {
-        // https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
-        // Each macOS version is labeled 10.<version>, where it looks like <versions> is taken from the major version returned by os.release() (16.x.x for example) and subtracting 4 from it.
-        // So the version becomes "10.12" in this case.
-        // Could be improved by spawning `system_profiler SPSoftwareDataType` and getting the System Version line from the result.
         const majorVersion = osRelease && _.first(osRelease.split("."));
         return majorVersion && `10.${+majorVersion - 4}`;
     }
@@ -90,4 +86,3 @@ __decorate([
     (0, decorators_1.exported)("analyticsSettingsService")
 ], AnalyticsSettingsService.prototype, "getUserAgentString", null);
 yok_1.injector.register("analyticsSettingsService", AnalyticsSettingsService);
-//# sourceMappingURL=analytics-settings-service.js.map

package/lib/services/android/android-bundle-tool-service.js

@@ -62,4 +62,3 @@ class AndroidBundleToolService {
 }
 exports.AndroidBundleToolService = AndroidBundleToolService;
 yok_1.injector.register("androidBundleToolService", AndroidBundleToolService);
-//# sourceMappingURL=android-bundle-tool-service.js.map

package/lib/services/android/gradle-build-args-service.js

@@ -18,7 +18,6 @@ class GradleBuildArgsService {
         if (await this.$analyticsService.isEnabled(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) {
             args.push("-PgatherAnalyticsData=true");
         }
-        // allow modifying gradle args from a `before-build-task-args` hook
         await this.$hooksService.executeBeforeHooks("build-task-args", {
             hookArgs: { args },
         });
@@ -31,7 +30,6 @@ class GradleBuildArgsService {
     }
     getBaseTaskArgs(buildData) {
         const args = this.getBuildLoggingArgs();
-        // ensure we initialize project data
         this.$projectData.initializeProjectData(buildData.projectDir);
         args.push(`-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
         if (buildData.gradleArgs) {
@@ -63,4 +61,3 @@ class GradleBuildArgsService {
 }
 exports.GradleBuildArgsService = GradleBuildArgsService;
 yok_1.injector.register("gradleBuildArgsService", GradleBuildArgsService);
-//# sourceMappingURL=gradle-build-args-service.js.map

package/lib/services/android/gradle-build-service.js

@@ -39,4 +39,3 @@ class GradleBuildService extends events_1.EventEmitter {
 }
 exports.GradleBuildService = GradleBuildService;
 yok_1.injector.register("gradleBuildService", GradleBuildService);
-//# sourceMappingURL=gradle-build-service.js.map

package/lib/services/android/gradle-command-service.js

@@ -38,4 +38,3 @@ class GradleCommandService {
 }
 exports.GradleCommandService = GradleCommandService;
 yok_1.injector.register("gradleCommandService", GradleCommandService);
-//# sourceMappingURL=gradle-command-service.js.map

package/lib/services/android-device-debug-service.js

@@ -33,7 +33,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
     async debug(debugData, debugOptions) {
         this._packageName = debugData.applicationIdentifier;
         const result = await this.debugCore(debugData.applicationIdentifier, debugOptions);
-        // TODO: extract this logic outside the debug service
         if (debugOptions.start && !debugOptions.justlaunch) {
             const pid = await this.$androidProcessService.getAppProcessId(this.deviceIdentifier, debugData.applicationIdentifier);
             if (pid) {
@@ -56,7 +55,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
             `tcp:${port}`,
         ]);
     }
-    // TODO: Remove this method and reuse logic from androidProcessService
     async getForwardedDebugPort(deviceId, packageName) {
         let port = -1;
         const forwardsResult = await this.device.adb.executeCommand([
@@ -64,7 +62,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
             "--list",
         ]);
         const unixSocketName = `${packageName}-inspectorServer`;
-        //matches 123a188909e6czzc tcp:40001 localabstract:org.nativescript.testUnixSockets-debug
         const regexp = new RegExp(`(?:${deviceId} tcp:)([\\d]+)(?= localabstract:${unixSocketName})`, "g");
         const match = regexp.exec(forwardsResult);
         if (match) {
@@ -80,7 +77,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
         });
         return port;
     }
-    // TODO: Remove this method and reuse logic from androidProcessService
     async unixSocketForward(local, remote) {
         await this.device.adb.executeCommand([
             "forward",
@@ -106,7 +102,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
     async printDebugPort(deviceId, port) {
         this.$logger.info("device: " + deviceId + " debug port: " + port + "\n");
     }
-    // TODO: extract this logic outside the debug service
     async validateRunningApp(deviceId, packageName) {
         if (!(await this.isAppRunning(packageName, deviceId))) {
             this.$errors.fail(`The application ${packageName} does not appear to be running on ${deviceId} or is not built with debugging enabled. Try starting the application manually.`);
@@ -149,4 +144,3 @@ __decorate([
     (0, decorators_1.performanceLog)()
 ], AndroidDeviceDebugService.prototype, "debugCore", null);
 yok_1.injector.register("androidDeviceDebugService", AndroidDeviceDebugService, false);
-//# sourceMappingURL=android-device-debug-service.js.map

package/lib/services/android-plugin-build-service.js

@@ -54,15 +54,12 @@ class AndroidPluginBuildService {
     async updateManifestContent(oldManifestContent, defaultPackageName) {
         let xml = await this.getXml(oldManifestContent);
         let packageName = defaultPackageName;
-        // if the manifest file is full-featured and declares settings inside the manifest scope
         if (xml["manifest"]) {
             if (xml["manifest"]["$"]["package"]) {
                 packageName = xml["manifest"]["$"]["package"];
             }
-            // set the xml as the value to iterate over its properties
             xml = xml["manifest"];
         }
-        // if the manifest file doesn't have a <manifest> scope, only the first setting will be picked up
         const newManifest = { manifest: {} };
         for (const prop in xml) {
             newManifest.manifest[prop] = xml[prop];
@@ -135,14 +132,6 @@ class AndroidPluginBuildService {
         }
         return result;
     }
-    /**
-     * Returns whether the build has completed or not
-     * @param {Object} options
-     * @param {string} options.pluginName - The name of the plugin. E.g. 'nativescript-barcodescanner'
-     * @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory.
-     * @param {string} options.aarOutputDir - The path where the aar should be copied after a successful build.
-     * @param {string} options.tempPluginDirPath - The path where the android plugin will be built.
-     */
     async buildAar(options) {
         this.validateOptions(options);
         const manifestFilePath = this.getManifest(options.platformsAndroidDirPath);
@@ -178,7 +167,6 @@ class AndroidPluginBuildService {
         return shouldBuildAar;
     }
     cleanPluginDir(pluginTempDir) {
-        // In case plugin was already built in the current process, we need to clean the old sources as they may break the new build.
         this.$fs.deleteDirectory(pluginTempDir);
         this.$fs.ensureDirectoryExists(pluginTempDir);
     }
@@ -252,7 +240,6 @@ class AndroidPluginBuildService {
         this.replaceGradleAndroidPluginVersion(buildGradlePath, runtimeGradleVersions.gradleAndroidPluginVersion);
         this.replaceFileContent(buildGradlePath, "{{pluginName}}", pluginName);
         this.replaceFileContent(settingsGradlePath, "{{pluginName}}", pluginName);
-        // gets the package from the AndroidManifest to use as the namespace or fallback to the `org.nativescript.${shortPluginName}`
         const shortPluginName = (0, helpers_1.getShortPluginName)(pluginName);
         const manifestPath = path.join(pluginTempDir, "src", "main", "AndroidManifest.xml");
         const manifestContent = this.$fs.readText(manifestPath);
@@ -305,7 +292,6 @@ class AndroidPluginBuildService {
         var _a, _b;
         const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
             constants_1.SCOPED_ANDROID_RUNTIME_NAME;
-        // try reading from installed runtime first before reading from the npm registry...
         const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(packageName, {
             paths: [this.$projectData.projectDir],
         });
@@ -341,23 +327,13 @@ class AndroidPluginBuildService {
         }
         const packageName = ((_b = (_a = this.$projectData.nsConfig) === null || _a === void 0 ? void 0 : _a.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) ||
             constants_1.SCOPED_ANDROID_RUNTIME_NAME;
-        // fallback to reading from npm...
         try {
             let output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { version_info: true });
             output = (_c = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _c !== void 0 ? _c : output;
             if (!output) {
-                /**
-                 * fallback to the old 'gradle' key in package.json
-                 *
-                 * format:
-                 *
-                 * gradle: { version: '6.4', android: '3.6.4' }
-                 *
-                 */
                 output = await this.$packageManager.view(`${packageName}@${runtimeVersion}`, { gradle: true });
                 output = (_d = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _d !== void 0 ? _d : output;
                 const { version, android } = output;
-                // covert output to the new format...
                 output = {
                     gradle: version,
                     gradleAndroid: android,
@@ -429,10 +405,6 @@ class AndroidPluginBuildService {
             this.$errors.fail(`No built aar found at ${pathToBuiltAar}`);
         }
     }
-    /**
-     * @param {Object} options
-     * @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory.
-     */
     migrateIncludeGradle(options) {
         this.validatePlatformsAndroidDirPathOption(options);
         const includeGradleFilePath = path.join(options.platformsAndroidDirPath, constants_1.INCLUDE_GRADLE_NAME);
@@ -485,8 +457,8 @@ class AndroidPluginBuildService {
         };
         if (this.$options.hostProjectPath) {
             opts.env = {
-                USER_PROJECT_PLATFORMS_ANDROID: path.resolve((0, process_1.cwd)(), this.$options.hostProjectPath), // TODO: couldn't `hostProjectPath` have an absolute path already?
-                ...process.env, // TODO: any other way to pass automatically the current process.env?
+                USER_PROJECT_PLATFORMS_ANDROID: path.resolve((0, process_1.cwd)(), this.$options.hostProjectPath),
+                ...process.env,
             };
         }
         try {
@@ -533,4 +505,3 @@ __decorate([
     (0, helpers_1.hook)("buildAndroidPlugin")
 ], AndroidPluginBuildService.prototype, "buildPlugin", null);
 yok_1.injector.register("androidPluginBuildService", AndroidPluginBuildService);
-//# sourceMappingURL=android-plugin-build-service.js.map