refactor(@schematics/angular): use schema format

filipesilva · hansl · commit 4fa016731544 · 2018-01-10T19:41:17.000-05:00
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
@@ -25,8 +25,7 @@ describe('App Shell Schematic', () => {
   let appTree: Tree;
   const appOptions: ApplicationOptions = {
     directory: '',
-    name: 'app',
-    prefix: '',
+    name: 'appshell-app',
     sourceDir: 'src',
     inlineStyle: false,
     inlineTemplate: false,
diff --git a/packages/schematics/angular/app-shell/schema.json b/packages/schematics/angular/app-shell/schema.json
@@ -22,64 +22,77 @@
 
     "name": {
       "type": "string",
+      "format": "app-name",
       "description": "Name of the universal app"
     },
     "appId": {
       "type": "string",
+      "format": "app-name",
       "description": "The appId to use withServerTransition.",
       "default": "serverApp"
     },
     "outDir": {
       "type": "string",
+      "format": "path",
       "description": "The output directory for build results.",
-      "default": "dist-server/"
+      "default": "dist-server"
     },
     "root": {
       "type": "string",
+      "format": "path",
       "description": "The root directory of the app.",
       "default": "src"
     },
     "index": {
       "type": "string",
+      "format": "path",
       "description": "Name of the index file",
       "default": "index.html"
     },
     "main": {
       "type": "string",
+      "format": "path",
       "description": "The name of the main entry-point file.",
       "default": "main.server.ts"
     },
     "test": {
       "type": "string",
+      "format": "path",
       "description": "The name of the test entry-point file."
     },
     "tsconfigFileName": {
       "type": "string",
+      "format": "path",
       "default": "tsconfig.server",
       "description": "The name of the TypeScript configuration file."
     },
     "testTsconfigFileName": {
       "type": "string",
+      "format": "path",
       "description": "The name of the TypeScript configuration file for tests.",
       "default": "tsconfig.spec"
     },
     "appDir": {
       "type": "string",
+      "format": "path",
       "description": "The name of the application directory.",
       "default": "app"
     },
     "rootModuleFileName": {
       "type": "string",
+      "format": "path",
       "description": "The name of the root module file",
       "default": "app.server.module.ts"
     },
     "rootModuleClassName": {
       "type": "string",
+      "format": "app-name",
       "description": "The name of the root module class.",
       "default": "AppServerModule"
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "alias": "sd"
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
@@ -19,7 +19,6 @@ describe('Application Schematic', () => {
   const defaultOptions: ApplicationOptions = {
     directory: 'foo',
     name: 'foo',
-    prefix: '',
     sourceDir: 'src',
     inlineStyle: false,
     inlineTemplate: false,
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
@@ -6,25 +6,29 @@
   "properties": {
     "directory": {
       "type": "string",
+      "format": "path",
       "description": "The directory name to create the app in.",
       "alias": "dir"
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path of the application.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "alias": "sd",
       "visible": false
     },
     "name": {
       "description": "The name of the application.",
-      "type": "string"
+      "type": "string",
+      "format": "app-name"
     },
     "inlineStyle": {
       "description": "Specifies if the style will be in the ts file.",
@@ -55,6 +59,7 @@
     },
     "prefix": {
       "type": "string",
+      "format": "html-selector",
       "description": "The prefix to apply to generated selectors.",
       "default": "app",
       "alias": "p"
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
@@ -10,18 +10,21 @@
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the class.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     },
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
@@ -28,7 +28,7 @@ describe('Component Schematic', () => {
     spec: true,
     module: undefined,
     export: false,
-    prefix: undefined,
+    prefix: 'app',
   };
 
   let appTree: Tree;
@@ -175,18 +175,6 @@ describe('Component Schematic', () => {
     expect(files.indexOf(`${root}.ts`)).toBeGreaterThanOrEqual(0);
   });
 
-  it('should handle ".." in a path', () => {
-    const options = { ...defaultOptions, path: 'app/a/../c' };
-
-    const tree = schematicRunner.runSchematic('component', options, appTree);
-    const files = tree.files;
-    const root = `/src/app/c/foo/foo.component`;
-    expect(files.indexOf(`${root}.css`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.html`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.spec.ts`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.ts`)).toBeGreaterThanOrEqual(0);
-  });
-
   it('should use the prefix', () => {
     const options = { ...defaultOptions, prefix: 'pre' };
 
@@ -196,7 +184,7 @@ describe('Component Schematic', () => {
   });
 
   it('should not use a prefix if none is passed', () => {
-    const options = { ...defaultOptions, prefix: '' };
+    const options = { ...defaultOptions, prefix: undefined };
 
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const content = getFileContent(tree, '/src/app/foo/foo.component.ts');
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
@@ -6,19 +6,22 @@
   "properties": {
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the component.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "alias": "sd",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     },
@@ -53,8 +56,8 @@
     },
     "prefix": {
       "type": "string",
+      "format": "html-selector",
       "description": "The prefix to apply to generated selectors.",
-      "default": "app",
       "alias": "p"
     },
     "styleext": {
@@ -79,6 +82,7 @@
     },
     "selector": {
       "type": "string",
+      "format": "html-selector",
       "description": "The selector to use for the component."
     },
     "module":  {
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
@@ -10,23 +10,27 @@
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the directive.",
       "default": "app",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     },
     "prefix": {
       "type": "string",
+      "format": "html-selector",
       "description": "The prefix to apply to generated selectors.",
       "default": "app",
       "alias": "p"
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "visible": false
@@ -43,6 +47,7 @@
     },
     "selector": {
       "type": "string",
+      "format": "html-selector",
       "description": "The selector to use for the directive."
     },
     "flat": {
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
@@ -10,18 +10,21 @@
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the enum.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     }
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
@@ -21,23 +21,25 @@
     "module":  {
       "type": "string",
       "description": "Allows specification of the declaring module.",
-      "alias": "m",
-      "subtype": "filepath"
+      "alias": "m"
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the guard.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     }
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
@@ -10,18 +10,21 @@
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the interface.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     },
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
@@ -10,18 +10,21 @@
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the module.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     },
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
@@ -10,18 +10,21 @@
     },
     "path": {
       "type": "string",
+      "format": "path",
       "description": "The path to create the pipe.",
       "default": "app",
       "visible": false
     },
     "sourceDir": {
       "type": "string",
+      "format": "path",
       "description": "The path of the source directory.",
       "default": "src",
       "visible": false
     },
     "appRoot": {
       "type": "string",
+      "format": "path",
       "description": "The root of the application.",
       "visible": false
     },
@@ -44,8 +47,7 @@
       "type": "string",
       "default": "",
       "description": "Allows specification of the declaring module.",
-      "alias": "m",
-      "subtype": "filepath"
+      "alias": "m"
     },
     "export": {
       "type": "boolean",
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
