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

package/{commands/version-impl.js → src/commands/version/cli.js}

@@ -10,44 +10,52 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersionCommand = void 0;
+exports.VersionCommandModule = void 0;
 const child_process_1 = require("child_process");
 const module_1 = __importDefault(require("module"));
-const command_1 = require("../models/command");
-const color_1 = require("../utilities/color");
-const package_manager_1 = require("../utilities/package-manager");
+const path_1 = require("path");
+const command_module_1 = require("../../command-builder/command-module");
+const color_1 = require("../../utilities/color");
+const package_manager_1 = require("../../utilities/package-manager");
 /**
  * Major versions of Node.js that are officially supported by Angular.
  */
-const SUPPORTED_NODE_MAJORS = [12, 14, 16];
-class VersionCommand extends command_1.Command {
+const SUPPORTED_NODE_MAJORS = [14, 16];
+const PACKAGE_PATTERNS = [
+    /^@angular\/.*/,
+    /^@angular-devkit\/.*/,
+    /^@bazel\/.*/,
+    /^@ngtools\/.*/,
+    /^@nguniversal\/.*/,
+    /^@schematics\/.*/,
+    /^rxjs$/,
+    /^typescript$/,
+    /^ng-packagr$/,
+    /^webpack$/,
+];
+class VersionCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
-        this.localRequire = module_1.default.createRequire(__filename);
-        // Trailing slash is used to allow the path to be treated as a directory
-        this.workspaceRequire = module_1.default.createRequire(this.context.root + '/');
+        this.command = 'version';
+        this.aliases = ['v'];
+        this.describe = 'Outputs Angular CLI version.';
+    }
+    builder(localYargs) {
+        return localYargs;
     }
     async run() {
-        const cliPackage = this.localRequire('../package.json');
+        const logger = this.context.logger;
+        const localRequire = module_1.default.createRequire((0, path_1.resolve)(__filename, '../../../'));
+        // Trailing slash is used to allow the path to be treated as a directory
+        const workspaceRequire = module_1.default.createRequire(this.context.root + '/');
+        const cliPackage = localRequire('./package.json');
         let workspacePackage;
         try {
-            workspacePackage = this.workspaceRequire('./package.json');
+            workspacePackage = workspaceRequire('./package.json');
         }
         catch { }
         const [nodeMajor] = process.versions.node.split('.').map((part) => Number(part));
         const unsupportedNodeVersion = !SUPPORTED_NODE_MAJORS.includes(nodeMajor);
-        const patterns = [
-            /^@angular\/.*/,
-            /^@angular-devkit\/.*/,
-            /^@bazel\/.*/,
-            /^@ngtools\/.*/,
-            /^@nguniversal\/.*/,
-            /^@schematics\/.*/,
-            /^rxjs$/,
-            /^typescript$/,
-            /^ng-packagr$/,
-            /^webpack$/,
-        ];
         const packageNames = [
             ...Object.keys(cliPackage.dependencies || {}),
             ...Object.keys(cliPackage.devDependencies || {}),
@@ -55,12 +63,12 @@ class VersionCommand extends command_1.Command {
             ...Object.keys((workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.devDependencies) || {}),
         ];
         const versions = packageNames
-            .filter((x) => patterns.some((p) => p.test(x)))
+            .filter((x) => PACKAGE_PATTERNS.some((p) => p.test(x)))
             .reduce((acc, name) => {
             if (name in acc) {
                 return acc;
             }
-            acc[name] = this.getVersion(name);
+            acc[name] = this.getVersion(name, workspaceRequire, localRequire);
             return acc;
         }, {});
         const ngCliVersion = cliPackage.version;
@@ -93,11 +101,11 @@ class VersionCommand extends command_1.Command {
             .split('\n')
             .map((x) => color_1.colors.red(x))
             .join('\n');
-        this.logger.info(asciiArt);
-        this.logger.info(`
+        logger.info(asciiArt);
+        logger.info(`
       Angular CLI: ${ngCliVersion}
       Node: ${process.versions.node}${unsupportedNodeVersion ? ' (Unsupported)' : ''}
-      Package Manager: ${await this.getPackageManager()}
+      Package Manager: ${await this.getPackageManagerVersion()}
       OS: ${process.platform} ${process.arch}
 
       Angular: ${angularCoreVersion}
@@ -126,36 +134,35 @@ class VersionCommand extends command_1.Command {
             .join('\n')}
     `.replace(/^ {6}/gm, ''));
         if (unsupportedNodeVersion) {
-            this.logger.warn(`Warning: The current version of Node (${process.versions.node}) is not supported by Angular.`);
+            logger.warn(`Warning: The current version of Node (${process.versions.node}) is not supported by Angular.`);
         }
     }
-    getVersion(moduleName) {
+    getVersion(moduleName, workspaceRequire, localRequire) {
         let packageInfo;
         let cliOnly = false;
         // Try to find the package in the workspace
         try {
-            packageInfo = this.workspaceRequire(`${moduleName}/package.json`);
+            packageInfo = workspaceRequire(`${moduleName}/package.json`);
         }
         catch { }
         // If not found, try to find within the CLI
         if (!packageInfo) {
             try {
-                packageInfo = this.localRequire(`${moduleName}/package.json`);
+                packageInfo = localRequire(`${moduleName}/package.json`);
                 cliOnly = true;
             }
             catch { }
         }
-        let version;
         // If found, attempt to get the version
         if (packageInfo) {
             try {
-                version = packageInfo.version + (cliOnly ? ' (cli-only)' : '');
+                return packageInfo.version + (cliOnly ? ' (cli-only)' : '');
             }
             catch { }
         }
-        return version || '<error>';
+        return '<error>';
     }
-    async getPackageManager() {
+    async getPackageManagerVersion() {
         try {
             const manager = await (0, package_manager_1.getPackageManager)(this.context.root);
             const version = (0, child_process_1.execSync)(`${manager} --version`, {
@@ -175,5 +182,4 @@ class VersionCommand extends command_1.Command {
         }
     }
 }
-exports.VersionCommand = VersionCommand;
-VersionCommand.aliases = ['v'];
+exports.VersionCommandModule = VersionCommandModule;

package/src/typings.d.ts

@@ -12,7 +12,7 @@ declare module 'ini' {
     function parse(data: string): Record<string, any>;
 }
 declare module 'npm-pick-manifest' {
-    function pickManifest(metadata: import('../utilities/package-metadata').PackageMetadata, selector: string): import('../utilities/package-metadata').PackageManifest;
+    function pickManifest(metadata: import('./utilities/package-metadata').PackageMetadata, selector: string): import('./utilities/package-metadata').PackageManifest;
     export = pickManifest;
 }
 declare module 'pacote' {
@@ -20,5 +20,5 @@ declare module 'pacote' {
         name: string;
         version: string;
     }>;
-    function packument(specifier: string, options: Record<string, unknown>): Promise<import('../utilities/package-metadata').NpmRepositoryPackageJson>;
+    function packument(specifier: string, options: Record<string, unknown>): Promise<import('./utilities/package-metadata').NpmRepositoryPackageJson>;
 }

package/{utilities → src/utilities}/config.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { json, workspaces } from '@angular-devkit/core';
-import { PackageManager } from '../lib/config/workspace-schema';
+import { PackageManager } from '../../lib/config/workspace-schema';
 import { JSONFile } from './json-file';
 export declare const workspaceSchemaPath: string;
 export declare class AngularWorkspace {

package/{utilities → src/utilities}/config.js

@@ -62,10 +62,7 @@ function createWorkspaceHost() {
         },
     };
 }
-function getSchemaLocation() {
-    return path.join(__dirname, '../lib/config/schema.json');
-}
-exports.workspaceSchemaPath = getSchemaLocation();
+exports.workspaceSchemaPath = path.join(__dirname, '../../lib/config/schema.json');
 const configNames = ['angular.json', '.angular.json'];
 const globalFileName = '.angular-config.json';
 function xdgConfigHome(home, configFile) {
@@ -190,7 +187,7 @@ function getWorkspaceRaw(level = 'local') {
 }
 exports.getWorkspaceRaw = getWorkspaceRaw;
 async function validateWorkspace(data) {
-    const schema = (0, json_file_1.readAndParseJson)(path.join(__dirname, '../lib/config/schema.json'));
+    const schema = (0, json_file_1.readAndParseJson)(exports.workspaceSchemaPath);
     const { formats } = await Promise.resolve().then(() => __importStar(require('@angular-devkit/schematics')));
     const registry = new core_1.json.schema.CoreSchemaRegistry(formats.standardFormats);
     const validator = await registry.compile(schema).toPromise();

package/{utilities → src/utilities}/install-package.d.ts

@@ -5,8 +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 { PackageManager } from '../lib/config/workspace-schema';
-import { NgAddSaveDepedency } from '../utilities/package-metadata';
+import { PackageManager } from '../../lib/config/workspace-schema';
+import { NgAddSaveDepedency } from './package-metadata';
 export declare function installAllPackages(packageManager?: PackageManager, extraArgs?: string[], cwd?: string): Promise<1 | 0>;
 export declare function installPackage(packageName: string, packageManager?: PackageManager, save?: Exclude<NgAddSaveDepedency, false>, extraArgs?: string[], cwd?: string): Promise<1 | 0>;
 export declare function installTempPackage(packageName: string, packageManager?: PackageManager, extraArgs?: string[]): Promise<{

package/{utilities → src/utilities}/install-package.js

@@ -12,7 +12,7 @@ const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
-const workspace_schema_1 = require("../lib/config/workspace-schema");
+const workspace_schema_1 = require("../../lib/config/workspace-schema");
 const spinner_1 = require("./spinner");
 async function installAllPackages(packageManager = workspace_schema_1.PackageManager.Npm, extraArgs = [], cwd = process.cwd()) {
     const packageManagerArgs = getPackageManagerArguments(packageManager);

package/{utilities → src/utilities}/package-manager.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
  */
-import { PackageManager } from '../lib/config/workspace-schema';
+import { PackageManager } from '../../lib/config/workspace-schema';
 export declare function getPackageManager(root: string): Promise<PackageManager>;
 /**
  * Checks if the npm version is a supported 7.x version.  If not, display a warning.

package/{utilities → src/utilities}/package-manager.js

@@ -13,7 +13,7 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const util_1 = require("util");
-const workspace_schema_1 = require("../lib/config/workspace-schema");
+const workspace_schema_1 = require("../../lib/config/workspace-schema");
 const config_1 = require("./config");
 const exec = (0, util_1.promisify)(child_process_1.exec);
 async function supports(name) {

package/{models → src/utilities}/version.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 declare class Version {
+declare class Version {
     readonly full: string;
     readonly major: string;
     readonly minor: string;
@@ -13,3 +13,4 @@ export declare class Version {
     constructor(full: string);
 }
 export declare const VERSION: Version;
+export {};

package/{models → src/utilities}/version.js

@@ -7,19 +7,19 @@
  * 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 fs_1 = require("fs");
 const path_1 = require("path");
 // Same structure as used in framework packages
 class Version {
     constructor(full) {
         this.full = full;
-        this.major = full.split('.')[0];
-        this.minor = full.split('.')[1];
-        this.patch = full.split('.').slice(2).join('.');
+        const [major, minor, patch] = full.split('-', 1)[0].split('.', 3);
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
     }
 }
-exports.Version = Version;
 // TODO: Convert this to use build-time version stamping after flipping the build script to use bazel
 // export const VERSION = new Version('0.0.0-PLACEHOLDER');
-exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../package.json'), 'utf-8')).version);
+exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);

package/commands/add-impl.d.ts

@@ -1,21 +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 { Arguments } from '../models/interface';
-import { SchematicCommand } from '../models/schematic-command';
-import { Schema as AddCommandSchema } from './add';
-export declare class AddCommand extends SchematicCommand<AddCommandSchema> {
-    readonly allowPrivateSchematics = true;
-    initialize(options: AddCommandSchema & Arguments): Promise<void>;
-    run(options: AddCommandSchema & Arguments): Promise<number | void>;
-    private isProjectVersionValid;
-    reportAnalytics(paths: string[], options: AddCommandSchema & Arguments, dimensions?: (boolean | number | string)[], metrics?: (boolean | number | string)[]): Promise<void>;
-    private isPackageInstalled;
-    private executeSchematic;
-    private findProjectVersion;
-    private hasMismatchedPeer;
-}

package/commands/add.d.ts

@@ -1,42 +0,0 @@
-/**
- * Adds support for an external library to your project.
- */
-export interface Schema {
-    /**
-     * The package to be added.
-     */
-    collection?: string;
-    /**
-     * Disable interactive input prompts for options with a default.
-     */
-    defaults?: boolean;
-    /**
-     * Shows a help message for this command in the console.
-     */
-    help?: HelpUnion;
-    /**
-     * Enable interactive input prompts.
-     */
-    interactive?: boolean;
-    /**
-     * The NPM registry to use.
-     */
-    registry?: string;
-    /**
-     * Skip asking a confirmation prompt before installing and executing the package. Ensure
-     * package name is correct prior to using this option.
-     */
-    skipConfirmation?: boolean;
-    /**
-     * Display additional details about internal operations during execution.
-     */
-    verbose?: boolean;
-}
-/**
- * Shows a help message for this command in the console.
- */
-export declare type HelpUnion = boolean | HelpEnum;
-export declare enum HelpEnum {
-    HelpJson = "JSON",
-    Json = "json"
-}

package/commands/add.js

@@ -1,10 +0,0 @@
-"use strict";
-// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
-// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HelpEnum = void 0;
-var HelpEnum;
-(function (HelpEnum) {
-    HelpEnum["HelpJson"] = "JSON";
-    HelpEnum["Json"] = "json";
-})(HelpEnum = exports.HelpEnum || (exports.HelpEnum = {}));

package/commands/add.json

@@ -1,54 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema",
-  "$id": "ng-cli://commands/add.json",
-  "description": "Adds support for an external library to your project.",
-  "$longDescription": "./add.md",
-
-  "$scope": "in",
-  "$impl": "./add-impl#AddCommand",
-
-  "type": "object",
-  "allOf": [
-    {
-      "properties": {
-        "collection": {
-          "type": "string",
-          "description": "The package to be added.",
-          "$default": {
-            "$source": "argv",
-            "index": 0
-          }
-        },
-        "registry": {
-          "description": "The NPM registry to use.",
-          "type": "string",
-          "oneOf": [
-            {
-              "format": "uri"
-            },
-            {
-              "format": "hostname"
-            }
-          ]
-        },
-        "verbose": {
-          "description": "Display additional details about internal operations during execution.",
-          "type": "boolean",
-          "default": false
-        },
-        "skipConfirmation": {
-          "description": "Skip asking a confirmation prompt before installing and executing the package. Ensure package name is correct prior to using this option.",
-          "type": "boolean",
-          "default": false
-        }
-      },
-      "required": []
-    },
-    {
-      "$ref": "./definitions.json#/definitions/interactive"
-    },
-    {
-      "$ref": "./definitions.json#/definitions/base"
-    }
-  ]
-}

package/commands/analytics-impl.d.ts

@@ -1,13 +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 { Command } from '../models/command';
-import { Arguments } from '../models/interface';
-import { Schema as AnalyticsCommandSchema } from './analytics';
-export declare class AnalyticsCommand extends Command<AnalyticsCommandSchema> {
-    run(options: AnalyticsCommandSchema & Arguments): Promise<0 | 1 | 2 | 3 | 4>;
-}

package/commands/analytics-impl.js

@@ -1,80 +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.AnalyticsCommand = void 0;
-const analytics_1 = require("../models/analytics");
-const command_1 = require("../models/command");
-const analytics_2 = require("./analytics");
-class AnalyticsCommand extends command_1.Command {
-    async run(options) {
-        // Our parser does not support positional enums (won't report invalid parameters). Do the
-        // validation manually.
-        // TODO(hansl): fix parser to better support positionals. This would be a breaking change.
-        if (options.settingOrProject === undefined) {
-            if (options['--']) {
-                // The user passed positional arguments but they didn't validate.
-                this.logger.error(`Argument ${JSON.stringify(options['--'][0])} is invalid.`);
-                this.logger.error(`Please provide one of the following value: on, off, ci or project.`);
-                return 1;
-            }
-            else {
-                // No argument were passed.
-                await this.printHelp();
-                return 2;
-            }
-        }
-        else if (options.settingOrProject == analytics_2.SettingOrProject.Project &&
-            options.projectSetting === undefined) {
-            this.logger.error(`Argument ${JSON.stringify(options.settingOrProject)} requires a second ` +
-                `argument of one of the following value: on, off.`);
-            return 2;
-        }
-        try {
-            switch (options.settingOrProject) {
-                case analytics_2.SettingOrProject.Off:
-                    (0, analytics_1.setAnalyticsConfig)('global', false);
-                    break;
-                case analytics_2.SettingOrProject.On:
-                    (0, analytics_1.setAnalyticsConfig)('global', true);
-                    break;
-                case analytics_2.SettingOrProject.Ci:
-                    (0, analytics_1.setAnalyticsConfig)('global', 'ci');
-                    break;
-                case analytics_2.SettingOrProject.Project:
-                    switch (options.projectSetting) {
-                        case analytics_2.ProjectSetting.Off:
-                            (0, analytics_1.setAnalyticsConfig)('local', false);
-                            break;
-                        case analytics_2.ProjectSetting.On:
-                            (0, analytics_1.setAnalyticsConfig)('local', true);
-                            break;
-                        case analytics_2.ProjectSetting.Prompt:
-                            await (0, analytics_1.promptProjectAnalytics)(true);
-                            break;
-                        default:
-                            await this.printHelp();
-                            return 3;
-                    }
-                    break;
-                case analytics_2.SettingOrProject.Prompt:
-                    await (0, analytics_1.promptGlobalAnalytics)(true);
-                    break;
-                default:
-                    await this.printHelp();
-                    return 4;
-            }
-        }
-        catch (err) {
-            this.logger.fatal(err.message);
-            return 1;
-        }
-        return 0;
-    }
-}
-exports.AnalyticsCommand = AnalyticsCommand;

package/commands/analytics-long.md

@@ -1,8 +0,0 @@
-The value of _settingOrProject_ is one of the following.
-
-- "on" : Enables analytics gathering and reporting for the user.
-- "off" : Disables analytics gathering and reporting for the user.
-- "ci" : Enables analytics and configures reporting for use with Continuous Integration,
-  which uses a common CI user.
-- "prompt" : Prompts the user to set the status interactively.
-- "project" : Sets the default status for the project to the _projectSetting_ value, which can be any of the other values. The _projectSetting_ argument is ignored for all other values of _settingOrProject_.

package/commands/analytics.d.ts

@@ -1,46 +0,0 @@
-/**
- * Configures the gathering of Angular CLI usage metrics. See
- * https://angular.io/cli/usage-analytics-gathering.
- */
-export interface Schema {
-    /**
-     * Shows a help message for this command in the console.
-     */
-    help?: HelpUnion;
-    /**
-     * Sets the default analytics enablement status for the project.
-     */
-    projectSetting?: ProjectSetting;
-    /**
-     * Directly enables or disables all usage analytics for the user, or prompts the user to set
-     * the status interactively, or sets the default status for the project.
-     */
-    settingOrProject: SettingOrProject;
-}
-/**
- * Shows a help message for this command in the console.
- */
-export declare type HelpUnion = boolean | HelpEnum;
-export declare enum HelpEnum {
-    HelpJson = "JSON",
-    Json = "json"
-}
-/**
- * Sets the default analytics enablement status for the project.
- */
-export declare enum ProjectSetting {
-    Off = "off",
-    On = "on",
-    Prompt = "prompt"
-}
-/**
- * Directly enables or disables all usage analytics for the user, or prompts the user to set
- * the status interactively, or sets the default status for the project.
- */
-export declare enum SettingOrProject {
-    Ci = "ci",
-    Off = "off",
-    On = "on",
-    Project = "project",
-    Prompt = "prompt"
-}