fix(@schematics/angular): Validate to prevent additional properties

Brocco · filipesilva · commit a44d76aa3360 · 2018-05-24T21:12:02.000+01:00
fixes angular/angular-cli#10722
diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
@@ -17,7 +17,6 @@ import {
 import * as ts from 'typescript';
 import {
   WorkspaceProject,
-  WorkspaceSchema,
   WorkspaceTool,
 } from '../../../angular_devkit/core/src/workspace/workspace-schema';
 import { Schema as ComponentOptions } from '../component/schema';
@@ -171,12 +170,16 @@ function addUniversalTarget(options: AppShellOptions): Rule {
     // Copy options.
     const universalOptions = {
       ...options,
-      name: options.universalProject,
     };
 
     // Delete non-universal options.
     delete universalOptions.universalProject;
     delete universalOptions.route;
+    delete universalOptions.name;
+    delete universalOptions.outDir;
+    delete universalOptions.root;
+    delete universalOptions.index;
+    delete universalOptions.sourceDir;
 
     return schematic('universal', universalOptions)(host, context);
   };
diff --git a/packages/schematics/angular/app-shell/schema.json b/packages/schematics/angular/app-shell/schema.json
@@ -17,9 +17,6 @@
       "description": "Route path used to produce the app shell.",
       "default": "shell"
     },
-
-
-
     "name": {
       "type": "string",
       "format": "html-selector",
@@ -101,5 +98,6 @@
   "required": [
     "clientProject",
     "universalProject"
-  ]
+  ],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
@@ -63,5 +63,6 @@
       "description": "Do not add dependencies to package.json."
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
@@ -36,5 +36,6 @@
       "default": ""
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
@@ -100,5 +100,6 @@
       "description": "Specifies if declaring module exports the component."
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
@@ -70,5 +70,6 @@
       "description": "Specifies if declaring module exports the directive."
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/e2e/schema.json b/packages/schematics/angular/e2e/schema.json
@@ -30,5 +30,6 @@
   },
   "required": [
     "relatedAppName"
-  ]
+  ],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
@@ -26,5 +26,6 @@
       }
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
@@ -36,5 +36,6 @@
       }
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
@@ -39,5 +39,6 @@
       }
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
@@ -101,7 +101,7 @@ describe('Library Schematic', () => {
 
   it('should set the prefix correctly', () => {
     const options = { ...defaultOptions, prefix: 'pre' };
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
 
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('pre');
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
@@ -36,5 +36,6 @@
       "description": "Do not update tsconfig.json for development experience."
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
@@ -58,5 +58,6 @@
       "alias": "m"
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
@@ -113,5 +113,6 @@
   },
   "required": [
     "version"
-  ]
+  ],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
@@ -52,5 +52,6 @@
       "description": "Specifies if declaring module exports the pipe."
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/service-worker/schema.json b/packages/schematics/angular/service-worker/schema.json
@@ -22,5 +22,6 @@
       "default": "production"
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
@@ -36,5 +36,6 @@
       "description": "Specifies if a spec file is generated."
     }
   },
-  "required": []
+  "required": [],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
@@ -61,5 +61,6 @@
   },
   "required": [
     "clientProject"
-  ]
+  ],
+  "additionalProperties": false
 }
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
@@ -70,5 +70,6 @@
   "required": [
     "name",
     "version"
-  ]
+  ],
+  "additionalProperties": false
 }

Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,6 @@`
`63`	`63`	`"description": "Do not add dependencies to package.json."`
`64`	`64`	`}`
`65`	`65`	`},`
`66`		`- "required": []`
	`66`	`+ "required": [],`
	`67`	`+ "additionalProperties": false`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,6 @@`
`36`	`36`	`"default": ""`
`37`	`37`	`}`
`38`	`38`	`},`
`39`		`- "required": []`
	`39`	`+ "required": [],`
	`40`	`+ "additionalProperties": false`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,5 +100,6 @@`
`100`	`100`	`"description": "Specifies if declaring module exports the component."`
`101`	`101`	`}`
`102`	`102`	`},`
`103`		`- "required": []`
	`103`	`+ "required": [],`
	`104`	`+ "additionalProperties": false`
`104`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,5 +70,6 @@`
`70`	`70`	`"description": "Specifies if declaring module exports the directive."`
`71`	`71`	`}`
`72`	`72`	`},`
`73`		`- "required": []`
	`73`	`+ "required": [],`
	`74`	`+ "additionalProperties": false`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,6 @@`
`30`	`30`	`},`
`31`	`31`	`"required": [`
`32`	`32`	`"relatedAppName"`
`33`		`- ]`
	`33`	`+ ],`
	`34`	`+ "additionalProperties": false`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,6 @@`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`},`
`29`		`- "required": []`
	`29`	`+ "required": [],`
	`30`	`+ "additionalProperties": false`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,6 @@`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`},`
`42`		`- "required": []`
	`42`	`+ "required": [],`
	`43`	`+ "additionalProperties": false`
`43`	`44`	`}`