df85980 refactor(@schematics/angular): use generateFromFiles helper in even more cases

Author: Angular Builds

enum/files/__name@dasherize____type__.ts.template renamed to enum/files/__name@dasherize__.__type__.ts.template

@@ -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;

enum/index.d.ts

@@ -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);
 }

enum/index.js

@@ -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;

interceptor/class-files/__name@dasherize@if-flat__/__name@dasherize__.interceptor.spec.ts.template renamed to interceptor/class-files/__name@dasherize__.interceptor.spec.ts.template

@@ -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 });
 }

interceptor/class-files/__name@dasherize@if-flat__/__name@dasherize__.interceptor.ts.template renamed to interceptor/class-files/__name@dasherize__.interceptor.ts.template

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "20.0.0-next.4+sha-c8c46ab",
+  "version": "20.0.0-next.4+sha-df85980",
   "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#c8c46ab",
-    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c8c46ab",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#df85980",
+    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#df85980",
     "jsonc-parser": "3.3.1"
   },
   "repository": {

interceptor/functional-files/__name@dasherize@if-flat__/__name@dasherize__.interceptor.spec.ts.template renamed to interceptor/functional-files/__name@dasherize__.interceptor.spec.ts.template

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

interceptor/functional-files/__name@dasherize@if-flat__/__name@dasherize__.interceptor.ts.template renamed to interceptor/functional-files/__name@dasherize__.interceptor.ts.template

@@ -10,7 +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) {
-    return options.functional
-        ? (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './functional-files' })
-        : (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory: './class-files' });
+    const templateFilesDirectory = options.functional ? './functional-files' : './class-files';
+    return (0, generate_from_files_1.generateFromFiles)({ ...options, templateFilesDirectory });
 }

interceptor/index.d.ts

@@ -1 +1 @@
-Mon Apr 07 2025 10:02:00 GMT+0000 (Coordinated Universal Time)
+Mon Apr 07 2025 11:26:40 GMT+0000 (Coordinated Universal Time)

interceptor/index.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.4+sha-c8c46ab',
-    AngularBuild: '^20.0.0-next.4+sha-c8c46ab',
-    AngularSSR: '^20.0.0-next.4+sha-c8c46ab',
+    DevkitBuildAngular: '^20.0.0-next.4+sha-df85980',
+    AngularBuild: '^20.0.0-next.4+sha-df85980',
+    AngularSSR: '^20.0.0-next.4+sha-df85980',
 };