fix(lib): remove circular refs in IoService

fix #480
gund · Sep 1, 2022 · 6d225e6 · 6d225e6
1 parent b91c9ae
commit 6d225e6
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 16 deletions.
diff --git a/projects/ng-dynamic-component/src/lib/component-injector/component-injector.ts b/projects/ng-dynamic-component/src/lib/component-injector/component-injector.ts
@@ -0,0 +1,5 @@
+import { ComponentRef } from '@angular/core';
+
+export interface DynamicComponentInjector {
+  componentRef: ComponentRef<unknown> | null;
+}
diff --git a/projects/ng-dynamic-component/src/lib/component-injector/index.ts b/projects/ng-dynamic-component/src/lib/component-injector/index.ts
@@ -1,2 +1,2 @@
+export * from './component-injector';
 export * from './token';
-export * from './component-outlet';
diff --git a/projects/ng-dynamic-component/src/lib/component-injector/token.ts b/projects/ng-dynamic-component/src/lib/component-injector/token.ts
@@ -1,8 +1,5 @@
-import { ComponentRef, InjectionToken } from '@angular/core';
-
-export interface DynamicComponentInjector {
-  componentRef: ComponentRef<unknown> | null;
-}
+import { InjectionToken } from '@angular/core';
+import { DynamicComponentInjector } from './component-injector';
 
 export const DynamicComponentInjectorToken =
   new InjectionToken<DynamicComponentInjector>('DynamicComponentInjector');
diff --git a/...mponent-outlet-injector.directive.spec.ts → ...mponent-outlet-injector.directive.spec.ts b/...mponent-outlet-injector.directive.spec.ts → ...mponent-outlet-injector.directive.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @angular-eslint/component-selector */
 import { Component, ComponentRef, Type, ViewChild } from '@angular/core';
-import { TestSetup } from '../../../test';
+import { TestSetup } from '../../test';
 import { ComponentOutletInjectorDirective } from './component-outlet-injector.directive';
 
 describe('ComponentOutletInjectorDirective', () => {

diff --git a/...et/component-outlet-injector.directive.ts → ...et/component-outlet-injector.directive.ts b/...et/component-outlet-injector.directive.ts → ...et/component-outlet-injector.directive.ts
@@ -4,7 +4,7 @@ import { ComponentRef, Directive, Host } from '@angular/core';
 import {
   DynamicComponentInjector,
   DynamicComponentInjectorToken,
-} from '../token';
+} from '../component-injector';
 
 @Directive({
   // eslint-disable-next-line @angular-eslint/directive-selector

diff --git a/...utlet/component-outlet-injector.module.ts → ...utlet/component-outlet-injector.module.ts b/...utlet/component-outlet-injector.module.ts → ...utlet/component-outlet-injector.module.ts
diff --git a/...let/component-outlet-io.directive.spec.ts → ...let/component-outlet-io.directive.spec.ts b/...let/component-outlet-io.directive.spec.ts → ...let/component-outlet-io.directive.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @angular-eslint/component-selector */
 import { Component, EventEmitter, Input, Output, Type } from '@angular/core';
-import { TestSetup } from '../../../test';
+import { TestSetup } from '../../test';
 import { ComponentOutletInjectorDirective } from './component-outlet-injector.directive';
 import { ComponentOutletIoDirective } from './component-outlet-io.directive';
 

diff --git a/...t-outlet/component-outlet-io.directive.ts → ...t-outlet/component-outlet-io.directive.ts b/...t-outlet/component-outlet-io.directive.ts → ...t-outlet/component-outlet-io.directive.ts
@@ -1,6 +1,6 @@
 import { Directive, DoCheck, Input } from '@angular/core';
 
-import { InputsType, IoService, OutputsType } from '../../io';
+import { InputsType, IoService, OutputsType } from '../io';
 
 @Directive({
   selector:

diff --git a/...ponent-injector/component-outlet/index.ts → ...mponent/src/lib/component-outlet/index.ts b/...ponent-injector/component-outlet/index.ts → ...mponent/src/lib/component-outlet/index.ts
diff --git a/...ects/ng-dynamic-component/src/lib/dynamic-attributes/dynamic-attributes.directive.spec.ts b/...ects/ng-dynamic-component/src/lib/dynamic-attributes/dynamic-attributes.directive.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @angular-eslint/component-selector */
 import { Component, Type } from '@angular/core';
 import { TestFixture, TestSetup } from '../../test';
-import { ComponentOutletInjectorDirective } from '../component-injector';
+import { ComponentOutletInjectorDirective } from '../component-outlet';
 import { DynamicComponent as NdcDynamicComponent } from '../dynamic.component';
 import {
   AttributesMap,

diff --git a/projects/ng-dynamic-component/src/lib/dynamic-attributes/dynamic-attributes.module.ts b/projects/ng-dynamic-component/src/lib/dynamic-attributes/dynamic-attributes.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { ComponentOutletInjectorModule } from '../component-injector';
+import { ComponentOutletInjectorModule } from '../component-outlet';
 import { DynamicAttributesDirective } from './dynamic-attributes.directive';
 
 @NgModule({

diff --git a/...ects/ng-dynamic-component/src/lib/dynamic-directives/dynamic-directives.directive.spec.ts b/...ects/ng-dynamic-component/src/lib/dynamic-directives/dynamic-directives.directive.spec.ts
@@ -22,7 +22,7 @@ import {
 } from '@angular/core';
 
 import { TestFixture, TestSetup } from '../../test';
-import { ComponentOutletInjectorDirective } from '../component-injector';
+import { ComponentOutletInjectorDirective } from '../component-outlet';
 import { DynamicComponent as NdcDynamicComponent } from '../dynamic.component';
 import { IoFactoryService } from '../io';
 import {

diff --git a/projects/ng-dynamic-component/src/lib/dynamic-directives/dynamic-directives.module.ts b/projects/ng-dynamic-component/src/lib/dynamic-directives/dynamic-directives.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { ComponentOutletInjectorModule } from '../component-injector';
+import { ComponentOutletInjectorModule } from '../component-outlet';
 import { DynamicDirectivesDirective } from './dynamic-directives.directive';
 
 @NgModule({

diff --git a/projects/ng-dynamic-component/src/lib/dynamic-io/dynamic-io.directive.spec.ts b/projects/ng-dynamic-component/src/lib/dynamic-io/dynamic-io.directive.spec.ts
@@ -17,7 +17,7 @@ import {
 import { TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TestFixture, TestSetup } from '../../test';
-import { ComponentOutletInjectorModule } from '../component-injector';
+import { ComponentOutletInjectorModule } from '../component-outlet';
 import { DynamicComponent as NdcDynamicComponent } from '../dynamic.component';
 import { InputsType, IoEventArgumentToken, OutputsType } from '../io';
 import {

diff --git a/projects/ng-dynamic-component/src/lib/dynamic-io/dynamic-io.module.ts b/projects/ng-dynamic-component/src/lib/dynamic-io/dynamic-io.module.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { ComponentOutletInjectorModule } from '../component-injector';
+import { ComponentOutletInjectorModule } from '../component-outlet';
 import { DynamicIoDirective } from './dynamic-io.directive';
 
 @NgModule({

diff --git a/projects/ng-dynamic-component/src/public-api.ts b/projects/ng-dynamic-component/src/public-api.ts
@@ -4,6 +4,7 @@
 
 export * from './lib/io';
 export * from './lib/component-injector';
+export * from './lib/component-outlet';
 export * from './lib/dynamic.module';
 export * from './lib/dynamic.component';
 export * from './lib/dynamic-io';