From 0c70d0777d71b411bceab77d97107cce302e9fbb Mon Sep 17 00:00:00 2001 From: listepo-alterpost Date: Mon, 12 Nov 2018 22:13:09 +0200 Subject: [PATCH] fix(schematics): rename skipModuleName to simpleModuleName --- .../schematics/src/collection/library/index.ts | 2 +- .../src/collection/library/library.spec.ts | 14 +++++++------- .../schematics/src/collection/library/schema.d.ts | 2 +- .../schematics/src/collection/library/schema.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/schematics/src/collection/library/index.ts b/packages/schematics/src/collection/library/index.ts index 24e00a9382..0c41afa265 100644 --- a/packages/schematics/src/collection/library/index.ts +++ b/packages/schematics/src/collection/library/index.ts @@ -464,7 +464,7 @@ function normalizeOptions(host: Tree, options: Schema): NormalizedSchema { : name; const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-'); - const fileName = options.skipModulePrefix ? name : projectName; + const fileName = options.simpleModuleName ? name : projectName; const projectRoot = `libs/${projectDirectory}`; const moduleName = `${toClassName(fileName)}Module`; diff --git a/packages/schematics/src/collection/library/library.spec.ts b/packages/schematics/src/collection/library/library.spec.ts index dc221f5f58..35388c3773 100644 --- a/packages/schematics/src/collection/library/library.spec.ts +++ b/packages/schematics/src/collection/library/library.spec.ts @@ -140,7 +140,7 @@ describe('lib', () => { const tree2 = schematicRunner.runSchematic( 'lib', - { name: 'myLib2', skipModulePrefix: true }, + { name: 'myLib2', simpleModuleName: true }, tree ); expect(tree2.exists(`libs/my-lib2/karma.conf.js`)).toBeTruthy(); @@ -225,7 +225,7 @@ describe('lib', () => { name: 'myLib2', directory: 'myDir', tags: 'one,two', - skipModulePrefix: true + simpleModuleName: true }, tree ); @@ -270,7 +270,7 @@ describe('lib', () => { const tree2 = schematicRunner.runSchematic( 'lib', - { name: 'myLib2', directory: 'myDir', skipModulePrefix: true }, + { name: 'myLib2', directory: 'myDir', simpleModuleName: true }, tree ); expect(tree2.exists(`libs/my-dir/my-lib2/karma.conf.js`)).toBeTruthy(); @@ -387,7 +387,7 @@ describe('lib', () => { directory: 'myDir', routing: true, lazy: true, - skipModulePrefix: true + simpleModuleName: true }, tree ); @@ -465,7 +465,7 @@ describe('lib', () => { routing: true, lazy: true, parentModule: 'apps/myapp/src/app/app.module.ts', - skipModulePrefix: true + simpleModuleName: true }, tree2 ); @@ -518,7 +518,7 @@ describe('lib', () => { name: 'myLib2', directory: 'myDir', routing: true, - skipModulePrefix: true + simpleModuleName: true }, tree ); @@ -574,7 +574,7 @@ describe('lib', () => { directory: 'myDir', routing: true, parentModule: 'apps/myapp/src/app/app.module.ts', - skipModulePrefix: true + simpleModuleName: true }, tree2 ); diff --git a/packages/schematics/src/collection/library/schema.d.ts b/packages/schematics/src/collection/library/schema.d.ts index cc2d54d5cc..46fcfd6356 100644 --- a/packages/schematics/src/collection/library/schema.d.ts +++ b/packages/schematics/src/collection/library/schema.d.ts @@ -3,7 +3,7 @@ import { UnitTestRunner } from '../../utils/test-runners'; export interface Schema { name: string; skipFormat: boolean; - skipModulePrefix: boolean; + simpleModuleName: boolean; directory?: string; sourceDir?: string; publishable: boolean; diff --git a/packages/schematics/src/collection/library/schema.json b/packages/schematics/src/collection/library/schema.json index ec1d40b103..2c7da1261b 100644 --- a/packages/schematics/src/collection/library/schema.json +++ b/packages/schematics/src/collection/library/schema.json @@ -34,7 +34,7 @@ "type": "boolean", "default": false }, - "skipModulePrefix": { + "simpleModuleName": { "description": "Skip module prefix when using --directory", "type": "boolean", "default": false