From 143dd39a6627b9ad72dd4e0969dc479d77215ab5 Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Sat, 29 Jul 2017 16:10:10 -0400 Subject: [PATCH] feat: split directives into separate modules --- source/connect-array/connect-array.module.ts | 11 +++++++++++ source/{ => connect-array}/connect-array.ts | 8 ++++---- source/connect-array/index.ts | 2 ++ source/{ => connect}/connect-base.ts | 4 ++-- source/{ => connect}/connect-reactive.ts | 2 +- source/connect/connect.module.ts | 12 ++++++++++++ source/{ => connect}/connect.test.ts | 0 source/{ => connect}/connect.ts | 2 +- source/connect/index.ts | 4 ++++ source/index.ts | 2 -- source/module.ts | 20 +++++++------------- 11 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 source/connect-array/connect-array.module.ts rename source/{ => connect-array}/connect-array.ts (97%) create mode 100644 source/connect-array/index.ts rename source/{ => connect}/connect-base.ts (97%) rename source/{ => connect}/connect-reactive.ts (89%) create mode 100644 source/connect/connect.module.ts rename source/{ => connect}/connect.test.ts (100%) rename source/{ => connect}/connect.ts (90%) create mode 100644 source/connect/index.ts diff --git a/source/connect-array/connect-array.module.ts b/source/connect-array/connect-array.module.ts new file mode 100644 index 0000000..bd26390 --- /dev/null +++ b/source/connect-array/connect-array.module.ts @@ -0,0 +1,11 @@ +import { NgModule } from '@angular/core'; + +import { ConnectArray } from './connect-array'; + +const declarations = [ConnectArray]; + +@NgModule({ + declarations: [...declarations], + exports: [...declarations], +}) +export class NgReduxFormConnectArrayModule {} diff --git a/source/connect-array.ts b/source/connect-array/connect-array.ts similarity index 97% rename from source/connect-array.ts rename to source/connect-array/connect-array.ts index 61c52be..0da1b4a 100644 --- a/source/connect-array.ts +++ b/source/connect-array/connect-array.ts @@ -36,10 +36,10 @@ import { } from '@angular/forms'; import {Unsubscribe} from 'redux'; -import {ConnectBase} from './connect-base'; -import {FormStore} from './form-store'; -import {State} from './state'; -import {controlPath, selectValueAccessor} from './shims'; +import {ConnectBase} from '../connect'; +import {FormStore} from '../form-store'; +import {State} from '../state'; +import {controlPath, selectValueAccessor} from '../shims'; export class ConnectArrayTemplate { constructor( diff --git a/source/connect-array/index.ts b/source/connect-array/index.ts new file mode 100644 index 0000000..21f4af5 --- /dev/null +++ b/source/connect-array/index.ts @@ -0,0 +1,2 @@ +export * from './connect-array.module'; +export * from './connect-array'; diff --git a/source/connect-base.ts b/source/connect/connect-base.ts similarity index 97% rename from source/connect-base.ts rename to source/connect/connect-base.ts index a9f498d..c4c1ecc 100644 --- a/source/connect-base.ts +++ b/source/connect/connect-base.ts @@ -14,8 +14,8 @@ import { Unsubscribe } from 'redux'; import 'rxjs/add/operator/debounceTime'; -import { FormStore } from './form-store'; -import { State } from './state'; +import { FormStore } from '../form-store'; +import { State } from '../state'; export interface ControlPair { path: Array; diff --git a/source/connect-reactive.ts b/source/connect/connect-reactive.ts similarity index 89% rename from source/connect-reactive.ts rename to source/connect/connect-reactive.ts index 9d49e50..c7b62ba 100644 --- a/source/connect-reactive.ts +++ b/source/connect/connect-reactive.ts @@ -3,7 +3,7 @@ import { Input, } from '@angular/core'; -import {FormStore} from './form-store'; +import {FormStore} from '../form-store'; import {ConnectBase} from './connect-base'; diff --git a/source/connect/connect.module.ts b/source/connect/connect.module.ts new file mode 100644 index 0000000..165cd15 --- /dev/null +++ b/source/connect/connect.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; + +import { Connect } from './connect'; +import { ReactiveConnect } from './connect-reactive'; + +const declarations = [Connect, ReactiveConnect]; + +@NgModule({ + declarations: [...declarations], + exports: [...declarations], +}) +export class NgReduxFormConnectModule {} diff --git a/source/connect.test.ts b/source/connect/connect.test.ts similarity index 100% rename from source/connect.test.ts rename to source/connect/connect.test.ts diff --git a/source/connect.ts b/source/connect/connect.ts similarity index 90% rename from source/connect.ts rename to source/connect/connect.ts index cdc9b09..e8fb5f6 100644 --- a/source/connect.ts +++ b/source/connect/connect.ts @@ -2,7 +2,7 @@ import { Directive } from '@angular/core'; import { NgForm } from '@angular/forms'; -import {FormStore} from './form-store'; +import {FormStore} from '../form-store'; import {ConnectBase} from './connect-base'; diff --git a/source/connect/index.ts b/source/connect/index.ts new file mode 100644 index 0000000..e1537f3 --- /dev/null +++ b/source/connect/index.ts @@ -0,0 +1,4 @@ +export * from './connect-base'; +export * from './connect-reactive'; +export * from './connect.module'; +export * from './connect'; diff --git a/source/index.ts b/source/index.ts index de0191d..d942e12 100644 --- a/source/index.ts +++ b/source/index.ts @@ -3,8 +3,6 @@ export * from './form-reducer'; export * from './form-exception'; export * from './form-store'; export * from './configure'; -export * from './connect-base'; -export * from './connect-reactive'; export * from './connect'; export * from './connect-array'; export * from './module'; diff --git a/source/module.ts b/source/module.ts index eca3bb4..2e88e5e 100644 --- a/source/module.ts +++ b/source/module.ts @@ -1,11 +1,9 @@ import {NgModule} from '@angular/core'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; - import {NgRedux} from '@angular-redux/store'; -import {ReactiveConnect} from './connect-reactive'; -import {Connect} from './connect'; -import {ConnectArray} from './connect-array'; +import {NgReduxFormConnectModule} from './connect'; +import {NgReduxFormConnectArrayModule} from './connect-array'; import {FormStore} from './form-store'; export function formStoreFactory(ngRedux: NgRedux) { @@ -16,16 +14,12 @@ export function formStoreFactory(ngRedux: NgRedux) { imports: [ FormsModule, ReactiveFormsModule, - ], - declarations: [ - Connect, - ReactiveConnect, - ConnectArray, + NgReduxFormConnectModule, + NgReduxFormConnectArrayModule, ], exports: [ - Connect, - ReactiveConnect, - ConnectArray, + NgReduxFormConnectModule, + NgReduxFormConnectArrayModule ], providers: [ { @@ -33,6 +27,6 @@ export function formStoreFactory(ngRedux: NgRedux) { useFactory: formStoreFactory, deps: [NgRedux], }, - ] + ], }) export class NgReduxFormModule {}