Skip to content

Commit

Permalink
fix(core): export provider interfaces that are part of the public API…
Browse files Browse the repository at this point in the history
… types

Some of the provider interfaces that the [Provider][1] and
[StaticProvider][2] types comprise were not exported from
[@angular/core][3]. As a result, the docs for these symbols did not
appear on angular.io (even though both `Provider` and `StaticProvider`
are part of the public API. (See, also,
angular#31377 (comment).)

This commit fixes it by exporting all necessary provider interfaces.

[1]: https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L365-L366
[2]: https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/interface/provider.ts#L283-L284
[3]: https://github.com/angular/angular/blob/9e34670b2/packages/core/src/di/index.ts#L23
  • Loading branch information
gkalpak authored and jbogarthyde committed Jul 3, 2019
1 parent 1efaac5 commit 214a616
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 13 deletions.
2 changes: 1 addition & 1 deletion packages/core/src/di/index.ts
Expand Up @@ -20,7 +20,7 @@ export {Injectable, InjectableDecorator, InjectableProvider} from './injectable'
export {Injector} from './injector';
export {ɵɵinject, inject, INJECTOR} from './injector_compatibility';
export {ReflectiveInjector} from './reflective_injector';
export {StaticProvider, ValueProvider, ConstructorSansProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ClassProvider, ValueSansProvider, ClassSansProvider} from './interface/provider';
export {ClassProvider, ClassSansProvider, ConstructorProvider, ConstructorSansProvider, ExistingProvider, ExistingSansProvider, FactoryProvider, FactorySansProvider, Provider, StaticClassProvider, StaticClassSansProvider, StaticProvider, TypeProvider, ValueProvider, ValueSansProvider} from './interface/provider';
export {ResolvedReflectiveFactory, ResolvedReflectiveProvider} from './reflective_provider';
export {ReflectiveKey} from './reflective_key';
export {InjectionToken} from './injection_token';
13 changes: 1 addition & 12 deletions packages/core/src/di/interface/provider.ts
Expand Up @@ -164,12 +164,6 @@ export interface ConstructorProvider extends ConstructorSansProvider {
*
* For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
*
* @usageNotes
*
* ### Example
*
* {@example core/di/ts/provider_spec.ts region='ExistingSansProvider'}
*
* @publicApi
*/
export interface ExistingSansProvider {
Expand Down Expand Up @@ -214,11 +208,6 @@ export interface ExistingProvider extends ExistingSansProvider {
*
* For more details, see the ["Dependency Injection Guide"](guide/dependency-injection).
*
* @usageNotes
* ### Example
*
* {@example core/di/ts/provider_spec.ts region='FactorySansProvider'}
*
* @publicApi
*/
export interface FactorySansProvider {
Expand Down Expand Up @@ -369,4 +358,4 @@ export type Provider = TypeProvider | ValueProvider | ClassProvider | Constructo
* Describes a function that is used to process provider list (for example in case of provider
* overrides).
*/
export type ProcessProvidersFunction = (providers: Provider[]) => Provider[];
export type ProcessProvidersFunction = (providers: Provider[]) => Provider[];
24 changes: 24 additions & 0 deletions tools/public_api_guard/core/core.d.ts
Expand Up @@ -165,6 +165,11 @@ export declare abstract class ComponentRef<C> {
abstract onDestroy(callback: Function): void;
}

export interface ConstructorProvider extends ConstructorSansProvider {
multi?: boolean;
provide: Type<any>;
}

export interface ConstructorSansProvider {
deps?: any[];
}
Expand Down Expand Up @@ -332,11 +337,20 @@ export interface ExistingProvider extends ExistingSansProvider {
provide: any;
}

export interface ExistingSansProvider {
useExisting: any;
}

export interface FactoryProvider extends FactorySansProvider {
multi?: boolean;
provide: any;
}

export interface FactorySansProvider {
deps?: any[];
useFactory: Function;
}

export declare function forwardRef(forwardRefFn: ForwardRefFn): Type<any>;

export interface ForwardRefFn {
Expand Down Expand Up @@ -1363,6 +1377,16 @@ export interface SkipSelfDecorator {
new (): SkipSelf;
}

export interface StaticClassProvider extends StaticClassSansProvider {
multi?: boolean;
provide: any;
}

export interface StaticClassSansProvider {
deps: any[];
useClass: Type<any>;
}

export declare type StaticProvider = ValueProvider | ExistingProvider | StaticClassProvider | ConstructorProvider | FactoryProvider | any[];

/** @deprecated */
Expand Down

0 comments on commit 214a616

Please sign in to comment.