@anker-in/shopify-react 1.2.2-beta.6 → 1.2.2-beta.8

package/dist/index.d.mts

@@ -2,7 +2,7 @@ export { AppContext, CartContextValue, CartProvider, CartProviderProps, LoadingS
 export { C as CookieAdapter, a as CookieOptions, P as PerformanceAdapter, R as RouterAdapter, U as UserContextAdapter } from './types-SKDHauqk.mjs';
 export { BrowserPerformanceAdapter, browserCartCookieAdapter, browserCookieAdapter } from './adapters/index.mjs';
 export { AddCartLinesInput, ApplyCartCodesInput, AutoFreeGift, AutoFreeGiftCartLineInput, AutoFreeGiftConfig, AutoFreeGiftItem, AutoFreeGiftList, AutoFreeGiftMainProduct, BuyNowInput, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, Config, CreateCartInput, DiscountLabel, FormattedGift, FunctionGiftResult, GeoLocationData, GetCartAttributesProps, GiftProduct, GiftProductItem, GiftTier, HasPlusMemberInCartProps, HasPlusMemberInCartResult, HasPlusMemberInLinesResult, ImageMedia, LocaleMapping, MAIN_PRODUCT_CODE, MEMBER_PRICE_ATTRIBUTE_KEY, MainProductInfo, NormalizedSearchResultItem, Options, OrderBasePriceType, OrderDiscountConfig, OrderDiscountResult, OrderDiscountType, PlusMemberContext, PlusMemberContextValue, PlusMemberProvider, PlusMemberProviderProps, PriceBasePriceType, PriceDiscountConfig, PriceDiscountType, RemoveCartCodesInput, RemoveCartLinesInput, RewardItem, RuleCondition, RuleType, SCRIPT_CODE_AMOUNT_KEY, SearchResult, SearchResultType, SelectedOptionsResult, ShippingMethodsContext, SiteInfo, SpendMoneyType, TieredDiscount, UpdateBuyerIdentityInput, UpdateCartAttributesInput, UseAllBlogsOptions, UseAllCollectionsOptions, UseAllProductsOptions, UseArticleOptions, UseArticlesInBlogOptions, UseArticlesOptions, UseAutoRemovePlusMemberInCartProps, UseAvailableDeliveryCouponResult, UseBlogOptions, UseBuyNowOptions, UseCalcGiftsFromLinesOptions, UseCalcGiftsFromLinesResult, UseCollectionOptions, UseCollectionsOptions, UseExposureOptions, UseGeoLocationOptions, UseHasPlusMemberInLinesProps, UseIntersectionOptions, UsePlusMemberVariantsOptions, UsePlusMemberVariantsResult, UsePriceOptions, UsePriceResult, UseProductOptions, UseProductsByHandlesOptions, UseSearchOptions, UseShippingMethodsOptions, UseShippingMethodsResult, UseSiteOptions, UseUpdateBuyerIdentityOptions, UseUpdateCartAttributesOptions, VariantItem, VariantMedia, VideoMedia, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, getCachedGeoLocation, getCartBasicAttributes, getDiscountEnvAttributeValue, getGA4Attributes, getGA4AttributesAsync, getMatchedMainProductSubTotal, getOperatingSystem, getQuery, getReferralAttributes, getUserType, hasPlusMemberInCart, hasPlusMemberInLines, normalizeAddToCartLines, preCheck, safeParse, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useAvailableDeliveryCoupon, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useHasPlusMemberInLines, useIntersection, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberNeedAddToCart, usePlusMemberVariants, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useSearch, useSelectedOptions, useShippingMethods, useSite, useUpdateBuyerIdentity, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdateVariantQuery, useVariant, useVariantMedia } from './hooks/index.mjs';
-export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-Bzg8_e4k.mjs';
+export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-DfR13pDe.mjs';
 export * from '@anker-in/shopify-sdk';
 import 'react';
 import 'react/jsx-runtime';

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { AppContext, CartContextValue, CartProvider, CartProviderProps, LoadingS
 export { C as CookieAdapter, a as CookieOptions, P as PerformanceAdapter, R as RouterAdapter, U as UserContextAdapter } from './types-SKDHauqk.js';
 export { BrowserPerformanceAdapter, browserCartCookieAdapter, browserCookieAdapter } from './adapters/index.js';
 export { AddCartLinesInput, ApplyCartCodesInput, AutoFreeGift, AutoFreeGiftCartLineInput, AutoFreeGiftConfig, AutoFreeGiftItem, AutoFreeGiftList, AutoFreeGiftMainProduct, BuyNowInput, BuyRuleType, CODE_AMOUNT_KEY, CUSTOMER_ATTRIBUTE_KEY, CUSTOMER_SCRIPT_GIFT_KEY, Config, CreateCartInput, DiscountLabel, FormattedGift, FunctionGiftResult, GeoLocationData, GetCartAttributesProps, GiftProduct, GiftProductItem, GiftTier, HasPlusMemberInCartProps, HasPlusMemberInCartResult, HasPlusMemberInLinesResult, ImageMedia, LocaleMapping, MAIN_PRODUCT_CODE, MEMBER_PRICE_ATTRIBUTE_KEY, MainProductInfo, NormalizedSearchResultItem, Options, OrderBasePriceType, OrderDiscountConfig, OrderDiscountResult, OrderDiscountType, PlusMemberContext, PlusMemberContextValue, PlusMemberProvider, PlusMemberProviderProps, PriceBasePriceType, PriceDiscountConfig, PriceDiscountType, RemoveCartCodesInput, RemoveCartLinesInput, RewardItem, RuleCondition, RuleType, SCRIPT_CODE_AMOUNT_KEY, SearchResult, SearchResultType, SelectedOptionsResult, ShippingMethodsContext, SiteInfo, SpendMoneyType, TieredDiscount, UpdateBuyerIdentityInput, UpdateCartAttributesInput, UseAllBlogsOptions, UseAllCollectionsOptions, UseAllProductsOptions, UseArticleOptions, UseArticlesInBlogOptions, UseArticlesOptions, UseAutoRemovePlusMemberInCartProps, UseAvailableDeliveryCouponResult, UseBlogOptions, UseBuyNowOptions, UseCalcGiftsFromLinesOptions, UseCalcGiftsFromLinesResult, UseCollectionOptions, UseCollectionsOptions, UseExposureOptions, UseGeoLocationOptions, UseHasPlusMemberInLinesProps, UseIntersectionOptions, UsePlusMemberVariantsOptions, UsePlusMemberVariantsResult, UsePriceOptions, UsePriceResult, UseProductOptions, UseProductsByHandlesOptions, UseSearchOptions, UseShippingMethodsOptions, UseShippingMethodsResult, UseSiteOptions, UseUpdateBuyerIdentityOptions, UseUpdateCartAttributesOptions, VariantItem, VariantMedia, VideoMedia, clearGeoLocationCache, createMockCartFromLines, currencyCodeMapping, defaultSWRMutationConfiguration, formatFunctionAutoFreeGift, formatScriptAutoFreeGift, getCachedGeoLocation, getCartBasicAttributes, getDiscountEnvAttributeValue, getGA4Attributes, getGA4AttributesAsync, getMatchedMainProductSubTotal, getOperatingSystem, getQuery, getReferralAttributes, getUserType, hasPlusMemberInCart, hasPlusMemberInLines, normalizeAddToCartLines, preCheck, safeParse, useAddCartLines, useAddToCart, useAllBlogs, useAllCollections, useAllProducts, useApplyCartCodes, useArticle, useArticles, useArticlesInBlog, useAutoRemovePlusMemberInCart, useAvailableDeliveryCoupon, useBlog, useBuyNow, useCalcAutoFreeGift, useCalcGiftsFromLines, useCalcOrderDiscount, useCartAttributes, useCartItemQuantityLimit, useCollection, useCollections, useCreateCart, useExposure, useGeoLocation, useHasPlusMemberInCart, useHasPlusMemberInLines, useIntersection, usePlusMemberCheckoutCustomAttributes, usePlusMemberContext, usePlusMemberNeedAddToCart, usePlusMemberVariants, usePrice, useProduct, useProductUrl, useProductsByHandles, useRemoveCartCodes, useRemoveCartLines, useReplaceCartPlusMember, useSearch, useSelectedOptions, useShippingMethods, useSite, useUpdateBuyerIdentity, useUpdateCartAttributes, useUpdateCartLines, useUpdateLineCodeAmountAttributes, useUpdateVariantQuery, useVariant, useVariantMedia } from './hooks/index.js';
-export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-Bzg8_e4k.js';
+export { g as AddToCartInput, A as AddToCartLineItem, C as BuyNowTrackConfig, p as DeliveryCustomData, D as DeliveryPlusType, v as GA4Data, G as GtmParams, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, n as PlusMemberSettingsMetafields, m as PlusMemberShippingMethodConfig, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, o as SelectedPlusMemberVariant, k as ShippingMethodMode, h as UseAddToCartOptions, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, e as UseScriptAutoFreeGiftResult, q as gaTrack, x as getGA4ClientId, z as getGA4Data, y as getGA4SessionId, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, B as trackAddToCartFBQ, t as trackAddToCartGA, r as trackBeginCheckoutGA, E as trackBuyNowFBQ, s as trackBuyNowGA, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift, w as waitForGtagReady } from './types-DfR13pDe.js';
 export * from '@anker-in/shopify-sdk';
 import 'react';
 import 'react/jsx-runtime';

package/dist/index.js

@@ -4,7 +4,7 @@ var react = require('react');
 var shopifySdk = require('@anker-in/shopify-sdk');
 var Cookies5 = require('js-cookie');
 var jsxRuntime = require('react/jsx-runtime');
-var Decimal2 = require('decimal.js');
+var Decimal3 = require('decimal.js');
 var shopifyCore = require('@anker-in/shopify-core');
 var useSWR = require('swr');
 var useSWRMutation = require('swr/mutation');
@@ -13,7 +13,7 @@ var ahooks = require('ahooks');
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var Cookies5__default = /*#__PURE__*/_interopDefault(Cookies5);
-var Decimal2__default = /*#__PURE__*/_interopDefault(Decimal2);
+var Decimal3__default = /*#__PURE__*/_interopDefault(Decimal3);
 var useSWR__default = /*#__PURE__*/_interopDefault(useSWR);
 var useSWRMutation__default = /*#__PURE__*/_interopDefault(useSWRMutation);
 
@@ -160,8 +160,6 @@ var CODE_AMOUNT_KEY = "_sku_code_money";
 var SCRIPT_CODE_AMOUNT_KEY = "_code_money";
 var MEMBER_PRICE_ATTRIBUTE_KEY = "_member_price";
 var MAIN_PRODUCT_CODE = ["WS24", "WSTD", "WS7D", "WSCP", "WSPE", "WSPD"];
-
-// src/hooks/cart/utils/normalize-add-to-cart-lines.ts
 function normalizeAddToCartLines(lines) {
   return lines.filter((line) => line.variant?.id).map((line, index) => {
     const variant = line.variant;
@@ -169,8 +167,8 @@ function normalizeAddToCartLines(lines) {
     const quantity = line.quantity || 1;
     const originalPrice = variant.price?.amount ? Number(variant.price.amount) : 0;
     const finalPrice = variant.finalPrice?.amount === void 0 ? originalPrice : Number(variant.finalPrice?.amount);
-    const subtotalAmount = originalPrice * quantity;
-    const totalAmount = finalPrice * quantity;
+    const subtotalAmount = new Decimal3__default.default(originalPrice).times(quantity).toNumber();
+    const totalAmount = new Decimal3__default.default(finalPrice).times(quantity).toNumber();
     return {
       id: `temp-line-${index}-${variant.id}`,
       // Temporary ID for pre-cart lines
@@ -178,6 +176,7 @@ function normalizeAddToCartLines(lines) {
       quantity,
       variantId: variant.id,
       productId: product?.id || variant.id.split("/").slice(0, -2).join("/"),
+      amountPerQuantity: finalPrice,
       totalAmount,
       subtotalAmount,
       discountAllocations: [],
@@ -362,7 +361,7 @@ var formatScriptAutoFreeGift = ({
       path: product?.handle || "",
       variant,
       totalAmount: 0,
-      subtotalAmount: new Decimal2__default.default(
+      subtotalAmount: new Decimal3__default.default(
         typeof variant?.price === "object" ? variant?.price?.amount || 0 : variant?.price || 0
       ).toNumber(),
       options: [],
@@ -422,7 +421,7 @@ var formatFunctionAutoFreeGift = ({
       path: product?.handle || "",
       variant,
       totalAmount: 0,
-      subtotalAmount: new Decimal2__default.default(
+      subtotalAmount: new Decimal3__default.default(
         typeof variant?.price === "object" ? variant?.price?.amount || 0 : variant?.price || 0
       ).toNumber(),
       options: [],
@@ -652,7 +651,7 @@ var useScriptAutoFreeGift = ({
   const breakpoints = react.useMemo(() => {
     if (!isActivityAvailable) return [];
     return (campaign?.breakpoints || []).map((item) => ({
-      breakpoint: new Decimal2__default.default(item.breakpoint).minus(new Decimal2__default.default(upgrade_value)).dividedBy(new Decimal2__default.default(upgrade_multiple)).toFixed(2, Decimal2__default.default.ROUND_DOWN),
+      breakpoint: new Decimal3__default.default(item.breakpoint).minus(new Decimal3__default.default(upgrade_value)).dividedBy(new Decimal3__default.default(upgrade_multiple)).toFixed(2, Decimal3__default.default.ROUND_DOWN),
       giveawayProducts: item.giveawayProducts || []
     }));
   }, [campaign, upgrade_multiple, upgrade_value]);
@@ -687,11 +686,11 @@ var useScriptAutoFreeGift = ({
     });
   }, [effectiveCart?.lineItems, isActivityAvailable, _giveaway]);
   const involvedSubTotal = react.useMemo(() => {
-    if (!isActivityAvailable) return new Decimal2__default.default(0);
+    if (!isActivityAvailable) return new Decimal3__default.default(0);
     return involvedLines.reduce((prev, item) => {
       const amount = campaign?.useTotalAmount ? item.totalAmount : item.subtotalAmount;
-      return new Decimal2__default.default(prev).plus(new Decimal2__default.default(amount || 0));
-    }, new Decimal2__default.default(0));
+      return new Decimal3__default.default(prev).plus(new Decimal3__default.default(amount || 0));
+    }, new Decimal3__default.default(0));
   }, [involvedLines, isActivityAvailable]);
   const [freeGiftLevel, nextFreeGiftLevel] = react.useMemo(() => {
     if (!isActivityAvailable) return [null, null];
@@ -699,7 +698,7 @@ var useScriptAutoFreeGift = ({
       (a, b) => Number(b.breakpoint) - Number(a.breakpoint)
     );
     const levelIndex = sortedLevels.findIndex(
-      (level) => involvedSubTotal.gte(new Decimal2__default.default(level.breakpoint)) && involvedLines.length > 0
+      (level) => involvedSubTotal.gte(new Decimal3__default.default(level.breakpoint)) && involvedLines.length > 0
     );
     if (levelIndex === -1) {
       return [
@@ -870,7 +869,7 @@ var trackAddToCartGA = ({
     return;
   }
   const currencyCode = lineItems[0].product?.price?.currencyCode;
-  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.variant.price || 0), new Decimal2__default.default(0)).toNumber();
+  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.finalPrice?.amount || item.totalAmount || 0), new Decimal3__default.default(0)).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "add_to_cart",
@@ -912,7 +911,7 @@ var trackBeginCheckoutGA = ({
     (prev, { variant }) => prev.plus(
       variant?.finalPrice?.amount === void 0 ? Number(variant?.price?.amount) || 0 : Number(variant?.finalPrice?.amount) || 0
     ),
-    new Decimal2__default.default(0)
+    new Decimal3__default.default(0)
   ).toNumber();
   gaTrack({
     event: "ga4Event",
@@ -951,7 +950,7 @@ var trackBuyNowGA = ({
     return;
   }
   const currencyCode = lineItems[0].product?.price?.currencyCode;
-  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.variant.price || 0), new Decimal2__default.default(0)).toNumber();
+  const totalPrice = lineItems.reduce((prev, item) => prev.plus(item.totalAmount || 0), new Decimal3__default.default(0)).toNumber();
   gaTrack({
     event: "ga4Event",
     event_name: "begin_checkout",
@@ -1207,7 +1206,7 @@ var initDiscountAttributes = ({ line }) => {
         key: CUSTOMER_ATTRIBUTE_KEY,
         value: JSON.stringify({
           is_gift: false,
-          discounted_amount: new Decimal2__default.default(priceAmount).times(line.quantity || 1).toNumber()
+          discounted_amount: new Decimal3__default.default(priceAmount).times(line.quantity || 1).toNumber()
         })
       }
     ]);
@@ -1231,11 +1230,11 @@ var initDiscountAttributes = ({ line }) => {
     itemAttributes = itemAttributes.concat([
       {
         key: CODE_AMOUNT_KEY,
-        value: new Decimal2__default.default(coupon.amount).times(line.quantity || 1).toString()
+        value: new Decimal3__default.default(coupon.amount).times(line.quantity || 1).toString()
       },
       {
         key: SCRIPT_CODE_AMOUNT_KEY,
-        value: new Decimal2__default.default(coupon.amount).times(line.quantity || 1).toString()
+        value: new Decimal3__default.default(coupon.amount).times(line.quantity || 1).toString()
       }
     ]);
   }
@@ -1693,8 +1692,8 @@ function getCartBasicAttributes({
     {
       key: "_weight",
       value: cart?.lineItems?.reduce((acc, item) => {
-        const itemWeight = new Decimal2__default.default(item.variant.weight ?? 0).times(item.quantity);
-        return new Decimal2__default.default(acc).plus(itemWeight).toNumber();
+        const itemWeight = new Decimal3__default.default(item.variant.weight ?? 0).times(item.quantity);
+        return new Decimal3__default.default(acc).plus(itemWeight).toNumber();
       }, 0).toString()
     }
   ];
@@ -2556,6 +2555,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
           }
           return {
             ...cartLine,
+            finalPrice: inputLine.variant?.finalPrice,
             quantity: inputLine.quantity,
             gtmParams: inputLine.gtmParams
           };