@anker-in/shopify-react 0.1.1-beta.2 → 0.1.1-beta.20

package/dist/index.js

@@ -142,6 +142,81 @@ var CODE_AMOUNT_KEY = "_sku_code_money";
 var SCRIPT_CODE_AMOUNT_KEY = "_code_money";
 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;
+    const product = variant.product;
+    const quantity = line.quantity || 1;
+    const price = variant.finalPrice?.amount ? Number(variant.finalPrice.amount) : variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : variant.price?.amount ? Number(variant.price.amount) : 0;
+    const subtotalAmount = price * quantity;
+    const totalAmount = subtotalAmount;
+    return {
+      id: `temp-line-${index}-${variant.id}`,
+      // Temporary ID for pre-cart lines
+      name: product?.title || variant.title || "",
+      quantity,
+      variantId: variant.id,
+      productId: product?.id || variant.id.split("/").slice(0, -2).join("/"),
+      totalAmount,
+      subtotalAmount,
+      discountAllocations: [],
+      customAttributes: line.attributes || [],
+      variant: {
+        id: variant.id,
+        price,
+        listPrice: variant.compareAtPrice?.amount ? Number(variant.compareAtPrice.amount) : 0,
+        sku: variant.sku || "",
+        name: variant.title || "",
+        image: variant.image ? {
+          url: variant.image.url,
+          altText: variant.image.altText || void 0
+        } : void 0,
+        requiresShipping: false,
+        // Default value, not available in NormalizedProductVariant
+        availableForSale: variant.availableForSale ?? true,
+        quantityAvailable: variant.quantityAvailable ?? 0,
+        currentlyNotInStock: false,
+        // Default value, will be updated when added to cart
+        weight: variant.weight,
+        metafields: variant.metafields
+      },
+      product,
+      path: product?.handle ? `/products/${product.handle}` : "",
+      discounts: [],
+      options: variant.selectedOptions?.map((opt) => ({
+        name: opt.name,
+        value: opt.value
+      }))
+    };
+  });
+}
+function createMockCartFromLines(lines, existingCart) {
+  const normalizedLines = normalizeAddToCartLines(lines);
+  const subtotalPrice = normalizedLines.reduce((sum, line) => sum + line.subtotalAmount, 0);
+  const totalPrice = normalizedLines.reduce((sum, line) => sum + line.totalAmount, 0);
+  return {
+    id: existingCart?.id || "temp-cart-id",
+    customerId: existingCart?.customerId,
+    email: existingCart?.email,
+    createdAt: existingCart?.createdAt || (/* @__PURE__ */ new Date()).toISOString(),
+    currency: existingCart?.currency || { code: "USD" },
+    taxesIncluded: existingCart?.taxesIncluded,
+    lineItems: normalizedLines,
+    totalLineItemsDiscount: 0,
+    orderDiscounts: 0,
+    lineItemsSubtotalPrice: subtotalPrice,
+    subtotalPrice,
+    totalPrice,
+    totalTaxAmount: 0,
+    discountCodes: existingCart?.discountCodes || [],
+    discountAllocations: [],
+    url: existingCart?.url || "",
+    ready: true,
+    customAttributes: existingCart?.customAttributes
+  };
+}
+
 // src/hooks/cart/utils/index.ts
 var getQuery = () => {
   const url = typeof window !== "undefined" ? window.location.search : "";
@@ -159,22 +234,12 @@ var getQuery = () => {
   }
   return theRequest;
 };
-function atobID(id) {
-  if (id && typeof id === "string" && id.includes("/")) {
-    return id.split("/").pop()?.split("?")?.shift();
-  } else {
-    return id;
-  }
-}
-function btoaID(id, type = "ProductVariant") {
-  return `gid://shopify/${type}/${id}`;
-}
 var getMatchedMainProductSubTotal = (cartData, variant_list, main_product) => {
   const isAllStoreVariant = main_product?.all_store_variant ?? false;
   const matchedList = cartData?.lineItems?.filter((line) => {
     const { is_gift } = getDiscountEnvAttributeValue(line.customAttributes);
     return isAllStoreVariant ? !is_gift : variant_list?.find((item) => {
-      return !is_gift && atobID(line.variantId) === item;
+      return !is_gift && shopifySdk.atobID(line.variantId) === item;
     });
   });
   return matchedList?.reduce((acc, line) => {
@@ -366,12 +431,18 @@ var formatFunctionAutoFreeGift = ({
   };
   return result;
 };
-var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
+var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer, lines) => {
   const tags = react.useMemo(() => customer?.tags || [], [customer?.tags]);
   const isCustomerLoading = react.useMemo(() => !customer ? true : false, [customer]);
   const dealsType = "";
   const { client, locale } = useShopify();
   const giftProductsCache = react.useRef(null);
+  const effectiveCart = react.useMemo(() => {
+    if (lines && lines.length > 0) {
+      return createMockCartFromLines(lines, cart);
+    }
+    return cart;
+  }, [lines, cart]);
   const { activeCampaign, subtotal } = react.useMemo(() => {
     for (const campaign of autoFreeGiftConfig) {
       const { rule_conditions = [], rule_result } = campaign;
@@ -379,7 +450,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
       const isPreCheckPassed = preCheck(rule_conditions, tags, []);
       if (isPreCheckPassed && spend_get_reward) {
         const matchedSubtotal = getMatchedMainProductSubTotal(
-          cart,
+          effectiveCart,
           spend_get_reward.main_product?.variant_list?.map((v) => v.variant_id) || [],
           {
             spend_money_type: spend_get_reward.main_product?.spend_money_type || 1,
@@ -393,13 +464,13 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
       }
     }
     return { activeCampaign: null, subtotal: 0 };
-  }, [autoFreeGiftConfig, cart, tags, dealsType]);
+  }, [autoFreeGiftConfig, effectiveCart, tags, dealsType]);
   const { qualifyingGift, nextTierGoal } = react.useMemo(() => {
     if (!activeCampaign || !activeCampaign.rule_result?.spend_get_reward?.gift_product) {
       return { qualifyingGift: null, nextTierGoal: null };
     }
     const giftTiers = activeCampaign.rule_result.spend_get_reward.gift_product;
-    const qualifyingTier = [...giftTiers].reverse().find((tier) => subtotal >= Number(tier.spend_sum_money));
+    const qualifyingTier = [...giftTiers].sort((a, b) => Number(b.spend_sum_money) - Number(a.spend_sum_money)).find((tier) => subtotal >= Number(tier.spend_sum_money));
     const nextGoal = giftTiers.find((tier) => subtotal < Number(tier.spend_sum_money));
     if (!qualifyingTier) {
       return { qualifyingGift: null, nextTierGoal: nextGoal || null };
@@ -411,7 +482,7 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
         if (!giftProduct) return null;
         return {
           variant: {
-            id: btoaID(giftProduct.variant_id),
+            id: shopifySdk.btoaID(giftProduct.variant_id),
             handle: giftProduct.handle,
             sku: giftProduct.sku
           },
@@ -446,18 +517,24 @@ var useCalcAutoFreeGift = (cart, autoFreeGiftConfig, customer) => {
     }
     return true;
   }, [giftHandles]);
-  const { data: giftProductsResult } = useSWR__default.default(shouldFetch ? giftHandles : null, async () => {
-    const res = await shopifySdk.getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR__default.default(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await shopifySdk.getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = react.useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
@@ -476,12 +553,19 @@ var useScriptAutoFreeGift = ({
   campaign,
   _giveaway,
   cart,
-  locale: providedLocale
+  locale: providedLocale,
+  lines
 }) => {
   const { client, locale: contextLocale } = useShopify();
   const locale = providedLocale || contextLocale;
   const [points_subscribe, set_points_subscribe] = react.useState(false);
   const giftProductsCache = react.useRef(null);
+  const effectiveCart = react.useMemo(() => {
+    if (lines && lines.length > 0) {
+      return createMockCartFromLines(lines, cart);
+    }
+    return cart;
+  }, [lines, cart]);
   react.useEffect(() => {
     if (locale === "au") {
       const isPointsSubscribe = Cookies5__default.default.get("points_subscribe");
@@ -503,14 +587,16 @@ var useScriptAutoFreeGift = ({
       upgrade_multiple2 = 1.2;
       upgrade_value2 = 40;
     }
-    cart?.lineItems?.forEach(({ customAttributes }) => {
-      customAttributes?.forEach(({ key, value }) => {
-        if (key === "_amount_upgrade_multiple") upgrade_multiple2 = Number(value) || 1;
-        if (key === "_amount_upgrade_value") upgrade_value2 = Number(value) || 0;
-      });
-    });
+    effectiveCart?.lineItems?.forEach(
+      ({ customAttributes }) => {
+        customAttributes?.forEach(({ key, value }) => {
+          if (key === "_amount_upgrade_multiple") upgrade_multiple2 = Number(value) || 1;
+          if (key === "_amount_upgrade_value") upgrade_value2 = Number(value) || 0;
+        });
+      }
+    );
     return [upgrade_multiple2, upgrade_value2];
-  }, [cart?.lineItems, points_subscribe]);
+  }, [effectiveCart?.lineItems, points_subscribe]);
   const breakpoints = react.useMemo(() => {
     if (!isActivityAvailable) return [];
     return (campaign?.breakpoints || []).map((item) => ({
@@ -538,7 +624,7 @@ var useScriptAutoFreeGift = ({
   }, [giftHandles]);
   const involvedLines = react.useMemo(() => {
     if (!isActivityAvailable) return [];
-    return (cart?.lineItems || []).filter((line) => {
+    return (effectiveCart?.lineItems || []).filter((line) => {
       const isNotGift = line?.totalAmount && Number(line.totalAmount) > 0 && line.customAttributes?.every(
         (item) => item.key !== _giveaway
       );
@@ -547,7 +633,7 @@ var useScriptAutoFreeGift = ({
       );
       return isNotGift && hasCampaignTag;
     });
-  }, [cart?.lineItems, isActivityAvailable, _giveaway]);
+  }, [effectiveCart?.lineItems, isActivityAvailable, _giveaway]);
   const involvedSubTotal = react.useMemo(() => {
     if (!isActivityAvailable) return new Decimal2__default.default(0);
     return involvedLines.reduce((prev, item) => {
@@ -573,18 +659,24 @@ var useScriptAutoFreeGift = ({
     const nextLevel = levelIndex > 0 ? sortedLevels[levelIndex - 1] ?? null : null;
     return [currentLevel, nextLevel];
   }, [breakpoints, involvedSubTotal, involvedLines.length]);
-  const { data: giftProductsResult } = useSWR__default.default(shouldFetch ? giftHandles : null, async () => {
-    const res = await shopifySdk.getProductsByHandles(client, {
-      handles: giftHandles,
-      locale
-    });
-    const result = Array.isArray(res) ? res : [];
-    giftProductsCache.current = {
-      data: result,
-      giftHandles: [...giftHandles]
-    };
-    return result;
-  });
+  const { data: giftProductsResult } = useSWR__default.default(
+    shouldFetch ? giftHandles : null,
+    async () => {
+      const res = await shopifySdk.getProductsByHandles(client, {
+        handles: giftHandles,
+        locale
+      });
+      const result = Array.isArray(res) ? res : [];
+      giftProductsCache.current = {
+        data: result,
+        giftHandles: [...giftHandles]
+      };
+      return result;
+    },
+    {
+      revalidateOnFocus: false
+    }
+  );
   const finalGiftProductsResult = react.useMemo(() => {
     if (giftProductsCache.current && !shouldFetch) {
       return giftProductsCache.current.data || void 0;
@@ -847,7 +939,7 @@ function useApplyCartCodes(options) {
       if (!discountCodes?.length) {
         throw new Error("Invalid input used for this operation: Miss discountCode");
       }
-      const cartId = providedCartId ? void 0 : providedCartId || cart?.id;
+      const cartId = providedCartId || cart?.id;
       if (!cartId) {
         return void 0;
       }
@@ -875,7 +967,7 @@ function useRemoveCartCodes(options) {
   const removeCodes = react.useCallback(
     async (_key, { arg }) => {
       const { cartId: providedCartId, discountCodes } = arg;
-      const cartId = providedCartId ? void 0 : providedCartId || cart?.id;
+      const cartId = providedCartId || cart?.id;
       const codes = cart?.discountCodes?.filter((code) => !!code.applicable) || [];
       const leftCodes = codes.filter((code) => discountCodes?.length ? !discountCodes.includes(code.code) : code.code).map((code) => code.code);
       const updatedCart = await shopifySdk.updateCartCodes(client, {
@@ -897,7 +989,7 @@ function useRemoveCartCodes(options) {
 // src/hooks/cart/use-add-to-cart.ts
 function useAddToCart({ withTrack = true } = {}, swrOptions) {
   const { client, config, locale, cartCookieAdapter, userAdapter } = useShopify();
-  const { cart } = useCartContext();
+  const { cart, addCustomAttributes } = useCartContext();
   const { trigger: applyCartCodes } = useApplyCartCodes();
   const { trigger: removeInvalidCodes } = useRemoveCartCodes();
   const { trigger: addCartLines2 } = useAddCartLines();
@@ -911,7 +1003,8 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
         buyerIdentity,
         needCreateCart = false,
         onCodesInvalid,
-        replaceExistingCodes
+        replaceExistingCodes,
+        customAttributes
       } = arg;
       if (!lineItems || lineItems.length === 0) {
         return;
@@ -934,6 +1027,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
       if (!resultCart) {
         return void 0;
       }
+      console.log("npm addCartLines resultCart", resultCart);
       if (resultCart.discountCodes && resultCart.discountCodes.length > 0) {
         const unapplicableCodes = resultCart.discountCodes.filter((item) => !item.applicable).map((item) => item.code);
         if (unapplicableCodes.length > 0) {
@@ -955,6 +1049,9 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
           discountCodes
         });
       }
+      if (customAttributes && customAttributes.length > 0) {
+        addCustomAttributes(customAttributes);
+      }
       if (withTrack) {
         trackAddToCartGA({
           lineItems,
@@ -1107,6 +1204,60 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
   );
   return useSWRMutation__default.default("buy-now", buyNow, swrOptions);
 }
+function useCalcGiftsFromLines({
+  lines,
+  customer,
+  scriptGiveawayKey = CUSTOMER_SCRIPT_GIFT_KEY
+}) {
+  const { locale } = useShopify();
+  const { cart, autoFreeGiftConfig, gradientGiftsConfig } = useCartContext();
+  const functionGift = useCalcAutoFreeGift(cart, autoFreeGiftConfig || [], customer, lines);
+  const scriptGift = useScriptAutoFreeGift({
+    campaign: gradientGiftsConfig || null,
+    _giveaway: scriptGiveawayKey,
+    cart,
+    locale,
+    lines
+  });
+  const allGiftLines = react.useMemo(() => {
+    const functionGiftLines = functionGift.qualifyingGift?.itemsToAdd || [];
+    const scriptGiftLines = scriptGift.freeGiftLevel ? scriptGift.freeGiftLevel.giveawayProducts.map((product) => {
+      const giftProduct = scriptGift.giftProductsResult?.find(
+        (p) => p.handle === product.handle
+      );
+      const variant = giftProduct?.variants?.[0];
+      return {
+        variant: {
+          id: variant?.id || "",
+          handle: product.handle,
+          sku: product.sku
+        },
+        quantity: 1,
+        attributes: [
+          {
+            key: scriptGiveawayKey,
+            value: "true"
+          }
+        ]
+      };
+    }).filter((item) => item.variant.id) : [];
+    return [...functionGiftLines, ...scriptGiftLines];
+  }, [
+    functionGift.qualifyingGift,
+    scriptGift.freeGiftLevel,
+    scriptGift.giftProductsResult,
+    scriptGiveawayKey
+  ]);
+  const hasGifts = react.useMemo(() => {
+    return allGiftLines.length > 0;
+  }, [allGiftLines]);
+  return {
+    functionGift,
+    scriptGift,
+    allGiftLines,
+    hasGifts
+  };
+}
 
 // src/hooks/cart/types/order-discount.ts
 var OrderDiscountType = /* @__PURE__ */ ((OrderDiscountType2) => {
@@ -1227,12 +1378,10 @@ function useHasPlusMemberInCart({
     };
   }, [cart?.lineItems, plus_monthly_product, plus_annual_product]);
 }
-
-// src/hooks/cart/feature/use-cart-attributes.ts
 var getReferralAttributes = () => {
-  const inviteCode = Cookies5__default.default.get("invite_code");
-  const playModeId = Cookies5__default.default.get("playModeId");
-  const popup = Cookies5__default.default.get("_popup");
+  const inviteCode = shopifySdk.getLocalStorage("invite_code") || Cookies5__default.default.get("invite_code");
+  const playModeId = shopifySdk.getLocalStorage("playModeId") || Cookies5__default.default.get("playModeId");
+  const popup = shopifySdk.getLocalStorage("_popup") || Cookies5__default.default.get("_popup");
   if (inviteCode && playModeId) {
     return popup ? [
       { key: "_invite_code", value: inviteCode ? inviteCode : "" },
@@ -1256,8 +1405,6 @@ var useCartAttributes = ({
     memberSetting,
     cart
   });
-  console.log("memberSetting", memberSetting);
-  console.log("hasPlusMember", hasPlusMember);
   react.useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
@@ -1283,7 +1430,7 @@ var useCartAttributes = ({
     return "new_user_login";
   }, [customer]);
   const memberAttributes = react.useMemo(() => {
-    return [
+    const attributes = [
       {
         key: "_token",
         value: profile?.token
@@ -1304,17 +1451,28 @@ var useCartAttributes = ({
         value: profile?.token ? "true" : "false"
       }
     ];
+    if (profile?.token) {
+      attributes.push({
+        key: "_login_user",
+        value: "1"
+      });
+    }
+    return attributes;
   }, [profile?.memberType, profile?.token, userType, hasPlusMember]);
   const functionAttributes = react.useMemo(() => {
-    return [
-      cart?.discountCodes && {
+    const hasFunctionEnvAttribute = cart?.lineItems.some(
+      (item) => item.customAttributes?.some((attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY)
+    );
+    const discountCodes = cart?.discountCodes.map((item) => item.code).filter((code) => code) || [];
+    return hasFunctionEnvAttribute ? [
+      {
         key: "_discounts_function_env",
         value: JSON.stringify({
-          discount_code: cart?.discountCodes.map((item) => item.code),
+          discount_code: discountCodes,
           user_tags: customer?.tags || []
         })
       }
-    ];
+    ] : [];
   }, [cart]);
   const presellAttributes = react.useMemo(() => {
     return [
@@ -1346,18 +1504,50 @@ var useCartAttributes = ({
       }
     ];
   }, [currentUrl]);
+  const commonAttributes = react.useMemo(
+    () => [
+      ...memberAttributes,
+      ...functionAttributes,
+      ...presellAttributes,
+      ...weightAttributes,
+      ...trackingAttributes,
+      ...getReferralAttributes()
+    ].filter((item) => item?.value),
+    [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
+  );
+  const extraAttributesInCart = react.useMemo(() => {
+    const commonAttributeKeys = [
+      // member attributes
+      "_token",
+      "_member_type",
+      "_user_type",
+      "_is_login",
+      "_login_user",
+      // function attributes
+      "_discounts_function_env",
+      // presell attributes
+      "_presale",
+      // weight attributes
+      "_weight",
+      "_app_source_name",
+      // tracking attributes
+      "utm_params",
+      // referral attributes
+      "_invite_code",
+      "_play_mode_id",
+      "_popup"
+    ];
+    return cart?.customAttributes?.filter(
+      (item) => !commonAttributeKeys.includes(item.key)
+    ) || [];
+  }, [cart]);
   return react.useMemo(
     () => ({
-      attributes: [
-        ...memberAttributes,
-        ...functionAttributes,
-        ...presellAttributes,
-        ...weightAttributes,
-        ...trackingAttributes,
-        ...getReferralAttributes()
-      ].filter((item) => item?.value)
+      attributes: [...commonAttributes, ...extraAttributesInCart].filter(
+        (item) => item?.value
+      )
     }),
-    [memberAttributes, functionAttributes, presellAttributes, weightAttributes, trackingAttributes]
+    [commonAttributes, extraAttributesInCart]
   );
 };
 var DEFAULT_MIN = 1;
@@ -1574,8 +1764,9 @@ function useProductsByHandles(options = {}) {
         metafieldIdentifiers
       });
     },
-    swrOptions || {
-      revalidateOnFocus: false
+    {
+      revalidateOnFocus: false,
+      ...swrOptions
     }
   );
 }
@@ -2491,6 +2682,73 @@ var usePlusMemberDeliveryCodes = ({
     [deliveryData]
   );
 };
+function useUpdateCartDeliveryOptions(mutate, metafieldIdentifiers, options) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const updateDeliveryOptions = react.useCallback(
+    async (_key, { arg }) => {
+      const updatedCart = await shopifySdk.updateCartDeliveryOptions(client, {
+        ...arg,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      console.log("useUpdateCartDeliveryOptions updatedCart", updatedCart);
+      if (updatedCart) {
+        mutate(updatedCart);
+      }
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutate]
+  );
+  return useSWRMutation__default.default("update-cart-delivery-options", updateDeliveryOptions, options);
+}
+
+// src/hooks/member/plus/use-update-plus-member-delivery-options.ts
+var useUpdatePlusMemberDeliveryOptions = ({
+  options
+} = {}) => {
+  const { cart: cartContextData, mutateCart, metafieldIdentifiers } = useCartContext();
+  const { trigger: updateCartDeliveryOptions2 } = useUpdateCartDeliveryOptions(
+    mutateCart,
+    metafieldIdentifiers
+  );
+  const handler = react.useCallback(
+    async (_, { arg }) => {
+      const currentCart = arg?.cart || cartContextData;
+      const { deliveryData } = arg;
+      const firstDeliveryGroup = currentCart?.deliveryGroups?.[0];
+      const deliveryGroupId = firstDeliveryGroup?.id;
+      const selectedOptionCode = deliveryData?.deliveryCustomData?.selected_delivery_option?.code;
+      if (!deliveryGroupId || !selectedOptionCode || selectedOptionCode === firstDeliveryGroup?.selectedDeliveryOption?.code) {
+        return null;
+      }
+      const deliveryGroup = currentCart?.deliveryGroups?.find(
+        (group) => group?.id === deliveryGroupId
+      );
+      const matchedOption = deliveryGroup?.deliveryOptions?.find(
+        (option) => option?.code === selectedOptionCode
+      );
+      if (!matchedOption?.handle) {
+        return null;
+      }
+      const deliveryOptions = [
+        {
+          deliveryGroupId,
+          deliveryOptionHandle: matchedOption.handle
+        }
+      ];
+      const updatedCart = await updateCartDeliveryOptions2({
+        selectedDeliveryOptions: deliveryOptions,
+        cartId: currentCart?.id
+      });
+      if (updatedCart && mutateCart) {
+        mutateCart(updatedCart);
+      }
+      return updatedCart;
+    },
+    [cartContextData, updateCartDeliveryOptions2, mutateCart]
+  );
+  return useSWRMutation__default.default("update-cart-delivery-options", handler, options);
+};
 var usePlusMemberItemCustomAttributes = ({
   deliveryData
 }) => {
@@ -2510,48 +2768,18 @@ var usePlusMemberCheckoutCustomAttributes = ({
   deliveryData,
   product,
   variant,
-  customer,
   isShowShippingBenefits
 }) => {
   const { deliveryCustomData } = deliveryData || {};
   const { profile } = usePlusMemberContext();
-  const userType = react.useMemo(() => {
-    const customerInfo = customer;
-    if (!customerInfo) {
-      return "new_user_unlogin";
-    }
-    if (customer) {
-      const { orders = {} } = customer;
-      const edgesLength = orders?.edges?.length;
-      if (edgesLength === 1) {
-        return "old_user_orders_once";
-      } else if (edgesLength && edgesLength > 1) {
-        return "old_user_orders_twice";
-      }
-    }
-    return "new_user_login";
-  }, [customer]);
   return react.useMemo(() => {
     const checkoutCustomAttributes = [
-      {
-        key: "_token",
-        value: profile?.token || ""
-      },
+      // _last_url: 付费会员结算完成之后 checkout 有一个继续购买的按钮, 用于跳转到继续购买的页面
       {
         key: "_last_url",
         value: typeof window !== "undefined" ? window.location.origin + window.location.pathname : ""
-      },
-      {
-        key: "_user_type",
-        value: userType
       }
     ];
-    if (profile) {
-      checkoutCustomAttributes.push({
-        key: "_login_user",
-        value: "1"
-      });
-    }
     if (deliveryCustomData) {
       checkoutCustomAttributes.push({
         key: "_checkout_delivery_custom",
@@ -2561,12 +2789,6 @@ var usePlusMemberCheckoutCustomAttributes = ({
         })
       });
     }
-    if (variant?.metafields?.presell) {
-      checkoutCustomAttributes.push({
-        key: "_presale",
-        value: "true"
-      });
-    }
     if (isShowShippingBenefits && !isShowShippingBenefits({ variant, product, setting: {} })) {
       checkoutCustomAttributes.push({
         key: "_hide_shipping",
@@ -2574,18 +2796,17 @@ var usePlusMemberCheckoutCustomAttributes = ({
       });
     }
     return checkoutCustomAttributes;
-  }, [deliveryCustomData, product, profile, userType, variant, isShowShippingBenefits]);
+  }, [deliveryCustomData, product, profile, variant, isShowShippingBenefits]);
 };
 function useAutoRemovePlusMemberInCart({
-  metafields,
-  isMonthlyPlus,
-  isAnnualPlus
+  cart,
+  profile,
+  memberSetting
 }) {
-  const { plus_monthly_product, plus_annual_product } = metafields || {};
-  const { cart } = useCartContext();
+  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
   const { trigger: removeCartLines2 } = useRemoveCartLines();
   react.useEffect(() => {
-    if (!cart) return;
+    if (!cart || !plus_monthly_product || !plus_annual_product) return;
     const removePlusProduct = async (productType) => {
       if (!productType) return;
       const product = cart.lineItems?.find(
@@ -2597,33 +2818,25 @@ function useAutoRemovePlusMemberInCart({
         });
       }
     };
-    if (isMonthlyPlus) {
+    if (profile?.isMonthlyPlus) {
       removePlusProduct(plus_monthly_product);
     }
-    if (isAnnualPlus) {
+    if (profile?.isAnnualPlus) {
       removePlusProduct(plus_annual_product);
     }
-  }, [
-    cart,
-    plus_annual_product,
-    plus_monthly_product,
-    isAnnualPlus,
-    isMonthlyPlus,
-    removeCartLines2
-  ]);
+  }, [cart, plus_annual_product, plus_monthly_product, profile, removeCartLines2]);
 }
 function useAddPlusMemberProductsToCart({
   cart,
-  memberSetting,
-  selectedPlusMemberMode,
-  selectedPlusMemberProduct
+  profile
 }) {
+  const { selectedPlusMemberMode, selectedPlusMemberProduct, plusMemberMetafields } = usePlusMemberContext();
   const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
-    cart,
-    memberSetting
+    memberSetting: plusMemberMetafields,
+    cart
   });
   const plusMemberProduct = react.useMemo(() => {
-    if (selectedPlusMemberMode === "free" /* FREE */) {
+    if (!selectedPlusMemberProduct || selectedPlusMemberMode === "free" /* FREE */) {
       return void 0;
     }
     if (selectedPlusMemberMode === "monthly" /* MONTHLY */ && hasMonthlyPlus) {
@@ -2632,7 +2845,10 @@ function useAddPlusMemberProductsToCart({
     if (selectedPlusMemberMode === "annual" /* ANNUAL */ && hasAnnualPlus) {
       return void 0;
     }
-    if (!selectedPlusMemberProduct) {
+    if (profile?.isMonthlyPlus && selectedPlusMemberMode === "monthly" /* MONTHLY */) {
+      return void 0;
+    }
+    if (profile?.isAnnualPlus && selectedPlusMemberMode === "annual" /* ANNUAL */) {
       return void 0;
     }
     return selectedPlusMemberProduct;
@@ -2951,8 +3167,13 @@ function CartProvider({
   const { attributes } = useCartAttributes({ profile, customer, cart, memberSetting });
   ahooks.useRequest(
     () => {
-      const newAttributes = [...attributes, ...customAttributes];
-      const needUpdate = cart && !checkAttributesUpdateNeeded(
+      const newAttributes = [...attributes];
+      customAttributes.forEach((item) => {
+        if (item.value && !newAttributes.some((attr) => attr.key === item.key)) {
+          newAttributes.push(item);
+        }
+      });
+      const needUpdate = cart && checkAttributesUpdateNeeded(
         cart.customAttributes,
         newAttributes,
         customAttributesNeedDelete
@@ -3056,8 +3277,14 @@ function CartProvider({
     );
     return result;
   }, [cart?.lineItems, scriptAutoFreeGift, functionAutoFreeGift]);
+  const totalQuantity = react.useMemo(() => {
+    const cartLinesCount = cart?.lineItems.reduce((acc, item) => acc + item.quantity, 0) || 0;
+    const giftLinesCount = giftNeedAddToCartLines?.reduce((acc, item) => acc + (item.quantity || 1), 0) || 0;
+    return cartLinesCount + giftLinesCount;
+  }, [cart?.lineItems, giftNeedAddToCartLines]);
   const value = react.useMemo(
     () => ({
+      totalQuantity,
       cart,
       isCartLoading,
       triggerFetch: fetchCart,
@@ -3069,6 +3296,7 @@ function CartProvider({
       isCodeChanging,
       setIsCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       setLoadingState,
       loadingState,
       // function满赠
@@ -3084,6 +3312,7 @@ function CartProvider({
     }),
     [
       cart,
+      totalQuantity,
       isCartLoading,
       fetchCart,
       mutateCart,
@@ -3092,6 +3321,7 @@ function CartProvider({
       locale,
       isCodeChanging,
       autoFreeGiftConfig,
+      gradientGiftsConfig,
       loadingState,
       // function满赠
       functionAutoFreeGift,
@@ -3115,30 +3345,6 @@ function useCartContext() {
   return context;
 }
 
-Object.defineProperty(exports, "ShopifyConfig", {
-  enumerable: true,
-  get: function () { return shopifySdk.ShopifyConfig; }
-});
-Object.defineProperty(exports, "clearLocalStorage", {
-  enumerable: true,
-  get: function () { return shopifySdk.clearLocalStorage; }
-});
-Object.defineProperty(exports, "createShopifyClient", {
-  enumerable: true,
-  get: function () { return shopifySdk.createShopifyClient; }
-});
-Object.defineProperty(exports, "getLocalStorage", {
-  enumerable: true,
-  get: function () { return shopifySdk.getLocalStorage; }
-});
-Object.defineProperty(exports, "removeLocalStorage", {
-  enumerable: true,
-  get: function () { return shopifySdk.removeLocalStorage; }
-});
-Object.defineProperty(exports, "setLocalStorage", {
-  enumerable: true,
-  get: function () { return shopifySdk.setLocalStorage; }
-});
 exports.BuyRuleType = BuyRuleType;
 exports.CODE_AMOUNT_KEY = CODE_AMOUNT_KEY;
 exports.CUSTOMER_ATTRIBUTE_KEY = CUSTOMER_ATTRIBUTE_KEY;
@@ -3160,12 +3366,11 @@ exports.ShippingMethodMode = ShippingMethodMode;
 exports.ShopifyContext = ShopifyContext;
 exports.ShopifyProvider = ShopifyProvider;
 exports.SpendMoneyType = SpendMoneyType;
-exports.atobID = atobID;
 exports.browserCartCookieAdapter = browserCartCookieAdapter;
 exports.browserCookieAdapter = browserCookieAdapter;
-exports.btoaID = btoaID;
 exports.checkAttributesUpdateNeeded = checkAttributesUpdateNeeded;
 exports.clearGeoLocationCache = clearGeoLocationCache;
+exports.createMockCartFromLines = createMockCartFromLines;
 exports.currencyCodeMapping = currencyCodeMapping;
 exports.defaultSWRMutationConfiguration = defaultSWRMutationConfiguration;
 exports.formatFunctionAutoFreeGift = formatFunctionAutoFreeGift;
@@ -3176,6 +3381,7 @@ exports.getDiscountEnvAttributeValue = getDiscountEnvAttributeValue;
 exports.getMatchedMainProductSubTotal = getMatchedMainProductSubTotal;
 exports.getQuery = getQuery;
 exports.getReferralAttributes = getReferralAttributes;
+exports.normalizeAddToCartLines = normalizeAddToCartLines;
 exports.preCheck = preCheck;
 exports.safeParse = safeParse;
 exports.trackAddToCartFBQ = trackAddToCartFBQ;
@@ -3197,6 +3403,7 @@ exports.useAutoRemovePlusMemberInCart = useAutoRemovePlusMemberInCart;
 exports.useBlog = useBlog;
 exports.useBuyNow = useBuyNow;
 exports.useCalcAutoFreeGift = useCalcAutoFreeGift;
+exports.useCalcGiftsFromLines = useCalcGiftsFromLines;
 exports.useCalcOrderDiscount = useCalcOrderDiscount;
 exports.useCartAttributes = useCartAttributes;
 exports.useCartContext = useCartContext;
@@ -3231,8 +3438,15 @@ exports.useSite = useSite;
 exports.useUpdateCartAttributes = useUpdateCartAttributes;
 exports.useUpdateCartLines = useUpdateCartLines;
 exports.useUpdateLineCodeAmountAttributes = useUpdateLineCodeAmountAttributes;
+exports.useUpdatePlusMemberDeliveryOptions = useUpdatePlusMemberDeliveryOptions;
 exports.useUpdateVariantQuery = useUpdateVariantQuery;
 exports.useVariant = useVariant;
 exports.useVariantMedia = useVariantMedia;
+Object.keys(shopifySdk).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return shopifySdk[k]; }
+  });
+});
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map