feat(added-providerfn): added provider function (#5)

* feat(added-providerfn): added provider function * feat(added-providerfn): added provider function --------- Co-authored-by: Maxime Schlosser <maxime.schlosser@wity.sh>
paddls · Oct 18, 2024 · fcbceb9 · fcbceb9
1 parent 35ae687
commit fcbceb9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 18 deletions.
diff --git a/projects/ngx-form-app/src/app/app.module.ts b/projects/ngx-form-app/src/app/app.module.ts
@@ -3,9 +3,9 @@ import {NgModule} from '@angular/core';
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app/app.component';
 import {ReactiveFormsModule} from '@angular/forms';
-import {NgxFormModule} from '@paddls/ngx-form';
 import {AddressFormComponent} from './address-form/address-form.component';
 import {CompanyFormComponent} from './company-form/company-form.component';
+import {provideNgxForm} from "@paddls/ngx-form";
 
 @NgModule({
   declarations: [
@@ -16,10 +16,11 @@ import {CompanyFormComponent} from './company-form/company-form.component';
   imports: [
     AppRoutingModule,
     BrowserModule,
-    ReactiveFormsModule,
-    NgxFormModule.forRoot()
+    ReactiveFormsModule
+  ],
+  providers: [
+    provideNgxForm()
   ],
-  providers: [],
   bootstrap: [AppComponent]
 })
 export class AppModule {

diff --git a/projects/ngx-form/src/lib/ngx-form.module.ts b/projects/ngx-form/src/lib/ngx-form.module.ts
@@ -1,20 +1,34 @@
 import 'reflect-metadata';
 
-import {Injector, ModuleWithProviders, NgModule} from '@angular/core';
+import {APP_INITIALIZER, Injector, ModuleWithProviders, NgModule, Provider} from '@angular/core';
 import {NgxFormBuilder} from './core/ngx-form.builder';
 import {AsyncValidatorResolver} from './core/async-validator.resolver';
 import {DisableOnHandler} from './core/handler/disable-on.handler';
 import {ValidatorResolver} from './core/validator.resolver';
 import {OnValueChangesHandler} from './core/handler/on-value-changes.handler';
 
+export function provideNgxForm(): Provider[] {
+  return [
+    {
+      provide: APP_INITIALIZER,
+      useFactory: (injector: Injector) => (): void => {
+        NgxFormModule.injector = injector;
+      },
+      multi: true,
+      deps: [Injector]
+    },
+    NgxFormBuilder,
+    ValidatorResolver,
+    AsyncValidatorResolver,
+    DisableOnHandler,
+    OnValueChangesHandler
+  ]
+}
+
 @NgModule()
 export class NgxFormModule {
 
-  private static injector: Injector = null;
-
-  public constructor(injector: Injector) {
-    NgxFormModule.injector = injector;
-  }
+  public static injector: Injector = null;
 
   public static getNgxFormBuilder(): NgxFormBuilder {
     return NgxFormModule.injector.get(NgxFormBuilder);
@@ -24,16 +38,13 @@ export class NgxFormModule {
     return NgxFormModule.injector;
   }
 
+  /**
+   * @deprecated use provideNgxForm() instead
+   */
   public static forRoot(): ModuleWithProviders<NgxFormModule> {
     return {
       ngModule: NgxFormModule,
-      providers: [
-        NgxFormBuilder,
-        ValidatorResolver,
-        AsyncValidatorResolver,
-        DisableOnHandler,
-        OnValueChangesHandler
-      ]
+      providers: provideNgxForm()
     };
   }
 }
diff --git a/projects/ngx-form/src/public-api.ts b/projects/ngx-form/src/public-api.ts
@@ -18,4 +18,4 @@ export {NgxFormGroup} from './lib/model/ngx-form-group.model';
 
 export {NgxFormBuilder} from './lib/core/ngx-form.builder';
 
-export {NgxFormModule} from './lib/ngx-form.module';
+export {NgxFormModule, provideNgxForm} from './lib/ngx-form.module';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,4 @@ export {NgxFormGroup} from './lib/model/ngx-form-group.model';

		export {NgxFormBuilder} from './lib/core/ngx-form.builder';

		export {NgxFormModule} from './lib/ngx-form.module';
		export {NgxFormModule, provideNgxForm} from './lib/ngx-form.module';