@angular/cli 14.0.0-next.5 → 14.0.0-next.8

package/src/commands/config/cli.js

@@ -9,12 +9,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigCommandModule = void 0;
 const path_1 = require("path");
+const uuid_1 = require("uuid");
 const command_module_1 = require("../../command-builder/command-module");
-const config_impl_1 = require("./config-impl");
+const config_1 = require("../../utilities/config");
+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');
     }
@@ -24,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.',
@@ -38,9 +39,130 @@ class ConfigCommandModule extends command_module_1.CommandModule {
         })
             .strict();
     }
-    run(options) {
-        const command = new config_impl_1.ConfigCommand(this.context, 'config');
-        return command.validateAndRun(options);
+    async run(options) {
+        const level = options.global ? 'global' : 'local';
+        const [config] = (0, config_1.getWorkspaceRaw)(level);
+        if (options.value == undefined) {
+            if (!config) {
+                this.context.logger.error('No config found.');
+                return 1;
+            }
+            return this.get(config, options);
+        }
+        else {
+            return this.set(options);
+        }
+    }
+    get(jsonFile, options) {
+        const { logger } = this.context;
+        const value = options.jsonPath
+            ? jsonFile.get(parseJsonPath(options.jsonPath))
+            : jsonFile.content;
+        if (value === undefined) {
+            logger.error('Value cannot be found.');
+            return 1;
+        }
+        else if (typeof value === 'string') {
+            logger.info(value);
+        }
+        else {
+            logger.info(JSON.stringify(value, null, 2));
+        }
+        return 0;
+    }
+    async set(options) {
+        var _a, _b, _c;
+        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.schematicCollections', 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],
+        ]);
+        if (options.global &&
+            !options.jsonPath.startsWith('schematics.') &&
+            !validCliPaths.has(options.jsonPath)) {
+            throw new command_module_1.CommandModuleError('Invalid Path.');
+        }
+        const [config, configPath] = (0, config_1.getWorkspaceRaw)(options.global ? 'global' : 'local');
+        const { logger } = this.context;
+        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 modified = config.modify(parseJsonPath(options.jsonPath), normalizeValue(value));
+        if (!modified) {
+            logger.error('Value cannot be found.');
+            return 1;
+        }
+        await (0, config_1.validateWorkspace)((0, json_file_1.parseJson)(config.content));
+        config.save();
+        return 0;
     }
 }
 exports.ConfigCommandModule = ConfigCommandModule;
+/**
+ * Splits a JSON path string into fragments. Fragments can be used to get the value referenced
+ * by the path. For example, a path of "a[3].foo.bar[2]" would give you a fragment array of
+ * ["a", 3, "foo", "bar", 2].
+ * @param path The JSON string to parse.
+ * @returns {(string|number)[]} The fragments for the string.
+ * @private
+ */
+function parseJsonPath(path) {
+    const fragments = (path || '').split(/\./g);
+    const result = [];
+    while (fragments.length > 0) {
+        const fragment = fragments.shift();
+        if (fragment == undefined) {
+            break;
+        }
+        const match = fragment.match(/([^[]+)((\[.*\])*)/);
+        if (!match) {
+            throw new command_module_1.CommandModuleError('Invalid JSON path.');
+        }
+        result.push(match[1]);
+        if (match[2]) {
+            const indices = match[2]
+                .slice(1, -1)
+                .split('][')
+                .map((x) => (/^\d$/.test(x) ? +x : x.replace(/"|'/g, '')));
+            result.push(...indices);
+        }
+    }
+    return result.filter((fragment) => fragment != null);
+}
+function normalizeValue(value) {
+    const valueString = `${value}`.trim();
+    switch (valueString) {
+        case 'true':
+            return true;
+        case 'false':
+            return false;
+        case 'null':
+            return null;
+        case 'undefined':
+            return undefined;
+    }
+    if (isFinite(+valueString)) {
+        return +valueString;
+    }
+    try {
+        // We use `JSON.parse` instead of `parseJson` because the latter will parse UUIDs
+        // and convert them into a numberic entities.
+        // Example: 73b61974-182c-48e4-b4c6-30ddf08c5c98 -> 73.
+        // These values should never contain comments, therefore using `JSON.parse` is safe.
+        return JSON.parse(valueString);
+    }
+    catch {
+        return value;
+    }
+}

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/doc/cli.js

@@ -8,7 +8,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

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

@@ -8,7 +8,7 @@
 import { Argv } from 'yargs';
 import { CommandModuleImplementation, Options, OtherOptions } from '../../command-builder/command-module';
 import { SchematicsCommandArgs, SchematicsCommandModule } from '../../command-builder/schematics-command-module';
-export interface GenerateCommandArgs extends SchematicsCommandArgs {
+interface GenerateCommandArgs extends SchematicsCommandArgs {
     schematic?: string;
 }
 export declare class GenerateCommandModule extends SchematicsCommandModule implements CommandModuleImplementation<GenerateCommandArgs> {
@@ -17,11 +17,23 @@ export declare class GenerateCommandModule extends SchematicsCommandModule imple
     describe: string;
     longDescriptionPath?: string | undefined;
     builder(argv: Argv): Promise<Argv<GenerateCommandArgs>>;
-    run(options: Options<GenerateCommandArgs> & OtherOptions): number | void | Promise<number | void>;
+    run(options: Options<GenerateCommandArgs> & OtherOptions): Promise<number | void>;
+    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,49 +9,37 @@
 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 generate_impl_1 = require("./generate-impl");
+const command_1 = require("../../command-builder/utilities/command");
 class GenerateCommandModule extends schematics_command_module_1.SchematicsCommandModule {
     constructor() {
         super(...arguments);
-        this.command = 'generate [schematic]';
+        this.command = 'generate';
         this.aliases = 'g';
         this.describe = 'Generates and/or modifies files based on a schematic.';
     }
     async builder(argv) {
-        const [, schematicNameFromArgs] = this.parseSchematicInfo(
-        // positional = [generate, component] or [generate]
-        this.context.args.positional[1]);
-        const baseYargs = await super.builder(argv);
-        if (this.schematicName) {
-            return baseYargs;
-        }
-        // When we do know the schematic name we need to add the 'schematic'
-        // positional option as the schematic will be accessable as a subcommand.
-        let localYargs = schematicNameFromArgs
-            ? baseYargs
-            : baseYargs.positional('schematic', {
-                describe: 'The schematic or collection:schematic to generate.',
+        let localYargs = (await super.builder(argv)).command({
+            command: '$0 <schematic>',
+            describe: 'Run the provided schematic.',
+            builder: (localYargs) => localYargs
+                .positional('schematic', {
+                describe: 'The [collection:schematic] to run.',
                 type: 'string',
                 demandOption: true,
-            });
-        const collectionName = await this.getCollectionName();
-        const workflow = this.getOrCreateWorkflow(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());
-        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);
+            })
+                .strict(),
+            handler: (options) => this.handler(options),
+        });
+        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),
@@ -63,11 +51,31 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
                 handler: (options) => this.handler({ ...options, schematic: `${collectionName}:${schematicName}` }),
             });
         }
-        return localYargs;
+        return localYargs.demandCommand(1, command_1.demandCommandFailureMessage);
     }
-    run(options) {
-        const command = new generate_impl_1.GenerateCommand(this.context, 'generate');
-        return command.validateAndRun(options);
+    async run(options) {
+        const { dryRun, schematic, defaults, force, interactive, ...schematicOptions } = options;
+        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,
+            schematicOptions,
+            executionOptions: {
+                dryRun,
+                defaults,
+                force,
+                interactive,
+            },
+        });
+    }
+    async getCollectionNames() {
+        const [collectionName] = this.parseSchematicInfo(
+        // positional = [generate, component] or [generate]
+        this.context.args.positional[1]);
+        return collectionName ? [collectionName] : [...(await this.getSchematicCollections())];
     }
     /**
      * Generate a command string to be passed to the command builder.
@@ -79,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
@@ -94,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

@@ -8,16 +8,20 @@
 import { Argv } from 'yargs';
 import { CommandModuleImplementation, CommandScope, Options, OtherOptions } from '../../command-builder/command-module';
 import { SchematicsCommandArgs, SchematicsCommandModule } from '../../command-builder/schematics-command-module';
-export interface NewCommandArgs extends SchematicsCommandArgs {
+interface NewCommandArgs extends SchematicsCommandArgs {
     collection?: string;
 }
 export declare class NewCommandModule extends SchematicsCommandModule implements CommandModuleImplementation<NewCommandArgs> {
-    protected schematicName: string;
+    private readonly schematicName;
     static scope: CommandScope;
+    protected allowPrivateSchematics: boolean;
     command: string;
     aliases: string;
     describe: string;
     longDescriptionPath?: string | undefined;
     builder(argv: Argv): Promise<Argv<NewCommandArgs>>;
-    run(options: Options<NewCommandArgs> & OtherOptions): number | void | Promise<number | void>;
+    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,26 +10,72 @@ 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 new_impl_1 = require("./new-impl");
+const version_1 = require("../../utilities/version");
 class NewCommandModule extends schematics_command_module_1.SchematicsCommandModule {
     constructor() {
         super(...arguments);
         this.schematicName = 'ng-new';
+        this.allowPrivateSchematics = true;
         this.command = 'new [name]';
         this.aliases = 'n';
         this.describe = 'Creates a new Angular workspace.';
     }
     async builder(argv) {
-        const baseYargs = await super.builder(argv);
-        return baseYargs.option('collection', {
+        const localYargs = (await super.builder(argv)).option('collection', {
             alias: 'c',
             describe: 'A collection of schematics to use in generating the initial application.',
             type: 'string',
         });
+        const { options: { collectionNameFromArgs }, } = this.context.args;
+        const collectionName = typeof collectionNameFromArgs === 'string'
+            ? collectionNameFromArgs
+            : await this.getCollectionFromConfig();
+        const workflow = await this.getOrCreateWorkflowForBuilder(collectionName);
+        const collection = workflow.engine.createCollection(collectionName);
+        const options = await this.getSchematicOptions(collection, this.schematicName, workflow);
+        return this.addSchemaOptionsToCommand(localYargs, options);
     }
-    run(options) {
-        const command = new new_impl_1.NewCommand(this.context, 'new');
-        return command.validateAndRun(options);
+    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.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')) {
+            this.context.packageManager.ensureCompatibility();
+        }
+        return this.runSchematic({
+            collectionName,
+            schematicName: this.schematicName,
+            schematicOptions,
+            executionOptions: {
+                dryRun,
+                force,
+                interactive,
+                defaults,
+            },
+        });
+    }
+    /** 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;