@aranova/tracking-next 0.18.1 → 0.19.1

package/dist/index.js

@@ -43,6 +43,7 @@ __export(src_exports, {
   TRACKING_PARAM_KEYS: () => TRACKING_PARAM_KEYS,
   TRACKING_RANGES: () => TRACKING_RANGES,
   captureTrackingParamsFromLocation: () => captureTrackingParamsFromLocation,
+  clearStashedUserData: () => clearStashedUserData,
   createSalesClient: () => createSalesClient,
   createTracking: () => createTracking,
   createTrackingClientContext: () => createTrackingClientContext,
@@ -71,6 +72,7 @@ __export(src_exports, {
   saleUpdateSchema: () => saleUpdateSchema,
   salesRequest: () => salesRequest,
   setConsentState: () => setConsentState,
+  stashUserData: () => stashUserData,
   toE164: () => toE164,
   toMinor: () => toMinor,
   useConsent: () => useConsent,
@@ -83,6 +85,140 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// ../tracking-core/src/phone.ts
+var import_libphonenumber_js = require("libphonenumber-js");
+var DEFAULT_PHONE_COUNTRY = "CA";
+function parsePhone(raw, country) {
+  const region = country ?? DEFAULT_PHONE_COUNTRY;
+  const parsed = (0, import_libphonenumber_js.parsePhoneNumberFromString)(raw ?? "", region);
+  if (!parsed) {
+    return { e164: null, national: "", international: "", country: region, isValid: false };
+  }
+  const isValid = parsed.isValid();
+  return {
+    // E.164 is only surfaced for a *valid* number — a possible-but-invalid input
+    // (e.g. too few digits) still parses but must not be transmitted.
+    e164: isValid ? parsed.number : null,
+    national: parsed.formatNational(),
+    international: parsed.formatInternational(),
+    country: parsed.country ?? region,
+    isValid
+  };
+}
+function toE164(raw, country) {
+  return parsePhone(raw, country).e164;
+}
+function formatPhone(value, format = "national", country) {
+  const parsed = parsePhone(value, country);
+  if (typeof format === "function") return format(parsed);
+  switch (format) {
+    case "international":
+      return parsed.international || value;
+    case "e164":
+      return parsed.e164 ?? value;
+    case "national":
+    default:
+      return parsed.national || value;
+  }
+}
+function formatPhoneAsTyped(raw, country) {
+  return new import_libphonenumber_js.AsYouType(country ?? DEFAULT_PHONE_COUNTRY).input(raw ?? "");
+}
+
+// ../tracking-core/src/user-data.ts
+var EMAIL_SHAPE = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
+var EMAIL_NAME_HINT = /e[-_]?mail/i;
+var PHONE_NAME_HINT = /(^|[^a-z])(phone|tel|mobile|cell)/i;
+var stash = { email: null, phoneNumber: null };
+function normalizeEmail(raw) {
+  if (typeof raw !== "string") return null;
+  const cleaned = raw.trim().toLowerCase();
+  return EMAIL_SHAPE.test(cleaned) ? cleaned : null;
+}
+function fieldText(field, key) {
+  const value = field[key];
+  return typeof value === "string" ? value : "";
+}
+function extractUserDataFromFormFields(fields, country) {
+  const result = { email: null, phoneNumber: null };
+  if (!Array.isArray(fields)) return result;
+  const passes = [
+    (field, _hint, type) => fieldText(field, "type").toLowerCase() === type,
+    (field, hint) => hint.test(fieldText(field, "name")) || hint.test(fieldText(field, "label"))
+  ];
+  for (const matches of passes) {
+    for (const raw of fields) {
+      if (raw === null || typeof raw !== "object") continue;
+      const field = raw;
+      if (typeof field.value !== "string" || field.value.length === 0) continue;
+      if (result.email === null && matches(field, EMAIL_NAME_HINT, "email")) {
+        result.email = normalizeEmail(field.value);
+      }
+      if (result.phoneNumber === null && matches(field, PHONE_NAME_HINT, "tel")) {
+        try {
+          result.phoneNumber = toE164(field.value, country);
+        } catch {
+        }
+      }
+    }
+    if (result.email !== null && result.phoneNumber !== null) break;
+  }
+  return result;
+}
+function stashUserData(data, country) {
+  const email = normalizeEmail(data.email);
+  let phoneNumber = null;
+  if (typeof data.phone === "string" && data.phone.length > 0) {
+    try {
+      phoneNumber = toE164(data.phone, country);
+    } catch {
+      phoneNumber = null;
+    }
+  }
+  stash = {
+    email: email ?? stash.email,
+    phoneNumber: phoneNumber ?? stash.phoneNumber
+  };
+}
+function stashUserDataFromFormFields(fields, country) {
+  try {
+    const extracted = extractUserDataFromFormFields(fields, country);
+    stash = {
+      email: extracted.email ?? stash.email,
+      phoneNumber: extracted.phoneNumber ?? stash.phoneNumber
+    };
+  } catch {
+  }
+}
+function clearStashedUserData() {
+  stash = { email: null, phoneNumber: null };
+}
+function applyUserDataForConversion(explicit, country) {
+  if (typeof window === "undefined" || typeof window.gtag !== "function") return false;
+  let email = stash.email;
+  let phoneNumber = stash.phoneNumber;
+  if (explicit) {
+    const normalizedEmail = normalizeEmail(explicit.email);
+    if (normalizedEmail) email = normalizedEmail;
+    if (typeof explicit.phone === "string" && explicit.phone.length > 0) {
+      try {
+        phoneNumber = toE164(explicit.phone, country) ?? phoneNumber;
+      } catch {
+      }
+    }
+  }
+  if (email === null && phoneNumber === null) return false;
+  try {
+    window.gtag("set", "user_data", {
+      ...email !== null ? { email } : {},
+      ...phoneNumber !== null ? { phone_number: phoneNumber } : {}
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // ../tracking-core/src/consent.ts
 var CONSENT_STATE_KEY = "consent_state";
 var CONSENT_TIMESTAMP_KEY = "consent_timestamp";
@@ -168,6 +304,13 @@ function setConsentState(state, options) {
   } catch {
   }
   pushConsentToPlatforms(state);
+  if (state === "denied") {
+    clearStashedUserData();
+    try {
+      if (typeof window.gtag === "function") window.gtag("set", "user_data", null);
+    } catch {
+    }
+  }
   notifyConsentChanged({ state, source: "explicit", updatedAt, expiresAt });
 }
 function optIn() {
@@ -206,6 +349,11 @@ var aranovaConsent = (function () {
 var TRACKING_COOKIE_MAX_AGE_SECONDS = 7776e3;
 var TRACKING_PARAM_KEYS = [
   "gclid",
+  // Google's iOS/Safari replacement click IDs — issued when privacy features
+  // withhold gclid (wbraid: web-to-web, gbraid: app-to-web). First-class
+  // citizens: captured, persisted, and attributed exactly like gclid.
+  "wbraid",
+  "gbraid",
   "fbclid",
   "utm_source",
   "utm_medium",
@@ -216,6 +364,8 @@ var TRACKING_PARAM_KEYS = [
 function createEmptyTrackingParams() {
   return {
     gclid: null,
+    wbraid: null,
+    gbraid: null,
     fbclid: null,
     utm_source: null,
     utm_medium: null,
@@ -518,6 +668,8 @@ function buildLandingPayloadFields(sessionId, override) {
   if (params === null) return {};
   return {
     landing_gclid: params.gclid ?? null,
+    landing_wbraid: params.wbraid ?? null,
+    landing_gbraid: params.gbraid ?? null,
     landing_fbclid: params.fbclid ?? null,
     landing_utm_source: params.utm_source ?? null,
     landing_utm_medium: params.utm_medium ?? null,
@@ -545,6 +697,8 @@ function createTrackingSessionUpsertPayload(trackingParams, input, context) {
     session_id: input.sessionId,
     visitor_id: input.visitorId ?? null,
     gclid: trackingParams.gclid,
+    wbraid: trackingParams.wbraid,
+    gbraid: trackingParams.gbraid,
     fbclid: trackingParams.fbclid,
     fbc: getFbcCookie(),
     fbp: getFbpCookie(),
@@ -566,6 +720,8 @@ function createTrackingEventCreatePayload(trackingParams, input, context) {
     session_id: input.sessionId,
     event_type: input.eventType,
     gclid: trackingParams.gclid,
+    wbraid: trackingParams.wbraid,
+    gbraid: trackingParams.gbraid,
     fbclid: trackingParams.fbclid,
     fbc: getFbcCookie(),
     fbp: getFbpCookie(),
@@ -595,13 +751,18 @@ function markFired(input) {
   } catch {
   }
 }
-function fireOnce(input) {
-  if (alreadyFired(input)) return;
-  if (fireGtagConversion(input)) markFired(input);
-}
-function fireConversionWithConsent(input) {
-  if (getConsentState() === "denied") return;
-  fireOnce(input);
+function fireConversionWithConsent(input, options) {
+  if (getConsentState() === "denied") return "denied";
+  if (alreadyFired(input)) return "duplicate";
+  if (!isValidSendTo(input.sendTo)) return "invalid";
+  try {
+    applyUserDataForConversion(options?.userData);
+    if (!fireGtagConversion(input)) return "retryable";
+    markFired(input);
+    return "fired";
+  } catch {
+    return "retryable";
+  }
 }
 
 // ../tracking-core/src/resources/conversion-config.ts
@@ -775,6 +936,103 @@ function resolveConversionConfig(options) {
   };
 }
 
+// ../tracking-core/src/resources/automatic-transaction.ts
+var STORAGE_KEY = "_aranova_auto_txn_map";
+var transactionIds = /* @__PURE__ */ new Map();
+var legacyCounter = 0;
+function scopeKey(sessionId, goalKey, path) {
+  return JSON.stringify([sessionId, goalKey, path]);
+}
+function randomId() {
+  const cryptoApi = globalThis.crypto;
+  if (typeof cryptoApi?.randomUUID === "function") return cryptoApi.randomUUID();
+  if (typeof cryptoApi?.getRandomValues === "function") {
+    const bytes = cryptoApi.getRandomValues(new Uint8Array(16));
+    return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
+  }
+  legacyCounter = (legacyCounter + 1) % 4294967296;
+  const timestamp = Date.now().toString(16).padStart(12, "0");
+  const counter = legacyCounter.toString(16).padStart(8, "0");
+  const random = Math.floor(Math.random() * 281474976710655).toString(16).padStart(12, "0");
+  return `${timestamp}${counter}${random}`.slice(0, 32);
+}
+function isValidTransactionId(value) {
+  return typeof value === "string" && /^auto:(?:[0-9a-f]{32}|[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12})$/i.test(
+    value
+  ) && value.length <= 64;
+}
+function readStoredMap(sessionId) {
+  if (typeof window === "undefined") return { sessionId, entries: {} };
+  try {
+    const raw = window.localStorage.getItem(STORAGE_KEY);
+    if (!raw) return { sessionId, entries: {} };
+    const parsed = JSON.parse(raw);
+    if (parsed.sessionId !== sessionId || !parsed.entries || typeof parsed.entries !== "object" || Array.isArray(parsed.entries)) {
+      return { sessionId, entries: {} };
+    }
+    return { sessionId, entries: parsed.entries };
+  } catch {
+    return { sessionId, entries: {} };
+  }
+}
+function writeStoredMap(stored) {
+  if (typeof window === "undefined") return;
+  try {
+    window.localStorage.setItem(STORAGE_KEY, JSON.stringify(stored));
+  } catch {
+  }
+}
+function getAutomaticTransactionId(sessionId, goalKey, path) {
+  const key = scopeKey(sessionId, goalKey, path);
+  const existing = transactionIds.get(key);
+  if (existing) return existing;
+  const stored = readStoredMap(sessionId);
+  const storedId = stored.entries[key];
+  if (isValidTransactionId(storedId)) {
+    transactionIds.set(key, storedId);
+    return storedId;
+  }
+  const transactionId = `auto:${randomId()}`;
+  transactionIds.set(key, transactionId);
+  const latest = readStoredMap(sessionId);
+  const concurrentId = latest.entries[key];
+  if (isValidTransactionId(concurrentId)) {
+    transactionIds.set(key, concurrentId);
+    return concurrentId;
+  }
+  latest.entries[key] = transactionId;
+  writeStoredMap(latest);
+  return transactionId;
+}
+
+// ../tracking-core/src/resources/automatic-trigger.ts
+function hasNumberField(metadata, key) {
+  return typeof metadata[key] === "number";
+}
+function hasStringField(metadata, key) {
+  return typeof metadata[key] === "string";
+}
+function automaticThresholdMet(goal, eventType, metadata) {
+  const trigger = goal.trigger;
+  if (!trigger || trigger.event_type !== eventType) return false;
+  switch (eventType) {
+    case "scroll_depth":
+      return hasNumberField(metadata, "depth_percent") && trigger.threshold_percent != null && metadata.depth_percent >= trigger.threshold_percent;
+    case "time_on_site":
+      return hasNumberField(metadata, "duration_ms") && trigger.threshold_seconds != null && metadata.duration_ms >= trigger.threshold_seconds * 1e3;
+    case "multi_page_session":
+      return hasNumberField(metadata, "page_count") && trigger.page_threshold != null && metadata.page_count >= trigger.page_threshold;
+    case "specific_page_visit":
+      return hasStringField(metadata, "page_name") && metadata.page_name === trigger.page_name;
+    case "page_view":
+    case "form_start":
+    case "phone_click":
+      return true;
+    default:
+      return false;
+  }
+}
+
 // ../tracking-core/src/resources/sales/money.ts
 var MINOR_UNIT_EXPONENT = {
   USD: 2,
@@ -893,7 +1151,12 @@ var TrackingConfigRuntime = class {
     this.etag = null;
     this.stateValue = "unconfirmed";
     this.confirmedAt = 0;
+    this.authorityGeneration = 0;
     this.inFlight = null;
+    this.flushInFlight = null;
+    this.flushRequested = false;
+    this.retryTimer = null;
+    this.started = false;
     this.conversionQueue = [];
     this.automaticQueue = [];
     this.pageQueue = [];
@@ -901,6 +1164,20 @@ var TrackingConfigRuntime = class {
     const cached = readCache2(ref.cdnUrl);
     this.current = cached?.config ?? null;
     this.etag = cached?.etag ?? null;
+    this.start();
+  }
+  /**
+   * Explicitly start authority resolution and Google-tag bootstrap.
+   *
+   * Idempotent so framework effects can call it after hydration without
+   * depending on constructor timing.
+   */
+  start() {
+    if (this.started) {
+      void this.flush();
+      return;
+    }
+    this.started = true;
     void this.revalidate();
     if (typeof window !== "undefined") {
       window.addEventListener("visibilitychange", () => {
@@ -916,7 +1193,7 @@ var TrackingConfigRuntime = class {
     return this.stateValue === "active" || this.stateValue === "tombstone" ? this.current : null;
   }
   __unsafeExpireAuthorityForTests() {
-    this.confirmedAt = 0;
+    this.confirmedAt = Number.NEGATIVE_INFINITY;
   }
   subscribe(listener) {
     this.listeners.add(listener);
@@ -926,10 +1203,14 @@ var TrackingConfigRuntime = class {
     if (this.stateValue !== "unconfirmed" && Date.now() - this.confirmedAt < AUTHORITY_TTL_MS) {
       return true;
     }
-    await this.revalidate();
+    await this.revalidateAuthority();
     return this.stateValue !== "unconfirmed" && Date.now() - this.confirmedAt < AUTHORITY_TTL_MS;
   }
   async revalidate() {
+    await this.revalidateAuthority();
+    await this.flush();
+  }
+  async revalidateAuthority() {
     if (typeof window === "undefined" || !this.fetchImpl) return;
     if (this.inFlight) return this.inFlight;
     this.inFlight = this.revalidateNow().finally(() => {
@@ -946,8 +1227,8 @@ var TrackingConfigRuntime = class {
     this.conversionQueue.push({ key, ...options });
     void this.flush();
   }
-  queueAutomaticEvent(eventType, metadata, transactionPath) {
-    this.automaticQueue.push({ eventType, metadata, transactionPath });
+  queueAutomaticEvent(eventType, metadata, transactionPath, transactionScope) {
+    this.automaticQueue.push({ eventType, metadata, transactionPath, transactionScope });
     void this.flush();
   }
   listGoals() {
@@ -964,7 +1245,6 @@ var TrackingConfigRuntime = class {
       });
       if (response.status === 304 && this.current && validateConfig(this.current, this.ref)) {
         this.confirm(this.current, this.etag);
-        await this.flush();
         return;
       }
       if (!response.ok) {
@@ -981,21 +1261,26 @@ var TrackingConfigRuntime = class {
         return;
       }
       this.confirm(next, response.headers.get("ETag"));
-      await this.flush();
     } catch {
       this.expireAuthority();
     }
   }
   expireAuthority() {
+    this.authorityGeneration += 1;
     if (this.stateValue !== "unconfirmed") this.stateValue = "unconfirmed";
   }
   confirm(config, etag) {
+    this.authorityGeneration += 1;
     this.current = config;
     this.etag = etag;
     this.confirmedAt = Date.now();
     this.stateValue = isTombstone(config) ? "tombstone" : "active";
     writeCache2(this.ref.cdnUrl, { etag, config });
     if (this.stateValue === "tombstone") {
+      if (this.retryTimer !== null) {
+        window.clearTimeout(this.retryTimer);
+        this.retryTimer = null;
+      }
       this.conversionQueue.length = 0;
       this.automaticQueue.length = 0;
       this.pageQueue.length = 0;
@@ -1003,79 +1288,107 @@ var TrackingConfigRuntime = class {
     for (const listener of this.listeners) listener();
   }
   async flush() {
+    if (this.flushInFlight) {
+      this.flushRequested = true;
+      return this.flushInFlight;
+    }
+    this.flushRequested = false;
+    this.flushInFlight = this.flushNow().finally(() => {
+      this.flushInFlight = null;
+      if (this.flushRequested && this.stateValue === "active") void this.flush();
+    });
+    return this.flushInFlight;
+  }
+  scheduleRetry() {
+    if (this.retryTimer !== null || typeof window === "undefined") return;
+    this.retryTimer = window.setTimeout(() => {
+      this.retryTimer = null;
+      void this.flush();
+    }, 1e3);
+  }
+  async flushNow() {
     if (!await this.ensureAuthority()) return;
     if (this.stateValue !== "active" || !this.current) return;
-    const ids = Object.values(this.current.gtag_ids).filter(
+    const config = this.current;
+    const generation = this.authorityGeneration;
+    const ids = Object.values(config.gtag_ids).filter(
       (id) => typeof id === "string" && isValidGtagId(id)
     );
     if (ids.length === 0) return;
     await ensureScript(ids[0]);
+    if (this.authorityGeneration !== generation || this.stateValue !== "active" || this.current !== config) {
+      return;
+    }
     const gtag = window.gtag;
     if (typeof gtag !== "function") return;
-    if (!jsInitialized) {
-      gtag("js", /* @__PURE__ */ new Date());
-      jsInitialized = true;
-    }
-    for (const id of ids) {
-      if (configuredIds.has(id)) continue;
-      gtag("config", id, { send_page_view: false });
-      configuredIds.add(id);
-    }
-    while (this.pageQueue.length) {
-      const page = this.pageQueue.shift();
-      gtag("event", "page_view", {
-        page_location: page.href,
-        page_title: page.title ?? void 0,
-        page_referrer: page.referrer ?? void 0
-      });
+    try {
+      if (!jsInitialized) {
+        gtag("js", /* @__PURE__ */ new Date());
+        jsInitialized = true;
+      }
+      for (const id of ids) {
+        if (configuredIds.has(id)) continue;
+        gtag("config", id, { send_page_view: false });
+        configuredIds.add(id);
+      }
+    } catch {
+      this.scheduleRetry();
+      return;
     }
-    while (this.automaticQueue.length) {
-      const event = this.automaticQueue.shift();
-      for (const goal of this.current.goals) {
+    while (this.pageQueue.length > 0) {
+      const page = this.pageQueue[0];
+      try {
+        gtag("event", "page_view", {
+          page_location: page.href,
+          page_title: page.title ?? void 0,
+          page_referrer: page.referrer ?? void 0
+        });
+        this.pageQueue.shift();
+      } catch {
+        this.scheduleRetry();
+        return;
+      }
+    }
+    while (this.automaticQueue.length > 0) {
+      const event = this.automaticQueue[0];
+      for (const goal of config.goals) {
         if (goal.kind !== "event" || !goal.firing) continue;
         if (!automaticThresholdMet(goal, event.eventType, event.metadata)) continue;
         this.conversionQueue.push({
           key: goal.key,
-          transactionId: `auto:${goal.key}:${event.transactionPath}`
+          transactionId: getAutomaticTransactionId(
+            event.transactionScope,
+            goal.key,
+            event.transactionPath
+          )
         });
       }
+      this.automaticQueue.shift();
     }
-    while (this.conversionQueue.length) {
-      const item = this.conversionQueue.shift();
-      const goal = this.current.goals.find((g) => g.key === item.key);
+    while (this.conversionQueue.length > 0) {
+      const item = this.conversionQueue[0];
+      const goal = config.goals.find((g) => g.key === item.key);
       const firing = goal?.firing;
-      if (!firing || getConsentState() === "denied") continue;
+      if (!firing) {
+        this.conversionQueue.shift();
+        continue;
+      }
       const currency = item.currency ?? firing.currency ?? null;
       const value = item.value ?? (firing.value_cents != null && currency ? fromMinor(firing.value_cents, currency) : null);
-      fireGtagConversion({
+      const outcome = fireConversionWithConsent({
         sendTo: firing.send_to,
         value,
         currency,
         transactionId: item.transactionId ?? null
       });
+      if (outcome === "retryable") {
+        this.scheduleRetry();
+        return;
+      }
+      this.conversionQueue.shift();
     }
   }
 };
-function automaticThresholdMet(goal, eventType, metadata) {
-  const t = goal.trigger;
-  if (!t || t.event_type !== eventType) return false;
-  switch (eventType) {
-    case "scroll_depth":
-      return typeof metadata.depth_percent === "number" && t.threshold_percent != null && metadata.depth_percent >= t.threshold_percent;
-    case "time_on_site":
-      return typeof metadata.duration_ms === "number" && t.threshold_seconds != null && metadata.duration_ms >= t.threshold_seconds * 1e3;
-    case "multi_page_session":
-      return typeof metadata.page_count === "number" && t.page_threshold != null && metadata.page_count >= t.page_threshold;
-    case "specific_page_visit":
-      return typeof metadata.page_name === "string" && metadata.page_name === t.page_name;
-    case "page_view":
-    case "form_start":
-    case "phone_click":
-      return true;
-    default:
-      return false;
-  }
-}
 function getTrackingConfigRuntime(ref, fetchImpl) {
   const key = `${ref.cdnUrl}|${ref.businessId}|${ref.environment}`;
   const existing = runtimes.get(key);
@@ -1086,26 +1399,6 @@ function getTrackingConfigRuntime(ref, fetchImpl) {
 }
 
 // ../tracking-core/src/resources/conversion-autofire.ts
-function thresholdMet(goal, eventType, metadata) {
-  const t = goal.trigger;
-  if (!t || t.event_type !== eventType) return false;
-  switch (eventType) {
-    case "scroll_depth":
-      return typeof metadata.depth_percent === "number" && t.threshold_percent != null && metadata.depth_percent >= t.threshold_percent;
-    case "time_on_site":
-      return typeof metadata.duration_ms === "number" && t.threshold_seconds != null && metadata.duration_ms >= t.threshold_seconds * 1e3;
-    case "multi_page_session":
-      return typeof metadata.page_count === "number" && t.page_threshold != null && metadata.page_count >= t.page_threshold;
-    case "specific_page_visit":
-      return typeof metadata.page_name === "string" && metadata.page_name === t.page_name;
-    case "page_view":
-    case "form_start":
-    case "phone_click":
-      return true;
-    default:
-      return false;
-  }
-}
 function currentPath() {
   return typeof window === "undefined" ? "" : window.location.pathname;
 }
@@ -1113,13 +1406,14 @@ var MAX_BUFFERED_EVENTS = 50;
 function createConversionAutoFire(store) {
   const pending = [];
   let subscribed = false;
-  function fireMatching(eventType, metadata) {
+  function fireMatching(eventType, metadata, transactionScope) {
     for (const goal of store.listGoals()) {
       if (goal.kind !== "event" || !goal.firing) continue;
-      if (!thresholdMet(goal, eventType, metadata)) continue;
+      if (!automaticThresholdMet(goal, eventType, metadata)) continue;
+      const transactionId = getAutomaticTransactionId(transactionScope, goal.key, currentPath());
       if ("queueAutomaticEvent" in store) {
         store.fireConversion(goal.key, {
-          transactionId: `auto:${goal.key}:${currentPath()}`
+          transactionId
         });
         continue;
       }
@@ -1130,28 +1424,30 @@ function createConversionAutoFire(store) {
         sendTo: firing.send_to,
         value: cents != null && currency ? fromMinor(cents, currency) : null,
         currency,
-        // Page-scoped txn id → fire once per (goal, path) per session; engagement conversions
-        // shouldn't re-fire as the visitor scrolls back and forth or re-enters a page.
-        transactionId: `auto:${goal.key}:${currentPath()}`
+        transactionId
       });
     }
   }
   return {
-    onAutomaticEvent(eventType, metadata) {
+    onAutomaticEvent(eventType, metadata, transactionScope) {
       if ("queueAutomaticEvent" in store) {
-        store.queueAutomaticEvent(eventType, metadata, currentPath());
+        store.queueAutomaticEvent(eventType, metadata, currentPath(), transactionScope);
         return;
       }
       if (store.isReady()) {
-        fireMatching(eventType, metadata);
+        fireMatching(eventType, metadata, transactionScope);
         return;
       }
-      if (pending.length < MAX_BUFFERED_EVENTS) pending.push({ eventType, metadata });
+      if (pending.length < MAX_BUFFERED_EVENTS) {
+        pending.push({ eventType, metadata, transactionScope });
+      }
       if (!subscribed) {
         subscribed = true;
         store.onResolve(() => {
           const buffered = pending.splice(0);
-          for (const event of buffered) fireMatching(event.eventType, event.metadata);
+          for (const event of buffered) {
+            fireMatching(event.eventType, event.metadata, event.transactionScope);
+          }
         });
       }
     }
@@ -1163,7 +1459,7 @@ function withConversionAutoFire(client, autoFire) {
     trackEvent: (input) => {
       client.trackEvent(input);
       try {
-        autoFire.onAutomaticEvent(input.eventType, input.metadata ?? {});
+        autoFire.onAutomaticEvent(input.eventType, input.metadata ?? {}, client.getSessionId());
       } catch {
       }
     }
@@ -1540,6 +1836,8 @@ function createTrackingClient(config) {
       session_id: sessionId,
       visitor_id: visitorId,
       gclid: params.gclid,
+      wbraid: params.wbraid,
+      gbraid: params.gbraid,
       fbclid: params.fbclid,
       fbc: getFbcCookie(),
       fbp: getFbpCookie(),
@@ -1586,6 +1884,13 @@ function createTrackingClient(config) {
   function trackEvent(input) {
     if (destroyed) return;
     if (!input || typeof input.eventType !== "string" || input.eventType.length === 0) return;
+    if (input.eventType === "form_submit" && getConsentState() !== "denied") {
+      try {
+        const fields = input.metadata?.form?.fields;
+        if (fields) stashUserDataFromFormFields(fields, config.phone?.defaultCountry);
+      } catch {
+      }
+    }
     const occurredAt = input.occurredAt instanceof Date ? input.occurredAt.toISOString() : typeof input.occurredAt === "string" ? input.occurredAt : (/* @__PURE__ */ new Date()).toISOString();
     queue.push({
       event_type: input.eventType,
@@ -2414,46 +2719,6 @@ function attachCtaClickCapture(client, config) {
   };
 }
 
-// ../tracking-core/src/phone.ts
-var import_libphonenumber_js = require("libphonenumber-js");
-var DEFAULT_PHONE_COUNTRY = "CA";
-function parsePhone(raw, country) {
-  const region = country ?? DEFAULT_PHONE_COUNTRY;
-  const parsed = (0, import_libphonenumber_js.parsePhoneNumberFromString)(raw ?? "", region);
-  if (!parsed) {
-    return { e164: null, national: "", international: "", country: region, isValid: false };
-  }
-  const isValid = parsed.isValid();
-  return {
-    // E.164 is only surfaced for a *valid* number — a possible-but-invalid input
-    // (e.g. too few digits) still parses but must not be transmitted.
-    e164: isValid ? parsed.number : null,
-    national: parsed.formatNational(),
-    international: parsed.formatInternational(),
-    country: parsed.country ?? region,
-    isValid
-  };
-}
-function toE164(raw, country) {
-  return parsePhone(raw, country).e164;
-}
-function formatPhone(value, format = "national", country) {
-  const parsed = parsePhone(value, country);
-  if (typeof format === "function") return format(parsed);
-  switch (format) {
-    case "international":
-      return parsed.international || value;
-    case "e164":
-      return parsed.e164 ?? value;
-    case "national":
-    default:
-      return parsed.national || value;
-  }
-}
-function formatPhoneAsTyped(raw, country) {
-  return new import_libphonenumber_js.AsYouType(country ?? DEFAULT_PHONE_COUNTRY).input(raw ?? "");
-}
-
 // ../tracking-core/src/triggers/phone-click-capture.ts
 var DEFAULT_TEL_SELECTOR = 'a[href^="tel:"]';
 function safeDecodeURIComponent(value) {
@@ -2563,6 +2828,8 @@ async function salesRequest(config, method, path, body) {
 // ../tracking-core/src/resources/sales/client.ts
 function fireRecordedConversions(firing, input, recorded, sale, currency) {
   if (!firing) return;
+  const userData = input.customer_email || input.customer_phone ? { email: input.customer_email ?? null, phone: input.customer_phone ?? null } : null;
+  if (userData && getConsentState() !== "denied") stashUserData(userData);
   const txnBase = input.external_id ?? sale.id;
   for (const item of recorded) {
     if (!item.service) continue;
@@ -2577,12 +2844,15 @@ function fireRecordedConversions(firing, input, recorded, sale, currency) {
     const config = firing.getFiring(item.service);
     if (!config) continue;
     const cents = item.amount_cents ?? config.value_cents ?? null;
-    fireConversionWithConsent({
-      sendTo: config.send_to,
-      value: cents != null ? fromMinor(cents, currency) : null,
-      currency: config.currency ?? currency,
-      transactionId: `${txnBase}:${item.service}`
-    });
+    fireConversionWithConsent(
+      {
+        sendTo: config.send_to,
+        value: cents != null ? fromMinor(cents, currency) : null,
+        currency: config.currency ?? currency,
+        transactionId: `${txnBase}:${item.service}`
+      },
+      { userData }
+    );
   }
 }
 function createSalesClient(config) {
@@ -2617,6 +2887,7 @@ function createSalesClient(config) {
     recordSale: record,
     trackConversion(key, options) {
       if (config.firing && "fireConversion" in config.firing) {
+        if (options?.userData && getConsentState() !== "denied") stashUserData(options.userData);
         config.firing.fireConversion(key, {
           value: options?.value ?? void 0,
           currency: options?.currency ?? config.defaultCurrency ?? void 0,
@@ -2629,12 +2900,15 @@ function createSalesClient(config) {
       const currency = firing.currency ?? options?.currency ?? config.defaultCurrency ?? null;
       const cents = firing.value_cents ?? null;
       const value = options?.value ?? (cents != null && currency ? fromMinor(cents, currency) : null);
-      fireConversionWithConsent({
-        sendTo: firing.send_to,
-        value,
-        currency,
-        transactionId: options?.transactionId ?? null
-      });
+      fireConversionWithConsent(
+        {
+          sendTo: firing.send_to,
+          value,
+          currency,
+          transactionId: options?.transactionId ?? null
+        },
+        { userData: options?.userData }
+      );
     },
     async list(query) {
       const { cursor, limit, sort, order, want_total, ...filters } = query ?? {};
@@ -3144,7 +3418,7 @@ function AdPlatformTracking({
     if (!trackingConfig) return;
     const runtime = getTrackingConfigRuntime(trackingConfig);
     if (standalonePageView) runtime.queuePageView();
-    else void runtime.revalidate();
+    else runtime.start();
   }, [trackingConfigKey, standalonePageView]);
   const gtagAll = trackingConfig ? [] : gtagIds ? Object.values(gtagIds).filter((id) => id != null) : gtagId ? [gtagId] : [];
   const metaAll = metaPixelIds ? Object.values(metaPixelIds).filter((id) => id != null) : metaPixelId ? [metaPixelId] : [];
@@ -3196,7 +3470,7 @@ function GoogleAdsTracking(props) {
 var import_navigation3 = require("next/navigation");
 
 // package.json
-var version = "0.18.1";
+var version = "0.19.1";
 
 // src/factory.tsx
 var import_react5 = require("react");
@@ -3333,22 +3607,18 @@ function createTracking(options) {
   const timeOnSiteConfig = triggers.automatic.time_on_site ?? null;
   function TrackingProvider({ children }) {
     const pathname = (0, import_navigation3.usePathname)();
-    const client = (0, import_react5.useMemo)(
-      () => createTypedClient(
-        getOrCreateTrackingClient({
-          apiKey,
-          endpoint,
-          surface: "next",
-          packageName: "@aranova/tracking-next",
-          sdkVersion: version,
-          triggers,
-          environment,
-          activeGtagIds: gtagIds,
-          debug
-        }),
+    const rawClient = (0, import_react5.useMemo)(
+      () => getOrCreateTrackingClient({
+        apiKey,
+        endpoint,
+        surface: "next",
+        packageName: "@aranova/tracking-next",
+        sdkVersion: version,
         triggers,
-        { debug }
-      ),
+        environment,
+        activeGtagIds: gtagIds,
+        debug
+      }),
       []
     );
     const conversionStore = (0, import_react5.useMemo)(
@@ -3362,33 +3632,22 @@ function createTracking(options) {
       const autoFire = conversionStore ? createConversionAutoFire(conversionStore) : null;
       return (c) => autoFire ? withConversionAutoFire(c, autoFire) : c;
     }, [conversionStore]);
+    const client = (0, import_react5.useMemo)(
+      () => createTypedClient(wrapClient(rawClient), triggers, { debug }),
+      [rawClient, wrapClient]
+    );
+    (0, import_react5.useEffect)(() => {
+      if (trackingConfig && conversionStore && "start" in conversionStore) {
+        conversionStore.start();
+      }
+    }, [conversionStore]);
     const firePageView = (0, import_react5.useCallback)(() => {
-      const rawClient = getOrCreateTrackingClient({
-        apiKey,
-        endpoint,
-        surface: "next",
-        packageName: "@aranova/tracking-next",
-        triggers,
-        environment,
-        activeGtagIds: gtagIds,
-        debug
-      });
       fireManualPageView(wrapClient(rawClient));
       if (trackingConfig) getTrackingConfigRuntime(trackingConfig).queuePageView();
-    }, [wrapClient]);
+    }, [rawClient, wrapClient]);
     const firedPagesRef = (0, import_react5.useRef)(/* @__PURE__ */ new Set());
     (0, import_react5.useEffect)(() => {
       if (!specificPageVisitConfig || pathname === null) return;
-      const rawClient = getOrCreateTrackingClient({
-        apiKey,
-        endpoint,
-        surface: "next",
-        packageName: "@aranova/tracking-next",
-        triggers,
-        environment,
-        activeGtagIds: gtagIds,
-        debug
-      });
       const detectorClient = wrapClient(rawClient);
       for (const { name, pathPattern } of specificPageVisitConfig.pages) {
         if (!pathPattern.test(pathname)) continue;
@@ -3405,7 +3664,7 @@ function createTracking(options) {
           occurredAt: null
         });
       }
-    }, [pathname]);
+    }, [pathname, rawClient, wrapClient]);
     const multiPageSessionConfig = triggers.automatic.multi_page_session ?? null;
     const mpsLastPathRef = (0, import_react5.useRef)(null);
     (0, import_react5.useEffect)(() => {
@@ -3431,17 +3690,6 @@ function createTracking(options) {
         store.setItem(MPS_PATHS_KEY, JSON.stringify([...paths]));
         if (paths.size >= multiPageSessionConfig.pageThreshold) {
           store.setItem(MPS_FIRED_KEY, "1");
-          const rawClient = getOrCreateTrackingClient({
-            apiKey,
-            endpoint,
-            surface: "next",
-            packageName: "@aranova/tracking-next",
-            sdkVersion: version,
-            triggers,
-            environment,
-            activeGtagIds: gtagIds,
-            debug
-          });
           wrapClient(rawClient).trackEvent({
             eventType: "multi_page_session",
             metadata: {
@@ -3454,18 +3702,8 @@ function createTracking(options) {
         }
       } catch {
       }
-    }, [pathname]);
+    }, [multiPageSessionConfig, pathname, rawClient, wrapClient]);
     (0, import_react5.useEffect)(() => {
-      const rawClient = getOrCreateTrackingClient({
-        apiKey,
-        endpoint,
-        surface: "next",
-        packageName: "@aranova/tracking-next",
-        triggers,
-        environment,
-        activeGtagIds: gtagIds,
-        debug
-      });
       return attachClientCapturesOnce(rawClient, () => {
         const detachers = [];
         const detectorClient = wrapClient(rawClient);
@@ -3496,7 +3734,7 @@ function createTracking(options) {
           }
         };
       });
-    }, []);
+    }, [rawClient, wrapClient]);
     return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(TrackingContext.Provider, { value: client, children: [
       /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(import_react5.Suspense, { fallback: null, children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(PageViewTracker, { fire: firePageView }) }),
       /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(PhoneConfigProvider, { value: phone ?? null, children })
@@ -3528,6 +3766,7 @@ function createTracking(options) {
   TRACKING_PARAM_KEYS,
   TRACKING_RANGES,
   captureTrackingParamsFromLocation,
+  clearStashedUserData,
   createSalesClient,
   createTracking,
   createTrackingClientContext,
@@ -3556,6 +3795,7 @@ function createTracking(options) {
   saleUpdateSchema,
   salesRequest,
   setConsentState,
+  stashUserData,
   toE164,
   toMinor,
   useConsent,