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

package/src/commands/update/schematic/index.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/version/cli.js

@@ -16,7 +16,6 @@ const module_1 = __importDefault(require("module"));
 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.
  */
@@ -56,21 +55,18 @@ class VersionCommandModule extends command_module_1.CommandModule {
         catch { }
         const [nodeMajor] = process.versions.node.split('.').map((part) => Number(part));
         const unsupportedNodeVersion = !SUPPORTED_NODE_MAJORS.includes(nodeMajor);
-        const packageNames = [
-            ...Object.keys(cliPackage.dependencies || {}),
-            ...Object.keys(cliPackage.devDependencies || {}),
-            ...Object.keys((workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.dependencies) || {}),
-            ...Object.keys((workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.devDependencies) || {}),
-        ];
-        const versions = packageNames
-            .filter((x) => PACKAGE_PATTERNS.some((p) => p.test(x)))
-            .reduce((acc, name) => {
-            if (name in acc) {
-                return acc;
+        const packageNames = new Set(Object.keys({
+            ...cliPackage.dependencies,
+            ...cliPackage.devDependencies,
+            ...workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.dependencies,
+            ...workspacePackage === null || workspacePackage === void 0 ? void 0 : workspacePackage.devDependencies,
+        }));
+        const versions = {};
+        for (const name of packageNames) {
+            if (PACKAGE_PATTERNS.some((p) => p.test(name))) {
+                versions[name] = this.getVersion(name, workspaceRequire, localRequire);
             }
-            acc[name] = this.getVersion(name, workspaceRequire, localRequire);
-            return acc;
-        }, {});
+        }
         const ngCliVersion = cliPackage.version;
         let angularCoreVersion = '';
         const angularSameAsCore = [];
@@ -78,11 +74,10 @@ class VersionCommandModule extends command_module_1.CommandModule {
             // Filter all angular versions that are the same as core.
             angularCoreVersion = versions['@angular/core'];
             if (angularCoreVersion) {
-                for (const angularPackage of Object.keys(versions)) {
-                    if (versions[angularPackage] == angularCoreVersion &&
-                        angularPackage.startsWith('@angular/')) {
-                        angularSameAsCore.push(angularPackage.replace(/^@angular\//, ''));
-                        delete versions[angularPackage];
+                for (const [name, version] of Object.entries(versions)) {
+                    if (version === angularCoreVersion && name.startsWith('@angular/')) {
+                        angularSameAsCore.push(name.replace(/^@angular\//, ''));
+                        delete versions[name];
                     }
                 }
                 // Make sure we list them in alphabetical order.
@@ -105,7 +100,7 @@ class VersionCommandModule extends command_module_1.CommandModule {
         logger.info(`
       Angular CLI: ${ngCliVersion}
       Node: ${process.versions.node}${unsupportedNodeVersion ? ' (Unsupported)' : ''}
-      Package Manager: ${await this.getPackageManagerVersion()}
+      Package Manager: ${this.getPackageManagerVersion()}
       OS: ${process.platform} ${process.arch}
 
       Angular: ${angularCoreVersion}
@@ -162,9 +157,9 @@ class VersionCommandModule extends command_module_1.CommandModule {
         }
         return '<error>';
     }
-    async getPackageManagerVersion() {
+    getPackageManagerVersion() {
         try {
-            const manager = await (0, package_manager_1.getPackageManager)(this.context.root);
+            const manager = this.context.packageManager;
             const version = (0, child_process_1.execSync)(`${manager} --version`, {
                 encoding: 'utf8',
                 stdio: ['ignore', 'pipe', 'ignore'],

package/src/utilities/color.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/utilities/config.d.ts

@@ -28,3 +28,4 @@ export declare function getProjectByCwd(workspace: AngularWorkspace): string | n
 export declare function getConfiguredPackageManager(): Promise<PackageManager | null>;
 export declare function getSchematicDefaults(collection: string, schematic: string, project?: string | null): Promise<{}>;
 export declare function isWarningEnabled(warning: string): Promise<boolean>;
+export declare function getProjectsByPath(workspace: workspaces.WorkspaceDefinition, cwd: string, root: string): string[];

package/src/utilities/config.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];
@@ -26,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWarningEnabled = exports.getSchematicDefaults = exports.getConfiguredPackageManager = exports.getProjectByCwd = exports.validateWorkspace = exports.getWorkspaceRaw = exports.createGlobalSettings = exports.getWorkspace = exports.AngularWorkspace = exports.workspaceSchemaPath = void 0;
+exports.getProjectsByPath = exports.isWarningEnabled = exports.getSchematicDefaults = exports.getConfiguredPackageManager = exports.getProjectByCwd = exports.validateWorkspace = exports.getWorkspaceRaw = exports.createGlobalSettings = exports.getWorkspace = exports.AngularWorkspace = exports.workspaceSchemaPath = void 0;
 const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const os = __importStar(require("os"));
@@ -337,3 +341,33 @@ async function isWarningEnabled(warning) {
     return result !== null && result !== void 0 ? result : true;
 }
 exports.isWarningEnabled = isWarningEnabled;
+function getProjectsByPath(workspace, cwd, root) {
+    if (workspace.projects.size === 1) {
+        return Array.from(workspace.projects.keys());
+    }
+    const isInside = (base, potential) => {
+        const absoluteBase = path.resolve(root, base);
+        const absolutePotential = path.resolve(root, potential);
+        const relativePotential = path.relative(absoluteBase, absolutePotential);
+        if (!relativePotential.startsWith('..') && !path.isAbsolute(relativePotential)) {
+            return true;
+        }
+        return false;
+    };
+    const projects = Array.from(workspace.projects.entries())
+        .map(([name, project]) => [path.resolve(root, project.root), name])
+        .filter((tuple) => isInside(tuple[0], cwd))
+        // 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 [];
+}
+exports.getProjectsByPath = getProjectsByPath;

package/src/utilities/find-up.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/utilities/package-metadata.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/utilities/package-tree.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/utilities/project.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/utilities/prompt.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/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/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>;
-}