fix(@schematics/angular): prevent AI config schematic from failing when 'none' and other AI tools are selected

When using 'ng new' with the interactive AI tool prompt, the 'none' option remains selected even after a user selects another tool. This results in a validation error because the schematic receives an array with both 'none' and the selected tool. This fix filters out the 'none' value from the `tool` option if any other tool is also present, allowing the schematic to proceed. Closes: #30987 (cherry picked from commit 0f86cf8)

Author: alan-agius4

packages/ngtools/webpack/src/transformers/replace_resources_spec.ts

@@ -105,7 +105,7 @@ describe('@ngtools/webpack transformers', () => {
  expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
  });
 
- it('should should support svg as templates', () => {
+ it('should support svg as templates', () => {
  const input = tags.stripIndent`
  import { Component } from '@angular/core';
 

packages/schematics/angular/ai-config/index.ts

@@ -19,9 +19,7 @@ import {
 } from '@angular-devkit/schematics';
 import { Schema as ConfigOptions, Tool } from './schema';
 
-type ToolWithoutNone = Exclude<Tool, Tool.None>;
-
-const AI_TOOLS: { [key in ToolWithoutNone]: ContextFileInfo } = {
+const AI_TOOLS: { [key in Exclude<Tool, Tool.None>]: ContextFileInfo } = {
  gemini: {
  rulesName: 'GEMINI.md',
  directory: '.gemini',
@@ -57,26 +55,25 @@ interface ContextFileInfo {
 }
 
 export default function ({ tool }: ConfigOptions): Rule {
- if (!tool || tool.includes(Tool.None)) {
+ if (!tool) {
  return noop();
  }
 
- const files: ContextFileInfo[] = (tool as ToolWithoutNone[]).map(
- (selectedTool) => AI_TOOLS[selectedTool],
- );
-
- const rules = files.map(({ rulesName, directory, frontmatter }) =>
- mergeWith(
- apply(url('./files'), [
- applyTemplates({
- ...strings,
- rulesName,
- frontmatter,
- }),
- move(directory),
- ]),
- ),
- );
+ const rules = tool
+ .filter((tool) => tool !== Tool.None)
+ .map((selectedTool) => AI_TOOLS[selectedTool])
+ .map(({ rulesName, directory, frontmatter }) =>
+ mergeWith(
+ apply(url('./files'), [
+ applyTemplates({
+ ...strings,
+ rulesName,
+ frontmatter,
+ }),
+ move(directory),
+ ]),
+ ),
+ );
 
  return chain(rules);
 }

packages/schematics/angular/ai-config/index_spec.ts

@@ -72,13 +72,14 @@ describe('Ai Config Schematic', () => {
  expect(tree.exists('.cursor/rules/cursor.mdc')).toBeTruthy();
  });
 
- it('should error is None is associated with other values', () => {
- return expectAsync(runConfigSchematic([ConfigTool.None, ConfigTool.Cursor])).toBeRejected();
- });
-
  it('should not create any files if None is selected', async () => {
  const filesCount = workspaceTree.files.length;
  const tree = await runConfigSchematic([ConfigTool.None]);
  expect(tree.files.length).toBe(filesCount);
  });
+
+ it('should create for tool if None and Gemini are selected', async () => {
+ const tree = await runConfigSchematic([ConfigTool.Gemini, ConfigTool.None]);
+ expect(tree.exists('.gemini/GEMINI.md')).toBeTruthy();
+ });
 });

packages/schematics/angular/ai-config/schema.json

@@ -9,7 +9,7 @@
  "tool": {
  "type": "array",
  "uniqueItems": true,
- "default": "none",
+ "default": ["none"],
  "x-prompt": {
  "message": "Which AI tools do you want to configure with Angular best practices? https://angular.dev/ai/develop-with-ai",
  "type": "list",
@@ -50,21 +50,5 @@
  "enum": ["none", "gemini", "copilot", "claude", "cursor", "jetbrains", "windsurf"]
  }
  }
- },
- "if": {
- "properties": {
- "tool": {
- "contains": {
- "const": "none"
- }
- }
- }
- },
- "then": {
- "properties": {
- "tool": {
- "maxItems": 1
- }
- }
  }
 }

packages/schematics/angular/ng-new/index_spec.ts

@@ -58,7 +58,7 @@ describe('Ng New Schematic', () => {
  );
  });
 
- it('should should set the prefix in angular.json and in app.ts', async () => {
+ it('should set the prefix in angular.json and in app.ts', async () => {
  const options = { ...defaultOptions, prefix: 'pre' };
 
  const tree = await schematicRunner.runSchematic('ng-new', options);