fix(useFactory): allow use of $inject on factory methods

Fixes #25
jbedard · May 24, 2017 · 568ba58 · 568ba58
1 parent bec50ae
commit 568ba58
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 1 deletion.
diff --git a/src/facade.spec.ts b/src/facade.spec.ts
@@ -253,6 +253,58 @@ describe("facade", function() {
                 expect("$apply" in instance.a).toBe(true);
                 expect(instance.b).toEqual(jasmine.any(Foo));
             });
+
+            it("should support factory.$inject to inject into factory method", function() {
+                @Injectable()
+                class Foo {}
+
+                class Bar {
+                    constructor(public a, public b) {}
+                }
+
+                function factory(a, b) { return new Bar(a, b); }
+                (<any>factory).$inject = ["$rootScope", Foo];
+
+                @NgModule({
+                    id: "test",
+                    providers: [Foo, {
+                        provide: Bar,
+                        useFactory: factory
+                    }]
+                })
+                class Mod {}
+
+                const instance = bootstrapAndInitialize("test", Bar);
+
+                expect(instance).toEqual(jasmine.any(Bar));
+                expect("$apply" in instance.a).toBe(true);
+                expect(instance.b).toEqual(jasmine.any(Foo));
+            });
+
+            it("should throw if both factory.$inject and deps declared", function() {
+                @Injectable()
+                class Foo {}
+
+                class Bar {
+                    constructor(public a, public b) {}
+                }
+
+                function factory(a, b) { return new Bar(a, b); }
+                (<any>factory).$inject = ["$rootScope", Foo];
+
+                expect(function() {
+                    @NgModule({
+                        id: "test",
+                        providers: [Foo, {
+                            provide: Bar,
+                            useFactory: factory,
+                            deps: ["$rootScope", Foo]
+                        }]
+                    })
+                    class Mod {}
+                })
+                .toThrow();
+            });
         });
 
         describe("useExisting", function() {

diff --git a/src/facade.ts b/src/facade.ts
@@ -230,7 +230,14 @@ function setupProvider(mod: angular.IModule, provider: Provider): void {
     }
     //FactoryProvider
     else if (isFactoryProvider(provider)) {
-        mod.factory(provider.provide, extend(provider.useFactory, {$inject: provider.deps || []}));
+        const factory = provider.useFactory;
+        if (provider.deps) {
+            if (factory.$inject) {
+                throw new Error("Can not declare both $inject and deps for a factory");
+            }
+            factory.$inject = provider.deps;
+        }
+        mod.factory(provider.provide, factory);
     }
     //ClassProvider
     else if (isClassProvider(provider)) {