@anker-in/shopify-react 1.3.0-beta.1 → 1.3.0-beta.11

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, 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-CM5QrlnE.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-CM5QrlnE.mjs';
+import { CartLineInput, BuyerIdentityInput, NormalizedCart, NormalizedProduct, NormalizedProductVariant, NormalizedLineItem, UpdateCartLinesOptions, HasMetafieldsIdentifier, Media, NormalizedCollection, CollectionsConnection, NormalizedBlog, NormalizedArticle, NormalizedShop, 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';
@@ -920,7 +920,7 @@ interface UseAllProductsOptions extends SWRConfiguration<NormalizedProduct[]> {
  */
 declare function useAllProducts(options?: UseAllProductsOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
 
-interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct[]> {
+interface UseProductsByHandlesOptions extends SWRConfiguration<(NormalizedProduct | undefined)[]> {
     handles?: string[];
     metafieldIdentifiers?: {
         product: HasMetafieldsIdentifier[];
@@ -956,7 +956,7 @@ interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct
  * }
  * ```
  */
-declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
+declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<(NormalizedProduct | undefined)[], any, SWRConfiguration<(NormalizedProduct | undefined)[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>)> | undefined>;
 
 /**
  * useVariant Hook
@@ -1350,33 +1350,14 @@ interface UseSearchOptions extends SWRConfiguration<SearchResult | undefined> {
 }
 declare function useSearch(options?: UseSearchOptions): swr.SWRResponse<SearchResult | undefined, any, SWRConfiguration<SearchResult | undefined, any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SearchResult | undefined>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SearchResult | undefined>)> | undefined>;
 
-interface SiteInfo {
-    name: string;
-    description?: string;
-    primaryDomain: {
-        url: string;
-        host: string;
-    };
-    brand?: {
-        logo?: {
-            image?: {
-                url: string;
-            };
-        };
-        colors?: {
-            primary?: string;
-            secondary?: string;
-        };
-    };
-    metafields?: Record<string, any>;
-}
+type SiteInfo = NormalizedShop;
 interface UseSiteOptions extends SWRConfiguration<SiteInfo | undefined> {
     metafieldIdentifiers?: Array<{
         namespace: string;
         key: string;
     }>;
 }
-declare function useSite(options?: UseSiteOptions): swr.SWRResponse<SiteInfo | undefined, any, SWRConfiguration<SiteInfo | undefined, any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SiteInfo | undefined>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SiteInfo | undefined>)> | undefined>;
+declare function useSite(options?: UseSiteOptions): swr.SWRResponse<NormalizedShop | undefined, any, SWRConfiguration<NormalizedShop | undefined, any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedShop | undefined>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedShop | undefined>)> | undefined>;
 
 interface ShippingMethodsContext {
     freeShippingMethods: PlusMemberShippingMethodConfig[];

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, 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-CM5QrlnE.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-CM5QrlnE.js';
+import { CartLineInput, BuyerIdentityInput, NormalizedCart, NormalizedProduct, NormalizedProductVariant, NormalizedLineItem, UpdateCartLinesOptions, HasMetafieldsIdentifier, Media, NormalizedCollection, CollectionsConnection, NormalizedBlog, NormalizedArticle, NormalizedShop, 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';
@@ -920,7 +920,7 @@ interface UseAllProductsOptions extends SWRConfiguration<NormalizedProduct[]> {
  */
 declare function useAllProducts(options?: UseAllProductsOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
 
-interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct[]> {
+interface UseProductsByHandlesOptions extends SWRConfiguration<(NormalizedProduct | undefined)[]> {
     handles?: string[];
     metafieldIdentifiers?: {
         product: HasMetafieldsIdentifier[];
@@ -956,7 +956,7 @@ interface UseProductsByHandlesOptions extends SWRConfiguration<NormalizedProduct
  * }
  * ```
  */
-declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<NormalizedProduct[], any, SWRConfiguration<NormalizedProduct[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedProduct[]>)> | undefined>;
+declare function useProductsByHandles(options?: UseProductsByHandlesOptions): swr.SWRResponse<(NormalizedProduct | undefined)[], any, SWRConfiguration<(NormalizedProduct | undefined)[], any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<(NormalizedProduct | undefined)[]>)> | undefined>;
 
 /**
  * useVariant Hook
@@ -1350,33 +1350,14 @@ interface UseSearchOptions extends SWRConfiguration<SearchResult | undefined> {
 }
 declare function useSearch(options?: UseSearchOptions): swr.SWRResponse<SearchResult | undefined, any, SWRConfiguration<SearchResult | undefined, any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SearchResult | undefined>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SearchResult | undefined>)> | undefined>;
 
-interface SiteInfo {
-    name: string;
-    description?: string;
-    primaryDomain: {
-        url: string;
-        host: string;
-    };
-    brand?: {
-        logo?: {
-            image?: {
-                url: string;
-            };
-        };
-        colors?: {
-            primary?: string;
-            secondary?: string;
-        };
-    };
-    metafields?: Record<string, any>;
-}
+type SiteInfo = NormalizedShop;
 interface UseSiteOptions extends SWRConfiguration<SiteInfo | undefined> {
     metafieldIdentifiers?: Array<{
         namespace: string;
         key: string;
     }>;
 }
-declare function useSite(options?: UseSiteOptions): swr.SWRResponse<SiteInfo | undefined, any, SWRConfiguration<SiteInfo | undefined, any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SiteInfo | undefined>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<SiteInfo | undefined>)> | undefined>;
+declare function useSite(options?: UseSiteOptions): swr.SWRResponse<NormalizedShop | undefined, any, SWRConfiguration<NormalizedShop | undefined, any, ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedShop | undefined>) | ((arg: readonly [any, ...unknown[]]) => swr__internal.FetcherResponse<NormalizedShop | undefined>)> | undefined>;
 
 interface ShippingMethodsContext {
     freeShippingMethods: PlusMemberShippingMethodConfig[];

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);
@@ -994,6 +1165,26 @@ function useRemoveCartCodes(options) {
   );
   return useSWRMutation__default.default("remove-codes", removeCodes, options);
 }
+function useUpdateCartLines(options) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const { mutateCart, metafieldIdentifiers } = useCartContext();
+  const updateLines = react.useCallback(
+    async (_key, { arg }) => {
+      const updatedCart = await shopifySdk.updateCartLines(client, {
+        ...arg,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      if (updatedCart) {
+        mutateCart(updatedCart);
+      }
+      console.log("use-update-cart-lines updatedCart", metafieldIdentifiers, updatedCart);
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
+  );
+  return useSWRMutation__default.default("update-cart-lines", updateLines, options);
+}
 var initSameLinesAttributes = ({
   cart,
   line
@@ -1081,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,
@@ -2294,6 +2346,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
   const { trigger: applyCartCodes } = useApplyCartCodes();
   const { trigger: removeInvalidCodes } = useRemoveCartCodes();
   const { trigger: addCartLines2 } = useAddCartLines();
+  const { trigger: updateCartLines3 } = useUpdateCartLines();
   const { trigger: createCart4 } = useCreateCart({
     updateCookie: true
   });
@@ -2346,10 +2399,36 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
           // 初次加购时，就把所有 cart attributes 带上
         });
       } else {
-        resultCart = await addCartLines2({
-          cartId,
-          lines
+        const linesToUpdate = [];
+        const linesToAddNew = lines.filter((lineToAdd) => {
+          const existingLine = cart?.lineItems?.find(
+            (item) => item.variant?.id === lineToAdd.merchandiseId
+          );
+          if (existingLine) {
+            linesToUpdate.push({
+              id: existingLine.id,
+              quantity: existingLine.quantity + (lineToAdd.quantity || 1),
+              attributes: lineToAdd.attributes || void 0
+            });
+            return false;
+          }
+          return true;
         });
+        if (linesToUpdate.length > 0) {
+          resultCart = await updateCartLines3({
+            cartId,
+            lines: linesToUpdate
+          });
+        }
+        if (linesToAddNew.length > 0) {
+          resultCart = await addCartLines2({
+            cartId: resultCart?.id || cartId,
+            lines: linesToAddNew
+          });
+        }
+        if (!resultCart) {
+          resultCart = cart;
+        }
         console.log("npm addCartLines resultCart", resultCart);
         if (resultCart && resultCart.discountCodes && resultCart.discountCodes.length > 0) {
           const unapplicableCodes = resultCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
@@ -2410,6 +2489,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       performanceAdapter,
       createCart4,
       addCartLines2,
+      updateCartLines3,
       applyCartCodes,
       removeInvalidCodes,
       addCustomAttributes,
@@ -2419,26 +2499,6 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
   );
   return useSWRMutation__default.default("add-to-cart", addToCart, swrOptions);
 }
-function useUpdateCartLines(options) {
-  const { client, locale, cartCookieAdapter } = useShopify();
-  const { mutateCart, metafieldIdentifiers } = useCartContext();
-  const updateLines = react.useCallback(
-    async (_key, { arg }) => {
-      const updatedCart = await shopifySdk.updateCartLines(client, {
-        ...arg,
-        metafieldIdentifiers,
-        cookieAdapter: cartCookieAdapter
-      });
-      if (updatedCart) {
-        mutateCart(updatedCart);
-      }
-      console.log("use-update-cart-lines updatedCart", metafieldIdentifiers, updatedCart);
-      return updatedCart;
-    },
-    [client, locale, cartCookieAdapter, mutateCart, metafieldIdentifiers]
-  );
-  return useSWRMutation__default.default("update-cart-lines", updateLines, options);
-}
 function useUpdateCartAttributes({
   mutate,
   metafieldIdentifiers,
@@ -3037,8 +3097,7 @@ async function performSearch(client, locale, searchQuery, first = 20, types = ["
   const query = (
     /* GraphQL */
     `
-    query search($query: String!, $first: Int!, $types: [SearchType!])
-    @inContext(language: $language) {
+    query search($query: String!, $first: Int!, $types: [SearchType!]) {
       search(query: $query, first: $first, types: $types, unavailableProducts: HIDE) {
         totalCount
         edges {
@@ -3127,76 +3186,15 @@ function useSearch(options = {}) {
     swrOptions
   );
 }
-async function getSiteInfo(client, locale, metafieldIdentifiers) {
-  const hasMetafields = metafieldIdentifiers && metafieldIdentifiers.length > 0;
-  const query = (
-    /* GraphQL */
-    `
-    query getSiteInfo(
-      ${hasMetafields ? "$shopMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-    ) @inContext(language: $language) {
-      shop {
-        name
-        description
-        primaryDomain {
-          url
-          host
-        }
-        brand {
-          logo {
-            image {
-              url
-            }
-          }
-          colors {
-            primary {
-              background
-            }
-            secondary {
-              background
-            }
-          }
-        }
-        ${hasMetafields ? "metafields(identifiers: $shopMetafieldIdentifiers) { key value }" : ""}
-      }
-    }
-  `
-  );
-  const variables = {};
-  if (hasMetafields) {
-    variables.shopMetafieldIdentifiers = metafieldIdentifiers;
-  }
-  const data = await client.query(query, variables);
-  if (!data || !data.shop) {
-    return void 0;
-  }
-  const shop = data.shop;
-  const metafields = shop.metafields?.reduce((acc, mf) => {
-    if (mf && mf.key) {
-      acc[mf.key] = mf.value;
-    }
-    return acc;
-  }, {});
-  return {
-    name: shop.name,
-    description: shop.description,
-    primaryDomain: shop.primaryDomain,
-    brand: shop.brand ? {
-      logo: shop.brand.logo,
-      colors: shop.brand.colors ? {
-        primary: shop.brand.colors.primary?.background,
-        secondary: shop.brand.colors.secondary?.background
-      } : void 0
-    } : void 0,
-    metafields
-  };
-}
 function useSite(options = {}) {
   const { client, locale } = useShopify();
   const { metafieldIdentifiers, ...swrOptions } = options;
   return useSWR__default.default(
     ["site", locale, metafieldIdentifiers],
-    () => getSiteInfo(client, locale, metafieldIdentifiers),
+    () => shopifySdk.getShop(client, {
+      locale,
+      metafieldIdentifiers
+    }),
     swrOptions
   );
 }