@anker-in/shopify-react 1.2.9-beta.1 → 1.2.9-beta.2

package/dist/hooks/index.d.mts

@@ -1,9 +1,9 @@
 import * as swr_mutation from 'swr/mutation';
 import { SWRMutationConfiguration } from 'swr/mutation';
 import * as _anker_in_shopify_sdk from '@anker-in/shopify-sdk';
-import { CartLineInput, NormalizedCart, NormalizedProduct, NormalizedProductVariant, NormalizedLineItem, UpdateCartLinesOptions, HasMetafieldsIdentifier, Media, NormalizedCollection, CollectionsConnection, NormalizedBlog, NormalizedArticle, NormalizedAttribute } from '@anker-in/shopify-sdk';
-import { h as UseAddToCartOptions, g as AddToCartInput, A as AddToCartLineItem, G as GtmParams, C as BuyNowTrackConfig, e as UseScriptAutoFreeGiftResult, m as PlusMemberShippingMethodConfig, n as PlusMemberSettingsMetafields, D as DeliveryPlusType, o as SelectedPlusMemberVariant } from '../types-DfR13pDe.mjs';
-export { p as DeliveryCustomData, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, k as ShippingMethodMode, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift } from '../types-DfR13pDe.mjs';
+import { CartLineInput, BuyerIdentityInput, NormalizedCart, NormalizedProduct, NormalizedProductVariant, NormalizedLineItem, UpdateCartLinesOptions, HasMetafieldsIdentifier, Media, NormalizedCollection, CollectionsConnection, NormalizedBlog, NormalizedArticle, NormalizedAttribute } from '@anker-in/shopify-sdk';
+import { h as UseAddToCartOptions, g as AddToCartInput, A as AddToCartLineItem, G as GtmParams, C as BuyNowTrackConfig, e as UseScriptAutoFreeGiftResult, m as PlusMemberShippingMethodConfig, n as PlusMemberSettingsMetafields, D as DeliveryPlusType, o as SelectedPlusMemberVariant } from '../types-C0UyuPrG.mjs';
+export { p as DeliveryCustomData, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, k as ShippingMethodMode, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift } from '../types-C0UyuPrG.mjs';
 import * as swr from 'swr';
 import swr__default, { SWRConfiguration } from 'swr';
 import * as swr__internal from 'swr/_internal';
@@ -16,10 +16,7 @@ interface CreateCartInput {
     /** Lines to add to the cart */
     lines?: CartLineInput[];
     /** Buyer identity for cart creation */
-    buyerIdentity?: {
-        email?: string;
-        countryCode?: string;
-    };
+    buyerIdentity?: BuyerIdentityInput;
     /** Discount codes */
     discountCodes?: string[];
     /** Custom attributes */
@@ -502,18 +499,7 @@ interface UpdateBuyerIdentityInput {
     /** Cart ID (optional, will use cookie) */
     cartId?: string;
     /** Buyer identity information */
-    buyerIdentity: {
-        /** The email address of the buyer */
-        email?: string;
-        /** The phone number of the buyer */
-        phone?: string;
-        /** The country where the buyer is located */
-        countryCode?: string;
-        /** The access token used to identify the customer */
-        customerAccessToken?: string;
-        /** The company location of the buyer */
-        companyLocationId?: string;
-    };
+    buyerIdentity: BuyerIdentityInput;
 }
 interface UseUpdateBuyerIdentityOptions {
     /** Function to update cart state */
@@ -571,10 +557,7 @@ interface BuyNowInput {
         value: string;
     }>;
     /** Buyer identity */
-    buyerIdentity?: {
-        email?: string;
-        countryCode?: string;
-    };
+    buyerIdentity?: BuyerIdentityInput;
     /** GTM tracking parameters */
     gtmParams?: Omit<GtmParams, 'brand'>;
     /** Facebook Pixel tracking configuration */

package/dist/hooks/index.d.ts

@@ -1,9 +1,9 @@
 import * as swr_mutation from 'swr/mutation';
 import { SWRMutationConfiguration } from 'swr/mutation';
 import * as _anker_in_shopify_sdk from '@anker-in/shopify-sdk';
-import { CartLineInput, NormalizedCart, NormalizedProduct, NormalizedProductVariant, NormalizedLineItem, UpdateCartLinesOptions, HasMetafieldsIdentifier, Media, NormalizedCollection, CollectionsConnection, NormalizedBlog, NormalizedArticle, NormalizedAttribute } from '@anker-in/shopify-sdk';
-import { h as UseAddToCartOptions, g as AddToCartInput, A as AddToCartLineItem, G as GtmParams, C as BuyNowTrackConfig, e as UseScriptAutoFreeGiftResult, m as PlusMemberShippingMethodConfig, n as PlusMemberSettingsMetafields, D as DeliveryPlusType, o as SelectedPlusMemberVariant } from '../types-DfR13pDe.js';
-export { p as DeliveryCustomData, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, k as ShippingMethodMode, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift } from '../types-DfR13pDe.js';
+import { CartLineInput, BuyerIdentityInput, NormalizedCart, NormalizedProduct, NormalizedProductVariant, NormalizedLineItem, UpdateCartLinesOptions, HasMetafieldsIdentifier, Media, NormalizedCollection, CollectionsConnection, NormalizedBlog, NormalizedArticle, NormalizedAttribute } from '@anker-in/shopify-sdk';
+import { h as UseAddToCartOptions, g as AddToCartInput, A as AddToCartLineItem, G as GtmParams, C as BuyNowTrackConfig, e as UseScriptAutoFreeGiftResult, m as PlusMemberShippingMethodConfig, n as PlusMemberSettingsMetafields, D as DeliveryPlusType, o as SelectedPlusMemberVariant } from '../types-C0UyuPrG.js';
+export { p as DeliveryCustomData, P as PLUS_MEMBER_TYPE, j as PlusMemberMode, l as PlusMemberShippingMethodMetafields, S as ScriptAutoFreeGiftConfig, k as ShippingMethodMode, U as UseAutoRemoveFreeGiftsOptions, a as UseAutoRemoveFreeGiftsResult, d as isAnyGift, c as isBuyGetGift, i as isFunctionGift, b as isScriptGift, u as useAutoRemoveFreeGifts, f as useScriptAutoFreeGift } from '../types-C0UyuPrG.js';
 import * as swr from 'swr';
 import swr__default, { SWRConfiguration } from 'swr';
 import * as swr__internal from 'swr/_internal';
@@ -16,10 +16,7 @@ interface CreateCartInput {
     /** Lines to add to the cart */
     lines?: CartLineInput[];
     /** Buyer identity for cart creation */
-    buyerIdentity?: {
-        email?: string;
-        countryCode?: string;
-    };
+    buyerIdentity?: BuyerIdentityInput;
     /** Discount codes */
     discountCodes?: string[];
     /** Custom attributes */
@@ -502,18 +499,7 @@ interface UpdateBuyerIdentityInput {
     /** Cart ID (optional, will use cookie) */
     cartId?: string;
     /** Buyer identity information */
-    buyerIdentity: {
-        /** The email address of the buyer */
-        email?: string;
-        /** The phone number of the buyer */
-        phone?: string;
-        /** The country where the buyer is located */
-        countryCode?: string;
-        /** The access token used to identify the customer */
-        customerAccessToken?: string;
-        /** The company location of the buyer */
-        companyLocationId?: string;
-    };
+    buyerIdentity: BuyerIdentityInput;
 }
 interface UseUpdateBuyerIdentityOptions {
     /** Function to update cart state */
@@ -571,10 +557,7 @@ interface BuyNowInput {
         value: string;
     }>;
     /** Buyer identity */
-    buyerIdentity?: {
-        email?: string;
-        countryCode?: string;
-    };
+    buyerIdentity?: BuyerIdentityInput;
     /** GTM tracking parameters */
     gtmParams?: Omit<GtmParams, 'brand'>;
     /** Facebook Pixel tracking configuration */

package/dist/hooks/index.js

@@ -671,6 +671,177 @@ var useScriptAutoFreeGift = ({
     giftProductsResult: finalGiftProductsResult
   };
 };
+function useRemoveCartLines(options) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const { mutateCart, metafieldIdentifiers } = useCartContext();
+  const removeLines = react.useCallback(
+    async (_key, { arg }) => {
+      const { autoRemoveInvalidCodes = true, onCodesRemoved, cartId, lineIds } = arg;
+      let updatedCart = await shopifySdk.removeCartLines(client, {
+        cartId,
+        lineIds,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      if (updatedCart && autoRemoveInvalidCodes) {
+        const unApplicableCodes = updatedCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
+        if (unApplicableCodes.length > 0) {
+          if (onCodesRemoved) {
+            const handledCart = await onCodesRemoved(updatedCart, unApplicableCodes);
+            if (handledCart) {
+              updatedCart = handledCart;
+            }
+          } else {
+            updatedCart = await shopifySdk.updateCartCodes(client, {
+              cartId: updatedCart.id,
+              discountCodes: updatedCart.discountCodes.filter((item) => item.applicable).map((item) => item.code),
+              metafieldIdentifiers,
+              cookieAdapter: cartCookieAdapter
+            }) || updatedCart;
+          }
+        }
+      }
+      if (updatedCart) {
+        mutateCart(updatedCart);
+      }
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
+  );
+  return useSWRMutation__default.default("remove-cart-lines", removeLines, options);
+}
+
+// src/hooks/cart/feature/use-auto-remove-free-gifts.ts
+function useAutoRemoveFreeGifts(options = {}) {
+  const {
+    removeFunctionGifts = true,
+    removeScriptGifts = true,
+    isGiftLineItem,
+    runOnlyOnceAfterInit = false,
+    initDelay = 500
+  } = options;
+  const [isRemoving, setIsRemoving] = react.useState(false);
+  const [isInitialized, setIsInitialized] = react.useState(!runOnlyOnceAfterInit);
+  const [isFinished, setIsFinished] = react.useState(false);
+  const { cart } = useCartContext();
+  const { trigger: removeCartLines2 } = useRemoveCartLines();
+  const giftsToRemove = react.useMemo(() => {
+    if (!cart?.lineItems) {
+      return [];
+    }
+    return cart.lineItems.filter((item) => {
+      if (removeFunctionGifts) {
+        const functionAttr = item.customAttributes?.find(
+          (attr) => attr.key === "_discounts_function_env"
+        )?.value;
+        if (functionAttr) {
+          try {
+            const functionAttrObj = JSON.parse(functionAttr);
+            if (functionAttrObj.is_gift && functionAttrObj.rule_id && functionAttrObj.spend_sum_money) {
+              return true;
+            }
+          } catch (error) {
+            console.error("Failed to parse _discounts_function_env:", error);
+          }
+        }
+      }
+      if (removeScriptGifts) {
+        const scriptGiftAttr = item.customAttributes?.find(
+          (attr) => attr.key === "_giveaway_gradient_gifts"
+        );
+        if (scriptGiftAttr) {
+          return true;
+        }
+      }
+      if (isGiftLineItem && isGiftLineItem(item)) {
+        return true;
+      }
+      return false;
+    });
+  }, [cart, removeFunctionGifts, removeScriptGifts, isGiftLineItem]);
+  ahooks.useDebounceEffect(
+    () => {
+      if (!runOnlyOnceAfterInit || isInitialized || isFinished) {
+        return;
+      }
+      if (!cart?.lineItems?.length) {
+        return;
+      }
+      setIsInitialized(true);
+      if (giftsToRemove.length === 0) {
+        setIsFinished(true);
+      }
+    },
+    [runOnlyOnceAfterInit, isInitialized, isFinished, cart?.lineItems, giftsToRemove.length],
+    {
+      trailing: true,
+      wait: initDelay
+    }
+  );
+  react.useEffect(() => {
+    if (runOnlyOnceAfterInit && (!isInitialized || isFinished)) {
+      return;
+    }
+    if (isRemoving || giftsToRemove.length === 0) {
+      return;
+    }
+    const performRemoval = async () => {
+      setIsRemoving(true);
+      try {
+        await removeCartLines2({
+          lineIds: giftsToRemove.map((item) => item.id)
+        });
+      } catch (error) {
+        console.error("Failed to remove free gifts:", error);
+      } finally {
+        setIsRemoving(false);
+        if (runOnlyOnceAfterInit) {
+          setIsFinished(true);
+        }
+      }
+    };
+    performRemoval();
+  }, [
+    runOnlyOnceAfterInit,
+    isInitialized,
+    isFinished,
+    isRemoving,
+    giftsToRemove,
+    removeCartLines2
+  ]);
+  return {
+    isRemoving
+  };
+}
+function isFunctionGift(line) {
+  const functionAttr = line.customAttributes?.find(
+    (attr) => attr.key === "_discounts_function_env"
+  )?.value;
+  if (!functionAttr) {
+    return false;
+  }
+  try {
+    const functionAttrObj = JSON.parse(functionAttr);
+    return Boolean(
+      functionAttrObj.is_gift && functionAttrObj.rule_id && functionAttrObj.spend_sum_money
+    );
+  } catch {
+    return false;
+  }
+}
+function isScriptGift(line) {
+  return line.customAttributes?.some(
+    (attr) => attr.key === "_giveaway_gradient_gifts"
+  ) ?? false;
+}
+function isBuyGetGift(line) {
+  return line.customAttributes?.some(
+    (attr) => attr.key === "_freegift_related_handlesku"
+  ) ?? false;
+}
+function isAnyGift(line) {
+  return isFunctionGift(line) || isScriptGift(line) || isBuyGetGift(line);
+}
 var CartContext = react.createContext(null);
 function useCartContext(options) {
   const context = react.useContext(CartContext);
@@ -1101,145 +1272,6 @@ var getLinesWithAttributes = ({
     return functionLine;
   });
 };
-function useRemoveCartLines(options) {
-  const { client, locale, cartCookieAdapter } = useShopify();
-  const { mutateCart, metafieldIdentifiers } = useCartContext();
-  const removeLines = react.useCallback(
-    async (_key, { arg }) => {
-      const { autoRemoveInvalidCodes = true, onCodesRemoved, cartId, lineIds } = arg;
-      let updatedCart = await shopifySdk.removeCartLines(client, {
-        cartId,
-        lineIds,
-        metafieldIdentifiers,
-        cookieAdapter: cartCookieAdapter
-      });
-      if (updatedCart && autoRemoveInvalidCodes) {
-        const unApplicableCodes = updatedCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
-        if (unApplicableCodes.length > 0) {
-          if (onCodesRemoved) {
-            const handledCart = await onCodesRemoved(updatedCart, unApplicableCodes);
-            if (handledCart) {
-              updatedCart = handledCart;
-            }
-          } else {
-            updatedCart = await shopifySdk.updateCartCodes(client, {
-              cartId: updatedCart.id,
-              discountCodes: updatedCart.discountCodes.filter((item) => item.applicable).map((item) => item.code),
-              metafieldIdentifiers,
-              cookieAdapter: cartCookieAdapter
-            }) || updatedCart;
-          }
-        }
-      }
-      if (updatedCart) {
-        mutateCart(updatedCart);
-      }
-      return updatedCart;
-    },
-    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
-  );
-  return useSWRMutation__default.default("remove-cart-lines", removeLines, options);
-}
-
-// src/hooks/cart/feature/use-auto-remove-free-gifts.ts
-function useAutoRemoveFreeGifts(options = {}) {
-  const {
-    removeFunctionGifts = true,
-    removeScriptGifts = true,
-    isGiftLineItem
-  } = options;
-  const [isRemoving, setIsRemoving] = react.useState(false);
-  const { cart } = useCartContext();
-  const { trigger: removeCartLines2 } = useRemoveCartLines();
-  const giftsToRemove = react.useMemo(() => {
-    if (!cart?.lineItems) {
-      return [];
-    }
-    return cart.lineItems.filter((item) => {
-      if (removeFunctionGifts) {
-        const functionAttr = item.customAttributes?.find(
-          (attr) => attr.key === "_discounts_function_env"
-        )?.value;
-        if (functionAttr) {
-          try {
-            const functionAttrObj = JSON.parse(functionAttr);
-            if (functionAttrObj.is_gift && functionAttrObj.rule_id && functionAttrObj.spend_sum_money) {
-              return true;
-            }
-          } catch (error) {
-            console.error("Failed to parse _discounts_function_env:", error);
-          }
-        }
-      }
-      if (removeScriptGifts) {
-        const scriptGiftAttr = item.customAttributes?.find(
-          (attr) => attr.key === "_giveaway_gradient_gifts"
-        );
-        if (scriptGiftAttr) {
-          return true;
-        }
-      }
-      if (isGiftLineItem && isGiftLineItem(item)) {
-        return true;
-      }
-      return false;
-    });
-  }, [cart, removeFunctionGifts, removeScriptGifts, isGiftLineItem]);
-  react.useEffect(() => {
-    if (isRemoving || giftsToRemove.length === 0) {
-      return;
-    }
-    const performRemoval = async () => {
-      setIsRemoving(true);
-      try {
-        await removeCartLines2({
-          lineIds: giftsToRemove.map((item) => item.id)
-        });
-      } catch (error) {
-        console.error("Failed to remove free gifts:", error);
-      } finally {
-        setIsRemoving(false);
-      }
-    };
-    performRemoval();
-  }, [
-    isRemoving,
-    giftsToRemove,
-    removeCartLines2
-  ]);
-  return {
-    isRemoving
-  };
-}
-function isFunctionGift(line) {
-  const functionAttr = line.customAttributes?.find(
-    (attr) => attr.key === "_discounts_function_env"
-  )?.value;
-  if (!functionAttr) {
-    return false;
-  }
-  try {
-    const functionAttrObj = JSON.parse(functionAttr);
-    return Boolean(
-      functionAttrObj.is_gift && functionAttrObj.rule_id && functionAttrObj.spend_sum_money
-    );
-  } catch {
-    return false;
-  }
-}
-function isScriptGift(line) {
-  return line.customAttributes?.some(
-    (attr) => attr.key === "_giveaway_gradient_gifts"
-  ) ?? false;
-}
-function isBuyGetGift(line) {
-  return line.customAttributes?.some(
-    (attr) => attr.key === "_freegift_related_handlesku"
-  ) ?? false;
-}
-function isAnyGift(line) {
-  return isFunctionGift(line) || isScriptGift(line) || isBuyGetGift(line);
-}
 function useCalcGiftsFromLines({
   lines,
   customer,
@@ -1536,7 +1568,17 @@ function getCartBasicAttributes({
   const presellAttributes = [
     {
       key: "_presale",
-      value: cart?.lineItems?.some((item) => item?.variant?.metafields?.presell === "presell") ? "true" : "false"
+      value: cart?.lineItems?.some(
+        (item) => item?.variant?.metafields?.global?.presell === "presell"
+      ) ? "true" : "false"
+    }
+  ];
+  const hideShippingAttributes = [
+    {
+      key: "_hide_shipping",
+      value: cart?.lineItems?.some(
+        (item) => item?.variant?.metafields?.global?.hideShipping === "true"
+      ) ? "true" : "false"
     }
   ];
   const weightAttributes = [
@@ -1575,6 +1617,7 @@ function getCartBasicAttributes({
     ...functionAttributes,
     ...presellAttributes,
     ...weightAttributes,
+    ...hideShippingAttributes,
     ...trackingAttributes,
     ...getReferralAttributes()
   ].filter((item) => item?.value !== void 0 && item?.value !== null);
@@ -2571,7 +2614,13 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
         cookieAdapter: cartCookieAdapter,
         buyerIdentity,
         discountCodes,
-        customAttributes: [...basicCartAttributes, ...ga4Attributes, ...customAttributes || []]
+        customAttributes: [
+          ...basicCartAttributes.filter(
+            (a) => !(customAttributes || []).some((c) => c.key === a.key)
+          ),
+          ...ga4Attributes.filter((a) => !(customAttributes || []).some((c) => c.key === a.key)),
+          ...customAttributes || []
+        ]
       });
       if (!resultCart) {
         throw new Error("Failed to create cart for buy now");
@@ -2579,7 +2628,9 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
       if (withTrack && resultCart.lineItems) {
         trackBuyNowGA({
           lineItems: lineItems.map((item) => {
-            const cartLine = resultCart.lineItems.find((line) => line.variant.id === item.variant?.id);
+            const cartLine = resultCart.lineItems.find(
+              (line) => line.variant.id === item.variant?.id
+            );
             if (!cartLine) {
               return null;
             }