@angular/cli 20.2.0-rc.1 → 20.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "20.2.0-rc.1",
+  "version": "20.2.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,13 +25,13 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.2002.0-rc.1",
-    "@angular-devkit/core": "20.2.0-rc.1",
-    "@angular-devkit/schematics": "20.2.0-rc.1",
+    "@angular-devkit/architect": "0.2002.0",
+    "@angular-devkit/core": "20.2.0",
+    "@angular-devkit/schematics": "20.2.0",
     "@inquirer/prompts": "7.8.2",
     "@listr2/prompt-adapter-inquirer": "3.0.1",
-    "@modelcontextprotocol/sdk": "1.17.2",
-    "@schematics/angular": "20.2.0-rc.1",
+    "@modelcontextprotocol/sdk": "1.17.3",
+    "@schematics/angular": "20.2.0",
     "@yarnpkg/lockfile": "1.1.0",
     "algoliasearch": "5.35.0",
     "ini": "5.0.0",
@@ -47,14 +47,14 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "20.2.0-rc.1",
-      "@angular/build": "20.2.0-rc.1",
-      "@angular/ssr": "20.2.0-rc.1",
-      "@angular-devkit/architect": "0.2002.0-rc.1",
-      "@angular-devkit/build-angular": "20.2.0-rc.1",
-      "@angular-devkit/build-webpack": "0.2002.0-rc.1",
-      "@angular-devkit/core": "20.2.0-rc.1",
-      "@angular-devkit/schematics": "20.2.0-rc.1"
+      "@angular/cli": "20.2.0",
+      "@angular/build": "20.2.0",
+      "@angular/ssr": "20.2.0",
+      "@angular-devkit/architect": "0.2002.0",
+      "@angular-devkit/build-angular": "20.2.0",
+      "@angular-devkit/build-webpack": "0.2002.0",
+      "@angular-devkit/core": "20.2.0",
+      "@angular-devkit/schematics": "20.2.0"
     }
   },
   "packageManager": "pnpm@10.14.0",

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

@@ -218,11 +218,17 @@ let CommandModule = (() => {
                 ...Object.values(analytics_parameters_1.EventCustomMetric),
             ]);
             for (const [name, ua] of this.optionsWithAnalytics) {
+                if (!validEventCustomDimensionAndMetrics.has(ua)) {
+                    continue;
+                }
                 const value = options[name];
-                if ((typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') &&
-                    validEventCustomDimensionAndMetrics.has(ua)) {
+                if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
                     parameters[ua] = value;
                 }
+                else if (Array.isArray(value)) {
+                    // GA doesn't allow array as values.
+                    parameters[ua] = value.sort().join(', ');
+                }
             }
             return parameters;
         }

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

@@ -224,11 +224,13 @@ let SchematicsCommandModule = (() => {
                                         ? {
                                             name: item,
                                             value: item,
+                                            checked: item === definition.default,
                                         }
                                         : {
                                             ...item,
                                             name: item.label,
                                             value: item.value,
+                                            checked: item.value === definition.default,
                                         }),
                                 });
                                 break;

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

@@ -7,6 +7,7 @@
  */
 import { json } from '@angular-devkit/core';
 import type { Argv, Options as YargsOptions } from 'yargs';
+import { EventCustomDimension } from '../../analytics/analytics-parameters';
 /**
  * An option description.
  */
@@ -48,4 +49,4 @@ export declare function parseJsonSchemaToOptions(registry: json.schema.SchemaReg
  *
  * @returns A map from option name to analytics configuration.
  */
-export declare function addSchemaOptionsToCommand<T>(localYargs: Argv<T>, options: Option[], includeDefaultValues: boolean): Map<string, string>;
+export declare function addSchemaOptionsToCommand<T>(localYargs: Argv<T>, options: Option[], includeDefaultValues: boolean): Map<string, EventCustomDimension>;

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

@@ -10,7 +10,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJsonSchemaToOptions = parseJsonSchemaToOptions;
 exports.addSchemaOptionsToCommand = addSchemaOptionsToCommand;
 const core_1 = require("@angular-devkit/core");
-function coerceToStringMap(dashedName, value) {
+function checkStringMap(keyValuePairOptions, args) {
+    for (const key of keyValuePairOptions) {
+        const value = args[key];
+        if (!Array.isArray(value)) {
+            // Value has been parsed.
+            continue;
+        }
+        for (const pair of value) {
+            if (pair === undefined) {
+                continue;
+            }
+            if (!pair.includes('=')) {
+                throw new Error(`Invalid value for argument: ${key}, Given: '${pair}', Expected key=value pair`);
+            }
+        }
+    }
+    return true;
+}
+function coerceToStringMap(value) {
     const stringMap = {};
     for (const pair of value) {
         // This happens when the flag isn't passed at all.
@@ -19,14 +37,11 @@ function coerceToStringMap(dashedName, value) {
         }
         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`));
+            // In the case it is not valid skip processing this option and handle the error in `checkStringMap`
+            return value;
         }
         const key = pair.slice(0, eqIdx);
-        const value = pair.slice(eqIdx + 1);
-        stringMap[key] = value;
+        stringMap[key] = pair.slice(eqIdx + 1);
     }
     return stringMap;
 }
@@ -79,7 +94,7 @@ async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
                     // Only include arrays if they're boolean, string or number.
                     if (core_1.json.isJsonObject(current.items) &&
                         typeof current.items.type == 'string' &&
-                        ['boolean', 'number', 'string'].includes(current.items.type)) {
+                        isValidTypeForEnum(current.items.type)) {
                         return true;
                     }
                     return false;
@@ -94,20 +109,18 @@ async function parseJsonSchemaToOptions(registry, schema, interactive = true) {
             return;
         }
         // Only keep enum values we support (booleans, numbers and strings).
-        const enumValues = ((core_1.json.isJsonArray(current.enum) && current.enum) || []).filter((x) => {
-            switch (typeof x) {
-                case 'boolean':
-                case 'number':
-                case 'string':
-                    return true;
-                default:
-                    return false;
-            }
-        });
+        const enumValues = ((core_1.json.isJsonArray(current.enum) && current.enum) ||
+            (core_1.json.isJsonObject(current.items) &&
+                core_1.json.isJsonArray(current.items.enum) &&
+                current.items.enum) ||
+            [])
+            .filter((value) => isValidTypeForEnum(typeof value))
+            .sort();
         let defaultValue = undefined;
         if (current.default !== undefined) {
             switch (types[0]) {
                 case 'string':
+                case 'array':
                     if (typeof current.default == 'string') {
                         defaultValue = current.default;
                     }
@@ -199,7 +212,7 @@ function addSchemaOptionsToCommand(localYargs, options, includeDefaultValues) {
             booleanOptionsWithNoPrefix.add(dashedName);
         }
         if (itemValueType) {
-            keyValuePairOptions.add(name);
+            keyValuePairOptions.add(dashedName);
         }
         const sharedOptions = {
             alias,
@@ -207,7 +220,7 @@ function addSchemaOptionsToCommand(localYargs, options, includeDefaultValues) {
             description,
             deprecated,
             choices,
-            coerce: itemValueType ? coerceToStringMap.bind(null, dashedName) : undefined,
+            coerce: itemValueType ? coerceToStringMap : undefined,
             // This should only be done when `--help` is used otherwise default will override options set in angular.json.
             ...(includeDefaultValues ? { default: defaultVal } : {}),
         };
@@ -229,6 +242,10 @@ function addSchemaOptionsToCommand(localYargs, options, includeDefaultValues) {
             optionsWithAnalytics.set(name, userAnalytics);
         }
     }
+    // Valid key/value options
+    if (keyValuePairOptions.size) {
+        localYargs.check(checkStringMap.bind(null, keyValuePairOptions), false);
+    }
     // Handle options which have been defined in the schema with `no` prefix.
     if (booleanOptionsWithNoPrefix.size) {
         localYargs.middleware((options) => {
@@ -242,3 +259,7 @@ function addSchemaOptionsToCommand(localYargs, options, includeDefaultValues) {
     }
     return optionsWithAnalytics;
 }
+const VALID_ENUM_TYPES = new Set(['boolean', 'number', 'string']);
+function isValidTypeForEnum(value) {
+    return VALID_ENUM_TYPES.has(value);
+}

package/src/commands/mcp/cli.js

@@ -24,6 +24,8 @@ To start using the Angular CLI MCP Server, add this configuration to your host:
 }
 
 Exact configuration may differ depending on the host.
+
+For more information and documentation, visit: https://angular.dev/ai/mcp
 `;
 class McpCommandModule extends command_module_1.CommandModule {
     command = 'mcp';
@@ -46,6 +48,8 @@ class McpCommandModule extends command_module_1.CommandModule {
             alias: 'E',
             array: true,
             describe: 'Enable an experimental tool.',
+            choices: mcp_server_1.EXPERIMENTAL_TOOLS.map(({ name }) => name),
+            hidden: true,
         });
     }
     async run(options) {

package/src/commands/mcp/mcp-server.d.ts

@@ -8,6 +8,17 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { AngularWorkspace } from '../../utilities/config';
 import { AnyMcpToolDeclaration } from './tools/tool-registry';
+/**
+ * The set of tools that are available but not enabled by default.
+ * These tools are considered experimental and may have limitations.
+ */
+export declare const EXPERIMENTAL_TOOLS: readonly [import("./tools/tool-registry").McpToolDeclaration<{
+    query: import("zod").ZodString;
+}, import("zod").ZodRawShape>, import("./tools/tool-registry").McpToolDeclaration<{
+    transformations: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodEnum<[string, ...string[]]>, "many">>;
+}, {
+    instructions: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+}>];
 export declare function createMcpServer(options: {
     workspace?: AngularWorkspace;
     readOnly?: boolean;

package/src/commands/mcp/mcp-server.js

@@ -10,6 +10,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EXPERIMENTAL_TOOLS = void 0;
 exports.createMcpServer = createMcpServer;
 exports.assembleToolDeclarations = assembleToolDeclarations;
 const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
@@ -31,7 +32,7 @@ const STABLE_TOOLS = [best_practices_1.BEST_PRACTICES_TOOL, doc_search_1.DOC_SEA
  * The set of tools that are available but not enabled by default.
  * These tools are considered experimental and may have limitations.
  */
-const EXPERIMENTAL_TOOLS = [examples_1.FIND_EXAMPLE_TOOL, modernize_1.MODERNIZE_TOOL];
+exports.EXPERIMENTAL_TOOLS = [examples_1.FIND_EXAMPLE_TOOL, modernize_1.MODERNIZE_TOOL];
 async function createMcpServer(options, logger) {
     const server = new mcp_js_1.McpServer({
         name: 'angular-cli-server',
@@ -46,7 +47,7 @@ async function createMcpServer(options, logger) {
             'When writing or modifying Angular code, use the MCP server and its tools instead of direct shell commands where possible.',
     });
     (0, instructions_1.registerInstructionsResource)(server);
-    const toolDeclarations = assembleToolDeclarations(STABLE_TOOLS, EXPERIMENTAL_TOOLS, {
+    const toolDeclarations = assembleToolDeclarations(STABLE_TOOLS, exports.EXPERIMENTAL_TOOLS, {
         ...options,
         logger,
     });

package/src/commands/mcp/tools/doc-search.js

@@ -112,7 +112,7 @@ function createDocSearchHandler() {
                     const response = await fetch(url);
                     if (response.ok) {
                         const html = await response.text();
-                        const mainContent = extractBodyContent(html);
+                        const mainContent = extractMainContent(html);
                         if (mainContent) {
                             topText += `\n\n--- DOCUMENTATION CONTENT ---\n${mainContent}`;
                         }
@@ -138,22 +138,21 @@ function createDocSearchHandler() {
     };
 }
 /**
- * Extracts the content of the `<body>` element from an HTML string.
+ * Extracts the content of the `<main>` element from an HTML string.
  *
  * @param html The HTML content of a page.
- * @returns The content of the `<body>` element, or `undefined` if not found.
+ * @returns The content of the `<main>` element, or `undefined` if not found.
  */
-function extractBodyContent(html) {
-    // TODO: Use '<main>' element instead of '<body>' when available in angular.dev HTML.
-    const mainTagStart = html.indexOf('<body');
+function extractMainContent(html) {
+    const mainTagStart = html.indexOf('<main');
     if (mainTagStart === -1) {
         return undefined;
     }
-    const mainTagEnd = html.lastIndexOf('</body>');
+    const mainTagEnd = html.lastIndexOf('</main>');
     if (mainTagEnd <= mainTagStart) {
         return undefined;
     }
-    // Add 7 to include '</body>'
+    // Add 7 to include '</main>'
     return html.substring(mainTagStart, mainTagEnd + 7);
 }
 /**

package/src/utilities/package-manager.js

@@ -171,7 +171,7 @@ let PackageManagerUtils = (() => {
             const { cwd = process.cwd(), silent = false } = options;
             return new Promise((resolve) => {
                 const bufferedOutput = [];
-                const childProcess = (0, node_child_process_1.spawn)(this.name, args, {
+                const childProcess = (0, node_child_process_1.spawn)(`${this.name} ${args.join(' ')}`, {
                     // Always pipe stderr to allow for failures to be reported
                     stdio: silent ? ['ignore', 'ignore', 'pipe'] : 'pipe',
                     shell: true,

package/src/utilities/version.js

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