@dotcms/analytics 1.2.1 → 1.2.2

package/README.md

@@ -247,7 +247,7 @@ The `impressions` option controls automatic tracking of content visibility:
 
 **How it works:**
 
--   ✅ Tracks contentlets marked with `dotcms-analytics-contentlet` class and `data-dot-analytics-*` attributes
+-   ✅ Tracks contentlets marked with `dotcms-contentlet` class and `data-dot-*` attributes (e.g., `data-dot-identifier`, `data-dot-inode`, `data-dot-type`)
 -   ✅ Uses Intersection Observer API for high performance and battery efficiency
 -   ✅ Only fires when element is ≥50% visible for ≥750ms (configurable)
 -   ✅ Only tracks during active tab (respects page visibility)
@@ -299,7 +299,7 @@ The `clicks` option controls automatic tracking of user interactions with conten
 **How it works:**
 
 -   ✅ Tracks clicks on `<a>` and `<button>` elements within contentlets
--   ✅ Contentlets must be marked with `dotcms-analytics-contentlet` class and `data-dot-analytics-*` attributes
+-   ✅ Contentlets must be marked with `dotcms-contentlet` class and `data-dot-*` attributes (e.g., `data-dot-identifier`, `data-dot-inode`, `data-dot-type`)
 -   ✅ Captures semantic attributes (`href`, `aria-label`, `data-*`) and excludes CSS classes
 -   ✅ Throttles rapid clicks to prevent duplicate tracking (300ms fixed)
 -   ✅ One click event per interaction
@@ -341,7 +341,7 @@ The `attributes` array captures additional semantic data in `'key:value'` string
 -   `class` - Already captured as top-level property
 -   `id` - Already captured as top-level property
 -   `href` - Already captured as top-level property
--   `data-dot-analytics-*` - Internal SDK attributes
+-   `data-dot-*` - Internal SDK attributes (e.g., `data-dot-identifier`, `data-dot-inode`, `data-dot-type`)
 
 **Example: Enable click tracking**
 

package/lib/core/dot-analytics.content.d.ts

@@ -1,4 +1,4 @@
-import { ANALYTICS_WINDOWS_ACTIVE_KEY, ANALYTICS_WINDOWS_CLEANUP_KEY } from '../../../../uve/src/internal.ts';
+import { ANALYTICS_WINDOWS_ACTIVE_KEY, ANALYTICS_WINDOWS_CLEANUP_KEY } from './shared/constants/dot-analytics.constants';
 import { DotCMSAnalytics, DotCMSAnalyticsConfig } from './shared/models';
 declare global {
     interface Window {

package/lib/core/dot-analytics.content.js

@@ -1,14 +1,13 @@
 import { Analytics as l } from "analytics";
-import { ANALYTICS_WINDOWS_ACTIVE_KEY as a, ANALYTICS_WINDOWS_CLEANUP_KEY as d } from "../../uve/src/internal/constants.js";
-import { dotAnalyticsClickPlugin as y } from "./plugin/click/dot-analytics.click.plugin.js";
-import { dotAnalyticsEnricherPlugin as m } from "./plugin/enricher/dot-analytics.enricher.plugin.js";
+import { dotAnalyticsClickPlugin as d } from "./plugin/click/dot-analytics.click.plugin.js";
+import { dotAnalyticsEnricherPlugin as y } from "./plugin/enricher/dot-analytics.enricher.plugin.js";
 import { dotAnalyticsIdentityPlugin as u } from "./plugin/identity/dot-analytics.identity.plugin.js";
-import { dotAnalyticsImpressionPlugin as p } from "./plugin/impression/dot-analytics.impression.plugin.js";
+import { dotAnalyticsImpressionPlugin as m } from "./plugin/impression/dot-analytics.impression.plugin.js";
 import { dotAnalytics as A } from "./plugin/main/dot-analytics.plugin.js";
-import { DotCMSPredefinedEventType as f } from "./shared/constants/dot-analytics.constants.js";
+import { ANALYTICS_WINDOWS_ACTIVE_KEY as a, ANALYTICS_WINDOWS_CLEANUP_KEY as p, DotCMSPredefinedEventType as f } from "./shared/constants/dot-analytics.constants.js";
 import { validateAnalyticsConfig as C, getEnhancedTrackingPlugins as w } from "./shared/utils/dot-analytics.utils.js";
 import { cleanupActivityTracking as g } from "./plugin/identity/dot-analytics.identity.activity-tracker.js";
-const _ = (t) => {
+const T = (t) => {
   const e = C(t);
   if (e)
     return console.error(
@@ -16,8 +15,8 @@ const _ = (t) => {
     ), typeof window < "u" && (window[a] = !1), null;
   const s = w(
     t,
-    p,
-    y
+    m,
+    d
   ), i = l({
     app: "dotAnalytics",
     debug: t.debug,
@@ -26,13 +25,13 @@ const _ = (t) => {
       // Inject identity context
       ...s,
       //Track content impressions & clicks (conditionally loaded)
-      m(),
+      y(),
       // Enrich and clean payload with page, device, utm data and custom data
       A(t)
       // Send events to server
     ]
   }), r = () => g();
-  return typeof window < "u" && (window.addEventListener("beforeunload", r), window[d] = r, window[a] = !0, window.dispatchEvent(new CustomEvent("dotcms:analytics:ready"))), {
+  return typeof window < "u" && (window.addEventListener("beforeunload", r), window[p] = r, window[a] = !0, window.dispatchEvent(new CustomEvent("dotcms:analytics:ready"))), {
     /**
      * Track a page view.
      * Session activity is automatically updated by the identity plugin.
@@ -80,5 +79,5 @@ const _ = (t) => {
   };
 };
 export {
-  _ as initializeContentAnalytics
+  T as initializeContentAnalytics
 };

package/lib/core/plugin/identity/dot-analytics.identity.activity-tracker.d.ts

@@ -1,4 +1,4 @@
-import { ANALYTICS_WINDOWS_ACTIVE_KEY, ANALYTICS_WINDOWS_CLEANUP_KEY } from '../../../../../../uve/src/internal.ts';
+import { ANALYTICS_WINDOWS_ACTIVE_KEY, ANALYTICS_WINDOWS_CLEANUP_KEY } from '../../shared/constants';
 import { DotCMSAnalyticsConfig } from '../../shared/models';
 declare global {
     interface Window {

package/lib/core/plugin/identity/dot-analytics.identity.activity-tracker.js

@@ -1,5 +1,4 @@
-import { ANALYTICS_WINDOWS_ACTIVE_KEY as a, ANALYTICS_WINDOWS_CLEANUP_KEY as o } from "../../../../uve/src/internal/constants.js";
-import { DEFAULT_SESSION_TIMEOUT_MINUTES as r, ACTIVITY_EVENTS as l } from "../../shared/constants/dot-analytics.constants.js";
+import { ANALYTICS_WINDOWS_ACTIVE_KEY as a, ANALYTICS_WINDOWS_CLEANUP_KEY as o, DEFAULT_SESSION_TIMEOUT_MINUTES as r, ACTIVITY_EVENTS as l } from "../../shared/constants/dot-analytics.constants.js";
 class v {
   constructor() {
     this.activityListeners = [], this.lastActivityTime = Date.now(), this.inactivityTimer = null, this.isThrottled = !1, this.config = null, this.ACTIVITY_THROTTLE_MS = 1e3;
@@ -11,8 +10,7 @@ class v {
   updateActivityTime() {
     this.lastActivityTime = Date.now(), this.inactivityTimer && clearTimeout(this.inactivityTimer), this.inactivityTimer = setTimeout(
       () => {
-        var i;
-        (i = this.config) != null && i.debug && console.warn("DotCMS Analytics [Activity]: User became inactive after timeout"), this.inactivityTimer = null;
+        this.config?.debug && console.warn("DotCMS Analytics [Activity]: User became inactive after timeout"), this.inactivityTimer = null;
       },
       r * 60 * 1e3
     );
@@ -53,15 +51,15 @@ class v {
     this.activityListeners.forEach((i) => i()), this.activityListeners = [], this.inactivityTimer && (clearTimeout(this.inactivityTimer), this.inactivityTimer = null), this.config = null;
   }
 }
-const t = new v(), d = () => {
+const t = new v(), T = () => {
   t.updateSessionActivity();
-}, u = (e) => {
+}, d = (e) => {
   t.initialize(e);
-}, y = () => {
+}, u = () => {
   t.cleanup(), typeof window < "u" && (window[a] = !1, window[o] = void 0, window.dispatchEvent(new CustomEvent("dotcms:analytics:cleanup")));
 };
 export {
-  y as cleanupActivityTracking,
-  u as initializeActivityTracking,
-  d as updateSessionActivity
+  u as cleanupActivityTracking,
+  d as initializeActivityTracking,
+  T as updateSessionActivity
 };

package/lib/core/plugin/impression/dot-analytics.impression-tracker.js

@@ -78,7 +78,7 @@ class E {
           this.logger.debug(`Skipping element ${r} (${o})`);
           continue;
         }
-        this.elementImpressionStates.has(r) || (n.dataset.dotAnalyticsDomIndex || (n.dataset.dotAnalyticsDomIndex = String(s)), this.observer.observe(n), this.elementImpressionStates.set(r, {
+        this.elementImpressionStates.has(r) || (n.dataset.dotDomIndex || (n.dataset.dotDomIndex = String(s)), this.observer.observe(n), this.elementImpressionStates.set(r, {
           timer: null,
           visibleSince: null,
           tracked: this.hasBeenTrackedInSession(r),
@@ -150,7 +150,7 @@ class E {
   trackAndSendImpression(e, i) {
     const t = this.elementImpressionStates.get(e);
     if (!t) return;
-    const s = t.visibleSince ? Date.now() - t.visibleSince : 0, n = I(i), r = d(i), o = parseInt(i.dataset.dotAnalyticsDomIndex || "-1", 10), h = {
+    const s = t.visibleSince ? Date.now() - t.visibleSince : 0, n = I(i), r = d(i), o = parseInt(i.dataset.dotDomIndex || "-1", 10), h = {
       content: {
         identifier: n.identifier,
         inode: n.inode,

package/lib/core/shared/constants/dot-analytics.constants.d.ts

@@ -127,6 +127,32 @@ export declare const CLICKABLE_ELEMENTS_SELECTOR = "a, button";
  */
 export declare const IMPRESSION_SESSION_KEY = "dot_analytics_impressions";
 /**
- * CSS class selector for trackable contentlets
- */
-export declare const ANALYTICS_CONTENTLET_CLASS = "dotcms-analytics-contentlet";
+ * Window property key for analytics active state
+ * Used to track if analytics is initialized and active
+ */
+export declare const ANALYTICS_WINDOWS_ACTIVE_KEY = "__dotAnalyticsActive__";
+/**
+ * Window property key for analytics cleanup function
+ * Used to store the cleanup function for analytics instance
+ */
+export declare const ANALYTICS_WINDOWS_CLEANUP_KEY = "__dotAnalyticsCleanup__";
+/**
+ * CSS class selector for contentlet elements
+ *
+ * @important This constant is intentionally duplicated in @dotcms/react SDK
+ * (core-web/libs/sdk/react/src/lib/next/components/Contentlet/Contentlet.tsx).
+ * Both constants MUST have the same value ('dotcms-contentlet') for analytics
+ * tracking to work correctly with React-rendered contentlets.
+ *
+ * This duplication is intentional to maintain SDK independence:
+ * - @dotcms/analytics can be used standalone without React
+ * - @dotcms/react can be used without analytics
+ * - When both are used together, they must share the same class name
+ *
+ * If you need to change this value, you MUST update it in both locations:
+ * 1. This file (analytics SDK)
+ * 2. Contentlet.tsx in React SDK
+ *
+ * @see core-web/libs/sdk/react/src/lib/next/components/Contentlet/Contentlet.tsx
+ */
+export declare const CONTENTLET_CLASS = "dotcms-contentlet";

package/lib/core/shared/constants/dot-analytics.constants.js

@@ -3,18 +3,18 @@ const I = "/api/v1/analytics/content/event", c = {
   CONTENT_IMPRESSION: "content_impression",
   CONTENT_CLICK: "content_click",
   CONVERSION: "conversion"
-}, s = [
+}, o = [
   "utm_source",
   "utm_medium",
   "utm_campaign",
   "utm_term",
   "utm_content"
-], o = 30, e = "dot_analytics_session_id", N = "dot_analytics_user_id", E = 15, _ = 5e3, L = ["click"], O = {
-  eventBatchSize: E,
+], s = 30, e = "dot_analytics_session_id", N = "dot_analytics_user_id", _ = 15, E = 5e3, A = ["click"], L = {
+  eventBatchSize: _,
   // Max events per batch - auto-sends when reached
-  flushInterval: _
+  flushInterval: E
   // Time between flushes - sends whatever is queued
-}, i = [
+}, O = [
   "title",
   "url",
   "path",
@@ -23,30 +23,32 @@ const I = "/api/v1/analytics/content/event", c = {
   "width",
   "height",
   "referrer"
-], t = 0.5, T = 750, n = 100, S = 100, A = 250, C = {
+], t = 0.5, n = 750, T = 100, S = 100, i = 250, C = {
   visibilityThreshold: t,
-  dwellMs: T,
-  maxNodes: n,
+  dwellMs: n,
+  maxNodes: T,
   throttleMs: S
-}, U = "content_impression", M = "content_click", D = 300, R = "a, button", a = "dotcms-analytics-contentlet";
+}, U = "content_impression", D = "content_click", M = 300, a = "a, button", R = "__dotAnalyticsActive__", l = "__dotAnalyticsCleanup__", r = "dotcms-contentlet";
 export {
-  L as ACTIVITY_EVENTS,
-  a as ANALYTICS_CONTENTLET_CLASS,
+  A as ACTIVITY_EVENTS,
   I as ANALYTICS_ENDPOINT,
-  i as ANALYTICS_JS_DEFAULT_PROPERTIES,
-  R as CLICKABLE_ELEMENTS_SELECTOR,
-  M as CLICK_EVENT_TYPE,
-  D as DEFAULT_CLICK_THROTTLE_MS,
+  O as ANALYTICS_JS_DEFAULT_PROPERTIES,
+  R as ANALYTICS_WINDOWS_ACTIVE_KEY,
+  l as ANALYTICS_WINDOWS_CLEANUP_KEY,
+  a as CLICKABLE_ELEMENTS_SELECTOR,
+  D as CLICK_EVENT_TYPE,
+  r as CONTENTLET_CLASS,
+  M as DEFAULT_CLICK_THROTTLE_MS,
   C as DEFAULT_IMPRESSION_CONFIG,
-  T as DEFAULT_IMPRESSION_DWELL_MS,
-  n as DEFAULT_IMPRESSION_MAX_NODES,
-  A as DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS,
+  n as DEFAULT_IMPRESSION_DWELL_MS,
+  T as DEFAULT_IMPRESSION_MAX_NODES,
+  i as DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS,
   S as DEFAULT_IMPRESSION_THROTTLE_MS,
   t as DEFAULT_IMPRESSION_VISIBILITY_THRESHOLD,
-  O as DEFAULT_QUEUE_CONFIG,
-  o as DEFAULT_SESSION_TIMEOUT_MINUTES,
+  L as DEFAULT_QUEUE_CONFIG,
+  s as DEFAULT_SESSION_TIMEOUT_MINUTES,
   c as DotCMSPredefinedEventType,
-  s as EXPECTED_UTM_KEYS,
+  o as EXPECTED_UTM_KEYS,
   U as IMPRESSION_EVENT_TYPE,
   e as SESSION_STORAGE_KEY,
   N as USER_ID_KEY

package/lib/core/shared/queue/dot-analytics.queue.utils.js

@@ -3,20 +3,20 @@ import v from "@analytics/router-utils";
 import { DEFAULT_QUEUE_CONFIG as y } from "../constants/dot-analytics.constants.js";
 import { sendAnalyticsEvent as b } from "../http/dot-analytics.http.js";
 import { createPluginLogger as w } from "../utils/dot-analytics.utils.js";
-const L = (o) => {
-  const i = w("Queue", o);
-  let e = null, n = null, u = !1, d = !1, f = typeof window < "u" ? window.location.pathname : "";
+const L = (u) => {
+  const i = w("Queue", u);
+  let t = null, n = null, o = !1, d = !1, f = typeof window < "u" ? window.location.pathname : "";
   const a = {
     ...y,
-    ...typeof o.queue == "object" ? o.queue : {}
-  }, g = (t, s) => {
+    ...typeof u.queue == "object" ? u.queue : {}
+  }, g = (e, s) => {
     if (!n) return;
-    i.debug(`Sending batch of ${t.length} event(s)`, {
-      events: t,
-      keepalive: u
-    }), b({ context: n, events: t }, o, u);
+    i.debug(`Sending batch of ${e.length} event(s)`, {
+      events: e,
+      keepalive: o
+    }), b({ context: n, events: e }, u, o);
   }, l = () => {
-    !e || e.size() === 0 || !n || (i.info(`Flushing ${e.size()} events (page hidden/unload)`), u = !0, e.flush(!0));
+    !t || t.size() === 0 || !n || (i.info(`Flushing ${t.size()} events (page hidden/unload)`), o = !0, t.flush(!0));
   }, c = () => {
     if (i.debug("handleVisibilityChange", document.visibilityState), document.visibilityState === "hidden") {
       if (d) {
@@ -31,9 +31,9 @@ const L = (o) => {
      * Initialize the queue with smart batching
      */
     initialize: () => {
-      e = m(
-        (t, s) => {
-          g(t);
+      t = m(
+        (e, s) => {
+          g(e);
         },
         {
           max: a.eventBatchSize,
@@ -41,8 +41,8 @@ const L = (o) => {
           throttle: !1
           // Always false - enables both batch size and interval triggers
         }
-      ), typeof window < "u" && typeof document < "u" && (document.addEventListener("visibilitychange", c), window.addEventListener("pagehide", l), v((t) => {
-        d = !0, f = t, i.debug(`SPA navigation detected (${f})`), setTimeout(() => {
+      ), typeof window < "u" && typeof document < "u" && (document.addEventListener("visibilitychange", c), window.addEventListener("pagehide", l), v((e) => {
+        d = !0, f = e, i.debug(`SPA navigation detected (${f})`), setTimeout(() => {
           d = !1;
         }, 100);
       }));
@@ -53,25 +53,25 @@ const L = (o) => {
      * - Sends immediately when eventBatchSize reached (with throttle: false)
      * - Sends pending events every flushInterval
      */
-    enqueue: (t, s) => {
-      if (n = s, !e) return;
-      const r = e.size() + 1, p = a.eventBatchSize, h = r >= p;
+    enqueue: (e, s) => {
+      if (n = s, !t) return;
+      const r = t.size() + 1, p = a.eventBatchSize, h = r >= p;
       i.debug(
         `Event added. Queue size: ${r}/${p}${h ? " (full, sending...)" : ""}`,
-        { eventType: t.event_type, event: t }
-      ), e.push(t);
+        { eventType: e.event_type, event: e }
+      ), t.push(e);
     },
     /**
      * Get queue size for debugging
      * Returns the number of events in smartQueue
      */
-    size: () => (e == null ? void 0 : e.size()) ?? 0,
+    size: () => t?.size() ?? 0,
     /**
      * Clean up queue resources
      * Flushes remaining events and cleans up listeners
      */
     cleanup: () => {
-      l(), typeof window < "u" && typeof document < "u" && (document.removeEventListener("visibilitychange", c), window.removeEventListener("pagehide", l)), e = null, n = null, u = !1;
+      l(), typeof window < "u" && typeof document < "u" && (document.removeEventListener("visibilitychange", c), window.removeEventListener("pagehide", l)), t = null, n = null, o = !1;
     }
   };
 };

package/lib/core/shared/utils/dot-analytics.utils.js

@@ -1,16 +1,14 @@
-import { ANALYTICS_JS_DEFAULT_PROPERTIES as T, SESSION_STORAGE_KEY as h, DEFAULT_SESSION_TIMEOUT_MINUTES as y, USER_ID_KEY as w, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as I, EXPECTED_UTM_KEYS as D, ANALYTICS_CONTENTLET_CLASS as S } from "../constants/dot-analytics.constants.js";
+import { ANALYTICS_JS_DEFAULT_PROPERTIES as _, SESSION_STORAGE_KEY as g, DEFAULT_SESSION_TIMEOUT_MINUTES as p, USER_ID_KEY as m, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as T, EXPECTED_UTM_KEYS as D, CONTENTLET_CLASS as h } from "../constants/dot-analytics.constants.js";
 import { DotLogger as E } from "../dot-analytics.logger.js";
-import "../../../../uve/src/internal/constants.js";
-function Y(t) {
-  var n, s;
+function $(t) {
   const e = [];
-  return (n = t.siteAuth) != null && n.trim() || e.push('"siteAuth"'), (s = t.server) != null && s.trim() || e.push('"server"'), e.length > 0 ? e : null;
+  return t.siteAuth?.trim() || e.push('"siteAuth"'), t.server?.trim() || e.push('"server"'), e.length > 0 ? e : null;
 }
-let u = null, l = null;
-const g = (t) => {
+let d = null, u = null;
+const l = (t) => {
   const e = Date.now(), n = Math.random().toString(36).substr(2, 9), s = Math.random().toString(36).substr(2, 9);
   return `${t}_${e}_${n}${s}`;
-}, _ = {
+}, f = {
   getItem: (t) => {
     try {
       return localStorage.getItem(t);
@@ -25,10 +23,10 @@ const g = (t) => {
       console.warn(`DotCMS Analytics [Core]: Could not save ${t} to localStorage`);
     }
   }
-}, A = () => {
-  let t = _.getItem(w);
-  return t || (t = g("user"), _.setItem(w, t)), t;
-}, C = (t) => {
+}, I = () => {
+  let t = f.getItem(m);
+  return t || (t = l("user"), f.setItem(m, t)), t;
+}, y = (t) => {
   const e = new Date(t), n = /* @__PURE__ */ new Date(), s = new Date(
     e.getUTCFullYear(),
     e.getUTCMonth(),
@@ -38,14 +36,14 @@ const g = (t) => {
 }, v = () => {
   const t = Date.now();
   if (typeof window > "u")
-    return g("session_fallback");
+    return l("session_fallback");
   try {
-    const e = sessionStorage.getItem(h);
+    const e = sessionStorage.getItem(g);
     if (e) {
-      const { sessionId: r, startTime: o, lastActivity: a } = JSON.parse(e), i = !C(o), c = t - a < y * 60 * 1e3;
+      const { sessionId: r, startTime: o, lastActivity: a } = JSON.parse(e), i = !y(o), c = t - a < p * 60 * 1e3;
       if (i && c)
         return sessionStorage.setItem(
-          h,
+          g,
           JSON.stringify({
             sessionId: r,
             startTime: o,
@@ -53,39 +51,39 @@ const g = (t) => {
           })
         ), r;
     }
-    const n = g("session"), s = {
+    const n = l("session"), s = {
       sessionId: n,
       startTime: t,
       lastActivity: t
     };
-    return sessionStorage.setItem(h, JSON.stringify(s)), n;
+    return sessionStorage.setItem(g, JSON.stringify(s)), n;
   } catch {
-    return g("session_fallback");
+    return l("session_fallback");
   }
-}, x = (t) => {
-  const e = v(), n = A(), s = O();
+}, P = (t) => {
+  const e = v(), n = I(), s = C();
   return {
     site_auth: t.siteAuth,
     session_id: e,
     user_id: n,
     device: s
   };
-}, p = () => u || (u = {
+}, w = () => d || (d = {
   user_language: navigator.language,
   doc_encoding: document.characterSet || document.charset,
   screen_resolution: typeof screen < "u" && screen.width && screen.height ? `${screen.width}x${screen.height}` : ""
-}, u), O = () => {
-  const t = p(), e = window.innerWidth || document.documentElement.clientWidth || 0, n = window.innerHeight || document.documentElement.clientHeight || 0;
+}, d), C = () => {
+  const t = w(), e = window.innerWidth || document.documentElement.clientWidth || 0, n = window.innerHeight || document.documentElement.clientHeight || 0;
   return {
     screen_resolution: t.screen_resolution ?? "",
     language: t.user_language ?? "",
     viewport_width: String(e),
     viewport_height: String(n)
   };
-}, N = (t) => {
+}, A = (t) => {
   const e = t.search;
-  if (l && l.search === e)
-    return l.params;
+  if (u && u.search === e)
+    return u.params;
   const n = new URLSearchParams(e), s = {};
   return D.forEach((r) => {
     const o = n.get(r);
@@ -93,25 +91,25 @@ const g = (t) => {
       const a = r.replace("utm_", "");
       s[a] = o;
     }
-  }), l = { search: e, params: s }, s;
-}, b = () => {
+  }), u = { search: e, params: s }, s;
+}, O = () => {
   try {
     const t = (/* @__PURE__ */ new Date()).getTimezoneOffset(), e = t > 0 ? "-" : "+", n = Math.abs(t), s = Math.floor(n / 60), r = n % 60;
     return `${e}${s.toString().padStart(2, "0")}:${r.toString().padStart(2, "0")}`;
   } catch {
     return "+00:00";
   }
-}, M = () => {
+}, N = () => {
   try {
-    const t = /* @__PURE__ */ new Date(), e = b(), n = t.getFullYear(), s = (t.getMonth() + 1).toString().padStart(2, "0"), r = t.getDate().toString().padStart(2, "0"), o = t.getHours().toString().padStart(2, "0"), a = t.getMinutes().toString().padStart(2, "0"), i = t.getSeconds().toString().padStart(2, "0");
+    const t = /* @__PURE__ */ new Date(), e = O(), n = t.getFullYear(), s = (t.getMonth() + 1).toString().padStart(2, "0"), r = t.getDate().toString().padStart(2, "0"), o = t.getHours().toString().padStart(2, "0"), a = t.getMinutes().toString().padStart(2, "0"), i = t.getSeconds().toString().padStart(2, "0");
     return `${n}-${s}-${r}T${o}:${a}:${i}${e}`;
   } catch {
     return (/* @__PURE__ */ new Date()).toISOString();
   }
-}, B = (t, e = typeof window < "u" ? window.location : {}) => {
-  const n = M(), s = p(), { properties: r } = t, o = {};
+}, R = (t, e = typeof window < "u" ? window.location : {}) => {
+  const n = N(), s = w(), { properties: r } = t, o = {};
   Object.keys(r).forEach((c) => {
-    T.includes(c) || (o[c] = r[c]);
+    _.includes(c) || (o[c] = r[c]);
   });
   const a = {
     url: e.href,
@@ -121,8 +119,8 @@ const g = (t) => {
     doc_search: e.search,
     doc_host: e.hostname,
     doc_path: e.pathname,
-    title: r.title ?? (document == null ? void 0 : document.title)
-  }, i = N(e);
+    title: r.title ?? document?.title
+  }, i = A(e);
   return {
     ...t,
     page: a,
@@ -132,36 +130,35 @@ const g = (t) => {
     local_time: n
   };
 };
-function L(t, e) {
+function b(t, e) {
   let n = 0;
   return (...s) => {
     const r = Date.now();
     r - n >= e && (t(...s), n = r);
   };
 }
-function F(t) {
-  return t.dataset.dotAnalyticsIdentifier || null;
+function x(t) {
+  return t.dataset.dotIdentifier || null;
 }
-function k(t) {
+function Y(t) {
   return {
-    identifier: t.dataset.dotAnalyticsIdentifier || "",
-    inode: t.dataset.dotAnalyticsInode || "",
-    contentType: t.dataset.dotAnalyticsContenttype || "",
-    title: t.dataset.dotAnalyticsTitle || "",
-    baseType: t.dataset.dotAnalyticsBasetype || ""
+    identifier: t.dataset.dotIdentifier || "",
+    inode: t.dataset.dotInode || "",
+    contentType: t.dataset.dotType || "",
+    title: t.dataset.dotTitle || "",
+    baseType: t.dataset.dotBasetype || ""
   };
 }
-const z = 100, U = () => typeof window < "u" && typeof document < "u", H = () => Array.from(document.querySelectorAll(`.${S}`)), J = (t, e = I) => {
-  const n = L(t, e), s = new MutationObserver((r) => {
+const B = 100, M = () => typeof window < "u" && typeof document < "u", F = () => Array.from(document.querySelectorAll(`.${h}`)), k = (t, e = T) => {
+  const n = b(t, e), s = new MutationObserver((r) => {
     r.some((a) => a.addedNodes.length === 0 && a.removedNodes.length === 0 ? !1 : [
       ...Array.from(a.addedNodes),
       ...Array.from(a.removedNodes)
     ].some((c) => {
-      var f, m;
       if (c.nodeType !== Node.ELEMENT_NODE)
         return !1;
-      const d = c;
-      return (f = d.classList) != null && f.contains(S) ? !0 : ((m = d.querySelector) == null ? void 0 : m.call(d, `.${S}`)) !== null;
+      const S = c;
+      return S.classList?.contains(h) ? !0 : S.querySelector?.(`.${h}`) !== null;
     })) && n();
   });
   return s.observe(document.body, {
@@ -170,33 +167,33 @@ const z = 100, U = () => typeof window < "u" && typeof document < "u", H = () =>
     attributes: !1,
     characterData: !1
   }), s;
-}, K = (t) => {
-  U() && (window.addEventListener("beforeunload", t), window.addEventListener("pagehide", t));
-}, j = (t, e) => {
+}, z = (t) => {
+  M() && (window.addEventListener("beforeunload", t), window.addEventListener("pagehide", t));
+}, H = (t, e) => {
   const n = e.logLevel ?? (e.debug ? "debug" : "warn");
   return new E("Analytics", t, n);
-}, W = (t, e, n) => [
+}, J = (t, e, n) => [
   t.impressions && e(t),
   t.clicks && n(t)
 ].filter(Boolean);
 export {
-  z as INITIAL_SCAN_DELAY_MS,
-  J as createContentletObserver,
-  j as createPluginLogger,
-  L as createThrottle,
-  B as enrichPagePayloadOptimized,
-  k as extractContentletData,
-  F as extractContentletIdentifier,
-  N as extractUTMParameters,
-  H as findContentlets,
-  g as generateSecureId,
-  x as getAnalyticsContext,
-  O as getDeviceDataForContext,
-  W as getEnhancedTrackingPlugins,
-  M as getLocalTime,
+  B as INITIAL_SCAN_DELAY_MS,
+  k as createContentletObserver,
+  H as createPluginLogger,
+  b as createThrottle,
+  R as enrichPagePayloadOptimized,
+  Y as extractContentletData,
+  x as extractContentletIdentifier,
+  A as extractUTMParameters,
+  F as findContentlets,
+  l as generateSecureId,
+  P as getAnalyticsContext,
+  C as getDeviceDataForContext,
+  J as getEnhancedTrackingPlugins,
+  N as getLocalTime,
   v as getSessionId,
-  A as getUserId,
-  U as isBrowser,
-  K as setupPluginCleanup,
-  Y as validateAnalyticsConfig
+  I as getUserId,
+  M as isBrowser,
+  z as setupPluginCleanup,
+  $ as validateAnalyticsConfig
 };

package/lib/react/hook/useRouterTracker.js

@@ -1,18 +1,18 @@
-import { usePathname as u, useSearchParams as c } from "next/navigation";
-import { useRef as p, useEffect as m } from "react";
-import { getUVEState as s } from "../../../uve/src/lib/core/core.utils.js";
+import { usePathname as s, useSearchParams as u } from "next/navigation";
+import { useRef as c, useEffect as a } from "react";
+import { getUVEState as m } from "../../../uve/src/lib/core/core.utils.js";
 import "../../../uve/src/internal/constants.js";
-const g = (e, t) => `${e}${t != null && t.toString() ? "?" + t.toString() : ""}`;
-function A(e, t = !1) {
-  const o = p(null), n = u(), r = c();
-  m(() => {
-    if (!e) return;
+const p = (t, e) => `${t}${e?.toString() ? "?" + e.toString() : ""}`;
+function l(t, e = !1) {
+  const r = c(null), o = s(), n = u();
+  a(() => {
+    if (!t) return;
     const i = (f) => {
-      s() || f !== o.current && (o.current = f, e.pageView());
+      m() || f !== r.current && (r.current = f, t.pageView());
     };
-    t && console.info("DotCMS Analytics [React]: using Next.js App Router tracking"), i(g(n, r));
-  }, [e, n, r, t]);
+    e && console.info("DotCMS Analytics [React]: using Next.js App Router tracking"), i(p(o, n));
+  }, [t, o, n, e]);
 }
 export {
-  A as useRouterTracker
+  l as useRouterTracker
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcms/analytics",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Official JavaScript library for Content Analytics with DotCMS.",
   "repository": {
     "type": "git",

package/uve/src/internal/constants.js

@@ -1,8 +1,3 @@
-import { UVEEventType as t } from "../../../types/src/lib/editor/public.js";
-import { onContentletHovered as e, onIframeScroll as o, onRequestBounds as r, onPageReload as E, onContentChanges as _ } from "./events.js";
-t.CONTENT_CHANGES + "", t.PAGE_RELOAD + "", t.REQUEST_BOUNDS + "", t.IFRAME_SCROLL + "", t.CONTENTLET_HOVERED + "";
-const N = "__dotAnalyticsActive__", T = "__dotAnalyticsCleanup";
-export {
-  N as ANALYTICS_WINDOWS_ACTIVE_KEY,
-  T as ANALYTICS_WINDOWS_CLEANUP_KEY
-};
+import { UVEEventType as n } from "../../../types/src/lib/editor/public.js";
+import { onContentletHovered as r, onIframeScroll as o, onRequestBounds as t, onPageReload as E, onContentChanges as u } from "./events.js";
+n.CONTENT_CHANGES + "", n.PAGE_RELOAD + "", n.REQUEST_BOUNDS + "", n.IFRAME_SCROLL + "", n.CONTENTLET_HOVERED + "";

package/uve/src/internal/events.js

@@ -1,7 +1,7 @@
 import { UVEEventType as a } from "../../../types/src/lib/editor/public.js";
 import { __DOTCMS_UVE_EVENT__ as s } from "../../../types/src/lib/events/internal.js";
-import { findDotCMSElement as M, findDotCMSVTLData as p, getClosestDotCMSContainerData as w, getDotCMSPageBounds as S } from "../lib/dom/dom.utils.js";
-function U(o) {
+import { findDotCMSElement as u, findDotCMSVTLData as C, getClosestDotCMSContainerData as g, getDotCMSPageBounds as N } from "../lib/dom/dom.utils.js";
+function O(o) {
   const t = (n) => {
     n.data.name === s.UVE_SET_PAGE_DATA && o(n.data.payload);
   };
@@ -12,7 +12,7 @@ function U(o) {
     event: a.CONTENT_CHANGES
   };
 }
-function V(o) {
+function p(o) {
   const t = (n) => {
     n.data.name === s.UVE_RELOAD_PAGE && o();
   };
@@ -23,12 +23,12 @@ function V(o) {
     event: a.PAGE_RELOAD
   };
 }
-function I(o) {
+function b(o) {
   const t = (n) => {
     if (n.data.name === s.UVE_REQUEST_BOUNDS) {
       const e = Array.from(
         document.querySelectorAll('[data-dot-object="container"]')
-      ), i = S(e);
+      ), i = N(e);
       o(i);
     }
   };
@@ -39,7 +39,7 @@ function I(o) {
     event: a.REQUEST_BOUNDS
   };
 }
-function Y(o) {
+function S(o) {
   const t = (n) => {
     if (n.data.name === s.UVE_SCROLL_INSIDE_IFRAME) {
       const e = n.data.direction;
@@ -53,12 +53,11 @@ function Y(o) {
     event: a.IFRAME_SCROLL
   };
 }
-function B(o) {
+function M(o) {
   const t = (n) => {
-    var d, r, E, c, T, l, m, _, u, C;
-    const e = M(n.target);
+    const e = u(n.target);
     if (!e) return;
-    const { x: i, y: g, width: v, height: N } = e.getBoundingClientRect(), f = ((d = e.dataset) == null ? void 0 : d.dotObject) === "container", L = {
+    const { x: i, y: d, width: r, height: E } = e.getBoundingClientRect(), c = e.dataset?.dotObject === "container", T = {
       identifier: "TEMP_EMPTY_CONTENTLET",
       title: "TEMP_EMPTY_CONTENTLET",
       contentType: "TEMP_EMPTY_CONTENTLET_TYPE",
@@ -66,29 +65,32 @@ function B(o) {
       widgetTitle: "TEMP_EMPTY_CONTENTLET",
       baseType: "TEMP_EMPTY_CONTENTLET",
       onNumberOfPages: 1
-    }, P = {
-      identifier: (r = e.dataset) == null ? void 0 : r.dotIdentifier,
-      title: (E = e.dataset) == null ? void 0 : E.dotTitle,
-      inode: (c = e.dataset) == null ? void 0 : c.dotInode,
-      contentType: (T = e.dataset) == null ? void 0 : T.dotType,
-      baseType: (l = e.dataset) == null ? void 0 : l.dotBasetype,
-      widgetTitle: (m = e.dataset) == null ? void 0 : m.dotWidgetTitle,
-      onNumberOfPages: (_ = e.dataset) == null ? void 0 : _.dotOnNumberOfPages
-    }, O = p(e), b = {
+    }, l = {
+      identifier: e.dataset?.dotIdentifier,
+      title: e.dataset?.dotTitle,
+      inode: e.dataset?.dotInode,
+      contentType: e.dataset?.dotType,
+      baseType: e.dataset?.dotBasetype,
+      widgetTitle: e.dataset?.dotWidgetTitle,
+      onNumberOfPages: e.dataset?.dotOnNumberOfPages,
+      ...e.dataset?.dotStyleProperties && {
+        dotStyleProperties: JSON.parse(e.dataset.dotStyleProperties)
+      }
+    }, m = C(e), _ = {
       container: (
         // Here extract dot-container from contentlet if it is Headless
         // or search in parent container if it is VTL
-        (u = e.dataset) != null && u.dotContainer ? JSON.parse((C = e.dataset) == null ? void 0 : C.dotContainer) : w(e)
+        e.dataset?.dotContainer ? JSON.parse(e.dataset?.dotContainer) : g(e)
       ),
-      contentlet: f ? L : P,
-      vtlFiles: O
+      contentlet: c ? T : l,
+      vtlFiles: m
     };
     o({
       x: i,
-      y: g,
-      width: v,
-      height: N,
-      payload: b
+      y: d,
+      width: r,
+      height: E,
+      payload: _
     });
   };
   return document.addEventListener("pointermove", t), {
@@ -99,9 +101,9 @@ function B(o) {
   };
 }
 export {
-  U as onContentChanges,
-  B as onContentletHovered,
-  Y as onIframeScroll,
-  V as onPageReload,
-  I as onRequestBounds
+  O as onContentChanges,
+  M as onContentletHovered,
+  S as onIframeScroll,
+  p as onPageReload,
+  b as onRequestBounds
 };

package/uve/src/lib/dom/dom.utils.js

@@ -1,80 +1,74 @@
 import "../../internal/constants.js";
-function C(t) {
-  return t.map((a) => {
-    const o = a.getBoundingClientRect(), n = Array.from(
-      a.querySelectorAll('[data-dot-object="contentlet"]')
+function c(t) {
+  return t.map((n) => {
+    const e = n.getBoundingClientRect(), o = Array.from(
+      n.querySelectorAll('[data-dot-object="contentlet"]')
     );
     return {
-      x: o.x,
-      y: o.y,
-      width: o.width,
-      height: o.height,
+      x: e.x,
+      y: e.y,
+      width: e.width,
+      height: e.height,
       payload: JSON.stringify({
-        container: u(a)
+        container: a(n)
       }),
-      contentlets: f(o, n)
+      contentlets: d(e, o)
     };
   });
 }
-function f(t, a) {
-  return a.map((o) => {
-    var d, r, i, e, s, c;
-    const n = o.getBoundingClientRect();
+function d(t, n) {
+  return n.map((e) => {
+    const o = e.getBoundingClientRect();
     return {
       x: 0,
-      y: n.y - t.y,
-      width: n.width,
-      height: n.height,
+      y: o.y - t.y,
+      width: o.width,
+      height: o.height,
       payload: JSON.stringify({
-        container: (d = o.dataset) != null && d.dotContainer ? JSON.parse((r = o.dataset) == null ? void 0 : r.dotContainer) : y(o),
+        container: e.dataset?.dotContainer ? JSON.parse(e.dataset?.dotContainer) : r(e),
         contentlet: {
-          identifier: (i = o.dataset) == null ? void 0 : i.dotIdentifier,
-          title: (e = o.dataset) == null ? void 0 : e.dotTitle,
-          inode: (s = o.dataset) == null ? void 0 : s.dotInode,
-          contentType: (c = o.dataset) == null ? void 0 : c.dotType
+          identifier: e.dataset?.dotIdentifier,
+          title: e.dataset?.dotTitle,
+          inode: e.dataset?.dotInode,
+          contentType: e.dataset?.dotType
         }
       })
     };
   });
 }
-function u(t) {
-  var a, o, n, d;
+function a(t) {
   return {
-    acceptTypes: ((a = t.dataset) == null ? void 0 : a.dotAcceptTypes) || "",
-    identifier: ((o = t.dataset) == null ? void 0 : o.dotIdentifier) || "",
-    maxContentlets: ((n = t.dataset) == null ? void 0 : n.maxContentlets) || "",
-    uuid: ((d = t.dataset) == null ? void 0 : d.dotUuid) || ""
+    acceptTypes: t.dataset?.dotAcceptTypes || "",
+    identifier: t.dataset?.dotIdentifier || "",
+    maxContentlets: t.dataset?.maxContentlets || "",
+    uuid: t.dataset?.dotUuid || ""
   };
 }
-function y(t) {
-  const a = t.closest('[data-dot-object="container"]');
-  return a ? u(a) : (console.warn("No container found for the contentlet"), null);
+function r(t) {
+  const n = t.closest('[data-dot-object="container"]');
+  return n ? a(n) : (console.warn("No container found for the contentlet"), null);
 }
-function g(t) {
-  var o, n, d;
+function i(t) {
   if (!t) return null;
-  const a = t.querySelector('[data-dot-object="empty-content"]');
-  return ((o = t == null ? void 0 : t.dataset) == null ? void 0 : o.dotObject) === "contentlet" || // The container inside Headless components have a span with the data-dot-object="container" attribute
-  ((n = t == null ? void 0 : t.dataset) == null ? void 0 : n.dotObject) === "container" && a || // The container inside Traditional have no content inside
-  ((d = t == null ? void 0 : t.dataset) == null ? void 0 : d.dotObject) === "container" && t.children.length === 0 ? t : g(t == null ? void 0 : t.parentElement);
+  const n = t.querySelector('[data-dot-object="empty-content"]');
+  return t?.dataset?.dotObject === "contentlet" || // The container inside Headless components have a span with the data-dot-object="container" attribute
+  t?.dataset?.dotObject === "container" && n || // The container inside Traditional have no content inside
+  t?.dataset?.dotObject === "container" && t.children.length === 0 ? t : i(t?.parentElement);
 }
-function h(t) {
-  const a = t.querySelectorAll(
+function u(t) {
+  const n = t.querySelectorAll(
     '[data-dot-object="vtl-file"]'
   );
-  return a.length ? Array.from(a).map((o) => {
-    var n, d;
-    return {
-      inode: (n = o.dataset) == null ? void 0 : n.dotInode,
-      name: (d = o.dataset) == null ? void 0 : d.dotUrl
-    };
-  }) : null;
+  return n.length ? Array.from(n).map((e) => ({
+    inode: e.dataset?.dotInode,
+    name: e.dataset?.dotUrl
+  })) : null;
 }
 export {
-  g as findDotCMSElement,
-  h as findDotCMSVTLData,
-  y as getClosestDotCMSContainerData,
-  u as getDotCMSContainerData,
-  f as getDotCMSContentletsBound,
-  C as getDotCMSPageBounds
+  i as findDotCMSElement,
+  u as findDotCMSVTLData,
+  r as getClosestDotCMSContainerData,
+  a as getDotCMSContainerData,
+  d as getDotCMSContentletsBound,
+  c as getDotCMSPageBounds
 };