Merge branch 'master' into master

Author: Bbbrinks

packages/@angular-cli/ast-tools/package.json

@@ -1,3 +1,5 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
@@ -7,7 +9,6 @@ const findParentModule = require('../../utilities/find-parent-module').default;
 const getFiles = Blueprint.prototype.files;
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 
 export default Blueprint.extend({
   description: '',

packages/@angular-cli/ast-tools/tsconfig.json

@@ -1,11 +1,12 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const findParentModule = require('../../utilities/find-parent-module').default;
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 

packages/@angular-cli/base-href-webpack/package.json

@@ -1,11 +1,12 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const findParentModule = require('../../utilities/find-parent-module').default;
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 

packages/@angular-cli/base-href-webpack/tsconfig.json

@@ -1,11 +1,11 @@
+import {NodeHost} from '../../lib/ast-tools';
 import { oneLine } from 'common-tags';
 
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const getFiles = Blueprint.prototype.files;

packages/@angular/cli/blueprints/component/index.ts

@@ -2,7 +2,7 @@ import * as webpack from 'webpack';
 import * as path from 'path';
 import { GlobCopyWebpackPlugin } from '../../plugins/glob-copy-webpack-plugin';
 import { packageChunkSort } from '../../utilities/package-chunk-sort';
-import { BaseHrefWebpackPlugin } from '@angular-cli/base-href-webpack';
+import { BaseHrefWebpackPlugin } from '../../lib/base-href-webpack';
 import { extraEntryParser, lazyChunksFilter, getOutputHashFormat } from './utils';
 import { WebpackConfigOptions } from '../webpack-config';
 

packages/@angular/cli/blueprints/directive/index.ts

@@ -26,11 +26,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-cli/ast-tools": "^1.0.14",
-    "@angular-cli/base-href-webpack": "^1.0.14",
     "@angular/compiler": "^2.3.1",
     "@angular/compiler-cli": "^2.3.1",
     "@angular/core": "^2.3.1",
+    "@angular/tsc-wrapped": "^0.5.0",
     "@ngtools/json-schema": "^1.0.0",
     "@ngtools/webpack": "^1.2.3",
     "async": "^2.1.4",
@@ -74,6 +73,7 @@
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",
     "rsvp": "^3.0.17",
+    "rxjs": "^5.0.1",
     "sass-loader": "^4.1.1",
     "script-loader": "^0.7.0",
     "semver": "^5.1.0",

packages/@angular/cli/blueprints/pipe/index.ts

@@ -20,9 +20,6 @@
     ],
     "baseUrl": "",
     "paths": {
-      "@angular-cli/ast-tools": [ "../../../dist/@angular-cli/ast-tools/src" ],
-      "@angular-cli/base-href-webpack": [ "../../../dist/@angular-cli/base-href-webpack/src" ],
-      "@angular-cli/version": [ "../../../dist/@angular-cli/version/src" ],
       "@ngtools/json-schema": [ "../../../dist/@ngtools/json-schema/src" ],
       "@ngtools/webpack": [ "../../../dist/@ngtools/webpack/src" ]
     }

packages/@angular/cli/blueprints/service/index.ts

@@ -1,4 +1,5 @@
 chore: initial commit from @angular/cli
+
                           _                      _ _ 
    __ _ _ __   __ _ _   _| | __ _ _ __       ___| (_)
   / _  |  _ \ / _  | | | | |/ _  |  __|____ / __| | |

packages/@angular-cli/ast-tools/src/ast-utils.spec.ts renamed to packages/@angular/cli/lib/ast-tools/ast-utils.spec.ts

@@ -10,4 +10,4 @@ export {
   addDeclarationToModule,
   addProviderToModule,
   addExportToModule
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';

packages/@angular-cli/ast-tools/src/ast-utils.ts renamed to packages/@angular/cli/lib/ast-tools/ast-utils.ts

@@ -5,4 +5,4 @@ export {
   InsertChange,
   RemoveChange,
   ReplaceChange
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';

packages/@angular-cli/ast-tools/src/change.spec.ts renamed to packages/@angular/cli/lib/ast-tools/change.spec.ts

@@ -6,7 +6,7 @@ import * as dependentFilesUtils from './get-dependent-files';
 
 
 import {Change, ReplaceChange} from './change';
-import {NodeHost, Host} from '@angular-cli/ast-tools';
+import {NodeHost, Host} from '../lib/ast-tools';
 
 /**
  * Rewrites import module of dependent files when the file is moved.

packages/@angular-cli/ast-tools/src/change.ts renamed to packages/@angular/cli/lib/ast-tools/change.ts

@@ -8,4 +8,4 @@ export {
   confirmComponentExport,
   resolveComponentPath,
   applyChanges
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';

packages/@angular-cli/ast-tools/src/index.ts renamed to packages/@angular/cli/lib/ast-tools/index.ts

@@ -60,6 +60,16 @@ describe('@ngtools/json-schema', () => {
       proto.a[1] = 'INVALID';
       expect(proto.a).toEqual(['v2', null, null, 'v3']);
     });
+
+    it('supports default values', () => {
+      const proto: any = Object.create(null);
+      const schema = new RootSchemaTreeNode(proto, {
+        value: valueJson,
+        schema: schemaJson
+      });
+
+      expect(schema.children['b'].get()).toEqual('default');
+    });
   });
 
 });

packages/@angular-cli/ast-tools/src/node.ts renamed to packages/@angular/cli/lib/ast-tools/node.ts

@@ -97,7 +97,7 @@ export abstract class SchemaTreeNode<T> implements SchemaNode {
   get itemPrototype(): SchemaTreeNode<any> | null { return null; }
 
   abstract get(): T;
-  set(v: T, force = false) {
+  set(v: T, init = false, force = false) {
     if (!this.readOnly) {
       throw new MissingImplementationError();
     }
@@ -220,10 +220,10 @@ export class OneOfSchemaTreeNode extends NonLeafSchemaTreeNode<any> {
     }
 
     this._currentTypeHolder = proto;
-    this._currentTypeHolder.set(v, true);
+    this._currentTypeHolder.set(v, false, true);
   }
 
-  set(v: any, force = false) {
+  set(v: any, init = false, force = false) {
     return this._set(v, false, force);
   }
 
@@ -338,7 +338,6 @@ export class ArraySchemaTreeNode extends NonLeafSchemaTreeNode<Array<any>> {
     const schema = this._schema;
     const forward = this._forward;
 
-    this._defined = !!value;
     this._value = Object.create(null);
     this._dirty = this._dirty || !init;
 
@@ -361,8 +360,8 @@ export class ArraySchemaTreeNode extends NonLeafSchemaTreeNode<Array<any>> {
     }
   }
 
-  set(v: any, force = false) {
-    return this._set(v, false, force);
+  set(v: any, init = false, force = false) {
+    return this._set(v, init, force);
   }
 
   isCompatible(v: any) { return Array.isArray(v); }
@@ -395,7 +394,7 @@ export class RootSchemaTreeNode extends ObjectSchemaTreeNode {
 
 /** A leaf in the schema tree. Must contain a single primitive value. */
 export abstract class LeafSchemaTreeNode<T> extends SchemaTreeNode<T> {
-  private _default: T;
+  protected _default: T;
 
   constructor(metaData: TreeNodeConstructorArgument<T>) {
     super(metaData);
@@ -410,13 +409,13 @@ export abstract class LeafSchemaTreeNode<T> extends SchemaTreeNode<T> {
       return this._forward.get();
     }
     if (!this.defined) {
-      return this._default !== undefined ? this._default : undefined;
+      return 'default' in this._schema ? this._default : undefined;
     }
     return this._value === undefined
       ? undefined
       : (this._value === null ? null : this.convert(this._value));
   }
-  set(v: T, force = false) {
+  set(v: T, init = false, force = false) {
     if (this.readOnly && !force) {
       throw new SettingReadOnlyPropertyError();
     }
@@ -428,7 +427,7 @@ export abstract class LeafSchemaTreeNode<T> extends SchemaTreeNode<T> {
       }
     }
 
-    this.dirty = true;
+    this.dirty = !init;
     this._value = convertedValue;
   }
 
@@ -438,7 +437,10 @@ export abstract class LeafSchemaTreeNode<T> extends SchemaTreeNode<T> {
   }
 
   get defaultValue(): T {
-    return 'default' in this._schema ? this._default : null;
+    return this.hasDefault ? this._default : null;
+  }
+  get hasDefault() {
+    return 'default' in this._schema;
   }
 
   abstract convert(v: any): T;
@@ -462,20 +464,20 @@ class StringSchemaTreeNode extends LeafSchemaTreeNode<string> {
 
 
 class EnumSchemaTreeNode extends StringSchemaTreeNode {
-  private _enumValues: string[];
-
   constructor(metaData: TreeNodeConstructorArgument<string>) {
     super(metaData);
 
     if (!Array.isArray(metaData.schema['enum'])) {
       throw new InvalidSchema();
     }
-    this._enumValues = [].concat(metaData.schema['enum']);
-    this.set(metaData.value, true);
+    if (this.hasDefault && !this._isInEnum(this._default)) {
+      throw new InvalidSchema();
+    }
+    this.set(metaData.value, true, true);
   }
 
   protected _isInEnum(value: string) {
-    return this._enumValues.some(v => v === value);
+    return this._schema['enum'].some((v: string) => v === value);
   }
 
   isCompatible(v: any) {

packages/@angular-cli/ast-tools/src/route-utils.spec.ts renamed to packages/@angular/cli/lib/ast-tools/route-utils.spec.ts

@@ -8,6 +8,10 @@
       "items": {
         "enum": [ "v1", "v2", "v3" ]
       }
+    },
+    "b": {
+      "enum": [ "default", "v1", "v2" ],
+      "default": "default"
     }
   }
 }

packages/@angular-cli/ast-tools/src/route-utils.ts renamed to packages/@angular/cli/lib/ast-tools/route-utils.ts

@@ -1,8 +1,8 @@
 {
   "a": [
-    null,
+    "v2",
     "v1",
-    null,
+    "v2",
     "v3"
   ]
 }

packages/@angular-cli/ast-tools/src/spec-utils.ts renamed to packages/@angular/cli/lib/ast-tools/spec-utils.ts

@@ -192,6 +192,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   invalidate(fileName: string): void {
+    fileName = this._resolve(fileName);
     if (fileName in this._files) {
       this._files[fileName] = null;
       this._changedFiles[fileName] = true;