feat(content): create injection tokens with factory (#3265)

libs/content/driver/src/interfaces/service.interface.ts

@@ -5,8 +5,7 @@ import {
   DaffContentBlock,
   DaffContentBlockCollection,
 } from '@daffodil/content';
-
-export const DaffContentDriver = new InjectionToken<DaffContentServiceInterface>('DaffContentDriver');
+import { createSingletonInjectionToken } from '@daffodil/core';
 
 /**
  * Query content objects accessible by the logged-in user.
@@ -19,3 +18,8 @@ export interface DaffContentServiceInterface<
    */
   getBlocks(...blockIds: T['id'][]): Observable<DaffContentBlockCollection<T>>;
 }
+
+export const {
+  token: DaffContentDriver,
+  provider: provideDaffContentDriver,
+} = createSingletonInjectionToken<DaffContentServiceInterface>('DaffContentDriver');

libs/content/state/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_CONTENT_ERROR_MATCHER = new InjectionToken<typeof daffTransformErrorToStateError>(
-  'DAFF_CONTENT_ERROR_MATCHER',
-  { factory: () => 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_CONTENT_ERROR_MATCHER,
+  /**
+   * Provider for {@link DAFF_CONTENT_ERROR_MATCHER}.
+   */
+  provider: provideDaffContentErrorMatcher,
+} = createSingleInjectionToken<typeof daffTransformErrorToStateError>('DAFF_CONTENT_ERROR_MATCHER');