fix(@schematics/angular): add "type" option in enum schematic

closes: #20667
angular · May 3, 2021 · 1b9577a · 1b9577a
1 parent b2594bc
commit 1b9577a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/...files/__name@dasherize__.enum.ts.template → ...es/__name@dasherize____type__.ts.template b/...files/__name@dasherize__.enum.ts.template → ...es/__name@dasherize____type__.ts.template
diff --git a/packages/schematics/angular/enum/index.ts b/packages/schematics/angular/enum/index.ts
@@ -33,6 +33,8 @@ export default function (options: EnumOptions): Rule {
     options.name = parsedPath.name;
     options.path = parsedPath.path;
 
+    options.type = options.type ? `.${options.type}` : '';
+
     const templateSource = apply(url('./files'), [
       applyTemplates({
         ...strings,

diff --git a/packages/schematics/angular/enum/index_spec.ts b/packages/schematics/angular/enum/index_spec.ts
@@ -48,14 +48,14 @@ describe('Enum Schematic', () => {
       .runSchematicAsync('enum', defaultOptions, appTree)
       .toPromise();
     const files = tree.files;
-    expect(files).toContain('/projects/bar/src/app/foo.enum.ts');
+    expect(files).toContain('/projects/bar/src/app/foo.ts');
   });
 
   it('should create an enumeration', async () => {
     const tree = await schematicRunner
       .runSchematicAsync('enum', defaultOptions, appTree)
       .toPromise();
-    const content = tree.readContent('/projects/bar/src/app/foo.enum.ts');
+    const content = tree.readContent('/projects/bar/src/app/foo.ts');
     expect(content).toMatch('export enum Foo {');
   });
 
@@ -64,6 +64,13 @@ describe('Enum Schematic', () => {
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
     appTree = await schematicRunner.runSchematicAsync('enum', defaultOptions, appTree).toPromise();
-    expect(appTree.files).toContain('/projects/bar/custom/app/foo.enum.ts');
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
+  });
+
+  it('should put type in the file name', async () => {
+    const options = { ...defaultOptions, type: 'enum' };
+
+    const tree = await schematicRunner.runSchematicAsync('enum', options, appTree).toPromise();
+    expect(tree.files).toContain('/projects/bar/src/app/foo.enum.ts');
   });
 });
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
@@ -28,6 +28,10 @@
         "$source": "projectName"
       }
     },
+    "type": {
+      "type": "string",
+      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\"."
+    },
     "lintFix": {
       "type": "boolean",
       "description": "Apply lint fixes after generating the enum.",