fixup! feat(ivy): support injection even if no injector present

angular · Apr 13, 2018 · 27674e3 · 27674e3
1 parent e2a3a2f
commit 27674e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/core/src/di/defs.ts b/packages/core/src/di/defs.ts
@@ -26,9 +26,12 @@ import {ClassProvider, ClassSansProvider, ConstructorProvider, ConstructorSansPr
  */
 export interface InjectableDef<T> {
   /**
-   * Specifies that the given type belongs to a particular `InjectorDef`, `NgModule`, or a special
-   * scope (e.g. `'root'`). A value of `null` indicates that the injectable does not belong to any
-   * scope.
+   * Specifies that the given type belongs to a particular injector:
+   * - `InjectorType` such as `NgModule`,
+   * - `'root'` the root injector
+   * - `'any'` all injectors.
+   * - `null`, does not belong to any injector. Must be explicitly listed in the injector
+   *   `providers`.
    */
   providedIn: InjectorType<any>|'root'|'any'|null;
 
@@ -115,11 +118,11 @@ export interface InjectorTypeWithProviders<T> {
  * @experimental
  */
 export function defineInjectable<T>(opts: {
-  providedIn?: Type<any>| 'root' | null,
+  providedIn?: Type<any>| 'root' | 'any' | null,
   factory: () => T,
 }): InjectableDef<T> {
   return {
-    providedIn: (opts.providedIn as InjectorType<any>| 'root' | null | undefined) || null,
+    providedIn: opts.providedIn as any || null,
     factory: opts.factory,
     value: undefined,
   };

diff --git a/packages/core/src/render3/interfaces/view.ts b/packages/core/src/render3/interfaces/view.ts
@@ -192,7 +192,7 @@ export interface LView {
   queries: LQueries|null;
 
   /**
-   * Injector to be used (if any).
+   * An optional Module Injector to be used as fall back after Element Injectors are consulted.
    */
   injector: Injector|null;
 }