Merge pull request dschnelldavis#170 from jscharett/master

Fixed lazy loaded modules issue

Author: dschnelldavis

src/lib/src/framework-library/bootstrap-3-framework/bootstrap-3-framework.module.ts

@@ -1,18 +1,23 @@
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { WidgetLibraryModule } from '../../widget-library/widget-library.module';
 
-import { WidgetLibraryService } from '../../widget-library/widget-library.service';
-import { FrameworkLibraryService } from '../framework-library.service';
+import { JsonSchemaFormService } from '../../json-schema-form.service';
 
 import { Bootstrap3FrameworkComponent } from './bootstrap-3-framework.component';
 
 @NgModule({
   imports:         [ CommonModule, WidgetLibraryModule ],
   declarations:    [ Bootstrap3FrameworkComponent ],
   exports:         [ Bootstrap3FrameworkComponent ],
-  entryComponents: [ Bootstrap3FrameworkComponent ],
-  providers:       [ WidgetLibraryService, FrameworkLibraryService ]
+  entryComponents: [ Bootstrap3FrameworkComponent ]
 })
-export class Bootstrap3FrameworkModule { }
+export class Bootstrap3FrameworkModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: Bootstrap3FrameworkModule,
+      providers: [ JsonSchemaFormService ]
+    }
+  }
+}

src/lib/src/framework-library/bootstrap-4-framework/bootstrap-4-framework.module.ts

@@ -1,18 +1,23 @@
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
 import { WidgetLibraryModule } from '../../widget-library/widget-library.module';
 
-import { WidgetLibraryService } from '../../widget-library/widget-library.service';
-import { FrameworkLibraryService } from '../framework-library.service';
+import { JsonSchemaFormService } from '../../json-schema-form.service';
 
 import { Bootstrap4FrameworkComponent } from './bootstrap-4-framework.component';
 
 @NgModule({
   imports:         [ CommonModule, WidgetLibraryModule ],
   declarations:    [ Bootstrap4FrameworkComponent ],
   exports:         [ Bootstrap4FrameworkComponent ],
-  entryComponents: [ Bootstrap4FrameworkComponent ],
-  providers:       [ WidgetLibraryService, FrameworkLibraryService ]
+  entryComponents: [ Bootstrap4FrameworkComponent ]
 })
-export class Bootstrap4FrameworkModule { }
+export class Bootstrap4FrameworkModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: Bootstrap4FrameworkModule,
+      providers: [ JsonSchemaFormService ]
+    }
+  }
+}

src/lib/src/framework-library/framework-library.module.ts

@@ -1,8 +1,8 @@
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { WidgetLibraryModule } from '../widget-library/widget-library.module';
 import { WidgetLibraryService } from '../widget-library/widget-library.service';
+import { WidgetLibraryModule } from '../widget-library/widget-library.module';
 
 import { FrameworkLibraryService } from './framework-library.service';
 import { NoFrameworkComponent } from './no-framework.component';
@@ -15,7 +15,13 @@ import { NoFrameworkComponent } from './no-framework.component';
   exports:         [
     NoFrameworkComponent,
   ],
-  entryComponents: [ NoFrameworkComponent ],
-  providers:       [ WidgetLibraryService, FrameworkLibraryService ]
+  entryComponents: [ NoFrameworkComponent ]
 })
-export class FrameworkLibraryModule { }
+export class FrameworkLibraryModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: FrameworkLibraryModule,
+      providers: [ WidgetLibraryService, FrameworkLibraryService ]
+    }
+  }
+}

src/lib/src/framework-library/material-design-framework/material-design-framework.module.ts

@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FlexLayoutModule } from '@angular/flex-layout';
@@ -36,7 +36,13 @@ import { MATERIAL_FRAMEWORK_COMPONENTS } from './index';
   ],
   declarations:    [ ...MATERIAL_FRAMEWORK_COMPONENTS ],
   exports:         [ ...MATERIAL_FRAMEWORK_COMPONENTS ],
-  entryComponents: [ ...MATERIAL_FRAMEWORK_COMPONENTS ],
-  providers:       [ JsonSchemaFormService ]
+  entryComponents: [ ...MATERIAL_FRAMEWORK_COMPONENTS ]
 })
-export class MaterialDesignFrameworkModule { }
+export class MaterialDesignFrameworkModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MaterialDesignFrameworkModule,
+      providers: [ JsonSchemaFormService ]
+    }
+  }
+}

src/lib/src/json-schema-form.module.ts

@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
@@ -8,7 +8,6 @@ import { WidgetLibraryModule } from './widget-library/widget-library.module';
 import { JsonSchemaFormComponent } from './json-schema-form.component';
 
 import { JsonSchemaFormService } from './json-schema-form.service';
-import { FrameworkLibraryService } from './framework-library/framework-library.service';
 
 @NgModule({
   imports: [
@@ -18,9 +17,15 @@ import { FrameworkLibraryService } from './framework-library/framework-library.s
   declarations: [ JsonSchemaFormComponent ],
   exports: [
     JsonSchemaFormComponent, FrameworkLibraryModule, WidgetLibraryModule
-  ],
-  providers: [
-    JsonSchemaFormService, FrameworkLibraryService
   ]
 })
-export class JsonSchemaFormModule { }
+export class JsonSchemaFormModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: JsonSchemaFormModule,
+      providers: [ ]
+        .concat([JsonSchemaFormService])
+        .concat(FrameworkLibraryModule.forRoot().providers)
+    }
+  }
+}

src/lib/src/widget-library/widget-library.module.ts

@@ -1,10 +1,9 @@
-import { NgModule } from '@angular/core';
+import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 import { OrderableDirective } from '../shared/orderable.directive';
 
-import { WidgetLibraryService } from './widget-library.service';
 import { JsonSchemaFormService } from '../json-schema-form.service';
 
 import { BASIC_WIDGETS } from './index';
@@ -14,6 +13,13 @@ import { BASIC_WIDGETS } from './index';
   declarations:    [ ...BASIC_WIDGETS, OrderableDirective ],
   exports:         [ ...BASIC_WIDGETS, OrderableDirective ],
   entryComponents: [ ...BASIC_WIDGETS ],
-  providers:       [ JsonSchemaFormService, WidgetLibraryService ]
+  providers:       [ JsonSchemaFormService ]
 })
-export class WidgetLibraryModule { }
+export class WidgetLibraryModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: WidgetLibraryModule,
+      providers: [ JsonSchemaFormService ]
+    }
+  }
+}