fix(generators): Inconsistent named feature arrays. (#69)

Author: m-abs

src/directive/_index_files/index.ts

@@ -1,3 +1,9 @@
 import { <%= utils.classify(name) %>Directive } from './<%= name %>.directive';
 
-export const <%= utils.sanitize(name).toUpperCase() %>_DIRECTIVES = [<%= utils.classify(name) %>Directive];
+<% if (feature) { %>
+  export const <%= utils.sanitize(feature).toUpperCase() %>_DIRECTIVES = [
+<% } else { %>
+export const DIRECTIVES = [
+<% } %>
+    <%= utils.classify(name) %>Directive
+];

src/directive/index_spec.ts

@@ -36,9 +36,11 @@ describe('directive schematic', () => {
       name: 'foo',
       platforms: 'nativescript,web'
     }, tree);
-    const options: GenerateOptions = { ...defaultOptions };
+    let options: GenerateOptions = { ...defaultOptions };
+
+    // Directives without the feature option are added to the ui-feature
     tree = schematicRunner.runSchematic('directive', options, tree);
-    const files = tree.files;
+    let files = tree.files;
     // console.log(files.slice(91,files.length));
 
     // component
@@ -52,9 +54,32 @@ describe('directive schematic', () => {
 
     let modulePath = '/libs/features/ui/ui.module.ts';
     let moduleContent = getFileContent(tree, modulePath);
+
     // console.log(modulePath + ':');
     // console.log(moduleContent);
     expect(moduleContent.indexOf(`...UI_DIRECTIVES`)).toBeGreaterThanOrEqual(0);
+
+    // Directives added to the foo-feature
+    options = { ...defaultOptions, feature: 'foo' };
+    tree = schematicRunner.runSchematic('directive', options, tree);
+    files = tree.files;
+    // console.log(files.slice(91,files.length));
+
+    // component
+    expect(files.indexOf('/libs/features/foo/directives/active-link.directive.ts')).toBeGreaterThanOrEqual(0);
+
+    // file content
+    content = getFileContent(tree, '/libs/features/foo/directives/active-link.directive.ts');
+    // console.log(content);
+    expect(content.indexOf(`@Directive({`)).toBeGreaterThanOrEqual(0);
+    expect(content.indexOf(`selector: '[active-link]'`)).toBeGreaterThanOrEqual(0);
+
+    modulePath = '/libs/features/foo/foo.module.ts';
+    moduleContent = getFileContent(tree, modulePath);
+
+    // console.log(modulePath + ':');
+    // console.log(moduleContent);
+    expect(moduleContent.indexOf(`...FOO_DIRECTIVES`)).toBeGreaterThanOrEqual(0);
   });
 
   it('should create directive for specified projects only', () => {
@@ -72,7 +97,7 @@ describe('directive schematic', () => {
       projects: 'nativescript-viewer,web-viewer,ionic-viewer',
       onlyProject: true
     }, tree);
-    const options: GenerateOptions = { 
+    const options: GenerateOptions = {
       name: 'active-link',
       feature: 'foo',
       projects: 'nativescript-viewer,web-viewer,ionic-viewer'
@@ -111,4 +136,4 @@ describe('directive schematic', () => {
     // console.log(barrelIndex);
     expect(index.indexOf(`ActiveLinkDirective`)).toBeGreaterThanOrEqual(0);
   });
-}); 
+});

src/pipe/_index_files/index.ts

@@ -1,3 +1,11 @@
 import { <%= utils.classify(name) %>Pipe } from './<%= name %>.pipe';
 
-export const <%= utils.sanitize(name).toUpperCase() %>_PIPES = [<%= utils.classify(name) %>Pipe];
+<% if (feature) { %>
+export const <%= utils.sanitize(feature).toUpperCase() %>_PIPES = [
+<% } else { %>
+export const PIPES = [
+<% } %>
+   <%= utils.classify(name) %>Pipe
+];
+
+export * from  './<%= name %>.pipe';

src/pipe/index_spec.ts

@@ -50,7 +50,7 @@ describe("pipe schematic", () => {
     );
     let options: GenerateOptions = { ...defaultOptions };
     tree = schematicRunner.runSchematic("pipe", options, tree);
-    const files = tree.files;
+    let files = tree.files;
     // console.log(files.slice(91,files.length));
 
     // component
@@ -66,6 +66,39 @@ describe("pipe schematic", () => {
     // console.log(content);
     expect(content.indexOf(`@Pipe({`)).toBeGreaterThanOrEqual(0);
     expect(content.indexOf(`name: 'truncate'`)).toBeGreaterThanOrEqual(0);
+
+    let modulePath = '/libs/features/ui/ui.module.ts';
+    let moduleContent = getFileContent(tree, modulePath);
+
+    // console.log(modulePath + ':');
+    // console.log(moduleContent);
+    expect(moduleContent.indexOf(`...PIPES`)).toBeGreaterThanOrEqual(0);
+
+    options = { ...defaultOptions, feature: 'foo' };
+    tree = schematicRunner.runSchematic("pipe", options, tree);
+    files = tree.files;
+    // console.log(files.slice(91,files.length));
+
+    // component
+    expect(
+      files.indexOf("/libs/features/foo/pipes/truncate.pipe.ts")
+    ).toBeGreaterThanOrEqual(0);
+
+    // file content
+    content = getFileContent(
+      tree,
+      "/libs/features/foo/pipes/truncate.pipe.ts"
+    );
+    // console.log(content);
+    expect(content.indexOf(`@Pipe({`)).toBeGreaterThanOrEqual(0);
+    expect(content.indexOf(`name: 'truncate'`)).toBeGreaterThanOrEqual(0);
+
+    modulePath = '/libs/features/foo/foo.module.ts';
+    moduleContent = getFileContent(tree, modulePath);
+
+    // console.log(modulePath + ':');
+    // console.log(moduleContent);
+    expect(moduleContent.indexOf(`...FOO_PIPES`)).toBeGreaterThanOrEqual(0);
   });
 
   it("should create pipe in libs and handle camel case properly", () => {
@@ -94,7 +127,7 @@ describe("pipe schematic", () => {
       },
       tree
     );
-    let options: GenerateOptions = { 
+    let options: GenerateOptions = {
       ...defaultOptions,
       name: 'test-with-dashes'
     };

src/service/_index_files/index.ts

@@ -1,5 +1,7 @@
 import { <%= utils.classify(name) %>Service } from './<%= name %>.service';
 
-export const <%= utils.sanitize(name).toUpperCase() %>_PROVIDERS = [<%= utils.classify(name) %>Service];
+export const <%= utils.sanitize(feature).toUpperCase() %>_PROVIDERS = [
+  <%= utils.classify(name) %>Service
+];
 
 export * from './<%= name %>.service';

src/utils/generator.ts

@@ -546,7 +546,7 @@ export function adjustBarrelIndex(
         }
       }
 
-      if (type === "component" || type === "service") {
+      if (type === "component" || type === "service" || type === 'pipe') {
         // export symbol from barrel
         if ((isBase || importIfSubFolder) && options.subFolder) {
           changes.push(