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

package/models/command.d.ts

@@ -1,29 +0,0 @@
-/**
- * @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 { analytics, logging } from '@angular-devkit/core';
-import { Option } from '../src/command-builder/utilities/json-schema';
-import { AngularWorkspace } from '../src/utilities/config';
-import { CommandContext } from './interface';
-export interface BaseCommandOptions {
-    jsonHelp?: boolean;
-}
-export declare abstract class Command<T = {}> {
-    protected readonly context: CommandContext;
-    protected readonly commandName: string;
-    protected allowMissingWorkspace: boolean;
-    protected useReportAnalytics: boolean;
-    readonly workspace?: AngularWorkspace;
-    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

@@ -1,50 +0,0 @@
-"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.Command = void 0;
-const core_1 = require("@angular-devkit/core");
-class Command {
-    constructor(context, commandName) {
-        this.context = context;
-        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();
-    }
-    async initialize(options) { }
-    async reportAnalytics(paths, options, dimensions = [], metrics = []) {
-        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;
-            }
-        }
-        this.analytics.pageview('/command/' + paths.join('/'), { dimensions, metrics });
-    }
-    async validateAndRun(options) {
-        let result = await this.initialize(options);
-        if (typeof result === 'number' && result !== 0) {
-            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

@@ -1,19 +0,0 @@
-/**
- * @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 { analytics, logging } from '@angular-devkit/core';
-import { AngularWorkspace } from '../src/utilities/config';
-/**
- * A command runner context.
- */
-export interface CommandContext {
-    currentDirectory: string;
-    root: string;
-    workspace?: AngularWorkspace;
-    analytics?: analytics.Analytics;
-    logger: logging.Logger;
-}

package/models/interface.js

@@ -1,9 +0,0 @@
-"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 });

package/models/schematic-command.d.ts

@@ -1,43 +0,0 @@
-/**
- * @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 { FileSystemCollection, FileSystemEngine, FileSystemSchematic, NodeWorkflow } from '@angular-devkit/schematics/tools';
-import { BaseCommandOptions, Command } from './command';
-import { CommandContext } from './interface';
-export interface BaseSchematicSchema {
-    debug?: boolean;
-    dryRun?: boolean;
-    force?: boolean;
-    interactive?: boolean;
-    defaults?: boolean;
-    registry?: string;
-}
-export interface RunSchematicOptions extends BaseSchematicSchema {
-    collectionName: string;
-    schematicName: string;
-    schematicOptions?: Record<string, unknown>;
-    showNothingDone?: boolean;
-}
-export declare class UnknownCollectionError extends Error {
-    constructor(collectionName: string);
-}
-export declare abstract class SchematicCommand<T extends BaseSchematicSchema & BaseCommandOptions> extends Command<T> {
-    protected readonly allowPrivateSchematics: boolean;
-    protected readonly useReportAnalytics = false;
-    protected _workflow: NodeWorkflow;
-    protected defaultCollectionName: string;
-    protected collectionName: string;
-    protected schematicName?: string;
-    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 createWorkflow(options: BaseSchematicSchema): Promise<NodeWorkflow>;
-    protected getDefaultSchematicCollection(): Promise<string>;
-    protected runSchematic(options: RunSchematicOptions): Promise<number | void>;
-}

package/models/schematic-command.js

@@ -1,378 +0,0 @@
-"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 __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]; } });
-}) : (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 __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.SchematicCommand = exports.UnknownCollectionError = 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 = __importStar(require("inquirer"));
-const systemPath = __importStar(require("path"));
-const analytics_1 = require("../src/analytics/analytics");
-const json_schema_1 = require("../src/command-builder/utilities/json-schema");
-const color_1 = require("../src/utilities/color");
-const config_1 = require("../src/utilities/config");
-const package_manager_1 = require("../src/utilities/package-manager");
-const tty_1 = require("../src/utilities/tty");
-const command_1 = require("./command");
-const schematic_engine_host_1 = require("./schematic-engine-host");
-class UnknownCollectionError extends Error {
-    constructor(collectionName) {
-        super(`Invalid collection (${collectionName}).`);
-    }
-}
-exports.UnknownCollectionError = UnknownCollectionError;
-class SchematicCommand extends command_1.Command {
-    constructor(context, commandName) {
-        super(context, commandName);
-        this.allowPrivateSchematics = false;
-        this.useReportAnalytics = false;
-        this.defaultCollectionName = '@schematics/angular';
-        this.collectionName = this.defaultCollectionName;
-    }
-    async initialize(options) {
-        this._workflow = await this.createWorkflow(options);
-        if (this.schematicName) {
-            // Set the options.
-            const collection = this.getCollection(this.collectionName);
-            const schematic = this.getSchematic(collection, this.schematicName, true);
-            const options = await (0, json_schema_1.parseJsonSchemaToOptions)(this._workflow.registry, schematic.description.schemaJson || {});
-            this.commandOptions.push(...options);
-            // Remove any user analytics from schematics that are NOT part of our safelist.
-            for (const o of this.commandOptions) {
-                if (o.userAnalytics && !(0, analytics_1.isPackageNameSafeForAnalytics)(this.collectionName)) {
-                    o.userAnalytics = undefined;
-                }
-            }
-        }
-    }
-    getEngine() {
-        return this._workflow.engine;
-    }
-    getCollection(collectionName) {
-        const engine = this.getEngine();
-        const collection = engine.createCollection(collectionName);
-        if (collection === null) {
-            throw new UnknownCollectionError(collectionName);
-        }
-        return collection;
-    }
-    getSchematic(collection, schematicName, allowPrivate) {
-        return collection.createSchematic(schematicName, allowPrivate);
-    }
-    /*
-     * Runtime hook to allow specifying customized workflow
-     */
-    async createWorkflow(options) {
-        if (this._workflow) {
-            return this._workflow;
-        }
-        const { force, dryRun } = options;
-        const root = this.context.root;
-        const workflow = new tools_1.NodeWorkflow(root, {
-            force,
-            dryRun,
-            packageManager: await (0, package_manager_1.getPackageManager)(root),
-            packageRegistry: options.registry,
-            // A schema registry is required to allow customizing addUndefinedDefaults
-            registry: new core_1.schema.CoreSchemaRegistry(schematics_1.formats.standardFormats),
-            resolvePaths: this.workspace
-                ? // Workspace
-                    this.collectionName === this.defaultCollectionName
-                        ? // Favor __dirname for @schematics/angular to use the build-in version
-                            [__dirname, process.cwd(), root]
-                        : [process.cwd(), root, __dirname]
-                : // Global
-                    [__dirname, process.cwd()],
-            schemaValidation: true,
-            optionTransforms: [
-                // Add configuration file defaults
-                async (schematic, current) => {
-                    const projectName = typeof current.project === 'string'
-                        ? current.project
-                        : getProjectName();
-                    return {
-                        ...(await (0, config_1.getSchematicDefaults)(schematic.collection.name, schematic.name, projectName)),
-                        ...current,
-                    };
-                },
-            ],
-            engineHostCreator: (options) => new schematic_engine_host_1.SchematicEngineHost(options.resolvePaths),
-        });
-        const getProjectName = () => {
-            if (this.workspace) {
-                const projectNames = getProjectsByPath(this.workspace, process.cwd(), this.workspace.basePath);
-                if (projectNames.length === 1) {
-                    return projectNames[0];
-                }
-                else {
-                    if (projectNames.length > 1) {
-                        this.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.
-            `);
-                    }
-                    const defaultProjectName = this.workspace.extensions['defaultProject'];
-                    if (typeof defaultProjectName === 'string' && defaultProjectName) {
-                        return defaultProjectName;
-                    }
-                }
-            }
-            return undefined;
-        };
-        workflow.registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
-        workflow.registry.addSmartDefaultProvider('projectName', getProjectName);
-        workflow.registry.useXDeprecatedProvider((msg) => this.logger.warn(msg));
-        let shouldReportAnalytics = true;
-        workflow.engineHost.registerOptionsTransform(async (_, options) => {
-            if (shouldReportAnalytics) {
-                shouldReportAnalytics = false;
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                await this.reportAnalytics([this.commandName], options);
-            }
-            return options;
-        });
-        if (options.interactive !== false && (0, tty_1.isTTY)()) {
-            workflow.registry.usePromptProvider((definitions) => {
-                const questions = definitions
-                    .filter((definition) => !options.defaults || definition.default === undefined)
-                    .map((definition) => {
-                    var _a;
-                    const question = {
-                        name: definition.id,
-                        message: definition.message,
-                        default: definition.default,
-                    };
-                    const validator = definition.validator;
-                    if (validator) {
-                        question.validate = (input) => validator(input);
-                        // Filter allows transformation of the value prior to validation
-                        question.filter = async (input) => {
-                            for (const type of definition.propertyTypes) {
-                                let value;
-                                switch (type) {
-                                    case 'string':
-                                        value = String(input);
-                                        break;
-                                    case 'integer':
-                                    case 'number':
-                                        value = Number(input);
-                                        break;
-                                    default:
-                                        value = input;
-                                        break;
-                                }
-                                // Can be a string if validation fails
-                                const isValid = (await validator(value)) === true;
-                                if (isValid) {
-                                    return value;
-                                }
-                            }
-                            return input;
-                        };
-                    }
-                    switch (definition.type) {
-                        case 'confirmation':
-                            question.type = 'confirm';
-                            break;
-                        case 'list':
-                            question.type = definition.multiselect ? 'checkbox' : 'list';
-                            question.choices = (_a = definition.items) === null || _a === void 0 ? void 0 : _a.map((item) => {
-                                return typeof item == 'string'
-                                    ? item
-                                    : {
-                                        name: item.label,
-                                        value: item.value,
-                                    };
-                            });
-                            break;
-                        default:
-                            question.type = definition.type;
-                            break;
-                    }
-                    return question;
-                });
-                return inquirer.prompt(questions);
-            });
-        }
-        return (this._workflow = workflow);
-    }
-    async getDefaultSchematicCollection() {
-        let workspace = await (0, config_1.getWorkspace)('local');
-        if (workspace) {
-            const project = (0, config_1.getProjectByCwd)(workspace);
-            if (project && workspace.getProjectCli(project)) {
-                const value = workspace.getProjectCli(project)['defaultCollection'];
-                if (typeof value == 'string') {
-                    return value;
-                }
-            }
-            if (workspace.getCli()) {
-                const value = workspace.getCli()['defaultCollection'];
-                if (typeof value == 'string') {
-                    return value;
-                }
-            }
-        }
-        workspace = await (0, config_1.getWorkspace)('global');
-        if (workspace && workspace.getCli()) {
-            const value = workspace.getCli()['defaultCollection'];
-            if (typeof value == 'string') {
-                return value;
-            }
-        }
-        return this.defaultCollectionName;
-    }
-    async runSchematic(options) {
-        const { schematicOptions: input = {}, debug, dryRun } = options;
-        let { collectionName, schematicName } = options;
-        let nothingDone = true;
-        let loggingQueue = [];
-        let error = false;
-        const workflow = this._workflow;
-        // Get the option object from the schematic schema.
-        const schematic = this.getSchematic(this.getCollection(collectionName), schematicName, this.allowPrivateSchematics);
-        // Update the schematic and collection name in case they're not the same as the ones we
-        // received in our options, e.g. after alias resolution or extension.
-        collectionName = schematic.collection.description.name;
-        schematicName = schematic.description.name;
-        workflow.reporter.subscribe((event) => {
-            nothingDone = false;
-            // Strip leading slash to prevent confusion.
-            const eventPath = event.path.startsWith('/') ? event.path.substr(1) : event.path;
-            switch (event.kind) {
-                case 'error':
-                    error = true;
-                    const desc = event.description == 'alreadyExist' ? 'already exists' : 'does not exist.';
-                    this.logger.warn(`ERROR! ${eventPath} ${desc}.`);
-                    break;
-                case 'update':
-                    loggingQueue.push(core_1.tags.oneLine `
-            ${color_1.colors.cyan('UPDATE')} ${eventPath} (${event.content.length} bytes)
-          `);
-                    break;
-                case 'create':
-                    loggingQueue.push(core_1.tags.oneLine `
-            ${color_1.colors.green('CREATE')} ${eventPath} (${event.content.length} bytes)
-          `);
-                    break;
-                case 'delete':
-                    loggingQueue.push(`${color_1.colors.yellow('DELETE')} ${eventPath}`);
-                    break;
-                case 'rename':
-                    const eventToPath = event.to.startsWith('/') ? event.to.substring(1) : event.to;
-                    loggingQueue.push(`${color_1.colors.blue('RENAME')} ${eventPath} => ${eventToPath}`);
-                    break;
-            }
-        });
-        workflow.lifeCycle.subscribe((event) => {
-            if (event.kind == 'end' || event.kind == 'post-tasks-start') {
-                if (!error) {
-                    // Output the logging queue, no error happened.
-                    loggingQueue.forEach((log) => this.logger.info(log));
-                }
-                loggingQueue = [];
-                error = false;
-            }
-        });
-        // Temporary compatibility check for NPM 7
-        if (collectionName === '@schematics/angular' && schematicName === 'ng-new') {
-            if (!input.skipInstall &&
-                (input.packageManager === undefined || input.packageManager === 'npm')) {
-                await (0, package_manager_1.ensureCompatibleNpm)(this.context.root);
-            }
-        }
-        return new Promise((resolve) => {
-            workflow
-                .execute({
-                collection: collectionName,
-                schematic: schematicName,
-                options: input,
-                debug: debug,
-                logger: this.logger,
-                allowPrivate: this.allowPrivateSchematics,
-            })
-                .subscribe({
-                error: (err) => {
-                    // In case the workflow was not successful, show an appropriate error message.
-                    if (err instanceof schematics_1.UnsuccessfulWorkflowExecution) {
-                        // "See above" because we already printed the error.
-                        this.logger.fatal('The Schematic workflow failed. See above.');
-                    }
-                    else if (debug) {
-                        this.logger.fatal(`An error occurred:\n${err.message}\n${err.stack}`);
-                    }
-                    else {
-                        this.logger.fatal(err.message);
-                    }
-                    resolve(1);
-                },
-                complete: () => {
-                    const showNothingDone = !(options.showNothingDone === false);
-                    if (nothingDone && showNothingDone) {
-                        this.logger.info('Nothing to be done.');
-                    }
-                    if (dryRun) {
-                        this.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
-                    }
-                    resolve();
-                },
-            });
-        });
-    }
-}
-exports.SchematicCommand = SchematicCommand;
-function getProjectsByPath(workspace, path, root) {
-    if (workspace.projects.size === 1) {
-        return Array.from(workspace.projects.keys());
-    }
-    const isInside = (base, potential) => {
-        const absoluteBase = systemPath.resolve(root, base);
-        const absolutePotential = systemPath.resolve(root, potential);
-        const relativePotential = systemPath.relative(absoluteBase, absolutePotential);
-        if (!relativePotential.startsWith('..') && !systemPath.isAbsolute(relativePotential)) {
-            return true;
-        }
-        return false;
-    };
-    const projects = Array.from(workspace.projects.entries())
-        .map(([name, project]) => [systemPath.resolve(root, project.root), name])
-        .filter((tuple) => isInside(tuple[0], path))
-        // Sort tuples by depth, with the deeper ones first. Since the first member is a path and
-        // we filtered all invalid paths, the longest will be the deepest (and in case of equality
-        // the sort is stable and the first declared project will win).
-        .sort((a, b) => b[0].length - a[0].length);
-    if (projects.length === 1) {
-        return [projects[0][1]];
-    }
-    else if (projects.length > 1) {
-        const firstPath = projects[0][0];
-        return projects.filter((v) => v[0] === firstPath).map((v) => v[1]);
-    }
-    return [];
-}

package/src/commands/add/add-impl.d.ts

@@ -1,22 +0,0 @@
-/**
- * @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 { SchematicCommand } from '../../../models/schematic-command';
-import { Options } from '../../command-builder/command-module';
-import { AddCommandArgs } from './cli';
-declare type AddCommandOptions = Options<AddCommandArgs>;
-export declare class AddCommandModule extends SchematicCommand<AddCommandOptions> {
-    readonly allowPrivateSchematics = true;
-    run(options: AddCommandOptions): Promise<number | void>;
-    private isProjectVersionValid;
-    reportAnalytics(paths: string[], options: AddCommandOptions, dimensions?: (boolean | number | string)[], metrics?: (boolean | number | string)[]): Promise<void>;
-    private isPackageInstalled;
-    private executeSchematic;
-    private findProjectVersion;
-    private hasMismatchedPeer;
-}
-export {};