fix(@angular/cli): adding dynamic parser options

sumitarora · sumitarora · commit b90d56e4e505 · 2017-05-03T17:58:03.000-04:00
diff --git a/packages/@angular/cli/blueprints/class/index.ts b/packages/@angular/cli/blueprints/class/index.ts
@@ -1,5 +1,5 @@
 import {getAppFromConfig} from '../../utilities/app-utils';
-import {dynamicPathParser} from '../../utilities/dynamic-path-parser';
+import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser';
 import {CliConfig} from '../../models/config';
 
 const stringUtils = require('ember-cli-string-utils');
@@ -26,8 +26,14 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath =
-     dynamicPathParser(this.project, entityName.split('.')[0], appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName: entityName.split('.')[0],
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/component/index.ts b/packages/@angular/cli/blueprints/component/index.ts
@@ -4,7 +4,7 @@ import * as path from 'path';
 import { NodeHost } from '../../lib/ast-tools';
 import { CliConfig } from '../../models/config';
 import { getAppFromConfig } from '../../utilities/app-utils';
-import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
+import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
 import { resolveModulePath } from '../../utilities/resolve-module-file';
 
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
@@ -123,7 +123,13 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
 
diff --git a/packages/@angular/cli/blueprints/directive/index.ts b/packages/@angular/cli/blueprints/directive/index.ts
@@ -4,7 +4,7 @@ import { NodeHost } from '../../lib/ast-tools';
 import { CliConfig } from '../../models/config';
 import { getAppFromConfig } from '../../utilities/app-utils';
 import { resolveModulePath } from '../../utilities/resolve-module-file';
-import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
+import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
 
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
@@ -76,7 +76,13 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
 
diff --git a/packages/@angular/cli/blueprints/enum/index.ts b/packages/@angular/cli/blueprints/enum/index.ts
@@ -1,5 +1,5 @@
 import {getAppFromConfig} from '../../utilities/app-utils';
-import {dynamicPathParser} from '../../utilities/dynamic-path-parser';
+import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser';
 
 const stringUtils = require('ember-cli-string-utils');
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
@@ -19,7 +19,13 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/guard/index.ts b/packages/@angular/cli/blueprints/guard/index.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import { oneLine } from 'common-tags';
 import { NodeHost } from '../../lib/ast-tools';
 import { CliConfig } from '../../models/config';
-import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
+import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
 import { getAppFromConfig } from '../../utilities/app-utils';
 import { resolveModulePath } from '../../utilities/resolve-module-file';
 
@@ -45,7 +45,13 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/interface/index.ts b/packages/@angular/cli/blueprints/interface/index.ts
@@ -1,6 +1,6 @@
 import {CliConfig} from '../../models/config';
 import {getAppFromConfig} from '../../utilities/app-utils';
-import {dynamicPathParser} from '../../utilities/dynamic-path-parser';
+import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser';
 
 const stringUtils = require('ember-cli-string-utils');
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
@@ -24,7 +24,13 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/module/index.ts b/packages/@angular/cli/blueprints/module/index.ts
@@ -1,6 +1,6 @@
 import {CliConfig} from '../../models/config';
 import {getAppFromConfig} from '../../utilities/app-utils';
-import {dynamicPathParser} from '../../utilities/dynamic-path-parser';
+import {dynamicPathParser, DynamicPathOptions} from '../../utilities/dynamic-path-parser';
 
 const path = require('path');
 const Blueprint   = require('../../ember-cli/lib/models/blueprint');
@@ -38,7 +38,13 @@ export default Blueprint.extend({
   normalizeEntityName: function (entityName: string) {
     this.entityName = entityName;
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/pipe/index.ts b/packages/@angular/cli/blueprints/pipe/index.ts
@@ -2,7 +2,7 @@ import * as chalk from 'chalk';
 import * as path from 'path';
 import { NodeHost } from '../../lib/ast-tools';
 import { CliConfig } from '../../models/config';
-import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
+import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
 import { getAppFromConfig } from '../../utilities/app-utils';
 import { resolveModulePath } from '../../utilities/resolve-module-file';
 
@@ -71,7 +71,13 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/blueprints/service/index.ts b/packages/@angular/cli/blueprints/service/index.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import { oneLine } from 'common-tags';
 import { NodeHost } from '../../lib/ast-tools';
 import { CliConfig } from '../../models/config';
-import { dynamicPathParser } from '../../utilities/dynamic-path-parser';
+import { dynamicPathParser, DynamicPathOptions } from '../../utilities/dynamic-path-parser';
 import { getAppFromConfig } from '../../utilities/app-utils';
 import { resolveModulePath } from '../../utilities/resolve-module-file';
 
@@ -50,7 +50,13 @@ export default Blueprint.extend({
 
   normalizeEntityName: function (entityName: string) {
     const appConfig = getAppFromConfig(this.options.app);
-    const parsedPath = dynamicPathParser(this.project, entityName, appConfig, this.options.dryRun);
+    const dynamicPathOptions: DynamicPathOptions = {
+      project: this.project,
+      entityName,
+      appConfig,
+      dryRun: this.options.dryRun
+    };
+    const parsedPath = dynamicPathParser(dynamicPathOptions);
 
     this.dynamicPath = parsedPath;
     return parsedPath.name;
diff --git a/packages/@angular/cli/utilities/dynamic-path-parser.ts b/packages/@angular/cli/utilities/dynamic-path-parser.ts
@@ -3,20 +3,26 @@ import * as process from 'process';
 import * as fs from 'fs';
 const stringUtils = require('ember-cli-string-utils');
 
-export function dynamicPathParser(project: any, entityName: string, appConfig: any,
-                                  dryRun: boolean) {
-  const projectRoot = project.root;
-  const sourceDir = appConfig.root;
+export interface DynamicPathOptions {
+  project: any;
+  entityName: string;
+  appConfig: any;
+  dryRun: boolean;
+}
+
+export function dynamicPathParser(options: DynamicPathOptions) {
+  const projectRoot = options.project.root;
+  const sourceDir = options.appConfig.root;
   const appRoot = path.join(sourceDir, 'app');
   const cwd = process.env.PWD;
 
   const rootPath = path.join(projectRoot, appRoot);
-  let outputPath = path.join(rootPath, entityName);
+  let outputPath = path.join(rootPath, options.entityName);
 
-  if (entityName.indexOf(path.sep) === 0) {
-    outputPath = path.join(rootPath, entityName.substr(1));
+  if (options.entityName.indexOf(path.sep) === 0) {
+    outputPath = path.join(rootPath, options.entityName.substr(1));
   } else if (cwd.indexOf(rootPath) >= 0) {
-    outputPath = path.join(cwd, entityName);
+    outputPath = path.join(cwd, options.entityName);
   }
 
   if (!fs.existsSync(outputPath)) {
@@ -39,7 +45,7 @@ export function dynamicPathParser(project: any, entityName: string, appConfig: a
       // Folder not found, create it, and return it
       const dasherizedPart = stringUtils.dasherize(part);
       const dasherizedDirName = path.join(tempPath, dasherizedPart);
-      if (!dryRun) {
+      if (!options.dryRun) {
         fs.mkdirSync(dasherizedDirName);
       }
       return dasherizedDirName;
@@ -49,7 +55,7 @@ export function dynamicPathParser(project: any, entityName: string, appConfig: a
   }
 
   if (outputPath.indexOf(rootPath) < 0) {
-    throw `Invalid path: "${entityName}" cannot be ` +
+    throw `Invalid path: "${options.entityName}" cannot be ` +
         `above the "${appRoot}" directory`;
   }
 
diff --git a/packages/@angular/cli/utilities/resolve-module-file.ts b/packages/@angular/cli/utilities/resolve-module-file.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import { dynamicPathParser } from './dynamic-path-parser';
+import { dynamicPathParser, DynamicPathOptions } from './dynamic-path-parser';
 
 export function resolveModulePath(
   moduleNameFromFlag: string, project: any, projectRoot: any, appConfig: any): string {
@@ -39,7 +39,13 @@ export function resolveModulePath(
 }
 
 function buildFullPath(project: any, relativeModulePath: string, appConfig: any, projectRoot: any) {
-  const parsedPath = dynamicPathParser(project, relativeModulePath, appConfig, false);
+  const dynamicPathOptions: DynamicPathOptions = {
+    project,
+    entityName: relativeModulePath,
+    appConfig,
+    dryRun: false
+  };
+  const parsedPath = dynamicPathParser(dynamicPathOptions);
   const fullModulePath = path.join(projectRoot, parsedPath.dir, parsedPath.base);
 
   return fullModulePath;
diff --git a/tests/acceptance/dynamic-path-parser.spec.js b/tests/acceptance/dynamic-path-parser.spec.js
