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

package/dist/index.mjs

@@ -1,13 +1,13 @@
 import { createContext, useMemo, useContext, useRef, useState, useEffect, useCallback } from 'react';
-import { createShopifyClient, getProductsByHandles, createCart, updateCartCodes, addCartLines, removeCartLines, getLocalStorage, updateCartLines, updateCartAttributes, updateBuyerIdentity, getProduct, getAllProducts, getCollection, getAllCollections, getCollections, getBlog, getAllBlogs, getArticle, getArticles, getArticlesInBlog, getCart, setLocalStorage } from '@anker-in/shopify-sdk';
+import { createShopifyClient, getProductsByHandles, createCart, updateCartCodes, addCartLines, updateCartLines, removeCartLines, getLocalStorage, updateCartAttributes, updateBuyerIdentity, getProduct, getAllProducts, getCollection, getAllCollections, getCollections, getBlog, getAllBlogs, getArticle, getArticles, getArticlesInBlog, getShop, getCart, setLocalStorage } from '@anker-in/shopify-sdk';
 export * from '@anker-in/shopify-sdk';
 import Cookies5 from 'js-cookie';
-import { jsx } from 'react/jsx-runtime';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import Decimal3 from 'decimal.js';
 import { atobID, btoaID } from '@anker-in/shopify-core';
 import useSWR from 'swr';
 import useSWRMutation from 'swr/mutation';
-import { useRequest } from 'ahooks';
+import { useDebounceEffect, useRequest } from 'ahooks';
 
 // src/provider/context.ts
 var ShopifyContext = createContext(null);
@@ -1155,6 +1155,26 @@ function useRemoveCartCodes(options) {
   );
   return useSWRMutation("remove-codes", removeCodes, options);
 }
+function useUpdateCartLines(options) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const { mutateCart, metafieldIdentifiers } = useCartContext();
+  const updateLines = useCallback(
+    async (_key, { arg }) => {
+      const updatedCart = await 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("update-cart-lines", updateLines, options);
+}
 var initSameLinesAttributes = ({
   cart,
   line
@@ -1287,9 +1307,13 @@ function useAutoRemoveFreeGifts(options = {}) {
   const {
     removeFunctionGifts = true,
     removeScriptGifts = true,
-    isGiftLineItem
+    isGiftLineItem,
+    runOnlyOnceAfterInit = false,
+    initDelay = 500
   } = options;
   const [isRemoving, setIsRemoving] = useState(false);
+  const [isInitialized, setIsInitialized] = useState(!runOnlyOnceAfterInit);
+  const [isFinished, setIsFinished] = useState(false);
   const { cart } = useCartContext();
   const { trigger: removeCartLines2 } = useRemoveCartLines();
   const giftsToRemove = useMemo(() => {
@@ -1326,7 +1350,29 @@ function useAutoRemoveFreeGifts(options = {}) {
       return false;
     });
   }, [cart, removeFunctionGifts, removeScriptGifts, isGiftLineItem]);
+  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
+    }
+  );
   useEffect(() => {
+    if (runOnlyOnceAfterInit && (!isInitialized || isFinished)) {
+      return;
+    }
     if (isRemoving || giftsToRemove.length === 0) {
       return;
     }
@@ -1340,10 +1386,16 @@ function useAutoRemoveFreeGifts(options = {}) {
         console.error("Failed to remove free gifts:", error);
       } finally {
         setIsRemoving(false);
+        if (runOnlyOnceAfterInit) {
+          setIsFinished(true);
+        }
       }
     };
     performRemoval();
   }, [
+    runOnlyOnceAfterInit,
+    isInitialized,
+    isFinished,
     isRemoving,
     giftsToRemove,
     removeCartLines2
@@ -2455,6 +2507,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
   });
@@ -2507,10 +2560,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);
@@ -2571,6 +2650,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       performanceAdapter,
       createCart4,
       addCartLines2,
+      updateCartLines3,
       applyCartCodes,
       removeInvalidCodes,
       addCustomAttributes,
@@ -2580,26 +2660,6 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
   );
   return useSWRMutation("add-to-cart", addToCart, swrOptions);
 }
-function useUpdateCartLines(options) {
-  const { client, locale, cartCookieAdapter } = useShopify();
-  const { mutateCart, metafieldIdentifiers } = useCartContext();
-  const updateLines = useCallback(
-    async (_key, { arg }) => {
-      const updatedCart = await 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("update-cart-lines", updateLines, options);
-}
 function useUpdateCartAttributes({
   mutate,
   metafieldIdentifiers,
@@ -3198,8 +3258,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 {
@@ -3288,76 +3347,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(
     ["site", locale, metafieldIdentifiers],
-    () => getSiteInfo(client, locale, metafieldIdentifiers),
+    () => getShop(client, {
+      locale,
+      metafieldIdentifiers
+    }),
     swrOptions
   );
 }
@@ -3541,6 +3539,16 @@ function clearGeoLocationCache(cacheKey = "geoLocation") {
   }
 }
 var CartContext = createContext(null);
+function AutoRemoveGiftsHandler({
+  options,
+  onRemovingChange
+}) {
+  const { isRemoving } = useAutoRemoveFreeGifts(options);
+  useEffect(() => {
+    onRemovingChange(isRemoving);
+  }, [isRemoving, onRemovingChange]);
+  return null;
+}
 function CartProvider({
   children,
   // swrOptions,
@@ -3568,6 +3576,7 @@ function CartProvider({
   });
   const [scriptAutoFreeGift, setScriptAutoFreeGift] = useState([]);
   const [functionAutoFreeGift, setFunctionAutoFreeGift] = useState([]);
+  const [isAutoRemovingFreeGifts, setIsAutoRemovingFreeGifts] = useState(false);
   const {
     run: fetchCart,
     data: cart,
@@ -3727,7 +3736,9 @@ function CartProvider({
   const autoRemoveFreeGiftsOptions = useMemo(() => {
     return {
       removeFunctionGifts: !!functionAutoFreeGiftConfig,
-      removeScriptGifts: !!scriptAutoFreeGiftConfig
+      removeScriptGifts: !!scriptAutoFreeGiftConfig,
+      runOnlyOnceAfterInit: true,
+      initDelay: 500
     };
   }, [functionAutoFreeGiftConfig, scriptAutoFreeGiftConfig]);
   const value = useMemo(
@@ -3760,7 +3771,8 @@ function CartProvider({
       metafieldIdentifiers,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     }),
     [
       cart,
@@ -3789,10 +3801,20 @@ function CartProvider({
       profile,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     ]
   );
-  return /* @__PURE__ */ jsx(CartContext.Provider, { value, children });
+  return /* @__PURE__ */ jsxs(CartContext.Provider, { value, children: [
+    (functionAutoFreeGiftConfig || scriptAutoFreeGiftConfig) && /* @__PURE__ */ jsx(
+      AutoRemoveGiftsHandler,
+      {
+        options: autoRemoveFreeGiftsOptions,
+        onRemovingChange: setIsAutoRemovingFreeGifts
+      }
+    ),
+    children
+  ] });
 }
 function useCartContext(options) {
   const context = useContext(CartContext);