bc0f07b fix(@schematics/angular): generate services without a .service extension/type

Author: Angular Builds

library/files/src/__entryFile__.ts.template

@@ -2,6 +2,5 @@
  * Public API Surface of <%= dasherize(name) %>
  */
 
-export * from './lib/<%= dasherize(name) %>.service';
 export * from './lib/<%= dasherize(name) %>';<% if (!standalone) { %>
 export * from './lib/<%= dasherize(name) %>.module';<% } %>

library/index.js

@@ -155,12 +155,6 @@ function default_1(options) {
                 standalone: options.standalone,
                 project: packageName,
             }),
-            (0, schematics_1.schematic)('service', {
-                name: options.name,
-                flat: true,
-                path: sourceDir,
-                project: packageName,
-            }),
             (_tree, context) => {
                 if (!options.skipPackageJson && !options.skipInstall) {
                     context.addTask(new tasks_1.NodePackageInstallTask());

package.json

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

service/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.spec.ts.template

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { <%= classify(name) %><%= classify(type) %> } from './<%= dasherize(name) %><%= type ? '.' + dasherize(type) : '' %>';
+
+describe('<%= classify(name) %><%= classify(type) %>', () => {
+  let service: <%= classify(name) %><%= classify(type) %>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(<%= classify(name) %><%= classify(type) %>);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

service/files/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template renamed to service/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 @Injectable({
   providedIn: 'root'
 })
-export class <%= classify(name) %>Service {
+export class <%= classify(name) %><%= classify(type) %> {
 
   constructor() { }
 }

service/files/__name@dasherize@if-flat__/__name@dasherize__.service.spec.ts.template

@@ -13,6 +13,8 @@ function default_1(options) {
     // This schematic uses an older method to implement the flat option
     const flat = options.flat;
     options.flat = true;
+    // Schematic templates require a defined type value
+    options.type ??= '';
     return (0, generate_from_files_1.generateFromFiles)(options, {
         'if-flat': (s) => (flat ? '' : s),
     });

service/index.js

@@ -28,4 +28,9 @@ export type Schema = {
      * Skip the generation of a unit test file `spec.ts` for the service.
      */
     skipTests?: boolean;
+    /**
+     * Append a custom type to the service's filename. For example, if you set the type to
+     * `service`, the file will be named `my-service.service.ts`.
+     */
+    type?: string;
 };

service/schema.d.ts

@@ -39,6 +39,10 @@
       "type": "boolean",
       "description": "Skip the generation of a unit test file `spec.ts` for the service.",
       "default": false
+    },
+    "type": {
+      "type": "string",
+      "description": "Append a custom type to the service's filename. For example, if you set the type to `service`, the file will be named `my-service.service.ts`."
     }
   },
   "required": ["name", "project"]

service/schema.json

@@ -1 +1 @@
-Mon Mar 17 2025 21:25:26 GMT+0000 (Coordinated Universal Time)
+Tue Mar 18 2025 11:32:47 GMT+0000 (Coordinated Universal Time)

uniqueId

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

utility/generate-from-files.d.ts

@@ -29,6 +29,16 @@ function generateFromFiles(options, extraTemplateValues = {}) {
                 ...options,
                 ...extraTemplateValues,
             }),
+            !options.type
+                ? (0, schematics_1.forEach)(((file) => {
+                    return file.path.includes('..')
+                        ? {
+                            content: file.content,
+                            path: file.path.replace('..', '.'),
+                        }
+                        : file;
+                }))
+                : (0, schematics_1.noop)(),
             (0, schematics_1.move)(parsedPath.path + (options.flat ? '' : '/' + schematics_1.strings.dasherize(options.name))),
         ]);
         return (0, schematics_1.chain)([(0, schematics_1.mergeWith)(templateSource)]);

utility/generate-from-files.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: '^20.0.0-next.0',
     NgPackagr: '^20.0.0-next.0',
-    DevkitBuildAngular: '^20.0.0-next.1+sha-e07491e',
-    AngularBuild: '^20.0.0-next.1+sha-e07491e',
-    AngularSSR: '^20.0.0-next.1+sha-e07491e',
+    DevkitBuildAngular: '^20.0.0-next.1+sha-bc0f07b',
+    AngularBuild: '^20.0.0-next.1+sha-bc0f07b',
+    AngularSSR: '^20.0.0-next.1+sha-bc0f07b',
 };