chore: generation paths are fully dynamic & supports --flat for components/directives/pipes/services

This is a step in aligning with the style guide and will provide the flexibility needed
Related to #316

Author: Brocco

addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.css renamed to addon/ng2/blueprints/component/files/__path__/__name__.css

@@ -12,7 +12,6 @@ import {
 import {provide} from 'angular2/core';
 import {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>';
 
-
 describe('<%= classifiedModuleName %> Component', () => {
 
   beforeEachProviders((): any[] => []);

addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.html renamed to addon/ng2/blueprints/component/files/__path__/__name__.html

@@ -1,7 +1,12 @@
+var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 module.exports = {
   description: '',
+  
+  availableOptions: [
+    { name: 'flat', type: Boolean, default: false, aliases: ['f'] }
+  ],
 
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
@@ -10,20 +15,22 @@ module.exports = {
     return parsedPath.name;
   },
 
-  locals: function () {
+  locals: function (options) {
     return {
-      dynamicPath: this.dynamicPath.dir
+      dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
+      flat: options.flat
     };
   },
 
-  fileMapTokens: function () {
+  fileMapTokens: function (options) {
     // Return custom template variables here.
     return {
-      __name__: () => {
-        return this.dynamicPath.name;
-      },
       __path__: () => {
-        return this.dynamicPath.dir;
+        var dir = this.dynamicPath.dir;
+        if (!options.locals.flat) {
+          dir += path.sep + options.dasherizedModuleName;
+        }
+        return dir;
       }
     };
   }

addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.spec.ts renamed to addon/ng2/blueprints/component/files/__path__/__name__.spec.ts

@@ -1,7 +1,12 @@
+var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 module.exports = {
   description: '',
+  
+  availableOptions: [
+    { name: 'flat', type: Boolean, default: false, aliases: ['f'] }
+  ],
 
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
@@ -10,20 +15,22 @@ module.exports = {
     return parsedPath.name;
   },
 
-  locals: function () {
+  locals: function (options) {
     return {
-      dynamicPath: this.dynamicPath.dir
+      dynamicPath: this.dynamicPath.dir,
+      flat: options.flat
     };
   },
 
-  fileMapTokens: function () {
+  fileMapTokens: function (options) {
     // Return custom template variables here.
     return {
-      __name__: () => {
-        return this.dynamicPath.name;
-      },
       __path__: () => {
-        return this.dynamicPath.dir;
+        var dir = this.dynamicPath.dir;
+        if (!options.locals.flat) {
+          dir += path.sep + options.dasherizedModuleName;
+        }
+        return dir;
       }
     };
   }

addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.ts renamed to addon/ng2/blueprints/component/files/__path__/__name__.ts

@@ -1,7 +1,12 @@
+var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 module.exports = {
   description: '',
+  
+  availableOptions: [
+    { name: 'flat', type: Boolean, default: false, aliases: ['f'] }
+  ],
 
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
@@ -10,18 +15,22 @@ module.exports = {
     return parsedPath.name;
   },
 
-  locals: function () {
-    return { dynamicPath: this.dynamicPath.dir };
+  locals: function (options) {
+    return { 
+      dynamicPath: this.dynamicPath.dir,
+      flat: options.flat
+    };
   },
 
-  fileMapTokens: function () {
+  fileMapTokens: function (options) {
     // Return custom template variables here.
     return {
-      __name__: () => {
-        return this.dynamicPath.name;
-      },
       __path__: () => {
-        return this.dynamicPath.dir;
+        var dir = this.dynamicPath.dir;
+        if (!options.locals.flat) {
+          dir += path.sep + options.dasherizedModuleName;
+        }
+        return dir;
       }
     };
   }

addon/ng2/blueprints/component/index.js

@@ -1,13 +1,17 @@
 var fs = require('fs-extra');
 var path = require('path');
+var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 var imports, routeDefinitions;
 
 module.exports = {
   description: 'Registers the route with the router.',
 
-  locals: function (options) {
-    return generateLocals.call(this, options);
+  normalizeEntityName: function (entityName) {
+    var parsedPath = dynamicPathParser(this.project, 'ignore');
+
+    this.dynamicPath = parsedPath;
+    return parsedPath.name;
   },
 
   beforeInstall: function (options) {
@@ -17,6 +21,19 @@ module.exports = {
     } catch (e) {
       //  doing nothing here
     }
+  },
+
+  locals: function (options) {
+    return generateLocals.call(this, options);
+  },
+
+  fileMapTokens: function (options) {
+    // Return custom template variables here.
+    return {
+      __path__: () => {
+        return this.dynamicPath.dir;
+      }
+    };
   }
 };
 

addon/ng2/blueprints/directive/files/src/client/app/__path__/__name__/__name__.spec.ts renamed to addon/ng2/blueprints/directive/files/__path__/__name__.spec.ts

@@ -1,7 +1,12 @@
+var path = require('path');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 module.exports = {
   description: '',
+  
+  availableOptions: [
+    { name: 'flat', type: Boolean, default: false, aliases: ['f'] }
+  ],
 
   normalizeEntityName: function (entityName) {
     var parsedPath = dynamicPathParser(this.project, entityName);
@@ -10,18 +15,22 @@ module.exports = {
     return parsedPath.name;
   },
 
-  locals: function () {
-    return { dynamicPath: this.dynamicPath.dir };
+  locals: function (options) {
+    return {
+      dynamicPath: this.dynamicPath.dir,
+      flat: options.flat
+    };
   },
 
-  fileMapTokens: function () {
+  fileMapTokens: function (options) {
     // Return custom template variables here.
     return {
-      __name__: () => {
-        return this.dynamicPath.name;
-      },
       __path__: () => {
-        return this.dynamicPath.dir;
+        var dir = this.dynamicPath.dir;
+        if (!options.locals.flat) {
+          dir += path.sep + options.dasherizedModuleName;
+        }
+        return dir;
       }
     };
   }

addon/ng2/blueprints/directive/files/src/client/app/__path__/__name__/__name__.ts renamed to addon/ng2/blueprints/directive/files/__path__/__name__.ts

@@ -3,9 +3,10 @@ var process = require('process');
 
 module.exports = function dynamicPathParser(project, entityName) {
   var projectRoot = project.root;
+  var appRoot = path.join('src', 'client', 'app');
   var cwd = process.env.PWD;
 
-  var rootPath = path.join(projectRoot, 'src', 'client', 'app');
+  var rootPath = path.join(projectRoot, appRoot);
 
   var outputPath = path.join(rootPath, entityName);
 
@@ -31,14 +32,15 @@ module.exports = function dynamicPathParser(project, entityName) {
 
   if (outputPath.indexOf(rootPath) < 0) {
     throw `Invalid path: "${entityName}" cannot be ` +
-        `above the "${path.join('src', 'app')}" directory`;
+        `above the "${appRoot}" directory`;
   }
 
-  var adjustedPath = outputPath.replace(rootPath, '');
+  var adjustedPath = outputPath.replace(projectRoot, '');
 
   var parsedPath = path.parse(adjustedPath);
 
   parsedPath.dir = parsedPath.dir === path.sep ? '' : parsedPath.dir;
+  parsedPath.appRoot = appRoot
 
   return parsedPath;
 };

addon/ng2/blueprints/directive/index.js

@@ -4,6 +4,8 @@ var expect = require('chai').expect;
 var path = require('path');
 var dynamicPathParser = require('../../addon/ng2/utilities/dynamic-path-parser');
 
+var appDir = `${path.sep}src${path.sep}client${path.sep}app`;
+
 describe('dynamic path parser', () => {
   var project;
   var entityName = 'temp-name';
@@ -14,50 +16,50 @@ describe('dynamic path parser', () => {
   it('parse from proj root dir', () => {
     process.env.PWD = process.cwd();
     var result = dynamicPathParser(project, entityName);
-    expect(result.dir).to.equal('');
+    expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it('parse from proj src dir', () => {
     process.env.PWD = path.join(process.cwd(), 'src');
     var result = dynamicPathParser(project, entityName);
-    expect(result.dir).to.equal('');
+    expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client dir`, () => {
     process.env.PWD = path.join(process.cwd(), 'src', 'client');
     var result = dynamicPathParser(project, entityName);
-    expect(result.dir).to.equal('');
+    expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client${path.sep}app dir`, () => {
     process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app');
     var result = dynamicPathParser(project, entityName);
-    expect(result.dir).to.equal('');
+    expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir`, () => {
     process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir');
     var result = dynamicPathParser(project, entityName);
-    expect(result.dir).to.equal(`${path.sep}child-dir`);
+    expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir w/ ..${path.sep}`, () => {
     process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir');
     var result = dynamicPathParser(project, '..' + path.sep + entityName);
-    expect(result.dir).to.equal('');
+    expect(result.dir).to.equal(appDir);
     expect(result.name).to.equal(entityName);
   });
 
   it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir${path.sep}grand-child-dir w/ ..${path.sep}`,
     () => {
       process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir', 'grand-child-dir');
       var result = dynamicPathParser(project, '..' + path.sep + entityName);
-      expect(result.dir).to.equal(`${path.sep}child-dir`);
+      expect(result.dir).to.equal(`${appDir}${path.sep}child-dir`);
       expect(result.name).to.equal(entityName);
     });
 });