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

The enum, interceptor, and resolver schematics now more fully
use the `generateFromFiles` helper.  This reduces repeat code within each
schematic. In some cases the schematic has been reduced to a single call
to the helper.

Author: clydin

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

@@ -6,12 +6,10 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { Rule } from '@angular-devkit/schematics';
+import type { Rule } from '@angular-devkit/schematics';
 import { generateFromFiles } from '../utility/generate-from-files';
-import { Schema as EnumOptions } from './schema';
+import type { Schema as EnumOptions } from './schema';
 
 export default function (options: EnumOptions): Rule {
-  options.type = options.type ? `.${options.type}` : '';
-
   return generateFromFiles(options);
 }

packages/schematics/angular/enum/index.ts

@@ -6,25 +6,12 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { Rule } from '@angular-devkit/schematics';
+import type { Rule } from '@angular-devkit/schematics';
 import { generateFromFiles } from '../utility/generate-from-files';
-import { Schema as InterceptorOptions } from './schema';
+import type { Schema as InterceptorOptions } from './schema';
 
 export default function (options: InterceptorOptions): Rule {
-  // This schematic uses an older method to implement the flat option
-  const flat = options.flat;
-  options.flat = true;
-  const extraTemplateValues = {
-    'if-flat': (s: string) => (flat ? '' : s),
-  };
+  const templateFilesDirectory = options.functional ? './functional-files' : './class-files';
 
-  return options.functional
-    ? generateFromFiles(
-        { ...options, templateFilesDirectory: './functional-files' },
-        extraTemplateValues,
-      )
-    : generateFromFiles(
-        { ...options, templateFilesDirectory: './class-files' },
-        extraTemplateValues,
-      );
+  return generateFromFiles({ ...options, templateFilesDirectory });
 }

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

@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { Rule } from '@angular-devkit/schematics';
+import type { Rule } from '@angular-devkit/schematics';
 import { generateFromFiles } from '../utility/generate-from-files';
-import { Schema } from './schema';
+import type { Schema as ResolverOptions } from './schema';
 
-export default function (options: Schema): Rule {
-  return options.functional
-    ? generateFromFiles({ ...options, templateFilesDirectory: './functional-files' })
-    : generateFromFiles({ ...options, templateFilesDirectory: './class-files' });
+export default function (options: ResolverOptions): Rule {
+  const templateFilesDirectory = options.functional ? './functional-files' : './class-files';
+
+  return generateFromFiles({ ...options, templateFilesDirectory });
 }