@blotoutio/providers-google-ads-clicks-sdk 1.68.1 → 1.69.0

package/index.cjs.js

@@ -596,6 +596,18 @@ new Set([
 ]);
 
 const packageName = 'googleAdsClicks';
+/**
+ * The browser and server must send the exact same transactionId for Google to
+ * deduplicate the pair, so both the SDK and the edge derive it here — order id
+ * when there is one, else the shared event id — and can never disagree.
+ *
+ * It is sent as-is, NOT truncated. v1 has always sent the raw order id, and a
+ * real order/event id sits well within Google's 64-char limit. Slicing to 64
+ * would both silently change v1's long ids and collapse two distinct ids that
+ * share a 64-char prefix onto the same dedup key (undercounting). A pathological
+ * over-64 id is better rejected visibly by Google than mangled into a collision.
+ */
+const buildTransactionId = (orderId, eventId) => (orderId === null || orderId === void 0 ? void 0 : orderId.toString()) || (eventId === null || eventId === void 0 ? void 0 : eventId.toString()) || '';
 
 const getGoogleConsent = (consentData) => {
     const gadsConsent = hasUserConsentForProvider(consentData, 'googleAdsClicks');
@@ -610,7 +622,7 @@ const getIdentifierValue = (identifier, contentItem) => {
     if (!contentItem) {
         return identifierValue;
     }
-    identifierValue = identifierValue.replaceAll('{productId}', contentItem.id);
+    identifierValue = identifierValue.replaceAll('{productId}', contentItem.id || '');
     identifierValue = identifierValue.replaceAll('{variantId}', contentItem.variantId || '');
     identifierValue = identifierValue.replaceAll('{sku}', contentItem.sku || '');
     return identifierValue;
@@ -624,7 +636,19 @@ const getConversionLabel = (eventName, manifestVariables) => {
     const mapping = mappings.find((mappingItem) => mappingItem.eventName === eventName);
     return mapping === null || mapping === void 0 ? void 0 : mapping.browserConversionLabel;
 };
-const getEventData = (data, isNewCustomer) => {
+/**
+ * Builds the gtag conversion payload.
+ *
+ * `eventId` matters on v2 only. There, the server sends the same conversion to
+ * the same conversion action, and Google deduplicates the pair on
+ * `transaction_id` — so every conversion needs one. Purchases have an order id;
+ * Lead, SignUp and AddToCart don't, and without a fallback those would count
+ * twice. `eventId` is the same value the edge sees on `payload.eventId`, so both
+ * sides agree. On v1 there is no eventId fallback — it keeps the raw order id
+ * exactly as before the migration, since v1 has no server counterpart to dedupe
+ * against.
+ */
+const getEventData = (data, isNewCustomer, eventId) => {
     const eventData = {};
     if (!data) {
         return eventData;
@@ -635,7 +659,19 @@ const getEventData = (data, isNewCustomer) => {
     if (data['currency']) {
         eventData.currency = data['currency'];
     }
-    if (data['orderId']) {
+    // `eventId` is passed only on v2 (see tag.ts: `isDataManager ? eventId :
+    // undefined`), so its presence marks the v2 path.
+    if (eventId !== undefined) {
+        // v2: same derivation as the edge (buildTransactionId), sent as-is, so the
+        // browser and server dedup keys are always byte-identical.
+        const transactionId = buildTransactionId(data['orderId'], eventId);
+        if (transactionId) {
+            eventData.transaction_id = transactionId;
+        }
+    }
+    else if (data['orderId']) {
+        // v1 unchanged: the raw order id exactly as before the migration — no
+        // stringify, no eventId fallback — so the dark launch stays v1-identical.
         eventData.transaction_id = data['orderId'];
     }
     if (typeof isNewCustomer === 'boolean') {
@@ -872,7 +908,7 @@ const initGAds = (ID, consentData, executionContext, consentSkip, sdkUrl) => {
     }
 };
 const init = ({ manifest, consentData, executionContext, pageUrl, }) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const shouldLoadSDK = ((_a = manifest === null || manifest === void 0 ? void 0 : manifest.variables) === null || _a === void 0 ? void 0 : _a['loadSDK']) === '1' ||
         ((_b = manifest === null || manifest === void 0 ? void 0 : manifest.variables) === null || _b === void 0 ? void 0 : _b['dynamicRemarketingEnabled']) === '1';
     if (typeof window === 'undefined' ||
@@ -887,7 +923,9 @@ const init = ({ manifest, consentData, executionContext, pageUrl, }) => {
     if (resolvedPageUrl) {
         customConfig['page_location'] = resolvedPageUrl;
     }
-    if (((_e = manifest.variables) === null || _e === void 0 ? void 0 : _e['enhancedConversionsSetting']) === 'gtag') {
+    // v2 always drives enhanced conversions through gtag, so it needs this too.
+    if (((_e = manifest.variables) === null || _e === void 0 ? void 0 : _e['apiVersion']) === '2' ||
+        ((_f = manifest.variables) === null || _f === void 0 ? void 0 : _f['enhancedConversionsSetting']) === 'gtag') {
         customConfig['allow_enhanced_conversions'] = true;
     }
     window.dataLayer = window.dataLayer || [];
@@ -899,7 +937,7 @@ const init = ({ manifest, consentData, executionContext, pageUrl, }) => {
             };
     if (!window.google_tag_manager ||
         !window.google_tag_manager[manifest.variables['tagId']]) {
-        initGAds(manifest.variables['tagId'], consentData, executionContext, (_f = manifest.variables) === null || _f === void 0 ? void 0 : _f['consentSkip'], (_g = manifest.variables) === null || _g === void 0 ? void 0 : _g['sdkUrl']);
+        initGAds(manifest.variables['tagId'], consentData, executionContext, (_g = manifest.variables) === null || _g === void 0 ? void 0 : _g['consentSkip'], (_h = manifest.variables) === null || _h === void 0 ? void 0 : _h['sdkUrl']);
     }
     if (window.gtag) {
         window.gtag('config', manifest.variables['tagId'], customConfig);
@@ -964,11 +1002,11 @@ const getIsNewCustomerFromBrowser = (destination) => {
     return isNewCustomer ? isNewCustomer === 'true' : undefined;
 };
 
-const tag = ({ data, eventName, manifestVariables, destination, pageUrl, getEdgeData, }) => {
+const tag = ({ data, eventName, eventId, manifestVariables, destination, pageUrl, getEdgeData, }) => {
     var _a, _b;
     const result = {
         isFired: false,
-        sdkVersion: "1.68.1" ,
+        sdkVersion: "1.69.0" ,
     };
     const tagId = manifestVariables === null || manifestVariables === void 0 ? void 0 : manifestVariables['tagId'];
     if (!eventName || !window.gtag || !tagId) {
@@ -986,14 +1024,23 @@ const tag = ({ data, eventName, manifestVariables, destination, pageUrl, getEdge
     if ((manifestVariables === null || manifestVariables === void 0 ? void 0 : manifestVariables['loadSDK']) === '1') {
         const conversionLabel = getConversionLabel(eventName, manifestVariables);
         if (conversionLabel) {
-            if (manifestVariables['enhancedConversionsSetting'] === 'gtag' &&
+            const isDataManager = manifestVariables['apiVersion'] === '2';
+            /*
+             * On v2 the browser is the primary source of user data: Google now accepts
+             * user-provided data from the tag, Data Manager and the API at once, so
+             * there is no adjustment upload to attach it server-side. Consent is
+             * handled by Consent Mode — `init` sets ad_user_data/ad_personalization
+             * from the user's consent, and gtag withholds user data when they're denied.
+             */
+            if ((isDataManager ||
+                manifestVariables['enhancedConversionsSetting'] === 'gtag') &&
                 destination) {
                 window.gtag('set', 'user_data', getUserData(destination));
             }
             const cartData = getCartData(manifestVariables, data);
             const fireConversion = (isNewCustomer) => {
                 var _a;
-                const eventData = getEventData(data, isNewCustomer);
+                const eventData = getEventData(data, isNewCustomer, isDataManager ? eventId : undefined);
                 const conversionPayload = {
                     send_to: conversionLabel,
                     ...eventData,

package/index.js

@@ -597,6 +597,18 @@ var ProvidersGoogleAdsClicksSdk = (function () {
     ]);
 
     const packageName = 'googleAdsClicks';
+    /**
+     * The browser and server must send the exact same transactionId for Google to
+     * deduplicate the pair, so both the SDK and the edge derive it here — order id
+     * when there is one, else the shared event id — and can never disagree.
+     *
+     * It is sent as-is, NOT truncated. v1 has always sent the raw order id, and a
+     * real order/event id sits well within Google's 64-char limit. Slicing to 64
+     * would both silently change v1's long ids and collapse two distinct ids that
+     * share a 64-char prefix onto the same dedup key (undercounting). A pathological
+     * over-64 id is better rejected visibly by Google than mangled into a collision.
+     */
+    const buildTransactionId = (orderId, eventId) => (orderId === null || orderId === void 0 ? void 0 : orderId.toString()) || (eventId === null || eventId === void 0 ? void 0 : eventId.toString()) || '';
 
     const getGoogleConsent = (consentData) => {
         const gadsConsent = hasUserConsentForProvider(consentData, 'googleAdsClicks');
@@ -611,7 +623,7 @@ var ProvidersGoogleAdsClicksSdk = (function () {
         if (!contentItem) {
             return identifierValue;
         }
-        identifierValue = identifierValue.replaceAll('{productId}', contentItem.id);
+        identifierValue = identifierValue.replaceAll('{productId}', contentItem.id || '');
         identifierValue = identifierValue.replaceAll('{variantId}', contentItem.variantId || '');
         identifierValue = identifierValue.replaceAll('{sku}', contentItem.sku || '');
         return identifierValue;
@@ -625,7 +637,19 @@ var ProvidersGoogleAdsClicksSdk = (function () {
         const mapping = mappings.find((mappingItem) => mappingItem.eventName === eventName);
         return mapping === null || mapping === void 0 ? void 0 : mapping.browserConversionLabel;
     };
-    const getEventData = (data, isNewCustomer) => {
+    /**
+     * Builds the gtag conversion payload.
+     *
+     * `eventId` matters on v2 only. There, the server sends the same conversion to
+     * the same conversion action, and Google deduplicates the pair on
+     * `transaction_id` — so every conversion needs one. Purchases have an order id;
+     * Lead, SignUp and AddToCart don't, and without a fallback those would count
+     * twice. `eventId` is the same value the edge sees on `payload.eventId`, so both
+     * sides agree. On v1 there is no eventId fallback — it keeps the raw order id
+     * exactly as before the migration, since v1 has no server counterpart to dedupe
+     * against.
+     */
+    const getEventData = (data, isNewCustomer, eventId) => {
         const eventData = {};
         if (!data) {
             return eventData;
@@ -636,7 +660,19 @@ var ProvidersGoogleAdsClicksSdk = (function () {
         if (data['currency']) {
             eventData.currency = data['currency'];
         }
-        if (data['orderId']) {
+        // `eventId` is passed only on v2 (see tag.ts: `isDataManager ? eventId :
+        // undefined`), so its presence marks the v2 path.
+        if (eventId !== undefined) {
+            // v2: same derivation as the edge (buildTransactionId), sent as-is, so the
+            // browser and server dedup keys are always byte-identical.
+            const transactionId = buildTransactionId(data['orderId'], eventId);
+            if (transactionId) {
+                eventData.transaction_id = transactionId;
+            }
+        }
+        else if (data['orderId']) {
+            // v1 unchanged: the raw order id exactly as before the migration — no
+            // stringify, no eventId fallback — so the dark launch stays v1-identical.
             eventData.transaction_id = data['orderId'];
         }
         if (typeof isNewCustomer === 'boolean') {
@@ -873,7 +909,7 @@ var ProvidersGoogleAdsClicksSdk = (function () {
         }
     };
     const init = ({ manifest, consentData, executionContext, pageUrl, }) => {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const shouldLoadSDK = ((_a = manifest === null || manifest === void 0 ? void 0 : manifest.variables) === null || _a === void 0 ? void 0 : _a['loadSDK']) === '1' ||
             ((_b = manifest === null || manifest === void 0 ? void 0 : manifest.variables) === null || _b === void 0 ? void 0 : _b['dynamicRemarketingEnabled']) === '1';
         if (typeof window === 'undefined' ||
@@ -888,7 +924,9 @@ var ProvidersGoogleAdsClicksSdk = (function () {
         if (resolvedPageUrl) {
             customConfig['page_location'] = resolvedPageUrl;
         }
-        if (((_e = manifest.variables) === null || _e === void 0 ? void 0 : _e['enhancedConversionsSetting']) === 'gtag') {
+        // v2 always drives enhanced conversions through gtag, so it needs this too.
+        if (((_e = manifest.variables) === null || _e === void 0 ? void 0 : _e['apiVersion']) === '2' ||
+            ((_f = manifest.variables) === null || _f === void 0 ? void 0 : _f['enhancedConversionsSetting']) === 'gtag') {
             customConfig['allow_enhanced_conversions'] = true;
         }
         window.dataLayer = window.dataLayer || [];
@@ -900,7 +938,7 @@ var ProvidersGoogleAdsClicksSdk = (function () {
                 };
         if (!window.google_tag_manager ||
             !window.google_tag_manager[manifest.variables['tagId']]) {
-            initGAds(manifest.variables['tagId'], consentData, executionContext, (_f = manifest.variables) === null || _f === void 0 ? void 0 : _f['consentSkip'], (_g = manifest.variables) === null || _g === void 0 ? void 0 : _g['sdkUrl']);
+            initGAds(manifest.variables['tagId'], consentData, executionContext, (_g = manifest.variables) === null || _g === void 0 ? void 0 : _g['consentSkip'], (_h = manifest.variables) === null || _h === void 0 ? void 0 : _h['sdkUrl']);
         }
         if (window.gtag) {
             window.gtag('config', manifest.variables['tagId'], customConfig);
@@ -965,11 +1003,11 @@ var ProvidersGoogleAdsClicksSdk = (function () {
         return isNewCustomer ? isNewCustomer === 'true' : undefined;
     };
 
-    const tag = ({ data, eventName, manifestVariables, destination, pageUrl, getEdgeData, }) => {
+    const tag = ({ data, eventName, eventId, manifestVariables, destination, pageUrl, getEdgeData, }) => {
         var _a, _b;
         const result = {
             isFired: false,
-            sdkVersion: "1.68.1" ,
+            sdkVersion: "1.69.0" ,
         };
         const tagId = manifestVariables === null || manifestVariables === void 0 ? void 0 : manifestVariables['tagId'];
         if (!eventName || !window.gtag || !tagId) {
@@ -987,14 +1025,23 @@ var ProvidersGoogleAdsClicksSdk = (function () {
         if ((manifestVariables === null || manifestVariables === void 0 ? void 0 : manifestVariables['loadSDK']) === '1') {
             const conversionLabel = getConversionLabel(eventName, manifestVariables);
             if (conversionLabel) {
-                if (manifestVariables['enhancedConversionsSetting'] === 'gtag' &&
+                const isDataManager = manifestVariables['apiVersion'] === '2';
+                /*
+                 * On v2 the browser is the primary source of user data: Google now accepts
+                 * user-provided data from the tag, Data Manager and the API at once, so
+                 * there is no adjustment upload to attach it server-side. Consent is
+                 * handled by Consent Mode — `init` sets ad_user_data/ad_personalization
+                 * from the user's consent, and gtag withholds user data when they're denied.
+                 */
+                if ((isDataManager ||
+                    manifestVariables['enhancedConversionsSetting'] === 'gtag') &&
                     destination) {
                     window.gtag('set', 'user_data', getUserData(destination));
                 }
                 const cartData = getCartData(manifestVariables, data);
                 const fireConversion = (isNewCustomer) => {
                     var _a;
-                    const eventData = getEventData(data, isNewCustomer);
+                    const eventData = getEventData(data, isNewCustomer, isDataManager ? eventId : undefined);
                     const conversionPayload = {
                         send_to: conversionLabel,
                         ...eventData,

package/index.mjs

@@ -594,6 +594,18 @@ new Set([
 ]);
 
 const packageName = 'googleAdsClicks';
+/**
+ * The browser and server must send the exact same transactionId for Google to
+ * deduplicate the pair, so both the SDK and the edge derive it here — order id
+ * when there is one, else the shared event id — and can never disagree.
+ *
+ * It is sent as-is, NOT truncated. v1 has always sent the raw order id, and a
+ * real order/event id sits well within Google's 64-char limit. Slicing to 64
+ * would both silently change v1's long ids and collapse two distinct ids that
+ * share a 64-char prefix onto the same dedup key (undercounting). A pathological
+ * over-64 id is better rejected visibly by Google than mangled into a collision.
+ */
+const buildTransactionId = (orderId, eventId) => (orderId === null || orderId === void 0 ? void 0 : orderId.toString()) || (eventId === null || eventId === void 0 ? void 0 : eventId.toString()) || '';
 
 const getGoogleConsent = (consentData) => {
     const gadsConsent = hasUserConsentForProvider(consentData, 'googleAdsClicks');
@@ -608,7 +620,7 @@ const getIdentifierValue = (identifier, contentItem) => {
     if (!contentItem) {
         return identifierValue;
     }
-    identifierValue = identifierValue.replaceAll('{productId}', contentItem.id);
+    identifierValue = identifierValue.replaceAll('{productId}', contentItem.id || '');
     identifierValue = identifierValue.replaceAll('{variantId}', contentItem.variantId || '');
     identifierValue = identifierValue.replaceAll('{sku}', contentItem.sku || '');
     return identifierValue;
@@ -622,7 +634,19 @@ const getConversionLabel = (eventName, manifestVariables) => {
     const mapping = mappings.find((mappingItem) => mappingItem.eventName === eventName);
     return mapping === null || mapping === void 0 ? void 0 : mapping.browserConversionLabel;
 };
-const getEventData = (data, isNewCustomer) => {
+/**
+ * Builds the gtag conversion payload.
+ *
+ * `eventId` matters on v2 only. There, the server sends the same conversion to
+ * the same conversion action, and Google deduplicates the pair on
+ * `transaction_id` — so every conversion needs one. Purchases have an order id;
+ * Lead, SignUp and AddToCart don't, and without a fallback those would count
+ * twice. `eventId` is the same value the edge sees on `payload.eventId`, so both
+ * sides agree. On v1 there is no eventId fallback — it keeps the raw order id
+ * exactly as before the migration, since v1 has no server counterpart to dedupe
+ * against.
+ */
+const getEventData = (data, isNewCustomer, eventId) => {
     const eventData = {};
     if (!data) {
         return eventData;
@@ -633,7 +657,19 @@ const getEventData = (data, isNewCustomer) => {
     if (data['currency']) {
         eventData.currency = data['currency'];
     }
-    if (data['orderId']) {
+    // `eventId` is passed only on v2 (see tag.ts: `isDataManager ? eventId :
+    // undefined`), so its presence marks the v2 path.
+    if (eventId !== undefined) {
+        // v2: same derivation as the edge (buildTransactionId), sent as-is, so the
+        // browser and server dedup keys are always byte-identical.
+        const transactionId = buildTransactionId(data['orderId'], eventId);
+        if (transactionId) {
+            eventData.transaction_id = transactionId;
+        }
+    }
+    else if (data['orderId']) {
+        // v1 unchanged: the raw order id exactly as before the migration — no
+        // stringify, no eventId fallback — so the dark launch stays v1-identical.
         eventData.transaction_id = data['orderId'];
     }
     if (typeof isNewCustomer === 'boolean') {
@@ -870,7 +906,7 @@ const initGAds = (ID, consentData, executionContext, consentSkip, sdkUrl) => {
     }
 };
 const init = ({ manifest, consentData, executionContext, pageUrl, }) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const shouldLoadSDK = ((_a = manifest === null || manifest === void 0 ? void 0 : manifest.variables) === null || _a === void 0 ? void 0 : _a['loadSDK']) === '1' ||
         ((_b = manifest === null || manifest === void 0 ? void 0 : manifest.variables) === null || _b === void 0 ? void 0 : _b['dynamicRemarketingEnabled']) === '1';
     if (typeof window === 'undefined' ||
@@ -885,7 +921,9 @@ const init = ({ manifest, consentData, executionContext, pageUrl, }) => {
     if (resolvedPageUrl) {
         customConfig['page_location'] = resolvedPageUrl;
     }
-    if (((_e = manifest.variables) === null || _e === void 0 ? void 0 : _e['enhancedConversionsSetting']) === 'gtag') {
+    // v2 always drives enhanced conversions through gtag, so it needs this too.
+    if (((_e = manifest.variables) === null || _e === void 0 ? void 0 : _e['apiVersion']) === '2' ||
+        ((_f = manifest.variables) === null || _f === void 0 ? void 0 : _f['enhancedConversionsSetting']) === 'gtag') {
         customConfig['allow_enhanced_conversions'] = true;
     }
     window.dataLayer = window.dataLayer || [];
@@ -897,7 +935,7 @@ const init = ({ manifest, consentData, executionContext, pageUrl, }) => {
             };
     if (!window.google_tag_manager ||
         !window.google_tag_manager[manifest.variables['tagId']]) {
-        initGAds(manifest.variables['tagId'], consentData, executionContext, (_f = manifest.variables) === null || _f === void 0 ? void 0 : _f['consentSkip'], (_g = manifest.variables) === null || _g === void 0 ? void 0 : _g['sdkUrl']);
+        initGAds(manifest.variables['tagId'], consentData, executionContext, (_g = manifest.variables) === null || _g === void 0 ? void 0 : _g['consentSkip'], (_h = manifest.variables) === null || _h === void 0 ? void 0 : _h['sdkUrl']);
     }
     if (window.gtag) {
         window.gtag('config', manifest.variables['tagId'], customConfig);
@@ -962,11 +1000,11 @@ const getIsNewCustomerFromBrowser = (destination) => {
     return isNewCustomer ? isNewCustomer === 'true' : undefined;
 };
 
-const tag = ({ data, eventName, manifestVariables, destination, pageUrl, getEdgeData, }) => {
+const tag = ({ data, eventName, eventId, manifestVariables, destination, pageUrl, getEdgeData, }) => {
     var _a, _b;
     const result = {
         isFired: false,
-        sdkVersion: "1.68.1" ,
+        sdkVersion: "1.69.0" ,
     };
     const tagId = manifestVariables === null || manifestVariables === void 0 ? void 0 : manifestVariables['tagId'];
     if (!eventName || !window.gtag || !tagId) {
@@ -984,14 +1022,23 @@ const tag = ({ data, eventName, manifestVariables, destination, pageUrl, getEdge
     if ((manifestVariables === null || manifestVariables === void 0 ? void 0 : manifestVariables['loadSDK']) === '1') {
         const conversionLabel = getConversionLabel(eventName, manifestVariables);
         if (conversionLabel) {
-            if (manifestVariables['enhancedConversionsSetting'] === 'gtag' &&
+            const isDataManager = manifestVariables['apiVersion'] === '2';
+            /*
+             * On v2 the browser is the primary source of user data: Google now accepts
+             * user-provided data from the tag, Data Manager and the API at once, so
+             * there is no adjustment upload to attach it server-side. Consent is
+             * handled by Consent Mode — `init` sets ad_user_data/ad_personalization
+             * from the user's consent, and gtag withholds user data when they're denied.
+             */
+            if ((isDataManager ||
+                manifestVariables['enhancedConversionsSetting'] === 'gtag') &&
                 destination) {
                 window.gtag('set', 'user_data', getUserData(destination));
             }
             const cartData = getCartData(manifestVariables, data);
             const fireConversion = (isNewCustomer) => {
                 var _a;
-                const eventData = getEventData(data, isNewCustomer);
+                const eventData = getEventData(data, isNewCustomer, isDataManager ? eventId : undefined);
                 const conversionPayload = {
                     send_to: conversionLabel,
                     ...eventData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blotoutio/providers-google-ads-clicks-sdk",
-  "version": "1.68.1",
+  "version": "1.69.0",
   "description": "Google Ads Browser SDK for EdgeTag",
   "author": "Blotout",
   "license": "MIT",