@angular/cli 21.0.0-next.4 → 21.0.0-next.6

package/src/package-managers/parsers.js

@@ -0,0 +1,233 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseNpmLikeDependencies = parseNpmLikeDependencies;
+exports.parseYarnClassicDependencies = parseYarnClassicDependencies;
+exports.parseYarnModernDependencies = parseYarnModernDependencies;
+exports.parseNpmLikeManifest = parseNpmLikeManifest;
+exports.parseNpmLikeMetadata = parseNpmLikeMetadata;
+exports.parseYarnLegacyManifest = parseYarnLegacyManifest;
+const MAX_LOG_LENGTH = 1024;
+function logStdout(stdout, logger) {
+    if (!logger) {
+        return;
+    }
+    let output = stdout;
+    if (output.length > MAX_LOG_LENGTH) {
+        output = `${output.slice(0, MAX_LOG_LENGTH)}... (truncated)`;
+    }
+    logger.debug(`  stdout:\n${output}`);
+}
+/**
+ * Parses the output of `npm list` or a compatible command.
+ *
+ * The expected JSON structure is:
+ * ```json
+ * {
+ *   "dependencies": {
+ *     "@angular/cli": {
+ *       "version": "18.0.0",
+ *       "path": "/path/to/project/node_modules/@angular/cli", // path is optional
+ *       ... (other package.json properties)
+ *     }
+ *   }
+ * }
+ * ```
+ *
+ * @param stdout The standard output of the command.
+ * @param logger An optional logger instance.
+ * @returns A map of package names to their installed package details.
+ */
+function parseNpmLikeDependencies(stdout, logger) {
+    logger?.debug(`Parsing npm-like dependency list...`);
+    logStdout(stdout, logger);
+    const dependencies = new Map();
+    if (!stdout) {
+        logger?.debug('  stdout is empty. No dependencies found.');
+        return dependencies;
+    }
+    let data = JSON.parse(stdout);
+    if (Array.isArray(data)) {
+        // pnpm returns an array of projects.
+        data = data[0];
+    }
+    const dependencyMaps = [data.dependencies, data.devDependencies, data.unsavedDependencies].filter((d) => !!d);
+    if (dependencyMaps.length === 0) {
+        logger?.debug('  `dependencies` property not found. No dependencies found.');
+        return dependencies;
+    }
+    for (const dependencyMap of dependencyMaps) {
+        for (const [name, info] of Object.entries(dependencyMap)) {
+            dependencies.set(name, {
+                name,
+                version: info.version,
+                path: info.path,
+            });
+        }
+    }
+    logger?.debug(`  Found ${dependencies.size} dependencies.`);
+    return dependencies;
+}
+/**
+ * Parses the output of `yarn list` (classic).
+ *
+ * The expected output is a JSON stream (JSONL), where each line is a JSON object.
+ * The relevant object has a `type` of `'tree'`.
+ * Yarn classic does not provide a path, so the `path` property will be `undefined`.
+ *
+ * ```json
+ * {"type":"tree","data":{"trees":[{"name":"@angular/cli@18.0.0","children":[]}]}}
+ * ```
+ *
+ * @param stdout The standard output of the command.
+ * @param logger An optional logger instance.
+ * @returns A map of package names to their installed package details.
+ */
+function parseYarnClassicDependencies(stdout, logger) {
+    logger?.debug(`Parsing yarn classic dependency list...`);
+    logStdout(stdout, logger);
+    const dependencies = new Map();
+    if (!stdout) {
+        logger?.debug('  stdout is empty. No dependencies found.');
+        return dependencies;
+    }
+    for (const line of stdout.split('\n')) {
+        if (!line) {
+            continue;
+        }
+        const json = JSON.parse(line);
+        if (json.type === 'tree' && json.data?.trees) {
+            for (const info of json.data.trees) {
+                const name = info.name.split('@')[0];
+                const version = info.name.split('@').pop();
+                dependencies.set(name, {
+                    name,
+                    version,
+                });
+            }
+        }
+    }
+    logger?.debug(`  Found ${dependencies.size} dependencies.`);
+    return dependencies;
+}
+/**
+ * Parses the output of `yarn list` (modern).
+ *
+ * The expected JSON structure is a single object.
+ * Yarn modern does not provide a path, so the `path` property will be `undefined`.
+ *
+ * ```json
+ * {
+ *   "trees": [
+ *     { "name": "@angular/cli@18.0.0", "children": [] }
+ *   ]
+ * }
+ * ```
+ *
+ * @param stdout The standard output of the command.
+ * @param logger An optional logger instance.
+ * @returns A map of package names to their installed package details.
+ */
+function parseYarnModernDependencies(stdout, logger) {
+    logger?.debug(`Parsing yarn modern dependency list...`);
+    logStdout(stdout, logger);
+    const dependencies = new Map();
+    if (!stdout) {
+        logger?.debug('  stdout is empty. No dependencies found.');
+        return dependencies;
+    }
+    // Modern yarn `list` command outputs a single JSON object with a `trees` property.
+    // Each line is not a separate JSON object.
+    try {
+        const data = JSON.parse(stdout);
+        for (const info of data.trees) {
+            const name = info.name.split('@')[0];
+            const version = info.name.split('@').pop();
+            dependencies.set(name, {
+                name,
+                version,
+            });
+        }
+    }
+    catch (e) {
+        logger?.debug(`  Failed to parse as single JSON object: ${e}. Falling back to line-by-line parsing.`);
+        // Fallback for older versions of yarn berry that might still output json lines
+        for (const line of stdout.split('\n')) {
+            if (!line) {
+                continue;
+            }
+            try {
+                const json = JSON.parse(line);
+                if (json.type === 'tree' && json.data?.trees) {
+                    for (const info of json.data.trees) {
+                        const name = info.name.split('@')[0];
+                        const version = info.name.split('@').pop();
+                        dependencies.set(name, {
+                            name,
+                            version,
+                        });
+                    }
+                }
+            }
+            catch (innerError) {
+                logger?.debug(`  Ignoring non-JSON line: ${innerError}`);
+                // Ignore lines that are not valid JSON.
+            }
+        }
+    }
+    logger?.debug(`  Found ${dependencies.size} dependencies.`);
+    return dependencies;
+}
+/**
+ * Parses the output of `npm view` or a compatible command to get a package manifest.
+ * @param stdout The standard output of the command.
+ * @param logger An optional logger instance.
+ * @returns The package manifest object.
+ */
+function parseNpmLikeManifest(stdout, logger) {
+    logger?.debug(`Parsing npm-like manifest...`);
+    logStdout(stdout, logger);
+    if (!stdout) {
+        logger?.debug('  stdout is empty. No manifest found.');
+        return null;
+    }
+    return JSON.parse(stdout);
+}
+/**
+ * Parses the output of `npm view` or a compatible command to get package metadata.
+ * @param stdout The standard output of the command.
+ * @param logger An optional logger instance.
+ * @returns The package metadata object.
+ */
+function parseNpmLikeMetadata(stdout, logger) {
+    logger?.debug(`Parsing npm-like metadata...`);
+    logStdout(stdout, logger);
+    if (!stdout) {
+        logger?.debug('  stdout is empty. No metadata found.');
+        return null;
+    }
+    return JSON.parse(stdout);
+}
+/**
+ * Parses the output of `yarn info` (classic).
+ * @param stdout The standard output of the command.
+ * @param logger An optional logger instance.
+ * @returns The package manifest object.
+ */
+function parseYarnLegacyManifest(stdout, logger) {
+    logger?.debug(`Parsing yarn classic manifest...`);
+    logStdout(stdout, logger);
+    if (!stdout) {
+        logger?.debug('  stdout is empty. No manifest found.');
+        return null;
+    }
+    const data = JSON.parse(stdout);
+    // Yarn classic wraps the manifest in a `data` property.
+    return data.data ?? data;
+}

package/src/package-managers/testing/mock-host.d.ts

@@ -0,0 +1,26 @@
+/**
+ * @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.dev/license
+ */
+import { Stats } from 'node:fs';
+import { Host } from '../host';
+/**
+ * A mock `Host` implementation for testing.
+ * This class allows for simulating a file system in memory.
+ */
+export declare class MockHost implements Host {
+    private readonly fs;
+    constructor(files?: Record<string, string[] | true>);
+    stat(path: string): Promise<Stats>;
+    readdir(path: string): Promise<string[]>;
+    runCommand(): Promise<{
+        stdout: string;
+        stderr: string;
+    }>;
+    createTempDirectory(): Promise<string>;
+    deleteDirectory(): Promise<void>;
+    writeFile(): Promise<void>;
+}

package/src/package-managers/testing/mock-host.js

@@ -0,0 +1,52 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockHost = void 0;
+/**
+ * A mock `Host` implementation for testing.
+ * This class allows for simulating a file system in memory.
+ */
+class MockHost {
+    fs = new Map();
+    constructor(files = {}) {
+        // Normalize paths to use forward slashes for consistency in tests.
+        for (const [path, content] of Object.entries(files)) {
+            this.fs.set(path.replace(/\\/g, '/'), content);
+        }
+    }
+    stat(path) {
+        const content = this.fs.get(path.replace(/\\/g, '/'));
+        if (content === undefined) {
+            return Promise.reject(new Error(`File not found: ${path}`));
+        }
+        // A `true` value signifies a directory in our mock file system.
+        return Promise.resolve({ isDirectory: () => content === true });
+    }
+    readdir(path) {
+        const content = this.fs.get(path.replace(/\\/g, '/'));
+        if (content === true || content === undefined) {
+            // This should be a directory with a file list.
+            return Promise.reject(new Error(`Directory not found or not a directory: ${path}`));
+        }
+        return Promise.resolve(content);
+    }
+    runCommand() {
+        throw new Error('Method not implemented.');
+    }
+    createTempDirectory() {
+        throw new Error('Method not implemented.');
+    }
+    deleteDirectory() {
+        throw new Error('Method not implemented.');
+    }
+    writeFile() {
+        throw new Error('Method not implemented.');
+    }
+}
+exports.MockHost = MockHost;

package/src/utilities/package-manager.js

@@ -288,17 +288,17 @@ let PackageManagerUtils = (() => {
                 : lockfiles.some((lockfile) => filesInRoot.includes(lockfile));
         }
         getConfiguredPackageManager() {
-            const getPackageManager = (source) => {
-                if (source && (0, core_1.isJsonObject)(source)) {
-                    const value = source['packageManager'];
-                    if (typeof value === 'string') {
-                        return value;
-                    }
-                }
-                return undefined;
-            };
-            let result;
             const { workspace: localWorkspace, globalConfiguration: globalWorkspace } = this.context;
+            let result;
+            try {
+                const packageJsonPath = (0, node_path_1.join)(this.context.root, 'package.json');
+                const pkgJson = JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf-8'));
+                result = getPackageManager(pkgJson);
+            }
+            catch { }
+            if (result) {
+                return result;
+            }
             if (localWorkspace) {
                 const project = (0, config_1.getProjectByCwd)(localWorkspace);
                 if (project) {
@@ -306,11 +306,18 @@ let PackageManagerUtils = (() => {
                 }
                 result ??= getPackageManager(localWorkspace.extensions['cli']);
             }
-            if (!result) {
-                result = getPackageManager(globalWorkspace.extensions['cli']);
-            }
+            result ??= getPackageManager(globalWorkspace.extensions['cli']);
             return result;
         }
     };
 })();
 exports.PackageManagerUtils = PackageManagerUtils;
+function getPackageManager(source) {
+    if (source && (0, core_1.isJsonObject)(source)) {
+        const value = source['packageManager'];
+        if (typeof value === 'string') {
+            return value.split('@', 1)[0];
+        }
+    }
+    return undefined;
+}

package/src/utilities/version.js

@@ -22,4 +22,4 @@ class Version {
         this.patch = patch;
     }
 }
-exports.VERSION = new Version('21.0.0-next.4');
+exports.VERSION = new Version('21.0.0-next.6');