feat: add components/directives/pipes/services to barrel when generated into a shared dir

Author: Brocco

addon/ng2/blueprints/component/index.js

@@ -1,7 +1,7 @@
 var path = require('path');
 var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
-
+var addBarrelRegistration = require('../../utilities/barrel-management');
 var getFiles = Blueprint.prototype.files;
 
 module.exports = {
@@ -35,10 +35,10 @@ module.exports = {
   files: function() {
     var fileList = getFiles.call(this);
 
-    if (this.options.flat) {
+    if (this.options && this.options.flat) {
       fileList = fileList.filter(p => p.indexOf('index.ts') <= 0);
     }
-    if (!this.options.route) {
+    if (this.options && !this.options.route) {
       fileList = fileList.filter(p => p.indexOf(path.join('shared', 'index.ts')) <= 0);
     }
 
@@ -60,6 +60,7 @@ module.exports = {
           }
         }
         this.appDir = dir.replace(`src${path.sep}client${path.sep}`, '');
+        this.generatePath = dir;
         return dir;
       },
       __styleext__: () => {
@@ -72,11 +73,20 @@ module.exports = {
     if (!options.flat) {
       var filePath = path.join('src', 'client', 'system-config.ts');
       var barrelUrl = this.appDir.replace(path.sep, '/');
-      return this.insertIntoFile(
-        filePath,
-        `  '${barrelUrl}',`,
-        { before: '  /** @cli-barrel */' }
-      );
+      
+      return addBarrelRegistration(this, this.generatePath)
+        .then(() => {
+          return this.insertIntoFile(
+            filePath,
+            `  '${barrelUrl}',`,
+            { before: '  /** @cli-barrel */' }
+          );
+        })
+    } else {
+      return addBarrelRegistration(
+        this, 
+        this.generatePath,
+        options.entity.name + '.component');
     }
   }
 };

addon/ng2/blueprints/directive/files/__path__/index.ts

@@ -0,0 +1 @@
+export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.directive';

addon/ng2/blueprints/directive/index.js

@@ -1,5 +1,8 @@
 var path = require('path');
+var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+var addBarrelRegistration = require('../../utilities/barrel-management');
+var getFiles = Blueprint.prototype.files;
 
 module.exports = {
   description: '',
@@ -23,6 +26,16 @@ module.exports = {
       rawEntityName: this.rawEntityName
     };
   },
+  
+  files: function() {
+    var fileList = getFiles.call(this);
+    
+    if (this.options && this.options.flat) {
+      fileList = fileList.filter(p => p.indexOf('index.ts') <= 0);
+    }
+
+    return fileList;
+  },
 
   fileMapTokens: function (options) {
     // Return custom template variables here.
@@ -32,8 +45,22 @@ module.exports = {
         if (!options.locals.flat) {
           dir += path.sep + options.dasherizedModuleName;
         }
+        this.generatePath = dir;
         return dir;
       }
     };
+  },
+  
+  afterInstall: function(options) {
+    if (!options.flat) {
+      return addBarrelRegistration(
+        this,
+        this.generatePath);
+    } else {
+      return addBarrelRegistration(
+        this, 
+        this.generatePath,
+        options.entity.name + '.directive');
+    }
   }
 };

addon/ng2/blueprints/pipe/files/__path__/index.ts

@@ -0,0 +1 @@
+export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.pipe';

addon/ng2/blueprints/pipe/index.js

@@ -1,5 +1,8 @@
 var path = require('path');
+var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+var addBarrelRegistration = require('../../utilities/barrel-management');
+var getFiles = Blueprint.prototype.files;
 
 module.exports = {
   description: '',
@@ -21,6 +24,16 @@ module.exports = {
       flat: options.flat
     };
   },
+  
+  files: function() {
+    var fileList = getFiles.call(this);
+    
+    if (this.options && this.options.flat) {
+      fileList = fileList.filter(p => p.indexOf('index.ts') <= 0);
+    }
+
+    return fileList;
+  },
 
   fileMapTokens: function (options) {
     // Return custom template variables here.
@@ -30,8 +43,22 @@ module.exports = {
         if (!options.locals.flat) {
           dir += path.sep + options.dasherizedModuleName;
         }
+        this.generatePath = dir;
         return dir;
       }
     };
+  },
+  
+  afterInstall: function(options) {
+    if (!options.flat) {
+      return addBarrelRegistration(
+        this,
+        this.generatePath);
+    } else {
+      return addBarrelRegistration(
+        this, 
+        this.generatePath,
+        options.entity.name + '.pipe');
+    }
   }
 };

addon/ng2/blueprints/service/files/__path__/index.ts

@@ -0,0 +1 @@
+export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.service';

addon/ng2/blueprints/service/index.js

@@ -1,5 +1,8 @@
 var path = require('path');
+var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+var addBarrelRegistration = require('../../utilities/barrel-management');
+var getFiles = Blueprint.prototype.files;
 
 module.exports = {
   description: '',
@@ -21,6 +24,16 @@ module.exports = {
       flat: options.flat
     };
   },
+  
+  files: function() {
+    var fileList = getFiles.call(this);
+    
+    if (this.options && this.options.flat) {
+      fileList = fileList.filter(p => p.indexOf('index.ts') <= 0);
+    }
+
+    return fileList;
+  },
 
   fileMapTokens: function (options) {
     // Return custom template variables here.
@@ -30,8 +43,22 @@ module.exports = {
         if (!options.locals.flat) {
           dir += path.sep + options.dasherizedModuleName;
         }
+        this.generatePath = dir;
         return dir;
       }
     };
+  },
+  
+  afterInstall: function(options) {
+    if (!options.flat) {
+      return addBarrelRegistration(
+        this,
+        this.generatePath);
+    } else {
+      return addBarrelRegistration(
+        this, 
+        this.generatePath,
+        options.entity.name + '.service');
+    }
   }
 };

addon/ng2/utilities/barrel-management.js

@@ -0,0 +1,30 @@
+var path = require('path');
+var EOL = require('os').EOL;
+
+module.exports = addBarrelRegistration;
+
+function addBarrelRegistration(blueprint, installationDir, fileName) {
+  var parts = installationDir.split(path.sep);
+  var idx = -1;
+  if (parts[parts.length - 1] === 'shared') {
+    idx = parts.length - 1;
+  } else if (parts[parts.length - 2] === 'shared') {
+    idx = parts.length - 2;
+  }
+  
+  if (idx === -1) {
+    return Promise.resolve();
+  }
+  
+  var sharedDir = parts.slice(0, idx + 1).join(path.sep);
+  var relativeParts = parts.splice(idx + 1);
+  if (fileName) {
+    relativeParts.push(fileName);
+  }
+  var importFrom = './' + relativeParts.join('/');
+  
+  return blueprint.insertIntoFile(
+    sharedDir + path.sep + 'index.ts',
+    `export * from '${importFrom}';${EOL}`
+  );
+}