fix(Schematics): Update parsed path logic to split path and name

Closes #1064

Author: brandonroberts

modules/effects/schematics-core/index.ts

@@ -70,3 +70,4 @@ export const stringUtils = {
 };
 
 export { updatePackage } from './utility/update';
+export { parseName } from './utility/parse-name';

modules/effects/schematics-core/utility/parse-name.ts

@@ -0,0 +1,16 @@
+import { Path, basename, dirname, normalize } from '@angular-devkit/core';
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export function parseName(path: string, name: string): Location {
+  const nameWithoutPath = basename(name as Path);
+  const namePath = dirname((path + '/' + name) as Path);
+
+  return {
+    name: nameWithoutPath,
+    path: normalize('/' + namePath),
+  };
+}

modules/entity/schematics-core/index.ts

@@ -70,3 +70,4 @@ export const stringUtils = {
 };
 
 export { updatePackage } from './utility/update';
+export { parseName } from './utility/parse-name';

modules/entity/schematics-core/utility/parse-name.ts

@@ -0,0 +1,16 @@
+import { Path, basename, dirname, normalize } from '@angular-devkit/core';
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export function parseName(path: string, name: string): Location {
+  const nameWithoutPath = basename(name as Path);
+  const namePath = dirname((path + '/' + name) as Path);
+
+  return {
+    name: nameWithoutPath,
+    path: normalize('/' + namePath),
+  };
+}

modules/router-store/schematics-core/index.ts

@@ -70,3 +70,4 @@ export const stringUtils = {
 };
 
 export { updatePackage } from './utility/update';
+export { parseName } from './utility/parse-name';

modules/router-store/schematics-core/utility/parse-name.ts

@@ -0,0 +1,16 @@
+import { Path, basename, dirname, normalize } from '@angular-devkit/core';
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export function parseName(path: string, name: string): Location {
+  const nameWithoutPath = basename(name as Path);
+  const namePath = dirname((path + '/' + name) as Path);
+
+  return {
+    name: nameWithoutPath,
+    path: normalize('/' + namePath),
+  };
+}

modules/schematics-core/index.ts

@@ -70,3 +70,4 @@ export const stringUtils = {
 };
 
 export { updatePackage } from './utility/update';
+export { parseName } from './utility/parse-name';

modules/schematics-core/utility/parse-name.ts

@@ -0,0 +1,16 @@
+import { Path, basename, dirname, normalize } from '@angular-devkit/core';
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export function parseName(path: string, name: string): Location {
+  const nameWithoutPath = basename(name as Path);
+  const namePath = dirname((path + '/' + name) as Path);
+
+  return {
+    name: nameWithoutPath,
+    path: normalize('/' + namePath),
+  };
+}

modules/schematics/schematics-core/index.ts

@@ -70,3 +70,4 @@ export const stringUtils = {
 };
 
 export { updatePackage } from './utility/update';
+export { parseName } from './utility/parse-name';

modules/schematics/schematics-core/utility/parse-name.ts

@@ -0,0 +1,16 @@
+import { Path, basename, dirname, normalize } from '@angular-devkit/core';
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export function parseName(path: string, name: string): Location {
+  const nameWithoutPath = basename(name as Path);
+  const namePath = dirname((path + '/' + name) as Path);
+
+  return {
+    name: nameWithoutPath,
+    path: normalize('/' + namePath),
+  };
+}

modules/schematics/src/action/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.actions.ts renamed to modules/schematics/src/action/files/__name@dasherize@if-flat__/__name@dasherize__.actions.ts

@@ -14,12 +14,20 @@ import {
   SchematicContext,
 } from '@angular-devkit/schematics';
 import { Schema as ActionOptions } from './schema';
-import { getProjectPath, stringUtils } from '@ngrx/schematics/schematics-core';
+import {
+  getProjectPath,
+  stringUtils,
+  parseName,
+} from '@ngrx/schematics/schematics-core';
 
 export default function(options: ActionOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
     const templateSource = apply(url('./files'), [
       options.spec ? noop() : filter(path => !path.endsWith('__spec.ts')),
       template({
@@ -32,6 +40,7 @@ export default function(options: ActionOptions): Rule {
         ...(options as object),
         dot: () => '.',
       } as any),
+      move(parsedPath.path),
     ]);
 
     return chain([branchAndMerge(chain([mergeWith(templateSource)]))])(

modules/schematics/src/action/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.actions__dot__spec.ts renamed to modules/schematics/src/action/files/__name@dasherize@if-flat__/__name@dasherize__.actions__dot__spec.ts

@@ -23,6 +23,7 @@ import {
   InsertChange,
   getProjectPath,
   omit,
+  parseName,
 } from '@ngrx/schematics/schematics-core';
 import { Schema as ContainerOptions } from './schema';
 
@@ -123,6 +124,10 @@ export default function(options: ContainerOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
     const opts = ['state', 'stateInterface'].reduce(
       (current: Partial<ContainerOptions>, key) => {
         return omit(current, key as any);
@@ -138,6 +143,7 @@ export default function(options: ContainerOptions): Rule {
         ...(options as object),
         dot: () => '.',
       } as any),
+      move(parsedPath.path),
     ]);
 
     return chain([

modules/schematics/src/action/index.ts

@@ -24,6 +24,7 @@ import {
   findModuleFromOptions,
 } from '@ngrx/schematics/schematics-core';
 import { Schema as EffectOptions } from './schema';
+import { parseName } from '@ngrx/schematics/schematics-core';
 
 function addImportToNgModule(options: EffectOptions): Rule {
   return (host: Tree) => {
@@ -99,6 +100,10 @@ export default function(options: EffectOptions): Rule {
       options.module = findModuleFromOptions(host, options);
     }
 
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
     const templateSource = apply(url('./files'), [
       options.spec ? noop() : filter(path => !path.endsWith('__spec.ts')),
       template({
@@ -111,6 +116,7 @@ export default function(options: EffectOptions): Rule {
         ...(options as object),
         dot: () => '.',
       } as any),
+      move(parsedPath.path),
     ]);
 
     return chain([

modules/schematics/src/container/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component__dot__spec.ts renamed to modules/schematics/src/container/files/__name@dasherize@if-flat__/__name@dasherize__.component__dot__spec.ts

@@ -19,13 +19,18 @@ import {
   addReducerImportToNgModule,
   getProjectPath,
   findModuleFromOptions,
+  parseName,
 } from '@ngrx/schematics/schematics-core';
 import { Schema as EntityOptions } from './schema';
 
 export default function(options: EntityOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
     if (options.module) {
       options.module = findModuleFromOptions(host, options);
     }
@@ -44,6 +49,7 @@ export default function(options: EntityOptions): Rule {
         ...(options as object),
         dot: () => '.',
       } as any),
+      move(parsedPath.path),
     ]);
 
     return chain([

modules/schematics/src/container/index.ts

@@ -75,4 +75,31 @@ describe('Feature Schematic', () => {
       files.indexOf(`${projectPath}/src/app/effects/foo.effects.spec.ts`)
     ).toBeGreaterThanOrEqual(0);
   });
+
+  it('should respect the path provided for the feature name', () => {
+    const options = {
+      ...defaultOptions,
+      name: 'foo/Foo',
+      group: true,
+      module: 'app',
+    };
+
+    const tree = schematicRunner.runSchematic('feature', options, appTree);
+    const effectsFileContent = tree.readContent(
+      `${projectPath}/src/app/foo/effects/foo.effects.ts`
+    );
+    const reducerFileContent = tree.readContent(
+      `${projectPath}/src/app/foo/reducers/foo.reducer.ts`
+    );
+    const moduleFileContent = tree.readContent(
+      `${projectPath}/src/app/app.module.ts`
+    );
+
+    expect(moduleFileContent).toMatch(
+      /import { FooEffects } from '\.\/foo\/effects\/foo.effects';/
+    );
+    expect(moduleFileContent).toMatch(
+      /import \* as fromFoo from '\.\/foo\/reducers\/foo.reducer';/
+    );
+  });
 });

modules/schematics/src/effect/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.effects.ts renamed to modules/schematics/src/effect/files/__name@dasherize@if-flat__/__name@dasherize__.effects.ts

@@ -20,6 +20,7 @@ import {
   stringUtils,
   addReducerToState,
   addReducerImportToNgModule,
+  parseName,
 } from '@ngrx/schematics/schematics-core';
 import { Schema as ReducerOptions } from './schema';
 
@@ -31,6 +32,10 @@ export default function(options: ReducerOptions): Rule {
       options.module = findModuleFromOptions(host, options);
     }
 
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
     const templateSource = apply(url('./files'), [
       options.spec ? noop() : filter(path => !path.endsWith('__spec.ts')),
       template({
@@ -43,6 +48,7 @@ export default function(options: ReducerOptions): Rule {
         ...(options as object),
         dot: () => '.',
       } as any),
+      move(parsedPath.path),
     ]);
 
     return chain([

modules/schematics/src/effect/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.effects__dot__spec.ts renamed to modules/schematics/src/effect/files/__name@dasherize@if-flat__/__name@dasherize__.effects__dot__spec.ts

@@ -22,6 +22,7 @@ import {
   getProjectPath,
   findModuleFromOptions,
   addImportToModule,
+  parseName,
 } from '@ngrx/schematics/schematics-core';
 import { Schema as StoreOptions } from './schema';
 
@@ -129,6 +130,10 @@ export default function(options: StoreOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
     const statePath = `/${options.path}/${options.statePath}/index.ts`;
     const environmentsPath = buildRelativePath(
       statePath,
@@ -153,6 +158,7 @@ export default function(options: StoreOptions): Rule {
         ...(options as object),
         environmentsPath,
       } as any),
+      move(parsedPath.path),
     ]);
 
     return chain([

modules/schematics/src/effect/index.ts

@@ -70,3 +70,4 @@ export const stringUtils = {
 };
 
 export { updatePackage } from './utility/update';
+export { parseName } from './utility/parse-name';

modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-actions__.actions.ts renamed to modules/schematics/src/entity/files/__name@dasherize@if-flat__/__name@dasherize@group-actions__.actions.ts

@@ -0,0 +1,16 @@
+import { Path, basename, dirname, normalize } from '@angular-devkit/core';
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export function parseName(path: string, name: string): Location {
+  const nameWithoutPath = basename(name as Path);
+  const namePath = dirname((path + '/' + name) as Path);
+
+  return {
+    name: nameWithoutPath,
+    path: normalize('/' + namePath),
+  };
+}

modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-models__.model.ts renamed to modules/schematics/src/entity/files/__name@dasherize@if-flat__/__name@dasherize@group-models__.model.ts

@@ -70,3 +70,4 @@ export const stringUtils = {
 };
 
 export { updatePackage } from './utility/update';
+export { parseName } from './utility/parse-name';

modules/schematics/src/entity/files/__path__/__name@dasherize@if-flat__/__name@dasherize@group-reducers__.reducer.ts renamed to modules/schematics/src/entity/files/__name@dasherize@if-flat__/__name@dasherize@group-reducers__.reducer.ts

@@ -0,0 +1,16 @@
+import { Path, basename, dirname, normalize } from '@angular-devkit/core';
+
+export interface Location {
+  name: string;
+  path: Path;
+}
+
+export function parseName(path: string, name: string): Location {
+  const nameWithoutPath = basename(name as Path);
+  const namePath = dirname((path + '/' + name) as Path);
+
+  return {
+    name: nameWithoutPath,
+    path: normalize('/' + namePath),
+  };
+}