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

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-CM5QrlnE.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-C0UyuPrG.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-CM5QrlnE.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-C0UyuPrG.js';
 export * from '@anker-in/shopify-sdk';
 import 'react';
 import 'react/jsx-runtime';

package/dist/index.js

@@ -1163,6 +1163,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
@@ -1295,9 +1315,13 @@ function useAutoRemoveFreeGifts(options = {}) {
   const {
     removeFunctionGifts = true,
     removeScriptGifts = true,
-    isGiftLineItem
+    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(() => {
@@ -1334,7 +1358,29 @@ function useAutoRemoveFreeGifts(options = {}) {
       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;
     }
@@ -1348,10 +1394,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
@@ -2463,6 +2515,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
   });
@@ -2515,10 +2568,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);
@@ -2579,6 +2658,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       performanceAdapter,
       createCart4,
       addCartLines2,
+      updateCartLines3,
       applyCartCodes,
       removeInvalidCodes,
       addCustomAttributes,
@@ -2588,26 +2668,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,
@@ -3206,8 +3266,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 {
@@ -3303,7 +3362,7 @@ async function getSiteInfo(client, locale, metafieldIdentifiers) {
     `
     query getSiteInfo(
       ${hasMetafields ? "$shopMetafieldIdentifiers: [HasMetafieldsIdentifier!]!" : ""}
-    ) @inContext(language: $language) {
+    ) {
       shop {
         name
         description
@@ -3549,6 +3608,16 @@ function clearGeoLocationCache(cacheKey = "geoLocation") {
   }
 }
 var CartContext = react.createContext(null);
+function AutoRemoveGiftsHandler({
+  options,
+  onRemovingChange
+}) {
+  const { isRemoving } = useAutoRemoveFreeGifts(options);
+  react.useEffect(() => {
+    onRemovingChange(isRemoving);
+  }, [isRemoving, onRemovingChange]);
+  return null;
+}
 function CartProvider({
   children,
   // swrOptions,
@@ -3576,6 +3645,7 @@ function CartProvider({
   });
   const [scriptAutoFreeGift, setScriptAutoFreeGift] = react.useState([]);
   const [functionAutoFreeGift, setFunctionAutoFreeGift] = react.useState([]);
+  const [isAutoRemovingFreeGifts, setIsAutoRemovingFreeGifts] = react.useState(false);
   const {
     run: fetchCart,
     data: cart,
@@ -3735,7 +3805,9 @@ function CartProvider({
   const autoRemoveFreeGiftsOptions = react.useMemo(() => {
     return {
       removeFunctionGifts: !!functionAutoFreeGiftConfig,
-      removeScriptGifts: !!scriptAutoFreeGiftConfig
+      removeScriptGifts: !!scriptAutoFreeGiftConfig,
+      runOnlyOnceAfterInit: true,
+      initDelay: 500
     };
   }, [functionAutoFreeGiftConfig, scriptAutoFreeGiftConfig]);
   const value = react.useMemo(
@@ -3768,7 +3840,8 @@ function CartProvider({
       metafieldIdentifiers,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     }),
     [
       cart,
@@ -3797,10 +3870,20 @@ function CartProvider({
       profile,
       memberSetting,
       appContext,
-      autoRemoveFreeGiftsOptions
+      autoRemoveFreeGiftsOptions,
+      isAutoRemovingFreeGifts
     ]
   );
-  return /* @__PURE__ */ jsxRuntime.jsx(CartContext.Provider, { value, children });
+  return /* @__PURE__ */ jsxRuntime.jsxs(CartContext.Provider, { value, children: [
+    (functionAutoFreeGiftConfig || scriptAutoFreeGiftConfig) && /* @__PURE__ */ jsxRuntime.jsx(
+      AutoRemoveGiftsHandler,
+      {
+        options: autoRemoveFreeGiftsOptions,
+        onRemovingChange: setIsAutoRemovingFreeGifts
+      }
+    ),
+    children
+  ] });
 }
 function useCartContext(options) {
   const context = react.useContext(CartContext);