@angular/cli 20.2.0-next.2 → 20.2.0-rc.0

package/src/utilities/json-file.js

@@ -13,34 +13,70 @@ exports.parseJson = parseJson;
 const jsonc_parser_1 = require("jsonc-parser");
 const node_fs_1 = require("node:fs");
 const eol_1 = require("./eol");
-/** @internal */
+const error_1 = require("./error");
+/**
+ * Represents a JSON file, allowing for reading, modifying, and saving.
+ * This class uses `jsonc-parser` to preserve comments and formatting, including
+ * indentation and end-of-line sequences.
+ * @internal
+ */
 class JSONFile {
-    path;
-    content;
-    eol;
+    /** The raw content of the JSON file. */
+    #content;
+    /** The end-of-line sequence used in the file. */
+    #eol;
+    /** Whether the file uses spaces for indentation. */
+    #insertSpaces = true;
+    /** The number of spaces or tabs used for indentation. */
+    #tabSize = 2;
+    /** The path to the JSON file. */
+    #path;
+    /** The parsed JSON abstract syntax tree. */
+    #jsonAst;
+    /** The raw content of the JSON file. */
+    get content() {
+        return this.#content;
+    }
+    /**
+     * Creates an instance of JSONFile.
+     * @param path The path to the JSON file.
+     */
     constructor(path) {
-        this.path = path;
-        const buffer = (0, node_fs_1.readFileSync)(this.path);
-        if (buffer) {
-            this.content = buffer.toString();
+        this.#path = path;
+        try {
+            this.#content = (0, node_fs_1.readFileSync)(this.#path, 'utf-8');
         }
-        else {
-            throw new Error(`Could not read '${path}'.`);
+        catch (e) {
+            (0, error_1.assertIsError)(e);
+            // We don't have to worry about ENOENT, since we'll be creating the file.
+            if (e.code !== 'ENOENT') {
+                throw e;
+            }
+            this.#content = '';
         }
-        this.eol = (0, eol_1.getEOL)(this.content);
+        this.#eol = (0, eol_1.getEOL)(this.#content);
+        this.#detectIndentation();
     }
-    _jsonAst;
+    /**
+     * Gets the parsed JSON abstract syntax tree.
+     * The AST is lazily parsed and cached.
+     */
     get JsonAst() {
-        if (this._jsonAst) {
-            return this._jsonAst;
+        if (this.#jsonAst) {
+            return this.#jsonAst;
         }
         const errors = [];
-        this._jsonAst = (0, jsonc_parser_1.parseTree)(this.content, errors, { allowTrailingComma: true });
+        this.#jsonAst = (0, jsonc_parser_1.parseTree)(this.#content, errors, { allowTrailingComma: true });
         if (errors.length) {
-            formatError(this.path, errors);
+            formatError(this.#path, errors);
         }
-        return this._jsonAst;
+        return this.#jsonAst;
     }
+    /**
+     * Gets a value from the JSON file at a specific path.
+     * @param jsonPath The path to the value.
+     * @returns The value at the given path, or `undefined` if not found.
+     */
     get(jsonPath) {
         const jsonAstNode = this.JsonAst;
         if (!jsonAstNode) {
@@ -52,6 +88,13 @@ class JSONFile {
         const node = (0, jsonc_parser_1.findNodeAtLocation)(jsonAstNode, jsonPath);
         return node === undefined ? undefined : (0, jsonc_parser_1.getNodeValue)(node);
     }
+    /**
+     * Modifies a value in the JSON file.
+     * @param jsonPath The path to the value to modify.
+     * @param value The new value to insert.
+     * @param insertInOrder A function to determine the insertion index, or `false` to insert at the end.
+     * @returns `true` if the modification was successful, `false` otherwise.
+     */
     modify(jsonPath, value, insertInOrder) {
         if (value === undefined && this.get(jsonPath) === undefined) {
             // Cannot remove a value which doesn't exist.
@@ -65,28 +108,49 @@ class JSONFile {
         else if (insertInOrder !== false) {
             getInsertionIndex = insertInOrder;
         }
-        const edits = (0, jsonc_parser_1.modify)(this.content, jsonPath, value, {
+        const edits = (0, jsonc_parser_1.modify)(this.#content, jsonPath, value, {
             getInsertionIndex,
-            // TODO: use indentation from original file.
             formattingOptions: {
-                insertSpaces: true,
-                tabSize: 2,
-                eol: this.eol,
+                insertSpaces: this.#insertSpaces,
+                tabSize: this.#tabSize,
+                eol: this.#eol,
             },
         });
         if (edits.length === 0) {
             return false;
         }
-        this.content = (0, jsonc_parser_1.applyEdits)(this.content, edits);
-        this._jsonAst = undefined;
+        this.#content = (0, jsonc_parser_1.applyEdits)(this.#content, edits);
+        this.#jsonAst = undefined;
         return true;
     }
+    /**
+     * Deletes a value from the JSON file at a specific path.
+     * @param jsonPath The path to the value to delete.
+     * @returns `true` if the deletion was successful, `false` otherwise.
+     */
+    delete(jsonPath) {
+        return this.modify(jsonPath, undefined);
+    }
+    /** Saves the modified content back to the file. */
     save() {
-        (0, node_fs_1.writeFileSync)(this.path, this.content);
+        (0, node_fs_1.writeFileSync)(this.#path, this.#content);
+    }
+    /** Detects the indentation of the file. */
+    #detectIndentation() {
+        // Find the first line that has indentation.
+        const match = this.#content.match(/^(?:( )+|\t+)\S/m);
+        if (match) {
+            this.#insertSpaces = !!match[1];
+            this.#tabSize = match[0].length - 1;
+        }
     }
 }
 exports.JSONFile = JSONFile;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+/**
+ * Reads and parses a JSON file, supporting comments and trailing commas.
+ * @param path The path to the JSON file.
+ * @returns The parsed JSON object.
+ */
 function readAndParseJson(path) {
     const errors = [];
     const content = (0, jsonc_parser_1.parse)((0, node_fs_1.readFileSync)(path, 'utf-8'), errors, { allowTrailingComma: true });
@@ -95,11 +159,20 @@ function readAndParseJson(path) {
     }
     return content;
 }
+/**
+ * Formats a JSON parsing error and throws an exception.
+ * @param path The path to the file that failed to parse.
+ * @param errors The list of parsing errors.
+ */
 function formatError(path, errors) {
     const { error, offset } = errors[0];
     throw new Error(`Failed to parse "${path}" as JSON AST Object. ${(0, jsonc_parser_1.printParseErrorCode)(error)} at location: ${offset}.`);
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+/**
+ * Parses a JSON string, supporting comments and trailing commas.
+ * @param content The JSON string to parse.
+ * @returns The parsed JSON object.
+ */
 function parseJson(content) {
     return (0, jsonc_parser_1.parse)(content, undefined, { allowTrailingComma: true });
 }

package/src/utilities/tty.d.ts

@@ -5,4 +5,12 @@
  * 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
  */
+/**
+ * Determines if the `stream` is a TTY.
+ *
+ * @param stream A NodeJS stream to check. Defaults to `process.stdout`.
+ * @returns `true` if the `stream` is a TTY, `false` otherwise. This detection is overridden
+ * by the `NG_FORCE_TTY` environment variable. In a CI environment, this will also be `false`
+ * unless `NG_FORCE_TTY` is set.
+ */
 export declare function isTTY(stream?: NodeJS.WriteStream): boolean;

package/src/utilities/tty.js

@@ -8,15 +8,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTTY = isTTY;
-function _isTruthy(value) {
-    // Returns true if value is a string that is anything but 0 or false.
-    return value !== undefined && value !== '0' && value.toUpperCase() !== 'FALSE';
-}
+const environment_options_1 = require("./environment-options");
+/**
+ * Determines if the `stream` is a TTY.
+ *
+ * @param stream A NodeJS stream to check. Defaults to `process.stdout`.
+ * @returns `true` if the `stream` is a TTY, `false` otherwise. This detection is overridden
+ * by the `NG_FORCE_TTY` environment variable. In a CI environment, this will also be `false`
+ * unless `NG_FORCE_TTY` is set.
+ */
 function isTTY(stream = process.stdout) {
-    // If we force TTY, we always return true.
-    const force = process.env['NG_FORCE_TTY'];
-    if (force !== undefined) {
-        return _isTruthy(force);
-    }
-    return !!stream.isTTY && !_isTruthy(process.env['CI']);
+    return environment_options_1.forceTty ?? (!!stream.isTTY && !environment_options_1.isCI);
 }

package/src/utilities/version.js

@@ -22,4 +22,4 @@ class Version {
         this.patch = patch;
     }
 }
-exports.VERSION = new Version('20.2.0-next.2');
+exports.VERSION = new Version('20.2.0-rc.0');

package/src/utilities/load-esm.d.ts

@@ -1,20 +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.dev/license
- */
-/**
- * This uses a dynamic import to load a module which may be ESM.
- * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
- * will currently, unconditionally downlevel dynamic import into a require call.
- * require calls cannot load ESM code and will result in a runtime error. To workaround
- * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
- * Once TypeScript provides support for keeping the dynamic import this workaround can
- * be dropped.
- *
- * @param modulePath The path of the module to load.
- * @returns A Promise that resolves to the dynamically imported module.
- */
-export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;

package/src/utilities/load-esm.js

@@ -1,30 +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.dev/license
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadEsmModule = loadEsmModule;
-/**
- * Lazily compiled dynamic import loader function.
- */
-let load;
-/**
- * This uses a dynamic import to load a module which may be ESM.
- * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
- * will currently, unconditionally downlevel dynamic import into a require call.
- * require calls cannot load ESM code and will result in a runtime error. To workaround
- * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
- * Once TypeScript provides support for keeping the dynamic import this workaround can
- * be dropped.
- *
- * @param modulePath The path of the module to load.
- * @returns A Promise that resolves to the dynamically imported module.
- */
-function loadEsmModule(modulePath) {
-    load ??= new Function('modulePath', `return import(modulePath);`);
-    return load(modulePath);
-}