@schematics/angular 20.0.1 → 20.1.0-next.0

package/component/index.js

@@ -35,16 +35,7 @@ function default_1(options) {
         if (options.path === undefined) {
             options.path = (0, workspace_1.buildDefaultPath)(project);
         }
-        try {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        }
-        catch {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, {
-                ...options,
-                moduleExt: '-module.ts',
-                routingModuleExt: '-routing-module.ts',
-            });
-        }
+        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
         // Schematic templates require a defined type value
         options.type ??= '';
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);

package/directive/index.js

@@ -35,16 +35,7 @@ function default_1(options) {
         if (options.path === undefined) {
             options.path = (0, workspace_1.buildDefaultPath)(project);
         }
-        try {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        }
-        catch {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, {
-                ...options,
-                moduleExt: '-module.ts',
-                routingModuleExt: '-routing-module.ts',
-            });
-        }
+        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;

package/module/index.js

@@ -99,11 +99,11 @@ function addRouteDeclarationToNgModule(options, routingModulePath) {
     };
 }
 function getRoutingModulePath(host, modulePath) {
-    const routingModulePath = modulePath.endsWith(find_module_1.ROUTING_MODULE_EXT) || modulePath.endsWith('-routing-module.ts')
+    const routingModulePath = modulePath.endsWith(find_module_1.ROUTING_MODULE_EXT_LEGACY) || modulePath.endsWith(find_module_1.ROUTING_MODULE_EXT)
         ? modulePath
         : modulePath
-            .replace(find_module_1.MODULE_EXT, find_module_1.ROUTING_MODULE_EXT)
-            .replace('-module.ts', '-routing-module.ts');
+            .replace(find_module_1.MODULE_EXT_LEGACY, find_module_1.ROUTING_MODULE_EXT_LEGACY)
+            .replace(find_module_1.MODULE_EXT, find_module_1.ROUTING_MODULE_EXT);
     return host.exists(routingModulePath) ? routingModulePath : undefined;
 }
 function buildRoute(options, modulePath) {
@@ -118,16 +118,7 @@ function default_1(options) {
             options.path = await (0, workspace_1.createDefaultPath)(host, options.project);
         }
         if (options.module) {
-            try {
-                options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-            }
-            catch {
-                options.module = (0, find_module_1.findModuleFromOptions)(host, {
-                    ...options,
-                    moduleExt: '-module.ts',
-                    routingModuleExt: '-routing-module.ts',
-                });
-            }
+            options.module = (0, find_module_1.findModuleFromOptions)(host, options);
         }
         let routingModulePath;
         const isLazyLoadedModuleGen = !!(options.route && options.module);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "20.0.1",
+  "version": "20.1.0-next.0",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -22,8 +22,8 @@
   },
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "20.0.1",
-    "@angular-devkit/schematics": "20.0.1",
+    "@angular-devkit/core": "20.1.0-next.0",
+    "@angular-devkit/schematics": "20.1.0-next.0",
     "jsonc-parser": "3.3.1"
   },
   "repository": {

package/pipe/index.js

@@ -18,16 +18,7 @@ const workspace_1 = require("../utility/workspace");
 function default_1(options) {
     return async (host) => {
         options.path ??= await (0, workspace_1.createDefaultPath)(host, options.project);
-        try {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        }
-        catch {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, {
-                ...options,
-                moduleExt: '-module.ts',
-                routingModuleExt: '-routing-module.ts',
-            });
-        }
+        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;

package/utility/find-module.d.ts

@@ -17,8 +17,10 @@ export interface ModuleOptions {
     routingModuleExt?: string;
     standalone?: boolean;
 }
-export declare const MODULE_EXT = ".module.ts";
-export declare const ROUTING_MODULE_EXT = "-routing.module.ts";
+export declare const MODULE_EXT = "-module.ts";
+export declare const ROUTING_MODULE_EXT = "-routing-module.ts";
+export declare const MODULE_EXT_LEGACY = ".module.ts";
+export declare const ROUTING_MODULE_EXT_LEGACY = "-routing.module.ts";
 /**
  * Find the module referred by a set of options passed to the schematics.
  */

package/utility/find-module.js

@@ -7,13 +7,15 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROUTING_MODULE_EXT = exports.MODULE_EXT = void 0;
+exports.ROUTING_MODULE_EXT_LEGACY = exports.MODULE_EXT_LEGACY = exports.ROUTING_MODULE_EXT = exports.MODULE_EXT = void 0;
 exports.findModuleFromOptions = findModuleFromOptions;
 exports.findModule = findModule;
 exports.buildRelativePath = buildRelativePath;
 const core_1 = require("@angular-devkit/core");
-exports.MODULE_EXT = '.module.ts';
-exports.ROUTING_MODULE_EXT = '-routing.module.ts';
+exports.MODULE_EXT = '-module.ts';
+exports.ROUTING_MODULE_EXT = '-routing-module.ts';
+exports.MODULE_EXT_LEGACY = '.module.ts';
+exports.ROUTING_MODULE_EXT_LEGACY = '-routing.module.ts';
 /**
  * Find the module referred by a set of options passed to the schematics.
  */
@@ -21,11 +23,9 @@ function findModuleFromOptions(host, options) {
     if (options.standalone || options.skipImport) {
         return undefined;
     }
-    const moduleExt = options.moduleExt || exports.MODULE_EXT;
-    const routingModuleExt = options.routingModuleExt || exports.ROUTING_MODULE_EXT;
     if (!options.module) {
         const pathToCheck = (options.path || '') + '/' + options.name;
-        return (0, core_1.normalize)(findModule(host, pathToCheck, moduleExt, routingModuleExt));
+        return (0, core_1.normalize)(findModule(host, pathToCheck, options.moduleExt, options.routingModuleExt));
     }
     else {
         const modulePath = (0, core_1.normalize)(`/${options.path}/${options.module}`);
@@ -39,11 +39,18 @@ function findModuleFromOptions(host, options) {
             candidateSet.add(dir);
         }
         const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
+        const candidateFiles = ['', `${moduleBaseName}.ts`];
+        if (options.moduleExt) {
+            candidateFiles.push(`${moduleBaseName}${options.moduleExt}`);
+        }
+        else {
+            candidateFiles.push(`${moduleBaseName}${exports.MODULE_EXT}`, `${moduleBaseName}${exports.MODULE_EXT_LEGACY}`);
+        }
         for (const c of candidatesDirs) {
-            const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map((x) => (0, core_1.join)(c, x));
             for (const sc of candidateFiles) {
-                if (host.exists(sc) && host.readText(sc).includes('@NgModule')) {
-                    return (0, core_1.normalize)(sc);
+                const scPath = (0, core_1.join)(c, sc);
+                if (host.exists(scPath) && host.readText(scPath).includes('@NgModule')) {
+                    return (0, core_1.normalize)(scPath);
                 }
             }
         }
@@ -54,12 +61,16 @@ function findModuleFromOptions(host, options) {
 /**
  * Function to find the "closest" module to a generated file's path.
  */
-function findModule(host, generateDir, moduleExt = exports.MODULE_EXT, routingModuleExt = exports.ROUTING_MODULE_EXT) {
+function findModule(host, generateDir, moduleExt, routingModuleExt) {
     let dir = host.getDir('/' + generateDir);
     let foundRoutingModule = false;
+    const moduleExtensions = moduleExt ? [moduleExt] : [exports.MODULE_EXT, exports.MODULE_EXT_LEGACY];
+    const routingModuleExtensions = routingModuleExt
+        ? [routingModuleExt]
+        : [exports.ROUTING_MODULE_EXT, exports.ROUTING_MODULE_EXT_LEGACY];
     while (dir) {
-        const allMatches = dir.subfiles.filter((p) => p.endsWith(moduleExt));
-        const filteredMatches = allMatches.filter((p) => !p.endsWith(routingModuleExt));
+        const allMatches = dir.subfiles.filter((p) => moduleExtensions.some((m) => p.endsWith(m)));
+        const filteredMatches = allMatches.filter((p) => !routingModuleExtensions.some((m) => p.endsWith(m)));
         foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length;
         if (filteredMatches.length == 1) {
             return (0, core_1.join)(dir.path, filteredMatches[0]);

package/utility/latest-versions.js

@@ -14,9 +14,9 @@ const dependencies = require('./latest-versions/package.json')['dependencies'];
 exports.latestVersions = {
     ...dependencies,
     // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
-    Angular: '^20.0.0',
-    NgPackagr: '^20.0.0',
-    DevkitBuildAngular: '^20.0.1',
-    AngularBuild: '^20.0.1',
-    AngularSSR: '^20.0.1',
+    Angular: '^20.1.0-next.0',
+    NgPackagr: '^20.1.0-next.0',
+    DevkitBuildAngular: '^20.1.0-next.0',
+    AngularBuild: '^20.1.0-next.0',
+    AngularSSR: '^20.1.0-next.0',
 };