nativescript 9.1.0-alpha.15 → 9.1.0-alpha.17

package/lib/node-package-manager.js

@@ -37,12 +37,8 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
         }
         params = params.concat(flags);
         const cwd = pathToSave;
-        // Npm creates `etc` directory in installation dir when --prefix is passed
-        // https://github.com/npm/npm/issues/11486
-        // we should delete it if it was created because of us
         const etcDirectoryLocation = (0, path_1.join)(cwd, "etc");
         const etcExistsPriorToInstallation = this.$fs.exists(etcDirectoryLocation);
-        //TODO: plamen5kov: workaround is here for a reason (remove whole file later)
         if (config.path) {
             let relativePathFromCwdToSource = "";
             if (config.frameworkPath) {
@@ -58,13 +54,9 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
         }
         catch (err) {
             if (err.message && err.message.indexOf("EPEERINVALID") !== -1) {
-                // Not installed peer dependencies are treated by npm 2 as errors, but npm 3 treats them as warnings.
-                // We'll show them as warnings and let the user install them in case they are needed.
                 this.$logger.warn(err.message);
             }
             else {
-                // All other errors should be handled by the caller code.
-                // Revert package.json contents to preserve valid state
                 this.$fs.writeJson(packageJsonPath, jsonContentBefore);
                 throw err;
             }
@@ -86,7 +78,7 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
         return this.$childProcess.exec(`npm search ${filter.join(" ")} ${flags}`);
     }
     async view(packageName, config) {
-        const wrappedConfig = _.extend({}, config, { json: true }); // always require view response as JSON
+        const wrappedConfig = _.extend({}, config, { json: true });
         const flags = this.getFlagsString(wrappedConfig, false);
         let viewResult;
         try {
@@ -103,7 +95,6 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
         }
     }
     async searchNpms(keyword) {
-        // TODO: Fix the generation of url - in case it contains @ or / , the call may fail.
         const httpRequestResult = await this.$httpClient.httpRequest(`https://api.npms.io/v2/search?q=keywords:${keyword}`);
         const result = JSON.parse(httpRequestResult.body);
         return result;
@@ -140,4 +131,3 @@ __decorate([
     (0, decorators_1.cache)()
 ], NodePackageManager.prototype, "getCachePath", null);
 yok_1.injector.register("npm", NodePackageManager);
-//# sourceMappingURL=node-package-manager.js.map

package/lib/options.d.ts

@@ -0,0 +1,33 @@
+import * as yargs from "yargs";
+import { IDictionary, IDashedOption, IErrors, ISettingsService } from "./common/declarations";
+export declare class Options {
+    private $errors;
+    private $settingsService;
+    private $logger;
+    private static DASHED_OPTION_REGEX;
+    private static NONDASHED_OPTION_REGEX;
+    private optionsWhiteList;
+    private globalOptions;
+    private initialArgv;
+    argv: yargs.Arguments;
+    options: IDictionary<IDashedOption>;
+    setupOptions(commandSpecificDashedOptions?: IDictionary<IDashedOption>): void;
+    constructor($errors: IErrors, $settingsService: ISettingsService, $logger: ILogger);
+    get shorthands(): string[];
+    private get commonOptions();
+    private get optionNames();
+    private getOptionValue;
+    validateOptions(commandSpecificDashedOptions?: IDictionary<IDashedOption>): void;
+    private getCanonicalOptionName;
+    private getReportedOptionName;
+    private reportInvalidOption;
+    private getCorrectOptionName;
+    private getOptionType;
+    private tryGetOptionByAliasName;
+    private hasAlias;
+    private isOptionSupported;
+    private getNonDashedOptionName;
+    private getDashedOptionName;
+    private setArgv;
+    private adjustDashedOptions;
+}

package/lib/options.js

@@ -5,6 +5,7 @@ const helpers = require("./common/helpers");
 const yargs = require("yargs");
 const helpers_1 = require("yargs/helpers");
 const _ = require("lodash");
+const enums_1 = require("./common/enums");
 const yok_1 = require("./common/yok");
 const constants_1 = require("./constants");
 class Options {
@@ -14,7 +15,6 @@ class Options {
             this.setArgv();
         }
         this.argv.bundle = "webpack";
-        // Check if the user has explicitly provide --hmr and --release options from command line
         if (this.initialArgv.release && this.initialArgv.hmr) {
             this.$errors.fail("The options --release and --hmr cannot be used simultaneously.");
         }
@@ -22,37 +22,27 @@ class Options {
             this.argv.hmr = !this.argv.release;
         }
         if (this.argv.debugBrk) {
-            // we cannot use HMR along with debug-brk because we have to restart the app
-            // on each livesync in order to stop and allow debugging on app start
             this.argv.hmr = false;
         }
         if (this.argv.justlaunch) {
             this.argv.hmr = false;
         }
     }
-    constructor($errors, $settingsService) {
+    constructor($errors, $settingsService, $logger) {
         this.$errors = $errors;
         this.$settingsService = $settingsService;
-        this.optionsWhiteList = [
-            "ui",
-            "recursive",
-            "reporter",
-            "require",
-            "timeout",
-            "_",
-            "$0",
-        ]; // These options shouldn't be validated
+        this.$logger = $logger;
+        this.optionsWhiteList = ["_", "$0"];
         this.globalOptions = {
-            log: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            verbose: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            version: { type: "boolean" /* OptionType.Boolean */, alias: "v", hasSensitiveValue: false },
-            help: { type: "boolean" /* OptionType.Boolean */, alias: "h", hasSensitiveValue: false },
-            profileDir: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            analyticsClient: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            path: { type: "string" /* OptionType.String */, alias: "p", hasSensitiveValue: true },
-            config: { type: "string" /* OptionType.String */, alias: "c", hasSensitiveValue: true },
-            // This will parse all non-hyphenated values as strings.
-            _: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
+            log: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            verbose: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            version: { type: enums_1.OptionType.Boolean, alias: "v", hasSensitiveValue: false },
+            help: { type: enums_1.OptionType.Boolean, alias: "h", hasSensitiveValue: false },
+            profileDir: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            analyticsClient: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            path: { type: enums_1.OptionType.String, alias: "p", hasSensitiveValue: true },
+            config: { type: enums_1.OptionType.String, alias: "c", hasSensitiveValue: true },
+            _: { type: enums_1.OptionType.String, hasSensitiveValue: false },
         };
         this.options = _.extend({}, this.commonOptions, this.globalOptions);
         this.setArgv();
@@ -60,173 +50,173 @@ class Options {
     get shorthands() {
         const result = [];
         _.each(_.keys(this.options), (optionName) => {
-            if (this.options[optionName].alias) {
-                result.push(this.options[optionName].alias);
+            const alias = this.options[optionName].alias;
+            if (alias) {
+                result.push(...(_.isArray(alias) ? alias : [alias]));
             }
         });
         return result;
     }
     get commonOptions() {
         return {
-            ipa: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            frameworkPath: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            frameworkName: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            framework: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            frameworkVersion: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            forDevice: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
+            ipa: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            frameworkPath: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            frameworkName: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            framework: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            frameworkVersion: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            forDevice: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
             iCloudContainerEnvironment: {
-                type: "string" /* OptionType.String */,
+                type: enums_1.OptionType.String,
                 hasSensitiveValue: false,
             },
-            provision: { type: "object" /* OptionType.Object */, hasSensitiveValue: true },
+            provision: { type: enums_1.OptionType.Object, hasSensitiveValue: true },
             client: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 default: true,
                 hasSensitiveValue: false,
             },
-            env: { type: "object" /* OptionType.Object */, hasSensitiveValue: false },
-            production: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            debugTransport: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            keyStorePath: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            keyStorePassword: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            keyStoreAlias: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
+            env: { type: enums_1.OptionType.Object, hasSensitiveValue: false },
+            production: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            debugTransport: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            keyStorePath: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            keyStorePassword: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            keyStoreAlias: { type: enums_1.OptionType.String, hasSensitiveValue: true },
             keyStoreAliasPassword: {
-                type: "string" /* OptionType.String */,
+                type: enums_1.OptionType.String,
                 hasSensitiveValue: true,
             },
-            ignoreScripts: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            disableNpmInstall: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            compileSdk: { type: "number" /* OptionType.Number */, hasSensitiveValue: false },
-            port: { type: "number" /* OptionType.Number */, hasSensitiveValue: false },
-            copyTo: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            js: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            javascript: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            ng: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            angular: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            react: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            reactjs: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            vue: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            vuejs: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            svelte: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            vision: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            "vision-ng": { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            "vision-react": { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            "vision-solid": { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            "vision-svelte": { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            "vision-vue": { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            tsc: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            ts: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            typescript: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            yarn: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            yarn2: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            pnpm: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            androidTypings: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            bundle: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            all: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            teamId: { type: "object" /* OptionType.Object */, hasSensitiveValue: true },
-            chrome: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            inspector: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            clean: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
+            ignoreScripts: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            disableNpmInstall: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            compileSdk: { type: enums_1.OptionType.Number, hasSensitiveValue: false },
+            port: { type: enums_1.OptionType.Number, hasSensitiveValue: false },
+            copyTo: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            js: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            javascript: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            ng: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            angular: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            react: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            reactjs: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            vue: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            vuejs: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            svelte: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            solid: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            vision: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            "vision-ng": { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            "vision-react": { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            "vision-solid": { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            "vision-svelte": { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            "vision-vue": { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            tsc: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            ts: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            typescript: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            yarn: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            yarn2: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            pnpm: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            androidTypings: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            bundle: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            all: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            teamId: { type: enums_1.OptionType.Object, hasSensitiveValue: true },
+            chrome: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            inspector: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            clean: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
             watch: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 default: true,
                 hasSensitiveValue: false,
             },
-            background: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            username: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            pluginName: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
+            background: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            username: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            pluginName: { type: enums_1.OptionType.String, hasSensitiveValue: false },
             includeTypeScriptDemo: {
-                type: "string" /* OptionType.String */,
+                type: enums_1.OptionType.String,
                 hasSensitiveValue: false,
             },
-            includeAngularDemo: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
+            includeAngularDemo: { type: enums_1.OptionType.String, hasSensitiveValue: false },
             hmr: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 hasSensitiveValue: false,
                 default: true,
             },
             collection: {
-                type: "string" /* OptionType.String */,
+                type: enums_1.OptionType.String,
                 alias: "c",
                 hasSensitiveValue: false,
             },
-            json: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            avd: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            // check not used
-            config: { type: "array" /* OptionType.Array */, hasSensitiveValue: false },
+            json: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            avd: { type: enums_1.OptionType.String, hasSensitiveValue: true },
             insecure: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 alias: "k",
                 hasSensitiveValue: false,
             },
-            debug: { type: "boolean" /* OptionType.Boolean */, alias: "d", hasSensitiveValue: false },
-            timeout: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            device: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            availableDevices: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            appid: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            geny: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            debugBrk: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            debugPort: { type: "number" /* OptionType.Number */, hasSensitiveValue: false },
-            start: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            stop: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            ddi: { type: "string" /* OptionType.String */, hasSensitiveValue: true }, // the path to developer  disk image
-            justlaunch: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            file: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            force: { type: "boolean" /* OptionType.Boolean */, alias: "f", hasSensitiveValue: false },
-            emulator: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            simulator: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            sdk: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            template: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            certificate: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            certificatePassword: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
+            debug: { type: enums_1.OptionType.Boolean, alias: "d", hasSensitiveValue: false },
+            timeout: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            device: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            availableDevices: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            appid: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            geny: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            debugBrk: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            debugPort: { type: enums_1.OptionType.Number, hasSensitiveValue: false },
+            start: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            stop: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            ddi: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            justlaunch: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            file: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            force: { type: enums_1.OptionType.Boolean, alias: "f", hasSensitiveValue: false },
+            emulator: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            simulator: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            sdk: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            template: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            certificate: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            certificatePassword: { type: enums_1.OptionType.String, hasSensitiveValue: true },
             release: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 alias: "r",
                 hasSensitiveValue: false,
             },
-            markingMode: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            var: { type: "object" /* OptionType.Object */, hasSensitiveValue: true },
-            default: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            count: { type: "number" /* OptionType.Number */, hasSensitiveValue: false },
-            analyticsLogFile: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            disableAnalytics: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            cleanupLogFile: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
+            markingMode: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            var: { type: enums_1.OptionType.Object, hasSensitiveValue: true },
+            default: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            count: { type: enums_1.OptionType.Number, hasSensitiveValue: false },
+            analyticsLogFile: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            disableAnalytics: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            cleanupLogFile: { type: enums_1.OptionType.String, hasSensitiveValue: true },
             hooks: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 default: true,
                 hasSensitiveValue: false,
             },
             link: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 default: false,
                 hasSensitiveValue: false,
             },
-            gradlePath: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            gradleArgs: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
-            hostProjectPath: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
+            gradlePath: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            gradleArgs: { type: enums_1.OptionType.String, hasSensitiveValue: false },
+            hostProjectPath: { type: enums_1.OptionType.String, hasSensitiveValue: false },
             hostProjectModuleName: {
-                type: "string" /* OptionType.String */,
+                type: enums_1.OptionType.String,
                 hasSensitiveValue: false,
                 default: constants_1.APP_FOLDER_NAME,
             },
-            aab: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            performance: { type: "object" /* OptionType.Object */, hasSensitiveValue: true },
+            aab: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            performance: { type: enums_1.OptionType.Object, hasSensitiveValue: true },
             appleApplicationSpecificPassword: {
-                type: "string" /* OptionType.String */,
+                type: enums_1.OptionType.String,
                 hasSensitiveValue: true,
             },
-            appleSessionBase64: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            jar: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            aar: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
-            filter: { type: "string" /* OptionType.String */, hasSensitiveValue: true },
+            appleSessionBase64: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            jar: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            aar: { type: enums_1.OptionType.String, hasSensitiveValue: true },
+            filter: { type: enums_1.OptionType.String, hasSensitiveValue: true },
             git: {
-                type: "boolean" /* OptionType.Boolean */,
+                type: enums_1.OptionType.Boolean,
                 hasSensitiveValue: false,
                 default: true,
             },
-            dryRun: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            skipNative: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
-            uniqueBundle: { type: "boolean" /* OptionType.Boolean */, hasSensitiveValue: false },
+            dryRun: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            skipNative: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
+            uniqueBundle: { type: enums_1.OptionType.Boolean, hasSensitiveValue: false },
         };
     }
     get optionNames() {
@@ -238,50 +228,82 @@ class Options {
     }
     validateOptions(commandSpecificDashedOptions) {
         this.setupOptions(commandSpecificDashedOptions);
-        const parsed = {};
-        for (const key of Object.keys(this.argv)) {
-            const optionName = `${this.argv[key]}`;
-            parsed[optionName] = this.getOptionValue(optionName);
-        }
-        _.each(parsed, (value, originalOptionName) => {
-            // when this.options are passed to yargs, it returns all of them and the ones that are not part of process.argv are set to undefined.
-            if (value === undefined) {
-                return;
+        const validated = [];
+        for (const originalOptionName of Object.keys(this.argv)) {
+            const optionValue = this.getOptionValue(originalOptionName);
+            if (optionValue === undefined) {
+                continue;
             }
             const optionName = this.getCorrectOptionName(originalOptionName);
-            if (!_.includes(this.optionsWhiteList, optionName)) {
-                if (!this.isOptionSupported(optionName)) {
-                    this.$errors.failWithHelp(`The option '${originalOptionName}' is not supported.`);
-                }
-                const optionType = this.getOptionType(optionName), optionValue = parsed[optionName];
-                if (_.isArray(optionValue) && optionType !== "array" /* OptionType.Array */) {
-                    this.$errors.failWithHelp("The '%s' option requires a single value.", originalOptionName);
-                }
-                else if (optionType === "string" /* OptionType.String */ &&
-                    helpers.isNullOrWhitespace(optionValue)) {
-                    this.$errors.failWithHelp("The option '%s' requires non-empty value.", originalOptionName);
-                }
-                else if (optionType === "array" /* OptionType.Array */ &&
-                    optionValue.length === 0) {
-                    this.$errors.failWithHelp(`The option '${originalOptionName}' requires one or more values, separated by a space.`);
-                }
+            if (_.includes(this.optionsWhiteList, optionName)) {
+                continue;
             }
-        });
+            const dedupeKey = this.getCanonicalOptionName(optionName);
+            if (_.includes(validated, dedupeKey)) {
+                continue;
+            }
+            validated.push(dedupeKey);
+            if (!this.isOptionSupported(optionName)) {
+                this.reportInvalidOption(`The option '${this.getReportedOptionName(originalOptionName)}' is not supported.`);
+                continue;
+            }
+            const optionType = this.getOptionType(optionName);
+            if (_.isArray(optionValue) && optionType !== enums_1.OptionType.Array) {
+                this.reportInvalidOption(`The '${originalOptionName}' option requires a single value.`);
+            }
+            else if (optionType === enums_1.OptionType.String &&
+                helpers.isNullOrWhitespace(optionValue)) {
+                this.reportInvalidOption(`The option '${originalOptionName}' requires non-empty value.`);
+            }
+            else if (optionType === enums_1.OptionType.Array && optionValue.length === 0) {
+                this.reportInvalidOption(`The option '${originalOptionName}' requires one or more values, separated by a space.`);
+            }
+        }
     }
-    getCorrectOptionName(optionName) {
-        const secondaryOptionName = this.getNonDashedOptionName(optionName);
-        return _.includes(this.optionNames, secondaryOptionName)
-            ? secondaryOptionName
+    getCanonicalOptionName(optionName) {
+        const correctName = this.getCorrectOptionName(optionName);
+        if (this.options[correctName]) {
+            return this.getNonDashedOptionName(correctName);
+        }
+        const aliasedName = _.findKey(this.options, (opt) => this.hasAlias(opt, correctName));
+        return this.getNonDashedOptionName(aliasedName || correctName);
+    }
+    getReportedOptionName(optionName) {
+        return process.argv.indexOf(`--no-${optionName}`) !== -1
+            ? `no-${optionName}`
             : optionName;
     }
+    reportInvalidOption(message) {
+        if (process.env.NS_STRICT_OPTIONS === "error") {
+            this.$errors.failWithHelp(message);
+            return;
+        }
+        this.$logger.warn(`${message} This will become an error in a future release. Set NS_STRICT_OPTIONS=error to preview that behavior.`);
+    }
+    getCorrectOptionName(optionName) {
+        const nonDashedName = this.getNonDashedOptionName(optionName);
+        if (_.includes(this.optionNames, nonDashedName)) {
+            return nonDashedName;
+        }
+        const dashedName = this.getDashedOptionName(optionName);
+        if (_.includes(this.optionNames, dashedName)) {
+            return dashedName;
+        }
+        return optionName;
+    }
     getOptionType(optionName) {
         const option = this.options[optionName] || this.tryGetOptionByAliasName(optionName);
         return option ? option.type : "";
     }
     tryGetOptionByAliasName(aliasName) {
-        const option = _.find(this.options, (opt) => opt.alias === aliasName);
+        const option = _.find(this.options, (opt) => this.hasAlias(opt, aliasName));
         return option;
     }
+    hasAlias(option, aliasName) {
+        return _.isArray(option.alias)
+            ? _.includes(option.alias, aliasName)
+            : option.alias === aliasName;
+    }
     isOptionSupported(option) {
         if (!this.options[option]) {
             const opt = this.tryGetOptionByAliasName(option);
@@ -289,16 +311,9 @@ class Options {
         }
         return true;
     }
-    // If you pass value with dash, yargs adds it to yargs.argv in two ways:
-    // with dash and without dash, replacing first symbol after it with its toUpper equivalent
-    // ex, "$ <cli name> emulate android --profile-dir" will add profile-dir to yargs.argv as profile-dir and profileDir
-    // IMPORTANT: In your code, it is better to use the value without dashes (profileDir in the example).
-    // This way your code will work in case "$ <cli name> emulate android --profile-dir" or "$ <cli name> emulate android --profileDir" is used by user.
     getNonDashedOptionName(optionName) {
         const matchUpperCaseLetters = optionName.match(Options.NONDASHED_OPTION_REGEX);
         if (matchUpperCaseLetters) {
-            // get here if option with upperCase letter is specified, for example profileDir
-            // check if in knownOptions we have its kebabCase presentation
             const secondaryOptionName = matchUpperCaseLetters[1] +
                 matchUpperCaseLetters[2].toUpperCase() +
                 matchUpperCaseLetters[3] || "";
@@ -327,18 +342,15 @@ class Options {
             const args = argv._.slice(1);
             const commands = yok_1.injector
                 .getRegisteredCommandsNames(false)
-                .filter((c) => c != "/?"); // remove the /? command, looks weird... :D
+                .filter((c) => c != "/?");
             const currentDepth = args.length > 0 ? args.length - 1 : 0;
             const current = (_a = current_ !== null && current_ !== void 0 ? current_ : args[currentDepth]) !== null && _a !== void 0 ? _a : "";
-            // split all commands into their components ie. "device|list" => ["device", "list"]
             const matchGroups = commands.map((c) => c.split("|"));
-            // find all commands that match the current depth and all the previous args
             const possibleMatches = matchGroups.filter((group) => {
                 return group.slice(0, currentDepth).every((g, i) => {
                     return g === args[i] || args[i].at(0) === "-";
                 });
             });
-            // filter out duplicates
             const completions = [
                 ...new Set(possibleMatches
                     .map((match) => {
@@ -346,28 +358,21 @@ class Options {
                 })
                     .filter(Boolean)),
             ];
-            // autocomplete long -- options
             if (current.startsWith("--")) {
                 return this.optionNames.filter((o) => o !== "_").map((o) => `--${o}`);
             }
-            // autocomple short - options
             if (current.startsWith("-")) {
                 return this.shorthands.map((o) => `-${o}`);
             }
-            // autocomplete matched completions
             return completions;
         });
         this.initialArgv = parsed.argv;
         this.argv = parsed.options(opts).argv;
-        // For backwards compatibility
-        // Previously profileDir had a default option and calling `this.$options.profileDir` always returned valid result.
-        // Now the profileDir should be used from $settingsService, but ensure the `this.$options.profileDir` returns the same value.
         this.$settingsService.setSettings({
             profileDir: this.argv.profileDir,
         });
         this.argv.profileDir = this.argv["profile-dir"] =
             this.$settingsService.getProfileDir();
-        // if justlaunch is set, it takes precedence over the --watch flag and the default true value
         if (this.argv.justlaunch) {
             this.argv.watch = false;
         }
@@ -383,7 +388,6 @@ class Options {
         if (this.argv.javascript) {
             this.argv.js = true;
         }
-        // alias --simulator to --emulator
         if (this.argv.simulator) {
             this.argv.emulator = this.argv.simulator;
         }
@@ -408,4 +412,3 @@ exports.Options = Options;
 Options.DASHED_OPTION_REGEX = /(.+?)([A-Z])(.*)/;
 Options.NONDASHED_OPTION_REGEX = /(.+?)[-]([a-zA-Z])(.*)/;
 yok_1.injector.register("options", Options);
-//# sourceMappingURL=options.js.map