mhevery · antingshen · Jul 11, 2014 · Jul 14, 2014
diff --git a/benchmark/pubspec.lock b/benchmark/pubspec.lock
@@ -4,7 +4,7 @@ packages:
   analyzer:
     description: analyzer
     source: hosted
-    version: "0.13.6"
+    version: "0.15.7"
   angular:
     description:
       path: ".."
@@ -30,23 +30,25 @@ packages:
   code_transformers:
     description: code_transformers
     source: hosted
-    version: "0.1.3"
+    version: "0.1.4+2"
   collection:
     description: collection
     source: hosted
     version: "0.9.2"
   di:
-    description: di
-    source: hosted
-    version: "1.0.0"
+    description:
+      path: "../../di.dart"
+      relative: true
+    source: path
+    version: "2.0.0-alpha.9"
   html5lib:
     description: html5lib
     source: hosted
     version: "0.10.0"
   intl:
     description: intl
     source: hosted
-    version: "0.9.9"
+    version: "0.9.10"
   logging:
     description: logging
     source: hosted

diff --git a/benchmark/pubspec.yaml b/benchmark/pubspec.yaml
@@ -13,3 +13,4 @@ transformers:
 - $dart2js:
     minify: false
     checked: false
+    commandLineOptions: [--dump-info]
diff --git a/benchmark/web/tree.dart b/benchmark/web/tree.dart
@@ -246,6 +246,7 @@ class NgFreeTreeClass implements ShadowRootAware {
 
 // Main function runs the benchmark.
 main() {
+  setupModuleTypeReflector();
   var cleanup, createDom;
 
   var module = new Module()

diff --git a/bin/parser_generator_for_spec.dart b/bin/parser_generator_for_spec.dart
@@ -1,7 +1,6 @@
 import 'dart:io' as io;
 
 import 'package:di/di.dart';
-import 'package:di/dynamic_injector.dart';
 import 'package:angular/cache/module.dart';
 import 'package:angular/core/parser/lexer.dart';
 import 'package:angular/core/parser/parser.dart';
@@ -14,8 +13,7 @@ main(arguments) {
     ..bind(Parser, toImplementation: DynamicParser)
     ..install(new CacheModule());
   module.bind(ParserBackend, toImplementation: DartGetterSetterGen);
-  Injector injector = new DynamicInjector(modules: [module],
-        allowImplicitInjection: true);
+  Injector injector = new ModuleInjector([module]);
 
   // List generated using:
   // node node_modules/karma/bin/karma run | grep -Eo ":XNAY:.*:XNAY:" | sed -e 's/:XNAY://g' | sed -e "s/^/'/" | sed -e "s/$/',/" | sort | uniq > missing_expressions

diff --git a/lib/application.dart b/lib/application.dart
@@ -84,6 +84,7 @@ import 'package:angular/routing/module.dart';
 import 'package:angular/introspection.dart';
 
 import 'package:angular/core_dom/static_keys.dart';
+import 'package:angular/core_dom/directive_injector.dart';
 
 /**
  * This is the top level module which describes all Angular components,
@@ -96,6 +97,7 @@ import 'package:angular/core_dom/static_keys.dart';
  */
 class AngularModule extends Module {
   AngularModule() {
+    DirectiveInjector.initUID();
     install(new CacheModule());
     install(new CoreModule());
     install(new CoreDomModule());
@@ -105,7 +107,6 @@ class AngularModule extends Module {
     install(new PerfModule());
     install(new RoutingModule());
 
-    bind(MetadataExtractor);
     bind(Expando, toValue: elementExpando);
   }
 }
@@ -175,9 +176,11 @@ abstract class Application {
       injector.getByKey(JS_CACHE_REGISTER_KEY);
       initializeDateFormatting(null, null).then((_) {
         try {
-          var compiler = injector.getByKey(COMPILER_KEY);
-          var viewFactory = compiler(rootElements, injector.getByKey(DIRECTIVE_MAP_KEY));
-          viewFactory(injector, rootElements);
+          Compiler compiler = injector.getByKey(COMPILER_KEY);
+          DirectiveMap directiveMap = injector.getByKey(DIRECTIVE_MAP_KEY);
+          RootScope rootScope = injector.getByKey(ROOT_SCOPE_KEY);
+          ViewFactory viewFactory = compiler(rootElements, directiveMap);
+          viewFactory(rootScope, injector.get(DirectiveInjector), rootElements);
         } catch (e, s) {
           exceptionHandler(e, s);
         }
@@ -190,5 +193,5 @@ abstract class Application {
    * Creates an injector function that can be used for retrieving services as well as for
    * dependency injection.
    */
-  Injector createInjector();
+  Injector createInjector() => new ModuleInjector(modules);
 }
diff --git a/lib/application_factory.dart b/lib/application_factory.dart
@@ -9,7 +9,6 @@
  */
 library angular.app.factory;
 
-import 'package:di/dynamic_injector.dart';
 import 'package:angular/angular.dart';
 import 'package:angular/core/registry.dart';
 import 'package:angular/core/parser/parser.dart' show ClosureMap;
@@ -64,8 +63,6 @@ class _DynamicApplication extends Application {
         ..bind(FieldGetterFactory, toImplementation: DynamicFieldGetterFactory)
         ..bind(ClosureMap, toImplementation: DynamicClosureMap);
   }
-
-  Injector createInjector() => new DynamicInjector(modules: modules);
 }
 
 /**

diff --git a/lib/application_factory_static.dart b/lib/application_factory_static.dart
@@ -30,8 +30,6 @@
  */
 library angular.app.factory.static;
 
-import 'package:di/static_injector.dart';
-import 'package:di/di.dart' show TypeFactory, Injector;
 import 'package:angular/application.dart';
 import 'package:angular/core/registry.dart';
 import 'package:angular/core/parser/parser.dart';
@@ -46,9 +44,7 @@ export 'package:angular/change_detection/change_detection.dart' show
     FieldSetter;
 
 class _StaticApplication extends Application {
-  final Map<Type, TypeFactory> typeFactories;
-
-  _StaticApplication(Map<Type, TypeFactory> this.typeFactories,
+  _StaticApplication(
                Map<Type, Object> metadata,
                Map<String, FieldGetter> fieldGetters,
                Map<String, FieldSetter> fieldSetters,
@@ -58,9 +54,6 @@ class _StaticApplication extends Application {
         ..bind(FieldGetterFactory, toValue: new StaticFieldGetterFactory(fieldGetters))
         ..bind(ClosureMap, toValue: new StaticClosureMap(fieldGetters, fieldSetters, symbols));
   }
-
-  Injector createInjector() =>
-      new StaticInjector(modules: modules, typeFactories: typeFactories);
 }
 
 /**
@@ -81,20 +74,19 @@ class _StaticApplication extends Application {
  * becomes:
  *
  *     main() {
- *       staticApplication(generated_static_injector.factories,
- *        generated_static_metadata.typeAnnotations,
- *        generated_static_expressions.getters,
- *        generated_static_expressions.setters,
- *        generated_static_expressions.symbols)
- *       .addModule(new Module()..bind(HelloWorldController))
- *       .run();
+ *       staticApplication(
+ *           generated_static_metadata.typeAnnotations,
+ *           generated_static_expressions.getters,
+ *           generated_static_expressions.setters,
+ *           generated_static_expressions.symbols)
+ *         .addModule(new Module()..bind(HelloWorldController))
+ *         .run();
  *
  */
 Application staticApplicationFactory(
-    Map<Type, TypeFactory> typeFactories,
     Map<Type, Object> metadata,
     Map<String, FieldGetter> fieldGetters,
     Map<String, FieldSetter> fieldSetters,
     Map<String, Symbol> symbols) {
-  return new _StaticApplication(typeFactories, metadata, fieldGetters, fieldSetters, symbols);
+  return new _StaticApplication(metadata, fieldGetters, fieldSetters, symbols);
 }
diff --git a/lib/cache/module.dart b/lib/cache/module.dart
@@ -13,4 +13,7 @@ class CacheModule extends Module {
   CacheModule() {
     bind(CacheRegister);
   }
+  CacheModule.withReflector(reflector): super.withReflector(reflector) {
+    bind(CacheRegister);
+  }
 }
diff --git a/lib/change_detection/ast_parser.dart b/lib/change_detection/ast_parser.dart
@@ -2,6 +2,7 @@ library angular.change_detection.ast_parser;
 
 import 'dart:collection';
 
+import 'package:di/di.dart' show Injectable;
 import 'package:angular/core/parser/syntax.dart' as syntax;
 import 'package:angular/core/parser/parser.dart';
 import 'package:angular/core/formatter.dart';

diff --git a/lib/core/annotation.dart b/lib/core/annotation.dart
@@ -13,12 +13,12 @@ export "package:angular/core/annotation_src.dart" show
     Formatter,
     DirectiveBinder,
     DirectiveBinderFn,
-    Injectable,
 
     Directive,
     Component,
     Controller,
     Decorator,
+    Visibility,
 
     DirectiveAnnotation,
     NgAttr,

diff --git a/lib/core/annotation_src.dart b/lib/core/annotation_src.dart
@@ -1,43 +1,28 @@
 library angular.core.annotation_src;
 
-import "package:di/di.dart" show Injector, Visibility;
+import "package:di/di.dart" show Injector, Visibility, Factory;
 
 abstract class DirectiveBinder {
-  bind(key, {Function toFactory, inject,
-      Visibility visibility: Directive.CHILDREN_VISIBILITY});
+  bind(key, {Function toFactory, inject, Visibility visibility: Visibility.CHILDREN});
 }
 
 typedef void DirectiveBinderFn(DirectiveBinder module);
 
 RegExp _ATTR_NAME = new RegExp(r'\[([^\]]+)\]$');
 
-const String SHADOW_DOM_INJECTOR_NAME = 'SHADOW_INJECTOR';
-
-skipShadow(Injector injector)
-    => injector.name == SHADOW_DOM_INJECTOR_NAME ? injector.parent : injector;
-
-localVisibility (Injector requesting, Injector defining)
-    => identical(skipShadow(requesting), defining);
-
-directChildrenVisibility(Injector requesting, Injector defining) {
-  requesting = skipShadow(requesting);
-  return identical(requesting.parent, defining) || localVisibility(requesting, defining);
-}
-
 Directive cloneWithNewMap(Directive annotation, map)
     => annotation._cloneWithNewMap(map);
 
 String mappingSpec(DirectiveAnnotation annotation) => annotation._mappingSpec;
 
+class Visibility {
+  static const LOCAL = const Visibility._('LOCAL');
+  static const CHILDREN = const Visibility._('CHILDREN');
+  static const DIRECT_CHILD = const Visibility._('DIRECT_CHILD');
 
-/**
- * An annotation when applied to a class indicates that the class (service) will
- * be instantiated by di injector. This annotation is also used to designate which
- * classes need to have a static factory generated when using static angular, and
- * therefore is required on any injectable class.
- */
-class Injectable {
-  const Injectable();
+  final String name;
+  const Visibility._(this.name);
+  toString() => 'Visibility: $name';
 }
 
 /**
@@ -46,16 +31,19 @@ class Injectable {
 abstract class Directive {
 
   /// The directive can only be injected to other directives on the same element.
-  static const Visibility LOCAL_VISIBILITY = localVisibility;
+  @deprecated // ('Use Visibility.LOCAL instead')
+  static const Visibility LOCAL_VISIBILITY = Visibility.LOCAL;
 
   /// The directive can be injected to other directives on the same or child elements.
-  static const Visibility CHILDREN_VISIBILITY = null;
+  @deprecated// ('Use Visibility.CHILDREN instead')
+  static const Visibility CHILDREN_VISIBILITY = Visibility.CHILDREN;
 
   /**
    * The directive on this element can only be injected to other directives
    * declared on elements which are direct children of the current element.
    */
-  static const Visibility DIRECT_CHILDREN_VISIBILITY = directChildrenVisibility;
+  @deprecated// ('Use Visibility.DIRECT_CHILD instead')
+  static const Visibility DIRECT_CHILDREN_VISIBILITY = Visibility.DIRECT_CHILD;
 
   /**
    * CSS selector which will trigger this component/directive.
@@ -129,8 +117,8 @@ abstract class Directive {
    *       selector: '[foo]',
    *       module: Foo.moduleFactory)
    *     class Foo {
-   *       static moduleFactory() => new Module()
-   *         ..bind(SomeTypeA, visibility: Directive.LOCAL_VISIBILITY);
+   *       static moduleFactory(DirectiveBinder binder) =>
+   *          binder.bind(SomeTypeA, visibility: Directive.LOCAL_VISIBILITY);
    *     }
    *
    * When specifying types, factories or values in the module, notice that
@@ -139,7 +127,7 @@ abstract class Directive {
    *  * [Directive.CHILDREN_VISIBILITY]
    *  * [Directive.DIRECT_CHILDREN_VISIBILITY]
    */
-  final Function module;
+  final DirectiveBinderFn module;
 
   /**
    * Use map to define the mapping of  DOM attributes to fields.
@@ -222,19 +210,15 @@ abstract class Directive {
 
   const Directive({
     this.selector,
-    this.children: Directive.COMPILE_CHILDREN,
-    this.visibility: Directive.LOCAL_VISIBILITY,
+    this.children,
+    this.visibility,
     this.module,
     this.map: const {},
     this.exportExpressions: const [],
     this.exportExpressionAttrs: const []
   });
 
   toString() => selector;
-  get hashCode => selector.hashCode;
-  operator==(other) =>
-      other is Directive && selector == other.selector;
-
   Directive _cloneWithNewMap(newMap);
 }
 
@@ -335,7 +319,7 @@ class Component extends Directive {
     applyAuthorStyles,
     resetStyleInheritance,
     this.publishAs,
-    module,
+    DirectiveBinderFn module,
     map,
     selector,
     visibility,
@@ -393,7 +377,7 @@ class Decorator extends Directive {
   const Decorator({children: Directive.COMPILE_CHILDREN,
                     map,
                     selector,
-                    module,
+                    DirectiveBinderFn module,
                     visibility,
                     exportExpressions,
                     exportExpressionAttrs})
@@ -446,7 +430,7 @@ class Controller extends Decorator {
                     children: Directive.COMPILE_CHILDREN,
                     this.publishAs,
                     map,
-                    module,
+                    DirectiveBinderFn module,
                     selector,
                     visibility,
                     exportExpressions,
@@ -595,8 +579,5 @@ class Formatter {
 
   const Formatter({this.name});
 
-  int get hashCode => name.hashCode;
-  bool operator==(other) => name == other.name;
-
   toString() => 'Formatter: $name';
 }
diff --git a/lib/core/formatter.dart b/lib/core/formatter.dart
@@ -14,7 +14,7 @@ class FormatterMap {
   final Injector _injector;
 
   FormatterMap(this._injector, MetadataExtractor extractMetadata) {
-    _injector.types.forEach((type) {
+    (_injector as ModuleInjector).types.forEach((type) {
       extractMetadata(type)
       .where((annotation) => annotation is Formatter)
       .forEach((Formatter formatter) {

diff --git a/lib/core/module.dart b/lib/core/module.dart
@@ -26,6 +26,9 @@ export "package:angular/cache/module.dart" show
     CacheRegister,
     CacheRegisterStats;
 
+export "package:angular/core_dom/directive_injector.dart" show
+    DirectiveInjector;
+
 export "package:angular/core_dom/module_internal.dart" show
     Animation,
     AnimationResult,