feat(di): support map literals as providers

mhevery · IgorMinar · commit 94a67f730c4c · 2016-04-26T14:09:25.000-07:00
diff --git a/modules/@angular/core/src/di/provider_util.dart b/modules/@angular/core/src/di/provider_util.dart
@@ -0,0 +1,20 @@
+import './provider.dart' show Provider;
+
+bool isProviderLiteral(dynamic obj) {
+  if (obj is Map) {
+    Map map = obj as Map;
+    return map.containsKey('provide');
+  } else {
+    return false;
+  }
+}
+
+Provider createProvider(dynamic obj) {
+  Map map = obj as Map;
+  return new Provider(map['provide'], useClass: map['useClass'],
+    useValue: map['useValue'],
+    useExisting: map['useExisting'],
+    useFactory: map['useFactory'],
+    deps: map['deps'],
+    multi: map['multi']);
+}
diff --git a/modules/@angular/core/src/di/provider_util.ts b/modules/@angular/core/src/di/provider_util.ts
@@ -0,0 +1,9 @@
+import {Provider} from './provider';
+
+export function isProviderLiteral(obj: any): boolean {
+  return obj && typeof obj == 'object' && obj.provide;
+}
+
+export function createProvider(obj: any): Provider {
+  return new Provider(obj.provide, obj);
+}
diff --git a/modules/@angular/core/src/di/reflective_injector.ts b/modules/@angular/core/src/di/reflective_injector.ts
@@ -390,7 +390,8 @@ export abstract class ReflectiveInjector implements Injector {
    *
    * See {@link ReflectiveInjector#fromResolvedProviders} for more info.
    */
-  static resolve(providers: Array<Type | Provider | any[]>): ResolvedReflectiveProvider[] {
+  static resolve(providers: Array<Type | Provider | {[k: string]: any} | any[]>):
+      ResolvedReflectiveProvider[] {
     return resolveReflectiveProviders(providers);
   }
 
@@ -420,7 +421,7 @@ export abstract class ReflectiveInjector implements Injector {
    * because it needs to resolve the passed-in providers first.
    * See {@link Injector#resolve} and {@link Injector#fromResolvedProviders}.
    */
-  static resolveAndCreate(providers: Array<Type | Provider | any[]>,
+  static resolveAndCreate(providers: Array<Type | Provider | {[k: string]: any} | any[]>,
                           parent: Injector = null): ReflectiveInjector {
     var ResolvedReflectiveProviders = ReflectiveInjector.resolve(providers);
     return ReflectiveInjector.fromResolvedProviders(ResolvedReflectiveProviders, parent);
@@ -511,7 +512,8 @@ export abstract class ReflectiveInjector implements Injector {
    * because it needs to resolve the passed-in providers first.
    * See {@link Injector#resolve} and {@link Injector#createChildFromResolved}.
    */
-  resolveAndCreateChild(providers: Array<Type | Provider | any[]>): ReflectiveInjector {
+  resolveAndCreateChild(
+      providers: Array<Type | Provider | {[k: string]: any} | any[]>): ReflectiveInjector {
     return unimplemented();
   }
 
diff --git a/modules/@angular/core/src/di/reflective_provider.ts b/modules/@angular/core/src/di/reflective_provider.ts
@@ -4,13 +4,13 @@ import {
   isPresent,
   CONST_EXPR,
   isArray,
+  MapWrapper,
+  ListWrapper
 } from '@angular/facade';
-import {MapWrapper, ListWrapper} from '@angular/facade';
 import {reflector} from '../reflection/reflection';
 import {ReflectiveKey} from './reflective_key';
 import {
   InjectMetadata,
-  InjectableMetadata,
   OptionalMetadata,
   SelfMetadata,
   HostMetadata,
@@ -24,6 +24,7 @@ import {
 } from './reflective_exceptions';
 import {resolveForwardRef} from './forward_ref';
 import {Provider, ProviderBuilder, provide} from './provider';
+import {isProviderLiteral, createProvider} from './provider_util';
 
 /**
  * `Dependency` is used by the framework to extend DI.
@@ -142,7 +143,7 @@ export function resolveReflectiveProvider(provider: Provider): ResolvedReflectiv
  * Resolve a list of Providers.
  */
 export function resolveReflectiveProviders(
-    providers: Array<Type | Provider | any[]>): ResolvedReflectiveProvider[] {
+    providers: Array<Type | Provider | {[k: string]: any} | any[]>): ResolvedReflectiveProvider[] {
   var normalized = _normalizeProviders(providers, []);
   var resolved = normalized.map(resolveReflectiveProvider);
   return MapWrapper.values(
@@ -186,15 +187,19 @@ export function mergeResolvedReflectiveProviders(
   return normalizedProvidersMap;
 }
 
-function _normalizeProviders(providers: Array<Type | Provider | ProviderBuilder | any[]>,
-                             res: Provider[]): Provider[] {
+function _normalizeProviders(
+    providers: Array<Type | Provider | {[k: string]: any} | ProviderBuilder | any[]>,
+    res: Provider[]): Provider[] {
   providers.forEach(b => {
     if (b instanceof Type) {
       res.push(provide(b, {useClass: b}));
 
     } else if (b instanceof Provider) {
       res.push(b);
 
+    } else if (isProviderLiteral(b)) {
+      res.push(createProvider(b));
+
     } else if (b instanceof Array) {
       _normalizeProviders(b, res);
 
diff --git a/modules/@angular/core/test/di/reflective_injector_spec.ts b/modules/@angular/core/test/di/reflective_injector_spec.ts
@@ -532,6 +532,18 @@ export function main() {
         expect(provider.resolvedFactories.length).toEqual(2);
       });
 
+
+      it("should support providers as hash", () => {
+        var provider = ReflectiveInjector.resolve([
+          {provide: Engine, useClass: BrokenEngine, multi: true},
+          {provide: Engine, useClass: TurboEngine, multi: true}
+        ])[0];
+
+        expect(provider.key.token).toBe(Engine);
+        expect(provider.multiProvider).toEqual(true);
+        expect(provider.resolvedFactories.length).toEqual(2);
+      });
+
       it("should support multi providers with only one provider", () => {
         var provider = ReflectiveInjector.resolve(
             [new Provider(Engine, {useClass: BrokenEngine, multi: true})])[0];
diff --git a/tools/public_api_guard/public_api_spec.ts b/tools/public_api_guard/public_api_spec.ts
