@angular/cli 19.0.0-next.2 → 19.0.0-next.4

package/bin/bootstrap.js

@@ -18,4 +18,12 @@
  * range.
  */
 
-import('../lib/init.js');
+// Enable on-disk code caching if available (Node.js 22.8+)
+try {
+  const { enableCompileCache } = require('node:module');
+
+  enableCompileCache?.();
+} catch {}
+
+// Initialize the Angular CLI
+void import('../lib/init.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "19.0.0-next.2",
+  "version": "19.0.0-next.4",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1900.0-next.2",
-    "@angular-devkit/core": "19.0.0-next.2",
-    "@angular-devkit/schematics": "19.0.0-next.2",
-    "@inquirer/prompts": "5.3.8",
+    "@angular-devkit/architect": "0.1900.0-next.4",
+    "@angular-devkit/core": "19.0.0-next.4",
+    "@angular-devkit/schematics": "19.0.0-next.4",
+    "@inquirer/prompts": "5.5.0",
     "@listr2/prompt-adapter-inquirer": "2.0.15",
-    "@schematics/angular": "19.0.0-next.2",
+    "@schematics/angular": "19.0.0-next.4",
     "@yarnpkg/lockfile": "1.1.0",
-    "ini": "4.1.3",
+    "ini": "5.0.0",
     "jsonc-parser": "3.3.1",
     "listr2": "8.2.4",
     "npm-package-arg": "11.0.3",
@@ -46,14 +46,14 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "19.0.0-next.2",
-      "@angular/build": "19.0.0-next.2",
-      "@angular/ssr": "19.0.0-next.2",
-      "@angular-devkit/architect": "0.1900.0-next.2",
-      "@angular-devkit/build-angular": "19.0.0-next.2",
-      "@angular-devkit/build-webpack": "0.1900.0-next.2",
-      "@angular-devkit/core": "19.0.0-next.2",
-      "@angular-devkit/schematics": "19.0.0-next.2"
+      "@angular/cli": "19.0.0-next.4",
+      "@angular/build": "19.0.0-next.4",
+      "@angular/ssr": "19.0.0-next.4",
+      "@angular-devkit/architect": "0.1900.0-next.4",
+      "@angular-devkit/build-angular": "19.0.0-next.4",
+      "@angular-devkit/build-webpack": "0.1900.0-next.4",
+      "@angular-devkit/core": "19.0.0-next.4",
+      "@angular-devkit/schematics": "19.0.0-next.4"
     }
   },
   "packageManager": "yarn@4.4.0",

package/src/command-builder/command-module.js

@@ -78,6 +78,7 @@ const analytics_collector_1 = require("../analytics/analytics-collector");
 const analytics_parameters_1 = require("../analytics/analytics-parameters");
 const completion_1 = require("../utilities/completion");
 const memoize_1 = require("../utilities/memoize");
+const json_schema_1 = require("./utilities/json-schema");
 var CommandScope;
 (function (CommandScope) {
     /** Command can only run inside an Angular workspace. */
@@ -182,51 +183,12 @@ let CommandModule = (() => {
          * **Note:** This method should be called from the command bundler method.
          */
         addSchemaOptionsToCommand(localYargs, options) {
-            const booleanOptionsWithNoPrefix = new Set();
-            for (const option of options) {
-                const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, hidden, name, choices, } = option;
-                const sharedOptions = {
-                    alias,
-                    hidden,
-                    description,
-                    deprecated,
-                    choices,
-                    // This should only be done when `--help` is used otherwise default will override options set in angular.json.
-                    ...(this.context.args.options.help ? { default: defaultVal } : {}),
-                };
-                let dashedName = core_1.strings.dasherize(name);
-                // Handle options which have been defined in the schema with `no` prefix.
-                if (type === 'boolean' && dashedName.startsWith('no-')) {
-                    dashedName = dashedName.slice(3);
-                    booleanOptionsWithNoPrefix.add(dashedName);
-                }
-                if (positional === undefined) {
-                    localYargs = localYargs.option(dashedName, {
-                        type,
-                        ...sharedOptions,
-                    });
-                }
-                else {
-                    localYargs = localYargs.positional(dashedName, {
-                        type: type === 'array' || type === 'count' ? 'string' : type,
-                        ...sharedOptions,
-                    });
-                }
-                // Record option of analytics.
-                if (userAnalytics !== undefined) {
-                    this.optionsWithAnalytics.set(name, userAnalytics);
-                }
-            }
-            // Handle options which have been defined in the schema with `no` prefix.
-            if (booleanOptionsWithNoPrefix.size) {
-                localYargs.middleware((options) => {
-                    for (const key of booleanOptionsWithNoPrefix) {
-                        if (key in options) {
-                            options[`no-${key}`] = !options[key];
-                            delete options[key];
-                        }
-                    }
-                }, false);
+            const optionsWithAnalytics = (0, json_schema_1.addSchemaOptionsToCommand)(localYargs, options, 
+            // This should only be done when `--help` is used otherwise default will override options set in angular.json.
+            /* includeDefaultValues= */ this.context.args.options.help);
+            // Record option of analytics.
+            for (const [name, userAnalytics] of optionsWithAnalytics) {
+                this.optionsWithAnalytics.set(name, userAnalytics);
             }
             return localYargs;
         }

package/src/command-builder/utilities/json-schema.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { json } from '@angular-devkit/core';
-import yargs from 'yargs';
+import yargs, { Argv } from 'yargs';
 /**
  * An option description.
  */
@@ -36,5 +36,16 @@ export interface Option extends yargs.Options {
      * If this is falsey, do not report this option.
      */
     userAnalytics?: string;
+    /**
+     * Type of the values in a key/value pair field.
+     */
+    itemValueType?: 'string';
 }
 export declare function parseJsonSchemaToOptions(registry: json.schema.SchemaRegistry, schema: json.JsonObject, interactive?: boolean): Promise<Option[]>;
+/**
+ * Adds schema options to a command also this keeps track of options that are required for analytics.
+ * **Note:** This method should be called from the command bundler method.
+ *
+ * @returns A map from option name to analytics configuration.
+ */
+export declare function addSchemaOptionsToCommand<T>(localYargs: Argv<T>, options: Option[], includeDefaultValues: boolean): Map<string, string>;

package/src/command-builder/utilities/json-schema.js

@@ -8,7 +8,38 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJsonSchemaToOptions = parseJsonSchemaToOptions;
+exports.addSchemaOptionsToCommand = addSchemaOptionsToCommand;
 const core_1 = require("@angular-devkit/core");
+function coerceToStringMap(dashedName, value) {
+    const stringMap = {};
+    for (const pair of value) {
+        // This happens when the flag isn't passed at all.
+        if (pair === undefined) {
+            continue;
+        }
+        const eqIdx = pair.indexOf('=');
+        if (eqIdx === -1) {
+            // TODO: Remove workaround once yargs properly handles thrown errors from coerce.
+            // Right now these sometimes end up as uncaught exceptions instead of proper validation
+            // errors with usage output.
+            return Promise.reject(new Error(`Invalid value for argument: ${dashedName}, Given: '${pair}', Expected key=value pair`));
+        }
+        const key = pair.slice(0, eqIdx);
+        const value = pair.slice(eqIdx + 1);
+        stringMap[key] = value;
+    }
+    return stringMap;
+}
+function isStringMap(node) {
+    // Exclude fields with more specific kinds of properties.
+    if (node.properties || node.patternProperties) {
+        return false;
+    }
+    // Restrict to additionalProperties with string values.
+    return (core_1.json.isJsonObject(node.additionalProperties) &&
+        !node.additionalProperties.enum &&
+        node.additionalProperties.type === 'string');
+}
 async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
     const options = [];
     function visitor(current, pointer, parentSchema) {
@@ -52,6 +83,8 @@ async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
                         return true;
                     }
                     return false;
+                case 'object':
+                    return isStringMap(current);
                 default:
                     return false;
             }
@@ -91,7 +124,6 @@ async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
                     break;
             }
         }
-        const type = types[0];
         const $default = current.$default;
         const $defaultIndex = core_1.json.isJsonObject($default) && $default['$source'] == 'argv' ? $default['index'] : undefined;
         const positional = typeof $defaultIndex == 'number' ? $defaultIndex : undefined;
@@ -115,7 +147,6 @@ async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
         const option = {
             name,
             description: '' + (current.description === undefined ? '' : current.description),
-            type,
             default: defaultValue,
             choices: enumValues.length ? enumValues : undefined,
             required,
@@ -125,6 +156,14 @@ async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
             userAnalytics,
             deprecated,
             positional,
+            ...(types[0] === 'object'
+                ? {
+                    type: 'array',
+                    itemValueType: 'string',
+                }
+                : {
+                    type: types[0],
+                }),
         };
         options.push(option);
     }
@@ -141,3 +180,65 @@ async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
         return a.name.localeCompare(b.name);
     });
 }
+/**
+ * Adds schema options to a command also this keeps track of options that are required for analytics.
+ * **Note:** This method should be called from the command bundler method.
+ *
+ * @returns A map from option name to analytics configuration.
+ */
+function addSchemaOptionsToCommand(localYargs, options, includeDefaultValues) {
+    const booleanOptionsWithNoPrefix = new Set();
+    const keyValuePairOptions = new Set();
+    const optionsWithAnalytics = new Map();
+    for (const option of options) {
+        const { default: defaultVal, positional, deprecated, description, alias, userAnalytics, type, itemValueType, hidden, name, choices, } = option;
+        let dashedName = core_1.strings.dasherize(name);
+        // Handle options which have been defined in the schema with `no` prefix.
+        if (type === 'boolean' && dashedName.startsWith('no-')) {
+            dashedName = dashedName.slice(3);
+            booleanOptionsWithNoPrefix.add(dashedName);
+        }
+        if (itemValueType) {
+            keyValuePairOptions.add(name);
+        }
+        const sharedOptions = {
+            alias,
+            hidden,
+            description,
+            deprecated,
+            choices,
+            coerce: itemValueType ? coerceToStringMap.bind(null, dashedName) : undefined,
+            // This should only be done when `--help` is used otherwise default will override options set in angular.json.
+            ...(includeDefaultValues ? { default: defaultVal } : {}),
+        };
+        if (positional === undefined) {
+            localYargs = localYargs.option(dashedName, {
+                array: itemValueType ? true : undefined,
+                type: itemValueType ?? type,
+                ...sharedOptions,
+            });
+        }
+        else {
+            localYargs = localYargs.positional(dashedName, {
+                type: type === 'array' || type === 'count' ? 'string' : type,
+                ...sharedOptions,
+            });
+        }
+        // Record option of analytics.
+        if (userAnalytics !== undefined) {
+            optionsWithAnalytics.set(name, userAnalytics);
+        }
+    }
+    // Handle options which have been defined in the schema with `no` prefix.
+    if (booleanOptionsWithNoPrefix.size) {
+        localYargs.middleware((options) => {
+            for (const key of booleanOptionsWithNoPrefix) {
+                if (key in options) {
+                    options[`no-${key}`] = !options[key];
+                    delete options[key];
+                }
+            }
+        }, false);
+    }
+    return optionsWithAnalytics;
+}

package/src/commands/e2e/cli.js

@@ -11,6 +11,10 @@ const architect_command_module_1 = require("../../command-builder/architect-comm
 const command_config_1 = require("../command-config");
 class E2eCommandModule extends architect_command_module_1.ArchitectCommandModule {
     missingTargetChoices = [
+        {
+            name: 'Playwright',
+            value: 'playwright-ng-schematics',
+        },
         {
             name: 'Cypress',
             value: '@cypress/schematic',

package/src/utilities/version.js

@@ -25,5 +25,5 @@ class Version {
     }
 }
 // TODO(bazel): Convert this to use build-time version stamping after flipping the build script to use bazel
-// export const VERSION = new Version('19.0.0-next.2');
+// export const VERSION = new Version('19.0.0-next.4');
 exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);