@angular/cli 14.0.0-next.6 → 14.0.0-next.9

package/src/command-builder/architect-command-module.js

@@ -6,17 +6,27 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArchitectCommandModule = void 0;
 const config_1 = require("../utilities/config");
+const memoize_1 = require("../utilities/memoize");
 const architect_base_command_module_1 = require("./architect-base-command-module");
-const command_module_1 = require("./command-module");
 class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBaseCommandModule {
     async builder(argv) {
+        const project = this.getArchitectProject();
+        const { jsonHelp, getYargsCompletions, help } = this.context.args.options;
         const localYargs = argv
             .positional('project', {
             describe: 'The name of the project to build. Can be an application or a library.',
             type: 'string',
+            // Hide choices from JSON help so that we don't display them in AIO.
+            choices: jsonHelp ? undefined : this.getProjectChoices(),
         })
             .option('configuration', {
             describe: `One or more named builder configurations as a comma-separated ` +
@@ -25,9 +35,13 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
                 `For more information, see https://angular.io/guide/workspace-config#alternate-build-configurations.`,
             alias: 'c',
             type: 'string',
+            // Show only in when using --help and auto completion because otherwise comma seperated configuration values will be invalid.
+            // Also, hide choices from JSON help so that we don't display them in AIO.
+            choices: (getYargsCompletions || help) && !jsonHelp && project
+                ? this.getConfigurationChoices(project)
+                : undefined,
         })
             .strict();
-        const project = this.getArchitectProject();
         if (!project) {
             return localYargs;
         }
@@ -39,7 +53,6 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         return this.addSchemaOptionsToCommand(localYargs, schemaOptions);
     }
     async run(options) {
-        var _a;
         const target = this.getArchitectTarget();
         const { configuration = '', project, ...architectOptions } = options;
         if (!project) {
@@ -48,7 +61,7 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
             let result = 0;
             const projectNames = this.getProjectNamesByTarget(target);
             if (!projectNames) {
-                throw new command_module_1.CommandModuleError((_a = this.missingErrorTarget) !== null && _a !== void 0 ? _a : 'Cannot determine project or target for command.');
+                return this.onMissingTarget('Cannot determine project or target for command.');
             }
             for (const project of projectNames) {
                 result |= await this.runSingleTarget({ configuration, target, project }, architectOptions);
@@ -66,18 +79,12 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         }
         const [, projectName] = this.context.args.positional;
         if (projectName) {
-            if (!workspace.projects.has(projectName)) {
-                throw new command_module_1.CommandModuleError(`Project '${projectName}' does not exist.`);
-            }
-            return projectName;
+            return workspace.projects.has(projectName) ? projectName : undefined;
         }
         const target = this.getArchitectTarget();
         const projectFromTarget = this.getProjectNamesByTarget(target);
         return (projectFromTarget === null || projectFromTarget === void 0 ? void 0 : projectFromTarget.length) ? projectFromTarget[0] : undefined;
     }
-    getArchitectTarget() {
-        return this.commandName;
-    }
     getProjectNamesByTarget(target) {
         const workspace = this.getWorkspaceOrThrow();
         const allProjectsForTargetName = [];
@@ -94,15 +101,34 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
             return allProjectsForTargetName;
         }
         else {
+            if (allProjectsForTargetName.length === 1) {
+                return allProjectsForTargetName;
+            }
             const maybeProject = (0, config_1.getProjectByCwd)(workspace);
             if (maybeProject && allProjectsForTargetName.includes(maybeProject)) {
                 return [maybeProject];
             }
-            if (allProjectsForTargetName.length === 1) {
-                return allProjectsForTargetName;
-            }
         }
         return undefined;
     }
+    /** @returns a sorted list of project names to be used for auto completion. */
+    getProjectChoices() {
+        const { workspace } = this.context;
+        return workspace ? [...workspace.projects.keys()].sort() : undefined;
+    }
+    /** @returns a sorted list of configuration names to be used for auto completion. */
+    getConfigurationChoices(project) {
+        var _a, _b;
+        const projectDefinition = (_a = this.context.workspace) === null || _a === void 0 ? void 0 : _a.projects.get(project);
+        if (!projectDefinition) {
+            return undefined;
+        }
+        const target = this.getArchitectTarget();
+        const configurations = (_b = projectDefinition.targets.get(target)) === null || _b === void 0 ? void 0 : _b.configurations;
+        return configurations ? Object.keys(configurations).sort() : undefined;
+    }
 }
+__decorate([
+    memoize_1.memoize
+], ArchitectCommandModule.prototype, "getProjectNamesByTarget", null);
 exports.ArchitectCommandModule = ArchitectCommandModule;

package/src/command-builder/command-module.d.ts

@@ -7,8 +7,8 @@
  */
 import { analytics, logging } from '@angular-devkit/core';
 import { ArgumentsCamelCase, Argv, CamelCaseKey, CommandModule as YargsCommandModule } from 'yargs';
-import { PackageManager } from '../../lib/config/workspace-schema';
 import { AngularWorkspace } from '../utilities/config';
+import { PackageManagerUtils } from '../utilities/package-manager';
 import { Option } from './utilities/json-schema';
 export declare type Options<T> = {
     [key in keyof T as CamelCaseKey<key>]: T[key];
@@ -25,14 +25,16 @@ export interface CommandContext {
     currentDirectory: string;
     root: string;
     workspace?: AngularWorkspace;
+    globalConfiguration?: AngularWorkspace;
     logger: logging.Logger;
-    packageManager: PackageManager;
+    packageManager: PackageManagerUtils;
     /** Arguments parsed in free-from without parser configuration. */
     args: {
         positional: string[];
         options: {
             help: boolean;
             jsonHelp: boolean;
+            getYargsCompletions: boolean;
         } & Record<string, unknown>;
     };
 }
@@ -71,7 +73,6 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
     abstract run(options: Options<T> & OtherOptions): Promise<number | void> | number | void;
     handler(args: ArgumentsCamelCase<T> & OtherOptions): Promise<void>;
     reportAnalytics(options: (Options<T> & OtherOptions) | OtherOptions, paths?: string[], dimensions?: (boolean | number | string)[]): Promise<void>;
-    private _analytics;
     protected getAnalytics(): Promise<analytics.Analytics>;
     /**
      * Adds schema options to a command also this keeps track of options that are required for analytics.

package/src/command-builder/command-module.js

@@ -22,6 +22,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -36,6 +42,7 @@ const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const helpers_1 = require("yargs/helpers");
 const analytics_1 = require("../analytics/analytics");
+const memoize_1 = require("../utilities/memoize");
 var CommandScope;
 (function (CommandScope) {
     /** Command can only run inside an Angular workspace. */
@@ -124,13 +131,10 @@ class CommandModule {
             metrics: [],
         });
     }
-    async getAnalytics() {
-        if (this._analytics) {
-            return this._analytics;
-        }
-        return (this._analytics = await (0, analytics_1.createAnalytics)(!!this.context.workspace, 
+    getAnalytics() {
+        return (0, analytics_1.createAnalytics)(!!this.context.workspace, 
         // Don't prompt for `ng update` and `ng analytics` commands.
-        ['update', 'analytics'].includes(this.commandName)));
+        ['update', 'analytics'].includes(this.commandName));
     }
     /**
      * Adds schema options to a command also this keeps track of options that are required for analytics.
@@ -180,8 +184,11 @@ class CommandModule {
         return workspace;
     }
 }
-exports.CommandModule = CommandModule;
 CommandModule.scope = CommandScope.Both;
+__decorate([
+    memoize_1.memoize
+], CommandModule.prototype, "getAnalytics", null);
+exports.CommandModule = CommandModule;
 /**
  * Creates an known command module error.
  * This is used so during executation we can filter between known validation error and real non handled errors.

package/src/command-builder/command-runner.d.ts

@@ -6,5 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import { AngularWorkspace } from '../utilities/config';
-export declare function runCommand(args: string[], logger: logging.Logger, workspace: AngularWorkspace | undefined): Promise<number>;
+export declare function runCommand(args: string[], logger: logging.Logger): Promise<number>;

package/src/command-builder/command-runner.js

@@ -16,59 +16,85 @@ const helpers_1 = require("yargs/helpers");
 const cli_1 = require("../commands/add/cli");
 const cli_2 = require("../commands/analytics/cli");
 const cli_3 = require("../commands/build/cli");
-const cli_4 = require("../commands/config/cli");
-const cli_5 = require("../commands/deploy/cli");
-const cli_6 = require("../commands/doc/cli");
-const cli_7 = require("../commands/e2e/cli");
-const cli_8 = require("../commands/extract-i18n/cli");
-const cli_9 = require("../commands/generate/cli");
-const cli_10 = require("../commands/lint/cli");
-const cli_11 = require("../commands/make-this-awesome/cli");
-const cli_12 = require("../commands/new/cli");
-const cli_13 = require("../commands/run/cli");
-const cli_14 = require("../commands/serve/cli");
-const cli_15 = require("../commands/test/cli");
-const cli_16 = require("../commands/update/cli");
-const cli_17 = require("../commands/version/cli");
+const cli_4 = require("../commands/cache/cli");
+const cli_5 = require("../commands/completion/cli");
+const cli_6 = require("../commands/config/cli");
+const cli_7 = require("../commands/deploy/cli");
+const cli_8 = require("../commands/doc/cli");
+const cli_9 = require("../commands/e2e/cli");
+const cli_10 = require("../commands/extract-i18n/cli");
+const cli_11 = require("../commands/generate/cli");
+const cli_12 = require("../commands/lint/cli");
+const cli_13 = require("../commands/make-this-awesome/cli");
+const cli_14 = require("../commands/new/cli");
+const cli_15 = require("../commands/run/cli");
+const cli_16 = require("../commands/serve/cli");
+const cli_17 = require("../commands/test/cli");
+const cli_18 = require("../commands/update/cli");
+const cli_19 = require("../commands/version/cli");
 const color_1 = require("../utilities/color");
+const config_1 = require("../utilities/config");
 const package_manager_1 = require("../utilities/package-manager");
 const command_module_1 = require("./command-module");
 const command_1 = require("./utilities/command");
 const json_help_1 = require("./utilities/json-help");
+const normalize_options_middleware_1 = require("./utilities/normalize-options-middleware");
 const COMMANDS = [
-    cli_17.VersionCommandModule,
-    cli_6.DocCommandModule,
-    cli_11.AwesomeCommandModule,
-    cli_4.ConfigCommandModule,
+    cli_19.VersionCommandModule,
+    cli_8.DocCommandModule,
+    cli_13.AwesomeCommandModule,
+    cli_6.ConfigCommandModule,
     cli_2.AnalyticsCommandModule,
     cli_1.AddCommandModule,
-    cli_9.GenerateCommandModule,
+    cli_11.GenerateCommandModule,
     cli_3.BuildCommandModule,
-    cli_7.E2eCommandModule,
-    cli_15.TestCommandModule,
-    cli_14.ServeCommandModule,
-    cli_8.ExtractI18nCommandModule,
-    cli_5.DeployCommandModule,
-    cli_10.LintCommandModule,
-    cli_12.NewCommandModule,
-    cli_16.UpdateCommandModule,
-    cli_13.RunCommandModule,
+    cli_9.E2eCommandModule,
+    cli_17.TestCommandModule,
+    cli_16.ServeCommandModule,
+    cli_10.ExtractI18nCommandModule,
+    cli_7.DeployCommandModule,
+    cli_12.LintCommandModule,
+    cli_14.NewCommandModule,
+    cli_18.UpdateCommandModule,
+    cli_15.RunCommandModule,
+    cli_4.CacheCommandModule,
+    cli_5.CompletionCommandModule,
 ].sort(); // Will be sorted by class name.
 const yargsParser = helpers_1.Parser;
-async function runCommand(args, logger, workspace) {
-    var _a, _b, _c;
-    const { $0, _: positional, help = false, jsonHelp = false, ...rest } = yargsParser(args, { boolean: ['help', 'json-help'], alias: { 'collection': 'c' } });
+async function runCommand(args, logger) {
+    var _a, _b;
+    const { $0, _, help = false, jsonHelp = false, getYargsCompletions = false, ...rest } = yargsParser(args, {
+        boolean: ['help', 'json-help', 'get-yargs-completions'],
+        alias: { 'collection': 'c' },
+    });
+    // When `getYargsCompletions` is true the scriptName 'ng' at index 0 is not removed.
+    const positional = getYargsCompletions ? _.slice(1) : _;
+    let workspace;
+    let globalConfiguration;
+    try {
+        [workspace, globalConfiguration] = await Promise.all([
+            (0, config_1.getWorkspace)('local'),
+            (0, config_1.getWorkspace)('global'),
+        ]);
+    }
+    catch (e) {
+        logger.fatal(e.message);
+        return 1;
+    }
+    const root = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.basePath) !== null && _a !== void 0 ? _a : process.cwd();
     const context = {
+        globalConfiguration,
         workspace,
         logger,
         currentDirectory: process.cwd(),
-        root: (_a = workspace === null || workspace === void 0 ? void 0 : workspace.basePath) !== null && _a !== void 0 ? _a : process.cwd(),
-        packageManager: await (0, package_manager_1.getPackageManager)((_b = workspace === null || workspace === void 0 ? void 0 : workspace.basePath) !== null && _b !== void 0 ? _b : process.cwd()),
+        root,
+        packageManager: new package_manager_1.PackageManagerUtils({ globalConfiguration, workspace, root }),
         args: {
             positional: positional.map((v) => v.toString()),
             options: {
                 help,
                 jsonHelp,
+                getYargsCompletions,
                 ...rest,
             },
         },
@@ -84,9 +110,15 @@ async function runCommand(args, logger, workspace) {
         }
         localYargs = (0, command_1.addCommandModuleToYargs)(localYargs, CommandModule, context);
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const usageInstance = localYargs.getInternalMethods().getUsageInstance();
     if (jsonHelp) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        localYargs.getInternalMethods().getUsageInstance().help = () => (0, json_help_1.jsonHelpUsage)();
+        usageInstance.help = () => (0, json_help_1.jsonHelpUsage)();
+    }
+    if (getYargsCompletions) {
+        // When in auto completion mode avoid printing description as it causes a slugish
+        // experience when there are a large set of options.
+        usageInstance.getDescriptions = () => ({});
     }
     await localYargs
         .scriptName('ng')
@@ -118,6 +150,7 @@ async function runCommand(args, logger, workspace) {
     })
         .demandCommand(1, command_1.demandCommandFailureMessage)
         .recommendCommands()
+        .middleware(normalize_options_middleware_1.normalizeOptionsMiddleware)
         .version(false)
         .showHelpOnFail(false)
         .strict()
@@ -130,6 +163,6 @@ async function runCommand(args, logger, workspace) {
     })
         .wrap(yargs_1.default.terminalWidth())
         .parseAsync();
-    return (_c = process.exitCode) !== null && _c !== void 0 ? _c : 0;
+    return (_b = process.exitCode) !== null && _b !== void 0 ? _b : 0;
 }
 exports.runCommand = runCommand;

package/src/command-builder/schematics-command-module.d.ts

@@ -10,6 +10,7 @@ import { FileSystemCollectionDescription, FileSystemSchematicDescription, NodeWo
 import { Argv } from 'yargs';
 import { CommandModule, CommandModuleImplementation, CommandScope, Options, OtherOptions } from './command-module';
 import { Option } from './utilities/json-schema';
+export declare const DEFAULT_SCHEMATICS_COLLECTION = "@schematics/angular";
 export interface SchematicsCommandArgs {
     interactive: boolean;
     force: boolean;
@@ -26,12 +27,9 @@ export declare abstract class SchematicsCommandModule extends CommandModule<Sche
     builder(argv: Argv): Promise<Argv<SchematicsCommandArgs>>;
     /** Get schematic schema options.*/
     protected getSchematicOptions(collection: Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>, schematicName: string, workflow: NodeWorkflow): Promise<Option[]>;
-    private _workflowForBuilder;
     protected getOrCreateWorkflowForBuilder(collectionName: string): NodeWorkflow;
-    private _workflowForExecution;
     protected getOrCreateWorkflowForExecution(collectionName: string, options: SchematicsExecutionOptions): Promise<NodeWorkflow>;
-    private _defaultSchematicCollection;
-    protected getDefaultSchematicCollection(): Promise<string>;
+    protected getSchematicCollections(): Promise<Set<string>>;
     protected parseSchematicInfo(schematic: string | undefined): [collectionName: string | undefined, schematicName: string | undefined];
     protected runSchematic(options: {
         executionOptions: SchematicsExecutionOptions;
@@ -39,6 +37,7 @@ export declare abstract class SchematicsCommandModule extends CommandModule<Sche
         collectionName: string;
         schematicName: string;
     }): Promise<number>;
+    private defaultProjectDeprecationWarningShown;
     private getProjectName;
     private getResolvePaths;
 }

package/src/command-builder/schematics-command-module.js

@@ -6,27 +6,54 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchematicsCommandModule = void 0;
+exports.SchematicsCommandModule = exports.DEFAULT_SCHEMATICS_COLLECTION = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
-const inquirer_1 = __importDefault(require("inquirer"));
 const config_1 = require("../utilities/config");
+const memoize_1 = require("../utilities/memoize");
 const tty_1 = require("../utilities/tty");
 const command_module_1 = require("./command-module");
 const json_schema_1 = require("./utilities/json-schema");
 const schematic_engine_host_1 = require("./utilities/schematic-engine-host");
 const schematic_workflow_1 = require("./utilities/schematic-workflow");
-const DEFAULT_SCHEMATICS_COLLECTION = '@schematics/angular';
+exports.DEFAULT_SCHEMATICS_COLLECTION = '@schematics/angular';
 class SchematicsCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
         this.allowPrivateSchematics = false;
         this.shouldReportAnalytics = false;
+        this.defaultProjectDeprecationWarningShown = false;
     }
     async builder(argv) {
         return argv
@@ -62,24 +89,18 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         return (0, json_schema_1.parseJsonSchemaToOptions)(workflow.registry, schemaJson);
     }
     getOrCreateWorkflowForBuilder(collectionName) {
-        if (this._workflowForBuilder) {
-            return this._workflowForBuilder;
-        }
-        return (this._workflowForBuilder = new tools_1.NodeWorkflow(this.context.root, {
+        return new tools_1.NodeWorkflow(this.context.root, {
             resolvePaths: this.getResolvePaths(collectionName),
             engineHostCreator: (options) => new schematic_engine_host_1.SchematicEngineHost(options.resolvePaths),
-        }));
+        });
     }
     async getOrCreateWorkflowForExecution(collectionName, options) {
-        if (this._workflowForExecution) {
-            return this._workflowForExecution;
-        }
         const { logger, root, packageManager } = this.context;
         const { force, dryRun, packageRegistry } = options;
         const workflow = new tools_1.NodeWorkflow(root, {
             force,
             dryRun,
-            packageManager,
+            packageManager: packageManager.name,
             // A schema registry is required to allow customizing addUndefinedDefaults
             registry: new core_1.schema.CoreSchemaRegistry(schematics_1.formats.standardFormats),
             packageRegistry,
@@ -118,7 +139,7 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             return options;
         });
         if (options.interactive !== false && (0, tty_1.isTTY)()) {
-            workflow.registry.usePromptProvider((definitions) => {
+            workflow.registry.usePromptProvider(async (definitions) => {
                 const questions = definitions
                     .filter((definition) => !options.defaults || definition.default === undefined)
                     .map((definition) => {
@@ -177,35 +198,47 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                     }
                     return question;
                 });
-                return inquirer_1.default.prompt(questions);
+                if (questions.length) {
+                    const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
+                    return prompt(questions);
+                }
+                else {
+                    return {};
+                }
             });
         }
-        return (this._workflowForExecution = workflow);
+        return workflow;
     }
-    async getDefaultSchematicCollection() {
-        if (this._defaultSchematicCollection) {
-            return this._defaultSchematicCollection;
-        }
-        let workspace = await (0, config_1.getWorkspace)('local');
+    async getSchematicCollections() {
+        var _a;
+        const getSchematicCollections = (configSection) => {
+            if (!configSection) {
+                return undefined;
+            }
+            const { schematicCollections, defaultCollection } = configSection;
+            if (Array.isArray(schematicCollections)) {
+                return new Set(schematicCollections);
+            }
+            else if (typeof defaultCollection === 'string') {
+                return new Set([defaultCollection]);
+            }
+            return undefined;
+        };
+        const { workspace, globalConfiguration } = this.context;
         if (workspace) {
             const project = (0, config_1.getProjectByCwd)(workspace);
             if (project) {
-                const value = workspace.getProjectCli(project)['defaultCollection'];
-                if (typeof value == 'string') {
-                    return (this._defaultSchematicCollection = value);
+                const value = getSchematicCollections(workspace.getProjectCli(project));
+                if (value) {
+                    return value;
                 }
             }
-            const value = workspace.getCli()['defaultCollection'];
-            if (typeof value === 'string') {
-                return (this._defaultSchematicCollection = value);
-            }
         }
-        workspace = await (0, config_1.getWorkspace)('global');
-        const value = workspace === null || workspace === void 0 ? void 0 : workspace.getCli()['defaultCollection'];
-        if (typeof value === 'string') {
-            return (this._defaultSchematicCollection = value);
+        const value = (_a = getSchematicCollections(workspace === null || workspace === void 0 ? void 0 : workspace.getCli())) !== null && _a !== void 0 ? _a : getSchematicCollections(globalConfiguration === null || globalConfiguration === void 0 ? void 0 : globalConfiguration.getCli());
+        if (value) {
+            return value;
         }
-        return (this._defaultSchematicCollection = DEFAULT_SCHEMATICS_COLLECTION);
+        return new Set([exports.DEFAULT_SCHEMATICS_COLLECTION]);
     }
     parseSchematicInfo(schematic) {
         if (schematic === null || schematic === void 0 ? void 0 : schematic.includes(':')) {
@@ -260,22 +293,20 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         if (!workspace) {
             return undefined;
         }
-        const projectNames = (0, config_1.getProjectsByPath)(workspace, process.cwd(), workspace.basePath);
-        if (projectNames.length === 1) {
-            return projectNames[0];
+        const projectName = (0, config_1.getProjectByCwd)(workspace);
+        if (projectName) {
+            return projectName;
         }
-        else {
-            if (projectNames.length > 1) {
+        const defaultProjectName = workspace.extensions['defaultProject'];
+        if (typeof defaultProjectName === 'string' && defaultProjectName) {
+            if (!this.defaultProjectDeprecationWarningShown) {
                 logger.warn(core_1.tags.oneLine `
-            Two or more projects are using identical roots.
-            Unable to determine project using current working directory.
-            Using default workspace project instead.
+            DEPRECATED: The 'defaultProject' workspace option has been deprecated.
+            The project to use will be determined from the current working directory.
           `);
+                this.defaultProjectDeprecationWarningShown = true;
             }
-            const defaultProjectName = workspace.extensions['defaultProject'];
-            if (typeof defaultProjectName === 'string' && defaultProjectName) {
-                return defaultProjectName;
-            }
+            return defaultProjectName;
         }
         return undefined;
     }
@@ -283,7 +314,7 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         const { workspace, root } = this.context;
         return workspace
             ? // Workspace
-                collectionName === DEFAULT_SCHEMATICS_COLLECTION
+                collectionName === exports.DEFAULT_SCHEMATICS_COLLECTION
                     ? // Favor __dirname for @schematics/angular to use the build-in version
                         [__dirname, process.cwd(), root]
                     : [process.cwd(), root, __dirname]
@@ -291,5 +322,14 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
                 [__dirname, process.cwd()];
     }
 }
-exports.SchematicsCommandModule = SchematicsCommandModule;
 SchematicsCommandModule.scope = command_module_1.CommandScope.In;
+__decorate([
+    memoize_1.memoize
+], SchematicsCommandModule.prototype, "getOrCreateWorkflowForBuilder", null);
+__decorate([
+    memoize_1.memoize
+], SchematicsCommandModule.prototype, "getOrCreateWorkflowForExecution", null);
+__decorate([
+    memoize_1.memoize
+], SchematicsCommandModule.prototype, "getSchematicCollections", null);
+exports.SchematicsCommandModule = SchematicsCommandModule;

package/src/command-builder/utilities/normalize-options-middleware.d.ts

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as yargs from 'yargs';
+/**
+ * A Yargs middleware that normalizes non Array options when the argument has been provided multiple times.
+ *
+ * By default, when an option is non array and it is provided multiple times in the command line, yargs
+ * will not override it's value but instead it will be changed to an array unless `duplicate-arguments-array` is disabled.
+ * But this option also have an effect on real array options which isn't desired.
+ *
+ * See: https://github.com/yargs/yargs-parser/pull/163#issuecomment-516566614
+ */
+export declare function normalizeOptionsMiddleware(args: yargs.Arguments): void;