@daffodil/cart 0.59.2 → 0.61.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/driver/in-memory/package.json +1 -1
- package/driver/magento/package.json +1 -1
- package/driver/magento/testing/package.json +1 -1
- package/driver/operators/handle-cart-not-found.d.ts +8 -0
- package/driver/operators/public_api.d.ts +1 -0
- package/driver/package.json +1 -1
- package/driver/public_api.d.ts +2 -0
- package/driver/services/public_api.d.ts +1 -0
- package/driver/services/resolve.service.d.ts +25 -0
- package/driver/testing/package.json +1 -1
- package/esm2020/driver/magento/cart-billing-address.service.mjs +2 -2
- package/esm2020/driver/magento/cart-item.service.mjs +3 -3
- package/esm2020/driver/magento/cart-payment-methods.service.mjs +5 -3
- package/esm2020/driver/magento/cart-payment.service.mjs +4 -4
- package/esm2020/driver/magento/cart-shipping-address.service.mjs +2 -2
- package/esm2020/driver/magento/cart-shipping-information.service.mjs +7 -5
- package/esm2020/driver/magento/cart-shipping-methods.service.mjs +5 -3
- package/esm2020/driver/magento/cart.service.mjs +11 -5
- package/esm2020/driver/operators/handle-cart-not-found.mjs +17 -0
- package/esm2020/driver/operators/public_api.mjs +2 -0
- package/esm2020/driver/public_api.mjs +3 -1
- package/esm2020/driver/services/public_api.mjs +2 -0
- package/esm2020/driver/services/resolve.service.mjs +46 -0
- package/esm2020/routing/cart-routing.module.mjs +4 -2
- package/esm2020/routing/guards/public_api.mjs +3 -1
- package/esm2020/routing/guards/resolve-cart/redirect.token.mjs +3 -0
- package/esm2020/routing/guards/resolve-cart/resolve-cart.guard.mjs +58 -0
- package/esm2020/state/effects/cart-item.effects.mjs +15 -7
- package/esm2020/state/effects/cart-resolver.effects.mjs +18 -28
- package/esm2020/state/reducers/cart/cart.reducer.mjs +4 -4
- package/esm2020/state/reducers/cart-billing-address/cart-billing-address.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-coupon/cart-coupon.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-initial-state.mjs +2 -2
- package/esm2020/state/reducers/cart-item/cart-item.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-payment/cart-payment.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-payment-methods/cart-payment-methods.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-resolve/cart-resolve.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-shipping-address/cart-shipping-address.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-shipping-information/cart-shipping-information.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart-shipping-methods/cart-shipping-methods.reducer.mjs +3 -3
- package/esm2020/state/reducers/cart.reducer.mjs +3 -3
- package/esm2020/state/reducers/public_api.mjs +3 -2
- package/fesm2015/daffodil-cart-driver-magento.mjs +22 -16
- package/fesm2015/daffodil-cart-driver-magento.mjs.map +1 -1
- package/fesm2015/daffodil-cart-driver.mjs +61 -2
- package/fesm2015/daffodil-cart-driver.mjs.map +1 -1
- package/fesm2015/daffodil-cart-routing.mjs +55 -1
- package/fesm2015/daffodil-cart-routing.mjs.map +1 -1
- package/fesm2015/daffodil-cart-state.mjs +42 -45
- package/fesm2015/daffodil-cart-state.mjs.map +1 -1
- package/fesm2020/daffodil-cart-driver-magento.mjs +22 -16
- package/fesm2020/daffodil-cart-driver-magento.mjs.map +1 -1
- package/fesm2020/daffodil-cart-driver.mjs +59 -2
- package/fesm2020/daffodil-cart-driver.mjs.map +1 -1
- package/fesm2020/daffodil-cart-routing.mjs +53 -1
- package/fesm2020/daffodil-cart-routing.mjs.map +1 -1
- package/fesm2020/daffodil-cart-state.mjs +42 -45
- package/fesm2020/daffodil-cart-state.mjs.map +1 -1
- package/package.json +1 -1
- package/routing/guards/public_api.d.ts +2 -0
- package/routing/guards/resolve-cart/redirect.token.d.ts +2 -0
- package/routing/guards/resolve-cart/resolve-cart.guard.d.ts +24 -0
- package/routing/package.json +1 -1
- package/state/effects/cart-item.effects.d.ts +9 -7
- package/state/effects/cart-resolver.effects.d.ts +3 -2
- package/state/package.json +1 -1
- package/state/reducers/cart-initial-state.d.ts +1 -1
- package/state/reducers/public_api.d.ts +2 -1
- package/state/testing/package.json +1 -1
- package/testing/package.json +1 -1
|
@@ -11,7 +11,7 @@ import { daffBuildFragmentNameSpread, daffBuildFragmentDefinition, DaffQueuedApo
|
|
|
11
11
|
import { DaffCartNotFoundError, DaffUnauthorizedForCartError, DaffCartDriverErrorCodes, DaffProductOutOfStockError, DaffCartInvalidAPIResponseError, DaffCartDriverErrorMap, DaffInvalidCouponCodeError, DaffCartItemDriver, DaffCartDriver, DaffCartAddressDriver, DaffCartBillingAddressDriver, DaffCartShippingAddressDriver, DaffCartShippingMethodsDriver, DaffCartShippingInformationDriver, DaffCartPaymentDriver, DaffCartPaymentMethodsDriver, DaffCartOrderDriver, DaffCartCouponDriver, daffCartDriverProvideFreePaymentMethod } from '@daffodil/cart/driver';
|
|
12
12
|
import { DaffBadInputError } from '@daffodil/driver';
|
|
13
13
|
import { DaffProductNotFoundError } from '@daffodil/product/driver';
|
|
14
|
-
import {
|
|
14
|
+
import { of, throwError, forkJoin } from 'rxjs';
|
|
15
15
|
import { map, switchMap, catchError } from 'rxjs/operators';
|
|
16
16
|
import { CommonModule } from '@angular/common';
|
|
17
17
|
|
|
@@ -1496,12 +1496,14 @@ class DaffMagentoCartService {
|
|
|
1496
1496
|
response: data ? this.cartTransformer.transform(data.cart) : undefined,
|
|
1497
1497
|
errors: errors?.map(e => {
|
|
1498
1498
|
const error = transformMagentoCartGraphQlError(e);
|
|
1499
|
-
if (DAFF_MAGENTO_GET_RECOVERABLE_ERRORS.
|
|
1499
|
+
if (DAFF_MAGENTO_GET_RECOVERABLE_ERRORS.find(klass => error instanceof klass)) {
|
|
1500
1500
|
error.recoverable = true;
|
|
1501
1501
|
}
|
|
1502
1502
|
return error;
|
|
1503
1503
|
}) || [],
|
|
1504
|
-
})))
|
|
1504
|
+
})), switchMap((resp) => resp.errors.reduce((acc, err) => acc && err.recoverable, true)
|
|
1505
|
+
? of(resp)
|
|
1506
|
+
: throwError(() => resp.errors.filter((err) => !err.recoverable)[0])));
|
|
1505
1507
|
}
|
|
1506
1508
|
create() {
|
|
1507
1509
|
return this.mutationQueue.mutate({ mutation: createCart }).pipe(map(result => ({ id: result.data.createEmptyCart })));
|
|
@@ -1519,6 +1521,8 @@ class DaffMagentoCartService {
|
|
|
1519
1521
|
source: guestCart,
|
|
1520
1522
|
destination: customerCart,
|
|
1521
1523
|
},
|
|
1524
|
+
errorPolicy: 'all',
|
|
1525
|
+
fetchPolicy: 'network-only',
|
|
1522
1526
|
}).pipe(map(({ data, errors }) => ({
|
|
1523
1527
|
response: data ? this.cartTransformer.transform(data.mergeCarts) : undefined,
|
|
1524
1528
|
errors: errors?.map(e => {
|
|
@@ -1528,7 +1532,9 @@ class DaffMagentoCartService {
|
|
|
1528
1532
|
}
|
|
1529
1533
|
return error;
|
|
1530
1534
|
}) || [],
|
|
1531
|
-
})))
|
|
1535
|
+
})), switchMap((resp) => resp.errors.reduce((acc, err) => acc && err.recoverable, true)
|
|
1536
|
+
? of(resp)
|
|
1537
|
+
: throwError(() => resp.errors.filter((err) => !err.recoverable)[0])));
|
|
1532
1538
|
}
|
|
1533
1539
|
;
|
|
1534
1540
|
}
|
|
@@ -1589,7 +1595,7 @@ class DaffMagentoCartItemService {
|
|
|
1589
1595
|
query: listCartItems(this.extraCartFragments),
|
|
1590
1596
|
variables: { cartId },
|
|
1591
1597
|
fetchPolicy: 'network-only',
|
|
1592
|
-
}).pipe(map(result => result.data.cart.items.filter(item => !!item)), map(items => items.map(item => transformMagentoCartItem(daffTransformMagentoCartItem(item), item, this.cartItemTransforms))));
|
|
1598
|
+
}).pipe(map(result => result.data.cart.items.filter(item => !!item)), map(items => items.map(item => transformMagentoCartItem(daffTransformMagentoCartItem(item), item, this.cartItemTransforms))), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1593
1599
|
}
|
|
1594
1600
|
get(cartId, itemId) {
|
|
1595
1601
|
return this.list(cartId).pipe(map(items => items.find(item => item.id === itemId)));
|
|
@@ -1625,7 +1631,7 @@ class DaffMagentoCartItemService {
|
|
|
1625
1631
|
itemId,
|
|
1626
1632
|
},
|
|
1627
1633
|
fetchPolicy: 'network-only',
|
|
1628
|
-
}).pipe(map(result => this.cartTransformer.transform(result.data.removeItemFromCart.cart)));
|
|
1634
|
+
}).pipe(map(result => this.cartTransformer.transform(result.data.removeItemFromCart.cart)), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1629
1635
|
}
|
|
1630
1636
|
addBundledProduct(cartId, cartItemInput) {
|
|
1631
1637
|
return this.addCartItemRequest(cartId, transformCompositeCartItem(cartItemInput));
|
|
@@ -1687,7 +1693,7 @@ class DaffMagentoCartPaymentService {
|
|
|
1687
1693
|
query: getSelectedPaymentMethod(this.extraCartFragments),
|
|
1688
1694
|
variables: { cartId },
|
|
1689
1695
|
fetchPolicy: 'network-only',
|
|
1690
|
-
}).pipe(map(result => this.paymentTransformer.transform(result.data.cart.selected_payment_method)));
|
|
1696
|
+
}).pipe(map(result => this.paymentTransformer.transform(result.data.cart.selected_payment_method)), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1691
1697
|
}
|
|
1692
1698
|
update(cartId, payment, billingAddress) {
|
|
1693
1699
|
return billingAddress
|
|
@@ -1699,7 +1705,7 @@ class DaffMagentoCartPaymentService {
|
|
|
1699
1705
|
payment: this.paymentInputTransformer.transform(payment),
|
|
1700
1706
|
},
|
|
1701
1707
|
fetchPolicy: 'network-only',
|
|
1702
|
-
}).pipe(map(result => this.cartTransformer.transform(result.data.setPaymentMethodOnCart.cart)));
|
|
1708
|
+
}).pipe(map(result => this.cartTransformer.transform(result.data.setPaymentMethodOnCart.cart)), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1703
1709
|
}
|
|
1704
1710
|
updateWithBilling(cartId, payment, address) {
|
|
1705
1711
|
return address.email
|
|
@@ -1714,7 +1720,7 @@ class DaffMagentoCartPaymentService {
|
|
|
1714
1720
|
payment: { code: '' },
|
|
1715
1721
|
},
|
|
1716
1722
|
fetchPolicy: 'network-only',
|
|
1717
|
-
}).pipe(map(() => undefined));
|
|
1723
|
+
}).pipe(map(() => undefined), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1718
1724
|
}
|
|
1719
1725
|
updateWithBillingAddress(cartId, payment, address) {
|
|
1720
1726
|
return this.mutationQueue.mutate({
|
|
@@ -1771,7 +1777,7 @@ class DaffMagentoCartPaymentMethodsService {
|
|
|
1771
1777
|
query: listPaymentMethods(this.extraCartFragments),
|
|
1772
1778
|
variables: { cartId },
|
|
1773
1779
|
fetchPolicy: 'network-only',
|
|
1774
|
-
}).pipe(map(result => result.data.cart.available_payment_methods.map(item => this.paymentTransformer.transform(item))));
|
|
1780
|
+
}).pipe(map(result => result.data.cart.available_payment_methods.map(item => this.paymentTransformer.transform(item))), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1775
1781
|
}
|
|
1776
1782
|
}
|
|
1777
1783
|
/** @nocollapse */ DaffMagentoCartPaymentMethodsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffMagentoCartPaymentMethodsService, deps: [{ token: i1.Apollo }, { token: DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS }, { token: DaffMagentoCartPaymentTransformer }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -1862,7 +1868,7 @@ class DaffMagentoCartBillingAddressService {
|
|
|
1862
1868
|
...result.data.cart.billing_address,
|
|
1863
1869
|
email: result.data.cart.email,
|
|
1864
1870
|
})
|
|
1865
|
-
: null));
|
|
1871
|
+
: null), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1866
1872
|
}
|
|
1867
1873
|
update(cartId, address) {
|
|
1868
1874
|
return address.email ? this.updateAddressWithEmail(cartId, address) : this.updateAddress(cartId, address);
|
|
@@ -1931,7 +1937,7 @@ class DaffMagentoCartShippingAddressService {
|
|
|
1931
1937
|
...result.data.cart.shipping_addresses[0],
|
|
1932
1938
|
email: result.data.cart.email,
|
|
1933
1939
|
})
|
|
1934
|
-
: null));
|
|
1940
|
+
: null), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1935
1941
|
}
|
|
1936
1942
|
update(cartId, address) {
|
|
1937
1943
|
return address.email ? this.updateAddressWithEmail(cartId, address) : this.updateAddress(cartId, address);
|
|
@@ -1992,7 +1998,7 @@ class DaffMagentoCartShippingMethodsService {
|
|
|
1992
1998
|
query: listShippingMethods(this.extraCartFragments),
|
|
1993
1999
|
variables: { cartId },
|
|
1994
2000
|
fetchPolicy: 'network-only',
|
|
1995
|
-
}).pipe(map(result => result.data.cart.shipping_addresses[0].available_shipping_methods.map(item => this.shippingRateTransformer.transform(item))));
|
|
2001
|
+
}).pipe(map(result => result.data.cart.shipping_addresses[0].available_shipping_methods.map(item => this.shippingRateTransformer.transform(item))), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
1996
2002
|
}
|
|
1997
2003
|
}
|
|
1998
2004
|
/** @nocollapse */ DaffMagentoCartShippingMethodsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffMagentoCartShippingMethodsService, deps: [{ token: i1.Apollo }, { token: DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS }, { token: DaffMagentoCartShippingRateTransformer }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -2028,7 +2034,7 @@ class DaffMagentoCartShippingInformationService {
|
|
|
2028
2034
|
fetchPolicy: 'network-only',
|
|
2029
2035
|
}).pipe(map(result => result.data.cart.shipping_addresses[0]
|
|
2030
2036
|
? this.shippingRateTransformer.transform(result.data.cart.shipping_addresses[0].selected_shipping_method)
|
|
2031
|
-
: null));
|
|
2037
|
+
: null), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
2032
2038
|
}
|
|
2033
2039
|
update(cartId, shippingInfo) {
|
|
2034
2040
|
return this.mutationQueue.mutate({
|
|
@@ -2049,7 +2055,7 @@ class DaffMagentoCartShippingInformationService {
|
|
|
2049
2055
|
}).pipe(map(shippingMethods => ({
|
|
2050
2056
|
...this.cartTransformer.transform(result.data.setShippingMethodsOnCart.cart),
|
|
2051
2057
|
available_shipping_methods: shippingMethods.data.cart.shipping_addresses[0].available_shipping_methods.map(item => this.shippingRateTransformer.transform(item)),
|
|
2052
|
-
})))));
|
|
2058
|
+
})))), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
2053
2059
|
}
|
|
2054
2060
|
delete(cartId, id) {
|
|
2055
2061
|
return this.mutationQueue.mutate({
|
|
@@ -2061,7 +2067,7 @@ class DaffMagentoCartShippingInformationService {
|
|
|
2061
2067
|
method_code: '',
|
|
2062
2068
|
},
|
|
2063
2069
|
},
|
|
2064
|
-
}).pipe(map(result => this.cartTransformer.transform(result.data.setShippingMethodsOnCart.cart)));
|
|
2070
|
+
}).pipe(map(result => this.cartTransformer.transform(result.data.setShippingMethodsOnCart.cart)), catchError(error => throwError(() => transformCartMagentoError(error))));
|
|
2065
2071
|
}
|
|
2066
2072
|
}
|
|
2067
2073
|
/** @nocollapse */ DaffMagentoCartShippingInformationService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.0", ngImport: i0, type: DaffMagentoCartShippingInformationService, deps: [{ token: i1.Apollo }, { token: DAFF_MAGENTO_CART_MUTATION_QUEUE }, { token: DAFF_CART_MAGENTO_EXTRA_CART_FRAGMENTS }, { token: DaffMagentoCartTransformer }, { token: DaffMagentoCartShippingRateTransformer }, { token: DaffMagentoShippingMethodInputTransformer }], target: i0.ɵɵFactoryTarget.Injectable });
|