@anker-in/shopify-react 0.1.1-beta.40 → 0.1.1-beta.42

package/dist/hooks/index.js

@@ -70,6 +70,7 @@ var CUSTOMER_ATTRIBUTE_KEY = "_discounts_function_env";
 var CUSTOMER_SCRIPT_GIFT_KEY = "_giveaway_gradient_gifts";
 var CODE_AMOUNT_KEY = "_sku_code_money";
 var SCRIPT_CODE_AMOUNT_KEY = "_code_money";
+var MEMBER_PRICE_ATTRIBUTE_KEY = "_member_price";
 var MAIN_PRODUCT_CODE = ["WS24", "WSTD", "WS7D", "WSCP", "WSPE", "WSPD"];
 
 // src/hooks/cart/utils/normalize-add-to-cart-lines.ts
@@ -948,59 +949,90 @@ function useRemoveCartCodes(options) {
   );
   return useSWRMutation__default.default("remove-codes", removeCodes, options);
 }
-
-// src/hooks/cart/utils/add-to-cart.ts
-var getLinesWithAttributes = ({
+var initSameLinesAttributes = ({
   cart,
-  lineItems
+  line
 }) => {
-  return lineItems.map((line) => {
-    const sameLineInCart = cart?.lineItems.find(
-      (lineInCart) => lineInCart.variant.sku === line.variant?.sku && lineInCart.product?.handle === line.variant?.product?.handle
-    );
-    const codeAmountAttribute = sameLineInCart?.customAttributes?.find(
-      (attr) => attr.key === CODE_AMOUNT_KEY
-    );
-    const scriptCodeAmountAttribute = sameLineInCart?.customAttributes?.find(
-      (attr) => attr.key === SCRIPT_CODE_AMOUNT_KEY
+  const sameLineInCart = cart?.lineItems.find(
+    (lineInCart) => lineInCart.variant.sku === line.variant?.sku && lineInCart.product?.handle === line.variant?.product?.handle
+  );
+  const codeAmountAttribute = sameLineInCart?.customAttributes?.find(
+    (attr) => attr.key === CODE_AMOUNT_KEY
+  );
+  const scriptCodeAmountAttribute = sameLineInCart?.customAttributes?.find(
+    (attr) => attr.key === SCRIPT_CODE_AMOUNT_KEY
+  );
+  let functionAttribute = null;
+  try {
+    functionAttribute = sameLineInCart?.customAttributes?.find(
+      (attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY && JSON.parse(attr.value)?.discounted_amount
     );
-    let functionAttribute = null;
-    try {
-      functionAttribute = sameLineInCart?.customAttributes?.find(
-        (attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY && JSON.parse(attr.value)?.discounted_amount
-      );
-    } catch (error) {
-    }
-    if (codeAmountAttribute || functionAttribute || scriptCodeAmountAttribute) {
-      return {
-        ...line,
-        attributes: [
-          ...line.attributes || [],
-          codeAmountAttribute,
-          functionAttribute,
-          scriptCodeAmountAttribute
-        ].filter(Boolean)
-      };
-    }
-    return line;
-  });
+  } catch (error) {
+  }
+  if (codeAmountAttribute || functionAttribute || scriptCodeAmountAttribute) {
+    return {
+      ...line,
+      attributes: [
+        ...line.attributes || [],
+        codeAmountAttribute,
+        functionAttribute,
+        scriptCodeAmountAttribute
+      ].filter(Boolean)
+    };
+  }
+  return line;
 };
-var getLinesWithFunctionAttributes = (lineItems) => {
+var initDiscountAttributes = ({ line }) => {
+  let itemAttributes = line.attributes || [];
+  const functionEnvAttribute = itemAttributes.find((attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY);
+  if (!functionEnvAttribute) {
+    itemAttributes = itemAttributes.concat([
+      {
+        key: CUSTOMER_ATTRIBUTE_KEY,
+        value: JSON.stringify({
+          is_gift: false,
+          discounted_amount: line.variant?.finalPrice?.amount === void 0 ? Number(line.variant?.price?.amount) * (line.quantity || 1) : Number(line.variant?.finalPrice?.amount) * (line.quantity || 1)
+        })
+      }
+    ]);
+  }
+  const memberPriceAttribute = itemAttributes.find(
+    (attr) => attr.key === MEMBER_PRICE_ATTRIBUTE_KEY
+  );
+  const coupon = line.coupon;
+  if (!memberPriceAttribute && coupon) {
+    itemAttributes = itemAttributes.concat([
+      {
+        key: MEMBER_PRICE_ATTRIBUTE_KEY,
+        value: JSON.stringify({ code: coupon.code })
+      }
+    ]);
+  }
+  const couponDiscountAttribute = itemAttributes.find(
+    (attr) => attr.key === CODE_AMOUNT_KEY || attr.key === SCRIPT_CODE_AMOUNT_KEY
+  );
+  if (!couponDiscountAttribute && coupon && Number(coupon?.amount) > 0) {
+    itemAttributes = itemAttributes.concat([
+      {
+        key: CODE_AMOUNT_KEY,
+        value: new Decimal2__default.default(coupon.amount).times(line.quantity || 1).toString()
+      },
+      {
+        key: SCRIPT_CODE_AMOUNT_KEY,
+        value: new Decimal2__default.default(coupon.amount).times(line.quantity || 1).toString()
+      }
+    ]);
+  }
+  return { ...line, attributes: itemAttributes };
+};
+var getLinesWithAttributes = ({
+  cart,
+  lineItems
+}) => {
   return lineItems.map((line) => {
-    let itemAttributes = line.attributes || [];
-    const functionEnvAttribute = itemAttributes.find((attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY);
-    if (!functionEnvAttribute) {
-      itemAttributes = itemAttributes.concat([
-        {
-          key: CUSTOMER_ATTRIBUTE_KEY,
-          value: JSON.stringify({
-            is_gift: false,
-            discounted_amount: line.variant?.finalPrice?.amount === void 0 ? Number(line.variant?.price?.amount) * (line.quantity || 1) : Number(line.variant?.finalPrice?.amount) * (line.quantity || 1)
-          })
-        }
-      ]);
-    }
-    return { ...line, attributes: itemAttributes };
+    const sameLine = initSameLinesAttributes({ cart, line });
+    const functionLine = initDiscountAttributes({ line: sameLine });
+    return functionLine;
   });
 };
 
@@ -1029,11 +1061,7 @@ function useAddToCart({ withTrack = true } = {}, swrOptions) {
         return;
       }
       performanceAdapter?.addToCartStart();
-      const linesWithAttributes = getLinesWithAttributes({
-        cart,
-        lineItems
-      });
-      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(linesWithAttributes);
+      const linesWithFunctionAttributes = getLinesWithAttributes({ cart, lineItems });
       const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
@@ -1170,24 +1198,31 @@ function useRemoveCartLines(options) {
   );
   return useSWRMutation__default.default("remove-cart-lines", removeLines, options);
 }
-function useUpdateCartAttributes(mutate, metafieldIdentifiers, options) {
+function useUpdateCartAttributes({
+  mutate,
+  metafieldIdentifiers,
+  disabled = false,
+  swrOptions
+}) {
   const { client, locale, cartCookieAdapter } = useShopify();
   const updateAttributes = react.useCallback(
     async (_key, { arg }) => {
+      if (disabled || !cartCookieAdapter?.getCartId(locale)) {
+        return void 0;
+      }
       const updatedCart = await shopifySdk.updateCartAttributes(client, {
         ...arg,
         metafieldIdentifiers,
         cookieAdapter: cartCookieAdapter
       });
-      console.log("useUpdateCartAttributes updatedCart", updatedCart);
       if (updatedCart) {
         mutate(updatedCart);
       }
       return updatedCart;
     },
-    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers]
+    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers, disabled]
   );
-  return useSWRMutation__default.default("update-cart-attributes", updateAttributes, options);
+  return useSWRMutation__default.default("update-cart-attributes", updateAttributes, swrOptions);
 }
 function useBuyNow({ withTrack = true } = {}, swrOptions) {
   const { client, config, locale, cartCookieAdapter, userAdapter } = useShopify();
@@ -1207,13 +1242,15 @@ function useBuyNow({ withTrack = true } = {}, swrOptions) {
       if (!lineItems || lineItems.length === 0) {
         return;
       }
-      const linesWithFunctionAttributes = getLinesWithFunctionAttributes(lineItems);
+      const linesWithFunctionAttributes = getLinesWithAttributes({
+        lineItems
+      });
       const lines = linesWithFunctionAttributes.map((item) => ({
         merchandiseId: item.variant?.id || "",
         quantity: item.quantity || 1,
         attributes: item.attributes,
         sellingPlanId: item.sellingPlanId
-      })).filter((item) => item.merchandiseId && item.quantity);
+      })).filter((item) => item.merchandiseId);
       if (lines.length === 0) {
         return;
       }
@@ -1268,17 +1305,41 @@ function useCalcGiftsFromLines({
     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 functionGiftLines = (functionGift.qualifyingGift?.itemsToAdd || []).map((item) => {
+      const product = functionGift.giftProductsResult?.find(
+        (product2) => product2.handle === item.variant.handle
       );
-      const variant = giftProduct?.variants?.[0];
+      const variants = product?.variants;
+      const variant = Array.isArray(variants) ? variants.find((v) => v.sku === item.variant.sku) : void 0;
+      if (!variant) {
+        console.warn(
+          `Function gift: Variant not found for handle=${item.variant.handle}, sku=${item.variant.sku}`
+        );
+        return null;
+      }
       return {
         variant: {
-          id: variant?.id || "",
-          handle: product.handle,
-          sku: product.sku
+          ...variant,
+          product
+        },
+        quantity: item.quantity ?? 1,
+        attributes: item.attributes
+      };
+    }).filter((item) => item !== null);
+    const scriptGiftLines = scriptGift.freeGiftLevel ? scriptGift.freeGiftLevel.giveawayProducts.map((item) => {
+      const product = scriptGift.giftProductsResult?.find(
+        (product2) => product2.handle === item.handle
+      );
+      const variants = product?.variants;
+      const variant = Array.isArray(variants) ? variants.find((v) => v.sku === item.sku) : void 0;
+      if (!variant) {
+        console.warn(`Script gift: Variant not found for handle=${item.handle}, sku=${item.sku}`);
+        return null;
+      }
+      return {
+        variant: {
+          ...variant,
+          product
         },
         quantity: 1,
         attributes: [
@@ -1288,10 +1349,11 @@ function useCalcGiftsFromLines({
           }
         ]
       };
-    }).filter((item) => item.variant.id) : [];
+    }).filter((item) => item !== null) : [];
     return [...functionGiftLines, ...scriptGiftLines];
   }, [
     functionGift.qualifyingGift,
+    functionGift.giftProductsResult,
     scriptGift.freeGiftLevel,
     scriptGift.giftProductsResult,
     scriptGiveawayKey
@@ -1524,7 +1586,7 @@ var useCartAttributes = ({
         })
       }
     ] : [];
-  }, [cart]);
+  }, [cart, customer]);
   const presellAttributes = react.useMemo(() => {
     return [
       {
@@ -1588,9 +1650,7 @@ var useCartAttributes = ({
       "_play_mode_id",
       "_popup"
     ];
-    return cart?.customAttributes?.filter(
-      (item) => !commonAttributeKeys.includes(item.key)
-    ) || [];
+    return cart?.customAttributes?.filter((item) => !commonAttributeKeys.includes(item.key)) || [];
   }, [cart]);
   return react.useMemo(
     () => ({
@@ -2444,8 +2504,9 @@ var createInitialValue = () => ({
     tddCoupon: void 0,
     isLoadingCoupon: false
   },
-  selectedPlusMemberProduct: null,
-  plusMemberProducts: [],
+  selectedPlusMemberVariant: void 0,
+  monthlyVariant: void 0,
+  annualVariant: void 0,
   showPlusMemberBenefit: false,
   setShowPlusMemberBenefit: () => {
   },
@@ -2459,33 +2520,39 @@ var PlusMemberContext = react.createContext(createInitialValue());
 function usePlusMemberContext() {
   return react.useContext(PlusMemberContext);
 }
-function usePlusMonthlyProductVariant() {
-  const { plusMemberProducts, plusMemberMetafields } = usePlusMemberContext();
-  const plusMonthly = plusMemberMetafields?.plus_monthly_product;
-  const plusMonthlyProductVariant = react.useMemo(() => {
-    const product = plusMemberProducts?.find(
-      (item) => item?.handle === plusMonthly?.handle
-    );
-    const productVariant = product?.variants?.find(
-      (item) => item.sku === plusMonthly?.sku
-    );
-    return productVariant;
+function usePlusMemberVariants({
+  memberSetting
+}) {
+  const plusMonthly = memberSetting?.plus_monthly_product;
+  const plusAnnual = memberSetting?.plus_annual_product;
+  const plusMemberHandles = react.useMemo(() => {
+    return [plusMonthly?.handle, plusAnnual?.handle].filter(Boolean);
+  }, [plusMonthly?.handle, plusAnnual?.handle]);
+  const { data: plusMemberProducts = [] } = useProductsByHandles({
+    handles: plusMemberHandles
+  });
+  const monthlyProduct = react.useMemo(() => {
+    return plusMemberProducts?.find((item) => item?.handle === plusMonthly?.handle);
   }, [plusMemberProducts, plusMonthly]);
-  return plusMonthlyProductVariant;
-}
-function usePlusAnnualProductVariant() {
-  const { plusMemberProducts, plusMemberMetafields } = usePlusMemberContext();
-  const plusAnnual = plusMemberMetafields?.plus_annual_product;
-  const plusAnnualProductVariant = react.useMemo(() => {
-    const product = plusMemberProducts?.find(
-      (item) => item?.handle === plusAnnual?.handle
-    );
-    const productVariant = product?.variants?.find(
-      (item) => item.sku === plusAnnual?.sku
-    );
-    return productVariant;
+  const annualProduct = react.useMemo(() => {
+    return plusMemberProducts?.find((item) => item?.handle === plusAnnual?.handle);
   }, [plusMemberProducts, plusAnnual]);
-  return plusAnnualProductVariant;
+  const monthlyVariant = react.useMemo(() => {
+    return monthlyProduct?.variants?.find((item) => item.sku === plusMonthly?.sku);
+  }, [monthlyProduct, plusMonthly]);
+  const annualVariant = react.useMemo(() => {
+    return annualProduct?.variants?.find((item) => item.sku === plusAnnual?.sku);
+  }, [annualProduct, plusAnnual]);
+  return {
+    monthlyVariant: monthlyVariant ? {
+      ...monthlyVariant,
+      product: monthlyProduct
+    } : void 0,
+    annualVariant: annualVariant ? {
+      ...annualVariant,
+      product: annualProduct
+    } : void 0
+  };
 }
 var useAvailableDeliveryCoupon = ({
   profile
@@ -2886,13 +2953,13 @@ function usePlusMemberNeedAddToCart({
   cart,
   profile
 }) {
-  const { selectedPlusMemberMode, selectedPlusMemberProduct, plusMemberMetafields } = usePlusMemberContext();
+  const { selectedPlusMemberMode, selectedPlusMemberVariant, plusMemberMetafields } = usePlusMemberContext();
   const { hasMonthlyPlus, hasAnnualPlus } = useHasPlusMemberInCart({
     memberSetting: plusMemberMetafields,
     cart
   });
-  const plusMemberProduct = react.useMemo(() => {
-    if (!selectedPlusMemberProduct || selectedPlusMemberMode === "free" /* FREE */) {
+  const plusMemberVariant = react.useMemo(() => {
+    if (!selectedPlusMemberVariant || selectedPlusMemberMode === "free" /* FREE */) {
       return void 0;
     }
     if (selectedPlusMemberMode === "monthly" /* MONTHLY */ && hasMonthlyPlus) {
@@ -2907,15 +2974,9 @@ function usePlusMemberNeedAddToCart({
     if (profile?.isAnnualPlus && selectedPlusMemberMode === "annual" /* ANNUAL */) {
       return void 0;
     }
-    return selectedPlusMemberProduct;
-  }, [
-    selectedPlusMemberMode,
-    selectedPlusMemberProduct?.variant,
-    selectedPlusMemberProduct?.product,
-    hasMonthlyPlus,
-    hasAnnualPlus
-  ]);
-  return plusMemberProduct;
+    return selectedPlusMemberVariant;
+  }, [selectedPlusMemberMode, selectedPlusMemberVariant, hasMonthlyPlus, hasAnnualPlus]);
+  return plusMemberVariant;
 }
 var PlusMemberProvider = ({
   variant,
@@ -2945,26 +3006,15 @@ var PlusMemberProvider = ({
     profile,
     isPlus: profile?.isPlus || false
   });
-  console.log("shippingMethodsContext", shippingMethodsContext);
-  const plusMemberHandles = react.useMemo(() => {
-    return [
-      memberSetting?.plus_monthly_product?.handle,
-      memberSetting?.plus_annual_product?.handle
-    ].filter(Boolean);
-  }, [memberSetting]);
-  const { data: plusMemberProducts = [] } = useProductsByHandles({
-    handles: plusMemberHandles
+  const { monthlyVariant, annualVariant } = usePlusMemberVariants({
+    memberSetting
   });
-  const selectedPlusMemberProduct = react.useMemo(() => {
+  const selectedPlusMemberVariant = react.useMemo(() => {
     if (selectedPlusMemberMode === "free" /* FREE */) {
-      return null;
+      return void 0;
     }
-    const handle = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? memberSetting?.plus_monthly_product?.handle : memberSetting?.plus_annual_product?.handle;
-    const sku = selectedPlusMemberMode === "monthly" /* MONTHLY */ ? memberSetting?.plus_monthly_product?.sku : memberSetting?.plus_annual_product?.sku;
-    const product2 = plusMemberProducts?.find((p) => p.handle === handle);
-    const variant2 = product2?.variants?.find((v) => v.sku === sku);
-    return product2 && variant2 ? { product: product2, variant: variant2 } : null;
-  }, [plusMemberProducts, memberSetting, selectedPlusMemberMode]);
+    return selectedPlusMemberMode === "monthly" /* MONTHLY */ ? monthlyVariant : annualVariant;
+  }, [monthlyVariant, annualVariant, selectedPlusMemberMode]);
   return /* @__PURE__ */ jsxRuntime.jsx(
     PlusMemberContext.Provider,
     {
@@ -2988,8 +3038,9 @@ var PlusMemberProvider = ({
         setShowTip,
         showMoreShippingMethod,
         setShowMoreShippingMethod,
-        selectedPlusMemberProduct,
-        plusMemberProducts,
+        selectedPlusMemberVariant,
+        monthlyVariant,
+        annualVariant,
         product,
         showPlusMemberBenefit,
         setShowPlusMemberBenefit,
@@ -3188,6 +3239,7 @@ exports.CUSTOMER_ATTRIBUTE_KEY = CUSTOMER_ATTRIBUTE_KEY;
 exports.CUSTOMER_SCRIPT_GIFT_KEY = CUSTOMER_SCRIPT_GIFT_KEY;
 exports.DeliveryPlusType = DeliveryPlusType;
 exports.MAIN_PRODUCT_CODE = MAIN_PRODUCT_CODE;
+exports.MEMBER_PRICE_ATTRIBUTE_KEY = MEMBER_PRICE_ATTRIBUTE_KEY;
 exports.OrderBasePriceType = OrderBasePriceType;
 exports.OrderDiscountType = OrderDiscountType;
 exports.PLUS_MEMBER_TYPE = PLUS_MEMBER_TYPE;
@@ -3240,13 +3292,12 @@ exports.useExposure = useExposure;
 exports.useGeoLocation = useGeoLocation;
 exports.useHasPlusMemberInCart = useHasPlusMemberInCart;
 exports.useIntersection = useIntersection;
-exports.usePlusAnnualProductVariant = usePlusAnnualProductVariant;
 exports.usePlusMemberCheckoutCustomAttributes = usePlusMemberCheckoutCustomAttributes;
 exports.usePlusMemberContext = usePlusMemberContext;
 exports.usePlusMemberDeliveryCodes = usePlusMemberDeliveryCodes;
 exports.usePlusMemberItemCustomAttributes = usePlusMemberItemCustomAttributes;
 exports.usePlusMemberNeedAddToCart = usePlusMemberNeedAddToCart;
-exports.usePlusMonthlyProductVariant = usePlusMonthlyProductVariant;
+exports.usePlusMemberVariants = usePlusMemberVariants;
 exports.usePrice = usePrice;
 exports.useProduct = useProduct;
 exports.useProductUrl = useProductUrl;