feat(contact): create injection tokens with factory (#3239)

libs/contact/driver/hubspot/src/config/contact-config.interface.ts

@@ -1,7 +1,7 @@
-import { InjectionToken } from '@angular/core';
-
+import { createSingleInjectionToken } from '@daffodil/core';
 import { DaffHubspotConfig } from '@daffodil/driver/hubspot';
 
-export const DaffContactConfigToken = new InjectionToken<DaffHubspotConfig>(
-  'DaffContactConfig',
-);
+export const {
+  token: DaffContactConfigToken,
+  provider: daffProvideContactConfigToken,
+} = createSingleInjectionToken<DaffHubspotConfig>('DaffContactConfig');

libs/contact/driver/hubspot/src/token/hubspot-forms.token.ts

@@ -1,26 +1,30 @@
 import { DOCUMENT } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import {
-  inject,
-  InjectionToken,
-} from '@angular/core';
+import { inject } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 
+import { createSingleInjectionToken } from '@daffodil/core';
 import {
   DaffHubspotFormsService,
   daffHubspotFormsServiceFactory,
 } from '@daffodil/driver/hubspot';
 
 import { DaffContactConfigToken } from '../config/contact-config.interface';
 
-export const DAFF_CONTACT_HUBSPOT_FORMS_TOKEN = new InjectionToken<DaffHubspotFormsService>('DAFF_CONTACT_HUBSPOT_FORMS_TOKEN',
+export const {
+  token: DAFF_CONTACT_HUBSPOT_FORMS_TOKEN,
+  provider: daffProvideContactHubspotFormsToken,
+} = createSingleInjectionToken<DaffHubspotFormsService>(
+  'DAFF_CONTACT_HUBSPOT_FORMS_TOKEN',
   {
-    providedIn: 'root', factory: () => daffHubspotFormsServiceFactory(
+    providedIn: 'root',
+    factory: () => daffHubspotFormsServiceFactory(
       inject(HttpClient),
       inject(DOCUMENT),
       inject(Router),
       inject(Title),
       inject(DaffContactConfigToken),
     ),
-  });
+  },
+);

libs/contact/driver/src/interfaces/contact-service.interface.ts

@@ -1,7 +1,11 @@
-import { InjectionToken } from '@angular/core';
 import { Observable } from 'rxjs';
 
-export const DaffContactDriver = new InjectionToken<DaffContactServiceInterface<any, any>>('DaffContactDriver');
+import { createSingleInjectionToken } from '@daffodil/core';
+
+export const {
+  token: DaffContactDriver,
+  provider: daffProvideContactDriver,
+} = createSingleInjectionToken<DaffContactServiceInterface<any, any>>('DaffContactDriver');
 export interface DaffContactServiceInterface<T, V> {
   send(payload: T): Observable<V>;
 }

libs/contact/src/injection-tokens/error-matcher.token.ts

@@ -1,12 +1,14 @@
-import { InjectionToken } from '@angular/core';
-
+import { createSingleInjectionToken } from '@daffodil/core';
 import { daffTransformErrorToStateError } from '@daffodil/core/state';
 
-/**
- * Transforms `DaffError`s into `DaffStateError`s before they are serialized into state.
- * Can be used to further refine Daffodil errors into more specific app errors.
- */
-export const DAFF_CONTACT_ERROR_MATCHER = new InjectionToken<typeof daffTransformErrorToStateError>(
+export const {
+  /**
+   * Transforms `DaffError`s into `DaffStateError`s before they are serialized into state.
+   * Can be used to further refine Daffodil errors into more specific app errors.
+   */
+  token: DAFF_CONTACT_ERROR_MATCHER,
+  provider: daffProvideContactErrorMatcher,
+} = createSingleInjectionToken<typeof daffTransformErrorToStateError>(
   'DAFF_CONTACT_ERROR_MATCHER',
   { factory: () => daffTransformErrorToStateError },
 );

libs/contact/src/injection-tokens/public_api.ts

@@ -1 +1 @@
-export { DAFF_CONTACT_ERROR_MATCHER } from './error-matcher.token';
+export * from './error-matcher.token';