@anker-in/shopify-react 1.1.2 → 1.2.0-beta.1

package/dist/provider/index.d.mts

@@ -4,7 +4,8 @@ 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-CMMWxyUF.mjs';
+import { S as ScriptAutoFreeGiftConfig, n as PlusMemberSettingsMetafields, U as UseAutoRemoveFreeGiftsOptions } from '../types-C4qc-wG4.mjs';
+import 'decimal.js';
 
 interface ShopifyContextValue {
     client: ShopifyClient;
@@ -48,6 +49,12 @@ type LoadingState = {
     listingAutoCodeApplying: boolean;
     userCodeApplying: boolean;
 };
+type AppContext = {
+    /** Whether running in app */
+    isInApp?: boolean;
+    /** App name */
+    appName?: string;
+};
 interface CartContextValue {
     /** Current cart data */
     cart: NormalizedCart | undefined;
@@ -91,10 +98,10 @@ interface CartContextValue {
     calculatedAutoFreeGift?: any;
     /** Gifts that need to be added to cart */
     giftNeedAddToCartLines: any[];
-    /** Auto free gift config */
-    autoFreeGiftConfig?: any;
-    /** Gradient gifts config */
-    gradientGiftsConfig?: any;
+    /** Function auto free gift config */
+    functionAutoFreeGiftConfig?: any;
+    /** Script auto free gift config */
+    scriptAutoFreeGiftConfig?: ScriptAutoFreeGiftConfig;
     /** Metafield identifiers */
     metafieldIdentifiers?: {
         variant: HasMetafieldsIdentifier[];
@@ -106,17 +113,19 @@ interface CartContextValue {
     customer?: any;
     /** Plus member settings */
     memberSetting?: PlusMemberSettingsMetafields;
+    /** App context */
+    appContext?: AppContext;
+    /** Auto remove free gifts options */
+    autoRemoveFreeGiftsOptions?: UseAutoRemoveFreeGiftsOptions;
 }
 interface CartProviderProps {
     children: React__default.ReactNode;
     /** SWR configuration options */
     swrOptions?: SWRConfiguration<NormalizedCart | undefined, Error>;
-    /** Auto free gift configuration */
-    autoFreeGiftConfig?: any;
-    /** Gradient gifts configuration (for script gifts) */
-    gradientGiftsConfig?: any;
-    /** Function gift configuration */
-    fnGiftConf?: any;
+    /** Function auto free gift configuration */
+    functionAutoFreeGiftConfig?: any;
+    /** Script auto free gift configuration */
+    scriptAutoFreeGiftConfig?: ScriptAutoFreeGiftConfig;
     /** User profile */
     profile?: any;
     /** Customer data */
@@ -130,6 +139,8 @@ interface CartProviderProps {
     };
     /** Plus member settings */
     memberSetting?: PlusMemberSettingsMetafields;
+    /** App context */
+    appContext?: AppContext;
 }
 /**
  * Cart Provider Component
@@ -141,7 +152,8 @@ interface CartProviderProps {
  * <ShopifyProvider {...config}>
  *   <CartProvider
  *     locale="us"
- *     autoFreeGiftConfig={config}
+ *     functionAutoFreeGiftConfig={functionConfig}
+ *     scriptAutoFreeGiftConfig={scriptConfig}
  *     profile={profile}
  *     customer={customer}
  *   >
@@ -150,7 +162,7 @@ interface CartProviderProps {
  * </ShopifyProvider>
  * ```
  */
-declare function CartProvider({ children, autoFreeGiftConfig, gradientGiftsConfig, profile, customer, locale, metafieldIdentifiers, memberSetting, }: CartProviderProps): react_jsx_runtime.JSX.Element;
+declare function CartProvider({ children, functionAutoFreeGiftConfig, scriptAutoFreeGiftConfig, profile, customer, locale, metafieldIdentifiers, memberSetting, appContext, }: CartProviderProps): react_jsx_runtime.JSX.Element;
 /**
  * Hook to access cart context
  *
@@ -175,4 +187,4 @@ declare function useCartContext(options: {
     optional: true;
 }): CartContextValue | null;
 
-export { type CartContextValue, CartProvider, type CartProviderProps, type LoadingState, ShopifyContext, type ShopifyContextValue, ShopifyProvider, type ShopifyProviderProps, useCartContext, useShopify };
+export { type AppContext, type CartContextValue, CartProvider, type CartProviderProps, type LoadingState, ShopifyContext, type ShopifyContextValue, ShopifyProvider, type ShopifyProviderProps, useCartContext, useShopify };

package/dist/provider/index.d.ts

@@ -4,7 +4,8 @@ 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-CMMWxyUF.js';
+import { S as ScriptAutoFreeGiftConfig, n as PlusMemberSettingsMetafields, U as UseAutoRemoveFreeGiftsOptions } from '../types-C4qc-wG4.js';
+import 'decimal.js';
 
 interface ShopifyContextValue {
     client: ShopifyClient;
@@ -48,6 +49,12 @@ type LoadingState = {
     listingAutoCodeApplying: boolean;
     userCodeApplying: boolean;
 };
+type AppContext = {
+    /** Whether running in app */
+    isInApp?: boolean;
+    /** App name */
+    appName?: string;
+};
 interface CartContextValue {
     /** Current cart data */
     cart: NormalizedCart | undefined;
@@ -91,10 +98,10 @@ interface CartContextValue {
     calculatedAutoFreeGift?: any;
     /** Gifts that need to be added to cart */
     giftNeedAddToCartLines: any[];
-    /** Auto free gift config */
-    autoFreeGiftConfig?: any;
-    /** Gradient gifts config */
-    gradientGiftsConfig?: any;
+    /** Function auto free gift config */
+    functionAutoFreeGiftConfig?: any;
+    /** Script auto free gift config */
+    scriptAutoFreeGiftConfig?: ScriptAutoFreeGiftConfig;
     /** Metafield identifiers */
     metafieldIdentifiers?: {
         variant: HasMetafieldsIdentifier[];
@@ -106,17 +113,19 @@ interface CartContextValue {
     customer?: any;
     /** Plus member settings */
     memberSetting?: PlusMemberSettingsMetafields;
+    /** App context */
+    appContext?: AppContext;
+    /** Auto remove free gifts options */
+    autoRemoveFreeGiftsOptions?: UseAutoRemoveFreeGiftsOptions;
 }
 interface CartProviderProps {
     children: React__default.ReactNode;
     /** SWR configuration options */
     swrOptions?: SWRConfiguration<NormalizedCart | undefined, Error>;
-    /** Auto free gift configuration */
-    autoFreeGiftConfig?: any;
-    /** Gradient gifts configuration (for script gifts) */
-    gradientGiftsConfig?: any;
-    /** Function gift configuration */
-    fnGiftConf?: any;
+    /** Function auto free gift configuration */
+    functionAutoFreeGiftConfig?: any;
+    /** Script auto free gift configuration */
+    scriptAutoFreeGiftConfig?: ScriptAutoFreeGiftConfig;
     /** User profile */
     profile?: any;
     /** Customer data */
@@ -130,6 +139,8 @@ interface CartProviderProps {
     };
     /** Plus member settings */
     memberSetting?: PlusMemberSettingsMetafields;
+    /** App context */
+    appContext?: AppContext;
 }
 /**
  * Cart Provider Component
@@ -141,7 +152,8 @@ interface CartProviderProps {
  * <ShopifyProvider {...config}>
  *   <CartProvider
  *     locale="us"
- *     autoFreeGiftConfig={config}
+ *     functionAutoFreeGiftConfig={functionConfig}
+ *     scriptAutoFreeGiftConfig={scriptConfig}
  *     profile={profile}
  *     customer={customer}
  *   >
@@ -150,7 +162,7 @@ interface CartProviderProps {
  * </ShopifyProvider>
  * ```
  */
-declare function CartProvider({ children, autoFreeGiftConfig, gradientGiftsConfig, profile, customer, locale, metafieldIdentifiers, memberSetting, }: CartProviderProps): react_jsx_runtime.JSX.Element;
+declare function CartProvider({ children, functionAutoFreeGiftConfig, scriptAutoFreeGiftConfig, profile, customer, locale, metafieldIdentifiers, memberSetting, appContext, }: CartProviderProps): react_jsx_runtime.JSX.Element;
 /**
  * Hook to access cart context
  *
@@ -175,4 +187,4 @@ declare function useCartContext(options: {
     optional: true;
 }): CartContextValue | null;
 
-export { type CartContextValue, CartProvider, type CartProviderProps, type LoadingState, ShopifyContext, type ShopifyContextValue, ShopifyProvider, type ShopifyProviderProps, useCartContext, useShopify };
+export { type AppContext, type CartContextValue, CartProvider, type CartProviderProps, type LoadingState, ShopifyContext, type ShopifyContextValue, ShopifyProvider, type ShopifyProviderProps, useCartContext, useShopify };

package/dist/provider/index.js

@@ -714,6 +714,52 @@ var checkAttributesUpdateNeeded = (oldAttributes, newAttributes, customAttribute
     (removeAttr) => oldAttributes.some((oldAttr) => oldAttr.key === removeAttr.key)
   );
 };
+function waitForGtagReady(timeout = 1e4) {
+  return new Promise((resolve, reject) => {
+    const start = Date.now();
+    function check() {
+      if (typeof window !== "undefined" && typeof window.gtag !== "undefined") {
+        resolve();
+      } else if (Date.now() - start > timeout) {
+        reject(new Error("GA4 gtag not loaded"));
+      } else {
+        setTimeout(check, 50);
+      }
+    }
+    check();
+  });
+}
+var getGA4Data = async (measurementId = "G-R0BRMRK4CY") => {
+  try {
+    await waitForGtagReady();
+    const timeoutPromise = new Promise((resolve) => {
+      setTimeout(() => {
+        resolve({ clientId: "", sessionId: "" });
+      }, 300);
+    });
+    const dataPromise = new Promise((resolve) => {
+      if (!window.gtag) {
+        resolve({ clientId: "", sessionId: "" });
+        return;
+      }
+      window.gtag("get", measurementId, "client_id", (clientId) => {
+        window.gtag("get", measurementId, "session_id", (sessionId) => {
+          resolve({
+            clientId: clientId || "",
+            sessionId: sessionId || ""
+          });
+        });
+      });
+    });
+    return Promise.race([dataPromise, timeoutPromise]);
+  } catch (error) {
+    console.error("Failed to get GA4 data:", error);
+    return {
+      clientId: "",
+      sessionId: ""
+    };
+  }
+};
 var getReferralAttributes = () => {
   const inviteCode = shopifySdk.getLocalStorage("inviteCode") || Cookies5__default.default.get("inviteCode");
   const playModeId = shopifySdk.getLocalStorage("playModeId") || Cookies5__default.default.get("playModeId");
@@ -730,6 +776,19 @@ var getReferralAttributes = () => {
   }
   return [];
 };
+var getOperatingSystem = () => {
+  if (typeof window === "undefined" || typeof navigator === "undefined") {
+    return "Unknown";
+  }
+  const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+  if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) {
+    return "IOS";
+  }
+  if (/android/i.test(userAgent)) {
+    return "Android";
+  }
+  return "Unknown";
+};
 var getUserType = (customer) => {
   let userInfo = Cookies5__default.default.get("userInfo");
   if (userInfo) {
@@ -751,12 +810,33 @@ var getUserType = (customer) => {
   }
   return "new_user_login";
 };
-function getCartAttributes({
+function getGA4Attributes(ga4Data) {
+  if (!ga4Data?.clientId && !ga4Data?.sessionId) {
+    return [];
+  }
+  const attributes = [];
+  if (ga4Data.clientId) {
+    attributes.push({
+      key: "_ga4_client_id",
+      value: ga4Data.clientId
+    });
+  }
+  if (ga4Data.sessionId) {
+    attributes.push({
+      key: "_ga4_session_id",
+      value: ga4Data.sessionId
+    });
+  }
+  return attributes;
+}
+function getCartBasicAttributes({
   profile,
   customer,
   cart,
   memberType,
-  currentUrl = ""
+  currentUrl = "",
+  appContext,
+  buyPath
 }) {
   const userType = getUserType(customer);
   const memberAttributes = [
@@ -783,12 +863,10 @@ function getCartAttributes({
       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 || []
       })
     }
@@ -796,26 +874,38 @@ function getCartAttributes({
   const presellAttributes = [
     {
       key: "_presale",
-      value: cart?.lineItems.some((item) => item?.variant?.metafields?.presell === "presell")
+      value: cart?.lineItems?.some((item) => item?.variant?.metafields?.presell === "presell")
     }
   ];
   const weightAttributes = [
     {
       key: "_weight",
-      value: cart?.lineItems.reduce((acc, item) => {
+      value: cart?.lineItems?.reduce((acc, item) => {
         const itemWeight = new Decimal2__default.default(item.variant.weight ?? 0).times(item.quantity);
         return new Decimal2__default.default(acc).plus(itemWeight).toNumber();
       }, 0).toString()
-    },
-    {
-      key: "_app_source_name",
-      value: "dtc"
     }
   ];
   const trackingAttributes = [
     {
       key: "utm_params",
       value: currentUrl
+    },
+    {
+      key: "_app_source_name",
+      value: appContext?.isInApp && appContext?.appName ? appContext.appName : "dtc"
+    },
+    {
+      key: "_operating_system",
+      value: getOperatingSystem()
+    },
+    {
+      key: "_cart_id",
+      value: cart?.id
+    },
+    {
+      key: "_buy_path",
+      value: buyPath
     }
   ];
   const commonAttributes = [
@@ -835,21 +925,41 @@ var useCartAttributes = ({
   profile,
   customer,
   cart,
-  memberType
+  memberType,
+  appContext,
+  buyPath
 }) => {
   const [currentUrl, setCurrentUrl] = react.useState("");
+  const [ga4Data, setGa4Data] = react.useState(null);
   react.useEffect(() => {
     setCurrentUrl(window.location.href);
   }, []);
+  react.useEffect(() => {
+    let isMounted = true;
+    getGA4Data().then((data) => {
+      if (isMounted) {
+        setGa4Data(data);
+      }
+    }).catch((error) => {
+      console.error("Failed to get GA4 data in useCartAttributes:", error);
+    });
+    return () => {
+      isMounted = false;
+    };
+  }, []);
   const attributes = react.useMemo(() => {
-    return getCartAttributes({
+    const basicAttributes = getCartBasicAttributes({
       profile,
       customer,
       cart,
       memberType,
-      currentUrl
+      currentUrl,
+      appContext,
+      buyPath
     });
-  }, [profile, customer, cart, memberType, currentUrl]);
+    const ga4Attributes = getGA4Attributes(ga4Data);
+    return [...basicAttributes, ...ga4Attributes];
+  }, [profile, customer, cart, memberType, currentUrl, appContext, buyPath, ga4Data]);
   return react.useMemo(
     () => ({
       attributes
@@ -878,12 +988,9 @@ var useUpdateLineCodeAmountAttributes = ({
       const codeDiscount = line.discountAllocations?.find(
         (allocation) => mainProductDiscountCodes?.includes(allocation.code)
       );
-      const hasFunctionEnvAttribute = line.customAttributes?.find(
-        (attr) => attr.key === CUSTOMER_ATTRIBUTE_KEY
-      );
       const functionEnvValue = getDiscountEnvAttributeValue(line.customAttributes);
       const hasSameFunctionEnvAttribute = Number(functionEnvValue.discounted_amount) === Number(line.totalAmount);
-      if (!hasSameFunctionEnvAttribute && hasFunctionEnvAttribute && !functionEnvValue.is_gift) {
+      if (!hasSameFunctionEnvAttribute && !functionEnvValue.is_gift) {
         attrNeedUpdate.push({
           key: CUSTOMER_ATTRIBUTE_KEY,
           value: JSON.stringify({
@@ -1071,13 +1178,14 @@ var CartContext = react.createContext(null);
 function CartProvider({
   children,
   // swrOptions,
-  autoFreeGiftConfig,
-  gradientGiftsConfig,
+  functionAutoFreeGiftConfig,
+  scriptAutoFreeGiftConfig,
   profile,
   customer,
   locale,
   metafieldIdentifiers,
-  memberSetting
+  memberSetting,
+  appContext
 }) {
   const { client, cartCookieAdapter } = useShopify();
   const [customAttributes, setCustomAttributes] = react.useState([]);
@@ -1122,7 +1230,8 @@ function CartProvider({
     profile,
     customer,
     cart,
-    memberType: hasPlusMember ? "2" : String(profile?.memberType ?? 0)
+    memberType: hasPlusMember ? "2" : String(profile?.memberType ?? 0),
+    appContext
   });
   ahooks.useRequest(
     () => {
@@ -1176,9 +1285,13 @@ function CartProvider({
     },
     [setCustomAttributes]
   );
-  const functionAutoFreeGiftResult = useCalcAutoFreeGift(cart, autoFreeGiftConfig || [], customer);
+  const functionAutoFreeGiftResult = useCalcAutoFreeGift(
+    cart,
+    functionAutoFreeGiftConfig || [],
+    customer
+  );
   const scriptAutoFreeGiftResult = useScriptAutoFreeGift({
-    campaign: gradientGiftsConfig || null,
+    campaign: scriptAutoFreeGiftConfig,
     _giveaway: CUSTOMER_SCRIPT_GIFT_KEY,
     cart,
     profile
@@ -1186,10 +1299,10 @@ function CartProvider({
   const formattedScriptGifts = react.useMemo(() => {
     return formatScriptAutoFreeGift({
       scriptAutoFreeGiftResult,
-      gradient_gifts: gradientGiftsConfig,
+      gradient_gifts: scriptAutoFreeGiftConfig,
       locale
     });
-  }, [scriptAutoFreeGiftResult, gradientGiftsConfig, locale]);
+  }, [scriptAutoFreeGiftResult, scriptAutoFreeGiftConfig, locale]);
   const formattedFunctionGifts = react.useMemo(() => {
     return formatFunctionAutoFreeGift({
       qualifyingGift: functionAutoFreeGiftResult?.qualifyingGift || null,
@@ -1237,6 +1350,12 @@ function CartProvider({
     const giftLinesCount = giftNeedAddToCartLines?.reduce((acc, item) => acc + (item.quantity || 1), 0) || 0;
     return cartLinesCount + giftLinesCount;
   }, [cart?.lineItems, giftNeedAddToCartLines]);
+  const autoRemoveFreeGiftsOptions = react.useMemo(() => {
+    return {
+      removeFunctionGifts: !!functionAutoFreeGiftConfig,
+      removeScriptGifts: !!scriptAutoFreeGiftConfig
+    };
+  }, [functionAutoFreeGiftConfig, scriptAutoFreeGiftConfig]);
   const value = react.useMemo(
     () => ({
       totalQuantity,
@@ -1251,8 +1370,8 @@ function CartProvider({
       customer,
       isCodeChanging,
       setIsCodeChanging,
-      autoFreeGiftConfig,
-      gradientGiftsConfig,
+      functionAutoFreeGiftConfig,
+      scriptAutoFreeGiftConfig,
       setLoadingState,
       loadingState,
       // function满赠
@@ -1265,7 +1384,9 @@ function CartProvider({
       setScriptAutoFreeGift,
       giftNeedAddToCartLines,
       metafieldIdentifiers,
-      memberSetting
+      memberSetting,
+      appContext,
+      autoRemoveFreeGiftsOptions
     }),
     [
       cart,
@@ -1277,8 +1398,8 @@ function CartProvider({
       removeCustomAttributes,
       locale,
       isCodeChanging,
-      autoFreeGiftConfig,
-      gradientGiftsConfig,
+      functionAutoFreeGiftConfig,
+      scriptAutoFreeGiftConfig,
       loadingState,
       // function满赠
       functionAutoFreeGift,
@@ -1292,7 +1413,9 @@ function CartProvider({
       metafieldIdentifiers,
       customer,
       profile,
-      memberSetting
+      memberSetting,
+      appContext,
+      autoRemoveFreeGiftsOptions
     ]
   );
   return /* @__PURE__ */ jsxRuntime.jsx(CartContext.Provider, { value, children });