@jitsu/js 1.5.1 → 1.6.1

package/src/destination-plugins/gtm.ts

@@ -5,12 +5,12 @@ import { applyFilters, CommonDestinationCredentials, InternalPlugin } from "./in
 const defaultScriptSrc = "https://www.googletagmanager.com/gtag/js";
 
 export type GtmDestinationCredentials = {
-  debug: boolean;
-  containerId: string;
-  dataLayerName: string;
-  preview: string;
-  auth: string;
-  customScriptSrc: string;
+  debug?: boolean;
+  containerId?: string;
+  dataLayerName?: string;
+  preview?: string;
+  auth?: string;
+  customScriptSrc?: string;
 } & CommonDestinationCredentials;
 
 export const gtmPlugin: InternalPlugin<GtmDestinationCredentials> = {
@@ -19,53 +19,50 @@ export const gtmPlugin: InternalPlugin<GtmDestinationCredentials> = {
     if (!applyFilters(payload, config)) {
       return;
     }
-    await initGtmIfNeeded(config);
+    await initGtmIfNeeded(config, payload);
 
     const dataLayer = window[config.dataLayerName || "dataLayer"];
-
+    const ids = {
+      ...(payload.userId ? { user_id: payload.userId, userId: payload.userId } : {}),
+      ...(payload.anonymousId ? { anonymousId: payload.anonymousId } : {}),
+    };
     switch (payload.type) {
       case "page":
         const { properties: pageProperties, context } = payload;
         const pageEvent = {
           event: "page_view",
-          url: pageProperties.url,
-          title: pageProperties.title,
-          referer: context?.page?.referrer ?? "",
+          page_location: pageProperties.url,
+          page_title: pageProperties.title,
+          page_path: pageProperties.path,
+          page_hash: pageProperties.hash,
+          page_search: pageProperties.search,
+          page_referrer: context?.page?.referrer ?? "",
+          ...ids,
         };
-        if (config.debug) {
-          console.log("gtag push", pageEvent);
-        }
         dataLayer.push(pageEvent);
         break;
       case "track":
         const { properties: trackProperties } = payload;
-        const trackEvent: any = { event: payload.event, ...trackProperties };
-        if (payload.userId) {
-          trackEvent.userId = payload.userId;
-        }
-        if (payload.anonymousId) {
-          trackEvent.anonymousId = payload.anonymousId;
-        }
-        if (config.debug) {
-          console.log("gtag push", trackEvent);
-        }
+        const trackEvent: any = {
+          event: payload.event,
+          ...trackProperties,
+          ...ids,
+        };
         dataLayer.push(trackEvent);
         break;
       case "identify":
         const { traits } = payload;
-        const identifyEvent: any = { event: "identify", ...traits };
-        if (payload.userId) {
-          identifyEvent.userId = payload.userId;
-        }
-        if (payload.anonymousId) {
-          identifyEvent.anonymousId = payload.anonymousId;
-        }
-        if (config.debug) {
-          console.log("gtag push", identifyEvent);
-        }
+        const identifyEvent: any = {
+          event: "identify",
+          ...traits,
+          ...ids,
+        };
         dataLayer.push(identifyEvent);
         break;
     }
+    dataLayer.push(function () {
+      this.reset();
+    });
   },
 };
 
@@ -79,7 +76,7 @@ function setGtmState(s: GtmState) {
   window["__jitsuGtmState"] = s;
 }
 
-async function initGtmIfNeeded(config: GtmDestinationCredentials) {
+async function initGtmIfNeeded(config: GtmDestinationCredentials, payload: AnalyticsClientEvent) {
   if (getGtmState() !== "fresh") {
     return;
   }
@@ -90,23 +87,27 @@ async function initGtmIfNeeded(config: GtmDestinationCredentials) {
   const previewParams = config.preview
     ? `&gtm_preview=${config.preview}&gtm_auth=${config.auth}&gtm_cookies_win=x`
     : "";
-  const scriptSrc = `${config.customScriptSrc || defaultScriptSrc}?id=${config.containerId}${dlParam}${previewParams}`;
+  const tagId = config.containerId;
+  const scriptSrc = `${config.customScriptSrc || defaultScriptSrc}?id=${tagId}${dlParam}${previewParams}`;
 
   window[dlName] = window[dlName] || [];
   const gtag = function () {
     window[dlName].push(arguments);
   };
+  window[dlName].push({
+    user_id: payload.userId,
+  });
   // @ts-ignore
   gtag("js", new Date());
   // @ts-ignore
-  gtag("config", config.containerId);
+  gtag("config", tagId);
 
   loadScript(scriptSrc)
     .then(() => {
       setGtmState("loaded");
     })
     .catch(e => {
-      console.warn(`GTM (containerId=${config.containerId}) init failed: ${e.message}`, e);
+      console.warn(`GTM (containerId=${tagId}) init failed: ${e.message}`, e);
       setGtmState("failed");
     });
 }

package/src/destination-plugins/index.ts

@@ -2,6 +2,7 @@ import { AnalyticsClientEvent } from "@jitsu/protocols/analytics";
 import { tagPlugin } from "./tag";
 import { logrocketPlugin } from "./logrocket";
 import { gtmPlugin } from "./gtm";
+import { ga4Plugin } from "./ga4";
 
 export type InternalPlugin<T> = {
   id: string;
@@ -36,7 +37,7 @@ export function applyFilters(event: AnalyticsClientEvent, creds: CommonDestinati
     const eventsArray = Array.isArray(events) ? events : events.split("\n");
     const hostsArray = Array.isArray(hosts) ? hosts : hosts.split("\n");
     return (
-      !!hostsArray.find(hostFilter => satisfyDomainFilter(hostFilter, event.context?.host)) &&
+      !!hostsArray.find(hostFilter => satisfyDomainFilter(hostFilter, event.context?.page?.host)) &&
       (!!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.type)) ||
         !!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.event)))
     );
@@ -55,5 +56,6 @@ export function applyFilters(event: AnalyticsClientEvent, creds: CommonDestinati
 export const internalDestinationPlugins: Record<string, InternalPlugin<any>> = {
   [tagPlugin.id]: tagPlugin,
   [gtmPlugin.id]: gtmPlugin,
+  [ga4Plugin.id]: ga4Plugin,
   [logrocketPlugin.id]: logrocketPlugin,
 };

package/src/index.ts

@@ -98,4 +98,5 @@ export function jitsuAnalytics(opts: JitsuOptions): AnalyticsInterface {
 
 export * from "./jitsu";
 export * from "./analytics-plugin";
+export { applyFilters } from "./destination-plugins";
 export { getTopLevelDomain } from "./tlds";

package/tsconfig.json

@@ -7,7 +7,7 @@
     "moduleResolution": "Node",
     "resolveJsonModule": true,
     "target": "ES2015",
-    "lib": ["es2017", "dom"],
+    "lib": ["es2020", "dom"],
     //this makes typescript igore @types/node during compilation
     "types": []
   },