nativescript 8.9.0-dev.2 → 8.9.0-dev.4

package/lib/common/decorators.js

@@ -1,15 +1,12 @@
 "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.deprecated = exports.performanceLog = exports.exported = exports.invokeInit = exports.invokeBefore = exports.memoize = exports.cache = void 0;
+exports.cache = cache;
+exports.memoize = memoize;
+exports.invokeBefore = invokeBefore;
+exports.invokeInit = invokeInit;
+exports.exported = exported;
+exports.performanceLog = performanceLog;
+exports.deprecated = deprecated;
 const constants_1 = require("../constants");
 const yok_1 = require("./yok");
 /**
@@ -54,7 +51,6 @@ function cache() {
         return descriptor;
     };
 }
-exports.cache = cache;
 let memoizeIDCounter = 0;
 function memoize(options) {
     return (target, propertyKey, descriptor) => {
@@ -120,7 +116,6 @@ function memoize(options) {
         return descriptor;
     };
 }
-exports.memoize = memoize;
 /**
  * Calls specific method of the instance before executing the decorated method.
  * This is usable when some of your methods depend on initialize async method, that cannot be invoked in constructor of the class.
@@ -132,20 +127,16 @@ exports.memoize = memoize;
 function invokeBefore(methodName, methodArgs) {
     return (target, propertyKey, descriptor) => {
         const originalValue = descriptor.value;
-        descriptor.value = function (...args) {
-            return __awaiter(this, void 0, void 0, function* () {
-                yield target[methodName].apply(this, methodArgs);
-                return originalValue.apply(this, args);
-            });
+        descriptor.value = async function (...args) {
+            await target[methodName].apply(this, methodArgs);
+            return originalValue.apply(this, args);
         };
         return descriptor;
     };
 }
-exports.invokeBefore = invokeBefore;
 function invokeInit() {
     return invokeBefore("init");
 }
-exports.invokeInit = invokeInit;
 function exported(moduleName) {
     return (target, propertyKey, descriptor) => {
         yok_1.injector.publicApi.__modules__[moduleName] =
@@ -157,7 +148,6 @@ function exported(moduleName) {
         return descriptor;
     };
 }
-exports.exported = exported;
 function performanceLog(localInjector) {
     localInjector = localInjector || yok_1.injector;
     return function (target, propertyKey, descriptor) {
@@ -198,7 +188,6 @@ function performanceLog(localInjector) {
         return descriptor;
     };
 }
-exports.performanceLog = performanceLog;
 // inspired by https://github.com/NativeScript/NativeScript/blob/55dfe25938569edbec89255008e5ad9804901305/tns-core-modules/globals/globals.ts#L121-L137
 function deprecated(additionalInfo, localInjector) {
     const isDeprecatedMessage = " is deprecated.";
@@ -245,5 +234,4 @@ function deprecated(additionalInfo, localInjector) {
         }
     };
 }
-exports.deprecated = deprecated;
 //# sourceMappingURL=decorators.js.map

package/lib/common/dispatchers.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 });
 exports.CommandDispatcher = void 0;
 const _ = require("lodash");
@@ -38,47 +29,43 @@ class CommandDispatcher {
         this.$packageManager = $packageManager;
         this.$terminalSpinnerService = $terminalSpinnerService;
     }
-    dispatchCommand() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.$options.version) {
-                return this.printVersion();
-            }
-            if (this.$logger.getLevel() === "TRACE" && !this.$options.json) {
-                // CommandDispatcher is called from external CLI's only, so pass the path to their package.json
-                this.$logger.trace("Collecting system information...");
-                const sysInfo = yield this.$sysInfo.getSysInfo({
-                    pathToNativeScriptCliPackageJson: path.join(__dirname, "..", "..", "package.json"),
-                });
-                this.$logger.trace("System information:");
-                this.$logger.trace(JSON.stringify(sysInfo, null, 2));
-                this.$logger.trace("Current CLI version: ", this.$staticConfig.version);
-            }
-            let commandName = this.getCommandName();
-            let commandArguments = this.$options.argv._.slice(1);
-            const lastArgument = _.last(commandArguments);
-            if (this.$options.help) {
-                commandArguments.unshift(commandName);
-                commandName = "help";
-            }
-            else if (lastArgument === "/?" || lastArgument === "?") {
-                commandArguments.pop();
-                commandArguments.unshift(commandName);
-                commandName = "help";
-            }
-            ({
-                commandName,
-                commandArguments,
-                argv: process.argv,
-            } = yield this.resolveCommand(commandName, commandArguments, process.argv));
-            yield this.$cancellation.begin("cli");
-            yield this.$commandsService.tryExecuteCommand(commandName, commandArguments);
-        });
+    async dispatchCommand() {
+        if (this.$options.version) {
+            return this.printVersion();
+        }
+        if (this.$logger.getLevel() === "TRACE" && !this.$options.json) {
+            // CommandDispatcher is called from external CLI's only, so pass the path to their package.json
+            this.$logger.trace("Collecting system information...");
+            const sysInfo = await this.$sysInfo.getSysInfo({
+                pathToNativeScriptCliPackageJson: path.join(__dirname, "..", "..", "package.json"),
+            });
+            this.$logger.trace("System information:");
+            this.$logger.trace(JSON.stringify(sysInfo, null, 2));
+            this.$logger.trace("Current CLI version: ", this.$staticConfig.version);
+        }
+        let commandName = this.getCommandName();
+        let commandArguments = this.$options.argv._.slice(1);
+        const lastArgument = _.last(commandArguments);
+        if (this.$options.help) {
+            commandArguments.unshift(commandName);
+            commandName = "help";
+        }
+        else if (lastArgument === "/?" || lastArgument === "?") {
+            commandArguments.pop();
+            commandArguments.unshift(commandName);
+            commandName = "help";
+        }
+        ({
+            commandName,
+            commandArguments,
+            argv: process.argv,
+        } = await this.resolveCommand(commandName, commandArguments, process.argv));
+        await this.$cancellation.begin("cli");
+        await this.$commandsService.tryExecuteCommand(commandName, commandArguments);
     }
-    resolveCommand(commandName, commandArguments, argv) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // just a hook point
-            return { commandName, commandArguments, argv };
-        });
+    async resolveCommand(commandName, commandArguments, argv) {
+        // just a hook point
+        return { commandName, commandArguments, argv };
     }
     getCommandName() {
         const remaining = this.$options.argv._;
@@ -89,68 +76,64 @@ class CommandDispatcher {
         this.$options.help = true;
         return "";
     }
-    printVersion() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$logger.info(this.$staticConfig.version);
-            if (this.$options.json) {
-                // we don't check for updates when --json is passed
-                // useful for tools that rely on the output of the command
-                return;
-            }
-            const spinner = this.$terminalSpinnerService.createSpinner();
-            spinner.start("Checking for updates...");
-            const nativescriptCliVersion = yield this.$versionsService.getNativescriptCliVersion();
-            spinner.stop();
-            const packageManagerName = yield this.$packageManager.getPackageManagerName();
-            let updateCommand = "";
-            switch (packageManagerName) {
-                case constants_1.PackageManagers.yarn:
-                case constants_1.PackageManagers.yarn2:
-                    updateCommand = "yarn global add nativescript";
-                    break;
-                case constants_1.PackageManagers.pnpm:
-                    updateCommand = "pnpm i -g nativescript";
-                    break;
-                case constants_1.PackageManagers.bun:
-                    updateCommand = "bun add --global nativescript";
-                    break;
-                case constants_1.PackageManagers.npm:
-                default:
-                    updateCommand = "npm i -g nativescript";
-                    break;
-            }
-            if (semver.gte(nativescriptCliVersion.currentVersion, nativescriptCliVersion.latestVersion, {
-                loose: true,
-            })) {
-                // up-to-date
-                spinner.succeed("Up to date.");
-            }
-            else {
-                spinner.info(`New version of NativeScript CLI is available (${nativescriptCliVersion.latestVersion}), run '${updateCommand}' to update.`);
-            }
-        });
+    async printVersion() {
+        this.$logger.info(this.$staticConfig.version);
+        if (this.$options.json) {
+            // we don't check for updates when --json is passed
+            // useful for tools that rely on the output of the command
+            return;
+        }
+        const spinner = this.$terminalSpinnerService.createSpinner();
+        spinner.start("Checking for updates...");
+        const nativescriptCliVersion = await this.$versionsService.getNativescriptCliVersion();
+        spinner.stop();
+        const packageManagerName = await this.$packageManager.getPackageManagerName();
+        let updateCommand = "";
+        switch (packageManagerName) {
+            case constants_1.PackageManagers.yarn:
+            case constants_1.PackageManagers.yarn2:
+                updateCommand = "yarn global add nativescript";
+                break;
+            case constants_1.PackageManagers.pnpm:
+                updateCommand = "pnpm i -g nativescript";
+                break;
+            case constants_1.PackageManagers.bun:
+                updateCommand = "bun add --global nativescript";
+                break;
+            case constants_1.PackageManagers.npm:
+            default:
+                updateCommand = "npm i -g nativescript";
+                break;
+        }
+        if (semver.gte(nativescriptCliVersion.currentVersion, nativescriptCliVersion.latestVersion, {
+            loose: true,
+        })) {
+            // up-to-date
+            spinner.succeed("Up to date.");
+        }
+        else {
+            spinner.info(`New version of NativeScript CLI is available (${nativescriptCliVersion.latestVersion}), run '${updateCommand}' to update.`);
+        }
     }
 }
+exports.CommandDispatcher = CommandDispatcher;
 __decorate([
     (0, helpers_1.hook)("resolveCommand")
 ], CommandDispatcher.prototype, "resolveCommand", null);
-exports.CommandDispatcher = CommandDispatcher;
 yok_1.injector.register("commandDispatcher", CommandDispatcher);
 class FutureDispatcher {
     constructor($errors) {
         this.$errors = $errors;
     }
-    run() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.actions) {
-                this.$errors.fail("You cannot run a running future dispatcher.");
-            }
-            this.actions = new queue.Queue();
-            while (true) {
-                const action = yield this.actions.dequeue();
-                yield action();
-            }
-        });
+    async run() {
+        if (this.actions) {
+            this.$errors.fail("You cannot run a running future dispatcher.");
+        }
+        this.actions = new queue.Queue();
+        while (true) {
+            const action = await this.actions.dequeue();
+            await action();
+        }
     }
     dispatch(action) {
         this.actions.enqueue(action);

package/lib/common/errors.js

@@ -5,17 +5,9 @@ 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.Errors = exports.installUncaughtExceptionListener = void 0;
+exports.Errors = void 0;
+exports.installUncaughtExceptionListener = installUncaughtExceptionListener;
 const util = require("util");
 const path = require("path");
 const _ = require("lodash");
@@ -28,69 +20,67 @@ function Exception() {
     /* intentionally left blank */
 }
 Exception.prototype = new Error();
-function resolveCallStack(error) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const stackLines = error.stack.split("\n");
-        const parsed = _.map(stackLines, (line) => {
-            let match = line.match(/^\s*at ([^(]*) \((.*?):([0-9]+):([0-9]+)\)$/);
-            if (match) {
-                return match;
-            }
-            match = line.match(/^\s*at (.*?):([0-9]+):([0-9]+)$/);
-            if (match) {
-                match.splice(1, 0, "<anonymous>");
-                return match;
-            }
-            return line;
-        });
-        const fs = require("fs");
-        const remapped = yield Promise.all(_.map(parsed, (parsedLine) => __awaiter(this, void 0, void 0, function* () {
-            if (_.isString(parsedLine)) {
-                return parsedLine;
-            }
-            const functionName = parsedLine[1];
-            const fileName = parsedLine[2];
-            const line = +parsedLine[3];
-            const column = +parsedLine[4];
-            const mapFileName = fileName + ".map";
-            if (!fs.existsSync(mapFileName)) {
-                return parsedLine.input;
-            }
-            const mapData = JSON.parse(fs.readFileSync(mapFileName).toString());
-            return yield source_map_1.SourceMapConsumer.with(mapData, null, (consumer) => {
-                const sourcePos = consumer.originalPositionFor({
-                    line: line,
-                    column: column,
-                });
-                if (sourcePos && sourcePos.source) {
-                    const source = path.join(path.dirname(fileName), sourcePos.source);
-                    return util.format("    at %s (%s:%s:%s)", functionName, source, sourcePos.line, sourcePos.column);
-                }
-                return util.format("    at %s (%s:%s:%s)", functionName, fileName, line, column);
-            });
-        })));
-        let outputMessage = remapped.join("\n");
-        if (outputMessage.indexOf(error.message) === -1) {
-            // when fibers throw error in node 0.12.x, the stack does NOT contain the message
-            outputMessage = outputMessage.replace(/Error/, "Error: " + error.message);
+async function resolveCallStack(error) {
+    const stackLines = error.stack.split("\n");
+    const parsed = _.map(stackLines, (line) => {
+        let match = line.match(/^\s*at ([^(]*) \((.*?):([0-9]+):([0-9]+)\)$/);
+        if (match) {
+            return match;
         }
-        return outputMessage;
+        match = line.match(/^\s*at (.*?):([0-9]+):([0-9]+)$/);
+        if (match) {
+            match.splice(1, 0, "<anonymous>");
+            return match;
+        }
+        return line;
     });
+    const fs = require("fs");
+    const remapped = await Promise.all(_.map(parsed, async (parsedLine) => {
+        if (_.isString(parsedLine)) {
+            return parsedLine;
+        }
+        const functionName = parsedLine[1];
+        const fileName = parsedLine[2];
+        const line = +parsedLine[3];
+        const column = +parsedLine[4];
+        const mapFileName = fileName + ".map";
+        if (!fs.existsSync(mapFileName)) {
+            return parsedLine.input;
+        }
+        const mapData = JSON.parse(fs.readFileSync(mapFileName).toString());
+        return await source_map_1.SourceMapConsumer.with(mapData, null, (consumer) => {
+            const sourcePos = consumer.originalPositionFor({
+                line: line,
+                column: column,
+            });
+            if (sourcePos && sourcePos.source) {
+                const source = path.join(path.dirname(fileName), sourcePos.source);
+                return util.format("    at %s (%s:%s:%s)", functionName, source, sourcePos.line, sourcePos.column);
+            }
+            return util.format("    at %s (%s:%s:%s)", functionName, fileName, line, column);
+        });
+    }));
+    let outputMessage = remapped.join("\n");
+    if (outputMessage.indexOf(error.message) === -1) {
+        // when fibers throw error in node 0.12.x, the stack does NOT contain the message
+        outputMessage = outputMessage.replace(/Error/, "Error: " + error.message);
+    }
+    return outputMessage;
 }
 function installUncaughtExceptionListener(actionOnException) {
-    const handler = (err) => __awaiter(this, void 0, void 0, function* () {
+    const handler = async (err) => {
         try {
             let callstack = err.stack;
             if (callstack) {
                 try {
-                    callstack = yield resolveCallStack(err);
+                    callstack = await resolveCallStack(err);
                 }
                 catch (err) {
                     console.error("Error while resolving callStack:", err);
                 }
             }
             console.error(callstack || err.toString());
-            yield tryTrackException(err, yok_1.injector);
+            await tryTrackException(err, yok_1.injector);
             if (actionOnException) {
                 actionOnException();
             }
@@ -100,32 +90,29 @@ function installUncaughtExceptionListener(actionOnException) {
             // We cannot do anything here as even `console.error` may fail. So just exit the process.
             process.exit(131 /* ErrorCodes.UNHANDLED_REJECTION_FAILURE */);
         }
-    });
+    };
     process.on("uncaughtException", handler);
     process.on("unhandledRejection", handler);
 }
-exports.installUncaughtExceptionListener = installUncaughtExceptionListener;
-function tryTrackException(error, localInjector) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let disableAnalytics;
+async function tryTrackException(error, localInjector) {
+    let disableAnalytics;
+    try {
+        disableAnalytics = localInjector.resolve("staticConfig").disableAnalytics;
+    }
+    catch (err) {
+        // We should get here only in our unit tests.
+        disableAnalytics = true;
+    }
+    if (!disableAnalytics) {
         try {
-            disableAnalytics = localInjector.resolve("staticConfig").disableAnalytics;
+            const analyticsService = localInjector.resolve("analyticsService");
+            await analyticsService.trackException(error, error.message);
         }
-        catch (err) {
-            // We should get here only in our unit tests.
-            disableAnalytics = true;
+        catch (e) {
+            // Do not replace with logger due to cyclic dependency
+            console.error("Error while reporting exception: " + e);
         }
-        if (!disableAnalytics) {
-            try {
-                const analyticsService = localInjector.resolve("analyticsService");
-                yield analyticsService.trackException(error, error.message);
-            }
-            catch (e) {
-                // Do not replace with logger due to cyclic dependency
-                console.error("Error while reporting exception: " + e);
-            }
-        }
-    });
+    }
 }
 class Errors {
     constructor($injector) {
@@ -170,35 +157,33 @@ class Errors {
         this.$injector.resolve("logger").trace(opts.formatStr);
         throw exception;
     }
-    beginCommand(action, printCommandHelpSuggestion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield action();
+    async beginCommand(action, printCommandHelpSuggestion) {
+        try {
+            return await action();
+        }
+        catch (ex) {
+            const logger = this.$injector.resolve("logger");
+            const loggerLevel = logger.getLevel().toUpperCase();
+            const printCallStack = this.printCallStack ||
+                loggerLevel === "TRACE" ||
+                loggerLevel === "DEBUG";
+            const message = printCallStack
+                ? await resolveCallStack(ex)
+                : (0, helpers_1.isInteractive)()
+                    ? `\x1B[31;1m${ex.message}\x1B[0m`
+                    : ex.message;
+            if (ex.printOnStdout) {
+                logger.info(message);
             }
-            catch (ex) {
-                const logger = this.$injector.resolve("logger");
-                const loggerLevel = logger.getLevel().toUpperCase();
-                const printCallStack = this.printCallStack ||
-                    loggerLevel === "TRACE" ||
-                    loggerLevel === "DEBUG";
-                const message = printCallStack
-                    ? yield resolveCallStack(ex)
-                    : (0, helpers_1.isInteractive)()
-                        ? `\x1B[31;1m${ex.message}\x1B[0m`
-                        : ex.message;
-                if (ex.printOnStdout) {
-                    logger.info(message);
-                }
-                else {
-                    logger.error(message);
-                }
-                if (ex.suggestCommandHelp) {
-                    yield printCommandHelpSuggestion();
-                }
-                yield tryTrackException(ex, this.$injector);
-                process.exit(_.isNumber(ex.errorCode) ? ex.errorCode : 127 /* ErrorCodes.UNKNOWN */);
+            else {
+                logger.error(message);
             }
-        });
+            if (ex.suggestCommandHelp) {
+                await printCommandHelpSuggestion();
+            }
+            await tryTrackException(ex, this.$injector);
+            process.exit(_.isNumber(ex.errorCode) ? ex.errorCode : 127 /* ErrorCodes.UNKNOWN */);
+        }
     }
     // If you want to activate this function, start Node with flags --nouse_idle_notification and --expose_gc
     verifyHeap(message) {
@@ -208,9 +193,9 @@ class Errors {
         }
     }
 }
+exports.Errors = Errors;
 __decorate([
     (0, decorators_1.deprecated)("Use `fail` instead.")
 ], Errors.prototype, "failWithoutHelp", null);
-exports.Errors = Errors;
 yok_1.injector.register("errors", Errors);
 //# sourceMappingURL=errors.js.map