refactor(Schematics): Use wildcard for feature store imports (#719)

ngrx · Jan 15, 2018 · b597172 · b597172
1 parent 95ff6c8
commit b597172
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/modules/schematics/src/feature/index.ts b/modules/schematics/src/feature/index.ts
@@ -26,6 +26,7 @@ export default function(options: FeatureOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     return chain([
       schematic('action', {
+        flat: options.flat,
         name: options.name,
         path: options.path,
         sourceDir: options.sourceDir,

diff --git a/modules/schematics/src/store/index.spec.ts b/modules/schematics/src/store/index.spec.ts
@@ -73,7 +73,15 @@ describe('Store Schematic', () => {
     const tree = schematicRunner.runSchematic('store', options, appTree);
     const content = getFileContent(tree, '/src/app/app.module.ts');
     expect(content).toMatch(
-      /StoreModule\.forFeature\('foo', reducers, { metaReducers }\)/
+      /StoreModule\.forFeature\('foo', fromFoo\.reducers, { metaReducers: fromFoo.metaReducers }\)/
     );
   });
+
+  it('should use a wildcard for a feature import ', () => {
+    const options = { ...defaultOptions, root: false, module: 'app.module.ts' };
+
+    const tree = schematicRunner.runSchematic('store', options, appTree);
+    const content = getFileContent(tree, '/src/app/app.module.ts');
+    expect(content).toMatch(/import \* as fromFoo from '\.\/reducers';/);
+  });
 });
diff --git a/modules/schematics/src/store/index.ts b/modules/schematics/src/store/index.ts
@@ -66,13 +66,30 @@ function addImportToNgModule(options: ServiceOptions): Rule {
         ? `StoreModule.forRoot(reducers, { metaReducers })`
         : `StoreModule.forFeature('${stringUtils.camelize(
             options.name
-          )}', reducers, { metaReducers })`,
+          )}', from${stringUtils.classify(
+            options.name
+          )}.reducers, { metaReducers: from${stringUtils.classify(
+            options.name
+          )}.metaReducers })`,
       relativePath
     ).shift();
 
     let commonImports = [
       insertImport(source, modulePath, 'StoreModule', '@ngrx/store'),
-      insertImport(source, modulePath, 'reducers, metaReducers', relativePath),
+      options.root
+        ? insertImport(
+            source,
+            modulePath,
+            'reducers, metaReducers',
+            relativePath
+          )
+        : insertImport(
+            source,
+            modulePath,
+            `* as from${stringUtils.classify(options.name)}`,
+            relativePath,
+            true
+          ),
       storeNgModuleImport,
     ];
     let rootImports: (Change | undefined)[] = [];