@schematics/angular 21.0.0-next.0 → 21.0.0-next.2

package/utility/ast-utils.js

@@ -57,7 +57,6 @@ exports.isImported = isImported;
 exports.getRouterModuleDeclaration = getRouterModuleDeclaration;
 exports.addRouteDeclarationToModule = addRouteDeclarationToModule;
 exports.hasTopLevelIdentifier = hasTopLevelIdentifier;
-const core_1 = require("@angular-devkit/core");
 const ts = __importStar(require("../third_party/github.com/Microsoft/TypeScript/lib/typescript"));
 const change_1 = require("./change");
 const eol_1 = require("./eol");
@@ -116,6 +115,7 @@ function insertImport(source, fileToEdit, symbolName, fileName, isDefault = fals
         ` from '${fileName}'${insertAtBeginning ? `;${eol}` : ''}`;
     return insertAfterLastOccurrence(allImports, toInsert, fileToEdit, fallbackPos, ts.SyntaxKind.StringLiteral);
 }
+const findNodesCache = new WeakMap();
 function findNodes(node, kindOrGuard, max = Infinity, recursive = false) {
     if (!node || max == 0) {
         return [];
@@ -123,6 +123,13 @@ function findNodes(node, kindOrGuard, max = Infinity, recursive = false) {
     const test = typeof kindOrGuard === 'function'
         ? kindOrGuard
         : (node) => node.kind === kindOrGuard;
+    // Caching is only supported for the entire file
+    if (ts.isSourceFile(node)) {
+        const sourceFileCache = findNodesCache.get(node);
+        if (sourceFileCache?.has(kindOrGuard)) {
+            return sourceFileCache.get(kindOrGuard);
+        }
+    }
     const arr = [];
     if (test(node)) {
         arr.push(node);
@@ -141,6 +148,14 @@ function findNodes(node, kindOrGuard, max = Infinity, recursive = false) {
             }
         }
     }
+    if (ts.isSourceFile(node)) {
+        let sourceFileCache = findNodesCache.get(node);
+        if (!sourceFileCache) {
+            sourceFileCache = new Map();
+            findNodesCache.set(node, sourceFileCache);
+        }
+        sourceFileCache.set(kindOrGuard, arr);
+    }
     return arr;
 }
 /**
@@ -150,17 +165,12 @@ function findNodes(node, kindOrGuard, max = Infinity, recursive = false) {
  */
 function getSourceNodes(sourceFile) {
     const nodes = [sourceFile];
-    const result = [];
-    while (nodes.length > 0) {
-        const node = nodes.shift();
-        if (node) {
-            result.push(node);
-            if (node.getChildCount(sourceFile) >= 0) {
-                nodes.unshift(...node.getChildren());
-            }
-        }
+    // NOTE: nodes.length changes inside of the loop but we only append to the end
+    for (let i = 0; i < nodes.length; i++) {
+        const node = nodes[i];
+        nodes.push(...node.getChildren(sourceFile));
     }
-    return result;
+    return nodes;
 }
 function findNode(node, kind, text) {
     if (node.kind === kind && node.getText() === text) {
@@ -312,7 +322,11 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
         let toInsert;
         if (node.properties.length == 0) {
             position = node.getEnd() - 1;
-            toInsert = `\n  ${metadataField}: [\n${core_1.tags.indentBy(4) `${symbolName}`}\n  ]\n`;
+            toInsert = `
+  ${metadataField}: [
+${' '.repeat(4)}${symbolName}
+  ]
+`;
         }
         else {
             const childNode = node.properties[node.properties.length - 1];
@@ -323,7 +337,7 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
             if (matches) {
                 toInsert =
                     `,${matches[0]}${metadataField}: [${matches[1]}` +
-                        `${core_1.tags.indentBy(matches[2].length + 2) `${symbolName}`}${matches[0]}]`;
+                        `${' '.repeat(matches[2].length + 2)}${symbolName}${matches[0]}]`;
             }
             else {
                 toInsert = `, ${metadataField}: [${symbolName}]`;
@@ -349,8 +363,8 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
     const assignmentInit = assignment.initializer;
     const elements = assignmentInit.elements;
     if (elements.length) {
-        const symbolsArray = elements.map((node) => core_1.tags.oneLine `${node.getText()}`);
-        if (symbolsArray.includes(core_1.tags.oneLine `${symbolName}`)) {
+        const symbolsArray = elements.map((node) => node.getText());
+        if (symbolsArray.includes(symbolName)) {
             return [];
         }
         expression = elements[elements.length - 1];
@@ -363,14 +377,14 @@ function addSymbolToNgModuleMetadata(source, ngModulePath, metadataField, symbol
     if (ts.isArrayLiteralExpression(expression)) {
         // We found the field but it's empty. Insert it just before the `]`.
         position--;
-        toInsert = `\n${core_1.tags.indentBy(4) `${symbolName}`}\n  `;
+        toInsert = `\n${' '.repeat(4)}${symbolName}\n  `;
     }
     else {
         // Get the indentation of the last element, if any.
         const text = expression.getFullText(source);
         const matches = text.match(/^(\r?\n)(\s*)/);
         if (matches) {
-            toInsert = `,${matches[1]}${core_1.tags.indentBy(matches[2].length) `${symbolName}`}`;
+            toInsert = `,${matches[1]}${' '.repeat(matches[2].length)}${symbolName}`;
         }
         else {
             toInsert = `, ${symbolName}`;

package/utility/generate-from-files.d.ts

@@ -15,5 +15,6 @@ export interface GenerateFromFilesOptions {
     skipTests?: boolean;
     templateFilesDirectory?: string;
     type?: string;
+    classifiedName?: string;
 }
 export declare function generateFromFiles(options: GenerateFromFilesOptions, extraTemplateValues?: Record<string, string | ((v: string) => string)>): Rule;

package/utility/latest-versions/package.json

@@ -8,7 +8,7 @@
     "@types/node": "^20.17.19",
     "browser-sync": "^3.0.0",
     "express": "^5.1.0",
-    "jasmine-core": "~5.9.0",
+    "jasmine-core": "~5.10.0",
     "jasmine-spec-reporter": "~7.0.0",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.0",
@@ -19,6 +19,8 @@
     "postcss": "^8.5.3",
     "protractor": "~7.0.0",
     "rxjs": "~7.8.0",
+    "tailwindcss": "^4.1.12",
+    "@tailwindcss/postcss": "^4.1.12",
     "tslib": "^2.3.0",
     "ts-node": "~10.9.0",
     "typescript": "~5.9.2",

package/utility/latest-versions.js

@@ -16,7 +16,7 @@ exports.latestVersions = {
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
     Angular: '^21.0.0-next.0',
     NgPackagr: '^21.0.0-next.0',
-    DevkitBuildAngular: '^21.0.0-next.0',
-    AngularBuild: '^21.0.0-next.0',
-    AngularSSR: '^21.0.0-next.0',
+    DevkitBuildAngular: '^21.0.0-next.2',
+    AngularBuild: '^21.0.0-next.2',
+    AngularSSR: '^21.0.0-next.2',
 };

package/utility/project.d.ts

@@ -0,0 +1,25 @@
+/**
+ * @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
+ */
+import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { ProjectDefinition, WorkspaceDefinition } from './workspace';
+/**
+ * Creates a schematic rule factory that provides project information to the given factory function.
+ * The project is determined from the `project` option. If the project is not found, an exception is
+ * thrown.
+ *
+ * @param factory The factory function that creates the schematic rule.
+ * @returns A schematic rule factory.
+ */
+export declare function createProjectSchematic<S extends {
+    project: string;
+}>(factory: (options: S, projectContext: {
+    project: ProjectDefinition;
+    workspace: WorkspaceDefinition;
+    tree: Tree;
+    context: SchematicContext;
+}) => Rule | Promise<Rule>): (options: S) => Rule;

package/utility/project.js

@@ -0,0 +1,30 @@
+"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.createProjectSchematic = createProjectSchematic;
+const schematics_1 = require("@angular-devkit/schematics");
+const workspace_1 = require("./workspace");
+/**
+ * Creates a schematic rule factory that provides project information to the given factory function.
+ * The project is determined from the `project` option. If the project is not found, an exception is
+ * thrown.
+ *
+ * @param factory The factory function that creates the schematic rule.
+ * @returns A schematic rule factory.
+ */
+function createProjectSchematic(factory) {
+    return (options) => async (tree, context) => {
+        const workspace = await (0, workspace_1.getWorkspace)(tree);
+        const project = workspace.projects.get(options.project);
+        if (!project) {
+            throw new schematics_1.SchematicsException(`Project "${options.project}" does not exist.`);
+        }
+        return factory(options, { project, workspace, tree, context });
+    };
+}

package/utility/standalone/rules.js

@@ -9,7 +9,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRootImport = addRootImport;
 exports.addRootProvider = addRootProvider;
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ast_utils_1 = require("../ast-utils");
 const change_1 = require("../change");
@@ -137,7 +136,7 @@ function insertStandaloneRootProvider(tree, mainFilePath, expression) {
         addProvidersExpressionToAppConfig(tree, appConfig, expression);
         return;
     }
-    const newAppConfig = `, {\n${core_1.tags.indentBy(2) `providers: [${expression}]`}\n}`;
+    const newAppConfig = `, {\n${' '.repeat(2)}providers: [${expression}]\n}`;
     let targetCall;
     if (bootstrapCall.arguments.length === 1) {
         targetCall = bootstrapCall;
@@ -170,7 +169,7 @@ function addProvidersExpressionToAppConfig(tree, appConfig, expression) {
         ]);
     }
     else {
-        const prop = core_1.tags.indentBy(2) `providers: [${expression}]`;
+        const prop = `${' '.repeat(2)}providers: [${expression}]`;
         let toInsert;
         let insertPosition;
         if (configProps.length === 0) {

package/web-worker/index.d.ts

@@ -7,4 +7,5 @@
  */
 import { Rule } from '@angular-devkit/schematics';
 import { Schema as WebWorkerOptions } from './schema';
-export default function (options: WebWorkerOptions): Rule;
+declare const _default: (options: WebWorkerOptions) => Rule;
+export default _default;

package/web-worker/index.js

@@ -7,11 +7,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const posix_1 = require("node:path/posix");
 const parse_name_1 = require("../utility/parse-name");
 const paths_1 = require("../utility/paths");
+const project_1 = require("../utility/project");
 const workspace_1 = require("../utility/workspace");
 function addSnippet(options) {
     return (host, context) => {
@@ -33,18 +33,18 @@ function addSnippet(options) {
         }
         const siblingModulePath = `${options.path}/${siblingModules[0]}`;
         const logMessage = 'console.log(`page got message: ${data}`);';
-        const workerCreationSnippet = core_1.tags.stripIndent `
-      if (typeof Worker !== 'undefined') {
-        // Create a new
-        const worker = new Worker(new URL('./${options.name}.worker', import.meta.url));
-        worker.onmessage = ({ data }) => {
-          ${logMessage}
-        };
-        worker.postMessage('hello');
-      } else {
-        // Web Workers are not supported in this environment.
-        // You should add a fallback so that your program still executes correctly.
-      }
+        const workerCreationSnippet = `
+if (typeof Worker !== 'undefined') {
+  // Create a new
+  const worker = new Worker(new URL('./${options.name}.worker', import.meta.url));
+  worker.onmessage = ({ data }) => {
+    ${logMessage}
+  };
+  worker.postMessage('hello');
+} else {
+  // Web Workers are not supported in this environment.
+  // You should add a fallback so that your program still executes correctly.
+}
     `;
         // Append the worker creation snippet.
         const originalContent = host.readText(siblingModulePath);
@@ -52,59 +52,49 @@ function addSnippet(options) {
         return host;
     };
 }
-function default_1(options) {
-    return async (host) => {
-        const workspace = await (0, workspace_1.getWorkspace)(host);
-        if (!options.project) {
-            throw new schematics_1.SchematicsException('Option "project" is required.');
-        }
-        const project = workspace.projects.get(options.project);
-        if (!project) {
-            throw new schematics_1.SchematicsException(`Invalid project name (${options.project})`);
-        }
-        const projectType = project.extensions['projectType'];
-        if (projectType !== 'application') {
-            throw new schematics_1.SchematicsException(`Web Worker requires a project type of "application".`);
-        }
-        if (options.path === undefined) {
-            options.path = (0, workspace_1.buildDefaultPath)(project);
-        }
-        const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
-        options.name = parsedPath.name;
-        options.path = parsedPath.path;
-        const templateSourceWorkerCode = (0, schematics_1.apply)((0, schematics_1.url)('./files/worker'), [
-            (0, schematics_1.applyTemplates)({ ...options, ...schematics_1.strings }),
-            (0, schematics_1.move)(parsedPath.path),
-        ]);
-        const root = project.root || '';
-        const templateSourceWorkerConfig = (0, schematics_1.apply)((0, schematics_1.url)('./files/worker-tsconfig'), [
-            (0, schematics_1.applyTemplates)({
-                ...options,
-                relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(root),
-            }),
-            (0, schematics_1.move)(root),
-        ]);
-        return (0, schematics_1.chain)([
-            // Add project configuration.
-            (0, workspace_1.updateWorkspace)((workspace) => {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                const project = workspace.projects.get(options.project);
-                const buildTarget = project.targets.get('build');
-                const testTarget = project.targets.get('test');
-                if (!buildTarget) {
-                    throw new Error(`Build target is not defined for this project.`);
-                }
-                const workerConfigPath = (0, core_1.join)((0, core_1.normalize)(root), 'tsconfig.worker.json');
-                (buildTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
-                if (testTarget) {
-                    (testTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
-                }
-            }),
-            // Create the worker in a sibling module.
-            options.snippet ? addSnippet(options) : (0, schematics_1.noop)(),
-            // Add the worker.
-            (0, schematics_1.mergeWith)(templateSourceWorkerCode),
-            (0, schematics_1.mergeWith)(templateSourceWorkerConfig),
-        ]);
-    };
-}
+exports.default = (0, project_1.createProjectSchematic)((options, { project }) => {
+    const projectType = project.extensions['projectType'];
+    if (projectType !== 'application') {
+        throw new schematics_1.SchematicsException(`Web Worker requires a project type of "application".`);
+    }
+    if (options.path === undefined) {
+        options.path = (0, workspace_1.buildDefaultPath)(project);
+    }
+    const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+    const templateSourceWorkerCode = (0, schematics_1.apply)((0, schematics_1.url)('./files/worker'), [
+        (0, schematics_1.applyTemplates)({ ...options, ...schematics_1.strings }),
+        (0, schematics_1.move)(parsedPath.path),
+    ]);
+    const root = project.root || '';
+    const templateSourceWorkerConfig = (0, schematics_1.apply)((0, schematics_1.url)('./files/worker-tsconfig'), [
+        (0, schematics_1.applyTemplates)({
+            ...options,
+            relativePathToWorkspaceRoot: (0, paths_1.relativePathToWorkspaceRoot)(root),
+        }),
+        (0, schematics_1.move)(root),
+    ]);
+    return (0, schematics_1.chain)([
+        // Add project configuration.
+        (0, workspace_1.updateWorkspace)((workspace) => {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const project = workspace.projects.get(options.project);
+            const buildTarget = project.targets.get('build');
+            const testTarget = project.targets.get('test');
+            if (!buildTarget) {
+                throw new Error(`Build target is not defined for this project.`);
+            }
+            const workerConfigPath = (0, posix_1.join)(root, 'tsconfig.worker.json');
+            (buildTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
+            if (testTarget) {
+                (testTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
+            }
+        }),
+        // Create the worker in a sibling module.
+        options.snippet ? addSnippet(options) : (0, schematics_1.noop)(),
+        // Add the worker.
+        (0, schematics_1.mergeWith)(templateSourceWorkerCode),
+        (0, schematics_1.mergeWith)(templateSourceWorkerConfig),
+    ]);
+});

package/workspace/schema.d.ts

@@ -40,7 +40,6 @@ export type Schema = {
  */
 export declare enum PackageManager {
     Bun = "bun",
-    Cnpm = "cnpm",
     Npm = "npm",
     Pnpm = "pnpm",
     Yarn = "yarn"

package/workspace/schema.js

@@ -9,7 +9,6 @@ exports.PackageManager = void 0;
 var PackageManager;
 (function (PackageManager) {
     PackageManager["Bun"] = "bun";
-    PackageManager["Cnpm"] = "cnpm";
     PackageManager["Npm"] = "npm";
     PackageManager["Pnpm"] = "pnpm";
     PackageManager["Yarn"] = "yarn";

package/workspace/schema.json

@@ -40,7 +40,7 @@
     "packageManager": {
       "description": "The package manager to use for installing dependencies.",
       "type": "string",
-      "enum": ["npm", "yarn", "pnpm", "cnpm", "bun"]
+      "enum": ["npm", "yarn", "pnpm", "bun"]
     }
   },
   "required": ["name", "version"]