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

package/dist/provider/index.d.mts

@@ -4,7 +4,7 @@ import { ShopifyClient, ShopifyConfig, CartCookieAdapter, NormalizedCart, Attrib
 import { C as CookieAdapter, R as RouterAdapter, U as UserContextAdapter, P as PerformanceAdapter } from '../types-SKDHauqk.mjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { SWRConfiguration } from 'swr';
-import { e as PlusMemberSettingsMetafields } from '../types-DntkHhf8.mjs';
+import { e as PlusMemberSettingsMetafields } from '../types-CMMWxyUF.mjs';
 
 interface ShopifyContextValue {
     client: ShopifyClient;
@@ -102,6 +102,12 @@ interface CartContextValue {
         variant: HasMetafieldsIdentifier[];
         product: HasMetafieldsIdentifier[];
     };
+    /** User profile */
+    profile?: any;
+    /** Customer data */
+    customer?: any;
+    /** Plus member settings */
+    memberSetting?: PlusMemberSettingsMetafields;
 }
 interface CartProviderProps {
     children: React__default.ReactNode;

package/dist/provider/index.d.ts

@@ -4,7 +4,7 @@ import { ShopifyClient, ShopifyConfig, CartCookieAdapter, NormalizedCart, Attrib
 import { C as CookieAdapter, R as RouterAdapter, U as UserContextAdapter, P as PerformanceAdapter } from '../types-SKDHauqk.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { SWRConfiguration } from 'swr';
-import { e as PlusMemberSettingsMetafields } from '../types-DntkHhf8.js';
+import { e as PlusMemberSettingsMetafields } from '../types-CMMWxyUF.js';
 
 interface ShopifyContextValue {
     client: ShopifyClient;
@@ -102,6 +102,12 @@ interface CartContextValue {
         variant: HasMetafieldsIdentifier[];
         product: HasMetafieldsIdentifier[];
     };
+    /** User profile */
+    profile?: any;
+    /** Customer data */
+    customer?: any;
+    /** Plus member settings */
+    memberSetting?: PlusMemberSettingsMetafields;
 }
 interface CartProviderProps {
     children: React__default.ReactNode;

package/dist/provider/index.js

@@ -557,7 +557,8 @@ var useScriptAutoFreeGift = ({
   _giveaway,
   cart,
   locale: providedLocale,
-  lines
+  lines,
+  profile
 }) => {
   const { client, locale: contextLocale } = useShopify();
   const locale = providedLocale || contextLocale;
@@ -581,8 +582,9 @@ var useScriptAutoFreeGift = ({
     const utmCampaign = Cookies5__default.default.get("utm_campaign") || query?.utm_campaign;
     if (campaign.activityAvailableQuery && !utmCampaign?.includes(campaign.activityAvailableQuery))
       return false;
+    if (campaign.requireLogin && !profile?.email) return false;
     return true;
-  }, [campaign]);
+  }, [campaign, profile]);
   const [upgrade_multiple, upgrade_value] = react.useMemo(() => {
     let upgrade_multiple2 = 1;
     let upgrade_value2 = 0;
@@ -711,63 +713,6 @@ var useScriptAutoFreeGift = ({
     giftProductsResult: finalGiftProductsResult
   };
 };
-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
-      });
-      if (updatedCart) {
-        mutate(updatedCart);
-      }
-      return updatedCart;
-    },
-    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers, disabled]
-  );
-  return useSWRMutation8__default.default("update-cart-attributes", updateAttributes, swrOptions);
-}
-function useHasPlusMemberInCart({
-  memberSetting,
-  cart
-}) {
-  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
-  return react.useMemo(() => {
-    if (!cart?.lineItems) {
-      return {
-        hasPlusMember: false,
-        hasMonthlyPlus: false,
-        hasAnnualPlus: false
-      };
-    }
-    const monthlyPlusItem = cart.lineItems.find(
-      (item) => item.product?.handle === plus_monthly_product?.handle && item.variant?.sku === plus_monthly_product?.sku
-    );
-    const annualPlusItem = cart.lineItems.find(
-      (item) => item.product?.handle === plus_annual_product?.handle && item.variant?.sku === plus_annual_product?.sku
-    );
-    const hasMonthlyPlus = !!monthlyPlusItem;
-    const hasAnnualPlus = !!annualPlusItem;
-    const hasPlusMember = hasMonthlyPlus || hasAnnualPlus;
-    return {
-      hasPlusMember,
-      hasMonthlyPlus,
-      hasAnnualPlus,
-      monthlyPlusItem,
-      annualPlusItem
-    };
-  }, [cart?.lineItems, plus_monthly_product, plus_annual_product]);
-}
 var getReferralAttributes = () => {
   const inviteCode = shopifySdk.getLocalStorage("inviteCode") || Cookies5__default.default.get("inviteCode");
   const playModeId = shopifySdk.getLocalStorage("playModeId") || Cookies5__default.default.get("playModeId");
@@ -784,158 +729,130 @@ var getReferralAttributes = () => {
   }
   return [];
 };
+var getUserType = (customer) => {
+  let userInfo = Cookies5__default.default.get("userInfo");
+  if (userInfo) {
+    userInfo = JSON.parse(userInfo);
+    let arr = typeof userInfo?.id == "string" && userInfo?.id.split("/");
+    userInfo.setId = arr[arr.length - 1];
+  }
+  const customerInfo = userInfo || customer;
+  if (!customerInfo) {
+    return "new_user_unlogin";
+  }
+  if (customer) {
+    const { orders = {} } = customer;
+    if (orders?.edges?.length === 1) {
+      return "old_user_orders_once";
+    } else if (orders?.edges?.length > 1) {
+      return "old_user_orders_twice";
+    }
+  }
+  return "new_user_login";
+};
+function getCartAttributes({
+  profile,
+  customer,
+  cart,
+  memberType,
+  currentUrl = ""
+}) {
+  const userType = getUserType(customer);
+  const memberAttributes = [
+    {
+      key: "_token",
+      value: profile?.token
+    },
+    {
+      key: "_member_type",
+      value: memberType ?? String(profile?.memberType || 0)
+    },
+    {
+      key: "_user_type",
+      value: userType
+    },
+    {
+      key: "_is_login",
+      value: profile?.token ? "true" : "false"
+    }
+  ];
+  if (profile?.token) {
+    memberAttributes.push({
+      key: "_login_user",
+      value: "1"
+    });
+  }
+  const discountCodes = cart?.discountCodes.map((item) => item.code).filter((code) => code) || [];
+  const functionAttributes = [
+    {
+      key: CUSTOMER_ATTRIBUTE_KEY,
+      value: JSON.stringify({
+        discount_code: discountCodes,
+        user_tags: customer?.tags || []
+      })
+    }
+  ];
+  const presellAttributes = [
+    {
+      key: "_presale",
+      value: cart?.lineItems.some((item) => item?.variant?.metafields?.presell === "presell")
+    }
+  ];
+  const weightAttributes = [
+    {
+      key: "_weight",
+      value: cart?.lineItems.reduce((acc, item) => {
+        return new Decimal2__default.default(acc).plus(item.variant.weight ?? 0).toNumber();
+      }, 0).toString()
+    },
+    {
+      key: "_app_source_name",
+      value: "dtc"
+    }
+  ];
+  const trackingAttributes = [
+    {
+      key: "utm_params",
+      value: currentUrl
+    }
+  ];
+  const commonAttributes = [
+    ...memberAttributes,
+    ...functionAttributes,
+    ...presellAttributes,
+    ...weightAttributes,
+    ...trackingAttributes,
+    ...getReferralAttributes()
+  ].filter((item) => item?.value);
+  const extraAttributesInCart = cart?.customAttributes?.filter(
+    (item) => !commonAttributes.some((attr) => attr.key === item.key)
+  ) || [];
+  return [...commonAttributes, ...extraAttributesInCart].filter((item) => item?.value);
+}
 var useCartAttributes = ({
   profile,
   customer,
   cart,
-  memberSetting
+  memberType
 }) => {
   const [currentUrl, setCurrentUrl] = react.useState("");
-  const { hasPlusMember } = useHasPlusMemberInCart({
-    memberSetting,
-    cart
-  });
   react.useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
-  const userType = react.useMemo(() => {
-    let userInfo = Cookies5__default.default.get("userInfo");
-    if (userInfo) {
-      userInfo = JSON.parse(userInfo);
-      let arr = typeof userInfo?.id == "string" && userInfo?.id.split("/");
-      userInfo.setId = arr[arr.length - 1];
-    }
-    const customerInfo = userInfo || customer;
-    if (!customerInfo) {
-      return "new_user_unlogin";
-    }
-    if (customer) {
-      const { orders = {} } = customer;
-      if (orders?.edges?.length === 1) {
-        return "old_user_orders_once";
-      } else if (orders?.edges?.length > 1) {
-        return "old_user_orders_twice";
-      }
-    }
-    return "new_user_login";
-  }, [customer]);
-  const memberAttributes = react.useMemo(() => {
-    const attributes = [
-      {
-        key: "_token",
-        value: profile?.token
-        //是否登录
-      },
-      {
-        key: "_member_type",
-        value: hasPlusMember ? "2" : profile?.memberType
-        //：0(游客)，1(普通会员)，2(付费会员)
-      },
-      {
-        key: "_user_type",
-        value: userType
-        // n
-      },
-      {
-        key: "_is_login",
-        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(() => {
-    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: discountCodes,
-          user_tags: customer?.tags || []
-        })
-      }
-    ] : [];
-  }, [cart, customer]);
-  const presellAttributes = react.useMemo(() => {
-    return [
-      {
-        key: "_presale",
-        value: cart?.lineItems.some((item) => item?.variant?.metafields?.presell === "presell")
-      }
-    ];
-  }, [cart]);
-  const weightAttributes = react.useMemo(() => {
-    return [
-      {
-        key: "_weight",
-        value: cart?.lineItems.reduce((acc, item) => {
-          return new Decimal2__default.default(acc).plus(item.variant.weight ?? 0).toNumber();
-        }, 0).toString()
-      },
-      {
-        key: "_app_source_name",
-        value: "dtc"
-      }
-    ];
-  }, [cart]);
-  const trackingAttributes = react.useMemo(() => {
-    return [
-      {
-        key: "utm_params",
-        value: currentUrl
-      }
-    ];
-  }, [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]);
+  const attributes = react.useMemo(() => {
+    return getCartAttributes({
+      profile,
+      customer,
+      cart,
+      memberType,
+      currentUrl
+    });
+  }, [profile, customer, cart, memberType, currentUrl]);
   return react.useMemo(
     () => ({
-      attributes: [...commonAttributes, ...extraAttributesInCart].filter(
-        (item) => item?.value
-      )
+      attributes
     }),
-    [commonAttributes, extraAttributesInCart]
+    [attributes]
   );
 };
 var useUpdateLineCodeAmountAttributes = ({
@@ -1053,28 +970,13 @@ var useUpdateLineCodeAmountAttributes = ({
   }, [loading, setLoadingState]);
 };
 var createInitialValue = () => ({
-  zipCode: "",
   plusMemberMetafields: {},
-  setZipCode: () => {
-  },
-  allowNextDayDelivery: false,
-  setAllowNextDayDelivery: () => {
-  },
-  allowThirdDayDelivery: false,
-  setAllowThirdDayDelivery: () => {
-  },
   selectedPlusMemberMode: "free",
   setSelectedPlusMemberMode: () => {
   },
-  showAreaCheckModal: false,
-  setShowAreaCheckModal: () => {
-  },
   selectedShippingMethod: void 0,
   setSelectedShippingMethod: () => {
   },
-  showTip: false,
-  setShowTip: () => {
-  },
   showMoreShippingMethod: false,
   setShowMoreShippingMethod: () => {
   },
@@ -1090,18 +992,79 @@ var createInitialValue = () => ({
     isLoadingCoupon: false
   },
   selectedPlusMemberVariant: void 0,
-  monthlyVariant: void 0,
-  annualVariant: void 0,
   showPlusMemberBenefit: false,
   setShowPlusMemberBenefit: () => {
   },
-  deleteMarginBottom: false,
-  setDeleteMarginBottom: () => {
-  },
-  profile: void 0,
-  locale: void 0
+  profile: void 0
 });
 react.createContext(createInitialValue());
+function hasPlusMemberInCart({
+  memberSetting,
+  cart
+}) {
+  const { plus_monthly_product, plus_annual_product } = memberSetting || {};
+  if (!cart?.lineItems) {
+    return {
+      hasPlusMember: false,
+      hasMonthlyPlus: false,
+      hasAnnualPlus: false
+    };
+  }
+  const monthlyPlusItem = cart.lineItems.find(
+    (item) => item.product?.handle === plus_monthly_product?.handle && item.variant?.sku === plus_monthly_product?.sku
+  );
+  const annualPlusItem = cart.lineItems.find(
+    (item) => item.product?.handle === plus_annual_product?.handle && item.variant?.sku === plus_annual_product?.sku
+  );
+  const hasMonthlyPlus = !!monthlyPlusItem;
+  const hasAnnualPlus = !!annualPlusItem;
+  const hasPlusMember = hasMonthlyPlus || hasAnnualPlus;
+  return {
+    hasPlusMember,
+    hasMonthlyPlus,
+    hasAnnualPlus,
+    monthlyPlusItem,
+    annualPlusItem
+  };
+}
+function useHasPlusMemberInCart({
+  memberSetting,
+  cart
+}) {
+  return react.useMemo(
+    () => hasPlusMemberInCart({
+      memberSetting,
+      cart
+    }),
+    [memberSetting, cart]
+  );
+}
+function useUpdateCartAttributes({
+  mutate,
+  metafieldIdentifiers,
+  disabled = false,
+  swrOptions
+}) {
+  const { client, locale, cartCookieAdapter } = useShopify();
+  const updateAttributes = react.useCallback(
+    async (_key, { arg }) => {
+      if (disabled) {
+        return void 0;
+      }
+      const updatedCart = await shopifySdk.updateCartAttributes(client, {
+        ...arg,
+        metafieldIdentifiers,
+        cookieAdapter: cartCookieAdapter
+      });
+      if (updatedCart) {
+        mutate(updatedCart);
+      }
+      return updatedCart;
+    },
+    [client, locale, cartCookieAdapter, mutate, metafieldIdentifiers, disabled]
+  );
+  return useSWRMutation8__default.default("update-cart-attributes", updateAttributes, swrOptions);
+}
 var CartContext = react.createContext(null);
 function CartProvider({
   children,
@@ -1149,7 +1112,17 @@ function CartProvider({
     metafieldIdentifiers,
     disabled: isCartLoading
   });
-  const { attributes } = useCartAttributes({ profile, customer, cart, memberSetting });
+  console.log("isCartLoading", isCartLoading);
+  const { hasPlusMember } = useHasPlusMemberInCart({
+    memberSetting,
+    cart
+  });
+  const { attributes } = useCartAttributes({
+    profile,
+    customer,
+    cart,
+    memberType: hasPlusMember ? "2" : profile?.memberType
+  });
   ahooks.useRequest(
     () => {
       const newAttributes = [...attributes];
@@ -1212,7 +1185,8 @@ function CartProvider({
   const scriptAutoFreeGiftResult = useScriptAutoFreeGift({
     campaign: gradientGiftsConfig || null,
     _giveaway: CUSTOMER_SCRIPT_GIFT_KEY,
-    cart
+    cart,
+    profile
   });
   const formattedScriptGifts = react.useMemo(() => {
     return formatScriptAutoFreeGift({
@@ -1279,6 +1253,8 @@ function CartProvider({
       removeCustomAttributes,
       setCustomAttributes,
       locale,
+      profile,
+      customer,
       isCodeChanging,
       setIsCodeChanging,
       autoFreeGiftConfig,
@@ -1294,7 +1270,8 @@ function CartProvider({
       scriptAutoFreeGiftResult,
       setScriptAutoFreeGift,
       giftNeedAddToCartLines,
-      metafieldIdentifiers
+      metafieldIdentifiers,
+      memberSetting
     }),
     [
       cart,
@@ -1318,7 +1295,10 @@ function CartProvider({
       scriptAutoFreeGiftResult,
       setScriptAutoFreeGift,
       giftNeedAddToCartLines,
-      metafieldIdentifiers
+      metafieldIdentifiers,
+      customer,
+      profile,
+      memberSetting
     ]
   );
   return /* @__PURE__ */ jsxRuntime.jsx(CartContext.Provider, { value, children });