From 9dd967f4f2c6c2d8d7dc567d2755ee09a93b26f6 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Wed, 24 Oct 2018 18:15:29 +0200 Subject: [PATCH] refactor(schematics): group ng-generate schematics in folder * Similarly to the CDK schematics, schematics that can be (ng-)`generated` should be grouped into its own directory. This cleans up the schematics folder and makes it clear where each schematic lives. * Removes a tslint ignore comment in a schematic test. --- src/lib/schematics/BUILD.bazel | 8 ++++---- src/lib/schematics/collection.json | 20 +++++++++---------- .../__name@dasherize__.component.__styleext__ | 0 .../__name@dasherize__.component.html | 0 .../__name@dasherize__.component.spec.ts | 0 .../__name@dasherize__.component.ts | 0 .../address-form/index.spec.ts | 2 +- .../{ => ng-generate}/address-form/index.ts | 0 .../address-form/schema.json | 0 .../{ => ng-generate}/address-form/schema.ts | 0 .../__name@dasherize__.component.__styleext__ | 0 .../__name@dasherize__.component.html | 0 .../__name@dasherize__.component.spec.ts | 0 .../__name@dasherize__.component.ts | 0 .../{ => ng-generate}/dashboard/index.spec.ts | 6 +++--- .../{ => ng-generate}/dashboard/index.ts | 0 .../{ => ng-generate}/dashboard/schema.json | 0 .../{ => ng-generate}/dashboard/schema.ts | 0 .../__name@dasherize__.component.__styleext__ | 0 .../__name@dasherize__.component.html | 0 .../__name@dasherize__.component.spec.ts | 0 .../__name@dasherize__.component.ts | 0 .../{ => ng-generate}/nav/index.spec.ts | 2 +- .../schematics/{ => ng-generate}/nav/index.ts | 0 .../{ => ng-generate}/nav/schema.json | 0 .../{ => ng-generate}/nav/schema.ts | 0 .../__name@dasherize__-datasource.ts | 0 .../__name@dasherize__.component.__styleext__ | 0 .../__name@dasherize__.component.html | 0 .../__name@dasherize__.component.spec.ts | 0 .../__name@dasherize__.component.ts | 0 .../{ => ng-generate}/table/index.spec.ts | 2 +- .../{ => ng-generate}/table/index.ts | 0 .../{ => ng-generate}/table/schema.json | 0 .../{ => ng-generate}/table/schema.ts | 0 .../__name@dasherize__.component.__styleext__ | 0 .../__name@dasherize__.component.html | 0 .../__name@dasherize__.component.spec.ts | 0 .../__name@dasherize__.component.ts | 0 .../example-data.ts | 0 .../{ => ng-generate}/tree/index.spec.ts | 2 +- .../{ => ng-generate}/tree/index.ts | 0 .../{ => ng-generate}/tree/schema.json | 0 .../{ => ng-generate}/tree/schema.ts | 0 src/lib/schematics/tsconfig.json | 6 +++--- tslint.json | 4 ++-- 46 files changed, 26 insertions(+), 26 deletions(-) rename src/lib/schematics/{ => ng-generate}/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ (100%) rename src/lib/schematics/{ => ng-generate}/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html (100%) rename src/lib/schematics/{ => ng-generate}/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts (100%) rename src/lib/schematics/{ => ng-generate}/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts (100%) rename src/lib/schematics/{ => ng-generate}/address-form/index.spec.ts (99%) rename src/lib/schematics/{ => ng-generate}/address-form/index.ts (100%) rename src/lib/schematics/{ => ng-generate}/address-form/schema.json (100%) rename src/lib/schematics/{ => ng-generate}/address-form/schema.ts (100%) rename src/lib/schematics/{ => ng-generate}/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ (100%) rename src/lib/schematics/{ => ng-generate}/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html (100%) rename src/lib/schematics/{ => ng-generate}/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts (100%) rename src/lib/schematics/{ => ng-generate}/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts (100%) rename src/lib/schematics/{ => ng-generate}/dashboard/index.spec.ts (97%) rename src/lib/schematics/{ => ng-generate}/dashboard/index.ts (100%) rename src/lib/schematics/{ => ng-generate}/dashboard/schema.json (100%) rename src/lib/schematics/{ => ng-generate}/dashboard/schema.ts (100%) rename src/lib/schematics/{ => ng-generate}/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ (100%) rename src/lib/schematics/{ => ng-generate}/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html (100%) rename src/lib/schematics/{ => ng-generate}/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts (100%) rename src/lib/schematics/{ => ng-generate}/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts (100%) rename src/lib/schematics/{ => ng-generate}/nav/index.spec.ts (99%) rename src/lib/schematics/{ => ng-generate}/nav/index.ts (100%) rename src/lib/schematics/{ => ng-generate}/nav/schema.json (100%) rename src/lib/schematics/{ => ng-generate}/nav/schema.ts (100%) rename src/lib/schematics/{ => ng-generate}/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__-datasource.ts (100%) rename src/lib/schematics/{ => ng-generate}/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ (100%) rename src/lib/schematics/{ => ng-generate}/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html (100%) rename src/lib/schematics/{ => ng-generate}/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts (100%) rename src/lib/schematics/{ => ng-generate}/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts (100%) rename src/lib/schematics/{ => ng-generate}/table/index.spec.ts (99%) rename src/lib/schematics/{ => ng-generate}/table/index.ts (100%) rename src/lib/schematics/{ => ng-generate}/table/schema.json (100%) rename src/lib/schematics/{ => ng-generate}/table/schema.ts (100%) rename src/lib/schematics/{ => ng-generate}/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ (100%) rename src/lib/schematics/{ => ng-generate}/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html (100%) rename src/lib/schematics/{ => ng-generate}/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts (100%) rename src/lib/schematics/{ => ng-generate}/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts (100%) rename src/lib/schematics/{ => ng-generate}/tree/files/__path__/__name@dasherize@if-flat__/example-data.ts (100%) rename src/lib/schematics/{ => ng-generate}/tree/index.spec.ts (99%) rename src/lib/schematics/{ => ng-generate}/tree/index.ts (100%) rename src/lib/schematics/{ => ng-generate}/tree/schema.json (100%) rename src/lib/schematics/{ => ng-generate}/tree/schema.ts (100%) diff --git a/src/lib/schematics/BUILD.bazel b/src/lib/schematics/BUILD.bazel index 910f3ade779d..44ad2acee4e3 100644 --- a/src/lib/schematics/BUILD.bazel +++ b/src/lib/schematics/BUILD.bazel @@ -7,16 +7,16 @@ load("//tools:defaults.bzl", "jasmine_node_test") filegroup( name = "schematics_assets", - srcs = glob(["**/files/**/*", "**/*.json"]), + srcs = glob(["ng-generate/*/files/**/*", "**/*.json"]), ) ts_library( name = "schematics", module_name = "@angular/material/schematics", srcs = glob(["**/*.ts"], exclude=[ - "**/files/**/*.ts", "**/*.spec.ts", - "ng-update/test-cases/**/*", + "ng-update/test-cases/**/*.ts", + "ng-generate/*/files/**/*.ts", ]), deps = [ "//src/cdk/schematics", @@ -49,7 +49,7 @@ jasmine_node_test( ts_library( name = "schematics_test_sources", - srcs = glob(["**/*.spec.ts"], exclude=["**/files/**/*.spec.ts"]), + srcs = glob(["**/*.spec.ts"], exclude=["ng-generate/*/files/**/*.spec.ts"]), deps = [ ":schematics", "//src/cdk/schematics", diff --git a/src/lib/schematics/collection.json b/src/lib/schematics/collection.json index 8bcff88a1525..47ee0fe3b982 100644 --- a/src/lib/schematics/collection.json +++ b/src/lib/schematics/collection.json @@ -18,36 +18,36 @@ // Create a dashboard component "dashboard": { "description": "Create a card-based dashboard component", - "factory": "./dashboard/index", - "schema": "./dashboard/schema.json", + "factory": "./ng-generate/dashboard/index", + "schema": "./ng-generate/dashboard/schema.json", "aliases": ["material-dashboard"] }, // Creates a table component "table": { "description": "Create a component that displays data with a data-table", - "factory": "./table/index", - "schema": "./table/schema.json", + "factory": "./ng-generate/table/index", + "schema": "./ng-generate/table/schema.json", "aliases": ["material-table"] }, // Creates toolbar and navigation components "nav": { "description": "Create a component with a responsive sidenav for navigation", - "factory": "./nav/index", - "schema": "./nav/schema.json", + "factory": "./ng-generate/nav/index", + "schema": "./ng-generate/nav/schema.json", "aliases": ["material-nav", "materialNav"] }, // Create a file tree component "tree": { "description": "Create a file tree component.", - "factory": "./tree/index", - "schema": "./tree/schema.json", + "factory": "./ng-generate/tree/index", + "schema": "./ng-generate/tree/schema.json", "aliases": ["material-tree"] }, // Creates a address form component "addressForm": { "description": "Create a component with a address form", - "factory": "./address-form/index", - "schema": "./address-form/schema.json", + "factory": "./ng-generate/address-form/index", + "schema": "./ng-generate/address-form/schema.json", "aliases": ["address-form", "material-address-form", "material-addressForm"] } } diff --git a/src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ b/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ similarity index 100% rename from src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ rename to src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ diff --git a/src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html b/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html similarity index 100% rename from src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html rename to src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html diff --git a/src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts b/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts similarity index 100% rename from src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts rename to src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts diff --git a/src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts similarity index 100% rename from src/lib/schematics/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts rename to src/lib/schematics/ng-generate/address-form/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts diff --git a/src/lib/schematics/address-form/index.spec.ts b/src/lib/schematics/ng-generate/address-form/index.spec.ts similarity index 99% rename from src/lib/schematics/address-form/index.spec.ts rename to src/lib/schematics/ng-generate/address-form/index.spec.ts index 8836c7a09c3f..e6f1b598a501 100644 --- a/src/lib/schematics/address-form/index.spec.ts +++ b/src/lib/schematics/ng-generate/address-form/index.spec.ts @@ -12,7 +12,7 @@ describe('Material address-form schematic', () => { }; beforeEach(() => { - runner = new SchematicTestRunner('schematics', require.resolve('../collection.json')); + runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); it('should create address-form files and add them to module', () => { diff --git a/src/lib/schematics/address-form/index.ts b/src/lib/schematics/ng-generate/address-form/index.ts similarity index 100% rename from src/lib/schematics/address-form/index.ts rename to src/lib/schematics/ng-generate/address-form/index.ts diff --git a/src/lib/schematics/address-form/schema.json b/src/lib/schematics/ng-generate/address-form/schema.json similarity index 100% rename from src/lib/schematics/address-form/schema.json rename to src/lib/schematics/ng-generate/address-form/schema.json diff --git a/src/lib/schematics/address-form/schema.ts b/src/lib/schematics/ng-generate/address-form/schema.ts similarity index 100% rename from src/lib/schematics/address-form/schema.ts rename to src/lib/schematics/ng-generate/address-form/schema.ts diff --git a/src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ b/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ similarity index 100% rename from src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ rename to src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ diff --git a/src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html b/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html similarity index 100% rename from src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html rename to src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html diff --git a/src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts b/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts similarity index 100% rename from src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts rename to src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts diff --git a/src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts similarity index 100% rename from src/lib/schematics/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts rename to src/lib/schematics/ng-generate/dashboard/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts diff --git a/src/lib/schematics/dashboard/index.spec.ts b/src/lib/schematics/ng-generate/dashboard/index.spec.ts similarity index 97% rename from src/lib/schematics/dashboard/index.spec.ts rename to src/lib/schematics/ng-generate/dashboard/index.spec.ts index 03fd31feab1c..7b303e8f8af8 100644 --- a/src/lib/schematics/dashboard/index.spec.ts +++ b/src/lib/schematics/ng-generate/dashboard/index.spec.ts @@ -12,7 +12,7 @@ describe('material-dashboard-schematic', () => { }; beforeEach(() => { - runner = new SchematicTestRunner('schematics', require.resolve('../collection.json')); + runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); it('should create dashboard files and add them to module', () => { @@ -40,8 +40,8 @@ describe('material-dashboard-schematic', () => { expect(moduleContent).toContain('MatButtonModule'); expect(moduleContent).toContain( - // tslint:disable-next-line - `import { MatGridListModule, MatCardModule, MatMenuModule, MatIconModule, MatButtonModule } from '@angular/material';`); + `import { MatGridListModule, MatCardModule, MatMenuModule, MatIconModule, MatButtonModule }` + + ` from '@angular/material';`); }); it('should throw if no name has been specified', () => { diff --git a/src/lib/schematics/dashboard/index.ts b/src/lib/schematics/ng-generate/dashboard/index.ts similarity index 100% rename from src/lib/schematics/dashboard/index.ts rename to src/lib/schematics/ng-generate/dashboard/index.ts diff --git a/src/lib/schematics/dashboard/schema.json b/src/lib/schematics/ng-generate/dashboard/schema.json similarity index 100% rename from src/lib/schematics/dashboard/schema.json rename to src/lib/schematics/ng-generate/dashboard/schema.json diff --git a/src/lib/schematics/dashboard/schema.ts b/src/lib/schematics/ng-generate/dashboard/schema.ts similarity index 100% rename from src/lib/schematics/dashboard/schema.ts rename to src/lib/schematics/ng-generate/dashboard/schema.ts diff --git a/src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ b/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ similarity index 100% rename from src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ rename to src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ diff --git a/src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html b/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html similarity index 100% rename from src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html rename to src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html diff --git a/src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts b/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts similarity index 100% rename from src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts rename to src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts diff --git a/src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts similarity index 100% rename from src/lib/schematics/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts rename to src/lib/schematics/ng-generate/nav/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts diff --git a/src/lib/schematics/nav/index.spec.ts b/src/lib/schematics/ng-generate/nav/index.spec.ts similarity index 99% rename from src/lib/schematics/nav/index.spec.ts rename to src/lib/schematics/ng-generate/nav/index.spec.ts index db07d4edeae4..28e1288521fe 100644 --- a/src/lib/schematics/nav/index.spec.ts +++ b/src/lib/schematics/ng-generate/nav/index.spec.ts @@ -12,7 +12,7 @@ describe('material-nav-schematic', () => { }; beforeEach(() => { - runner = new SchematicTestRunner('schematics', require.resolve('../collection.json')); + runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); it('should create nav files and add them to module', () => { diff --git a/src/lib/schematics/nav/index.ts b/src/lib/schematics/ng-generate/nav/index.ts similarity index 100% rename from src/lib/schematics/nav/index.ts rename to src/lib/schematics/ng-generate/nav/index.ts diff --git a/src/lib/schematics/nav/schema.json b/src/lib/schematics/ng-generate/nav/schema.json similarity index 100% rename from src/lib/schematics/nav/schema.json rename to src/lib/schematics/ng-generate/nav/schema.json diff --git a/src/lib/schematics/nav/schema.ts b/src/lib/schematics/ng-generate/nav/schema.ts similarity index 100% rename from src/lib/schematics/nav/schema.ts rename to src/lib/schematics/ng-generate/nav/schema.ts diff --git a/src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__-datasource.ts b/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__-datasource.ts similarity index 100% rename from src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__-datasource.ts rename to src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__-datasource.ts diff --git a/src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ b/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ similarity index 100% rename from src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ rename to src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ diff --git a/src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html b/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html similarity index 100% rename from src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html rename to src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html diff --git a/src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts b/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts similarity index 100% rename from src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts rename to src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts diff --git a/src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts similarity index 100% rename from src/lib/schematics/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts rename to src/lib/schematics/ng-generate/table/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts diff --git a/src/lib/schematics/table/index.spec.ts b/src/lib/schematics/ng-generate/table/index.spec.ts similarity index 99% rename from src/lib/schematics/table/index.spec.ts rename to src/lib/schematics/ng-generate/table/index.spec.ts index ece3d4d0087f..d0349ce23950 100644 --- a/src/lib/schematics/table/index.spec.ts +++ b/src/lib/schematics/ng-generate/table/index.spec.ts @@ -12,7 +12,7 @@ describe('material-table-schematic', () => { }; beforeEach(() => { - runner = new SchematicTestRunner('schematics', require.resolve('../collection.json')); + runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); it('should create table files and add them to module', () => { diff --git a/src/lib/schematics/table/index.ts b/src/lib/schematics/ng-generate/table/index.ts similarity index 100% rename from src/lib/schematics/table/index.ts rename to src/lib/schematics/ng-generate/table/index.ts diff --git a/src/lib/schematics/table/schema.json b/src/lib/schematics/ng-generate/table/schema.json similarity index 100% rename from src/lib/schematics/table/schema.json rename to src/lib/schematics/ng-generate/table/schema.json diff --git a/src/lib/schematics/table/schema.ts b/src/lib/schematics/ng-generate/table/schema.ts similarity index 100% rename from src/lib/schematics/table/schema.ts rename to src/lib/schematics/ng-generate/table/schema.ts diff --git a/src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ b/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ similarity index 100% rename from src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ rename to src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ diff --git a/src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html b/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html similarity index 100% rename from src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html rename to src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html diff --git a/src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts b/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts similarity index 100% rename from src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts rename to src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts diff --git a/src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts similarity index 100% rename from src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts rename to src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.ts diff --git a/src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/example-data.ts b/src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/example-data.ts similarity index 100% rename from src/lib/schematics/tree/files/__path__/__name@dasherize@if-flat__/example-data.ts rename to src/lib/schematics/ng-generate/tree/files/__path__/__name@dasherize@if-flat__/example-data.ts diff --git a/src/lib/schematics/tree/index.spec.ts b/src/lib/schematics/ng-generate/tree/index.spec.ts similarity index 99% rename from src/lib/schematics/tree/index.spec.ts rename to src/lib/schematics/ng-generate/tree/index.spec.ts index c3ad5c424bbe..cac159a66f2f 100644 --- a/src/lib/schematics/tree/index.spec.ts +++ b/src/lib/schematics/ng-generate/tree/index.spec.ts @@ -12,7 +12,7 @@ describe('Material tree schematic', () => { }; beforeEach(() => { - runner = new SchematicTestRunner('schematics', require.resolve('../collection.json')); + runner = new SchematicTestRunner('schematics', require.resolve('../../collection.json')); }); it('should create tree component files and add them to module', () => { diff --git a/src/lib/schematics/tree/index.ts b/src/lib/schematics/ng-generate/tree/index.ts similarity index 100% rename from src/lib/schematics/tree/index.ts rename to src/lib/schematics/ng-generate/tree/index.ts diff --git a/src/lib/schematics/tree/schema.json b/src/lib/schematics/ng-generate/tree/schema.json similarity index 100% rename from src/lib/schematics/tree/schema.json rename to src/lib/schematics/ng-generate/tree/schema.json diff --git a/src/lib/schematics/tree/schema.ts b/src/lib/schematics/ng-generate/tree/schema.ts similarity index 100% rename from src/lib/schematics/tree/schema.ts rename to src/lib/schematics/ng-generate/tree/schema.ts diff --git a/src/lib/schematics/tsconfig.json b/src/lib/schematics/tsconfig.json index 427c18d3cb0a..b6488d765562 100644 --- a/src/lib/schematics/tsconfig.json +++ b/src/lib/schematics/tsconfig.json @@ -26,11 +26,11 @@ "exclude": [ "**/*.spec.ts", // Exclude the test-setup utility files. Those should not be part of the output. - "test-setup/**/*", + "test-setup/**/*.ts", // Exclude template files that will be copied by the schematics. Those are not valid TS. - "*/files/**/*", + "ng-generate/*/files/**/*.ts", // Exclude all test-case files because those should not be included in the schematics output. - "ng-update/test-cases/**/*" + "ng-update/test-cases/**/*.ts" ], "bazelOptions": { "suppressTsconfigOverrideWarnings": true diff --git a/tslint.json b/tslint.json index 9b641777a4b5..62faa1edba33 100644 --- a/tslint.json +++ b/tslint.json @@ -134,8 +134,8 @@ "linterOptions": { "exclude": [ // Exclude schematic template files and test cases that can't be linted. - "src/lib/schematics/**/files/**/*", - "src/cdk/schematics/**/files/**/*", + "src/lib/schematics/ng-generate/*/files/**/*", + "src/cdk/schematics/ng-generate/*/files/**/*", "src/cdk/schematics/ng-update/test-cases/**/*", "src/lib/schematics/ng-update/test-cases/**/*" ]