feat(all): use provider functions (#3288)

griest024 · web-flow · commit 166a876f250f · 2024-10-16T15:27:58.000-04:00
diff --git a/apps/daffio/src/app/app.server.module.ts b/apps/daffio/src/app/app.server.module.ts
@@ -4,7 +4,7 @@ import { provideServerRendering } from '@angular/platform-server';
 import { DaffioAppComponent } from './app.component';
 import { AppModule } from './app.module';
 import { DaffioAssetFetchServerService } from './core/assets/fetch/server.service';
-import { DaffioAssetFetchService } from './core/assets/fetch/service.interface';
+import { provideDaffioAssetFetchService } from './core/assets/fetch/service.interface';
 import { provideServerDocsPath } from './docs/services/docs-path-server';
 
 @NgModule({
@@ -15,10 +15,7 @@ import { provideServerDocsPath } from './docs/services/docs-path-server';
   providers: [
     provideServerRendering(),
     provideServerDocsPath(),
-    {
-      provide: DaffioAssetFetchService,
-      useExisting: DaffioAssetFetchServerService,
-    },
+    provideDaffioAssetFetchService(DaffioAssetFetchServerService),
   ],
 })
 export class AppServerModule {}
diff --git a/libs/authorizenet/driver/in-memory/src/drivers/authorize-net-driver.module.ts b/libs/authorizenet/driver/in-memory/src/drivers/authorize-net-driver.module.ts
@@ -6,7 +6,7 @@ import {
 
 import {
   provideDaffAuthorizeNetDriver,
-  DaffAuthorizeNetPaymentId,
+  provideDaffAuthorizeNetPaymentId,
 } from '@daffodil/authorizenet/driver';
 import { provideDaffInMemoryBackends } from '@daffodil/driver/in-memory';
 
@@ -26,10 +26,7 @@ export class DaffAuthorizeNetInMemoryDriverModule {
       ngModule: DaffAuthorizeNetInMemoryDriverModule,
       providers: [
         provideDaffAuthorizeNetDriver(DaffInMemoryAuthorizeNetService),
-        {
-          provide: DaffAuthorizeNetPaymentId,
-          useValue: DAFF_IN_MEMORY_AUTHORIZE_NET_PAYMENT_ID,
-        },
+        provideDaffAuthorizeNetPaymentId(DAFF_IN_MEMORY_AUTHORIZE_NET_PAYMENT_ID),
         provideDaffInMemoryBackends(
           DaffInMemoryBackendAuthorizenetService,
         ),
diff --git a/libs/authorizenet/driver/magento/src/authorize-net.module.ts b/libs/authorizenet/driver/magento/src/authorize-net.module.ts
@@ -9,7 +9,7 @@ import {
   provideDaffAuthorizeNetConfigToken,
   provideDaffAuthorizeNetDriver,
   provideDaffAuthorizeNetPaymentDriver,
-  DaffAuthorizeNetPaymentId,
+  provideDaffAuthorizeNetPaymentId,
 } from '@daffodil/authorizenet/driver';
 
 import { MAGENTO_AUTHORIZE_NET_PAYMENT_ID } from './authorize-net-payment-id';
@@ -33,10 +33,7 @@ export class DaffMagentoAuthorizeNetDriverModule {
         provideDaffAuthorizeNetConfigToken(config),
         provideDaffAuthorizeNetDriver(DaffMagentoAuthorizeNetService),
         provideDaffAuthorizeNetPaymentDriver(DaffMagentoAuthorizeNetPaymentService),
-        {
-          provide: DaffAuthorizeNetPaymentId,
-          useValue: MAGENTO_AUTHORIZE_NET_PAYMENT_ID,
-        },
+        provideDaffAuthorizeNetPaymentId(MAGENTO_AUTHORIZE_NET_PAYMENT_ID),
       ],
     };
   }
diff --git a/libs/cart-store-credit/driver/magento/src/driver.module.ts b/libs/cart-store-credit/driver/magento/src/driver.module.ts
@@ -6,7 +6,7 @@ import {
 
 import {
   provideDaffCartMagentoCartTransforms,
-  DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS,
+  provideDaffCartMagentoExtraCartFragments,
 } from '@daffodil/cart/driver/magento';
 import { provideDaffCartStoreCreditDriver } from '@daffodil/cart-store-credit/driver';
 
@@ -25,11 +25,7 @@ export class DaffCartStoreCreditMagentoDriverModule {
       ngModule: DaffCartStoreCreditMagentoDriverModule,
       providers: [
         provideDaffCartStoreCreditDriver(DaffCartStoreCreditMagentoService),
-        {
-          provide: DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS,
-          useValue: magentoCartStoreCreditFragment,
-          multi: true,
-        },
+        provideDaffCartMagentoExtraCartFragments(magentoCartStoreCreditFragment),
         provideDaffCartMagentoCartTransforms(
           magentoCartWithStoreCreditTransform,
         ),
diff --git a/libs/cart/driver/magento/src/injection-tokens/public_api.ts b/libs/cart/driver/magento/src/injection-tokens/public_api.ts
@@ -1,9 +1,3 @@
-export { DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS } from './fragments/cart';
-export {
-  provideDaffCartMagentoCartItemTransforms,
-  DAFF_CART_MAGENTO_CART_ITEM_TRANSFORMS,
-} from './transforms/cart-item/token';
-export {
-  provideDaffCartMagentoCartTransforms,
-  DAFF_CART_MAGENTO_CART_TRANSFORMS,
-} from './transforms/cart/token';
+export * from './fragments/cart';
+export * from './transforms/cart-item/token';
+export * from './transforms/cart/token';
diff --git a/libs/cart/driver/src/injection-tokens/public_api.ts b/libs/cart/driver/src/injection-tokens/public_api.ts
@@ -1,4 +1 @@
-export {
-  daffCartDriverProvideFreePaymentMethod,
-  DAFF_CART_DRIVER_FREE_PAYMENT_METHOD,
-} from './free-payment-method';
+export * from './free-payment-method';
diff --git a/libs/cart/guides/extensions.md b/libs/cart/guides/extensions.md
@@ -81,7 +81,7 @@ Only drivers that use GraphQL support extensible fragments because fragments are
 - Magento
 
 ### Magento
-Provide the `DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS` to query additional fields on a Magento cart query. This applies to all of the driver calls that return a `DaffCart`, which is most of them.
+Use `provideDaffCartMagentoExtraCartFragments` to query additional fields on a Magento cart query. This applies to all of the driver calls that return a `DaffCart`, which is most of them.
 
 The additional fields are present on the untyped `extra_attributes` field.
 
@@ -90,7 +90,7 @@ The following example demonstrates providing a GraphQL document using the `graph
 ```ts
 import gql from 'graphql-tag';
 import {
-  DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS,
+  provideDaffCartMagentoExtraCartFragments,
   DaffCartFacade,
   DaffCartLoad,
   DaffCart
@@ -112,11 +112,7 @@ const extraCartFragment = gql`
 @NgModule({
   ...,
   providers: [
-    {
-      provide: DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS,
-      useValue: extraCartFragment,
-      multi: true
-    }
+    provideDaffCartMagentoExtraCartFragments(extraCartFragment)
   ]
 })
 class AppModule {}
diff --git a/libs/cart/guides/usage.md b/libs/cart/guides/usage.md
@@ -48,21 +48,18 @@ class AppModule {}
 
 ```ts
 import {
-  DaffCartPaymentMethodIdMap,
+  provideDaffCartPaymentMethodIdMap,
   DaffCartFacade,
   DaffCartPaymentMethod
 } from '@daffodil/cart';
 
 @NgModule({
   ...,
   providers: [
-    {
-      provide: DaffCartPaymentMethodIdMap,
-      useValue: {
-        authorizenet_accept_js: 'authorizenet',
-        payflowpro: 'paypal'
-      }
-    }
+    provideDaffCartPaymentMethodIdMap({
+      authorizenet_accept_js: 'authorizenet',
+      payflowpro: 'paypal'
+    })
   ]
 })
 class AppModule {}
diff --git a/libs/cart/state/src/cart-state.module.ts b/libs/cart/state/src/cart-state.module.ts
@@ -22,7 +22,7 @@ import { DaffCartShippingAddressEffects } from './effects/cart-shipping-address.
 import { DaffCartShippingInformationEffects } from './effects/cart-shipping-information.effects';
 import { DaffCartShippingMethodsEffects } from './effects/cart-shipping-methods.effects';
 import { DaffCartEffects } from './effects/cart.effects';
-import { DaffCartItemStateDebounceTime } from './injection-tokens/cart-item-state-debounce-time';
+import { provideDaffCartItemStateDebounceTime } from './injection-tokens/cart-item-state-debounce-time';
 import { daffCartPaymentReducer } from './reducers/cart-payment/payment.reducer';
 import { DAFF_CART_STORE_FEATURE_KEY } from './reducers/public_api';
 import { DAFF_CART_STORE_CONFIG } from './reducers/token/config.token';
@@ -48,7 +48,7 @@ import { DAFF_CART_REDUCERS } from './reducers/token/reducers.token';
     ]),
   ],
   providers: [
-    { provide: DaffCartItemStateDebounceTime, useValue: 4000 },
+    provideDaffCartItemStateDebounceTime(4000),
     ...daffPaymentProvideExtraReducers(combineReducers({
       payment: daffCartPaymentReducer,
     })),
diff --git a/libs/cart/state/src/injection-tokens/public_api.ts b/libs/cart/state/src/injection-tokens/public_api.ts
@@ -1,2 +1,2 @@
-export { DaffCartItemStateDebounceTime } from './cart-item-state-debounce-time';
+export * from './cart-item-state-debounce-time';
 export * from './error-matcher.token';
diff --git a/libs/core/guides/storage.md b/libs/core/guides/storage.md
@@ -29,7 +29,7 @@ import {
     {
       provide: DaffPersistenceServiceToken,
       deps: [PLATFORM_ID],
-      factory: (platformId: string) => isPlatformBrowser(platformId)
+      useFactory: (platformId: string) => isPlatformBrowser(platformId)
         ? new DaffLocalStorageService(platformId)
         : new DaffErrorStorageService()
     }
diff --git a/libs/core/src/storage/persistence-server-safe.token.ts b/libs/core/src/storage/persistence-server-safe.token.ts
@@ -16,7 +16,7 @@ export const {
    * Provides noop for the persistence service on the server.
    */
   token: DaffServerSafePersistenceServiceToken,
-  provider: provideDaffDaffServerSafePersistenceServiceToken,
+  provider: provideDaffServerSafePersistenceServiceToken,
 } = createSingleInjectionToken<DaffPersistenceService>(
   'DaffServerSafePersistenceService',
   {
diff --git a/libs/design/media-gallery/src/thumbnail/thumbnail-compat.token.ts b/libs/design/media-gallery/src/thumbnail/thumbnail-compat.token.ts
@@ -5,5 +5,5 @@ export const {
    * A multi provider injection token that marks a component as renderable for the `DaffMediaRendererComponent`.
    */
   token: daffThumbnailCompatToken,
-  provider: provideDaffdaffThumbnailCompatToken,
+  provider: provideDaffThumbnailCompatToken,
 } = createSingleInjectionToken<unknown>('thumbnailCompatToken');
diff --git a/libs/driver/magento/src/magento.module.ts b/libs/driver/magento/src/magento.module.ts
@@ -1,15 +1,12 @@
 import { NgModule } from '@angular/core';
 
-import { DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE } from '@daffodil/driver';
+import { provideDaffDriverHttpClientCacheService } from '@daffodil/driver';
 
 import { DaffDriverHttpClientCacheMagentoService } from './graphql/cache.service';
 
 @NgModule({
   providers: [
-    {
-      provide: DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE,
-      useExisting: DaffDriverHttpClientCacheMagentoService,
-    },
+    provideDaffDriverHttpClientCacheService(DaffDriverHttpClientCacheMagentoService),
   ],
 })
 export class DaffDriverMagentoModule {}
diff --git a/libs/driver/src/http-client-cache/service.token.ts b/libs/driver/src/http-client-cache/service.token.ts
@@ -1,14 +1,14 @@
 import { inject } from '@angular/core';
 
-import { createSingleInjectionToken } from '@daffodil/core';
+import { createSingletonInjectionToken } from '@daffodil/core';
 
 import { DaffDriverHttpClientCacheNoopService } from './noop.service';
 import { DaffDriverHttpClientCacheServiceInterface } from './service.type';
 
 export const {
   token: DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE,
   provider: provideDaffDriverHttpClientCacheService,
-} = createSingleInjectionToken<DaffDriverHttpClientCacheServiceInterface>(
+} = createSingletonInjectionToken<DaffDriverHttpClientCacheServiceInterface>(
   'DAFF_DRIVER_HTTP_CLIENT_CACHE_SERVICE',
   { factory: () => inject(DaffDriverHttpClientCacheNoopService) },
 );
diff --git a/libs/related-products/driver/in-memory/src/in-memory.module.ts b/libs/related-products/driver/in-memory/src/in-memory.module.ts
@@ -4,7 +4,7 @@ import {
   ModuleWithProviders,
 } from '@angular/core';
 
-import { DAFF_PRODUCT_IN_MEMORY_EXTRA_PRODUCT_RESPONSE_TRANSFORMS } from '@daffodil/product/driver/in-memory';
+import { provideDaffProductInMemoryExtraProductResponseTransforms } from '@daffodil/product/driver/in-memory';
 import { provideDaffProductExtraProductFactories } from '@daffodil/product/testing';
 import { DaffRelatedProductFactory } from '@daffodil/related-products/testing';
 
@@ -24,11 +24,7 @@ export class DaffRelatedProductsInMemoryDriverModule {
       ngModule: DaffRelatedProductsInMemoryDriverModule,
       providers: [
         provideDaffProductExtraProductFactories(DaffRelatedProductFactory),
-        {
-          provide: DAFF_PRODUCT_IN_MEMORY_EXTRA_PRODUCT_RESPONSE_TRANSFORMS,
-          useValue: transformInMemoryRelatedProducts,
-          multi: true,
-        },
+        provideDaffProductInMemoryExtraProductResponseTransforms(transformInMemoryRelatedProducts),
       ],
     };
   }
diff --git a/libs/related-products/state/src/state.module.ts b/libs/related-products/state/src/state.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { StoreModule } from '@ngrx/store';
 
-import { DAFF_PRODUCT_META_REDUCERS } from '@daffodil/product/state';
+import { daffProductProvideMetaReducers } from '@daffodil/product/state';
 
 import {
   DAFF_RELATED_PRODUCTS_STORE_FEATURE_KEY,
@@ -17,11 +17,7 @@ import {
     StoreModule.forFeature(DAFF_RELATED_PRODUCTS_STORE_FEATURE_KEY, daffRelatedProductsReducers),
   ],
   providers: [
-    {
-      provide: DAFF_PRODUCT_META_REDUCERS,
-      multi: true,
-      useValue: daffRelatedProductsDedupeMetaReducer,
-    },
+    daffProductProvideMetaReducers(daffRelatedProductsDedupeMetaReducer),
   ],
 })
 export class DaffRelatedProductStateModule {}
diff --git a/libs/search-category/driver/in-memory/src/in-memory.module.ts b/libs/search-category/driver/in-memory/src/in-memory.module.ts
@@ -4,7 +4,7 @@ import {
   ModuleWithProviders,
 } from '@angular/core';
 
-import { DAFF_SEARCH_IN_MEMORY_BACKENDS } from '@daffodil/search/driver/in-memory';
+import { provideDaffSearchInMemoryBackends } from '@daffodil/search/driver/in-memory';
 
 import { DaffSearchCategoryInMemoryBackendService } from './backend/search.service';
 
@@ -21,11 +21,7 @@ export class DaffSearchCategoryInMemoryDriverModule {
     return {
       ngModule: DaffSearchCategoryInMemoryDriverModule,
       providers: [
-        {
-          provide: DAFF_SEARCH_IN_MEMORY_BACKENDS,
-          useExisting: DaffSearchCategoryInMemoryBackendService,
-          multi: true,
-        },
+        provideDaffSearchInMemoryBackends(DaffSearchCategoryInMemoryBackendService),
       ],
     };
   }
diff --git a/libs/search-category/driver/magento/src/driver.module.ts b/libs/search-category/driver/magento/src/driver.module.ts
@@ -5,7 +5,10 @@ import {
 } from '@angular/core';
 
 import { provideDaffMagentoCacheableOperation } from '@daffodil/driver/magento';
-import { DAFF_SEARCH_FEDERATED_DRIVERS } from '@daffodil/search/driver/federated';
+import {
+  DAFF_SEARCH_FEDERATED_DRIVERS,
+  provideDaffSearchFederatedDrivers,
+} from '@daffodil/search/driver/federated';
 
 import { DaffSearchCategoryMagentoDriver } from './category-search.service';
 import { DAFF_MAGENTO_SEARCH_FOR_CATEGORIES_QUERY_NAME } from './queries/category-search';
@@ -26,11 +29,7 @@ export class DaffSearchCategoryMagentoDriverModule {
     return {
       ngModule: DaffSearchCategoryMagentoDriverModule,
       providers: [
-        {
-          provide: DAFF_SEARCH_FEDERATED_DRIVERS,
-          multi: true,
-          useExisting: DaffSearchCategoryMagentoDriver,
-        },
+        provideDaffSearchFederatedDrivers(DaffSearchCategoryMagentoDriver),
       ],
     };
   }
diff --git a/libs/search-product/driver/in-memory/src/in-memory.module.ts b/libs/search-product/driver/in-memory/src/in-memory.module.ts
@@ -4,7 +4,7 @@ import {
   ModuleWithProviders,
 } from '@angular/core';
 
-import { DAFF_SEARCH_IN_MEMORY_BACKENDS } from '@daffodil/search/driver/in-memory';
+import { provideDaffSearchInMemoryBackends } from '@daffodil/search/driver/in-memory';
 
 import { DaffSearchProductInMemoryBackendService } from './backend/search.service';
 
@@ -21,11 +21,7 @@ export class DaffSearchProductInMemoryDriverModule {
     return {
       ngModule: DaffSearchProductInMemoryDriverModule,
       providers: [
-        {
-          provide: DAFF_SEARCH_IN_MEMORY_BACKENDS,
-          useExisting: DaffSearchProductInMemoryBackendService,
-          multi: true,
-        },
+        provideDaffSearchInMemoryBackends(DaffSearchProductInMemoryBackendService),
       ],
     };
   }
diff --git a/libs/search-product/driver/magento/src/federated-driver.module.ts b/libs/search-product/driver/magento/src/federated-driver.module.ts
@@ -4,7 +4,10 @@ import {
   ModuleWithProviders,
 } from '@angular/core';
 
-import { DAFF_SEARCH_FEDERATED_DRIVERS } from '@daffodil/search/driver/federated';
+import {
+  DAFF_SEARCH_FEDERATED_DRIVERS,
+  provideDaffSearchFederatedDrivers,
+} from '@daffodil/search/driver/federated';
 
 import { DaffSearchProductMagentoCoreModule } from './core.module';
 import { DaffSearchProductMagentoDriver } from './product-search.service';
@@ -26,11 +29,7 @@ export class DaffSearchProductMagentoFederatedDriverModule {
     return {
       ngModule: DaffSearchProductMagentoFederatedDriverModule,
       providers: [
-        {
-          provide: DAFF_SEARCH_FEDERATED_DRIVERS,
-          multi: true,
-          useExisting: DaffSearchProductMagentoDriver,
-        },
+        provideDaffSearchFederatedDrivers(DaffSearchProductMagentoDriver),
       ],
     };
   }
diff --git a/libs/seo/router/src/canonical/updates.token.ts b/libs/seo/router/src/canonical/updates.token.ts
diff --git a/libs/seo/router/src/meta/updates.token.ts b/libs/seo/router/src/meta/updates.token.ts
diff --git a/libs/seo/router/src/title/updates.token.ts b/libs/seo/router/src/title/updates.token.ts
diff --git a/libs/upsell-products/driver/in-memory/src/in-memory.module.ts b/libs/upsell-products/driver/in-memory/src/in-memory.module.ts
diff --git a/libs/upsell-products/state/src/state.module.ts b/libs/upsell-products/state/src/state.module.ts

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-export { DaffCartItemStateDebounceTime } from './cart-item-state-debounce-time';`
	`1`	`+export * from './cart-item-state-debounce-time';`
`2`	`2`	`export * from './error-matcher.token';`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import {`
`29`	`29`	`{`
`30`	`30`	`provide: DaffPersistenceServiceToken,`
`31`	`31`	`deps: [PLATFORM_ID],`
`32`		`- factory: (platformId: string) => isPlatformBrowser(platformId)`
	`32`	`+ useFactory: (platformId: string) => isPlatformBrowser(platformId)`
`33`	`33`	`? new DaffLocalStorageService(platformId)`
`34`	`34`	`: new DaffErrorStorageService()`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export const {`
`16`	`16`	`* Provides noop for the persistence service on the server.`
`17`	`17`	`*/`
`18`	`18`	`token: DaffServerSafePersistenceServiceToken,`
`19`		`- provider: provideDaffDaffServerSafePersistenceServiceToken,`
	`19`	`+ provider: provideDaffServerSafePersistenceServiceToken,`
`20`	`20`	`} = createSingleInjectionToken<DaffPersistenceService>(`
`21`	`21`	`'DaffServerSafePersistenceService',`
`22`	`22`	`{`