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

package/src/commands/cache/utilities.js

@@ -0,0 +1,49 @@
+"use strict";
+/**
+ * @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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCacheConfig = exports.updateCacheConfig = void 0;
+const core_1 = require("@angular-devkit/core");
+const path_1 = require("path");
+const workspace_schema_1 = require("../../../lib/config/workspace-schema");
+function updateCacheConfig(workspace, key, value) {
+    var _a, _b;
+    var _c;
+    const cli = ((_a = (_c = workspace.extensions)['cli']) !== null && _a !== void 0 ? _a : (_c['cli'] = {}));
+    const cache = ((_b = cli['cache']) !== null && _b !== void 0 ? _b : (cli['cache'] = {}));
+    cache[key] = value;
+    return workspace.save();
+}
+exports.updateCacheConfig = updateCacheConfig;
+function getCacheConfig(workspace) {
+    if (!workspace) {
+        throw new Error(`Cannot retrieve cache configuration as workspace is not defined.`);
+    }
+    const defaultSettings = {
+        path: (0, path_1.resolve)(workspace.basePath, '.angular/cache'),
+        environment: workspace_schema_1.Environment.Local,
+        enabled: true,
+    };
+    const cliSetting = workspace.extensions['cli'];
+    if (!cliSetting || !(0, core_1.isJsonObject)(cliSetting)) {
+        return defaultSettings;
+    }
+    const cacheSettings = cliSetting['cache'];
+    if (!(0, core_1.isJsonObject)(cacheSettings)) {
+        return defaultSettings;
+    }
+    const { path = defaultSettings.path, environment = defaultSettings.environment, enabled = defaultSettings.enabled,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+     } = cacheSettings;
+    return {
+        path: (0, path_1.resolve)(workspace.basePath, path),
+        environment,
+        enabled,
+    };
+}
+exports.getCacheConfig = getCacheConfig;

package/src/commands/completion/cli.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @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 { Argv } from 'yargs';
+import { CommandModule, CommandModuleImplementation } from '../../command-builder/command-module';
+export declare class CompletionCommandModule extends CommandModule implements CommandModuleImplementation {
+    command: string;
+    describe: string;
+    longDescriptionPath: string;
+    builder(localYargs: Argv): Argv;
+    run(): void;
+}

package/src/commands/completion/cli.js

@@ -0,0 +1,31 @@
+"use strict";
+/**
+ * @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
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompletionCommandModule = void 0;
+const path_1 = require("path");
+const yargs_1 = __importDefault(require("yargs"));
+const command_module_1 = require("../../command-builder/command-module");
+class CompletionCommandModule extends command_module_1.CommandModule {
+    constructor() {
+        super(...arguments);
+        this.command = 'completion';
+        this.describe = 'Generate a bash and zsh real-time type-ahead autocompletion script.';
+        this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
+    }
+    builder(localYargs) {
+        return localYargs;
+    }
+    run() {
+        yargs_1.default.showCompletionScript();
+    }
+}
+exports.CompletionCommandModule = CompletionCommandModule;

package/src/commands/completion/long-description.md

@@ -0,0 +1 @@
+To enable bash and zsh real-time type-ahead autocompletion, copy and paste the generated script to your `.bashrc`, `.bash_profile`, `.zshrc` or `.zsh_profile`.

package/src/commands/config/cli.d.ts

@@ -8,7 +8,7 @@
 import { Argv } from 'yargs';
 import { CommandModule, CommandModuleImplementation, Options } from '../../command-builder/command-module';
 interface ConfigCommandArgs {
-    'json-path': string;
+    'json-path'?: string;
     value?: string;
     global?: boolean;
 }

package/src/commands/config/cli.js

@@ -16,7 +16,7 @@ const json_file_1 = require("../../utilities/json-file");
 class ConfigCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
-        this.command = 'config <json-path> [value]';
+        this.command = 'config [json-path] [value]';
         this.describe = 'Retrieves or sets Angular configuration values in the angular.json file for the workspace.';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
     }
@@ -26,7 +26,6 @@ class ConfigCommandModule extends command_module_1.CommandModule {
             description: `The configuration key to set or query, in JSON path format. ` +
                 `For example: "a[3].foo.bar[2]". If no new value is provided, returns the current value of this key.`,
             type: 'string',
-            demandOption: true,
         })
             .positional('value', {
             description: 'If provided, a new value for the given configuration key.',
@@ -72,24 +71,22 @@ class ConfigCommandModule extends command_module_1.CommandModule {
         return 0;
     }
     async set(options) {
-        var _a, _b, _c;
+        var _a;
         if (!((_a = options.jsonPath) === null || _a === void 0 ? void 0 : _a.trim())) {
             throw new command_module_1.CommandModuleError('Invalid Path.');
         }
-        const validCliPaths = new Map([
-            ['cli.warnings.versionMismatch', undefined],
-            ['cli.defaultCollection', undefined],
-            ['cli.packageManager', undefined],
-            ['cli.analytics', undefined],
-            ['cli.analyticsSharing.tracking', undefined],
-            ['cli.analyticsSharing.uuid', (v) => (v === '' ? (0, uuid_1.v4)() : `${v}`)],
-            ['cli.cache.enabled', undefined],
-            ['cli.cache.environment', undefined],
-            ['cli.cache.path', undefined],
+        const validGlobalCliPaths = new Set([
+            'cli.warnings.versionMismatch',
+            'cli.defaultCollection',
+            'cli.schematicCollections',
+            'cli.packageManager',
+            'cli.analytics',
+            'cli.analyticsSharing.tracking',
+            'cli.analyticsSharing.uuid',
         ]);
         if (options.global &&
             !options.jsonPath.startsWith('schematics.') &&
-            !validCliPaths.has(options.jsonPath)) {
+            !validGlobalCliPaths.has(options.jsonPath)) {
             throw new command_module_1.CommandModuleError('Invalid Path.');
         }
         const [config, configPath] = (0, config_1.getWorkspaceRaw)(options.global ? 'global' : 'local');
@@ -97,7 +94,10 @@ class ConfigCommandModule extends command_module_1.CommandModule {
         if (!config || !configPath) {
             throw new command_module_1.CommandModuleError('Confguration file cannot be found.');
         }
-        const value = (_c = (_b = validCliPaths.get(options.jsonPath)) === null || _b === void 0 ? void 0 : _b(options.value)) !== null && _c !== void 0 ? _c : options.value;
+        const normalizeUUIDValue = (v) => (v === '' ? (0, uuid_1.v4)() : `${v}`);
+        const value = options.jsonPath === 'cli.analyticsSharing.uuid'
+            ? normalizeUUIDValue(options.value)
+            : options.value;
         const modified = config.modify(parseJsonPath(options.jsonPath), normalizeValue(value));
         if (!modified) {
             logger.error('Value cannot be found.');

package/src/commands/deploy/cli.d.ts

@@ -5,10 +5,11 @@
  * 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 { MissingTargetChoice } from '../../command-builder/architect-base-command-module';
 import { ArchitectCommandModule } from '../../command-builder/architect-command-module';
 import { CommandModuleImplementation } from '../../command-builder/command-module';
 export declare class DeployCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
-    missingErrorTarget: string;
+    missingTargetChoices: MissingTargetChoice[];
     multiTarget: boolean;
     command: string;
     longDescriptionPath: string;

package/src/commands/deploy/cli.js

@@ -8,24 +8,38 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeployCommandModule = void 0;
-const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const architect_command_module_1 = require("../../command-builder/architect-command-module");
 class DeployCommandModule extends architect_command_module_1.ArchitectCommandModule {
     constructor() {
         super(...arguments);
-        this.missingErrorTarget = core_1.tags.stripIndents `
-  Cannot find "deploy" target for the specified project.
-
-  You should add a package that implements deployment capabilities for your
-  favorite platform.
-  
-  For example:
-    ng add @angular/fire
-    ng add @azure/ng-deploy
-  
-  Find more packages on npm https://www.npmjs.com/search?q=ng%20deploy
-  `;
+        // The below choices should be kept in sync with the list in https://angular.io/guide/deployment
+        this.missingTargetChoices = [
+            {
+                name: 'Amazon S3',
+                value: '@jefiozie/ngx-aws-deploy',
+            },
+            {
+                name: 'Azure',
+                value: '@azure/ng-deploy',
+            },
+            {
+                name: 'Firebase',
+                value: '@angular/fire',
+            },
+            {
+                name: 'Netlify',
+                value: '@netlify-builder/deploy',
+            },
+            {
+                name: 'NPM',
+                value: 'ngx-deploy-npm',
+            },
+            {
+                name: 'GitHub Pages',
+                value: 'angular-cli-ghpages',
+            },
+        ];
         this.multiTarget = false;
         this.command = 'deploy [project]';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');

package/src/commands/doc/cli.d.ts

@@ -16,7 +16,7 @@ export declare class DocCommandModule extends CommandModule<DocCommandArgs> impl
     command: string;
     aliases: string[];
     describe: string;
-    longDescriptionPath?: string | undefined;
+    longDescriptionPath?: string;
     builder(localYargs: Argv): Argv<DocCommandArgs>;
     run(options: Options<DocCommandArgs>): Promise<number | void>;
 }

package/src/commands/e2e/cli.d.ts

@@ -5,13 +5,14 @@
  * 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 { MissingTargetChoice } from '../../command-builder/architect-base-command-module';
 import { ArchitectCommandModule } from '../../command-builder/architect-command-module';
 import { CommandModuleImplementation } from '../../command-builder/command-module';
 export declare class E2eCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
+    missingTargetChoices: MissingTargetChoice[];
     multiTarget: boolean;
-    missingErrorTarget: string;
     command: string;
     aliases: string[];
     describe: string;
-    longDescriptionPath?: string | undefined;
+    longDescriptionPath?: string;
 }

package/src/commands/e2e/cli.js

@@ -8,24 +8,25 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2eCommandModule = void 0;
-const core_1 = require("@angular-devkit/core");
 const architect_command_module_1 = require("../../command-builder/architect-command-module");
 class E2eCommandModule extends architect_command_module_1.ArchitectCommandModule {
     constructor() {
         super(...arguments);
+        this.missingTargetChoices = [
+            {
+                name: 'Cypress',
+                value: '@cypress/schematic',
+            },
+            {
+                name: 'Nightwatch',
+                value: '@nightwatch/schematics',
+            },
+            {
+                name: 'WebdriverIO',
+                value: '@wdio/schematics',
+            },
+        ];
         this.multiTarget = true;
-        this.missingErrorTarget = core_1.tags.stripIndents `
-  Cannot find "e2e" target for the specified project.
-  
-  You should add a package that implements end-to-end testing capabilities.
-  
-  For example:
-    Cypress: ng add @cypress/schematic
-    Nightwatch: ng add @nightwatch/schematics
-    WebdriverIO: ng add @wdio/schematics
-  
-  More options will be added to the list as they become available.
-  `;
         this.command = 'e2e [project]';
         this.aliases = ['e'];
         this.describe = 'Builds and serves an Angular application, then runs end-to-end tests.';

package/src/commands/generate/cli.d.ts

@@ -18,12 +18,22 @@ export declare class GenerateCommandModule extends SchematicsCommandModule imple
     longDescriptionPath?: string | undefined;
     builder(argv: Argv): Promise<Argv<GenerateCommandArgs>>;
     run(options: Options<GenerateCommandArgs> & OtherOptions): Promise<number | void>;
-    private getCollectionName;
+    private getCollectionNames;
     /**
      * Generate a command string to be passed to the command builder.
      *
      * @example `component [name]` or `@schematics/angular:component [name]`.
      */
     private generateCommandString;
+    /**
+     * Get schematics that can to be registered as subcommands.
+     */
+    private getSchematics;
+    /**
+     * Get schematics that should to be registered as subcommands.
+     *
+     * @returns a sorted list of schematic that needs to be registered as subcommands.
+     */
+    private getSchematicsToRegister;
 }
 export {};

package/src/commands/generate/cli.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateCommandModule = void 0;
 const core_1 = require("@angular-devkit/core");
+const command_module_1 = require("../../command-builder/command-module");
 const schematics_command_module_1 = require("../../command-builder/schematics-command-module");
 const command_1 = require("../../command-builder/utilities/command");
 class GenerateCommandModule extends schematics_command_module_1.SchematicsCommandModule {
@@ -31,26 +32,14 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
                 .strict(),
             handler: (options) => this.handler(options),
         });
-        const collectionName = await this.getCollectionName();
-        const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
-        const collection = workflow.engine.createCollection(collectionName);
-        const schematicsInCollection = collection.description.schematics;
-        // We cannot use `collection.listSchematicNames()` as this doesn't return hidden schematics.
-        const schematicNames = new Set(Object.keys(schematicsInCollection).sort());
-        const [, schematicNameFromArgs] = this.parseSchematicInfo(
-        // positional = [generate, component] or [generate]
-        this.context.args.positional[1]);
-        if (schematicNameFromArgs && schematicNames.has(schematicNameFromArgs)) {
-            // No need to process all schematics since we know which one the user invoked.
-            schematicNames.clear();
-            schematicNames.add(schematicNameFromArgs);
-        }
-        for (const schematicName of schematicNames) {
-            const { description: { schemaJson, aliases: schematicAliases, hidden: schematicHidden }, } = collection.createSchematic(schematicName, true);
+        for (const [schematicName, collectionName] of await this.getSchematicsToRegister()) {
+            const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
+            const collection = workflow.engine.createCollection(collectionName);
+            const { description: { schemaJson, aliases: schematicAliases, hidden: schematicHidden, description: schematicDescription, }, } = collection.createSchematic(schematicName, true);
             if (!schemaJson) {
                 continue;
             }
-            const { description, 'x-deprecated': xDeprecated, aliases = schematicAliases, hidden = schematicHidden, } = schemaJson;
+            const { 'x-deprecated': xDeprecated, description = schematicDescription, aliases = schematicAliases, hidden = schematicHidden, } = schemaJson;
             const options = await this.getSchematicOptions(collection, schematicName, workflow);
             localYargs = localYargs.command({
                 command: await this.generateCommandString(collectionName, schematicName, options),
@@ -66,7 +55,10 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
     }
     async run(options) {
         const { dryRun, schematic, defaults, force, interactive, ...schematicOptions } = options;
-        const [collectionName = await this.getCollectionName(), schematicName = ''] = this.parseSchematicInfo(schematic);
+        const [collectionName, schematicName] = this.parseSchematicInfo(schematic);
+        if (!collectionName || !schematicName) {
+            throw new command_module_1.CommandModuleError('A collection and schematic is required during execution.');
+        }
         return this.runSchematic({
             collectionName,
             schematicName,
@@ -79,11 +71,11 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
             },
         });
     }
-    async getCollectionName() {
-        const [collectionName = await this.getDefaultSchematicCollection()] = this.parseSchematicInfo(
+    async getCollectionNames() {
+        const [collectionName] = this.parseSchematicInfo(
         // positional = [generate, component] or [generate]
         this.context.args.positional[1]);
-        return collectionName;
+        return collectionName ? [collectionName] : [...(await this.getSchematicCollections())];
     }
     /**
      * Generate a command string to be passed to the command builder.
@@ -95,10 +87,13 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
         // positional = [generate, component] or [generate]
         this.context.args.positional[1]);
         const dasherizedSchematicName = core_1.strings.dasherize(schematicName);
-        // Only add the collection name as part of the command when it's not the default collection or when it has been provided via the CLI.
+        const schematicCollectionsFromConfig = await this.getSchematicCollections();
+        const collectionNames = await this.getCollectionNames();
+        // Only add the collection name as part of the command when it's not a known
+        // schematics collection or when it has been provided via the CLI.
         // Ex:`ng generate @schematics/angular:component`
         const commandName = !!collectionNameFromArgs ||
-            (await this.getDefaultSchematicCollection()) !== (await this.getCollectionName())
+            !collectionNames.some((c) => schematicCollectionsFromConfig.has(c))
             ? collectionName + ':' + dasherizedSchematicName
             : dasherizedSchematicName;
         const positionalArgs = options
@@ -110,5 +105,41 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
             .join(' ');
         return `${commandName}${positionalArgs ? ' ' + positionalArgs : ''}`;
     }
+    /**
+     * Get schematics that can to be registered as subcommands.
+     */
+    async *getSchematics() {
+        const seenNames = new Set();
+        for (const collectionName of await this.getCollectionNames()) {
+            const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
+            const collection = workflow.engine.createCollection(collectionName);
+            for (const schematicName of collection.listSchematicNames(true /** includeHidden */)) {
+                // If a schematic with this same name is already registered skip.
+                if (!seenNames.has(schematicName)) {
+                    seenNames.add(schematicName);
+                    yield { schematicName, collectionName };
+                }
+            }
+        }
+    }
+    /**
+     * Get schematics that should to be registered as subcommands.
+     *
+     * @returns a sorted list of schematic that needs to be registered as subcommands.
+     */
+    async getSchematicsToRegister() {
+        const schematicsToRegister = [];
+        const [, schematicNameFromArgs] = this.parseSchematicInfo(
+        // positional = [generate, component] or [generate]
+        this.context.args.positional[1]);
+        for await (const { schematicName, collectionName } of this.getSchematics()) {
+            if (schematicName === schematicNameFromArgs) {
+                return [[schematicName, collectionName]];
+            }
+            schematicsToRegister.push([schematicName, collectionName]);
+        }
+        // Didn't find the schematic or no schematic name was provided Ex: `ng generate --help`.
+        return schematicsToRegister.sort(([nameA], [nameB]) => nameA.localeCompare(nameB, undefined, { sensitivity: 'accent' }));
+    }
 }
 exports.GenerateCommandModule = GenerateCommandModule;

package/src/commands/lint/cli.d.ts

@@ -5,10 +5,11 @@
  * 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 { MissingTargetChoice } from '../../command-builder/architect-base-command-module';
 import { ArchitectCommandModule } from '../../command-builder/architect-command-module';
 import { CommandModuleImplementation } from '../../command-builder/command-module';
 export declare class LintCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
-    missingErrorTarget: string;
+    missingTargetChoices: MissingTargetChoice[];
     multiTarget: boolean;
     command: string;
     longDescriptionPath: string;

package/src/commands/lint/cli.js

@@ -8,20 +8,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LintCommandModule = void 0;
-const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const architect_command_module_1 = require("../../command-builder/architect-command-module");
 class LintCommandModule extends architect_command_module_1.ArchitectCommandModule {
     constructor() {
         super(...arguments);
-        this.missingErrorTarget = core_1.tags.stripIndents `
-  Cannot find "lint" target for the specified project.
-  
-  You should add a package that implements linting capabilities.
-  
-  For example:
-    ng add @angular-eslint/schematics
-  `;
+        this.missingTargetChoices = [
+            {
+                name: 'ESLint',
+                value: '@angular-eslint/schematics',
+            },
+        ];
         this.multiTarget = true;
         this.command = 'lint [project]';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');

package/src/commands/new/cli.d.ts

@@ -21,5 +21,7 @@ export declare class NewCommandModule extends SchematicsCommandModule implements
     longDescriptionPath?: string | undefined;
     builder(argv: Argv): Promise<Argv<NewCommandArgs>>;
     run(options: Options<NewCommandArgs> & OtherOptions): Promise<number | void>;
+    /** Find a collection from config that has an `ng-new` schematic. */
+    private getCollectionFromConfig;
 }
 export {};

package/src/commands/new/cli.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewCommandModule = void 0;
 const command_module_1 = require("../../command-builder/command-module");
 const schematics_command_module_1 = require("../../command-builder/schematics-command-module");
-const package_manager_1 = require("../../utilities/package-manager");
 const version_1 = require("../../utilities/version");
 class NewCommandModule extends schematics_command_module_1.SchematicsCommandModule {
     constructor() {
@@ -30,7 +29,7 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
         const { options: { collectionNameFromArgs }, } = this.context.args;
         const collectionName = typeof collectionNameFromArgs === 'string'
             ? collectionNameFromArgs
-            : await this.getDefaultSchematicCollection();
+            : await this.getCollectionFromConfig();
         const workflow = await this.getOrCreateWorkflowForBuilder(collectionName);
         const collection = workflow.engine.createCollection(collectionName);
         const options = await this.getSchematicOptions(collection, this.schematicName, workflow);
@@ -39,15 +38,20 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
     async run(options) {
         var _a;
         // Register the version of the CLI in the registry.
-        const collectionName = (_a = options.collection) !== null && _a !== void 0 ? _a : (await this.getDefaultSchematicCollection());
-        const workflow = await this.getOrCreateWorkflowForExecution(collectionName, options);
-        workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version_1.VERSION.full);
+        const collectionName = (_a = options.collection) !== null && _a !== void 0 ? _a : (await this.getCollectionFromConfig());
         const { dryRun, force, interactive, defaults, collection, ...schematicOptions } = options;
+        const workflow = await this.getOrCreateWorkflowForExecution(collectionName, {
+            dryRun,
+            force,
+            interactive,
+            defaults,
+        });
+        workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version_1.VERSION.full);
         // Compatibility check for NPM 7
         if (collectionName === '@schematics/angular' &&
             !schematicOptions.skipInstall &&
             (schematicOptions.packageManager === undefined || schematicOptions.packageManager === 'npm')) {
-            await (0, package_manager_1.ensureCompatibleNpm)(this.context.root);
+            this.context.packageManager.ensureCompatibility();
         }
         return this.runSchematic({
             collectionName,
@@ -61,6 +65,18 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
             },
         });
     }
+    /** Find a collection from config that has an `ng-new` schematic. */
+    async getCollectionFromConfig() {
+        for (const collectionName of await this.getSchematicCollections()) {
+            const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
+            const collection = workflow.engine.createCollection(collectionName);
+            const schematicsInCollection = collection.description.schematics;
+            if (Object.keys(schematicsInCollection).includes(this.schematicName)) {
+                return collectionName;
+            }
+        }
+        return schematics_command_module_1.DEFAULT_SCHEMATICS_COLLECTION;
+    }
 }
 exports.NewCommandModule = NewCommandModule;
 NewCommandModule.scope = command_module_1.CommandScope.Out;

package/src/commands/run/cli.d.ts

@@ -20,4 +20,6 @@ export declare class RunCommandModule extends ArchitectBaseCommandModule<RunComm
     builder(argv: Argv): Promise<Argv<RunCommandArgs>>;
     run(options: Options<RunCommandArgs> & OtherOptions): Promise<number>;
     protected makeTargetSpecifier(options?: Options<RunCommandArgs>): Target | undefined;
+    /** @returns a sorted list of target specifiers to be used for auto completion. */
+    private getTargetChoices;
 }

package/src/commands/run/cli.js

@@ -19,11 +19,15 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
     }
     async builder(argv) {
+        const { jsonHelp, getYargsCompletions, help } = this.context.args.options;
         const localYargs = argv
             .positional('target', {
             describe: 'The Architect target to run.',
             type: 'string',
             demandOption: true,
+            // 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 ? this.getTargetChoices() : undefined,
         })
             .strict();
         const target = this.makeTargetSpecifier();
@@ -54,6 +58,26 @@ class RunCommandModule extends architect_base_command_module_1.ArchitectBaseComm
             configuration,
         };
     }
+    /** @returns a sorted list of target specifiers to be used for auto completion. */
+    getTargetChoices() {
+        if (!this.context.workspace) {
+            return;
+        }
+        const targets = [];
+        for (const [projectName, project] of this.context.workspace.projects) {
+            for (const [targetName, target] of project.targets) {
+                const currentTarget = `${projectName}:${targetName}`;
+                targets.push(currentTarget);
+                if (!target.configurations) {
+                    continue;
+                }
+                for (const configName of Object.keys(target.configurations)) {
+                    targets.push(`${currentTarget}:${configName}`);
+                }
+            }
+        }
+        return targets.sort();
+    }
 }
 exports.RunCommandModule = RunCommandModule;
 RunCommandModule.scope = command_module_1.CommandScope.In;

package/src/commands/update/cli.d.ts

@@ -50,5 +50,6 @@ export declare class UpdateCommandModule extends CommandModule<UpdateCommandArgs
      */
     private checkCLIVersion;
     private getCLIUpdateRunnerVersion;
+    private runTempBinary;
 }
 export {};