@schematics/angular 20.0.0-next.4 → 20.0.0-next.6

package/application/files/common-files/tsconfig.app.json.template

@@ -3,13 +3,14 @@
 {
   "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/app",
     "types": []
   },
-  "files": [
-    "src/main.ts"
-  ],
   "include": [
-    "src/**/*.d.ts"
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "src/**/*.spec.ts"
   ]
 }

package/application/files/common-files/tsconfig.spec.json.template

@@ -3,13 +3,13 @@
 {
   "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/spec",
     "types": [
       "jasmine"
     ]
   },
   "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.d.ts"
+    "src/**/*.ts"
   ]
 }

package/application/files/module-files/src/app/{app.module.ts.template → app-module.ts.template}

@@ -1,7 +1,7 @@
 import { NgModule<% if(experimentalZoneless) { %>, provideExperimentalZonelessChangeDetection<% } %> } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 <% if (routing) { %>
-import { AppRoutingModule } from './app-routing.module';<% } %>
+import { AppRoutingModule } from './app-routing-module';<% } %>
 import { App } from './app';
 
 @NgModule({

package/application/files/module-files/src/app/app.ts.template

@@ -9,7 +9,7 @@ import { Component } from '@angular/core';
      %><router-outlet /><%
     } %>
   `,<% } else { %>
-  templateUrl: './app.ng.html',<% } %>
+  templateUrl: './app.html',<% } %>
   standalone: false,<% if(inlineStyle) { %>
   styles: []<% } else { %>
   styleUrl: './app.<%= style %>'<% } %>

package/application/files/module-files/src/main.ts.template

@@ -1,6 +1,6 @@
 <% if(!!viewEncapsulation) { %>import { ViewEncapsulation } from '@angular/core';
 <% }%>import { platformBrowser } from '@angular/platform-browser';
-import { AppModule } from './app/app.module';
+import { AppModule } from './app/app-module';
 
 platformBrowser().bootstrapModule(AppModule, {
   <% if(!experimentalZoneless) { %>ngZoneEventCoalescing: true,<% } %><% if(!!viewEncapsulation) { %>

package/application/files/standalone-files/src/app/app.ts.template

@@ -11,7 +11,7 @@ import { RouterOutlet } from '@angular/router';<% } %>
      %><router-outlet /><%
     } %>
   `,<% } else { %>
-  templateUrl: './app.ng.html',<% } if(inlineStyle) { %>
+  templateUrl: './app.html',<% } if(inlineStyle) { %>
   styles: [],<% } else { %>
   styleUrl: './app.<%= style %>'<% } %>
 })

package/application/index.js

@@ -12,16 +12,33 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("../utility/dependencies");
+const json_file_1 = require("../utility/json-file");
 const latest_versions_1 = require("../utility/latest-versions");
 const paths_1 = require("../utility/paths");
 const workspace_1 = require("../utility/workspace");
 const workspace_models_1 = require("../utility/workspace-models");
 const schema_1 = require("./schema");
+function addTsProjectReference(...paths) {
+    return (host) => {
+        if (!host.exists('tsconfig.json')) {
+            return host;
+        }
+        const newReferences = paths.map((path) => ({ path }));
+        const file = new json_file_1.JSONFile(host, 'tsconfig.json');
+        const jsonPath = ['references'];
+        const value = file.get(jsonPath);
+        file.modify(jsonPath, Array.isArray(value) ? [...value, ...newReferences] : newReferences);
+    };
+}
 function default_1(options) {
     return async (host, context) => {
         const { appDir, appRootSelector, componentOptions, folderName, sourceDir } = await getAppOptions(host, options);
         return (0, schematics_1.chain)([
             addAppToWorkspaceFile(options, appDir, folderName),
+            addTsProjectReference((0, core_1.join)((0, core_1.normalize)(appDir), 'tsconfig.app.json')),
+            options.skipTests
+                ? (0, schematics_1.noop)()
+                : addTsProjectReference((0, core_1.join)((0, core_1.normalize)(appDir), 'tsconfig.spec.json')),
             options.standalone
                 ? (0, schematics_1.noop)()
                 : (0, schematics_1.schematic)('module', {
@@ -63,7 +80,7 @@ function default_1(options) {
                     ? (0, schematics_1.filter)((path) => !path.endsWith('tsconfig.spec.json.template'))
                     : (0, schematics_1.noop)(),
                 componentOptions.inlineTemplate
-                    ? (0, schematics_1.filter)((path) => !path.endsWith('.ng.html.template'))
+                    ? (0, schematics_1.filter)((path) => !path.endsWith('app.html.template'))
                     : (0, schematics_1.noop)(),
                 (0, schematics_1.applyTemplates)({
                     utils: schematics_1.strings,

package/class/index.js

@@ -10,6 +10,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    options.type = options.type ? `.${options.type}` : '';
     return (0, generate_from_files_1.generateFromFiles)(options);
 }

package/component/index.js

@@ -35,7 +35,16 @@ function default_1(options) {
         if (options.path === undefined) {
             options.path = (0, workspace_1.buildDefaultPath)(project);
         }
-        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
+        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',
+            });
+        }
         // Schematic templates require a defined type value
         options.type ??= '';
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);

package/component/schema.d.ts

@@ -51,7 +51,6 @@ export type Schema = {
     name: string;
     /**
      * Generate component template files with an '.ng.html' file extension instead of '.html'.
-     * The '.ng.html' file extension is recommended by the Angular style guide.
      */
     ngHtml?: boolean;
     /**

package/component/schema.json

@@ -137,8 +137,8 @@
     },
     "ngHtml": {
       "type": "boolean",
-      "default": true,
-      "description": "Generate component template files with an '.ng.html' file extension instead of '.html'. The '.ng.html' file extension is recommended by the Angular style guide."
+      "default": false,
+      "description": "Generate component template files with an '.ng.html' file extension instead of '.html'."
     }
   },
   "required": ["name", "project"]

package/directive/index.js

@@ -35,9 +35,16 @@ function default_1(options) {
         if (options.path === undefined) {
             options.path = (0, workspace_1.buildDefaultPath)(project);
         }
-        options.module = (0, find_module_1.findModuleFromOptions)(host, options);
-        // Schematic templates require a defined type value
-        options.type ??= '';
+        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',
+            });
+        }
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;

package/enum/index.d.ts

@@ -5,6 +5,6 @@
  * 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 } from '@angular-devkit/schematics';
-import { Schema as EnumOptions } from './schema';
+import type { Rule } from '@angular-devkit/schematics';
+import type { Schema as EnumOptions } from './schema';
 export default function (options: EnumOptions): Rule;

package/enum/index.js

@@ -10,6 +10,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    options.type = options.type ? `.${options.type}` : '';
     return (0, generate_from_files_1.generateFromFiles)(options);
 }

package/guard/implements-files/{__name@dasherize__.guard.spec.ts.template → __name@dasherize____typeSeparator__guard.spec.ts.template}

@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
-import { <%= classify(name) %>Guard } from './<%= dasherize(name) %>.guard';
+import { <%= classify(name) %>Guard } from './<%= dasherize(name) %><%= typeSeparator %>guard';
 
 describe('<%= classify(name) %>Guard', () => {
   let guard: <%= classify(name) %>Guard;

package/guard/schema.d.ts

@@ -40,6 +40,11 @@ export type Schema = {
      * Skip the generation of a unit test file `spec.ts` for the new guard.
      */
     skipTests?: boolean;
+    /**
+     * The separator character to use before the type within the generated file's name. For
+     * example, if you set the option to `.`, the file will be named `example.guard.ts`.
+     */
+    typeSeparator?: TypeSeparator;
 };
 export declare enum Implement {
     CanActivate = "CanActivate",
@@ -47,3 +52,11 @@ export declare enum Implement {
     CanDeactivate = "CanDeactivate",
     CanMatch = "CanMatch"
 }
+/**
+ * The separator character to use before the type within the generated file's name. For
+ * example, if you set the option to `.`, the file will be named `example.guard.ts`.
+ */
+export declare enum TypeSeparator {
+    Empty = "-",
+    TypeSeparator = "."
+}

package/guard/schema.js

@@ -2,7 +2,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Implement = void 0;
+exports.TypeSeparator = exports.Implement = void 0;
 var Implement;
 (function (Implement) {
     Implement["CanActivate"] = "CanActivate";
@@ -10,3 +10,12 @@ var Implement;
     Implement["CanDeactivate"] = "CanDeactivate";
     Implement["CanMatch"] = "CanMatch";
 })(Implement || (exports.Implement = Implement = {}));
+/**
+ * The separator character to use before the type within the generated file's name. For
+ * example, if you set the option to `.`, the file will be named `example.guard.ts`.
+ */
+var TypeSeparator;
+(function (TypeSeparator) {
+    TypeSeparator["Empty"] = "-";
+    TypeSeparator["TypeSeparator"] = ".";
+})(TypeSeparator || (exports.TypeSeparator = TypeSeparator = {}));

package/guard/schema.json

@@ -58,6 +58,12 @@
       },
       "default": ["CanActivate"],
       "x-prompt": "Which type of guard would you like to create?"
+    },
+    "typeSeparator": {
+      "type": "string",
+      "default": "-",
+      "enum": ["-", "."],
+      "description": "The separator character to use before the type within the generated file's name. For example, if you set the option to `.`, the file will be named `example.guard.ts`."
     }
   },
   "required": ["name", "project"]

package/guard/type-files/{__name@dasherize__.guard.spec.ts.template → __name@dasherize____typeSeparator__guard.spec.ts.template}

@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import { <%= guardType %> } from '@angular/router';
 
-import { <%= camelize(name) %>Guard } from './<%= dasherize(name) %>.guard';
+import { <%= camelize(name) %>Guard } from './<%= dasherize(name) %><%= typeSeparator %>guard';
 
 describe('<%= camelize(name) %>Guard', () => {
   const executeGuard: <%= guardType %><% if (guardType === 'CanDeactivateFn') { %><unknown><% } %> = (...guardParameters) => 

package/interceptor/class-files/{__name@dasherize@if-flat__/__name@dasherize__.interceptor.spec.ts.template → __name@dasherize____typeSeparator__interceptor.spec.ts.template}

@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
-import { <%= classify(name) %>Interceptor } from './<%= dasherize(name) %>.interceptor';
+import { <%= classify(name) %>Interceptor } from './<%= dasherize(name) %><%= typeSeparator %>interceptor';
 
 describe('<%= classify(name) %>Interceptor', () => {
   beforeEach(() => TestBed.configureTestingModule({

package/interceptor/functional-files/{__name@dasherize@if-flat__/__name@dasherize__.interceptor.spec.ts.template → __name@dasherize____typeSeparator__interceptor.spec.ts.template}

@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import { HttpInterceptorFn } from '@angular/common/http';
 
-import { <%= camelize(name) %>Interceptor } from './<%= dasherize(name) %>.interceptor';
+import { <%= camelize(name) %>Interceptor } from './<%= dasherize(name) %><%= typeSeparator %>interceptor';
 
 describe('<%= camelize(name) %>Interceptor', () => {
   const interceptor: HttpInterceptorFn = (req, next) => 

package/interceptor/index.d.ts

@@ -5,6 +5,6 @@
  * 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 } from '@angular-devkit/schematics';
-import { Schema as InterceptorOptions } from './schema';
+import type { Rule } from '@angular-devkit/schematics';
+import type { Schema as InterceptorOptions } from './schema';
 export default function (options: InterceptorOptions): Rule;

package/interceptor/index.js

@@ -10,13 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    // This schematic uses an older method to implement the flat option
-    const flat = options.flat;
-    options.flat = true;
-    const extraTemplateValues = {
-        'if-flat': (s) => (flat ? '' : s),
-    };
-    return options.functional
-        ? (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './functional-files' }, extraTemplateValues)
-        : (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './class-files' }, extraTemplateValues);
+    const templateFilesDirectory = options.functional ? './functional-files' : './class-files';
+    return (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory });
 }

package/interceptor/schema.d.ts

@@ -35,4 +35,17 @@ export type Schema = {
      * Skip the generation of a unit test file `spec.ts` for the new interceptor.
      */
     skipTests?: boolean;
+    /**
+     * The separator character to use before the type within the generated file's name. For
+     * example, if you set the option to `.`, the file will be named `example.interceptor.ts`.
+     */
+    typeSeparator?: TypeSeparator;
 };
+/**
+ * The separator character to use before the type within the generated file's name. For
+ * example, if you set the option to `.`, the file will be named `example.interceptor.ts`.
+ */
+export declare enum TypeSeparator {
+    Empty = "-",
+    TypeSeparator = "."
+}

package/interceptor/schema.js

@@ -2,3 +2,13 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeSeparator = void 0;
+/**
+ * The separator character to use before the type within the generated file's name. For
+ * example, if you set the option to `.`, the file will be named `example.interceptor.ts`.
+ */
+var TypeSeparator;
+(function (TypeSeparator) {
+    TypeSeparator["Empty"] = "-";
+    TypeSeparator["TypeSeparator"] = ".";
+})(TypeSeparator || (exports.TypeSeparator = TypeSeparator = {}));

package/interceptor/schema.json

@@ -45,6 +45,12 @@
       "type": "boolean",
       "description": "Creates the interceptor as a function `HttpInterceptorFn` instead of a class. Functional interceptors can be simpler for basic scenarios.",
       "default": true
+    },
+    "typeSeparator": {
+      "type": "string",
+      "default": "-",
+      "enum": ["-", "."],
+      "description": "The separator character to use before the type within the generated file's name. For example, if you set the option to `.`, the file will be named `example.interceptor.ts`."
     }
   },
   "required": ["name", "project"]

package/interface/index.js

@@ -10,6 +10,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const generate_from_files_1 = require("../utility/generate-from-files");
 function default_1(options) {
-    options.type = options.type ? `.${options.type}` : '';
     return (0, generate_from_files_1.generateFromFiles)(options);
 }

package/library/files/src/__entryFile__.ts.template

@@ -3,4 +3,4 @@
  */
 
 export * from './lib/<%= dasherize(name) %>';<% if (!standalone) { %>
-export * from './lib/<%= dasherize(name) %>.module';<% } %>
+export * from './lib/<%= dasherize(name) %>-module';<% } %>

package/library/index.js

@@ -72,9 +72,6 @@ function addLibToWorkspaceFile(options, projectRoot, projectName) {
                 build: {
                     builder: workspace_models_1.Builders.BuildNgPackagr,
                     defaultConfiguration: 'production',
-                    options: {
-                        project: `${projectRoot}/ng-package.json`,
-                    },
                     configurations: {
                         production: {
                             tsConfig: `${projectRoot}/tsconfig.lib.prod.json`,
@@ -154,6 +151,10 @@ function default_1(options) {
                 export: true,
                 standalone: options.standalone,
                 project: packageName,
+                // Explicitly set an empty `type` since it doesn't necessarily make sense in a library.
+                // This also ensures that the generated files are valid even if the `component` schematic
+                // inherits its `type` from the workspace.
+                type: '',
             }),
             (_tree, context) => {
                 if (!options.skipPackageJson && !options.skipInstall) {

package/migrations/migration-collection.json

@@ -15,6 +15,11 @@
       "factory": "./update-module-resolution/migration",
       "description": "Update 'moduleResolution' to 'bundler' in TypeScript configurations. You can read more about this, here: https://www.typescriptlang.org/tsconfig/#moduleResolution"
     },
+    "previous-style-guide": {
+      "version": "20.0.0",
+      "factory": "./previous-style-guide/migration",
+      "description": "Update workspace generation defaults to maintain previous style guide behavior."
+    },
     "use-application-builder": {
       "version": "20.0.0",
       "factory": "./use-application-builder/migration",

package/migrations/previous-style-guide/migration.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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 type { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/migrations/previous-style-guide/migration.js

@@ -0,0 +1,42 @@
+"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.default = default_1;
+const workspace_1 = require("../../utility/workspace");
+const TYPE_SCHEMATICS = ['component', 'directive', 'service'];
+const SEPARATOR_SCHEMATICS = ['guard', 'interceptor', 'module', 'pipe', 'resolver'];
+function default_1() {
+    return (0, workspace_1.updateWorkspace)((workspace) => {
+        let schematicsDefaults = workspace.extensions['schematics'];
+        // Ensure "schematics" field is an object
+        if (!schematicsDefaults ||
+            typeof schematicsDefaults !== 'object' ||
+            Array.isArray(schematicsDefaults)) {
+            schematicsDefaults = workspace.extensions['schematics'] = {};
+        }
+        // Add "type" value for each schematic to continue generating a type suffix.
+        // New default is an empty type value.
+        for (const schematicName of TYPE_SCHEMATICS) {
+            const schematic = (schematicsDefaults[`@schematics/angular:${schematicName}`] ??= {});
+            if (typeof schematic === 'object' && !Array.isArray(schematic) && !('type' in schematic)) {
+                schematic['type'] = schematicName;
+            }
+        }
+        // Add "typeSeparator" value for each schematic to continue generating "." before type.
+        // New default is an "-" type value.
+        for (const schematicName of SEPARATOR_SCHEMATICS) {
+            const schematic = (schematicsDefaults[`@schematics/angular:${schematicName}`] ??= {});
+            if (typeof schematic === 'object' &&
+                !Array.isArray(schematic) &&
+                !('typeSeparator' in schematic)) {
+                schematic['typeSeparator'] = '.';
+            }
+        }
+    });
+}

package/migrations/use-application-builder/migration.js

@@ -150,6 +150,7 @@ function updateProjects(tree, context) {
                 case workspace_models_1.Builders.Application:
                 case workspace_models_1.Builders.DevServer:
                 case workspace_models_1.Builders.ExtractI18n:
+                case workspace_models_1.Builders.Karma:
                 case workspace_models_1.Builders.NgPackagr:
                     // Ignore application, dev server, and i18n extraction for devkit usage check.
                     // Both will be replaced if no other usage is found.
@@ -173,6 +174,13 @@ function updateProjects(tree, context) {
                     case workspace_models_1.Builders.ExtractI18n:
                         target.builder = '@angular/build:extract-i18n';
                         break;
+                    case workspace_models_1.Builders.Karma:
+                        target.builder = '@angular/build:karma';
+                        // Remove "builderMode" option since the builder will always use "application"
+                        for (const [, karmaOptions] of (0, workspace_1.allTargetOptions)(target)) {
+                            delete karmaOptions['builderMode'];
+                        }
+                        break;
                     case workspace_models_1.Builders.NgPackagr:
                         target.builder = '@angular/build:ng-packagr';
                         break;

package/module/files/__name@dasherize@if-flat__/{__name@dasherize__.module.ts.template → __name@dasherize____typeSeparator__module.ts.template}

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';<% if (commonModule) { %>
 import { CommonModule } from '@angular/common';<% } %><% if (lazyRouteWithoutRouteModule) { %>
 import { Routes, RouterModule } from '@angular/router';<% } %>
 <% if ((!lazyRoute && routing) || lazyRouteWithRouteModule) { %>
-import { <%= classify(name) %>RoutingModule } from './<%= dasherize(name) %>-routing.module';<% } %>
+import { <%= classify(name) %>RoutingModule } from './<%= dasherize(name) %>-routing<%= typeSeparator %>module';<% } %>
 <% if (lazyRouteWithoutRouteModule) { %>
 const routes: Routes = [
   { path: '', component: <%= classify(name) %> }

package/module/index.js

@@ -52,7 +52,7 @@ const validation_1 = require("../utility/validation");
 const workspace_1 = require("../utility/workspace");
 const schema_1 = require("./schema");
 function buildRelativeModulePath(options, modulePath) {
-    const importModulePath = (0, posix_1.join)(options.path ?? '', options.flat ? '' : schematics_1.strings.dasherize(options.name), schematics_1.strings.dasherize(options.name) + '.module');
+    const importModulePath = (0, posix_1.join)(options.path ?? '', options.flat ? '' : schematics_1.strings.dasherize(options.name), schematics_1.strings.dasherize(options.name) + options.typeSeparator + 'module');
     return (0, find_module_1.buildRelativePath)(modulePath, importModulePath);
 }
 function addImportToNgModule(options) {
@@ -99,9 +99,11 @@ function addRouteDeclarationToNgModule(options, routingModulePath) {
     };
 }
 function getRoutingModulePath(host, modulePath) {
-    const routingModulePath = modulePath.endsWith(find_module_1.ROUTING_MODULE_EXT)
+    const routingModulePath = modulePath.endsWith(find_module_1.ROUTING_MODULE_EXT) || modulePath.endsWith('-routing-module.ts')
         ? modulePath
-        : modulePath.replace(find_module_1.MODULE_EXT, find_module_1.ROUTING_MODULE_EXT);
+        : modulePath
+            .replace(find_module_1.MODULE_EXT, find_module_1.ROUTING_MODULE_EXT)
+            .replace('-module.ts', '-routing-module.ts');
     return host.exists(routingModulePath) ? routingModulePath : undefined;
 }
 function buildRoute(options, modulePath) {
@@ -116,7 +118,16 @@ function default_1(options) {
             options.path = await (0, workspace_1.createDefaultPath)(host, options.project);
         }
         if (options.module) {
-            options.module = (0, find_module_1.findModuleFromOptions)(host, options);
+            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',
+                });
+            }
         }
         let routingModulePath;
         const isLazyLoadedModuleGen = !!(options.route && options.module);
@@ -131,7 +142,7 @@ function default_1(options) {
         const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
             options.routing || (isLazyLoadedModuleGen && routingModulePath)
                 ? (0, schematics_1.noop)()
-                : (0, schematics_1.filter)((path) => !path.endsWith('-routing.module.ts.template')),
+                : (0, schematics_1.filter)((path) => !path.includes('-routing')),
             (0, schematics_1.applyTemplates)({
                 ...schematics_1.strings,
                 'if-flat': (s) => (options.flat ? '' : s),
@@ -143,7 +154,7 @@ function default_1(options) {
             (0, schematics_1.move)(parsedPath.path),
         ]);
         const moduleDasherized = schematics_1.strings.dasherize(options.name);
-        const modulePath = `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}.module.ts`;
+        const modulePath = `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}${options.typeSeparator}module.ts`;
         const componentOptions = {
             module: modulePath,
             flat: options.flat,

package/module/schema.d.ts

@@ -40,6 +40,11 @@ export type Schema = {
      * The scope for the new routing module.
      */
     routingScope?: RoutingScope;
+    /**
+     * The separator character to use before the type within the generated file's name. For
+     * example, if you set the option to `.`, the file will be named `example.module.ts`.
+     */
+    typeSeparator?: TypeSeparator;
 };
 /**
  * The scope for the new routing module.
@@ -48,3 +53,11 @@ export declare enum RoutingScope {
     Child = "Child",
     Root = "Root"
 }
+/**
+ * The separator character to use before the type within the generated file's name. For
+ * example, if you set the option to `.`, the file will be named `example.module.ts`.
+ */
+export declare enum TypeSeparator {
+    Empty = "-",
+    TypeSeparator = "."
+}

package/module/schema.js

@@ -2,7 +2,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RoutingScope = void 0;
+exports.TypeSeparator = exports.RoutingScope = void 0;
 /**
  * The scope for the new routing module.
  */
@@ -11,3 +11,12 @@ var RoutingScope;
     RoutingScope["Child"] = "Child";
     RoutingScope["Root"] = "Root";
 })(RoutingScope || (exports.RoutingScope = RoutingScope = {}));
+/**
+ * The separator character to use before the type within the generated file's name. For
+ * example, if you set the option to `.`, the file will be named `example.module.ts`.
+ */
+var TypeSeparator;
+(function (TypeSeparator) {
+    TypeSeparator["Empty"] = "-";
+    TypeSeparator["TypeSeparator"] = ".";
+})(TypeSeparator || (exports.TypeSeparator = TypeSeparator = {}));