chore(di): Update the Module.bind(toFactory) to the new DI 2.0.0 format

Author: jbdeboer

benchmark/web/tree.dart

@@ -254,7 +254,7 @@ main() {
       ..bind(NgFreeTree)
       ..bind(NgFreeTreeScoped)
       ..bind(NgFreeTreeClass)
-      ..bind(ScopeDigestTTL, toFactory: (_) => new ScopeDigestTTL.value(15))
+      ..bind(ScopeDigestTTL, toFactory: () => new ScopeDigestTTL.value(15), inject: [])
       ..bind(CompilerConfig, toValue: new CompilerConfig.withOptions(elementProbeEnabled: false));
 
   var injector = applicationFactory().addModule(module).run();

bin/parser_generator_for_spec.dart

@@ -2,14 +2,20 @@ 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';
 import 'package:angular/tools/parser_getter_setter/generator.dart';
 
 main(arguments) {
-  Module module = new Module()..bind(Parser, toFactory: (i) => i.get(DynamicParser));
-  module.bind(ParserBackend, toFactory: (i) => i.get(DartGetterSetterGen));
+  Module module = new Module()
+    ..bind(Lexer)
+    ..bind(ParserGetterSetter)
+    ..bind(Parser, toImplementation: DynamicParser)
+    ..install(new CacheModule());
+  module.bind(ParserBackend, toImplementation: DartGetterSetterGen);
   Injector injector = new DynamicInjector(modules: [module],
-      allowImplicitInjection: true);
+        allowImplicitInjection: true);
 
   // 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

lib/application.dart

@@ -152,7 +152,7 @@ abstract class Application {
     modules.add(ngModule);
     ngModule..bind(VmTurnZone, toValue: zone)
             ..bind(Application, toValue: this)
-            ..bind(dom.Node, toFactory: (i) => i.getByKey(new Key(Application)).element);
+            ..bind(dom.Node, toFactory: (Application app) => app.element, inject: [Application]);
   }
 
   /**

lib/core/module_internal.dart

@@ -35,21 +35,19 @@ class CoreModule extends Module {
   CoreModule() {
     bind(ScopeDigestTTL);
 
-    bind(MetadataExtractor);
     bind(ExceptionHandler);
     bind(FormatterMap);
     bind(Interpolate);
     bind(RootScope);
-    bind(Scope, toFactory: (injector) => injector.getByKey(ROOT_SCOPE_KEY));
-    bind(ClosureMap, toFactory: (_) => throw "Must provide dynamic/static ClosureMap.");
+    bind(Scope, inject: [RootScope]);
+    bind(ClosureMap, toFactory: () => throw "Must provide dynamic/static ClosureMap.", inject: []);
     bind(ScopeStats);
     bind(ScopeStatsEmitter);
-    bind(ScopeStatsConfig, toFactory: (i) => new ScopeStatsConfig());
+    bind(ScopeStatsConfig);
     bind(Object, toValue: {}); // RootScope context
-    bind(VmTurnZone);
 
-    bind(Parser, toFactory: (i) => i.get(DynamicParser));
-    bind(ParserBackend, toFactory: (i) => i.get(DynamicParserBackend));
+    bind(Parser, inject: [DynamicParser]);
+    bind(ParserBackend, inject: [DynamicParserBackend]);
     bind(DynamicParser);
     bind(DynamicParserBackend);
     bind(Lexer);

lib/core/scope.dart

@@ -532,6 +532,7 @@ class ScopeStatsEmitter {
  * ScopeStatsConfig is used to modify behavior of [ScopeStats]. You can use this
  * object to modify behavior at runtime too.
  */
+@Injectable()
 class ScopeStatsConfig {
   var emit = false;
 

lib/core_dom/common.dart

@@ -41,10 +41,10 @@ class DirectiveRef {
  */
 Injector forceNewDirectivesAndFormatters(Injector injector, List<Module> modules) {
   modules.add(new Module()
-      ..bind(Scope, toFactory: (i) {
+      ..bind(Scope, toFactory: (Injector i) {
         var scope = i.parent.getByKey(SCOPE_KEY);
         return scope.createChild(new PrototypeMap(scope.context));
-      }));
+      }, inject: [Injector]));
 
   return injector.createChild(modules,
       forceNewInstances: [DirectiveMap, FormatterMap]);

lib/core_dom/module_internal.dart

@@ -57,11 +57,11 @@ class CoreDomModule extends Module {
     bind(ElementProbe, toValue: null);
 
     // Default to a unlimited-sized TemplateCache
-    bind(TemplateCache, toFactory: (i) {
+    bind(TemplateCache, toFactory: (CacheRegister register) {
       var templateCache = new TemplateCache();
-      i.getByKey(CACHE_REGISTER_KEY).registerCache("TemplateCache", templateCache);
+      register.registerCache("TemplateCache", templateCache);
       return templateCache;
-    });
+    }, inject: [CacheRegister]);
     bind(dom.NodeTreeSanitizer, toImplementation: NullTreeSanitizer);
 
     bind(TextMustache);
@@ -70,7 +70,7 @@ class CoreDomModule extends Module {
     bind(Compiler, toImplementation: TaggingCompiler);
     bind(CompilerConfig);
 
-    bind(ComponentFactory, toFactory: (i) => i.getByKey(SHADOW_DOM_COMPONENT_FACTORY_KEY));
+    bind(ComponentFactory, inject: [ShadowDomComponentFactory]);
     bind(ShadowDomComponentFactory);
     bind(TranscludingComponentFactory);
     bind(Content);

lib/directive/module.dart

@@ -68,7 +68,7 @@ class DirectiveModule extends Module {
     bind(NgBind, toValue: null);
     bind(NgBindTemplate, toValue: null);
     bind(NgBindHtml, toValue: null);
-    bind(dom.NodeValidator, toFactory: (_) => new dom.NodeValidatorBuilder.common());
+    bind(dom.NodeValidator, toFactory: () => new dom.NodeValidatorBuilder.common(), inject: []);
     bind(NgClass, toValue: null);
     bind(NgClassOdd, toValue: null);
     bind(NgClassEven, toValue: null);

lib/directive/ng_model.dart

@@ -603,7 +603,7 @@ class NgBindTypeForDateLike {
     module: InputDateLike.moduleFactory)
 class InputDateLike {
   static Module moduleFactory() => new Module()..bind(NgBindTypeForDateLike,
-      toFactory: (Injector i) => new NgBindTypeForDateLike(i.getByKey(ELEMENT_KEY)));
+      toFactory: (dom.Element e) => new NgBindTypeForDateLike(e), inject: [dom.Element]);
   final dom.InputElement inputElement;
   final NgModel ngModel;
   final NgModelOptions ngModelOptions;

lib/mock/module.dart

@@ -62,11 +62,11 @@ class AngularMockModule extends Module {
     bind(MockHttpBackend);
     bind(Element, toValue: document.body);
     bind(Node, toValue: document.body);
-    bind(HttpBackend, toFactory: (Injector i) => i.getByKey(MOCK_HTTP_BACKEND_KEY));
-    bind(VmTurnZone, toFactory: (_) {
+    bind(HttpBackend, inject: [MockHttpBackend]);
+    bind(VmTurnZone, toFactory: () {
       return new VmTurnZone()
         ..onError = (e, s, LongStackTrace ls) => dump('EXCEPTION: $e\n$s\n$ls');
-    });
+    }, inject: []);
     bind(Window, toImplementation: MockWindow);
     var mockPlatform = new MockWebPlatform();
     bind(MockWebPlatform, toValue: mockPlatform);

lib/mock/test_injection.dart

@@ -16,13 +16,13 @@ class _SpecInjector {
 
   _SpecInjector() {
     var moduleModule = new Module()
-      ..bind(Module, toFactory: (Injector injector) => addModule(new Module()));
+      ..bind(Module, toFactory: () => addModule(new Module()), inject: []);
     moduleInjector = new DynamicInjector(modules: [moduleModule]);
   }
 
   addModule(module) {
     if (injector != null) {
-      throw ["Injector already crated, can not add more modules."];
+      throw ["Injector already created, can not add more modules."];
     }
     modules.add(module);
     return module;

lib/routing/module.dart

@@ -142,10 +142,10 @@ part 'ng_bind_route.dart';
 class RoutingModule extends Module {
   RoutingModule({bool usePushState: true}) {
     bind(NgRoutingUsePushState);
-    bind(Router, toFactory: (injector) {
-      var useFragment = !injector.getByKey(NG_ROUTING_USE_PUSH_STATE_KEY).usePushState;
-      return new Router(useFragment: useFragment, windowImpl: injector.getByKey(WINDOW_KEY));
-    });
+    bind(Router, toFactory: (NgRoutingUsePushState state, Window window) {
+      var useFragment = !state.usePushState;
+      return new Router(useFragment: useFragment, windowImpl: window);
+    }, inject: [NG_ROUTING_USE_PUSH_STATE_KEY, WINDOW_KEY]);
     bind(NgRoutingHelper);
     bind(RouteProvider, toValue: null);
     bind(RouteInitializer, toValue: null);

test/core/parser/generated_getter_setter_spec.dart

@@ -7,7 +7,7 @@ import 'generated_getter_setter.dart' as gen;
 main() {
   describe('hybrid getter-setter', () {
     beforeEachModule((Module module) {
-      module..bind(Parser, toFactory: (i) => i.get(DynamicParser))
+      module..bind(Parser, inject: [DynamicParser])
             ..bind(ClosureMap, toValue: gen.closureMap);
     });
     parser_spec.main();

test/core_dom/view_spec.dart

@@ -199,7 +199,7 @@ main() {
           ..bind(Log)
           ..bind(AFormatter)
           ..bind(ADirective)
-          ..bind(Node, toFactory: (injector) => document.body);
+          ..bind(Node, toFactory: () => document.body, inject: []);
 
         Injector rootInjector = applicationFactory()
             .addModule(rootModule)

test/routing/routing_spec.dart

@@ -16,7 +16,7 @@ main() {
       router = new Router(useFragment: false, windowImpl: new MockWindow());
       m
         ..install(new AngularMockModule())
-        ..bind(RouteInitializerFn, toFactory: (_) => initRoutes)
+        ..bind(RouteInitializerFn, toFactory: () => initRoutes, inject: [])
         ..bind(Router, toValue: router);
     });