Skip to content

Fix for useFactory providers #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpmitche11 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for useFactory providers #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/injectable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,14 @@ export function registerProviders(module: IModule, providers: Provider[]) {
// providers registered using { provide, useClass/useFactory/useValue } syntax
if (provider.provide) {
const name = provider.provide;
if (provider.useClass && provider.useClass instanceof Function) {
if (provider.useClass) {
module.service(name, provider.useClass);
}
else if (provider.useFactory && provider.useFactory instanceof Function) {
provider.useFactory.$inject = provider.deps || provider.useFactory.$inject;
else if (provider.useFactory) {
if (provider.deps) {
provider.useFactory = replaceDependencies(provider.useFactory, provider.deps);
}

module.factory(name, provider.useFactory);
}
else if (provider.useValue) {
Expand All @@ -56,3 +59,13 @@ export function registerProviders(module: IModule, providers: Provider[]) {
}
});
}


function replaceDependencies(injectableFunction: any, deps: any[]) {
if (Array.isArray(injectableFunction)) {
injectableFunction = injectableFunction[injectableFunction.length - 1];
}

injectableFunction.$inject = deps;
return injectableFunction;
}
33 changes: 33 additions & 0 deletions test/ng-module.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,39 @@ describe('NgModule', () => {
expect(value[2][1]).toBe(providers[index].useFactory);
});
});
it('registers provider with factory function annotated with array syntax', () => {
const providers = [
{provide: 'useFactoryTestService', useFactory: ['foo', (foo) => new TestService(foo)] },
{provide: 'foo', useValue: 'bar'}
];
registerNgModule(moduleName, [], [], providers);

const invokeQueue = angular.module(moduleName)['_invokeQueue'];
expect(invokeQueue.length).toEqual(providers.length);
const providerInvoke = invokeQueue[1];
expect(providerInvoke[0]).toEqual('$provide');
expect(providerInvoke[1]).toEqual('factory');
expect(providerInvoke[2][0]).toEqual(providers[0].provide);
expect(providerInvoke[2][1]).toBe(providers[0].useFactory);
});
it('registers provider with factory function annotated with $inject syntax', () => {
const useFactory = (foo) => new TestService(foo);
useFactory.$inject = ['foo'];

const providers = [
{provide: 'useFactoryTestService', useFactory },
{provide: 'foo', useValue: 'bar'}
];
registerNgModule(moduleName, [], [], providers);

const invokeQueue = angular.module(moduleName)['_invokeQueue'];
expect(invokeQueue.length).toEqual(providers.length);
const providerInvoke = invokeQueue[1];
expect(providerInvoke[0]).toEqual('$provide');
expect(providerInvoke[1]).toEqual('factory');
expect(providerInvoke[2][0]).toEqual(providers[0].provide);
expect(providerInvoke[2][1]).toBe(providers[0].useFactory);
});
});

describe('useValue', () => {
Expand Down