From 1de653bb23729b4d43212bfa7efd64f4d913df23 Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Thu, 5 Jun 2025 14:13:54 +0000
Subject: [PATCH] fix(@schematics/angular): correctly detect modules using new
 file extension format

Previously, some internal methods failed to locate modules when using the `-module.ts` filename pattern instead of the legacy `.module.ts`. This update ensures proper detection with the new format.
---
 .../schematics/angular/component/index.ts     | 11 +----
 .../schematics/angular/directive/index.ts     | 10 +----
 packages/schematics/angular/module/index.ts   | 18 +++-----
 packages/schematics/angular/pipe/index.ts     | 11 +----
 .../schematics/angular/utility/find-module.ts | 43 ++++++++++++-------
 .../angular/utility/find-module_spec.ts       |  9 ++++
 6 files changed, 46 insertions(+), 56 deletions(-)

diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index acbb82fadca6..359aa28fa94e 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -53,16 +53,7 @@ export default function (options: ComponentOptions): Rule {
       options.path = buildDefaultPath(project);
     }
 
-    try {
-      options.module = findModuleFromOptions(host, options);
-    } catch {
-      options.module = findModuleFromOptions(host, {
-        ...options,
-        moduleExt: '-module.ts',
-        routingModuleExt: '-routing-module.ts',
-      });
-    }
-
+    options.module = findModuleFromOptions(host, options);
     // Schematic templates require a defined type value
     options.type ??= '';
 
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index e05c64ca9e5b..77d68d2e3073 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -38,15 +38,7 @@ export default function (options: DirectiveOptions): Rule {
       options.path = buildDefaultPath(project);
     }
 
-    try {
-      options.module = findModuleFromOptions(host, options);
-    } catch {
-      options.module = findModuleFromOptions(host, {
-        ...options,
-        moduleExt: '-module.ts',
-        routingModuleExt: '-routing-module.ts',
-      });
-    }
+    options.module = findModuleFromOptions(host, options);
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index f7657783d866..1a6065fedf95 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -27,7 +27,9 @@ import { addImportToModule, addRouteDeclarationToModule } from '../utility/ast-u
 import { InsertChange } from '../utility/change';
 import {
   MODULE_EXT,
+  MODULE_EXT_LEGACY,
   ROUTING_MODULE_EXT,
+  ROUTING_MODULE_EXT_LEGACY,
   buildRelativePath,
   findModuleFromOptions,
 } from '../utility/find-module';
@@ -114,11 +116,11 @@ function addRouteDeclarationToNgModule(
 
 function getRoutingModulePath(host: Tree, modulePath: string): string | undefined {
   const routingModulePath =
-    modulePath.endsWith(ROUTING_MODULE_EXT) || modulePath.endsWith('-routing-module.ts')
+    modulePath.endsWith(ROUTING_MODULE_EXT_LEGACY) || modulePath.endsWith(ROUTING_MODULE_EXT)
       ? modulePath
       : modulePath
-          .replace(MODULE_EXT, ROUTING_MODULE_EXT)
-          .replace('-module.ts', '-routing-module.ts');
+          .replace(MODULE_EXT_LEGACY, ROUTING_MODULE_EXT_LEGACY)
+          .replace(MODULE_EXT, ROUTING_MODULE_EXT);
 
   return host.exists(routingModulePath) ? routingModulePath : undefined;
 }
@@ -138,15 +140,7 @@ export default function (options: ModuleOptions): Rule {
     }
 
     if (options.module) {
-      try {
-        options.module = findModuleFromOptions(host, options);
-      } catch {
-        options.module = findModuleFromOptions(host, {
-          ...options,
-          moduleExt: '-module.ts',
-          routingModuleExt: '-routing-module.ts',
-        });
-      }
+      options.module = findModuleFromOptions(host, options);
     }
 
     let routingModulePath;
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 150b0bc20c57..e266839cbcc2 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -18,16 +18,7 @@ import { Schema as PipeOptions } from './schema';
 export default function (options: PipeOptions): Rule {
   return async (host: Tree) => {
     options.path ??= await createDefaultPath(host, options.project);
-    try {
-      options.module = findModuleFromOptions(host, options);
-    } catch {
-      options.module = findModuleFromOptions(host, {
-        ...options,
-        moduleExt: '-module.ts',
-        routingModuleExt: '-routing-module.ts',
-      });
-    }
-
+    options.module = findModuleFromOptions(host, options);
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index 69e10dc1368e..c98b52a0cbe2 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -20,8 +20,10 @@ export interface ModuleOptions {
   standalone?: boolean;
 }
 
-export const MODULE_EXT = '.module.ts';
-export const ROUTING_MODULE_EXT = '-routing.module.ts';
+export const MODULE_EXT = '-module.ts';
+export const ROUTING_MODULE_EXT = '-routing-module.ts';
+export const MODULE_EXT_LEGACY = '.module.ts';
+export const ROUTING_MODULE_EXT_LEGACY = '-routing.module.ts';
 
 /**
  * Find the module referred by a set of options passed to the schematics.
@@ -31,13 +33,10 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
     return undefined;
   }
 
-  const moduleExt = options.moduleExt || MODULE_EXT;
-  const routingModuleExt = options.routingModuleExt || ROUTING_MODULE_EXT;
-
   if (!options.module) {
     const pathToCheck = (options.path || '') + '/' + options.name;
 
-    return normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
+    return normalize(findModule(host, pathToCheck, options.moduleExt, options.routingModuleExt));
   } else {
     const modulePath = normalize(`/${options.path}/${options.module}`);
     const componentPath = normalize(`/${options.path}/${options.name}`);
@@ -53,14 +52,21 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
     }
 
     const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
-    for (const c of candidatesDirs) {
-      const candidateFiles = ['', `${moduleBaseName}.ts`, `${moduleBaseName}${moduleExt}`].map(
-        (x) => join(c, x),
+    const candidateFiles: string[] = ['', `${moduleBaseName}.ts`];
+    if (options.moduleExt) {
+      candidateFiles.push(`${moduleBaseName}${options.moduleExt}`);
+    } else {
+      candidateFiles.push(
+        `${moduleBaseName}${MODULE_EXT}`,
+        `${moduleBaseName}${MODULE_EXT_LEGACY}`,
       );
+    }
 
+    for (const c of candidatesDirs) {
       for (const sc of candidateFiles) {
-        if (host.exists(sc) && host.readText(sc).includes('@NgModule')) {
-          return normalize(sc);
+        const scPath = join(c, sc);
+        if (host.exists(scPath) && host.readText(scPath).includes('@NgModule')) {
+          return normalize(scPath);
         }
       }
     }
@@ -78,15 +84,22 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
 export function findModule(
   host: Tree,
   generateDir: string,
-  moduleExt = MODULE_EXT,
-  routingModuleExt = ROUTING_MODULE_EXT,
+  moduleExt?: string,
+  routingModuleExt?: string,
 ): Path {
   let dir: DirEntry | null = host.getDir('/' + generateDir);
   let foundRoutingModule = false;
 
+  const moduleExtensions: string[] = moduleExt ? [moduleExt] : [MODULE_EXT, MODULE_EXT_LEGACY];
+  const routingModuleExtensions: string[] = routingModuleExt
+    ? [routingModuleExt]
+    : [ROUTING_MODULE_EXT, 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;
 
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index 9680f15949c8..0db295ae384f 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -143,6 +143,15 @@ describe('find-module', () => {
       expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts');
     });
 
+    it('should find a module in a sub dir when using the `-module` suffix', () => {
+      tree.create('/projects/my-proj/src/admin/foo-module.ts', '@NgModule');
+      options.name = 'other/test';
+      options.module = 'admin/foo';
+      options.path = '/projects/my-proj/src';
+      const modPath = findModuleFromOptions(tree, options) as string;
+      expect(modPath).toEqual('/projects/my-proj/src/admin/foo-module.ts');
+    });
+
     it('should find a module in a sub dir (2)', () => {
       tree.create('/projects/my-proj/src/admin/foo.module.ts', '@NgModule');
       options.name = 'admin/hello';