feat(@angular/cli): use devkit core formats for schematics

Followup to angular/devkit#334

Author: filipesilva

package.json

@@ -42,6 +42,7 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular-devkit/build-optimizer": "~0.0.37",
+    "@angular-devkit/core": "~0.0.24",
     "@angular-devkit/schematics": "~0.0.45",
     "@schematics/angular": "~0.1.12",
     "autoprefixer": "^7.2.3",

packages/@angular/cli/commands/generate.ts

@@ -148,7 +148,7 @@ export default Command.extend({
       dryRun: commandOptions.dryRun
     };
     const parsedPath = dynamicPathParser(dynamicPathOptions);
-    commandOptions.sourceDir = parsedPath.sourceDir;
+    commandOptions.sourceDir = parsedPath.sourceDir.replace(separatorRegEx, '/');
     const root = parsedPath.sourceDir + path.sep;
     commandOptions.appRoot = parsedPath.appRoot === parsedPath.sourceDir ? '' :
       parsedPath.appRoot.startsWith(root)

packages/@angular/cli/package.json

@@ -28,6 +28,7 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular-devkit/build-optimizer": "~0.0.37",
+    "@angular-devkit/core": "~0.0.24",
     "@angular-devkit/schematics": "~0.0.45",
     "@ngtools/json-schema": "1.1.0",
     "@ngtools/webpack": "1.10.0-beta.0",

packages/@angular/cli/tasks/schematic-run.ts

@@ -173,7 +173,7 @@ function prepOptions(schematic: Schematic<{}, {}>, options: SchematicOptions): S
   const keys = Object.keys(properties);
   if (['component', 'c', 'directive', 'd'].indexOf(schematic.description.name) !== -1) {
     options.prefix = (options.prefix === 'false' || options.prefix === '')
-      ? '' : options.prefix;
+      ? undefined : options.prefix;
   }
 
   let preppedOptions = {

packages/@angular/cli/utilities/schematics.ts

@@ -5,16 +5,19 @@
  * require('@schematics/angular')
  */
 
+import { schema } from '@angular-devkit/core';
 import {
   Collection,
   Engine,
   Schematic,
   SchematicEngine,
+  formats,
 } from '@angular-devkit/schematics';
 import {
   FileSystemCollectionDesc,
   FileSystemSchematicDesc,
-  NodeModulesEngineHost
+  NodeModulesEngineHost,
+  validateOptionsWithSchema
 } from '@angular-devkit/schematics/tools';
 import { SchemaClassFactory } from '@ngtools/json-schema';
 import 'rxjs/add/operator/concatMap';
@@ -26,6 +29,10 @@ const engineHost = new NodeModulesEngineHost();
 const engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>
   = new SchematicEngine(engineHost);
 
+// Add support for schemaJson.
+const registry = new schema.CoreSchemaRegistry(formats.standardFormats);
+engineHost.registerOptionsTransform(validateOptionsWithSchema(registry));
+
 
 export function getEngineHost() {
   return engineHost;