feat(decorators): adds decorator versions of DI annotations.

rkirov · rkirov · commit 457c15cd6c94 · 2015-05-04T13:35:09.000-07:00
In 'angular2/di' the symbol:
- Inject is a decorator
- InjectAnnotation is an annotation

Internally one an get a hold of annotations without *Annotations appened
(to make ts2dart work without workarounds) by importing from
'angular2/src/di/annotations_impl' instead of 'angular2/di'. This is
needed only for users that transpile through TS and through ts2dart.
diff --git a/modules/angular2/annotations.js b/modules/angular2/annotations.js
@@ -9,4 +9,4 @@
  *
  */
 export * from './src/core/annotations/annotations';
-export * from './src/core/decorators/decorators';
+export * from './src/core/annotations/decorators';
diff --git a/modules/angular2/di.js b/modules/angular2/di.js
@@ -5,7 +5,8 @@
  * The `di` module provides dependency injection container services.
  */
 
-export {Inject, InjectPromise, InjectLazy, Injectable, Optional, DependencyAnnotation} from './src/di/annotations';
+export * from './src/di/annotations';
+export * from './src/di/decorators';
 export {Injector} from './src/di/injector';
 export {Binding, ResolvedBinding, Dependency, bind} from './src/di/binding';
 export {Key, KeyRegistry} from './src/di/key';
diff --git a/modules/angular2/src/change_detection/change_detection.js b/modules/angular2/src/change_detection/change_detection.js
@@ -8,10 +8,9 @@ import {BindingRecord} from './binding_record';
 import {DirectiveRecord} from './directive_record';
 import {DEFAULT} from './constants';
 import {ChangeDetection, ProtoChangeDetector} from './interfaces';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {List} from 'angular2/src/facade/collection';
 
-
 /**
  * Structural diffing for `Object`s and `Map`s.
  *
diff --git a/modules/angular2/src/change_detection/parser/lexer.js b/modules/angular2/src/change_detection/parser/lexer.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {List, ListWrapper, SetWrapper} from "angular2/src/facade/collection";
 import {int, NumberWrapper, StringJoiner, StringWrapper} from "angular2/src/facade/lang";
 
diff --git a/modules/angular2/src/change_detection/parser/parser.js b/modules/angular2/src/change_detection/parser/parser.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {int, isBlank, isPresent,  BaseException, StringWrapper, RegExpWrapper} from 'angular2/src/facade/lang';
 import {ListWrapper, List} from 'angular2/src/facade/collection';
 import {Lexer, EOF, Token, $PERIOD, $COLON, $SEMICOLON, $LBRACKET, $RBRACKET,
diff --git a/modules/angular2/src/change_detection/pipes/pipe_registry.js b/modules/angular2/src/change_detection/pipes/pipe_registry.js
@@ -1,7 +1,7 @@
 import {List, ListWrapper} from 'angular2/src/facade/collection';
 import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/facade/lang';
 import {Pipe} from './pipe';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {ChangeDetectorRef} from '../change_detector_ref';
 
 @Injectable()
diff --git a/modules/angular2/src/core/annotations/decorators.dart b/modules/angular2/src/core/annotations/decorators.dart
diff --git a/modules/angular2/src/core/annotations/decorators.es6 b/modules/angular2/src/core/annotations/decorators.es6
@@ -0,0 +1,23 @@
+import {
+  ComponentAnnotation,
+  DirectiveAnnotation
+} from './annotations';
+import {ViewAnnotation} from './view';
+import {AncestorAnnotation, ParentAnnotation} from './visibility';
+import {AttributeAnnotation, QueryAnnotation} from './di';
+import {makeDecorator, makeParamDecorator} from '../../util/decorators';
+
+/* from annotations */
+export var Component = makeDecorator(ComponentAnnotation);
+export var Decorator = makeDecorator(DirectiveAnnotation);
+
+/* from view */
+export var View = makeDecorator(ViewAnnotation);
+
+/* from visibility */
+export var Ancestor = makeParamDecorator(AncestorAnnotation);
+export var Parent = makeParamDecorator(ParentAnnotation);
+
+/* from di */
+export var Attribute = makeParamDecorator(AttributeAnnotation);
+export var Query = makeParamDecorator(QueryAnnotation);
diff --git a/modules/angular2/src/core/annotations_impl/annotations.js b/modules/angular2/src/core/annotations_impl/annotations.js
@@ -1,6 +1,6 @@
 import {CONST, normalizeBlank, isPresent} from 'angular2/src/facade/lang';
 import {ListWrapper, List} from 'angular2/src/facade/collection';
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {DEFAULT} from 'angular2/change_detection';
 
 // type StringMap = {[idx: string]: string};
diff --git a/modules/angular2/src/core/annotations_impl/di.js b/modules/angular2/src/core/annotations_impl/di.js
@@ -1,5 +1,5 @@
 import {CONST} from 'angular2/src/facade/lang';
-import {DependencyAnnotation} from 'angular2/di';
+import {DependencyAnnotation} from 'angular2/src/di/annotations_impl';
 
 /**
  * Specifies that a constant attribute value should be injected.
diff --git a/modules/angular2/src/core/annotations_impl/visibility.js b/modules/angular2/src/core/annotations_impl/visibility.js
@@ -1,5 +1,5 @@
 import {CONST} from 'angular2/src/facade/lang';
-import {DependencyAnnotation} from 'angular2/di';
+import {DependencyAnnotation} from 'angular2/src/di/annotations_impl';
 
 /**
  * Specifies that an injector should retrieve a dependency from the direct parent.
diff --git a/modules/angular2/src/core/application.js b/modules/angular2/src/core/application.js
@@ -1,4 +1,4 @@
-import {Injector, bind, OpaqueToken, Optional} from 'angular2/di';
+import {Injector, bind, OpaqueToken} from 'angular2/di';
 import {NumberWrapper, Type, isBlank, isPresent, BaseException,
     assertionsEnabled, print, stringify} from 'angular2/src/facade/lang';
 import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
diff --git a/modules/angular2/src/core/compiler/compiler.js b/modules/angular2/src/core/compiler/compiler.js
@@ -1,4 +1,5 @@
-import {Injectable, Binding} from 'angular2/di';
+import {Binding} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {Type, isBlank, isPresent, BaseException, normalizeBlank, stringify} from 'angular2/src/facade/lang';
 import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
diff --git a/modules/angular2/src/core/compiler/component_url_mapper.js b/modules/angular2/src/core/compiler/component_url_mapper.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {Type, isPresent} from 'angular2/src/facade/lang';
 import {Map, MapWrapper} from 'angular2/src/facade/collection';
 
diff --git a/modules/angular2/src/core/compiler/directive_metadata_reader.js b/modules/angular2/src/core/compiler/directive_metadata_reader.js
@@ -1,4 +1,5 @@
-import {Injectable, Injector} from 'angular2/di';
+import {Injector} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {Type, isPresent, BaseException, stringify} from 'angular2/src/facade/lang';
 import {Directive, Component} from '../annotations_impl/annotations';
 import {DirectiveMetadata} from './directive_metadata';
diff --git a/modules/angular2/src/core/compiler/dynamic_component_loader.js b/modules/angular2/src/core/compiler/dynamic_component_loader.js
@@ -1,4 +1,5 @@
-import {Key, Injector, Injectable, ResolvedBinding, Binding, bind} from 'angular2/di'
+import {Key, Injector, ResolvedBinding, Binding, bind} from 'angular2/di'
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {Compiler} from './compiler';
 import {Type, BaseException, stringify, isPresent} from 'angular2/src/facade/lang';
 import {Promise} from 'angular2/src/facade/async';
diff --git a/modules/angular2/src/core/compiler/proto_view_factory.js b/modules/angular2/src/core/compiler/proto_view_factory.js
@@ -1,4 +1,5 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
+
 import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 import {isPresent, isBlank} from 'angular2/src/facade/lang';
 import {reflector} from 'angular2/src/reflection/reflection';
@@ -29,7 +30,7 @@ class BindingRecordsCreator {
       bindings = ListWrapper.concat(bindings, this._createElementPropertyRecords(boundElementIndex, renderElementBinder));
       bindings = ListWrapper.concat(bindings, this._createDirectiveRecords(boundElementIndex, sortedDirectives[boundElementIndex]));
     }
-    
+
     return bindings;
   }
 
diff --git a/modules/angular2/src/core/compiler/template_resolver.js b/modules/angular2/src/core/compiler/template_resolver.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {View} from 'angular2/src/core/annotations_impl/view';
 
 import {Type, stringify, isBlank, BaseException} from 'angular2/src/facade/lang';
diff --git a/modules/angular2/src/core/compiler/view_manager.js b/modules/angular2/src/core/compiler/view_manager.js
@@ -1,4 +1,5 @@
-import {Injector, Injectable, Binding} from 'angular2/di';
+import {Injector, Binding} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection';
 import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
 import * as viewModule from './view';
@@ -216,4 +217,4 @@ export class AppViewManager {
     }
     view.render = null;
   }
-}
+}
diff --git a/modules/angular2/src/core/compiler/view_manager_utils.js b/modules/angular2/src/core/compiler/view_manager_utils.js
@@ -1,4 +1,5 @@
-import {Injectable, Injector, Binding} from 'angular2/di';
+import {Injector, Binding} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection';
 import * as eli from './element_injector';
 import {isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
@@ -241,4 +242,4 @@ export class AppViewManagerUtils {
     view.changeDetector.dehydrate();
   }
 
-}
+}
diff --git a/modules/angular2/src/core/compiler/view_pool.js b/modules/angular2/src/core/compiler/view_pool.js
@@ -1,4 +1,5 @@
-import {Inject, OpaqueToken} from 'angular2/di';
+import {Inject} from 'angular2/src/di/annotations_impl';
+
 import {ListWrapper, MapWrapper, Map, List} from 'angular2/src/facade/collection';
 import {isPresent, isBlank} from 'angular2/src/facade/lang';
 
@@ -37,4 +38,4 @@ export class AppViewPool {
     }
   }
 
-}
+}
diff --git a/modules/angular2/src/core/exception_handler.js b/modules/angular2/src/core/exception_handler.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {isPresent, print} from 'angular2/src/facade/lang';
 import {ListWrapper, isListLikeIterable} from 'angular2/src/facade/collection';
 import {DOM} from 'angular2/src/dom/dom_adapter';
diff --git a/modules/angular2/src/core/life_cycle/life_cycle.js b/modules/angular2/src/core/life_cycle/life_cycle.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {ChangeDetector} from 'angular2/change_detection';
 import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
diff --git a/modules/angular2/src/core/testability/testability.js b/modules/angular2/src/core/testability/testability.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {DOM} from 'angular2/src/dom/dom_adapter';
 import {Map, MapWrapper, List, ListWrapper} from 'angular2/src/facade/collection';
 import {StringWrapper, isBlank, BaseException} from 'angular2/src/facade/lang';
diff --git a/modules/angular2/src/di/annotations.dart b/modules/angular2/src/di/annotations.dart
@@ -0,0 +1,3 @@
+library angular2.di.annotations;
+
+export './annotations_impl.dart';
diff --git a/modules/angular2/src/di/annotations.es6 b/modules/angular2/src/di/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 {
+  Inject as InjectAnnotation,
+  InjectPromise as InjectPromiseAnnotation,
+  InjectLazy as InjectLazyAnnotation,
+  Optional as OptionalAnnotation,
+  Injectable as InjectableAnnotation,
+  DependencyAnnotation,  // abstract base class, does not need a decorator
+  } from './annotations_impl';
diff --git a/modules/angular2/src/di/annotations_impl.js b/modules/angular2/src/di/annotations_impl.js
diff --git a/modules/angular2/src/di/binding.js b/modules/angular2/src/di/binding.js
@@ -2,7 +2,7 @@ import {Type, isBlank, isPresent, CONST} from 'angular2/src/facade/lang';
 import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 import {reflector} from 'angular2/src/reflection/reflection';
 import {Key} from './key';
-import {Inject, InjectLazy, InjectPromise, Optional, DependencyAnnotation} from './annotations';
+import {Inject, InjectLazy, InjectPromise, Optional, DependencyAnnotation} from './annotations_impl';
 import {NoAnnotationError} from './exceptions';
 
 /**
diff --git a/modules/angular2/src/di/decorators.dart b/modules/angular2/src/di/decorators.dart
@@ -0,0 +1,3 @@
+library angular2.di.decorators;
+
+/* This file is empty because, Dart does not have decorators. */
diff --git a/modules/angular2/src/di/decorators.es6 b/modules/angular2/src/di/decorators.es6
@@ -0,0 +1,13 @@
+import {
+  InjectAnnotation,
+  InjectPromiseAnnotation,
+  InjectLazyAnnotation,
+  OptionalAnnotation,
+  InjectableAnnotation} from './annotations';
+import {makeDecorator, makeParamDecorator} from '../util/decorators';
+
+export var Inject = makeParamDecorator(InjectAnnotation);
+export var InjectPromise = makeParamDecorator(InjectPromiseAnnotation);
+export var InjectLazy = makeParamDecorator(InjectLazyAnnotation);
+export var Optional = makeParamDecorator(OptionalAnnotation);
+export var Injectable = makeDecorator(InjectableAnnotation);
diff --git a/modules/angular2/src/forms/directives.js b/modules/angular2/src/forms/directives.js
@@ -1,7 +1,7 @@
 import {Directive, 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 {Optional} from 'angular2/src/di/annotations_impl';
 import {Renderer} from 'angular2/src/render/api';
 import {isPresent, isString} from 'angular2/src/facade/lang';
 import {ListWrapper} from 'angular2/src/facade/collection';
diff --git a/modules/angular2/src/render/dom/compiler/compiler.js b/modules/angular2/src/render/dom/compiler/compiler.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 
 import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
 import {BaseException} from 'angular2/src/facade/lang';
diff --git a/modules/angular2/src/render/dom/compiler/template_loader.js b/modules/angular2/src/render/dom/compiler/template_loader.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {isBlank, isPresent, BaseException, stringify} from 'angular2/src/facade/lang';
 import {Map, MapWrapper, StringMapWrapper, StringMap} from 'angular2/src/facade/collection';
 import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
diff --git a/modules/angular2/src/render/dom/direct_dom_renderer.js b/modules/angular2/src/render/dom/direct_dom_renderer.js
@@ -1,4 +1,5 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
+
 import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {List, ListWrapper} from 'angular2/src/facade/collection';
 import {isBlank, isPresent, BaseException} from 'angular2/src/facade/lang';
diff --git a/modules/angular2/src/render/dom/shadow_dom/style_inliner.js b/modules/angular2/src/render/dom/shadow_dom/style_inliner.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {XHR} from 'angular2/src/services/xhr';
 import {ListWrapper} from 'angular2/src/facade/collection';
 
diff --git a/modules/angular2/src/render/dom/shadow_dom/style_url_resolver.js b/modules/angular2/src/render/dom/shadow_dom/style_url_resolver.js
@@ -1,7 +1,7 @@
 // Some of the code comes from WebComponents.JS
 // https://github.com/webcomponents/webcomponentsjs/blob/master/src/HTMLImports/path.js
 
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {RegExp, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang';
 import {UrlResolver} from 'angular2/src/services/url_resolver';
 
diff --git a/modules/angular2/src/render/dom/view/view_factory.js b/modules/angular2/src/render/dom/view/view_factory.js
@@ -1,4 +1,4 @@
-import {OpaqueToken, Inject, Injectable} from 'angular2/di';
+import {Inject, Injectable} from 'angular2/src/di/annotations_impl';
 import {int, isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection';
 
diff --git a/modules/angular2/src/render/dom/view/view_hydrator.js b/modules/angular2/src/render/dom/view/view_hydrator.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {int, isPresent, isBlank, BaseException} from 'angular2/src/facade/lang';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper, List} from 'angular2/src/facade/collection';
 
diff --git a/modules/angular2/src/services/url_resolver.js b/modules/angular2/src/services/url_resolver.js
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {isPresent, isBlank, RegExpWrapper, BaseException} from 'angular2/src/facade/lang';
 import {DOM} from 'angular2/src/dom/dom_adapter';
 
diff --git a/modules/angular2/src/services/xhr_impl.es6 b/modules/angular2/src/services/xhr_impl.es6
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/di/annotations_impl';
 import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {XHR} from './xhr';
 
diff --git a/modules/angular2/src/util/decorators.es6 b/modules/angular2/src/util/decorators.es6
@@ -1,13 +1,6 @@
-import {
-  ComponentAnnotation,
-  DirectiveAnnotation
-} from '../annotations/annotations';
-import {ViewAnnotation} from '../annotations/view';
-import {AncestorAnnotation, ParentAnnotation} from '../annotations/visibility';
-import {AttributeAnnotation, QueryAnnotation} from '../annotations/di';
 import {global} from 'angular2/src/facade/lang';
 
-function makeDecorator(annotationCls) {
+export function makeDecorator(annotationCls) {
   return function(...args) {
     var Reflect = global.Reflect;
     if (!(Reflect && Reflect.getMetadata)) {
@@ -24,7 +17,7 @@ function makeDecorator(annotationCls) {
   }
 }
 
-function makeParamDecorator(annotationCls) {
+export function makeParamDecorator(annotationCls) {
   return function(...args) {
     var Reflect = global.Reflect;
     if (!(Reflect && Reflect.getMetadata)) {
@@ -45,18 +38,3 @@ function makeParamDecorator(annotationCls) {
     }
   }
 }
-
-/* from annotations */
-export var Component = makeDecorator(ComponentAnnotation);
-export var Decorator = makeDecorator(DirectiveAnnotation);
-
-/* from view */
-export var View = makeDecorator(ViewAnnotation);
-
-/* from visibility */
-export var Ancestor = makeParamDecorator(AncestorAnnotation);
-export var Parent = makeParamDecorator(ParentAnnotation);
-
-/* from di */
-export var Attribute = makeParamDecorator(AttributeAnnotation);
-export var Query = makeParamDecorator(QueryAnnotation);
diff --git a/modules/angular2/test/core/application_spec.js b/modules/angular2/test/core/application_spec.js
@@ -16,7 +16,8 @@ import {Component, Directive} from 'angular2/src/core/annotations_impl/annotatio
 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 {bind} from 'angular2/di';
+import {Inject} from 'angular2/src/di/annotations_impl';
 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';
diff --git a/modules/angular2/test/core/compiler/element_injector_spec.js b/modules/angular2/test/core/compiler/element_injector_spec.js
@@ -6,7 +6,8 @@ import {ProtoElementInjector, PreBuiltObjects, DirectiveBinding, TreeNode}
 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 {bind, Injector} from 'angular2/di';
+import {Optional, Inject} from 'angular2/src/di/annotations_impl';
 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';
diff --git a/modules/angular2/test/di/async_spec.js b/modules/angular2/test/di/async_spec.js
@@ -9,7 +9,8 @@ import {
   it,
   xit,
 } from 'angular2/test_lib';
-import {Injector, Inject, InjectPromise, bind, Key} from 'angular2/di';
+import {Injector, bind, Key} from 'angular2/di';
+import {Inject, InjectPromise} from 'angular2/src/di/annotations_impl';
 import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 
 class UserList {
diff --git a/modules/angular2/test/di/injector_spec.js b/modules/angular2/test/di/injector_spec.js
diff --git a/modules/angular2/test/forms/integration_spec.js b/modules/angular2/test/forms/integration_spec.js
diff --git a/modules/angular2/test/transform/integration/all_tests.dart b/modules/angular2/test/transform/integration/all_tests.dart
diff --git a/modules/angular2_material/src/components/radio/radio_button.js b/modules/angular2_material/src/components/radio/radio_button.js
diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.js b/modules/benchmarks/src/largetable/largetable_benchmark.js
diff --git a/modules/examples/src/hello_world/index_common.js b/modules/examples/src/hello_world/index_common.js
diff --git a/modules/examples/src/material/demo_common.js b/modules/examples/src/material/demo_common.js
diff --git a/modules/examples/src/todo/services/TodoStore.js b/modules/examples/src/todo/services/TodoStore.js

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,4 @@`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`	`export * from './src/core/annotations/annotations';`
`12`		`-export * from './src/core/decorators/decorators';`
	`12`	`+export * from './src/core/annotations/decorators';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {Injectable} from 'angular2/di';`
	`1`	`+import {Injectable} from 'angular2/src/di/annotations_impl';`
`2`	`2`	`import {List, ListWrapper, SetWrapper} from "angular2/src/facade/collection";`
`3`	`3`	`import {int, NumberWrapper, StringJoiner, StringWrapper} from "angular2/src/facade/lang";`
`4`	`4`