@aranova/tracking-next 0.18.1 → 0.19.0

package/dist/index.mjs

@@ -1,3 +1,137 @@
+// ../tracking-core/src/phone.ts
+import { AsYouType, parsePhoneNumberFromString } from "libphonenumber-js";
+var DEFAULT_PHONE_COUNTRY = "CA";
+function parsePhone(raw, country) {
+  const region = country ?? DEFAULT_PHONE_COUNTRY;
+  const parsed = 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 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";
@@ -83,6 +217,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() {
@@ -121,6 +262,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",
@@ -131,6 +277,8 @@ var TRACKING_PARAM_KEYS = [
 function createEmptyTrackingParams() {
   return {
     gclid: null,
+    wbraid: null,
+    gbraid: null,
     fbclid: null,
     utm_source: null,
     utm_medium: null,
@@ -433,6 +581,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,
@@ -460,6 +610,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(),
@@ -481,6 +633,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(),
@@ -510,14 +664,12 @@ function markFired(input) {
   } catch {
   }
 }
-function fireOnce(input) {
+function fireConversionWithConsent(input, options) {
+  if (getConsentState() === "denied") return;
   if (alreadyFired(input)) return;
+  applyUserDataForConversion(options?.userData);
   if (fireGtagConversion(input)) markFired(input);
 }
-function fireConversionWithConsent(input) {
-  if (getConsentState() === "denied") return;
-  fireOnce(input);
-}
 
 // ../tracking-core/src/resources/conversion-config.ts
 function isStringMap(value) {
@@ -962,6 +1114,7 @@ var TrackingConfigRuntime = class {
       if (!firing || getConsentState() === "denied") continue;
       const currency = item.currency ?? firing.currency ?? null;
       const value = item.value ?? (firing.value_cents != null && currency ? fromMinor(firing.value_cents, currency) : null);
+      applyUserDataForConversion();
       fireGtagConversion({
         sendTo: firing.send_to,
         value,
@@ -1455,6 +1608,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(),
@@ -1501,6 +1656,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,
@@ -2329,46 +2491,6 @@ function attachCtaClickCapture(client, config) {
   };
 }
 
-// ../tracking-core/src/phone.ts
-import { AsYouType, parsePhoneNumberFromString } from "libphonenumber-js";
-var DEFAULT_PHONE_COUNTRY = "CA";
-function parsePhone(raw, country) {
-  const region = country ?? DEFAULT_PHONE_COUNTRY;
-  const parsed = 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 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) {
@@ -2478,6 +2600,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;
@@ -2492,12 +2616,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) {
@@ -2532,6 +2659,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,
@@ -2544,12 +2672,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 ?? {};
@@ -3111,7 +3242,7 @@ function GoogleAdsTracking(props) {
 import { usePathname, useSearchParams } from "next/navigation";
 
 // package.json
-var version = "0.18.1";
+var version = "0.19.0";
 
 // src/factory.tsx
 import {
@@ -3457,6 +3588,7 @@ export {
   TRACKING_PARAM_KEYS,
   TRACKING_RANGES,
   captureTrackingParamsFromLocation,
+  clearStashedUserData,
   createSalesClient,
   createTracking,
   createTrackingClientContext,
@@ -3485,6 +3617,7 @@ export {
   saleUpdateSchema,
   salesRequest,
   setConsentState,
+  stashUserData,
   toE164,
   toMinor,
   useConsent,