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

Author: Angular Builds

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

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

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

@@ -36,8 +36,6 @@ function default_1(options) {
             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 ??= '';
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;

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

directive/index.js

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

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

@@ -10,12 +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) {
-    // 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),
-    });
+    return (0, generate_from_files_1.generateFromFiles)(options);
 }

interface/index.js

@@ -1 +1 @@
-Thu Apr 03 2025 08:19:46 GMT+0000 (Coordinated Universal Time)
+Thu Apr 03 2025 10:53:07 GMT+0000 (Coordinated Universal Time)

package.json

@@ -57,10 +57,9 @@ function addDeclarationToNgModule(options) {
         const filePath = `/${options.path}/` +
             (options.flat ? '' : schematics_1.strings.dasherize(options.name) + '/') +
             schematics_1.strings.dasherize(options.name) +
-            (options.type ? '.' : '') +
-            schematics_1.strings.dasherize(options.type);
+            (options.type ? '.' + schematics_1.strings.dasherize(options.type) : '');
         const importPath = (0, find_module_1.buildRelativePath)(modulePath, filePath);
-        const classifiedName = schematics_1.strings.classify(options.name) + schematics_1.strings.classify(options.type);
+        const classifiedName = schematics_1.strings.classify(options.name) + (options.type ? schematics_1.strings.classify(options.type) : '');
         const changes = (0, ast_utils_1.addDeclarationToModule)(source, modulePath, classifiedName, importPath);
         if (options.export) {
             changes.push(...(0, ast_utils_1.addSymbolToNgModuleMetadata)(source, modulePath, 'exports', classifiedName));

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

@@ -17,6 +17,8 @@ function generateFromFiles(options, extraTemplateValues = {}) {
         options.path ??= await (0, workspace_1.createDefaultPath)(host, options.project);
         options.prefix ??= '';
         options.flat ??= true;
+        // Schematic templates require a defined type value
+        options.type ??= '';
         const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;

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

@@ -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-bfdd8d5',
-    AngularBuild: '^20.0.0-next.4+sha-bfdd8d5',
-    AngularSSR: '^20.0.0-next.4+sha-bfdd8d5',
+    DevkitBuildAngular: '^20.0.0-next.4+sha-322f6ec',
+    AngularBuild: '^20.0.0-next.4+sha-322f6ec',
+    AngularSSR: '^20.0.0-next.4+sha-322f6ec',
 };