@shoppexio/storefront 1.0.78 → 1.0.79

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.79
+
+- Attribution is now decided by the policy of the code that EARNED the hold, never by the one that just arrived. `captureAffiliateFromUrl()` sends the held code so the server can report its mode, and a first-click hold survives an affiliate on a last-click tier landing afterwards.
+- `applyAffiliateCode()` applies the same rules as a `?ref=` landing. It stores the code with the shop's (or tier's) real mode and window instead of a fixed 30-day last-click entry, and it no longer overrides a standing first-click hold — a themed "apply code" field was previously a way around the rule.
+- `applyAffiliateCode()` reports what is ATTRIBUTED: `data.affiliate_code` is the winning code and the new `data.applied` says whether that is the one you passed. Passing `data.affiliate_code` to `checkout()` therefore stays correct in both cases.
+- `validateAffiliateCode()` passes the resolved `attribution_mode`, `attribution_window_days` and `held_attribution_mode` through instead of dropping them.
+- `getStoredAffiliate()` also returns `expiresAt`, so a hold can be restored without extending the window it earned.
+- A transport failure or an HTTP error such as a rate limit no longer returns the arriving code while storage still holds another: both paths answer with the code that keeps the attribution.
+
 ## 1.0.78
 
 - `captureAffiliateFromUrl()` honours the shop's attribution mode (ADR-0067). Under `FIRST_CLICK` a held, unexpired attribution wins and a newer `?ref=` no longer replaces it; the landing is still reported so click statistics stay complete. `LAST_CLICK` is unchanged and remains the default.

package/dist/index.cjs

@@ -19317,6 +19317,9 @@ function safeWrite(value) {
   } catch {
   }
 }
+function restoreStoredAffiliate(value) {
+  safeWrite(value);
+}
 function setAffiliateCode(code, ttlDays = DEFAULT_TTL_DAYS, mode) {
   const normalized = normalizeAffiliateCode(code);
   if (!normalized) {
@@ -19341,7 +19344,7 @@ function getStoredAffiliate() {
   const code = normalizeAffiliateCode(stored.code);
   if (!code) return null;
   const windowDays = typeof stored.windowDays === "number" && stored.windowDays > 0 ? stored.windowDays : DEFAULT_TTL_DAYS;
-  return { code, mode: normalizeMode(stored.mode), windowDays };
+  return { code, mode: normalizeMode(stored.mode), windowDays, expiresAt: stored.expiresAt };
 }
 function clearAffiliateCode() {
   if (typeof window === "undefined") return;
@@ -19432,11 +19435,13 @@ async function validateAffiliateCode(code) {
     };
   }
   const config2 = getConfig();
+  const held = getStoredAffiliate();
   const response = await post(
     "/v1/storefront/affiliates/resolve",
     {
       shop_slug: config2.storeSlug,
-      code: normalizedCode
+      code: normalizedCode,
+      ...held && held.code !== normalizedCode ? { held_code: held.code } : {}
     },
     { retries: 0 }
   );
@@ -19464,15 +19469,36 @@ async function validateAffiliateCode(code) {
       ...response.data.program_enabled !== void 0 ? { program_enabled: response.data.program_enabled } : {},
       affiliate_code: normalizeAffiliateCode(response.data.affiliate_code),
       discount_active: Boolean(response.data.discount_active),
-      discount_percent: Number(response.data.discount_percent ?? 0)
+      discount_percent: Number(response.data.discount_percent ?? 0),
+      // Passed through rather than dropped: a caller that stores the code has
+      // no other way to learn the policy, and defaulting to 30-day last-click
+      // would quietly discard a first-click tier and any custom window.
+      attribution_mode: normalizeMode(response.data.attribution_mode),
+      attribution_window_days: typeof response.data.attribution_window_days === "number" && response.data.attribution_window_days >= 1 ? Math.trunc(response.data.attribution_window_days) : DEFAULT_TTL_DAYS,
+      held_attribution_mode: response.data.held_attribution_mode === "FIRST_CLICK" || response.data.held_attribution_mode === "LAST_CLICK" ? response.data.held_attribution_mode : null
     },
     ...response.message ? { message: response.message } : {}
   };
 }
 async function applyAffiliateCode(code) {
+  const held = getStoredAffiliate();
   const result = await validateAffiliateCode(code);
   if (result.success && result.data?.affiliate_code) {
-    setAffiliateCode(result.data.affiliate_code);
+    const applied = result.data.affiliate_code;
+    const holdsOtherCode = held !== null && held.code !== applied;
+    const heldMode = holdsOtherCode ? result.data.held_attribution_mode ?? held.mode : null;
+    if (heldMode === "FIRST_CLICK" && held) {
+      return {
+        ...result,
+        data: { ...result.data, affiliate_code: held.code, applied: false }
+      };
+    }
+    setAffiliateCode(
+      applied,
+      result.data.attribution_window_days ?? DEFAULT_TTL_DAYS,
+      result.data.attribution_mode
+    );
+    return { ...result, data: { ...result.data, applied: true } };
   }
   return result;
 }
@@ -19489,7 +19515,8 @@ async function captureAffiliateFromUrl(param = "ref") {
   code = normalizeAffiliateCode(code);
   if (!code) return null;
   const held = getStoredAffiliate();
-  const mayHoldFirstClick = held !== null && held.mode === "FIRST_CLICK" && held.code !== code;
+  const holdsOtherCode = held !== null && held.code !== code;
+  const mayHoldFirstClick = holdsOtherCode && held.mode === "FIRST_CLICK";
   if (!mayHoldFirstClick) {
     setAffiliateCode(code, held?.windowDays ?? DEFAULT_TTL_DAYS, held?.mode);
   }
@@ -19498,13 +19525,29 @@ async function captureAffiliateFromUrl(param = "ref") {
       const config2 = getConfig();
       const res = await post(
         "/v1/storefront/affiliates/attribution",
-        { shop_slug: config2.storeSlug, code },
+        {
+          shop_slug: config2.storeSlug,
+          code,
+          // Sent so the server can report the policy of the attribution we
+          // already hold. Its mode — not the arriving code's — decides whether
+          // that hold may be released.
+          ...held ? { held_code: held.code } : {}
+        },
         { retries: 0 }
       );
       const serverMode = res.success && res.data?.attribution_mode ? normalizeMode(res.data.attribution_mode) : null;
       const serverWindow = res.success && typeof res.data?.attribution_window_days === "number" ? res.data.attribution_window_days : DEFAULT_TTL_DAYS;
-      const holdsFirstClick = mayHoldFirstClick && serverMode !== "LAST_CLICK";
-      if (holdsFirstClick) {
+      const heldMode = res.success && res.data?.held_attribution_mode ? normalizeMode(res.data.held_attribution_mode) : null;
+      const holdsFirstClick = holdsOtherCode && (heldMode ?? held?.mode) === "FIRST_CLICK";
+      if (holdsFirstClick && held) {
+        if (!mayHoldFirstClick) {
+          restoreStoredAffiliate({
+            code: held.code,
+            expiresAt: held.expiresAt,
+            windowDays: held.windowDays,
+            mode: heldMode ?? "FIRST_CLICK"
+          });
+        }
         return held.code;
       }
       if (res.success && res.data?.accepted && res.data.affiliate_code) {
@@ -19515,7 +19558,7 @@ async function captureAffiliateFromUrl(param = "ref") {
         clearAffiliateCode();
         return null;
       }
-      return code;
+      return mayHoldFirstClick ? held.code : code;
     } catch {
       return mayHoldFirstClick ? held.code : code;
     }