nativescript 8.9.0-dev.2 → 8.9.0-dev.3

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

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("../common/helpers");
 const decorators_1 = require("../common/decorators");
@@ -28,10 +19,8 @@ class AnalyticsSettingsService {
         this.$osInfo = $osInfo;
         this.$logger = $logger;
     }
-    canDoRequest() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return true;
-        });
+    async canDoRequest() {
+        return true;
     }
     getUserId() {
         return this.getSettingValueOrDefault("USER_ID");
@@ -42,16 +31,12 @@ class AnalyticsSettingsService {
     getClientName() {
         return "" + color_1.color.cyan.bold(this.$staticConfig.CLIENT_NAME_ALIAS);
     }
-    getUserSessionsCount(projectName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sessionsCountForProject = yield this.$userSettingsService.getSettingValue(this.getSessionsProjectKey(projectName));
-            return sessionsCountForProject || 0;
-        });
+    async getUserSessionsCount(projectName) {
+        const sessionsCountForProject = await this.$userSettingsService.getSettingValue(this.getSessionsProjectKey(projectName));
+        return sessionsCountForProject || 0;
     }
-    setUserSessionsCount(count, projectName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.$userSettingsService.saveSetting(this.getSessionsProjectKey(projectName), count);
-        });
+    async setUserSessionsCount(count, projectName) {
+        return this.$userSettingsService.saveSetting(this.getSessionsProjectKey(projectName), count);
     }
     getUserAgentString(identifier) {
         let osString = "";
@@ -76,26 +61,20 @@ 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}`;
     }
     getSessionsProjectKey(projectName) {
         return `${AnalyticsSettingsService.SESSIONS_STARTED_KEY_PREFIX}${projectName}`;
     }
-    getSettingValueOrDefault(settingName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let guid = yield this.$userSettingsService.getSettingValue(settingName);
-            if (!guid) {
-                guid = (0, helpers_1.createGUID)(false);
-                this.$logger.trace(`Setting new ${settingName}: ${guid}.`);
-                yield this.$userSettingsService.saveSetting(settingName, guid);
-            }
-            return guid;
-        });
+    async getSettingValueOrDefault(settingName) {
+        let guid = await this.$userSettingsService.getSettingValue(settingName);
+        if (!guid) {
+            guid = (0, helpers_1.createGUID)(false);
+            this.$logger.trace(`Setting new ${settingName}: ${guid}.`);
+            await this.$userSettingsService.saveSetting(settingName, guid);
+        }
+        return guid;
     }
 }
 AnalyticsSettingsService.SESSIONS_STARTED_KEY_PREFIX = "SESSIONS_STARTED_";
@@ -106,4 +85,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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AndroidBundleToolService = void 0;
 const path_1 = require("path");
@@ -21,62 +12,53 @@ class AndroidBundleToolService {
         this.$errors = $errors;
         this.aabToolPath = (0, path_1.resolve)((0, path_1.join)(__dirname, "../../../vendor/aab-tool/bundletool.jar"));
     }
-    buildApks(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(0, helpers_1.hasValidAndroidSigning)(options.signingData)) {
-                this.$errors.fail(`Unable to build "apks" without a full signing information.`);
-            }
-            const aabToolResult = yield this.execBundleTool([
-                "build-apks",
-                "--bundle",
-                options.aabFilePath,
-                "--output",
-                options.apksOutputPath,
-                "--ks",
-                options.signingData.keyStorePath,
-                "--ks-pass",
-                `pass:${options.signingData.keyStorePassword}`,
-                "--ks-key-alias",
-                options.signingData.keyStoreAlias,
-                "--key-pass",
-                `pass:${options.signingData.keyStoreAliasPassword}`,
-            ]);
-            if (aabToolResult.exitCode !== 0 && aabToolResult.stderr) {
-                this.$errors.fail(`Unable to build "apks" from the provided "aab". Error: ${aabToolResult.stderr}`);
-            }
-        });
+    async buildApks(options) {
+        if (!(0, helpers_1.hasValidAndroidSigning)(options.signingData)) {
+            this.$errors.fail(`Unable to build "apks" without a full signing information.`);
+        }
+        const aabToolResult = await this.execBundleTool([
+            "build-apks",
+            "--bundle",
+            options.aabFilePath,
+            "--output",
+            options.apksOutputPath,
+            "--ks",
+            options.signingData.keyStorePath,
+            "--ks-pass",
+            `pass:${options.signingData.keyStorePassword}`,
+            "--ks-key-alias",
+            options.signingData.keyStoreAlias,
+            "--key-pass",
+            `pass:${options.signingData.keyStoreAliasPassword}`,
+        ]);
+        if (aabToolResult.exitCode !== 0 && aabToolResult.stderr) {
+            this.$errors.fail(`Unable to build "apks" from the provided "aab". Error: ${aabToolResult.stderr}`);
+        }
     }
-    installApks(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const aabToolResult = yield this.execBundleTool([
-                "install-apks",
-                "--apks",
-                options.apksFilePath,
-                "--device-id",
-                options.deviceId,
-            ]);
-            if (aabToolResult.exitCode !== 0 && aabToolResult.stderr) {
-                this.$errors.fail(`Unable to install "apks" on device "${options.deviceId}". Error: ${aabToolResult.stderr}`);
-            }
-        });
+    async installApks(options) {
+        const aabToolResult = await this.execBundleTool([
+            "install-apks",
+            "--apks",
+            options.apksFilePath,
+            "--device-id",
+            options.deviceId,
+        ]);
+        if (aabToolResult.exitCode !== 0 && aabToolResult.stderr) {
+            this.$errors.fail(`Unable to install "apks" on device "${options.deviceId}". Error: ${aabToolResult.stderr}`);
+        }
     }
-    execBundleTool(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const javaPath = yield this.getJavaPath();
-            const defaultArgs = ["-jar", this.aabToolPath];
-            const result = yield this.$childProcess.trySpawnFromCloseEvent(javaPath, _.concat(defaultArgs, args));
-            return result;
-        });
+    async execBundleTool(args) {
+        const javaPath = await this.getJavaPath();
+        const defaultArgs = ["-jar", this.aabToolPath];
+        const result = await this.$childProcess.trySpawnFromCloseEvent(javaPath, _.concat(defaultArgs, args));
+        return result;
     }
-    getJavaPath() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.javaPath) {
-                this.javaPath = yield this.$sysInfo.getJavaPath();
-            }
-            return this.javaPath;
-        });
+    async getJavaPath() {
+        if (!this.javaPath) {
+            this.javaPath = await this.$sysInfo.getJavaPath();
+        }
+        return this.javaPath;
     }
 }
 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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GradleBuildArgsService = void 0;
 const path = require("path");
@@ -21,19 +12,16 @@ class GradleBuildArgsService {
         this.$projectData = $projectData;
         this.$logger = $logger;
     }
-    getBuildTaskArgs(buildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = this.getBaseTaskArgs(buildData);
-            args.unshift(this.getBuildTaskName(buildData));
-            if (yield 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
-            yield this.$hooksService.executeBeforeHooks("build-task-args", {
-                hookArgs: { args },
-            });
-            return args;
+    async getBuildTaskArgs(buildData) {
+        const args = this.getBaseTaskArgs(buildData);
+        args.unshift(this.getBuildTaskName(buildData));
+        if (await this.$analyticsService.isEnabled(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) {
+            args.push("-PgatherAnalyticsData=true");
+        }
+        await this.$hooksService.executeBeforeHooks("build-task-args", {
+            hookArgs: { args },
         });
+        return args;
     }
     getCleanTaskArgs(buildData) {
         const args = this.getBaseTaskArgs(buildData);
@@ -42,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) {
@@ -74,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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GradleBuildService = void 0;
 const helpers_1 = require("../../common/helpers");
@@ -21,35 +12,30 @@ class GradleBuildService extends events_1.EventEmitter {
         this.$gradleBuildArgsService = $gradleBuildArgsService;
         this.$gradleCommandService = $gradleCommandService;
     }
-    buildProject(projectRoot, buildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const buildTaskArgs = yield this.$gradleBuildArgsService.getBuildTaskArgs(buildData);
-            const spawnOptions = {
-                emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME },
-                throwError: true,
-            };
-            const gradleCommandOptions = {
-                cwd: projectRoot,
-                message: "Gradle build...",
-                stdio: buildData.buildOutputStdio,
-                gradlePath: buildData.gradlePath,
-                spawnOptions,
-            };
-            yield (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, (data) => this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data), this.$gradleCommandService.executeCommand(buildTaskArgs, gradleCommandOptions));
-        });
+    async buildProject(projectRoot, buildData) {
+        const buildTaskArgs = await this.$gradleBuildArgsService.getBuildTaskArgs(buildData);
+        const spawnOptions = {
+            emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME },
+            throwError: true,
+        };
+        const gradleCommandOptions = {
+            cwd: projectRoot,
+            message: "Gradle build...",
+            stdio: buildData.buildOutputStdio,
+            gradlePath: buildData.gradlePath,
+            spawnOptions,
+        };
+        await (0, helpers_1.attachAwaitDetach)(constants.BUILD_OUTPUT_EVENT_NAME, this.$childProcess, (data) => this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data), this.$gradleCommandService.executeCommand(buildTaskArgs, gradleCommandOptions));
     }
-    cleanProject(projectRoot, buildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cleanTaskArgs = this.$gradleBuildArgsService.getCleanTaskArgs(buildData);
-            const gradleCommandOptions = {
-                cwd: projectRoot,
-                message: "Gradle clean...",
-                gradlePath: buildData.gradlePath,
-            };
-            yield this.$gradleCommandService.executeCommand(cleanTaskArgs, gradleCommandOptions);
-        });
+    async cleanProject(projectRoot, buildData) {
+        const cleanTaskArgs = this.$gradleBuildArgsService.getCleanTaskArgs(buildData);
+        const gradleCommandOptions = {
+            cwd: projectRoot,
+            message: "Gradle clean...",
+            gradlePath: buildData.gradlePath,
+        };
+        await this.$gradleCommandService.executeCommand(cleanTaskArgs, gradleCommandOptions);
     }
 }
 exports.GradleBuildService = GradleBuildService;
 yok_1.injector.register("gradleBuildService", GradleBuildService);
-//# sourceMappingURL=gradle-build-service.js.map

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GradleCommandService = void 0;
 const yok_1 = require("../../common/yok");
@@ -19,36 +10,31 @@ class GradleCommandService {
         this.$hostInfo = $hostInfo;
         this.$logger = $logger;
     }
-    executeCommand(gradleArgs, options) {
+    async executeCommand(gradleArgs, options) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { message, cwd, stdio, spawnOptions } = options;
-            this.$logger.info(message);
-            const childProcessOptions = {
-                cwd,
-                stdio: stdio || "inherit",
-                shell: this.$hostInfo.isWindows,
-            };
-            const gradleExecutable = (_a = options.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
-            const sanitizedGradleArgs = this.$hostInfo.isWindows
-                ? gradleArgs.map((arg) => (0, helpers_1.quoteString)(arg))
-                : gradleArgs;
-            const result = yield this.executeCommandSafe(gradleExecutable, sanitizedGradleArgs, childProcessOptions, spawnOptions);
-            return result;
-        });
+        const { message, cwd, stdio, spawnOptions } = options;
+        this.$logger.info(message);
+        const childProcessOptions = {
+            cwd,
+            stdio: stdio || "inherit",
+            shell: this.$hostInfo.isWindows,
+        };
+        const gradleExecutable = (_a = options.gradlePath) !== null && _a !== void 0 ? _a : (this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew");
+        const sanitizedGradleArgs = this.$hostInfo.isWindows
+            ? gradleArgs.map((arg) => (0, helpers_1.quoteString)(arg))
+            : gradleArgs;
+        const result = await this.executeCommandSafe(gradleExecutable, sanitizedGradleArgs, childProcessOptions, spawnOptions);
+        return result;
     }
-    executeCommandSafe(gradleExecutable, gradleArgs, childProcessOptions, spawnOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const result = yield this.$childProcess.spawnFromEvent(gradleExecutable, gradleArgs, "close", childProcessOptions, spawnOptions);
-                return result;
-            }
-            catch (err) {
-                this.$errors.fail(err.message);
-            }
-        });
+    async executeCommandSafe(gradleExecutable, gradleArgs, childProcessOptions, spawnOptions) {
+        try {
+            const result = await this.$childProcess.spawnFromEvent(gradleExecutable, gradleArgs, "close", childProcessOptions, spawnOptions);
+            return result;
+        }
+        catch (err) {
+            this.$errors.fail(err.message);
+        }
     }
 }
 exports.GradleCommandService = GradleCommandService;
 yok_1.injector.register("gradleCommandService", GradleCommandService);
-//# sourceMappingURL=gradle-command-service.js.map