@angular/cli 18.1.0-next.3 → 18.1.0-rc.1

package/src/commands/new/cli.js

@@ -30,7 +30,7 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
         const collectionName = typeof collectionNameFromArgs === 'string'
             ? collectionNameFromArgs
             : await this.getCollectionFromConfig();
-        const workflow = await this.getOrCreateWorkflowForBuilder(collectionName);
+        const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
         const collection = workflow.engine.createCollection(collectionName);
         const options = await this.getSchematicOptions(collection, this.schematicName, workflow);
         return this.addSchemaOptionsToCommand(localYargs, options);

package/src/commands/update/schematic/index.js

@@ -191,7 +191,7 @@ function _validateUpdatePackages(infoMap, force, next, logger) {
     }
 }
 function _performUpdate(tree, context, infoMap, logger, migrateOnly) {
-    const packageJsonContent = tree.read('/package.json');
+    const packageJsonContent = tree.read('/package.json')?.toString();
     if (!packageJsonContent) {
         throw new schematics_1.SchematicsException('Could not find a package.json. Are you in a Node project?');
     }
@@ -232,10 +232,12 @@ function _performUpdate(tree, context, infoMap, logger, migrateOnly) {
             logger.warn(`Package ${name} was not found in dependencies.`);
         }
     });
-    const newContent = JSON.stringify(packageJson, null, 2);
-    if (packageJsonContent.toString() != newContent || migrateOnly) {
+    const eofMatches = packageJsonContent.match(/\r?\n$/);
+    const eof = eofMatches?.[0] ?? '';
+    const newContent = JSON.stringify(packageJson, null, 2) + eof;
+    if (packageJsonContent != newContent || migrateOnly) {
         if (!migrateOnly) {
-            tree.overwrite('/package.json', JSON.stringify(packageJson, null, 2));
+            tree.overwrite('/package.json', newContent);
         }
         const externalMigrations = [];
         // Run the migrate schematics with the list of packages to use. The collection contains

package/src/utilities/color.d.ts

@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 export { color as colors, figures } from 'listr2';
-export declare function supportColor(): boolean;
+export declare function supportColor(stream?: NodeJS.WritableStream): boolean;

package/src/utilities/color.js

@@ -13,27 +13,15 @@ const node_tty_1 = require("node:tty");
 var listr2_1 = require("listr2");
 Object.defineProperty(exports, "colors", { enumerable: true, get: function () { return listr2_1.color; } });
 Object.defineProperty(exports, "figures", { enumerable: true, get: function () { return listr2_1.figures; } });
-function supportColor() {
-    if (process.env.FORCE_COLOR !== undefined) {
-        // 2 colors: FORCE_COLOR = 0 (Disables colors), depth 1
-        // 16 colors: FORCE_COLOR = 1, depth 4
-        // 256 colors: FORCE_COLOR = 2, depth 8
-        // 16,777,216 colors: FORCE_COLOR = 3, depth 16
-        // See: https://nodejs.org/dist/latest-v12.x/docs/api/tty.html#tty_writestream_getcolordepth_env
-        // and https://github.com/nodejs/node/blob/b9f36062d7b5c5039498e98d2f2c180dca2a7065/lib/internal/tty.js#L106;
-        switch (process.env.FORCE_COLOR) {
-            case '':
-            case 'true':
-            case '1':
-            case '2':
-            case '3':
-                return true;
-            default:
-                return false;
-        }
+function supportColor(stream = process.stdout) {
+    if (stream instanceof node_tty_1.WriteStream) {
+        return stream.hasColors();
     }
-    if (process.stdout instanceof node_tty_1.WriteStream) {
-        return process.stdout.getColorDepth() > 1;
+    try {
+        // The hasColors function does not rely on any instance state and should ideally be static
+        return node_tty_1.WriteStream.prototype.hasColors();
+    }
+    catch {
+        return process.env['FORCE_COLOR'] !== undefined && process.env['FORCE_COLOR'] !== '0';
     }
-    return false;
 }

package/src/utilities/memoize.d.ts

@@ -12,4 +12,4 @@
  *
  * @see https://en.wikipedia.org/wiki/Memoization
  */
-export declare function memoize<T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+export declare function memoize<This, Args extends unknown[], Return>(target: (this: This, ...args: Args) => Return, context: ClassMemberDecoratorContext): (this: This, ...args: Args) => Return;

package/src/utilities/memoize.js

@@ -15,29 +15,24 @@ exports.memoize = memoize;
  *
  * @see https://en.wikipedia.org/wiki/Memoization
  */
-function memoize(target, propertyKey, descriptor) {
-    const descriptorPropertyName = descriptor.get ? 'get' : 'value';
-    const originalMethod = descriptor[descriptorPropertyName];
-    if (typeof originalMethod !== 'function') {
+function memoize(target, context) {
+    if (context.kind !== 'method' && context.kind !== 'getter') {
         throw new Error('Memoize decorator can only be used on methods or get accessors.');
     }
     const cache = new Map();
-    return {
-        ...descriptor,
-        [descriptorPropertyName]: function (...args) {
-            for (const arg of args) {
-                if (!isJSONSerializable(arg)) {
-                    throw new Error(`Argument ${isNonPrimitive(arg) ? arg.toString() : arg} is JSON serializable.`);
-                }
+    return function (...args) {
+        for (const arg of args) {
+            if (!isJSONSerializable(arg)) {
+                throw new Error(`Argument ${isNonPrimitive(arg) ? arg.toString() : arg} is JSON serializable.`);
             }
-            const key = JSON.stringify(args);
-            if (cache.has(key)) {
-                return cache.get(key);
-            }
-            const result = originalMethod.apply(this, args);
-            cache.set(key, result);
-            return result;
-        },
+        }
+        const key = JSON.stringify(args);
+        if (cache.has(key)) {
+            return cache.get(key);
+        }
+        const result = target.apply(this, args);
+        cache.set(key, result);
+        return result;
     };
 }
 /** Method to check if value is a non primitive. */