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

package/bin/ng.js

@@ -36,19 +36,17 @@ if (version[0] % 2 === 1 && version[0] > 16) {
 
   require('./bootstrap');
 } else if (
-  version[0] < 12 ||
-  version[0] === 13 ||
+  version[0] < 14 ||
   version[0] === 15 ||
-  (version[0] === 12 && version[1] < 20) ||
   (version[0] === 14 && version[1] < 15) ||
   (version[0] === 16 && version[1] < 10)
 ) {
-  // Error and exit if less than 12.20 or 13.x or less than 14.15 or 15.x or less than 16.10
+  // Error and exit if less than 14.15 or 15.x or less than 16.10
   console.error(
     'Node.js version ' +
       process.version +
       ' detected.\n' +
-      'The Angular CLI requires a minimum Node.js version of either v12.20, v14.15, or v16.10.\n\n' +
+      'The Angular CLI requires a minimum Node.js version of either v14.15, or v16.10.\n\n' +
       'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n',
   );
 

package/bin/postinstall/analytics-prompt.js

@@ -14,7 +14,7 @@ if ('NG_CLI_ANALYTICS' in process.env) {
 }
 
 try {
-  var analytics = require('../../models/analytics');
+  var analytics = require('../../src/analytics/analytics');
 
   analytics
     .hasGlobalAnalyticsConfiguration()

package/lib/cli/index.d.ts

@@ -5,7 +5,7 @@
  * 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
  */
-export { VERSION, Version } from '../../models/version';
+export { VERSION } from '../../src/utilities/version';
 export default function (options: {
     testing?: boolean;
     cliArgs: string[];

package/lib/cli/index.js

@@ -7,26 +7,26 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Version = exports.VERSION = void 0;
+exports.VERSION = void 0;
 const node_1 = require("@angular-devkit/core/node");
 const util_1 = require("util");
-const command_runner_1 = require("../../models/command-runner");
-const color_1 = require("../../utilities/color");
-const config_1 = require("../../utilities/config");
-const log_file_1 = require("../../utilities/log-file");
-const project_1 = require("../../utilities/project");
-var version_1 = require("../../models/version");
+const command_module_1 = require("../../src/command-builder/command-module");
+const command_runner_1 = require("../../src/command-builder/command-runner");
+const color_1 = require("../../src/utilities/color");
+const config_1 = require("../../src/utilities/config");
+const log_file_1 = require("../../src/utilities/log-file");
+const project_1 = require("../../src/utilities/project");
+var version_1 = require("../../src/utilities/version");
 Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
-Object.defineProperty(exports, "Version", { enumerable: true, get: function () { return version_1.Version; } });
 const debugEnv = process.env['NG_DEBUG'];
 const isDebug = debugEnv !== undefined && debugEnv !== '0' && debugEnv.toLowerCase() !== 'false';
 /* eslint-disable no-console */
 async function default_1(options) {
     // This node version check ensures that the requirements of the project instance of the CLI are met
-    const version = process.versions.node.split('.').map((part) => Number(part));
-    if (version[0] < 12 || (version[0] === 12 && version[1] < 20)) {
+    const [major, minor] = process.versions.node.split('.').map((part) => Number(part));
+    if (major < 14 || (major === 14 && minor < 15)) {
         process.stderr.write(`Node.js version ${process.version} detected.\n` +
-            'The Angular CLI requires a minimum v12.20.\n\n' +
+            'The Angular CLI requires a minimum v14.15.\n\n' +
             'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n');
         return 3;
     }
@@ -67,15 +67,13 @@ async function default_1(options) {
         }
     }
     try {
-        const maybeExitCode = await (0, command_runner_1.runCommand)(options.cliArgs, logger, workspace);
-        if (typeof maybeExitCode === 'number') {
-            console.assert(Number.isInteger(maybeExitCode));
-            return maybeExitCode;
-        }
-        return 0;
+        return await (0, command_runner_1.runCommand)(options.cliArgs, logger, workspace);
     }
     catch (err) {
-        if (err instanceof Error) {
+        if (err instanceof command_module_1.CommandModuleError) {
+            logger.fatal(`Error: ${err.message}`);
+        }
+        else if (err instanceof Error) {
             try {
                 const logPath = (0, log_file_1.writeErrorToLogFile)(err);
                 logger.fatal(`An unhandled exception occurred: ${err.message}\n` +

package/lib/config/schema.json

@@ -741,8 +741,7 @@
         },
         "type": {
           "type": "string",
-          "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
-          "default": ""
+          "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\"."
         }
       }
     },
@@ -1129,7 +1128,6 @@
         },
         "prefix": {
           "type": "string",
-          "default": "",
           "description": "A prefix to apply to generated selectors."
         },
         "type": {
@@ -1751,12 +1749,11 @@
         },
         "outputPath": {
           "type": "string",
-          "description": "The full path for the new output directory, relative to the current workspace.\n\nBy default, writes output to a folder named dist/ in the current project."
+          "description": "The full path for the new output directory, relative to the current workspace.\nBy default, writes output to a folder named dist/ in the current project."
         },
         "resourcesOutputPath": {
           "type": "string",
-          "description": "The path where style resources will be placed, relative to outputPath.",
-          "default": ""
+          "description": "The path where style resources will be placed, relative to outputPath."
         },
         "aot": {
           "type": "boolean",
@@ -2664,8 +2661,7 @@
         },
         "resourcesOutputPath": {
           "type": "string",
-          "description": "The path where style resources will be placed, relative to outputPath.",
-          "default": ""
+          "description": "The path where style resources will be placed, relative to outputPath."
         },
         "sourceMap": {
           "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",

package/lib/init.js

@@ -31,9 +31,9 @@ require("symbol-observable");
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const semver_1 = require("semver");
-const version_1 = require("../models/version");
-const color_1 = require("../utilities/color");
-const config_1 = require("../utilities/config");
+const color_1 = require("../src/utilities/color");
+const config_1 = require("../src/utilities/config");
+const version_1 = require("../src/utilities/version");
 (async () => {
     var _a;
     /**

package/models/command.d.ts

@@ -6,29 +6,24 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { analytics, logging } from '@angular-devkit/core';
-import { AngularWorkspace } from '../utilities/config';
-import { Arguments, CommandContext, CommandDescription, CommandDescriptionMap, CommandScope, Option } from './interface';
+import { Option } from '../src/command-builder/utilities/json-schema';
+import { AngularWorkspace } from '../src/utilities/config';
+import { CommandContext } from './interface';
 export interface BaseCommandOptions {
-    help?: boolean | string;
+    jsonHelp?: boolean;
 }
-export declare abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> {
+export declare abstract class Command<T = {}> {
     protected readonly context: CommandContext;
-    readonly description: CommandDescription;
-    protected readonly logger: logging.Logger;
+    protected readonly commandName: string;
     protected allowMissingWorkspace: boolean;
     protected useReportAnalytics: boolean;
     readonly workspace?: AngularWorkspace;
-    readonly analytics: analytics.Analytics;
-    protected static commandMap: () => Promise<CommandDescriptionMap>;
-    static setCommandMap(map: () => Promise<CommandDescriptionMap>): void;
-    constructor(context: CommandContext, description: CommandDescription, logger: logging.Logger);
-    initialize(options: T & Arguments): Promise<number | void>;
-    printHelp(): Promise<number>;
-    printJsonHelp(): Promise<number>;
-    protected printHelpUsage(): Promise<void>;
-    protected printHelpOptions(options?: Option[]): Promise<void>;
-    validateScope(scope?: CommandScope): Promise<void>;
-    reportAnalytics(paths: string[], options: Arguments, dimensions?: (boolean | number | string)[], metrics?: (boolean | number | string)[]): Promise<void>;
-    abstract run(options: T & Arguments): Promise<number | void>;
-    validateAndRun(options: T & Arguments): Promise<number | void>;
+    protected readonly analytics: analytics.Analytics;
+    protected readonly commandOptions: Option[];
+    protected readonly logger: logging.Logger;
+    constructor(context: CommandContext, commandName: string);
+    initialize(options: T): Promise<number | void>;
+    reportAnalytics(paths: string[], options: T, dimensions?: (boolean | number | string)[], metrics?: (boolean | number | string)[]): Promise<void>;
+    abstract run(options: T): Promise<number | void>;
+    validateAndRun(options: T): Promise<number | void>;
 }

package/models/command.js

@@ -9,104 +9,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Command = void 0;
 const core_1 = require("@angular-devkit/core");
-const color_1 = require("../utilities/color");
-const interface_1 = require("./interface");
 class Command {
-    constructor(context, description, logger) {
+    constructor(context, commandName) {
         this.context = context;
-        this.description = description;
-        this.logger = logger;
+        this.commandName = commandName;
         this.allowMissingWorkspace = false;
         this.useReportAnalytics = true;
+        this.commandOptions = [];
         this.workspace = context.workspace;
+        this.logger = context.logger;
         this.analytics = context.analytics || new core_1.analytics.NoopAnalytics();
     }
-    static setCommandMap(map) {
-        this.commandMap = map;
-    }
     async initialize(options) { }
-    async printHelp() {
-        await this.printHelpUsage();
-        await this.printHelpOptions();
-        return 0;
-    }
-    async printJsonHelp() {
-        const replacer = (key, value) => key === 'name' ? core_1.strings.dasherize(value) : value;
-        this.logger.info(JSON.stringify(this.description, replacer, 2));
-        return 0;
-    }
-    async printHelpUsage() {
-        this.logger.info(this.description.description);
-        const name = this.description.name;
-        const args = this.description.options.filter((x) => x.positional !== undefined);
-        const opts = this.description.options.filter((x) => x.positional === undefined);
-        const argDisplay = args && args.length > 0 ? ' ' + args.map((a) => `<${a.name}>`).join(' ') : '';
-        const optionsDisplay = opts && opts.length > 0 ? ` [options]` : ``;
-        this.logger.info(`usage: ng ${name}${argDisplay}${optionsDisplay}`);
-        this.logger.info('');
-    }
-    async printHelpOptions(options = this.description.options) {
-        const args = options.filter((opt) => opt.positional !== undefined);
-        const opts = options.filter((opt) => opt.positional === undefined);
-        const formatDescription = (description) => `    ${description.replace(/\n/g, '\n    ')}`;
-        if (args.length > 0) {
-            this.logger.info(`arguments:`);
-            args.forEach((o) => {
-                this.logger.info(`  ${color_1.colors.cyan(o.name)}`);
-                if (o.description) {
-                    this.logger.info(formatDescription(o.description));
-                }
-            });
-        }
-        if (options.length > 0) {
-            if (args.length > 0) {
-                this.logger.info('');
-            }
-            this.logger.info(`options:`);
-            opts
-                .filter((o) => !o.hidden)
-                .sort((a, b) => a.name.localeCompare(b.name))
-                .forEach((o) => {
-                const aliases = o.aliases && o.aliases.length > 0
-                    ? '(' + o.aliases.map((a) => `-${a}`).join(' ') + ')'
-                    : '';
-                this.logger.info(`  ${color_1.colors.cyan('--' + core_1.strings.dasherize(o.name))} ${aliases}`);
-                if (o.description) {
-                    this.logger.info(formatDescription(o.description));
-                }
-            });
-        }
-    }
-    async validateScope(scope) {
-        switch (scope === undefined ? this.description.scope : scope) {
-            case interface_1.CommandScope.OutProject:
-                if (this.workspace) {
-                    this.logger.fatal(core_1.tags.oneLine `
-            The ${this.description.name} command requires to be run outside of a project, but a
-            project definition was found at "${this.workspace.filePath}".
-          `);
-                    // eslint-disable-next-line no-throw-literal
-                    throw 1;
-                }
-                break;
-            case interface_1.CommandScope.InProject:
-                if (!this.workspace) {
-                    this.logger.fatal(core_1.tags.oneLine `
-            The ${this.description.name} command requires to be run in an Angular project, but a
-            project definition could not be found.
-          `);
-                    // eslint-disable-next-line no-throw-literal
-                    throw 1;
-                }
-                break;
-            case interface_1.CommandScope.Everywhere:
-                // Can't miss this.
-                break;
-        }
-    }
     async reportAnalytics(paths, options, dimensions = [], metrics = []) {
-        for (const option of this.description.options) {
+        for (const option of this.commandOptions) {
             const ua = option.userAnalytics;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const v = options[option.name];
             if (v !== undefined && !Array.isArray(v) && ua) {
                 dimensions[ua] = v;
@@ -115,29 +33,18 @@ class Command {
         this.analytics.pageview('/command/' + paths.join('/'), { dimensions, metrics });
     }
     async validateAndRun(options) {
-        if (!(options.help === true || options.help === 'json' || options.help === 'JSON')) {
-            await this.validateScope();
-        }
         let result = await this.initialize(options);
         if (typeof result === 'number' && result !== 0) {
             return result;
         }
-        if (options.help === true) {
-            return this.printHelp();
-        }
-        else if (options.help === 'json' || options.help === 'JSON') {
-            return this.printJsonHelp();
-        }
-        else {
-            const startTime = +new Date();
-            if (this.useReportAnalytics) {
-                await this.reportAnalytics([this.description.name], options);
-            }
-            result = await this.run(options);
-            const endTime = +new Date();
-            this.analytics.timing(this.description.name, 'duration', endTime - startTime);
-            return result;
+        const startTime = +new Date();
+        if (this.useReportAnalytics) {
+            await this.reportAnalytics([this.commandName], options);
         }
+        result = await this.run(options);
+        const endTime = +new Date();
+        this.analytics.timing(this.commandName, 'duration', endTime - startTime);
+        return result;
     }
 }
 exports.Command = Command;

package/models/interface.d.ts

@@ -5,36 +5,8 @@
  * 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 { analytics, json, logging } from '@angular-devkit/core';
-import { AngularWorkspace } from '../utilities/config';
-/**
- * Value type of arguments.
- */
-export declare type Value = number | string | boolean | (number | string | boolean)[];
-/**
- * An object representing parsed arguments from the command line.
- */
-export interface Arguments {
-    [argName: string]: Value | undefined;
-    /**
-     * Extra arguments that were not parsed. Will be omitted if all arguments were parsed.
-     */
-    '--'?: string[];
-}
-/**
- * The base interface for Command, understood by the command runner.
- */
-export interface CommandInterface<T extends Arguments = Arguments> {
-    printHelp(options: T): Promise<number>;
-    printJsonHelp(options: T): Promise<number>;
-    validateAndRun(options: T): Promise<number>;
-}
-/**
- * Command constructor.
- */
-export interface CommandConstructor {
-    new (context: CommandContext, description: CommandDescription, logger: logging.Logger): CommandInterface;
-}
+import { analytics, logging } from '@angular-devkit/core';
+import { AngularWorkspace } from '../src/utilities/config';
 /**
  * A command runner context.
  */
@@ -43,154 +15,5 @@ export interface CommandContext {
     root: string;
     workspace?: AngularWorkspace;
     analytics?: analytics.Analytics;
-}
-/**
- * Value types of an Option.
- */
-export declare enum OptionType {
-    Any = "any",
-    Array = "array",
-    Boolean = "boolean",
-    Number = "number",
-    String = "string"
-}
-/**
- * An option description. This is exposed when using `ng --help=json`.
- */
-export interface Option {
-    /**
-     * The name of the option.
-     */
-    name: string;
-    /**
-     * A short description of the option.
-     */
-    description: string;
-    /**
-     * The type of option value. If multiple types exist, this type will be the first one, and the
-     * types array will contain all types accepted.
-     */
-    type: OptionType;
-    /**
-     * {@see type}
-     */
-    types?: OptionType[];
-    /**
-     * If this field is set, only values contained in this field are valid. This array can be mixed
-     * types (strings, numbers, boolean). For example, if this field is "enum: ['hello', true]",
-     * then "type" will be either string or boolean, types will be at least both, and the values
-     * accepted will only be either 'hello' or true (not false or any other string).
-     * This mean that prefixing with `no-` will not work on this field.
-     */
-    enum?: Value[];
-    /**
-     * If this option maps to a subcommand in the parent command, will contain all the subcommands
-     * supported. There is a maximum of 1 subcommand Option per command, and the type of this
-     * option will always be "string" (no other types). The value of this option will map into
-     * this map and return the extra information.
-     */
-    subcommands?: {
-        [name: string]: SubCommandDescription;
-    };
-    /**
-     * Aliases supported by this option.
-     */
-    aliases: string[];
-    /**
-     * Whether this option is required or not.
-     */
-    required?: boolean;
-    /**
-     * Format field of this option.
-     */
-    format?: string;
-    /**
-     * Whether this option should be hidden from the help output. It will still show up in JSON help.
-     */
-    hidden?: boolean;
-    /**
-     * Default value of this option.
-     */
-    default?: string | number | boolean;
-    /**
-     * If this option can be used as an argument, the position of the argument. Otherwise omitted.
-     */
-    positional?: number;
-    /**
-     * Smart default object.
-     */
-    $default?: OptionSmartDefault;
-    /**
-     * Whether or not to report this option to the Angular Team, and which custom field to use.
-     * If this is falsey, do not report this option.
-     */
-    userAnalytics?: number;
-    /**
-     * Deprecation. If this flag is not false a warning will be shown on the console. Either `true`
-     * or a string to show the user as a notice.
-     */
-    deprecated?: boolean | string;
-}
-/**
- * Scope of the command.
- */
-export declare enum CommandScope {
-    InProject = "in",
-    OutProject = "out",
-    Everywhere = "all",
-    Default = "in"
-}
-/**
- * A description of a command and its options.
- */
-export interface SubCommandDescription {
-    /**
-     * The name of the subcommand.
-     */
-    name: string;
-    /**
-     * Short description (1-2 lines) of this sub command.
-     */
-    description: string;
-    /**
-     * A long description of the sub command, in Markdown format.
-     */
-    longDescription?: string;
-    /**
-     * Additional notes about usage of this sub command, in Markdown format.
-     */
-    usageNotes?: string;
-    /**
-     * List of all supported options.
-     */
-    options: Option[];
-    /**
-     * Aliases supported for this sub command.
-     */
-    aliases: string[];
-}
-/**
- * A description of a command, its metadata.
- */
-export interface CommandDescription extends SubCommandDescription {
-    /**
-     * Scope of the command, whether it can be executed in a project, outside of a project or
-     * anywhere.
-     */
-    scope: CommandScope;
-    /**
-     * Whether this command should be hidden from a list of all commands.
-     */
-    hidden: boolean;
-    /**
-     * The constructor of the command, which should be extending the abstract Command<> class.
-     */
-    impl: CommandConstructor;
-}
-export interface OptionSmartDefault {
-    $source: string;
-    [key: string]: json.JsonValue;
-}
-export interface CommandDescriptionMap {
-    [key: string]: CommandDescription;
+    logger: logging.Logger;
 }

package/models/interface.js

@@ -7,25 +7,3 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandScope = exports.OptionType = void 0;
-/**
- * Value types of an Option.
- */
-var OptionType;
-(function (OptionType) {
-    OptionType["Any"] = "any";
-    OptionType["Array"] = "array";
-    OptionType["Boolean"] = "boolean";
-    OptionType["Number"] = "number";
-    OptionType["String"] = "string";
-})(OptionType = exports.OptionType || (exports.OptionType = {}));
-/**
- * Scope of the command.
- */
-var CommandScope;
-(function (CommandScope) {
-    CommandScope["InProject"] = "in";
-    CommandScope["OutProject"] = "out";
-    CommandScope["Everywhere"] = "all";
-    CommandScope["Default"] = "in";
-})(CommandScope = exports.CommandScope || (exports.CommandScope = {}));

package/models/schematic-command.d.ts

@@ -5,26 +5,21 @@
  * 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 { logging } from '@angular-devkit/core';
-import { workflow } from '@angular-devkit/schematics';
 import { FileSystemCollection, FileSystemEngine, FileSystemSchematic, NodeWorkflow } from '@angular-devkit/schematics/tools';
 import { BaseCommandOptions, Command } from './command';
-import { Arguments, CommandContext, CommandDescription, Option } from './interface';
+import { CommandContext } from './interface';
 export interface BaseSchematicSchema {
     debug?: boolean;
     dryRun?: boolean;
     force?: boolean;
     interactive?: boolean;
     defaults?: boolean;
-    packageRegistry?: string;
+    registry?: string;
 }
 export interface RunSchematicOptions extends BaseSchematicSchema {
     collectionName: string;
     schematicName: string;
-    additionalOptions?: {
-        [key: string]: {};
-    };
-    schematicOptions?: string[];
+    schematicOptions?: Record<string, unknown>;
     showNothingDone?: boolean;
 }
 export declare class UnknownCollectionError extends Error {
@@ -37,19 +32,12 @@ export declare abstract class SchematicCommand<T extends BaseSchematicSchema & B
     protected defaultCollectionName: string;
     protected collectionName: string;
     protected schematicName?: string;
-    constructor(context: CommandContext, description: CommandDescription, logger: logging.Logger);
-    initialize(options: T & Arguments): Promise<void>;
-    printHelp(): Promise<number>;
-    printHelpUsage(): Promise<void>;
+    constructor(context: CommandContext, commandName: string);
+    initialize(options: T): Promise<void>;
     protected getEngine(): FileSystemEngine;
     protected getCollection(collectionName: string): FileSystemCollection;
     protected getSchematic(collection: FileSystemCollection, schematicName: string, allowPrivate?: boolean): FileSystemSchematic;
-    protected setPathOptions(options: Option[], workingDir: string): {
-        [name: string]: string;
-    };
-    protected createWorkflow(options: BaseSchematicSchema): Promise<workflow.BaseWorkflow>;
+    protected createWorkflow(options: BaseSchematicSchema): Promise<NodeWorkflow>;
     protected getDefaultSchematicCollection(): Promise<string>;
     protected runSchematic(options: RunSchematicOptions): Promise<number | void>;
-    protected parseFreeFormArguments(schematicOptions: string[]): Promise<Arguments>;
-    protected parseArguments(schematicOptions: string[], options: Option[] | null): Promise<Arguments>;
 }