fix(Schematics): Add handling of flat option to entity blueprint

ngrx · Jan 11, 2018 · fb8d2c6 · fb8d2c6
1 parent d72084f
commit fb8d2c6
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 deletions.
diff --git a/...es/__path__/__name@dasherize__.actions.ts → ...e@if-flat__/__name@dasherize__.actions.ts b/...es/__path__/__name@dasherize__.actions.ts → ...e@if-flat__/__name@dasherize__.actions.ts
diff --git a/...iles/__path__/__name@dasherize__.model.ts → ...ize@if-flat__/__name@dasherize__.model.ts b/...iles/__path__/__name@dasherize__.model.ts → ...ize@if-flat__/__name@dasherize__.model.ts
diff --git a/...es/__path__/__name@dasherize__.reducer.ts → ...e@if-flat__/__name@dasherize__.reducer.ts b/...es/__path__/__name@dasherize__.reducer.ts → ...e@if-flat__/__name@dasherize__.reducer.ts
diff --git a/.../__name@dasherize__.reducer__dot__spec.ts → .../__name@dasherize__.reducer__dot__spec.ts b/.../__name@dasherize__.reducer__dot__spec.ts → .../__name@dasherize__.reducer__dot__spec.ts
diff --git a/modules/schematics/src/entity/index.spec.ts b/modules/schematics/src/entity/index.spec.ts
@@ -31,6 +31,17 @@ describe('Entity Schematic', () => {
     expect(tree.files[2]).toEqual('/src/app/foo.reducer.ts');
   });
 
+  it('should create a folder if flat is false', () => {
+    const tree = schematicRunner.runSchematic('entity', {
+      ...defaultOptions,
+      flat: false,
+    });
+    expect(tree.files.length).toEqual(3);
+    expect(tree.files[0]).toEqual('/src/app/foo/foo.actions.ts');
+    expect(tree.files[1]).toEqual('/src/app/foo/foo.model.ts');
+    expect(tree.files[2]).toEqual('/src/app/foo/foo.reducer.ts');
+  });
+
   it('should create 4 files if spec is true', () => {
     const options = {
       ...defaultOptions,

diff --git a/modules/schematics/src/entity/index.ts b/modules/schematics/src/entity/index.ts
@@ -38,6 +38,7 @@ export default function(options: EntityOptions): Rule {
       options.spec ? noop() : filter(path => !path.endsWith('__spec.ts')),
       template({
         ...stringUtils,
+        'if-flat': (s: string) => (options.flat ? '' : s),
         ...(options as object),
         dot: () => '.',
       }),

diff --git a/modules/schematics/src/entity/schema.d.ts b/modules/schematics/src/entity/schema.d.ts
@@ -9,4 +9,5 @@ export interface Schema {
   spec?: boolean;
   module?: string;
   reducers?: string;
+  flat?: boolean;
 }
diff --git a/modules/schematics/src/entity/schema.json b/modules/schematics/src/entity/schema.json
@@ -32,6 +32,11 @@
       "type": "string",
       "description": "Specifies the declaring module.",
       "aliases": ["m"]
+    },
+    "flat": {
+      "type": "boolean",
+      "default": true,
+      "description": "Flag to indicate if a dir is created."
     }
   },
   "required": [