feat(decorators): adds decorators to be used by TS and Babel transpiled apps.

modules/angular2/annotations.js

@@ -9,3 +9,4 @@
  *
  */
 export * from './src/core/annotations/annotations';
+export * from './src/core/decorators/decorators';

modules/angular2/globals.ts

@@ -21,4 +21,5 @@ interface Window {
   assert: typeof assert;
   NaN: typeof NaN;
   gc(): void;
+  Reflect: any;
 }

modules/angular2/src/core/annotations/annotations.dart

@@ -0,0 +1,8 @@
+/**
+ * This indirection is needed for TS compilation path.
+ * See comment in annotations.es6.
+ */
+
+library angular2.core.annotations.annotations;
+
+export "../annotations_impl/annotations.dart";

modules/angular2/src/core/annotations/annotations.es6

@@ -0,0 +1,13 @@
+/**
+ * This indirection is needed to free up Component, etc symbols in the public API
+ * to be used by the decorator versions of these annotations.
+ */
+
+export {
+  Component as ComponentAnnotation,
+  Decorator as DecoratorAnnotation,
+  Directive as DirectiveAnnotation,
+  DynamicComponent as DynamicComponentAnnotation,
+  Viewport as ViewportAnnotation,
+  onDestroy, onChange, onAllChangesDone
+} from '../annotations_impl/annotations';

modules/angular2/src/core/annotations/di.dart

@@ -0,0 +1,3 @@
+library angular2.core.annotations.di;
+
+export "../annotations_impl/di.dart";

modules/angular2/src/core/annotations/di.es6

@@ -0,0 +1,4 @@
+export {
+  Query as QueryAnnotation,
+  Attribute as AttributeAnnotation,
+} from '../annotations_impl/di';

modules/angular2/src/core/annotations/view.dart

@@ -0,0 +1,3 @@
+library angular2.core.annotations.view;
+
+export "../annotations_impl/view.dart";

modules/angular2/src/core/annotations/view.es6

@@ -0,0 +1,3 @@
+export {
+  View as ViewAnnotation,
+  } from '../annotations_impl/view';

modules/angular2/src/core/annotations/visibility.dart

@@ -0,0 +1,3 @@
+library angular2.core.annotations.visibility;
+
+export "../annotations_impl/visibility.dart";

modules/angular2/src/core/annotations/visibility.es6

@@ -0,0 +1,4 @@
+export {
+  Ancestor as AncestorAnnotation,
+  Parent as ParentAnnotation,
+  } from '../annotations_impl/visibility';

modules/angular2/src/core/compiler/base_query_list.dart

@@ -1,6 +1,6 @@
 library angular2.src.core.compiler.base_query_list;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 import 'dart:collection';
 
 /**

modules/angular2/src/core/compiler/base_query_list.es6

@@ -1,5 +1,5 @@
 import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Directive} from 'angular2/src/core/annotations/annotations';
+import {Directive} from 'angular2/src/core/annotations_impl/annotations';
 
 /**
  * Injectable Objects that contains a live list of child directives in the light Dom of a directive.

modules/angular2/src/core/compiler/compiler.js

@@ -4,12 +4,12 @@ import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
 
 import {DirectiveMetadataReader} from './directive_metadata_reader';
-import {Component, Viewport, DynamicComponent, Decorator} from '../annotations/annotations';
+import {Component, Viewport, DynamicComponent, Decorator} from '../annotations_impl/annotations';
 import {AppProtoView} from './view';
 import {ProtoViewRef} from './view_ref';
 import {DirectiveBinding} from './element_injector';
 import {TemplateResolver} from './template_resolver';
-import {View} from '../annotations/view';
+import {View} from '../annotations_impl/view';
 import {ComponentUrlMapper} from './component_url_mapper';
 import {ProtoViewFactory} from './proto_view_factory';
 import {UrlResolver} from 'angular2/src/services/url_resolver';

modules/angular2/src/core/compiler/directive_metadata.js

@@ -1,6 +1,6 @@
 import {Type} from 'angular2/src/facade/lang';
 import {List} from 'angular2/src/facade/collection';
-import {Directive} from 'angular2/src/core/annotations/annotations'
+import {Directive} from 'angular2/src/core/annotations_impl/annotations'
 import {ResolvedBinding} from 'angular2/di';
 
 /**

modules/angular2/src/core/compiler/directive_metadata_reader.js

@@ -1,6 +1,6 @@
 import {Injectable, Injector} from 'angular2/di';
 import {Type, isPresent, BaseException, stringify} from 'angular2/src/facade/lang';
-import {Directive, Component} from '../annotations/annotations';
+import {Directive, Component} from '../annotations_impl/annotations';
 import {DirectiveMetadata} from './directive_metadata';
 import {reflector} from 'angular2/src/reflection/reflection';
 

modules/angular2/src/core/compiler/element_injector.js

@@ -4,14 +4,14 @@ import {Math} from 'angular2/src/facade/math';
 import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 import {Injector, Key, Dependency, bind, Binding, ResolvedBinding, NoBindingError,
   AbstractBindingError, CyclicDependencyError} from 'angular2/di';
-import {Parent, Ancestor} from 'angular2/src/core/annotations/visibility';
-import {Attribute, Query} from 'angular2/src/core/annotations/di';
+import {Parent, Ancestor} from 'angular2/src/core/annotations_impl/visibility';
+import {Attribute, Query} from 'angular2/src/core/annotations_impl/di';
 import * as viewModule from './view';
 import * as avmModule from './view_manager';
 import {ViewContainerRef} from './view_container_ref';
 import {ElementRef} from './element_ref';
 import {ProtoViewRef, ViewRef} from './view_ref';
-import {Directive, Component, onChange, onDestroy, onAllChangesDone} from 'angular2/src/core/annotations/annotations';
+import {Directive, Component, onChange, onDestroy, onAllChangesDone} from 'angular2/src/core/annotations_impl/annotations';
 import {ChangeDetector, ChangeDetectorRef} from 'angular2/change_detection';
 import {QueryList} from './query_list';
 import {reflector} from 'angular2/src/reflection/reflection';

modules/angular2/src/core/compiler/proto_view_factory.js

@@ -4,7 +4,7 @@ import {isPresent, isBlank} from 'angular2/src/facade/lang';
 import {reflector} from 'angular2/src/reflection/reflection';
 
 import {ChangeDetection, DirectiveIndex} from 'angular2/change_detection';
-import {Component, Viewport, DynamicComponent} from '../annotations/annotations';
+import {Component, Viewport, DynamicComponent} from '../annotations_impl/annotations';
 
 import * as renderApi from 'angular2/src/render/api';
 import {AppProtoView} from './view';

modules/angular2/src/core/compiler/template_resolver.js

@@ -1,5 +1,5 @@
 import {Injectable} from 'angular2/di';
-import {View} from 'angular2/src/core/annotations/view';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {Type, stringify, isBlank, BaseException} from 'angular2/src/facade/lang';
 import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/facade/collection';

modules/angular2/src/core/decorators/decorators.dart

@@ -0,0 +1,3 @@
+library angular2.core.decorators;
+
+/* This file is empty because, Dart does not have decorators. */

modules/angular2/src/core/decorators/decorators.es6

@@ -0,0 +1,40 @@
+import {
+  ComponentAnnotation,
+  DecoratorAnnotation,
+  DynamicComponentAnnotation,
+  ViewportAnnotation} from '../annotations/annotations';
+import {ViewAnnotation} from '../annotations/view';
+import {AncestorAnnotation, ParentAnnotation} from '../annotations/visibility';
+import {AttributeAnnotation, QueryAnnotation} from '../annotations/di';
+
+function makeDecorator(annotationCls) {
+  return function(...args) {
+    if (!(window.Reflect && !window.Reflect.getMetadata)) throw 'reflect-metadata shim is required';
+    var annotationInstance = new annotationCls(...args);
+    var Reflect = window.Reflect;
+    return function(cls) {
+      var annotations = Reflect.getMetadata('annotations', cls);
+      annotations = annotations || [];
+      annotations.push(annotationInstance);
+      Reflect.defineMetadata('annotations', annotations, cls);
+      return cls;
+    }
+  }
+}
+
+/* from annotations */
+export var Component = makeDecorator(ComponentAnnotation);
+export var Decorator = makeDecorator(DecoratorAnnotation);
+export var DynamicComponent = makeDecorator(DynamicComponentAnnotation);
+export var Viewport = makeDecorator(ViewportAnnotation);
+
+/* from di */
+export var Attribute = makeDecorator(AttributeAnnotation);
+export var Query = makeDecorator(QueryAnnotation);
+
+/* from view */
+export var View = makeDecorator(ViewAnnotation);
+
+/* from visiblity */
+export var Ancestor = makeDecorator(AncestorAnnotation);
+export var Parent = makeDecorator(ParentAnnotation);

modules/angular2/src/directives/class.js

@@ -1,4 +1,4 @@
-import {Decorator} from 'angular2/src/core/annotations/annotations';
+import {Decorator} from 'angular2/src/core/annotations_impl/annotations';
 import {isPresent} from 'angular2/src/facade/lang';
 import {DOM} from 'angular2/src/dom/dom_adapter';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';

modules/angular2/src/directives/for.js

@@ -1,4 +1,4 @@
-import {Viewport} from 'angular2/src/core/annotations/annotations';
+import {Viewport} from 'angular2/src/core/annotations_impl/annotations';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {ViewRef} from 'angular2/src/core/compiler/view_ref';
 import {isPresent, isBlank} from 'angular2/src/facade/lang';

modules/angular2/src/directives/if.js

@@ -1,4 +1,4 @@
-import {Viewport} from 'angular2/src/core/annotations/annotations';
+import {Viewport} from 'angular2/src/core/annotations_impl/annotations';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {isBlank} from 'angular2/src/facade/lang';
 

modules/angular2/src/directives/non_bindable.js

@@ -1,4 +1,4 @@
-import {Decorator} from 'angular2/src/core/annotations/annotations';
+import {Decorator} from 'angular2/src/core/annotations_impl/annotations';
 
 /**
  * The `NonBindable` directive tells Angular not to compile or bind the contents of the current

modules/angular2/src/directives/switch.js

@@ -1,8 +1,8 @@
-import {Decorator, Viewport} from 'angular2/src/core/annotations/annotations';
+import {Decorator, Viewport} from 'angular2/src/core/annotations_impl/annotations';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {isPresent, isBlank, normalizeBlank} from 'angular2/src/facade/lang';
 import {ListWrapper, List, MapWrapper, Map} from 'angular2/src/facade/collection';
-import {Parent} from 'angular2/src/core/annotations/visibility';
+import {Parent} from 'angular2/src/core/annotations_impl/visibility';
 
 /**
  * The `Switch` directive is used to conditionally swap DOM structure on your template based on a

modules/angular2/src/forms/directives.js

@@ -1,5 +1,5 @@
-import {Decorator, onChange} from 'angular2/src/core/annotations/annotations';
-import {Ancestor} from 'angular2/src/core/annotations/visibility';
+import {Decorator, onChange} from 'angular2/src/core/annotations_impl/annotations';
+import {Ancestor} from 'angular2/src/core/annotations_impl/visibility';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 import {Optional} from 'angular2/di';
 import {Renderer} from 'angular2/src/render/api';

modules/angular2/src/forms/validator_directives.js

@@ -1,4 +1,5 @@
-import {Decorator} from 'angular2/src/core/annotations/annotations';
+import {Decorator} from 'angular2/src/core/annotations_impl/annotations';
+
 import {Validators} from './validators';
 import {ControlDirective} from './directives';
 
@@ -9,4 +10,4 @@ export class RequiredValidatorDirective {
   constructor(c:ControlDirective) {
     c.validator = Validators.compose([c.validator, Validators.required]);
   }
-}
+}

modules/angular2/src/mock/template_resolver_mock.js

@@ -1,7 +1,7 @@
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 import {Type, isPresent, BaseException, stringify, isBlank} from 'angular2/src/facade/lang';
 
-import {View} from 'angular2/src/core/annotations/view';
+import {View} from 'angular2/src/core/annotations_impl/view';
 import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
 
 export class MockTemplateResolver extends TemplateResolver {

modules/angular2/src/reflection/reflection_capabilities.es6

@@ -33,13 +33,30 @@ export class ReflectionCapabilities {
   }
 
   parameters(typeOfFunc):List<List> {
-    return isPresent(typeOfFunc.parameters) ?
-      typeOfFunc.parameters :
-      ListWrapper.createFixedSize(typeOfFunc.length);
+    // Prefer the direct API.
+    if (isPresent(typeOfFunc.parameters)) {
+      return typeOfFunc.parameters;
+    }
+    if (isPresent(window.Reflect) && isPresent(window.Reflect.getMetadata)) {
+      var paramtypes = window.Reflect.getMetadata('design:paramtypes', typeOfFunc);
+      if (isPresent(paramtypes)) {
+        // TODO(rado): add parameter annotations here.
+        return paramtypes.map((p) => [p]);
+      }
+    }
+    return ListWrapper.createFixedSize(typeOfFunc.length);
   }
 
   annotations(typeOfFunc):List {
-    return isPresent(typeOfFunc.annotations) ? typeOfFunc.annotations : [];
+    // Prefer the direct API.
+    if (isPresent(typeOfFunc.annotations)) {
+      return typeOfFunc.annotations;
+    }
+    if (isPresent(window.Reflect) && isPresent(window.Reflect.getMetadata)) {
+      var annotations = window.Reflect.getMetadata('annotations', typeOfFunc);
+      if (isPresent(annotations)) return annotations;
+    }
+    return [];
   }
 
   getter(name:string):GetterFn {
@@ -56,4 +73,4 @@ export class ReflectionCapabilities {
       `if (!${method}) throw new Error('"${name}" is undefined');` +
       `return ${method}.apply(o, args);`);
   }
-}
+}

modules/angular2/src/reflection/reflection_capabilities.ts

@@ -1,4 +1,4 @@
-import {Type, isPresent} from 'angular2/src/facade/lang';
+import {Type, isPresent, global} from 'angular2/src/facade/lang';
 import {List, ListWrapper} from 'angular2/src/facade/collection';
 import {GetterFn, SetterFn, MethodFn} from './types';
 
@@ -46,12 +46,30 @@ export class ReflectionCapabilities {
   }
 
   parameters(typeOfFunc): List<List<any>> {
-    return isPresent(typeOfFunc.parameters) ? typeOfFunc.parameters :
-                                              ListWrapper.createFixedSize(typeOfFunc.length);
+    // Prefer the direct API.
+    if (isPresent(typeOfFunc.parameters)) {
+      return typeOfFunc.parameters;
+    }
+    if (isPresent(global.Reflect) && isPresent(global.Reflect.getMetadata)) {
+      var paramtypes = global.Reflect.getMetadata('design:paramtypes', typeOfFunc);
+      if (isPresent(paramtypes)) {
+        // TODO(rado): add parameter annotations here.
+        return paramtypes.map((p) => [p]);
+      }
+    }
+    return ListWrapper.createFixedSize(typeOfFunc.length);
   }
 
   annotations(typeOfFunc): List<any> {
-    return isPresent(typeOfFunc.annotations) ? typeOfFunc.annotations : [];
+    // Prefer the direct API.
+    if (isPresent(typeOfFunc.annotations)) {
+      return typeOfFunc.annotations;
+    }
+    if (isPresent(global.Reflect) && isPresent(global.Reflect.getMetadata)) {
+      var annotations = global.Reflect.getMetadata('annotations', typeOfFunc);
+      if (isPresent(annotations)) return annotations;
+    }
+    return [];
   }
 
   getter(name: string): GetterFn { return new Function('o', 'return o.' + name + ';'); }

modules/angular2/src/router/router_link.js

@@ -1,4 +1,4 @@
-import {Decorator} from 'angular2/annotations';
+import {Decorator} from 'angular2/src/core/annotations_impl/annotations';
 import {ElementRef} from 'angular2/core';
 
 import {isPresent} from 'angular2/src/facade/lang';

modules/angular2/src/router/router_outlet.js

@@ -1,6 +1,6 @@
 import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 
-import {Decorator} from 'angular2/annotations';
+import {Decorator} from 'angular2/src/core/annotations_impl/annotations';
 import {Compiler, ViewContainerRef} from 'angular2/core';
 import {Injector, bind} from 'angular2/di';
 

modules/angular2/src/test_lib/test_bed.js

@@ -5,7 +5,7 @@ import {Promise} from 'angular2/src/facade/async';
 import {isBlank} from 'angular2/src/facade/lang';
 import {List} from 'angular2/src/facade/collection';
 
-import {View} from 'angular2/src/core/annotations/view';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
 import {AppView} from 'angular2/src/core/compiler/view';

modules/angular2/test/core/annotations/annotations_spec.js

@@ -1,5 +1,5 @@
 import {ddescribe, describe, it, iit, expect, beforeEach} from 'angular2/test_lib';
-import {Directive, onChange} from 'angular2/src/core/annotations/annotations';
+import {Directive, onChange} from 'angular2/src/core/annotations_impl/annotations';
 
 class DummyDirective extends Directive {
   constructor({lifecycle} = {}) { super({lifecycle: lifecycle}); }

modules/angular2/test/core/application_spec.js

@@ -12,12 +12,12 @@ import {
 } from 'angular2/test_lib';
 import {bootstrap} from 'angular2/src/core/application';
 import {appDocumentToken, appElementToken} from 'angular2/src/core/application_tokens';
-import {Component, Decorator} from 'angular2/src/core/annotations/annotations';
+import {Component, Decorator} from 'angular2/src/core/annotations_impl/annotations';
 import {DOM} from 'angular2/src/dom/dom_adapter';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {PromiseWrapper} from 'angular2/src/facade/async';
 import {bind, Inject} from 'angular2/di';
-import {View} from 'angular2/src/core/annotations/view';
+import {View} from 'angular2/src/core/annotations_impl/view';
 import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
 import {Testability, TestabilityRegistry} from 'angular2/src/core/testability/testability';
 

modules/angular2/test/core/compiler/compiler_spec.js

@@ -21,9 +21,9 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
 import {AppProtoView} from 'angular2/src/core/compiler/view';
 import {ElementBinder} from 'angular2/src/core/compiler/element_binder';
 import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
-import {Component, DynamicComponent, Viewport, Decorator} from 'angular2/src/core/annotations/annotations';
-import {Attribute} from 'angular2/src/core/annotations/di';
-import {View} from 'angular2/src/core/annotations/view';
+import {Component, DynamicComponent, Viewport, Decorator} from 'angular2/src/core/annotations_impl/annotations';
+import {Attribute} from 'angular2/src/core/annotations_impl/di';
+import {View} from 'angular2/src/core/annotations_impl/view';
 import {internalProtoView} from 'angular2/src/core/compiler/view_ref';
 import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';

modules/angular2/test/core/compiler/directive_metadata_reader_spec.js

@@ -2,7 +2,7 @@ import {isPresent} from 'angular2/src/facade/lang';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {ddescribe, describe, it, iit, expect, beforeEach} from 'angular2/test_lib';
 import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
-import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
+import {Decorator, Component, Viewport} from 'angular2/src/core/annotations_impl/annotations';
 import {DirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata';
 import {Injectable, Injector} from 'angular2/di';
 

modules/angular2/test/core/compiler/dynamic_component_loader_spec.js

@@ -16,8 +16,8 @@ import {
 
 import {TestBed} from 'angular2/src/test_lib/test_bed';
 
-import {Decorator, Component, Viewport, DynamicComponent} from 'angular2/src/core/annotations/annotations';
-import {View} from 'angular2/src/core/annotations/view';
+import {Decorator, Component, Viewport, DynamicComponent} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 import {If} from 'angular2/src/directives/if';
@@ -304,4 +304,4 @@ class MyComp {
   constructor() {
     this.ctxBoolProp = false;
   }
-}
+}

modules/angular2/test/core/compiler/element_injector_spec.js

@@ -3,15 +3,14 @@ import {isBlank, isPresent, IMPLEMENTS} from 'angular2/src/facade/lang';
 import {ListWrapper, MapWrapper, List, StringMapWrapper, iterateListLike} from 'angular2/src/facade/collection';
 import {ProtoElementInjector, PreBuiltObjects, DirectiveBinding, TreeNode}
   from 'angular2/src/core/compiler/element_injector';
-import {Parent, Ancestor} from 'angular2/src/core/annotations/visibility';
-import {Attribute, Query} from 'angular2/src/core/annotations/di';
-import {onDestroy} from 'angular2/src/core/annotations/annotations';
+import {Parent, Ancestor} from 'angular2/src/core/annotations_impl/visibility';
+import {Attribute, Query} from 'angular2/src/core/annotations_impl/di';
+import {Directive, onDestroy} from 'angular2/src/core/annotations_impl/annotations';
 import {Optional, Injector, Inject, bind} from 'angular2/di';
 import {AppProtoView, AppView} from 'angular2/src/core/compiler/view';
 import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 import {ProtoViewRef} from 'angular2/src/core/compiler/view_ref';
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
-import {Directive} from 'angular2/src/core/annotations/annotations';
 import {DynamicChangeDetector, ChangeDetectorRef, Parser, Lexer} from 'angular2/change_detection';
 import {ViewRef, Renderer} from 'angular2/src/render/api';
 import {QueryList} from 'angular2/src/core/compiler/query_list';

modules/angular2/test/core/compiler/integration_spec.js

@@ -24,10 +24,10 @@ import {Injector, bind} from 'angular2/di';
 import {PipeRegistry, defaultPipeRegistry,
   ChangeDetection, DynamicChangeDetection, Pipe, ChangeDetectorRef, ON_PUSH} from 'angular2/change_detection';
 
-import {Decorator, Component, Viewport, DynamicComponent} from 'angular2/src/core/annotations/annotations';
-import {View} from 'angular2/src/core/annotations/view';
-import {Parent, Ancestor} from 'angular2/src/core/annotations/visibility';
-import {Attribute} from 'angular2/src/core/annotations/di';
+import {Decorator, Component, Viewport, DynamicComponent} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
+import {Parent, Ancestor} from 'angular2/src/core/annotations_impl/visibility';
+import {Attribute} from 'angular2/src/core/annotations_impl/di';
 
 import {If} from 'angular2/src/directives/if';
 

modules/angular2/test/core/compiler/query_integration_spec.js

@@ -15,9 +15,12 @@ import {
 import {TestBed} from 'angular2/src/test_lib/test_bed';
 
 import {QueryList} from 'angular2/src/core/compiler/query_list';
-import {Query} from 'angular2/src/core/annotations/di';
+import {Query} from 'angular2/src/core/annotations_impl/di';
 
-import {Decorator, Component, View, If, For} from 'angular2/angular2';
+import {If, For} from 'angular2/angular2';
+
+import {Component, Decorator} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
 

modules/angular2/test/core/compiler/view_manager_spec.js

@@ -25,7 +25,7 @@ import {Renderer, RenderViewRef, RenderProtoViewRef, RenderViewContainerRef} fro
 import {ElementBinder} from 'angular2/src/core/compiler/element_binder';
 import {DirectiveBinding, ElementInjector} from 'angular2/src/core/compiler/element_injector';
 import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
-import {Component} from 'angular2/src/core/annotations/annotations';
+import {Component} from 'angular2/src/core/annotations_impl/annotations';
 import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils';
 import {AppViewPool} from 'angular2/src/core/compiler/view_pool';

modules/angular2/test/core/compiler/view_manager_utils_spec.js

@@ -24,7 +24,7 @@ import {ChangeDetector} from 'angular2/change_detection';
 import {ElementBinder} from 'angular2/src/core/compiler/element_binder';
 import {DirectiveBinding, ElementInjector, ElementRef} from 'angular2/src/core/compiler/element_injector';
 import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
-import {Component} from 'angular2/src/core/annotations/annotations';
+import {Component} from 'angular2/src/core/annotations_impl/annotations';
 import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils';
 
 export function main() {

modules/angular2/test/directives/class_spec.js

@@ -15,8 +15,8 @@ import {
 
 import {StringMapWrapper} from 'angular2/src/facade/collection';
 
-import {View} from 'angular2/src/core/annotations/view';
-import {Component} from 'angular2/src/core/annotations/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
+import {Component} from 'angular2/src/core/annotations_impl/annotations';
 
 import {TestBed} from 'angular2/src/test_lib/test_bed';
 

modules/angular2/test/directives/for_spec.js

@@ -15,8 +15,8 @@ import {
 import {DOM} from 'angular2/src/dom/dom_adapter';
 import {ListWrapper} from 'angular2/src/facade/collection';
 
-import {Component} from 'angular2/src/core/annotations/annotations';
-import {View} from 'angular2/src/core/annotations/view';
+import {Component} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {For} from 'angular2/src/directives/for';
 

modules/angular2/test/directives/if_spec.js

@@ -16,8 +16,8 @@ import {DOM} from 'angular2/src/dom/dom_adapter';
 
 import {TestBed} from 'angular2/src/test_lib/test_bed';
 
-import {Component} from 'angular2/src/core/annotations/annotations';
-import {View} from 'angular2/src/core/annotations/view';
+import {Component} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {If} from 'angular2/src/directives/if';
 

modules/angular2/test/directives/non_bindable_spec.js

@@ -12,8 +12,8 @@ import {
 } from 'angular2/test_lib';
 import {DOM} from 'angular2/src/dom/dom_adapter';
 
-import {Decorator, Component} from 'angular2/src/core/annotations/annotations';
-import {View} from 'angular2/src/core/annotations/view';
+import {Decorator, Component} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {ElementRef} from 'angular2/src/core/compiler/element_ref';
 

modules/angular2/test/directives/switch_spec.js

@@ -12,8 +12,8 @@ import {
 } from 'angular2/test_lib';
 import {DOM} from 'angular2/src/dom/dom_adapter';
 
-import {Component} from 'angular2/src/core/annotations/annotations';
-import {View} from 'angular2/src/core/annotations/view';
+import {Component} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {Switch, SwitchWhen, SwitchDefault} from 'angular2/src/directives/switch';
 

modules/angular2/test/forms/integration_spec.js

@@ -16,7 +16,8 @@ import {DOM} from 'angular2/src/dom/dom_adapter';
 
 import {Inject} from 'angular2/di';
 
-import {Component, Decorator, View} from 'angular2/angular2';
+import {Component, Decorator} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {TestBed} from 'angular2/src/test_lib/test_bed';
 
@@ -25,7 +26,7 @@ import {ControlGroupDirective, ControlDirective, Control, ControlGroup, Required
 
 export function main() {
   describe("integration tests", () => {
-    
+
     it("should initialize DOM elements with the given form object",
       inject([TestBed, AsyncTestCompleter], (tb, async) => {
       var ctx = new MyComp(new ControlGroup({

modules/angular2/test/mock/template_resolver_mock_spec.js

@@ -10,8 +10,8 @@ import {
 
 import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
 
-import {Component} from 'angular2/src/core/annotations/annotations';
-import {View} from 'angular2/src/core/annotations/view';
+import {Component} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {isBlank} from 'angular2/src/facade/lang';
 

modules/angular2/test/router/outlet_spec.js

@@ -16,8 +16,8 @@ import {
 import {TestBed} from 'angular2/test';
 
 import {Injector, bind} from 'angular2/di';
-import {Component, Viewport} from 'angular2/annotations';
-import {View} from 'angular2/src/core/annotations/view';
+import {Component, Viewport} from 'angular2/src/core/annotations_impl/annotations';
+import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {RootRouter} from 'angular2/src/router/router';
 import {Pipeline} from 'angular2/src/router/pipeline';

modules/angular2/test/transform/bind_generator/basic_bind_files/bar.ng_deps.dart

@@ -1,7 +1,7 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/bind_generator/basic_bind_files/expected/bar.ng_deps.dart

@@ -1,7 +1,7 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/expected/soup.ng_deps.dart

@@ -1,6 +1,6 @@
 library dinner.soup.ng_deps.dart;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 import 'soup.dart';
 
 var _visited = false;

modules/angular2/test/transform/bind_generator/duplicate_bind_name_files/soup.ng_deps.dart

@@ -1,6 +1,6 @@
 library dinner.soup.ng_deps.dart;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 import 'soup.dart';
 
 var _visited = false;

modules/angular2/test/transform/directive_linker/simple_export_files/bar.ng_deps.dart

@@ -1,7 +1,7 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 export 'foo.dart';
 
 var _visited = false;

modules/angular2/test/transform/directive_linker/simple_export_files/expected/bar.ng_deps.dart

@@ -1,7 +1,7 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 export 'foo.dart';
 import 'foo.ng_deps.dart' as i0;
 

modules/angular2/test/transform/directive_linker/simple_export_files/expected/foo.ng_deps.dart

@@ -1,7 +1,7 @@
 library foo.ng_deps.dart;
 
 import 'foo.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/directive_linker/simple_export_files/foo.ng_deps.dart

@@ -1,7 +1,7 @@
 library foo.ng_deps.dart;
 
 import 'foo.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/directive_linker/simple_files/bar.ng_deps.dart

@@ -1,7 +1,7 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 import 'foo.dart' as dep;
 
 var _visited = false;

modules/angular2/test/transform/directive_linker/simple_files/expected/bar.ng_deps.dart

@@ -1,7 +1,7 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 import 'foo.dart' as dep;
 import 'foo.ng_deps.dart' as i0;
 

modules/angular2/test/transform/directive_linker/simple_files/expected/foo.ng_deps.dart

@@ -1,7 +1,7 @@
 library foo.ng_deps.dart;
 
 import 'foo.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/directive_linker/simple_files/foo.ng_deps.dart

@@ -1,7 +1,7 @@
 library foo.ng_deps.dart;
 
 import 'foo.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/directive_processor/parameter_metadata/expected/soup.ng_deps.dart

@@ -1,7 +1,7 @@
 library dinner.soup.ng_deps.dart;
 
 import 'soup.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/directive_processor/parameter_metadata/soup.dart

@@ -1,6 +1,6 @@
 library dinner.soup;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 @Component(selector: '[soup]')
 class SoupComponent {

modules/angular2/test/transform/integration/all_tests.dart

@@ -38,8 +38,8 @@ void allTests() {
    * every test.
    */
   var commonInputs = {
-    'angular2|lib/src/core/annotations/annotations.dart':
-        '../../../lib/src/core/annotations/annotations.dart',
+    'angular2|lib/src/core/annotations_impl/annotations.dart':
+        '../../../lib/src/core/annotations_impl/annotations.dart',
     'angular2|lib/src/core/application.dart': '../common/application.dart',
     'angular2|lib/src/reflection/reflection_capabilities.dart':
         '../common/reflection_capabilities.dart',
@@ -96,8 +96,8 @@ void allTests() {
         inputs: {
       'a|web/index.dart': 'two_annotations_files/index.dart',
       'a|web/bar.dart': 'two_annotations_files/bar.dart',
-      'angular2|lib/src/core/annotations/view.dart':
-          '../../../lib/src/core/annotations/view.dart'
+      'angular2|lib/src/core/annotations_impl/view.dart':
+          '../../../lib/src/core/annotations_impl/view.dart'
     },
         outputs: {
       'a|web/bar.ng_deps.dart':

modules/angular2/test/transform/integration/list_of_types_files/bar.dart

@@ -1,6 +1,6 @@
 library bar;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 import 'foo.dart';
 
 @Component(componentServices: const [MyContext])

modules/angular2/test/transform/integration/list_of_types_files/expected/bar.ng_deps.dart

@@ -1,8 +1,8 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
-import 'package:angular2/src/core/annotations/annotations.ng_deps.dart' as i0;
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.ng_deps.dart' as i0;
 import 'foo.dart';
 import 'foo.ng_deps.dart' as i1;
 

modules/angular2/test/transform/integration/simple_annotation_files/bar.dart

@@ -1,6 +1,6 @@
 library bar;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 @Component(selector: '[soup]')
 class MyComponent {

modules/angular2/test/transform/integration/simple_annotation_files/expected/bar.ng_deps.dart

@@ -1,8 +1,8 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
-import 'package:angular2/src/core/annotations/annotations.ng_deps.dart' as i0;
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.ng_deps.dart' as i0;
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/integration/synthetic_ctor_files/bar.dart

@@ -1,6 +1,6 @@
 library bar;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 
 @Component(selector: '[soup]')
 class MyComponent {}

modules/angular2/test/transform/integration/synthetic_ctor_files/expected/bar.ng_deps.dart

@@ -1,8 +1,8 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
-import 'package:angular2/src/core/annotations/annotations.ng_deps.dart' as i0;
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.ng_deps.dart' as i0;
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/integration/two_annotations_files/bar.dart

@@ -1,7 +1,7 @@
 library bar;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
-import 'package:angular2/src/core/annotations/view.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/view.dart';
 
 @Component(selector: '[soup]')
 @View(template: 'Salad')

modules/angular2/test/transform/integration/two_annotations_files/expected/bar.ng_deps.dart

@@ -1,10 +1,10 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
-import 'package:angular2/src/core/annotations/annotations.ng_deps.dart' as i0;
-import 'package:angular2/src/core/annotations/view.dart';
-import 'package:angular2/src/core/annotations/view.ng_deps.dart' as i1;
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.ng_deps.dart' as i0;
+import 'package:angular2/src/core/annotations_impl/view.dart';
+import 'package:angular2/src/core/annotations_impl/view.ng_deps.dart' as i1;
 
 var _visited = false;
 void initReflector(reflector) {

modules/angular2/test/transform/integration/two_deps_files/bar.dart

@@ -1,6 +1,6 @@
 library bar;
 
-import 'package:angular2/src/core/annotations/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
 import 'foo.dart' as prefix;
 
 @Component(selector: prefix.preDefinedSelector)

modules/angular2/test/transform/integration/two_deps_files/expected/bar.ng_deps.dart

@@ -1,8 +1,8 @@
 library bar.ng_deps.dart;
 
 import 'bar.dart';
-import 'package:angular2/src/core/annotations/annotations.dart';
-import 'package:angular2/src/core/annotations/annotations.ng_deps.dart' as i0;
+import 'package:angular2/src/core/annotations_impl/annotations.dart';
+import 'package:angular2/src/core/annotations_impl/annotations.ng_deps.dart' as i0;
 import 'foo.dart' as prefix;
 import 'foo.ng_deps.dart' as i1;