diff --git a/goldens/public-api/core/index.md b/goldens/public-api/core/index.md index 0990c48a16efd..caa8e70e1a0d2 100644 --- a/goldens/public-api/core/index.md +++ b/goldens/public-api/core/index.md @@ -795,7 +795,7 @@ export abstract class Injector { // @deprecated (undocumented) static create(providers: StaticProvider[], parent?: Injector): Injector; static create(options: { - providers: StaticProvider[]; + providers: Array; parent?: Injector; name?: string; }): Injector; diff --git a/packages/core/src/di/create_injector.ts b/packages/core/src/di/create_injector.ts index 36274c4241d91..d09780a8f4d4c 100644 --- a/packages/core/src/di/create_injector.ts +++ b/packages/core/src/di/create_injector.ts @@ -10,7 +10,7 @@ import {EMPTY_ARRAY} from '../util/empty'; import {stringify} from '../util/stringify'; import {Injector} from './injector'; -import {StaticProvider} from './interface/provider'; +import {Provider, StaticProvider} from './interface/provider'; import {importProvidersFrom} from './provider_collection'; import {getNullInjector, R3Injector} from './r3_injector'; import {InjectorScope} from './scope'; @@ -22,7 +22,7 @@ import {InjectorScope} from './scope'; */ export function createInjector( defType: /* InjectorType */ any, parent: Injector|null = null, - additionalProviders: StaticProvider[]|null = null, name?: string): Injector { + additionalProviders: Array|null = null, name?: string): Injector { const injector = createInjectorWithoutInjectorInstances(defType, parent, additionalProviders, name); injector.resolveInjectorInitializers(); @@ -36,7 +36,7 @@ export function createInjector( */ export function createInjectorWithoutInjectorInstances( defType: /* InjectorType */ any, parent: Injector|null = null, - additionalProviders: StaticProvider[]|null = null, name?: string, + additionalProviders: Array|null = null, name?: string, scopes = new Set()): R3Injector { const providers = [ additionalProviders || EMPTY_ARRAY, diff --git a/packages/core/src/di/injector.ts b/packages/core/src/di/injector.ts index 324d355b3fbe9..a7b6394330d57 100644 --- a/packages/core/src/di/injector.ts +++ b/packages/core/src/di/injector.ts @@ -13,7 +13,7 @@ import {InjectorMarkers} from './injector_marker'; import {INJECTOR} from './injector_token'; import {ɵɵdefineInjectable} from './interface/defs'; import {InjectFlags, InjectOptions} from './interface/injector'; -import {StaticProvider} from './interface/provider'; +import {Provider, StaticProvider} from './interface/provider'; import {NullInjector} from './null_injector'; import {ProviderToken} from './provider_token'; @@ -104,11 +104,14 @@ export abstract class Injector { * @returns The new injector instance. * */ - static create(options: {providers: StaticProvider[], parent?: Injector, name?: string}): Injector; + static create(options: + {providers: Array, parent?: Injector, name?: string}): + Injector; static create( - options: StaticProvider[]|{providers: StaticProvider[], parent?: Injector, name?: string}, + options: StaticProvider[]| + {providers: Array, parent?: Injector, name?: string}, parent?: Injector): Injector { if (Array.isArray(options)) { return createInjector({name: ''}, parent, options, '');