Skip to content

Commit b69b8ec

Browse files
authored
feat(all): provide drivers with provider functions (#3275)
1 parent c6668fc commit b69b8ec

File tree

70 files changed

+243
-583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+243
-583
lines changed

libs/auth/driver/in-memory/src/drivers/auth-driver.module.ts

+8-20
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {
55
} from '@angular/core';
66

77
import {
8-
DaffLoginDriver,
9-
DaffRegisterDriver,
10-
DaffAuthDriver,
11-
DaffResetPasswordDriver,
8+
provideDaffLoginDriver,
9+
provideDaffRegisterDriver,
10+
provideDaffAuthDriver,
11+
provideDaffResetPasswordDriver,
1212
} from '@daffodil/auth/driver';
1313
import { provideDaffInMemoryBackends } from '@daffodil/driver/in-memory';
1414

@@ -28,22 +28,10 @@ export class DaffAuthInMemoryDriverModule {
2828
return {
2929
ngModule: DaffAuthInMemoryDriverModule,
3030
providers: [
31-
{
32-
provide: DaffLoginDriver,
33-
useExisting: DaffInMemoryLoginService,
34-
},
35-
{
36-
provide: DaffRegisterDriver,
37-
useExisting: DaffInMemoryRegisterService,
38-
},
39-
{
40-
provide: DaffAuthDriver,
41-
useExisting: DaffInMemoryAuthService,
42-
},
43-
{
44-
provide: DaffResetPasswordDriver,
45-
useExisting: DaffInMemoryResetPasswordService,
46-
},
31+
provideDaffLoginDriver(DaffInMemoryLoginService),
32+
provideDaffRegisterDriver(DaffInMemoryRegisterService),
33+
provideDaffAuthDriver(DaffInMemoryAuthService),
34+
provideDaffResetPasswordDriver(DaffInMemoryResetPasswordService),
4735
provideDaffInMemoryBackends(
4836
DaffInMemoryBackendAuthService,
4937
),

libs/auth/driver/magento/src/auth-driver.module.ts

+8-20
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {
55
} from '@angular/core';
66

77
import {
8-
DaffRegisterDriver,
9-
DaffLoginDriver,
10-
DaffAuthDriver,
11-
DaffResetPasswordDriver,
8+
provideDaffRegisterDriver,
9+
provideDaffLoginDriver,
10+
provideDaffAuthDriver,
11+
provideDaffResetPasswordDriver,
1212
} from '@daffodil/auth/driver';
1313

1414
import { DaffMagentoAuthService } from './auth.service';
@@ -26,22 +26,10 @@ export class DaffAuthMagentoDriverModule {
2626
return {
2727
ngModule: DaffAuthMagentoDriverModule,
2828
providers: [
29-
{
30-
provide: DaffRegisterDriver,
31-
useExisting: DaffMagentoRegisterService,
32-
},
33-
{
34-
provide: DaffLoginDriver,
35-
useExisting: DaffMagentoLoginService,
36-
},
37-
{
38-
provide: DaffAuthDriver,
39-
useExisting: DaffMagentoAuthService,
40-
},
41-
{
42-
provide: DaffResetPasswordDriver,
43-
useExisting: DaffMagentoResetPasswordService,
44-
},
29+
provideDaffRegisterDriver(DaffMagentoRegisterService),
30+
provideDaffLoginDriver(DaffMagentoLoginService),
31+
provideDaffAuthDriver(DaffMagentoAuthService),
32+
provideDaffResetPasswordDriver(DaffMagentoResetPasswordService),
4533
],
4634
};
4735
}

libs/auth/driver/testing/src/drivers/auth-driver.module.ts

+8-20
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {
55
} from '@angular/core';
66

77
import {
8-
DaffLoginDriver,
9-
DaffRegisterDriver,
10-
DaffAuthDriver,
11-
DaffResetPasswordDriver,
8+
provideDaffLoginDriver,
9+
provideDaffRegisterDriver,
10+
provideDaffAuthDriver,
11+
provideDaffResetPasswordDriver,
1212
} from '@daffodil/auth/driver';
1313

1414
import { DaffTestingAuthService } from './auth/auth.service';
@@ -26,22 +26,10 @@ export class DaffAuthTestingDriverModule {
2626
return {
2727
ngModule: DaffAuthTestingDriverModule,
2828
providers: [
29-
{
30-
provide: DaffLoginDriver,
31-
useExisting: DaffTestingLoginService,
32-
},
33-
{
34-
provide: DaffRegisterDriver,
35-
useExisting: DaffTestingRegisterService,
36-
},
37-
{
38-
provide: DaffAuthDriver,
39-
useExisting: DaffTestingAuthService,
40-
},
41-
{
42-
provide: DaffResetPasswordDriver,
43-
useExisting: DaffTestingResetPasswordService,
44-
},
29+
provideDaffLoginDriver(DaffTestingLoginService),
30+
provideDaffRegisterDriver(DaffTestingRegisterService),
31+
provideDaffAuthDriver(DaffTestingAuthService),
32+
provideDaffResetPasswordDriver(DaffTestingResetPasswordService),
4533
],
4634
};
4735
}

libs/authorizenet/driver/in-memory/src/drivers/authorize-net-driver.module.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from '@angular/core';
66

77
import {
8-
DaffAuthorizeNetDriver,
8+
provideDaffAuthorizeNetDriver,
99
DaffAuthorizeNetPaymentId,
1010
} from '@daffodil/authorizenet/driver';
1111
import { provideDaffInMemoryBackends } from '@daffodil/driver/in-memory';
@@ -25,10 +25,7 @@ export class DaffAuthorizeNetInMemoryDriverModule {
2525
return {
2626
ngModule: DaffAuthorizeNetInMemoryDriverModule,
2727
providers: [
28-
{
29-
provide: DaffAuthorizeNetDriver,
30-
useExisting: DaffInMemoryAuthorizeNetService,
31-
},
28+
provideDaffAuthorizeNetDriver(DaffInMemoryAuthorizeNetService),
3229
{
3330
provide: DaffAuthorizeNetPaymentId,
3431
useValue: DAFF_IN_MEMORY_AUTHORIZE_NET_PAYMENT_ID,

libs/authorizenet/driver/magento/src/authorize-net.module.ts

+4-10
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
import {
88
DaffAuthorizeNetConfig,
99
DaffAuthorizeNetConfigToken,
10-
DaffAuthorizeNetDriver,
11-
DaffAuthorizeNetPaymentDriver,
10+
provideDaffAuthorizeNetDriver,
11+
provideDaffAuthorizeNetPaymentDriver,
1212
DaffAuthorizeNetPaymentId,
1313
} from '@daffodil/authorizenet/driver';
1414

@@ -34,14 +34,8 @@ export class DaffMagentoAuthorizeNetDriverModule {
3434
provide: DaffAuthorizeNetConfigToken,
3535
useValue: config,
3636
},
37-
{
38-
provide: DaffAuthorizeNetDriver,
39-
useExisting: DaffMagentoAuthorizeNetService,
40-
},
41-
{
42-
provide: DaffAuthorizeNetPaymentDriver,
43-
useExisting: DaffMagentoAuthorizeNetPaymentService,
44-
},
37+
provideDaffAuthorizeNetDriver(DaffMagentoAuthorizeNetService),
38+
provideDaffAuthorizeNetPaymentDriver(DaffMagentoAuthorizeNetPaymentService),
4539
{
4640
provide: DaffAuthorizeNetPaymentId,
4741
useValue: MAGENTO_AUTHORIZE_NET_PAYMENT_ID,

libs/authorizenet/driver/testing/src/drivers/authorize-net-driver.module.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
ModuleWithProviders,
55
} from '@angular/core';
66

7-
import { DaffAuthorizeNetDriver } from '@daffodil/authorizenet/driver';
7+
import { provideDaffAuthorizeNetDriver } from '@daffodil/authorizenet/driver';
88

99
import { DaffTestingAuthorizeNetService } from './authorize-net.service';
1010

@@ -18,10 +18,7 @@ export class DaffTestingAuthorizeNetDriverModule {
1818
return {
1919
ngModule: DaffTestingAuthorizeNetDriverModule,
2020
providers: [
21-
{
22-
provide: DaffAuthorizeNetDriver,
23-
useExisting: DaffTestingAuthorizeNetService,
24-
},
21+
provideDaffAuthorizeNetDriver(DaffTestingAuthorizeNetService),
2522
],
2623
};
2724
}

libs/cart-customer/driver/magento/src/cart-driver.module.ts

+10-25
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {
55
} from '@angular/core';
66

77
import {
8-
DaffCartAddressDriver,
9-
DaffCartBillingAddressDriver,
10-
DaffCartDriver,
11-
DaffCartPaymentDriver,
12-
DaffCartShippingAddressDriver,
8+
provideDaffCartAddressDriver,
9+
provideDaffCartBillingAddressDriver,
10+
provideDaffCartDriver,
11+
provideDaffCartPaymentDriver,
12+
provideDaffCartShippingAddressDriver,
1313
} from '@daffodil/cart/driver';
1414

1515
import { DaffMagentoCartCustomerAddressService } from './cart-address.service';
@@ -28,26 +28,11 @@ export class DaffCartCustomerMagentoDriverModule {
2828
return {
2929
ngModule: DaffCartCustomerMagentoDriverModule,
3030
providers: [
31-
{
32-
provide: DaffCartDriver,
33-
useExisting: DaffMagentoCartCustomerService,
34-
},
35-
{
36-
provide: DaffCartAddressDriver,
37-
useExisting: DaffMagentoCartCustomerAddressService,
38-
},
39-
{
40-
provide: DaffCartBillingAddressDriver,
41-
useExisting: DaffMagentoCartCustomerBillingAddressService,
42-
},
43-
{
44-
provide: DaffCartShippingAddressDriver,
45-
useExisting: DaffMagentoCartCustomerShippingAddressService,
46-
},
47-
{
48-
provide: DaffCartPaymentDriver,
49-
useExisting: DaffMagentoCartCustomerPaymentService,
50-
},
31+
provideDaffCartDriver(DaffMagentoCartCustomerService),
32+
provideDaffCartAddressDriver(DaffMagentoCartCustomerAddressService),
33+
provideDaffCartBillingAddressDriver(DaffMagentoCartCustomerBillingAddressService),
34+
provideDaffCartShippingAddressDriver(DaffMagentoCartCustomerShippingAddressService),
35+
provideDaffCartPaymentDriver(DaffMagentoCartCustomerPaymentService),
5136
],
5237
};
5338
}

libs/cart-store-credit/driver/in-memory/src/driver/driver.module.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
ModuleWithProviders,
55
} from '@angular/core';
66

7-
import { DaffCartStoreCreditDriver } from '@daffodil/cart-store-credit/driver';
7+
import { provideDaffCartStoreCreditDriver } from '@daffodil/cart-store-credit/driver';
88
import { provideDaffInMemoryBackends } from '@daffodil/driver/in-memory';
99

1010
import { DaffCartStoreCreditInMemoryDriver } from './store-credit.service';
@@ -23,10 +23,7 @@ export class DaffCartStoreCreditInMemoryDriverModule {
2323
return {
2424
ngModule: DaffCartStoreCreditInMemoryDriverModule,
2525
providers: [
26-
{
27-
provide: DaffCartStoreCreditDriver,
28-
useExisting: DaffCartStoreCreditInMemoryDriver,
29-
},
26+
provideDaffCartStoreCreditDriver(DaffCartStoreCreditInMemoryDriver),
3027
provideDaffInMemoryBackends(DaffCartStoreCreditInMemoryBackendService),
3128
],
3229
};

libs/cart-store-credit/driver/magento/src/driver.module.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
provideDaffCartMagentoCartTransforms,
99
DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS,
1010
} from '@daffodil/cart/driver/magento';
11-
import { DaffCartStoreCreditDriver } from '@daffodil/cart-store-credit/driver';
11+
import { provideDaffCartStoreCreditDriver } from '@daffodil/cart-store-credit/driver';
1212

1313
import { magentoCartStoreCreditFragment } from './queries/public_api';
1414
import { DaffCartStoreCreditMagentoService } from './store-credit.service';
@@ -24,10 +24,7 @@ export class DaffCartStoreCreditMagentoDriverModule {
2424
return {
2525
ngModule: DaffCartStoreCreditMagentoDriverModule,
2626
providers: [
27-
{
28-
provide: DaffCartStoreCreditDriver,
29-
useExisting: DaffCartStoreCreditMagentoService,
30-
},
27+
provideDaffCartStoreCreditDriver(DaffCartStoreCreditMagentoService),
3128
{
3229
provide: DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS,
3330
useValue: magentoCartStoreCreditFragment,

libs/cart-store-credit/driver/testing/src/drivers/driver.module.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
ModuleWithProviders,
55
} from '@angular/core';
66

7-
import { DaffCartStoreCreditDriver } from '@daffodil/cart-store-credit/driver';
7+
import { provideDaffCartStoreCreditDriver } from '@daffodil/cart-store-credit/driver';
88

99
import { DaffCartStoreCreditTestingDriver } from './store-credit.service';
1010

@@ -21,10 +21,7 @@ export class DaffCartStoreCreditTestingDriverModule {
2121
return {
2222
ngModule: DaffCartStoreCreditTestingDriverModule,
2323
providers: [
24-
{
25-
provide: DaffCartStoreCreditDriver,
26-
useExisting: DaffCartStoreCreditTestingDriver,
27-
},
24+
provideDaffCartStoreCreditDriver(DaffCartStoreCreditTestingDriver),
2825
],
2926
};
3027
}

libs/cart/driver/in-memory/src/drivers/cart-driver.module.ts

+22-55
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import {
55
} from '@angular/core';
66

77
import {
8-
DaffCartDriver,
9-
DaffCartBillingAddressDriver,
10-
DaffCartItemDriver,
11-
DaffCartPaymentDriver,
12-
DaffCartPaymentMethodsDriver,
13-
DaffCartShippingAddressDriver,
14-
DaffCartShippingInformationDriver,
15-
DaffCartShippingMethodsDriver,
16-
DaffCartOrderDriver,
17-
DaffCartCouponDriver,
18-
DaffCartAddressDriver,
8+
provideDaffCartDriver,
9+
provideDaffCartBillingAddressDriver,
10+
provideDaffCartItemDriver,
11+
provideDaffCartPaymentDriver,
12+
provideDaffCartPaymentMethodsDriver,
13+
provideDaffCartShippingAddressDriver,
14+
provideDaffCartShippingInformationDriver,
15+
provideDaffCartShippingMethodsDriver,
16+
provideDaffCartOrderDriver,
17+
provideDaffCartCouponDriver,
18+
provideDaffCartAddressDriver,
1919
} from '@daffodil/cart/driver';
2020
import { provideDaffInMemoryBackends } from '@daffodil/driver/in-memory';
2121

@@ -42,50 +42,17 @@ export class DaffCartInMemoryDriverModule {
4242
return {
4343
ngModule: DaffCartInMemoryDriverModule,
4444
providers: [
45-
{
46-
provide: DaffCartDriver,
47-
useExisting: DaffInMemoryCartService,
48-
},
49-
{
50-
provide: DaffCartAddressDriver,
51-
useExisting: DaffInMemoryCartAddressService,
52-
},
53-
{
54-
provide: DaffCartBillingAddressDriver,
55-
useExisting: DaffInMemoryCartBillingAddressService,
56-
},
57-
{
58-
provide: DaffCartItemDriver,
59-
useExisting: DaffInMemoryCartItemService,
60-
},
61-
{
62-
provide: DaffCartPaymentDriver,
63-
useExisting: DaffInMemoryCartPaymentService,
64-
},
65-
{
66-
provide: DaffCartPaymentMethodsDriver,
67-
useExisting: DaffInMemoryCartPaymentMethodsService,
68-
},
69-
{
70-
provide: DaffCartShippingAddressDriver,
71-
useExisting: DaffInMemoryCartShippingAddressService,
72-
},
73-
{
74-
provide: DaffCartShippingInformationDriver,
75-
useExisting: DaffInMemoryCartShippingInformationService,
76-
},
77-
{
78-
provide: DaffCartShippingMethodsDriver,
79-
useExisting: DaffInMemoryCartShippingMethodsService,
80-
},
81-
{
82-
provide: DaffCartOrderDriver,
83-
useExisting: DaffInMemoryCartOrderService,
84-
},
85-
{
86-
provide: DaffCartCouponDriver,
87-
useExisting: DaffInMemoryCartCouponService,
88-
},
45+
provideDaffCartDriver(DaffInMemoryCartService),
46+
provideDaffCartAddressDriver(DaffInMemoryCartAddressService),
47+
provideDaffCartBillingAddressDriver(DaffInMemoryCartBillingAddressService),
48+
provideDaffCartItemDriver(DaffInMemoryCartItemService),
49+
provideDaffCartPaymentDriver(DaffInMemoryCartPaymentService),
50+
provideDaffCartPaymentMethodsDriver(DaffInMemoryCartPaymentMethodsService),
51+
provideDaffCartShippingAddressDriver(DaffInMemoryCartShippingAddressService),
52+
provideDaffCartShippingInformationDriver(DaffInMemoryCartShippingInformationService),
53+
provideDaffCartShippingMethodsDriver(DaffInMemoryCartShippingMethodsService),
54+
provideDaffCartOrderDriver(DaffInMemoryCartOrderService),
55+
provideDaffCartCouponDriver(DaffInMemoryCartCouponService),
8956
provideDaffInMemoryBackends(
9057
DaffInMemoryBackendCartRootService,
9158
),

0 commit comments

Comments
 (0)