9d5918e refactor(core): add MapInjector.createFactory and add factories to MapInjector.

tbosch · tbosch · commit 6fb9269067d2 · 2016-06-20T19:51:20.000Z
diff --git a/BUILD_INFO b/BUILD_INFO
@@ -1,2 +1,2 @@
-Fri Jun 17 15:02:43 UTC 2016
-43133b5d55524d91cd2fe0c6757b3c4e35427cd8
+Mon Jun 20 19:51:20 UTC 2016
+9d5918ee35212b43f0b9d8107d36d5d825962620
diff --git a/_analyzer.dart b/_analyzer.dart
diff --git a/lib/src/compiler/compile_metadata.dart b/lib/src/compiler/compile_metadata.dart
@@ -798,6 +798,7 @@ class CompileInjectorModuleMetadata
   var isHost = false;
   dynamic value;
   List<CompileDiDependencyMetadata> diDeps;
+  bool injectable;
   List<dynamic /* CompileProviderMetadata | CompileTypeMetadata | CompileIdentifierMetadata | List < dynamic > */ >
       providers;
   CompileInjectorModuleMetadata(
@@ -808,14 +809,16 @@ class CompileInjectorModuleMetadata
       dynamic value,
       List<CompileDiDependencyMetadata> diDeps,
       List<
-          dynamic /* CompileProviderMetadata | CompileTypeMetadata | CompileIdentifierMetadata | List < dynamic > */ > providers}) {
+          dynamic /* CompileProviderMetadata | CompileTypeMetadata | CompileIdentifierMetadata | List < dynamic > */ > providers,
+      bool injectable}) {
     this.runtime = runtime;
     this.name = name;
     this.moduleUrl = moduleUrl;
     this.prefix = prefix;
     this.value = value;
     this.diDeps = _normalizeArray(diDeps);
     this.providers = _normalizeArray(providers);
+    this.injectable = normalizeBool(injectable);
   }
   static CompileInjectorModuleMetadata fromJson(Map<String, dynamic> data) {
     return new CompileInjectorModuleMetadata(
@@ -825,7 +828,8 @@ class CompileInjectorModuleMetadata
         value: data["value"],
         diDeps: _arrayFromJson(
             data["diDeps"], CompileDiDependencyMetadata.fromJson),
-        providers: _arrayFromJson(data["providers"], metadataFromJson));
+        providers: _arrayFromJson(data["providers"], metadataFromJson),
+        injectable: data["injectable"]);
   }
 
   CompileIdentifierMetadata get identifier {
@@ -846,7 +850,8 @@ class CompileInjectorModuleMetadata
       "isHost": this.isHost,
       "value": this.value,
       "diDeps": _arrayToJson(this.diDeps),
-      "providers": _arrayToJson(this.providers)
+      "providers": _arrayToJson(this.providers),
+      "injectable": this.injectable
     };
   }
 }
diff --git a/lib/src/compiler/identifiers.dart b/lib/src/compiler/identifiers.dart
@@ -30,7 +30,7 @@ import "package:angular2/src/core/linker/template_ref.dart"
     show TemplateRef, TemplateRef_;
 import "util.dart" show MODULE_SUFFIX;
 import "package:angular2/src/core/linker/injector_factory.dart"
-    show CodegenInjector, InjectorFactory;
+    show CodegenInjector, CodegenInjectorFactory;
 
 var APP_VIEW_MODULE_URL =
     "asset:angular2/lib/src/core/linker/view" + MODULE_SUFFIX;
@@ -59,7 +59,7 @@ var impTemplateRef_ = TemplateRef_;
 var impValueUnwrapper = ValueUnwrapper;
 var impInjector = Injector;
 var impCodegenInjector = CodegenInjector;
-var impInjectorFactory = InjectorFactory;
+var impCodegenInjectorFactory = CodegenInjectorFactory;
 var impViewEncapsulation = ViewEncapsulation;
 var impViewType = ViewType;
 var impChangeDetectionStrategy = ChangeDetectionStrategy;
@@ -133,10 +133,10 @@ class Identifiers {
       moduleUrl: '''asset:angular2/lib/src/core/di/injector${ MODULE_SUFFIX}''',
       runtime: impInjector);
   static var InjectorFactory = new CompileIdentifierMetadata(
-      name: "InjectorFactory",
+      name: "CodegenInjectorFactory",
       moduleUrl:
           '''asset:angular2/lib/src/core/linker/injector_factory${ MODULE_SUFFIX}''',
-      runtime: impInjectorFactory);
+      runtime: impCodegenInjectorFactory);
   static var CodegenInjector = new CompileIdentifierMetadata(
       name: "CodegenInjector",
       moduleUrl:
diff --git a/lib/src/compiler/runtime_compiler.dart b/lib/src/compiler/runtime_compiler.dart
@@ -52,7 +52,7 @@ import "runtime_metadata.dart" show RuntimeMetadataResolver;
 import "package:angular2/src/core/linker/component_factory.dart"
     show ComponentFactory;
 import "package:angular2/src/core/linker/injector_factory.dart"
-    show InjectorFactory;
+    show CodegenInjectorFactory;
 import "package:angular2/src/core/linker/component_resolver.dart"
     show ComponentResolver, ReflectorComponentResolver;
 import "config.dart" show CompilerConfig;
@@ -92,7 +92,7 @@ class RuntimeCompiler implements ComponentResolver {
       this._xhr,
       this._injectorCompiler,
       this._genConfig) {}
-  InjectorFactory<dynamic> createInjectorFactory(Type moduleClass,
+  CodegenInjectorFactory<dynamic> createInjectorFactory(Type moduleClass,
       [List<dynamic> extraProviders = const []]) {
     var injectorModuleMeta = this
         ._runtimeMetadataResolver
diff --git a/lib/src/core/di.dart b/lib/src/core/di.dart
@@ -17,7 +17,7 @@ export "di/metadata.dart"
 // we have to reexport * because Dart and TS export two different sets of types
 export "di/decorators.dart";
 export "di/forward_ref.dart" show forwardRef, resolveForwardRef, ForwardRefFn;
-export "di/injector.dart" show Injector, MapInjector;
+export "di/injector.dart" show Injector, InjectorFactory;
 export "di/reflective_injector.dart" show ReflectiveInjector;
 export "di/provider.dart"
     show Binding, ProviderBuilder, bind, Provider, provide;
@@ -38,3 +38,4 @@ export "di/reflective_exceptions.dart"
         NoAnnotationError,
         OutOfBoundsError;
 export "di/opaque_token.dart" show OpaqueToken;
+export "di/map_injector.dart" show MapInjector, MapInjectorFactory;
diff --git a/lib/src/core/di/injector.dart b/lib/src/core/di/injector.dart
@@ -52,23 +52,17 @@ abstract class Injector {
   }
 }
 
+class _EmptyInjectorFactory implements InjectorFactory<dynamic> {
+  Injector create([Injector parent = null, dynamic context = null]) {
+    return isBlank(parent) ? Injector.NULL : parent;
+  }
+}
+
 /**
- * An simple injector based on a Map of values.
+ * A factory for an injector.
  */
-class MapInjector implements Injector {
-  Injector _parent;
-  Map<dynamic, dynamic> _values;
-  MapInjector(this._parent, this._values) {
-    if (isBlank(this._parent)) {
-      this._parent = Injector.NULL;
-    }
-  }
-  dynamic get(dynamic token, [dynamic notFoundValue = _THROW_IF_NOT_FOUND]) {
-    if (identical(token, Injector)) {
-      return this;
-    }
-    return this._values.containsKey(token)
-        ? this._values[token]
-        : this._parent.get(token, notFoundValue);
-  }
+abstract class InjectorFactory<CONTEXT> {
+  // An InjectorFactory that will always delegate to the parent.
+  static InjectorFactory<dynamic> EMPTY = new _EmptyInjectorFactory();
+  Injector create([Injector parent, CONTEXT context]);
 }
diff --git a/lib/src/core/di/map_injector.dart b/lib/src/core/di/map_injector.dart
@@ -0,0 +1,66 @@
+library angular2.src.core.di.map_injector;
+
+import "package:angular2/src/facade/lang.dart" show isBlank;
+import "injector.dart" show Injector, InjectorFactory, THROW_IF_NOT_FOUND;
+
+/**
+ * An simple injector based on a Map of values.
+ */
+class MapInjector implements Injector {
+  Injector _parent;
+  static InjectorFactory<dynamic> createFactory(
+      [Map<dynamic, dynamic> values,
+      Map<dynamic, dynamic /* (injector: Injector) => any */ > factories]) {
+    return new MapInjectorFactory(values, factories);
+  }
+
+  Map<dynamic, dynamic> _instances = new Map<dynamic, dynamic>();
+  Map<dynamic, dynamic /* (injector: Injector) => any */ > _factories;
+  Map<dynamic, dynamic> _values;
+  MapInjector(
+      [this._parent = null,
+      Map<dynamic, dynamic> values = null,
+      Map<dynamic, dynamic /* (injector: Injector) => any */ > factories =
+          null]) {
+    if (isBlank(values)) {
+      values = new Map<dynamic, dynamic>();
+    }
+    this._values = values;
+    if (isBlank(factories)) {
+      factories = new Map<dynamic, dynamic>();
+    }
+    this._factories = factories;
+    if (isBlank(this._parent)) {
+      this._parent = Injector.NULL;
+    }
+  }
+  dynamic get(dynamic token, [dynamic notFoundValue = THROW_IF_NOT_FOUND]) {
+    if (identical(token, Injector)) {
+      return this;
+    }
+    if (this._values.containsKey(token)) {
+      return this._values[token];
+    }
+    if (this._instances.containsKey(token)) {
+      return this._instances[token];
+    }
+    if (this._factories.containsKey(token)) {
+      var instance = this._factories[token](this);
+      this._instances[token] = instance;
+      return instance;
+    }
+    return this._parent.get(token, notFoundValue);
+  }
+}
+
+/**
+ * InjectorFactory for MapInjector.
+ */
+class MapInjectorFactory implements InjectorFactory<dynamic> {
+  Map<dynamic, dynamic> _values;
+  Map<dynamic, dynamic /* (injector: Injector) => any */ > _factories;
+  MapInjectorFactory([this._values = null, this._factories = null]) {}
+  Injector create([Injector parent = null, dynamic context = null]) {
+    return new MapInjector(parent, this._values, this._factories);
+  }
+}
diff --git a/lib/src/core/linker.dart b/lib/src/core/linker.dart
@@ -11,4 +11,3 @@ export "linker/view_container_ref.dart" show ViewContainerRef;
 export "linker/component_factory.dart" show ComponentRef, ComponentFactory;
 export "linker/exceptions.dart"
     show ExpressionChangedAfterItHasBeenCheckedException;
-export "linker/injector_factory.dart" show InjectorFactory;
diff --git a/lib/src/core/linker/component_resolver.dart b/lib/src/core/linker/component_resolver.dart
@@ -9,15 +9,15 @@ import "package:angular2/src/facade/exceptions.dart"
 import "package:angular2/src/facade/async.dart" show PromiseWrapper;
 import "package:angular2/src/core/reflection/reflection.dart" show reflector;
 import "component_factory.dart" show ComponentFactory;
-import "injector_factory.dart" show InjectorFactory;
+import "injector_factory.dart" show CodegenInjectorFactory;
 
 /**
  * Low-level service for loading [ComponentFactory]s, which
  * can later be used to create and render a Component instance.
  */
 abstract class ComponentResolver {
   Future<ComponentFactory> resolveComponent(Type componentType);
-  InjectorFactory<dynamic> createInjectorFactory(Type injectorModule,
+  CodegenInjectorFactory<dynamic> createInjectorFactory(Type injectorModule,
       [List<dynamic> extraProviders]);
   clearCache();
 }
@@ -39,7 +39,7 @@ class ReflectorComponentResolver extends ComponentResolver {
     return PromiseWrapper.resolve(componentFactory);
   }
 
-  InjectorFactory<dynamic> createInjectorFactory(Type injectorModule,
+  CodegenInjectorFactory<dynamic> createInjectorFactory(Type injectorModule,
       [List<dynamic> extraProviders]) {
     return unimplemented();
   }
diff --git a/lib/src/core/linker/injector_factory.dart b/lib/src/core/linker/injector_factory.dart
@@ -24,9 +24,9 @@ abstract class CodegenInjector<MODULE> implements Injector {
   dynamic getInternal(dynamic token, dynamic notFoundValue);
 }
 
-class InjectorFactory<MODULE> {
+class CodegenInjectorFactory<MODULE> {
   final dynamic /* (parent: Injector, mainModule: MODULE) => Injector */ _injectorFactory;
-  const InjectorFactory(this._injectorFactory);
+  const CodegenInjectorFactory(this._injectorFactory);
   Injector create([Injector parent = null, MODULE mainModule = null]) {
     if (isBlank(parent)) {
       parent = Injector.NULL;
diff --git a/lib/src/transform/common/type_metadata_reader.dart b/lib/src/transform/common/type_metadata_reader.dart
@@ -938,14 +938,10 @@ class _InjectorModuleMetadataVisitor extends Object
 
   final _CompileTypeMetadataVisitor _typeVisitor;
 
+  bool _isInjectable = false;
   /// The [AssetId] we are currently processing.
   AssetId _assetId;
 
-  _InjectorModuleMetadataVisitor(
-      this._annotationMatcher, this._typeVisitor) {
-    reset(null);
-  }
-
   /// Whether the visitor has found an [InjectorModule] annotation
   /// since the last call to `reset`.
   bool _hasMetadata = false;
@@ -954,11 +950,16 @@ class _InjectorModuleMetadataVisitor extends Object
   CompileTypeMetadata _type;
   List _providers;
 
+  _InjectorModuleMetadataVisitor(
+      this._annotationMatcher, this._typeVisitor) {
+    reset(null);
+  }
+
   void reset(AssetId assetId) {
     _typeVisitor.reset(assetId);
     _assetId = assetId;
     _hasMetadata = false;
-
+    _isInjectable = false;
     _providers = [];
   }
 
@@ -969,11 +970,13 @@ class _InjectorModuleMetadataVisitor extends Object
         name: _type.name,
         moduleUrl: _type.moduleUrl,
         diDeps: _type.diDeps,
+        injectable: _isInjectable,
         providers: _providers);
   }
 
   @override
   Object visitAnnotation(Annotation node) {
+    _isInjectable = _isInjectable || _annotationMatcher.isInjectable(node, _assetId);
     var isInjectorModule = _annotationMatcher.isInjectorModule(node, _assetId);
     if (isInjectorModule) {
       if (_hasMetadata) {
diff --git a/lib/src/transform/directive_metadata_linker/ng_meta_linker.dart b/lib/src/transform/directive_metadata_linker/ng_meta_linker.dart
@@ -193,7 +193,11 @@ class _NgMetaIdentifierResolver {
       } else if (meta is CompilePipeMetadata) {
         _resolveDiDependencyMetadata(ngMetaMap, meta.type.name, meta.type.diDeps);
       } else if (meta is CompileInjectorModuleMetadata) {
-        _resolveDiDependencyMetadata(ngMetaMap, meta.name, meta.diDeps);
+        if (meta.injectable) {
+          // Only resolve constructor arguments if the InjectorModule is marked as
+          // @Injectable.
+          _resolveDiDependencyMetadata(ngMetaMap, meta.name, meta.diDeps);
+        }
         _resolveInjectorProviders(ngMetaMap, meta);
       } else if (meta is CompileTypeMetadata) {
         _resolveDiDependencyMetadata(ngMetaMap, meta.name, meta.diDeps);
@@ -228,7 +232,8 @@ class _NgMetaIdentifierResolver {
       if (resolved is CompileTypeMetadata) {
         var providers = [new CompileProviderMetadata(token: new CompileTokenMetadata(identifier: resolved), useClass: resolved)];
         if (resolved is CompileInjectorModuleMetadata) {
-          providers.addAll(_resolveProviders(ngMetaMap, resolved.providers, resolved.name));
+          var cimm = resolved as CompileInjectorModuleMetadata;
+          providers.addAll(_resolveProviders(ngMetaMap, cimm.providers, cimm.name));
         }
         return providers;
 
diff --git a/test/core/application_ref_spec.dart b/test/core/application_ref_spec.dart
@@ -47,7 +47,7 @@ import "package:angular2/src/facade/async.dart"
 import "package:angular2/src/core/linker/component_factory.dart"
     show ComponentFactory, ComponentRef_, ComponentRef;
 import "package:angular2/src/core/linker/injector_factory.dart"
-    show InjectorFactory;
+    show CodegenInjectorFactory;
 import "package:angular2/src/facade/exception_handler.dart"
     show ExceptionHandler;
 
@@ -187,7 +187,7 @@ class _MockComponentResolver implements ComponentResolver {
     return PromiseWrapper.resolve(this._compFactory);
   }
 
-  InjectorFactory<dynamic> createInjectorFactory(Type injectorModule,
+  CodegenInjectorFactory<dynamic> createInjectorFactory(Type injectorModule,
       [List<dynamic> extraProviders]) {
     return unimplemented();
   }
diff --git a/test/core/di/injector_spec.dart b/test/core/di/injector_spec.dart
@@ -2,8 +2,7 @@ library angular2.test.core.di.injector_spec;
 
 import "package:angular2/testing_internal.dart"
     show describe, ddescribe, it, iit, expect, beforeEach;
-import "package:angular2/core.dart" show Injector, MapInjector;
-import "package:angular2/src/facade/collection.dart" show MapWrapper;
+import "package:angular2/core.dart" show Injector, InjectorFactory;
 
 main() {
   describe("Injector.NULL", () {
@@ -19,37 +18,9 @@ main() {
       expect(Injector.NULL.get("someToken", "notFound")).toEqual("notFound");
     });
   });
-  describe("MapInjector", () {
-    it("should throw if not found", () {
-      expect(() => new MapInjector(null, new Map<dynamic, dynamic>())
-          .get("someToken")).toThrowError("No provider for someToken!");
-    });
-    it("should return the default value", () {
-      expect(new MapInjector(null, new Map<dynamic, dynamic>())
-              .get("someToken", "notFound"))
-          .toEqual("notFound");
-    });
-    it("should return a value from the map", () {
-      expect(new MapInjector(
-              null,
-              MapWrapper.createFromPairs([
-                ["someToken", "someValue"]
-              ])).get("someToken"))
-          .toEqual("someValue");
-    });
-    it("should return the injector", () {
-      var injector = new MapInjector(null, new Map<dynamic, dynamic>());
-      expect(injector.get(Injector)).toBe(injector);
-    });
-    it("should delegate to the parent", () {
-      var parent = new MapInjector(
-          null,
-          MapWrapper.createFromPairs([
-            ["someToken", "someValue"]
-          ]));
-      expect(new MapInjector(parent, new Map<dynamic, dynamic>())
-              .get("someToken"))
-          .toEqual("someValue");
+  describe("InjectorFactory.EMPTY", () {
+    it("should return Injector.NULL if no parent is given", () {
+      expect(InjectorFactory.EMPTY.create()).toBe(Injector.NULL);
     });
   });
 }
diff --git a/test/core/di/map_injector_spec.dart b/test/core/di/map_injector_spec.dart
diff --git a/test/public_api_spec.dart b/test/public_api_spec.dart
diff --git a/test/transform/common/ng_meta_helper.dart b/test/transform/common/ng_meta_helper.dart
diff --git a/test/transform/directive_metadata_linker/all_tests.dart b/test/transform/directive_metadata_linker/all_tests.dart
diff --git a/test/transform/directive_processor/all_tests.dart b/test/transform/directive_processor/all_tests.dart
diff --git a/test/transform/directive_processor/injector_files/injectors.dart b/test/transform/directive_processor/injector_files/injectors.dart
