chore(paths): dynamic paths for directives, pipes and services

addon/ng2/blueprints/component/index.js

@@ -1,49 +1,24 @@
 var stringUtils = require('ember-cli/lib/utilities/string');
-var path = require('path');
-var process = require('process');
+var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 module.exports = {
   description: '',
-  
-  normalizeEntityName: function(entityName){
+
+  normalizeEntityName: function(entityName) {
     var cwd = this.project.cli.testing
       ? process.cwd()
       : process.env.PWD;
-
-    var rootPath = path.join(this.project.root, 'src', 'app');
-
-    var outputPath = path.join(rootPath, entityName);
-
-    if (entityName.indexOf(path.sep) === 0) {
-      outputPath = path.join(rootPath, entityName.substr(1));
-    } else if (cwd.indexOf(rootPath) >= 0) {
-      outputPath = path.join(cwd, entityName);
-    } else if (cwd.indexOf(path.join(this.project.root, 'src')) >= 0
-               && entityName.indexOf('app') === 0) {
-      outputPath = path.join(cwd, entityName);
-    } else if (cwd.indexOf(path.join(this.project.root, 'src')) >= 0) {
-      outputPath = path.join(cwd, 'app', entityName);
-    }
-
-    if (outputPath.indexOf(rootPath) < 0) {
-      throw `Invalid component path: "${entityName}" cannot be ` +
-        `above the "${path.join('src', 'app')}" directory`; 
-    }
 
-    var adjustedPath = outputPath.replace(rootPath, '');
+    var parsedPath = dynamicPathParser(cwd, this.project.root, entityName);
 
-    var parsedPath = path.parse(adjustedPath);
-    this.dynamicPath = {
-      name: parsedPath.name,
-      path: parsedPath.dir
-    };
+    this.dynamicPath = parsedPath;
     return parsedPath.name;
   },
-  
-  locals: function(options){
+
+  locals: function(options) {
     return {
-      dynamicPath: this.dynamicPath.path
-    }
+      dynamicPath: this.dynamicPath.dir
+    };
   },
 
   fileMapTokens: function(options) {
@@ -53,7 +28,7 @@ module.exports = {
         return this.dynamicPath.name;
       },
       __path__: (options) => {
-        return this.dynamicPath.path;
+        return this.dynamicPath.dir;
       }
     };
   }

addon/ng2/blueprints/directive/index.js

@@ -0,0 +1,35 @@
+var stringUtils = require('ember-cli/lib/utilities/string');
+var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+
+module.exports = {
+  description: '',
+
+  normalizeEntityName: function(entityName) {
+    var cwd = this.project.cli.testing
+      ? process.cwd()
+      : process.env.PWD;
+
+    var parsedPath = dynamicPathParser(cwd, this.project.root, entityName);
+
+    this.dynamicPath = parsedPath;
+    return parsedPath.name;
+  },
+
+  locals: function(options) {
+    return {
+      dynamicPath: this.dynamicPath.dir
+    };
+  },
+
+  fileMapTokens: function(options) {
+    // Return custom template variables here.
+    return {
+      __name__: (options) => {
+        return this.dynamicPath.name;
+      },
+      __path__: (options) => {
+        return this.dynamicPath.dir;
+      }
+    };
+  }
+};

addon/ng2/blueprints/pipe/index.js

@@ -0,0 +1,35 @@
+var stringUtils = require('ember-cli/lib/utilities/string');
+var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+
+module.exports = {
+  description: '',
+
+  normalizeEntityName: function(entityName) {
+    var cwd = this.project.cli.testing
+      ? process.cwd()
+      : process.env.PWD;
+
+    var parsedPath = dynamicPathParser(cwd, this.project.root, entityName);
+
+    this.dynamicPath = parsedPath;
+    return parsedPath.name;
+  },
+
+  locals: function(options) {
+    return {
+      dynamicPath: this.dynamicPath.dir
+    };
+  },
+
+  fileMapTokens: function(options) {
+    // Return custom template variables here.
+    return {
+      __name__: (options) => {
+        return this.dynamicPath.name;
+      },
+      __path__: (options) => {
+        return this.dynamicPath.dir;
+      }
+    };
+  }
+};

addon/ng2/blueprints/service/index.js

@@ -1,16 +1,35 @@
 var stringUtils = require('ember-cli/lib/utilities/string');
+var dynamicPathParser = require('../../utilities/dynamic-path-parser');
 
 module.exports = {
-  description: ''
+  description: '',
 
-  //locals: function(options) {
-  //   // Return custom template variables here.
-  //   return {
-  //
-  //   };
-  //}
+  normalizeEntityName: function(entityName) {
+    var cwd = this.project.cli.testing
+      ? process.cwd()
+      : process.env.PWD;
+
+    var parsedPath = dynamicPathParser(cwd, this.project.root, entityName);
+
+    this.dynamicPath = parsedPath;
+    return parsedPath.name;
+  },
 
-  // afterInstall: function(options) {
-  //   // Perform extra work here.
-  // }
+  locals: function(options) {
+    return {
+      dynamicPath: this.dynamicPath.dir
+    };
+  },
+
+  fileMapTokens: function(options) {
+    // Return custom template variables here.
+    return {
+      __name__: (options) => {
+        return this.dynamicPath.name;
+      },
+      __path__: (options) => {
+        return this.dynamicPath.dir;
+      }
+    };
+  }
 };

addon/ng2/utilities/dynamic-path-parser.js

@@ -0,0 +1,30 @@
+var path = require('path');
+var process = require('process');
+
+module.exports = function dynamicPathParser(cwd, projectRoot, entityName) {
+  var rootPath = path.join(projectRoot, 'src', 'app');
+
+  var outputPath = path.join(rootPath, entityName);
+
+  if (entityName.indexOf(path.sep) === 0) {
+    outputPath = path.join(rootPath, entityName.substr(1));
+  } else if (cwd.indexOf(rootPath) >= 0) {
+    outputPath = path.join(cwd, entityName);
+  } else if (cwd.indexOf(path.join(projectRoot, 'src')) >= 0
+    && entityName.indexOf('app') === 0) {
+    outputPath = path.join(cwd, entityName);
+  } else if (cwd.indexOf(path.join(projectRoot, 'src')) >= 0) {
+    outputPath = path.join(cwd, 'app', entityName);
+  }
+
+  if (outputPath.indexOf(rootPath) < 0) {
+    throw `Invalid path: "${entityName}" cannot be ` +
+      `above the "${path.join('src', 'app')}" directory`;
+  }
+
+  var adjustedPath = outputPath.replace(rootPath, '');
+
+  var parsedPath = path.parse(adjustedPath);
+
+  return parsedPath;
+}