@jitsu/js 1.10.2 → 1.10.4

package/dist/jitsu-no-ext.cjs.js

@@ -651,7 +651,7 @@ const defaultConfig = {
         dontSend: false,
         disableUserIds: false,
         ipPolicy: "keep",
-        consentCategories: undefined,
+        consentCategories: {},
     },
 };
 // mergeConfig merges newConfig into currentConfig also making sure that all undefined values are replaced with defaultConfig values
@@ -660,11 +660,14 @@ const mergeConfig = (current, newConfig) => {
         const value = newConfig[key];
         if (key === "privacy") {
             if (typeof value === "object") {
-                current.privacy = Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), current.privacy), value);
+                current.privacy = Object.assign(Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) }), current.privacy), value);
             }
-            else if (newConfig.hasOwnProperty("privacy") && typeof value === "undefined") {
-                // explicitly set to undefined - reset to default
-                current.privacy = Object.assign({}, defaultConfig.privacy);
+            else if (typeof value === "undefined") {
+                if (newConfig.hasOwnProperty("privacy") || !current.hasOwnProperty("privacy")) {
+                    // explicitly set to undefined - reset to default
+                    // or was not set at all - set to default
+                    current.privacy = Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) });
+                }
             }
         }
         else if (typeof value === "undefined") {
@@ -739,6 +742,19 @@ function getClientIds(runtime, customCookieCapture) {
     }, {});
     return Object.assign(Object.assign({}, clientIds), getGa4Ids(runtime));
 }
+function parseGa4SessionId(cookieValue) {
+    if (typeof cookieValue !== "string") {
+        return undefined;
+    }
+    if (cookieValue.startsWith("GA1") || cookieValue.startsWith("GS1")) {
+        return cookieValue.split(".")[2];
+    }
+    else {
+        // parse new GA4 cookie format, e.g.: GS2.1.s1747323152$o28$g0$t1747323152$j60$l0$h69286059
+        const match = cookieValue.match(/^GS\d+\.\d+\.(?:[\w_-]+[$])*s(\d+)(?:$|[$])/);
+        return match ? match[1] : undefined;
+    }
+}
 function getGa4Ids(runtime) {
     var _a;
     const allCookies = runtime.getCookies();
@@ -747,14 +763,11 @@ function getGa4Ids(runtime) {
     const sessionIds = gaSessionCookies.length > 0
         ? Object.fromEntries(gaSessionCookies
             .map(([key, value]) => {
-            if (typeof value !== "string") {
-                return null;
-            }
-            const parts = value.split(".");
-            if (parts.length < 3) {
+            const sessionId = parseGa4SessionId(value);
+            if (!sessionId) {
                 return null;
             }
-            return [key.substring("_ga_".length), parts[2]];
+            return [key.substring("_ga_".length), sessionId];
         })
             .filter(v => v !== null))
         : undefined;
@@ -978,6 +991,15 @@ const emptyRuntime = (config) => ({
         return undefined;
     },
 });
+function deepCopy(o) {
+    if (typeof o !== "object") {
+        return o;
+    }
+    if (!o) {
+        return o;
+    }
+    return JSON.parse(JSON.stringify(o));
+}
 function deepMerge(target, source) {
     if (typeof source !== "object" || source === null) {
         return source;
@@ -1014,17 +1036,46 @@ function urlPath(url) {
     const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
     return "/" + pathMatch;
 }
+function canonicalUrl() {
+    if (!isInBrowser())
+        return;
+    const tags = document.getElementsByTagName("link");
+    for (var i = 0, tag; (tag = tags[i]); i++) {
+        if (tag.getAttribute("rel") === "canonical") {
+            return tag.getAttribute("href");
+        }
+    }
+}
+/**
+ * bugged analytics.js logic that produces 'url' parameter by concating canonical URL with current search part
+ * I produces broken results in some cases like SPA where path is changed but canonical URL is not updated
+ */
+function analyticsJsUrl() {
+    if (!isInBrowser())
+        return;
+    const canonical = canonicalUrl();
+    if (!canonical)
+        return window.location.href.replace(hashRegex, "");
+    return canonical.match(/\?/) ? canonical : canonical + window.location.search;
+}
 function adjustPayload(payload, config, storage, s2s) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
     const url = runtime.pageUrl();
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
     const properties = payload.properties || {};
     if (payload.type === "page" && (properties.url || url)) {
-        const targetUrl = properties.url || url;
+        // we don't trust analytics.js URL logic since it's sticks with canonical URL on SPA pages
+        let targetUrl = url || properties.url;
+        if (properties.url && properties.url !== analyticsJsUrl()) {
+            // properties.url is not the same as provided by analytics.js
+            // it means that it was not overridden by user and we should use it
+            targetUrl = properties.url;
+        }
         properties.url = targetUrl.replace(hashRegex, "");
         properties.path = fixPath(urlPath(targetUrl));
+        // other properties are correctly based on window.location in analytics.js
     }
     const customContext = deepMerge(config.defaultPayloadContext, ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || ((_b = payload.options) === null || _b === void 0 ? void 0 : _b.context) || {});
     (_c = payload.properties) === null || _c === void 0 ? true : delete _c.context;
@@ -1035,17 +1086,17 @@ function adjustPayload(payload, config, storage, s2s) {
             version: jitsuVersion,
             env: isInBrowser() ? "browser" : "node",
         },
-        consent: ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories)
+        consent: typeof ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories) === "object" && Object.keys((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.consentCategories).length
             ? {
                 categoryPreferences: config.privacy.consentCategories,
             }
             : undefined,
-        userAgent: (_e = runtime.userAgent) === null || _e === void 0 ? void 0 : _e.call(runtime),
-        locale: (_f = runtime.language) === null || _f === void 0 ? void 0 : _f.call(runtime),
-        screen: (_g = runtime.screen) === null || _g === void 0 ? void 0 : _g.call(runtime),
-        ip: (_h = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        userAgent: (_f = runtime.userAgent) === null || _f === void 0 ? void 0 : _f.call(runtime),
+        locale: (_g = runtime.language) === null || _g === void 0 ? void 0 : _g.call(runtime),
+        screen: (_h = runtime.screen) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        ip: (_j = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _j === void 0 ? void 0 : _j.call(runtime),
         traits: payload.type != "identify" && payload.type != "group"
-            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_j = payload === null || payload === void 0 ? void 0 : payload.options) === null || _j === void 0 ? void 0 : _j.traits) || {})) : undefined,
+            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_k = payload === null || payload === void 0 ? void 0 : payload.options) === null || _k === void 0 ? void 0 : _k.traits) || {})) : undefined,
         page: {
             path: properties.path || (parsedUrl && parsedUrl.pathname),
             referrer: referrer,
@@ -1056,13 +1107,13 @@ function adjustPayload(payload, config, storage, s2s) {
             url: properties.url || url,
             encoding: properties.encoding || runtime.documentEncoding(),
         },
-        clientIds: !((_k = config.privacy) === null || _k === void 0 ? void 0 : _k.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
+        clientIds: !((_l = config.privacy) === null || _l === void 0 ? void 0 : _l.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
         campaign: parseUtms(query),
     };
-    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_l = payload === null || payload === void 0 ? void 0 : payload.options) === null || _l === void 0 ? void 0 : _l.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
+    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_p = payload === null || payload === void 0 ? void 0 : payload.options) === null || _p === void 0 ? void 0 : _p.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
-    if ((_p = config.privacy) === null || _p === void 0 ? void 0 : _p.disableUserIds) {
+    if ((_q = config.privacy) === null || _q === void 0 ? void 0 : _q.disableUserIds) {
         delete withContext.userId;
         delete withContext.anonymousId;
         delete withContext.context.traits;
@@ -1078,15 +1129,18 @@ function processDestinations(destinations, method, originalEvent, debug, analyti
     return __awaiter$1(this, void 0, void 0, function* () {
         const promises = [];
         for (const destination of destinations) {
-            let newEvents = [originalEvent];
+            let newEvents = [];
             if (destination.newEvents) {
                 try {
-                    newEvents = destination.newEvents.map(e => e === "same" ? originalEvent : isDiff(e) ? diff.patch(originalEvent, e.__diff) : e);
+                    newEvents = destination.newEvents.map(e => e === "same" ? deepCopy(originalEvent) : isDiff(e) ? diff.patch(deepCopy(originalEvent), e.__diff) : e);
                 }
                 catch (e) {
                     console.error(`[JITSU] Error applying '${destination.id}' changes to event: ${e === null || e === void 0 ? void 0 : e.message}`, e);
                 }
             }
+            else {
+                newEvents = [deepCopy(originalEvent)];
+            }
             const credentials = Object.assign(Object.assign({}, destination.credentials), destination.options);
             if (destination.deviceOptions.type === "internal-plugin") {
                 const plugin = internalDestinationPlugins[destination.deviceOptions.name];
@@ -1494,6 +1548,9 @@ const emptyAnalytics = {
     group: () => Promise.resolve({}),
     reset: () => Promise.resolve({}),
     configure: () => { },
+    getConfiguration() {
+        return {};
+    },
 };
 function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
     var _a, _b, _c;
@@ -1646,6 +1703,9 @@ function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
                 //However, since returned values are used for debugging purposes only, it's ok
                 return results[0];
             });
+        },
+        getConfiguration() {
+            return opts;
         } });
     if (((_b = opts.privacy) === null || _b === void 0 ? void 0 : _b.disableUserIds) || ((_c = opts.privacy) === null || _c === void 0 ? void 0 : _c.dontSend)) {
         storage.reset();

package/dist/jitsu-no-ext.es.js

@@ -649,7 +649,7 @@ const defaultConfig = {
         dontSend: false,
         disableUserIds: false,
         ipPolicy: "keep",
-        consentCategories: undefined,
+        consentCategories: {},
     },
 };
 // mergeConfig merges newConfig into currentConfig also making sure that all undefined values are replaced with defaultConfig values
@@ -658,11 +658,14 @@ const mergeConfig = (current, newConfig) => {
         const value = newConfig[key];
         if (key === "privacy") {
             if (typeof value === "object") {
-                current.privacy = Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), current.privacy), value);
+                current.privacy = Object.assign(Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) }), current.privacy), value);
             }
-            else if (newConfig.hasOwnProperty("privacy") && typeof value === "undefined") {
-                // explicitly set to undefined - reset to default
-                current.privacy = Object.assign({}, defaultConfig.privacy);
+            else if (typeof value === "undefined") {
+                if (newConfig.hasOwnProperty("privacy") || !current.hasOwnProperty("privacy")) {
+                    // explicitly set to undefined - reset to default
+                    // or was not set at all - set to default
+                    current.privacy = Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) });
+                }
             }
         }
         else if (typeof value === "undefined") {
@@ -737,6 +740,19 @@ function getClientIds(runtime, customCookieCapture) {
     }, {});
     return Object.assign(Object.assign({}, clientIds), getGa4Ids(runtime));
 }
+function parseGa4SessionId(cookieValue) {
+    if (typeof cookieValue !== "string") {
+        return undefined;
+    }
+    if (cookieValue.startsWith("GA1") || cookieValue.startsWith("GS1")) {
+        return cookieValue.split(".")[2];
+    }
+    else {
+        // parse new GA4 cookie format, e.g.: GS2.1.s1747323152$o28$g0$t1747323152$j60$l0$h69286059
+        const match = cookieValue.match(/^GS\d+\.\d+\.(?:[\w_-]+[$])*s(\d+)(?:$|[$])/);
+        return match ? match[1] : undefined;
+    }
+}
 function getGa4Ids(runtime) {
     var _a;
     const allCookies = runtime.getCookies();
@@ -745,14 +761,11 @@ function getGa4Ids(runtime) {
     const sessionIds = gaSessionCookies.length > 0
         ? Object.fromEntries(gaSessionCookies
             .map(([key, value]) => {
-            if (typeof value !== "string") {
-                return null;
-            }
-            const parts = value.split(".");
-            if (parts.length < 3) {
+            const sessionId = parseGa4SessionId(value);
+            if (!sessionId) {
                 return null;
             }
-            return [key.substring("_ga_".length), parts[2]];
+            return [key.substring("_ga_".length), sessionId];
         })
             .filter(v => v !== null))
         : undefined;
@@ -976,6 +989,15 @@ const emptyRuntime = (config) => ({
         return undefined;
     },
 });
+function deepCopy(o) {
+    if (typeof o !== "object") {
+        return o;
+    }
+    if (!o) {
+        return o;
+    }
+    return JSON.parse(JSON.stringify(o));
+}
 function deepMerge(target, source) {
     if (typeof source !== "object" || source === null) {
         return source;
@@ -1012,17 +1034,46 @@ function urlPath(url) {
     const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
     return "/" + pathMatch;
 }
+function canonicalUrl() {
+    if (!isInBrowser())
+        return;
+    const tags = document.getElementsByTagName("link");
+    for (var i = 0, tag; (tag = tags[i]); i++) {
+        if (tag.getAttribute("rel") === "canonical") {
+            return tag.getAttribute("href");
+        }
+    }
+}
+/**
+ * bugged analytics.js logic that produces 'url' parameter by concating canonical URL with current search part
+ * I produces broken results in some cases like SPA where path is changed but canonical URL is not updated
+ */
+function analyticsJsUrl() {
+    if (!isInBrowser())
+        return;
+    const canonical = canonicalUrl();
+    if (!canonical)
+        return window.location.href.replace(hashRegex, "");
+    return canonical.match(/\?/) ? canonical : canonical + window.location.search;
+}
 function adjustPayload(payload, config, storage, s2s) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
     const url = runtime.pageUrl();
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
     const properties = payload.properties || {};
     if (payload.type === "page" && (properties.url || url)) {
-        const targetUrl = properties.url || url;
+        // we don't trust analytics.js URL logic since it's sticks with canonical URL on SPA pages
+        let targetUrl = url || properties.url;
+        if (properties.url && properties.url !== analyticsJsUrl()) {
+            // properties.url is not the same as provided by analytics.js
+            // it means that it was not overridden by user and we should use it
+            targetUrl = properties.url;
+        }
         properties.url = targetUrl.replace(hashRegex, "");
         properties.path = fixPath(urlPath(targetUrl));
+        // other properties are correctly based on window.location in analytics.js
     }
     const customContext = deepMerge(config.defaultPayloadContext, ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || ((_b = payload.options) === null || _b === void 0 ? void 0 : _b.context) || {});
     (_c = payload.properties) === null || _c === void 0 ? true : delete _c.context;
@@ -1033,17 +1084,17 @@ function adjustPayload(payload, config, storage, s2s) {
             version: jitsuVersion,
             env: isInBrowser() ? "browser" : "node",
         },
-        consent: ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories)
+        consent: typeof ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories) === "object" && Object.keys((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.consentCategories).length
             ? {
                 categoryPreferences: config.privacy.consentCategories,
             }
             : undefined,
-        userAgent: (_e = runtime.userAgent) === null || _e === void 0 ? void 0 : _e.call(runtime),
-        locale: (_f = runtime.language) === null || _f === void 0 ? void 0 : _f.call(runtime),
-        screen: (_g = runtime.screen) === null || _g === void 0 ? void 0 : _g.call(runtime),
-        ip: (_h = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        userAgent: (_f = runtime.userAgent) === null || _f === void 0 ? void 0 : _f.call(runtime),
+        locale: (_g = runtime.language) === null || _g === void 0 ? void 0 : _g.call(runtime),
+        screen: (_h = runtime.screen) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        ip: (_j = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _j === void 0 ? void 0 : _j.call(runtime),
         traits: payload.type != "identify" && payload.type != "group"
-            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_j = payload === null || payload === void 0 ? void 0 : payload.options) === null || _j === void 0 ? void 0 : _j.traits) || {})) : undefined,
+            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_k = payload === null || payload === void 0 ? void 0 : payload.options) === null || _k === void 0 ? void 0 : _k.traits) || {})) : undefined,
         page: {
             path: properties.path || (parsedUrl && parsedUrl.pathname),
             referrer: referrer,
@@ -1054,13 +1105,13 @@ function adjustPayload(payload, config, storage, s2s) {
             url: properties.url || url,
             encoding: properties.encoding || runtime.documentEncoding(),
         },
-        clientIds: !((_k = config.privacy) === null || _k === void 0 ? void 0 : _k.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
+        clientIds: !((_l = config.privacy) === null || _l === void 0 ? void 0 : _l.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
         campaign: parseUtms(query),
     };
-    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_l = payload === null || payload === void 0 ? void 0 : payload.options) === null || _l === void 0 ? void 0 : _l.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
+    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_p = payload === null || payload === void 0 ? void 0 : payload.options) === null || _p === void 0 ? void 0 : _p.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
-    if ((_p = config.privacy) === null || _p === void 0 ? void 0 : _p.disableUserIds) {
+    if ((_q = config.privacy) === null || _q === void 0 ? void 0 : _q.disableUserIds) {
         delete withContext.userId;
         delete withContext.anonymousId;
         delete withContext.context.traits;
@@ -1076,15 +1127,18 @@ function processDestinations(destinations, method, originalEvent, debug, analyti
     return __awaiter$1(this, void 0, void 0, function* () {
         const promises = [];
         for (const destination of destinations) {
-            let newEvents = [originalEvent];
+            let newEvents = [];
             if (destination.newEvents) {
                 try {
-                    newEvents = destination.newEvents.map(e => e === "same" ? originalEvent : isDiff(e) ? diff.patch(originalEvent, e.__diff) : e);
+                    newEvents = destination.newEvents.map(e => e === "same" ? deepCopy(originalEvent) : isDiff(e) ? diff.patch(deepCopy(originalEvent), e.__diff) : e);
                 }
                 catch (e) {
                     console.error(`[JITSU] Error applying '${destination.id}' changes to event: ${e === null || e === void 0 ? void 0 : e.message}`, e);
                 }
             }
+            else {
+                newEvents = [deepCopy(originalEvent)];
+            }
             const credentials = Object.assign(Object.assign({}, destination.credentials), destination.options);
             if (destination.deviceOptions.type === "internal-plugin") {
                 const plugin = internalDestinationPlugins[destination.deviceOptions.name];
@@ -1492,6 +1546,9 @@ const emptyAnalytics = {
     group: () => Promise.resolve({}),
     reset: () => Promise.resolve({}),
     configure: () => { },
+    getConfiguration() {
+        return {};
+    },
 };
 function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
     var _a, _b, _c;
@@ -1644,6 +1701,9 @@ function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
                 //However, since returned values are used for debugging purposes only, it's ok
                 return results[0];
             });
+        },
+        getConfiguration() {
+            return opts;
         } });
     if (((_b = opts.privacy) === null || _b === void 0 ? void 0 : _b.disableUserIds) || ((_c = opts.privacy) === null || _c === void 0 ? void 0 : _c.dontSend)) {
         storage.reset();

package/dist/jitsu.cjs.js

@@ -1073,7 +1073,7 @@ const defaultConfig = {
         dontSend: false,
         disableUserIds: false,
         ipPolicy: "keep",
-        consentCategories: undefined,
+        consentCategories: {},
     },
 };
 // mergeConfig merges newConfig into currentConfig also making sure that all undefined values are replaced with defaultConfig values
@@ -1082,11 +1082,14 @@ const mergeConfig = (current, newConfig) => {
         const value = newConfig[key];
         if (key === "privacy") {
             if (typeof value === "object") {
-                current.privacy = Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), current.privacy), value);
+                current.privacy = Object.assign(Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) }), current.privacy), value);
             }
-            else if (newConfig.hasOwnProperty("privacy") && typeof value === "undefined") {
-                // explicitly set to undefined - reset to default
-                current.privacy = Object.assign({}, defaultConfig.privacy);
+            else if (typeof value === "undefined") {
+                if (newConfig.hasOwnProperty("privacy") || !current.hasOwnProperty("privacy")) {
+                    // explicitly set to undefined - reset to default
+                    // or was not set at all - set to default
+                    current.privacy = Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) });
+                }
             }
         }
         else if (typeof value === "undefined") {
@@ -1161,6 +1164,19 @@ function getClientIds(runtime, customCookieCapture) {
     }, {});
     return Object.assign(Object.assign({}, clientIds), getGa4Ids(runtime));
 }
+function parseGa4SessionId(cookieValue) {
+    if (typeof cookieValue !== "string") {
+        return undefined;
+    }
+    if (cookieValue.startsWith("GA1") || cookieValue.startsWith("GS1")) {
+        return cookieValue.split(".")[2];
+    }
+    else {
+        // parse new GA4 cookie format, e.g.: GS2.1.s1747323152$o28$g0$t1747323152$j60$l0$h69286059
+        const match = cookieValue.match(/^GS\d+\.\d+\.(?:[\w_-]+[$])*s(\d+)(?:$|[$])/);
+        return match ? match[1] : undefined;
+    }
+}
 function getGa4Ids(runtime) {
     var _a;
     const allCookies = runtime.getCookies();
@@ -1169,14 +1185,11 @@ function getGa4Ids(runtime) {
     const sessionIds = gaSessionCookies.length > 0
         ? Object.fromEntries(gaSessionCookies
             .map(([key, value]) => {
-            if (typeof value !== "string") {
-                return null;
-            }
-            const parts = value.split(".");
-            if (parts.length < 3) {
+            const sessionId = parseGa4SessionId(value);
+            if (!sessionId) {
                 return null;
             }
-            return [key.substring("_ga_".length), parts[2]];
+            return [key.substring("_ga_".length), sessionId];
         })
             .filter(v => v !== null))
         : undefined;
@@ -1400,6 +1413,15 @@ const emptyRuntime = (config) => ({
         return undefined;
     },
 });
+function deepCopy(o) {
+    if (typeof o !== "object") {
+        return o;
+    }
+    if (!o) {
+        return o;
+    }
+    return JSON.parse(JSON.stringify(o));
+}
 function deepMerge(target, source) {
     if (typeof source !== "object" || source === null) {
         return source;
@@ -1436,17 +1458,46 @@ function urlPath(url) {
     const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
     return "/" + pathMatch;
 }
+function canonicalUrl() {
+    if (!isInBrowser())
+        return;
+    const tags = document.getElementsByTagName("link");
+    for (var i = 0, tag; (tag = tags[i]); i++) {
+        if (tag.getAttribute("rel") === "canonical") {
+            return tag.getAttribute("href");
+        }
+    }
+}
+/**
+ * bugged analytics.js logic that produces 'url' parameter by concating canonical URL with current search part
+ * I produces broken results in some cases like SPA where path is changed but canonical URL is not updated
+ */
+function analyticsJsUrl() {
+    if (!isInBrowser())
+        return;
+    const canonical = canonicalUrl();
+    if (!canonical)
+        return window.location.href.replace(hashRegex, "");
+    return canonical.match(/\?/) ? canonical : canonical + window.location.search;
+}
 function adjustPayload(payload, config, storage, s2s) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
     const url = runtime.pageUrl();
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
     const properties = payload.properties || {};
     if (payload.type === "page" && (properties.url || url)) {
-        const targetUrl = properties.url || url;
+        // we don't trust analytics.js URL logic since it's sticks with canonical URL on SPA pages
+        let targetUrl = url || properties.url;
+        if (properties.url && properties.url !== analyticsJsUrl()) {
+            // properties.url is not the same as provided by analytics.js
+            // it means that it was not overridden by user and we should use it
+            targetUrl = properties.url;
+        }
         properties.url = targetUrl.replace(hashRegex, "");
         properties.path = fixPath(urlPath(targetUrl));
+        // other properties are correctly based on window.location in analytics.js
     }
     const customContext = deepMerge(config.defaultPayloadContext, ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || ((_b = payload.options) === null || _b === void 0 ? void 0 : _b.context) || {});
     (_c = payload.properties) === null || _c === void 0 ? true : delete _c.context;
@@ -1457,17 +1508,17 @@ function adjustPayload(payload, config, storage, s2s) {
             version: jitsuVersion,
             env: isInBrowser() ? "browser" : "node",
         },
-        consent: ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories)
+        consent: typeof ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories) === "object" && Object.keys((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.consentCategories).length
             ? {
                 categoryPreferences: config.privacy.consentCategories,
             }
             : undefined,
-        userAgent: (_e = runtime.userAgent) === null || _e === void 0 ? void 0 : _e.call(runtime),
-        locale: (_f = runtime.language) === null || _f === void 0 ? void 0 : _f.call(runtime),
-        screen: (_g = runtime.screen) === null || _g === void 0 ? void 0 : _g.call(runtime),
-        ip: (_h = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        userAgent: (_f = runtime.userAgent) === null || _f === void 0 ? void 0 : _f.call(runtime),
+        locale: (_g = runtime.language) === null || _g === void 0 ? void 0 : _g.call(runtime),
+        screen: (_h = runtime.screen) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        ip: (_j = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _j === void 0 ? void 0 : _j.call(runtime),
         traits: payload.type != "identify" && payload.type != "group"
-            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_j = payload === null || payload === void 0 ? void 0 : payload.options) === null || _j === void 0 ? void 0 : _j.traits) || {})) : undefined,
+            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_k = payload === null || payload === void 0 ? void 0 : payload.options) === null || _k === void 0 ? void 0 : _k.traits) || {})) : undefined,
         page: {
             path: properties.path || (parsedUrl && parsedUrl.pathname),
             referrer: referrer,
@@ -1478,13 +1529,13 @@ function adjustPayload(payload, config, storage, s2s) {
             url: properties.url || url,
             encoding: properties.encoding || runtime.documentEncoding(),
         },
-        clientIds: !((_k = config.privacy) === null || _k === void 0 ? void 0 : _k.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
+        clientIds: !((_l = config.privacy) === null || _l === void 0 ? void 0 : _l.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
         campaign: parseUtms(query),
     };
-    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_l = payload === null || payload === void 0 ? void 0 : payload.options) === null || _l === void 0 ? void 0 : _l.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
+    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_p = payload === null || payload === void 0 ? void 0 : payload.options) === null || _p === void 0 ? void 0 : _p.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
-    if ((_p = config.privacy) === null || _p === void 0 ? void 0 : _p.disableUserIds) {
+    if ((_q = config.privacy) === null || _q === void 0 ? void 0 : _q.disableUserIds) {
         delete withContext.userId;
         delete withContext.anonymousId;
         delete withContext.context.traits;
@@ -1500,15 +1551,18 @@ function processDestinations(destinations, method, originalEvent, debug, analyti
     return __awaiter$1(this, void 0, void 0, function* () {
         const promises = [];
         for (const destination of destinations) {
-            let newEvents = [originalEvent];
+            let newEvents = [];
             if (destination.newEvents) {
                 try {
-                    newEvents = destination.newEvents.map(e => e === "same" ? originalEvent : isDiff(e) ? diff.patch(originalEvent, e.__diff) : e);
+                    newEvents = destination.newEvents.map(e => e === "same" ? deepCopy(originalEvent) : isDiff(e) ? diff.patch(deepCopy(originalEvent), e.__diff) : e);
                 }
                 catch (e) {
                     console.error(`[JITSU] Error applying '${destination.id}' changes to event: ${e === null || e === void 0 ? void 0 : e.message}`, e);
                 }
             }
+            else {
+                newEvents = [deepCopy(originalEvent)];
+            }
             const credentials = Object.assign(Object.assign({}, destination.credentials), destination.options);
             if (destination.deviceOptions.type === "internal-plugin") {
                 const plugin = internalDestinationPlugins[destination.deviceOptions.name];
@@ -1916,6 +1970,9 @@ const emptyAnalytics = {
     group: () => Promise.resolve({}),
     reset: () => Promise.resolve({}),
     configure: () => { },
+    getConfiguration() {
+        return {};
+    },
 };
 function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
     var _a, _b, _c;
@@ -2068,6 +2125,9 @@ function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
                 //However, since returned values are used for debugging purposes only, it's ok
                 return results[0];
             });
+        },
+        getConfiguration() {
+            return opts;
         } });
     if (((_b = opts.privacy) === null || _b === void 0 ? void 0 : _b.disableUserIds) || ((_c = opts.privacy) === null || _c === void 0 ? void 0 : _c.dontSend)) {
         storage.reset();

package/dist/jitsu.es.js

@@ -1071,7 +1071,7 @@ const defaultConfig = {
         dontSend: false,
         disableUserIds: false,
         ipPolicy: "keep",
-        consentCategories: undefined,
+        consentCategories: {},
     },
 };
 // mergeConfig merges newConfig into currentConfig also making sure that all undefined values are replaced with defaultConfig values
@@ -1080,11 +1080,14 @@ const mergeConfig = (current, newConfig) => {
         const value = newConfig[key];
         if (key === "privacy") {
             if (typeof value === "object") {
-                current.privacy = Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), current.privacy), value);
+                current.privacy = Object.assign(Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) }), current.privacy), value);
             }
-            else if (newConfig.hasOwnProperty("privacy") && typeof value === "undefined") {
-                // explicitly set to undefined - reset to default
-                current.privacy = Object.assign({}, defaultConfig.privacy);
+            else if (typeof value === "undefined") {
+                if (newConfig.hasOwnProperty("privacy") || !current.hasOwnProperty("privacy")) {
+                    // explicitly set to undefined - reset to default
+                    // or was not set at all - set to default
+                    current.privacy = Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) });
+                }
             }
         }
         else if (typeof value === "undefined") {
@@ -1159,6 +1162,19 @@ function getClientIds(runtime, customCookieCapture) {
     }, {});
     return Object.assign(Object.assign({}, clientIds), getGa4Ids(runtime));
 }
+function parseGa4SessionId(cookieValue) {
+    if (typeof cookieValue !== "string") {
+        return undefined;
+    }
+    if (cookieValue.startsWith("GA1") || cookieValue.startsWith("GS1")) {
+        return cookieValue.split(".")[2];
+    }
+    else {
+        // parse new GA4 cookie format, e.g.: GS2.1.s1747323152$o28$g0$t1747323152$j60$l0$h69286059
+        const match = cookieValue.match(/^GS\d+\.\d+\.(?:[\w_-]+[$])*s(\d+)(?:$|[$])/);
+        return match ? match[1] : undefined;
+    }
+}
 function getGa4Ids(runtime) {
     var _a;
     const allCookies = runtime.getCookies();
@@ -1167,14 +1183,11 @@ function getGa4Ids(runtime) {
     const sessionIds = gaSessionCookies.length > 0
         ? Object.fromEntries(gaSessionCookies
             .map(([key, value]) => {
-            if (typeof value !== "string") {
-                return null;
-            }
-            const parts = value.split(".");
-            if (parts.length < 3) {
+            const sessionId = parseGa4SessionId(value);
+            if (!sessionId) {
                 return null;
             }
-            return [key.substring("_ga_".length), parts[2]];
+            return [key.substring("_ga_".length), sessionId];
         })
             .filter(v => v !== null))
         : undefined;
@@ -1398,6 +1411,15 @@ const emptyRuntime = (config) => ({
         return undefined;
     },
 });
+function deepCopy(o) {
+    if (typeof o !== "object") {
+        return o;
+    }
+    if (!o) {
+        return o;
+    }
+    return JSON.parse(JSON.stringify(o));
+}
 function deepMerge(target, source) {
     if (typeof source !== "object" || source === null) {
         return source;
@@ -1434,17 +1456,46 @@ function urlPath(url) {
     const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
     return "/" + pathMatch;
 }
+function canonicalUrl() {
+    if (!isInBrowser())
+        return;
+    const tags = document.getElementsByTagName("link");
+    for (var i = 0, tag; (tag = tags[i]); i++) {
+        if (tag.getAttribute("rel") === "canonical") {
+            return tag.getAttribute("href");
+        }
+    }
+}
+/**
+ * bugged analytics.js logic that produces 'url' parameter by concating canonical URL with current search part
+ * I produces broken results in some cases like SPA where path is changed but canonical URL is not updated
+ */
+function analyticsJsUrl() {
+    if (!isInBrowser())
+        return;
+    const canonical = canonicalUrl();
+    if (!canonical)
+        return window.location.href.replace(hashRegex, "");
+    return canonical.match(/\?/) ? canonical : canonical + window.location.search;
+}
 function adjustPayload(payload, config, storage, s2s) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
     const url = runtime.pageUrl();
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
     const properties = payload.properties || {};
     if (payload.type === "page" && (properties.url || url)) {
-        const targetUrl = properties.url || url;
+        // we don't trust analytics.js URL logic since it's sticks with canonical URL on SPA pages
+        let targetUrl = url || properties.url;
+        if (properties.url && properties.url !== analyticsJsUrl()) {
+            // properties.url is not the same as provided by analytics.js
+            // it means that it was not overridden by user and we should use it
+            targetUrl = properties.url;
+        }
         properties.url = targetUrl.replace(hashRegex, "");
         properties.path = fixPath(urlPath(targetUrl));
+        // other properties are correctly based on window.location in analytics.js
     }
     const customContext = deepMerge(config.defaultPayloadContext, ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || ((_b = payload.options) === null || _b === void 0 ? void 0 : _b.context) || {});
     (_c = payload.properties) === null || _c === void 0 ? true : delete _c.context;
@@ -1455,17 +1506,17 @@ function adjustPayload(payload, config, storage, s2s) {
             version: jitsuVersion,
             env: isInBrowser() ? "browser" : "node",
         },
-        consent: ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories)
+        consent: typeof ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories) === "object" && Object.keys((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.consentCategories).length
             ? {
                 categoryPreferences: config.privacy.consentCategories,
             }
             : undefined,
-        userAgent: (_e = runtime.userAgent) === null || _e === void 0 ? void 0 : _e.call(runtime),
-        locale: (_f = runtime.language) === null || _f === void 0 ? void 0 : _f.call(runtime),
-        screen: (_g = runtime.screen) === null || _g === void 0 ? void 0 : _g.call(runtime),
-        ip: (_h = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        userAgent: (_f = runtime.userAgent) === null || _f === void 0 ? void 0 : _f.call(runtime),
+        locale: (_g = runtime.language) === null || _g === void 0 ? void 0 : _g.call(runtime),
+        screen: (_h = runtime.screen) === null || _h === void 0 ? void 0 : _h.call(runtime),
+        ip: (_j = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _j === void 0 ? void 0 : _j.call(runtime),
         traits: payload.type != "identify" && payload.type != "group"
-            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_j = payload === null || payload === void 0 ? void 0 : payload.options) === null || _j === void 0 ? void 0 : _j.traits) || {})) : undefined,
+            ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_k = payload === null || payload === void 0 ? void 0 : payload.options) === null || _k === void 0 ? void 0 : _k.traits) || {})) : undefined,
         page: {
             path: properties.path || (parsedUrl && parsedUrl.pathname),
             referrer: referrer,
@@ -1476,13 +1527,13 @@ function adjustPayload(payload, config, storage, s2s) {
             url: properties.url || url,
             encoding: properties.encoding || runtime.documentEncoding(),
         },
-        clientIds: !((_k = config.privacy) === null || _k === void 0 ? void 0 : _k.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
+        clientIds: !((_l = config.privacy) === null || _l === void 0 ? void 0 : _l.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
         campaign: parseUtms(query),
     };
-    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_l = payload === null || payload === void 0 ? void 0 : payload.options) === null || _l === void 0 ? void 0 : _l.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
+    const withContext = Object.assign(Object.assign({}, payload), { userId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_p = payload === null || payload === void 0 ? void 0 : payload.options) === null || _p === void 0 ? void 0 : _p.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
-    if ((_p = config.privacy) === null || _p === void 0 ? void 0 : _p.disableUserIds) {
+    if ((_q = config.privacy) === null || _q === void 0 ? void 0 : _q.disableUserIds) {
         delete withContext.userId;
         delete withContext.anonymousId;
         delete withContext.context.traits;
@@ -1498,15 +1549,18 @@ function processDestinations(destinations, method, originalEvent, debug, analyti
     return __awaiter$1(this, void 0, void 0, function* () {
         const promises = [];
         for (const destination of destinations) {
-            let newEvents = [originalEvent];
+            let newEvents = [];
             if (destination.newEvents) {
                 try {
-                    newEvents = destination.newEvents.map(e => e === "same" ? originalEvent : isDiff(e) ? diff.patch(originalEvent, e.__diff) : e);
+                    newEvents = destination.newEvents.map(e => e === "same" ? deepCopy(originalEvent) : isDiff(e) ? diff.patch(deepCopy(originalEvent), e.__diff) : e);
                 }
                 catch (e) {
                     console.error(`[JITSU] Error applying '${destination.id}' changes to event: ${e === null || e === void 0 ? void 0 : e.message}`, e);
                 }
             }
+            else {
+                newEvents = [deepCopy(originalEvent)];
+            }
             const credentials = Object.assign(Object.assign({}, destination.credentials), destination.options);
             if (destination.deviceOptions.type === "internal-plugin") {
                 const plugin = internalDestinationPlugins[destination.deviceOptions.name];
@@ -1914,6 +1968,9 @@ const emptyAnalytics = {
     group: () => Promise.resolve({}),
     reset: () => Promise.resolve({}),
     configure: () => { },
+    getConfiguration() {
+        return {};
+    },
 };
 function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
     var _a, _b, _c;
@@ -2066,6 +2123,9 @@ function createUnderlyingAnalyticsInstance(opts, rt, plugins = []) {
                 //However, since returned values are used for debugging purposes only, it's ok
                 return results[0];
             });
+        },
+        getConfiguration() {
+            return opts;
         } });
     if (((_b = opts.privacy) === null || _b === void 0 ? void 0 : _b.disableUserIds) || ((_c = opts.privacy) === null || _c === void 0 ? void 0 : _c.dontSend)) {
         storage.reset();

package/dist/web/p.js.txt

@@ -1074,7 +1074,7 @@
           dontSend: false,
           disableUserIds: false,
           ipPolicy: "keep",
-          consentCategories: undefined,
+          consentCategories: {},
       },
   };
   // mergeConfig merges newConfig into currentConfig also making sure that all undefined values are replaced with defaultConfig values
@@ -1083,11 +1083,14 @@
           const value = newConfig[key];
           if (key === "privacy") {
               if (typeof value === "object") {
-                  current.privacy = Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), current.privacy), value);
+                  current.privacy = Object.assign(Object.assign(Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) }), current.privacy), value);
               }
-              else if (newConfig.hasOwnProperty("privacy") && typeof value === "undefined") {
-                  // explicitly set to undefined - reset to default
-                  current.privacy = Object.assign({}, defaultConfig.privacy);
+              else if (typeof value === "undefined") {
+                  if (newConfig.hasOwnProperty("privacy") || !current.hasOwnProperty("privacy")) {
+                      // explicitly set to undefined - reset to default
+                      // or was not set at all - set to default
+                      current.privacy = Object.assign(Object.assign({}, defaultConfig.privacy), { consentCategories: Object.assign({}, defaultConfig.privacy.consentCategories) });
+                  }
               }
           }
           else if (typeof value === "undefined") {
@@ -1162,6 +1165,19 @@
       }, {});
       return Object.assign(Object.assign({}, clientIds), getGa4Ids(runtime));
   }
+  function parseGa4SessionId(cookieValue) {
+      if (typeof cookieValue !== "string") {
+          return undefined;
+      }
+      if (cookieValue.startsWith("GA1") || cookieValue.startsWith("GS1")) {
+          return cookieValue.split(".")[2];
+      }
+      else {
+          // parse new GA4 cookie format, e.g.: GS2.1.s1747323152$o28$g0$t1747323152$j60$l0$h69286059
+          const match = cookieValue.match(/^GS\d+\.\d+\.(?:[\w_-]+[$])*s(\d+)(?:$|[$])/);
+          return match ? match[1] : undefined;
+      }
+  }
   function getGa4Ids(runtime) {
       var _a;
       const allCookies = runtime.getCookies();
@@ -1170,14 +1186,11 @@
       const sessionIds = gaSessionCookies.length > 0
           ? Object.fromEntries(gaSessionCookies
               .map(([key, value]) => {
-              if (typeof value !== "string") {
-                  return null;
-              }
-              const parts = value.split(".");
-              if (parts.length < 3) {
+              const sessionId = parseGa4SessionId(value);
+              if (!sessionId) {
                   return null;
               }
-              return [key.substring("_ga_".length), parts[2]];
+              return [key.substring("_ga_".length), sessionId];
           })
               .filter(v => v !== null))
           : undefined;
@@ -1401,6 +1414,15 @@
           return undefined;
       },
   });
+  function deepCopy(o) {
+      if (typeof o !== "object") {
+          return o;
+      }
+      if (!o) {
+          return o;
+      }
+      return JSON.parse(JSON.stringify(o));
+  }
   function deepMerge(target, source) {
       if (typeof source !== "object" || source === null) {
           return source;
@@ -1437,17 +1459,46 @@
       const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
       return "/" + pathMatch;
   }
+  function canonicalUrl() {
+      if (!isInBrowser())
+          return;
+      const tags = document.getElementsByTagName("link");
+      for (var i = 0, tag; (tag = tags[i]); i++) {
+          if (tag.getAttribute("rel") === "canonical") {
+              return tag.getAttribute("href");
+          }
+      }
+  }
+  /**
+   * bugged analytics.js logic that produces 'url' parameter by concating canonical URL with current search part
+   * I produces broken results in some cases like SPA where path is changed but canonical URL is not updated
+   */
+  function analyticsJsUrl() {
+      if (!isInBrowser())
+          return;
+      const canonical = canonicalUrl();
+      if (!canonical)
+          return window.location.href.replace(hashRegex, "");
+      return canonical.match(/\?/) ? canonical : canonical + window.location.search;
+  }
   function adjustPayload(payload, config, storage, s2s) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
       const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
       const url = runtime.pageUrl();
       const parsedUrl = safeCall(() => new URL(url), undefined);
       const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
       const properties = payload.properties || {};
       if (payload.type === "page" && (properties.url || url)) {
-          const targetUrl = properties.url || url;
+          // we don't trust analytics.js URL logic since it's sticks with canonical URL on SPA pages
+          let targetUrl = url || properties.url;
+          if (properties.url && properties.url !== analyticsJsUrl()) {
+              // properties.url is not the same as provided by analytics.js
+              // it means that it was not overridden by user and we should use it
+              targetUrl = properties.url;
+          }
           properties.url = targetUrl.replace(hashRegex, "");
           properties.path = fixPath(urlPath(targetUrl));
+          // other properties are correctly based on window.location in analytics.js
       }
       const customContext = deepMerge(config.defaultPayloadContext, ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || ((_b = payload.options) === null || _b === void 0 ? void 0 : _b.context) || {});
       (_c = payload.properties) === null || _c === void 0 ? true : delete _c.context;
@@ -1458,17 +1509,17 @@
               version: jitsuVersion,
               env: isInBrowser() ? "browser" : "node",
           },
-          consent: ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories)
+          consent: typeof ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories) === "object" && Object.keys((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.consentCategories).length
               ? {
                   categoryPreferences: config.privacy.consentCategories,
               }
               : undefined,
-          userAgent: (_e = runtime.userAgent) === null || _e === void 0 ? void 0 : _e.call(runtime),
-          locale: (_f = runtime.language) === null || _f === void 0 ? void 0 : _f.call(runtime),
-          screen: (_g = runtime.screen) === null || _g === void 0 ? void 0 : _g.call(runtime),
-          ip: (_h = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _h === void 0 ? void 0 : _h.call(runtime),
+          userAgent: (_f = runtime.userAgent) === null || _f === void 0 ? void 0 : _f.call(runtime),
+          locale: (_g = runtime.language) === null || _g === void 0 ? void 0 : _g.call(runtime),
+          screen: (_h = runtime.screen) === null || _h === void 0 ? void 0 : _h.call(runtime),
+          ip: (_j = runtime === null || runtime === void 0 ? void 0 : runtime.ip) === null || _j === void 0 ? void 0 : _j.call(runtime),
           traits: payload.type != "identify" && payload.type != "group"
-              ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_j = payload === null || payload === void 0 ? void 0 : payload.options) === null || _j === void 0 ? void 0 : _j.traits) || {})) : undefined,
+              ? Object.assign(Object.assign({}, (restoreTraits(storage) || {})), (((_k = payload === null || payload === void 0 ? void 0 : payload.options) === null || _k === void 0 ? void 0 : _k.traits) || {})) : undefined,
           page: {
               path: properties.path || (parsedUrl && parsedUrl.pathname),
               referrer: referrer,
@@ -1479,13 +1530,13 @@
               url: properties.url || url,
               encoding: properties.encoding || runtime.documentEncoding(),
           },
-          clientIds: !((_k = config.privacy) === null || _k === void 0 ? void 0 : _k.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
+          clientIds: !((_l = config.privacy) === null || _l === void 0 ? void 0 : _l.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
           campaign: parseUtms(query),
       };
-      const withContext = Object.assign(Object.assign({}, payload), { userId: ((_l = payload === null || payload === void 0 ? void 0 : payload.options) === null || _l === void 0 ? void 0 : _l.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
+      const withContext = Object.assign(Object.assign({}, payload), { userId: ((_m = payload === null || payload === void 0 ? void 0 : payload.options) === null || _m === void 0 ? void 0 : _m.userId) || (payload === null || payload === void 0 ? void 0 : payload.userId), anonymousId: ((_o = payload === null || payload === void 0 ? void 0 : payload.options) === null || _o === void 0 ? void 0 : _o.anonymousId) || (payload === null || payload === void 0 ? void 0 : payload.anonymousId), groupId: ((_p = payload === null || payload === void 0 ? void 0 : payload.options) === null || _p === void 0 ? void 0 : _p.groupId) || storage.getItem("__group_id"), timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
       delete withContext.meta;
       delete withContext.options;
-      if ((_p = config.privacy) === null || _p === void 0 ? void 0 : _p.disableUserIds) {
+      if ((_q = config.privacy) === null || _q === void 0 ? void 0 : _q.disableUserIds) {
           delete withContext.userId;
           delete withContext.anonymousId;
           delete withContext.context.traits;
@@ -1501,15 +1552,18 @@
       return __awaiter$1(this, void 0, void 0, function* () {
           const promises = [];
           for (const destination of destinations) {
-              let newEvents = [originalEvent];
+              let newEvents = [];
               if (destination.newEvents) {
                   try {
-                      newEvents = destination.newEvents.map(e => e === "same" ? originalEvent : isDiff(e) ? diff.patch(originalEvent, e.__diff) : e);
+                      newEvents = destination.newEvents.map(e => e === "same" ? deepCopy(originalEvent) : isDiff(e) ? diff.patch(deepCopy(originalEvent), e.__diff) : e);
                   }
                   catch (e) {
                       console.error(`[JITSU] Error applying '${destination.id}' changes to event: ${e === null || e === void 0 ? void 0 : e.message}`, e);
                   }
               }
+              else {
+                  newEvents = [deepCopy(originalEvent)];
+              }
               const credentials = Object.assign(Object.assign({}, destination.credentials), destination.options);
               if (destination.deviceOptions.type === "internal-plugin") {
                   const plugin = internalDestinationPlugins[destination.deviceOptions.name];
@@ -2055,6 +2109,9 @@
                   //However, since returned values are used for debugging purposes only, it's ok
                   return results[0];
               });
+          },
+          getConfiguration() {
+              return opts;
           } });
       if (((_b = opts.privacy) === null || _b === void 0 ? void 0 : _b.disableUserIds) || ((_c = opts.privacy) === null || _c === void 0 ? void 0 : _c.dontSend)) {
           storage.reset();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "main": "dist/jitsu.cjs.js",
@@ -39,10 +39,10 @@
     "rollup": "^3.29.5",
     "ts-jest": "29.0.5",
     "typescript": "^5.6.3",
-    "jsondiffpatch": "1.10.2"
+    "jsondiffpatch": "1.10.4"
   },
   "peerDependencies": {
-    "@jitsu/protocols": "1.10.2"
+    "@jitsu/protocols": "1.10.4"
   },
   "dependencies": {
     "analytics": "0.8.9"