fixup! refactor(ivy): create Injector interface; remove dependency on…

… Ivy
DzmitryShylovich · Jan 11, 2019 · 29e9f46 · 29e9f46
1 parent 59ab54b
commit 29e9f46
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 66 deletions.
diff --git a/packages/core/src/di.ts b/packages/core/src/di.ts
diff --git a/packages/core/src/di/injectable.ts b/packages/core/src/di/injectable.ts
@@ -10,8 +10,7 @@ import {Type} from '../interface/type';
 import {compileInjectable as render3CompileInjectable} from '../render3/jit/injectable';
 import {TypeDecorator, makeDecorator} from '../util/decorators';
 
-import {InjectableDef, InjectableType, defineInjectable, getInjectableDef} from './interface/defs';
-import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueSansProvider} from './interface/provider';
+import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, InjectableDef, InjectableType, StaticClassSansProvider, ValueSansProvider, defineInjectable, getInjectableDef} from './interface';
 import {convertInjectableProviderToFactory} from './util';
 
 

diff --git a/packages/core/src/di/injector_compatibility.ts b/packages/core/src/di/injector_compatibility.ts
@@ -10,8 +10,7 @@ import {Type} from '../interface/type';
 import {stringify} from '../util/stringify';
 
 import {Injector} from './injector';
-import {InjectFlags, InjectableDef, getInjectableDef} from './interface';
-import {InjectionToken} from './interface/injection_token';
+import {InjectFlags, InjectableDef, InjectionToken, getInjectableDef} from './interface';
 import {Inject, Optional, Self, SkipSelf} from './metadata';
 
 

diff --git a/packages/core/src/di/interface/index.ts b/packages/core/src/di/interface/index.ts
@@ -9,4 +9,4 @@
 export * from './injection_token';
 export * from './injector';
 export * from './defs';
-export * from './provider';
+export * from './provider';
diff --git a/packages/core/src/di/metadata.ts b/packages/core/src/di/metadata.ts
@@ -6,12 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Type} from '../interface/type';
-import {ReflectionCapabilities} from '../reflection/reflection_capabilities';
-import {makeDecorator, makeParamDecorator} from '../util/decorators';
-import {EMPTY_ARRAY} from '../view/util';
-
-import {ClassSansProvider, ConstructorProvider, ConstructorSansProvider, ExistingProvider, ExistingSansProvider, FactoryProvider, FactorySansProvider, StaticClassProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from './interface/provider';
+import {makeParamDecorator} from '../util/decorators';
 
 
 

diff --git a/packages/core/src/di/r3_injector.ts b/packages/core/src/di/r3_injector.ts
@@ -13,8 +13,7 @@ import {stringify} from '../util/stringify';
 import {resolveForwardRef} from './forward_ref';
 import {INJECTOR, Injector, NullInjector, THROW_IF_NOT_FOUND, USE_VALUE} from './injector';
 import {inject, injectArgs, setCurrentInjector} from './injector_compatibility';
-import {InjectFlags, InjectableDef, InjectableType, InjectionToken, InjectorType, InjectorTypeWithProviders, getInjectableDef, getInjectorDef} from './interface';
-import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, Provider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider} from './interface/provider';
+import {ClassProvider, ConstructorProvider, ExistingProvider, FactoryProvider, InjectFlags, InjectableDef, InjectableType, InjectionToken, InjectorType, InjectorTypeWithProviders, Provider, StaticClassProvider, StaticProvider, TypeProvider, ValueProvider, getInjectableDef, getInjectorDef} from './interface';
 import {APP_ROOT} from './scope';
 
 

diff --git a/packages/core/src/di/reflective_injector.ts b/packages/core/src/di/reflective_injector.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injector, THROW_IF_NOT_FOUND} from './injector';
-import {Provider} from './interface/provider';
+import {Provider} from './interface';
 import {Self, SkipSelf} from './metadata';
 import {cyclicDependencyError, instantiationError, noProviderError, outOfBoundsError} from './reflective_errors';
 import {ReflectiveKey} from './reflective_key';

diff --git a/packages/core/src/di/reflective_provider.ts b/packages/core/src/di/reflective_provider.ts
@@ -10,8 +10,7 @@ import {Type} from '../interface/type';
 import {reflector} from '../reflection/reflection';
 
 import {resolveForwardRef} from './forward_ref';
-import {InjectionToken} from './interface/injection_token';
-import {ClassProvider, ExistingProvider, FactoryProvider, Provider, TypeProvider, ValueProvider} from './interface/provider';
+import {ClassProvider, ExistingProvider, FactoryProvider, InjectionToken, Provider, TypeProvider, ValueProvider} from './interface';
 import {Inject, Optional, Self, SkipSelf} from './metadata';
 import {invalidProviderError, mixingMultiProvidersWithRegularProvidersError, noAnnotationError} from './reflective_errors';
 import {ReflectiveKey} from './reflective_key';

diff --git a/packages/core/src/di/scope.ts b/packages/core/src/di/scope.ts
@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Type} from '../interface/type';
-import {InjectionToken} from './interface/injection_token';
+import {InjectionToken} from './interface';
 
 
 /**

diff --git a/packages/core/src/di/util.ts b/packages/core/src/di/util.ts
@@ -11,7 +11,7 @@ import {ReflectionCapabilities} from '../reflection/reflection_capabilities';
 import {getClosureSafeProperty} from '../util/property';
 
 import {inject, injectArgs} from './injector_compatibility';
-import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from './interface/provider';
+import {ClassSansProvider, ConstructorSansProvider, ExistingSansProvider, FactorySansProvider, StaticClassSansProvider, ValueProvider, ValueSansProvider} from './interface';
 
 const USE_VALUE =
     getClosureSafeProperty<ValueProvider>({provide: String, useValue: getClosureSafeProperty});