@dotcms/analytics 1.2.3 → 1.2.4-next.2

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

@@ -1,6 +1,6 @@
-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";
-function $(t) {
+import { ANALYTICS_JS_DEFAULT_PROPERTIES as p, SESSION_STORAGE_KEY as g, DEFAULT_SESSION_TIMEOUT_MINUTES as T, USER_ID_KEY as f, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as I, EXPECTED_UTM_KEYS as D, CONTENTLET_CLASS as h } from "../constants/dot-analytics.constants.js";
+import { DotLogger as y } from "../dot-analytics.logger.js";
+function P(t) {
   const e = [];
   return t.siteAuth?.trim() || e.push('"siteAuth"'), t.server?.trim() || e.push('"server"'), e.length > 0 ? e : null;
 }
@@ -8,7 +8,7 @@ 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 = {
+}, w = {
   getItem: (t) => {
     try {
       return localStorage.getItem(t);
@@ -19,20 +19,49 @@ const l = (t) => {
   setItem: (t, e) => {
     try {
       localStorage.setItem(t, e);
+    } catch (n) {
+      throw console.warn(`DotCMS Analytics [Core]: Could not save ${t} to localStorage`), n;
+    }
+  }
+}, R = {
+  getItem: (t) => {
+    try {
+      return sessionStorage.getItem(t);
+    } catch {
+      return null;
+    }
+  },
+  setItem: (t, e) => {
+    try {
+      sessionStorage.setItem(t, e);
+    } catch (n) {
+      throw console.warn(`DotCMS Analytics [Core]: Could not save ${t} to sessionStorage`), n;
+    }
+  },
+  removeItem: (t) => {
+    try {
+      sessionStorage.removeItem(t);
     } catch {
-      console.warn(`DotCMS Analytics [Core]: Could not save ${t} to localStorage`);
+      console.warn(`DotCMS Analytics [Core]: Could not remove ${t} from sessionStorage`);
     }
   }
-}, I = () => {
-  let t = f.getItem(m);
-  return t || (t = l("user"), f.setItem(m, t)), t;
-}, y = (t) => {
+}, E = () => {
+  let t = w.getItem(f);
+  if (!t) {
+    t = l("user");
+    try {
+      w.setItem(f, t);
+    } catch {
+    }
+  }
+  return t;
+}, C = (t) => {
   const e = new Date(t), n = /* @__PURE__ */ new Date(), s = new Date(
     e.getUTCFullYear(),
     e.getUTCMonth(),
     e.getUTCDate()
-  ), r = new Date(n.getUTCFullYear(), n.getUTCMonth(), n.getUTCDate());
-  return s.getTime() !== r.getTime();
+  ), o = new Date(n.getUTCFullYear(), n.getUTCMonth(), n.getUTCDate());
+  return s.getTime() !== o.getTime();
 }, v = () => {
   const t = Date.now();
   if (typeof window > "u")
@@ -40,16 +69,16 @@ const l = (t) => {
   try {
     const e = sessionStorage.getItem(g);
     if (e) {
-      const { sessionId: r, startTime: o, lastActivity: a } = JSON.parse(e), i = !y(o), c = t - a < p * 60 * 1e3;
-      if (i && c)
+      const { sessionId: o, startTime: r, lastActivity: c } = JSON.parse(e), a = !C(r), i = t - c < T * 60 * 1e3;
+      if (a && i)
         return sessionStorage.setItem(
           g,
           JSON.stringify({
-            sessionId: r,
-            startTime: o,
+            sessionId: o,
+            startTime: r,
             lastActivity: t
           })
-        ), r;
+        ), o;
     }
     const n = l("session"), s = {
       sessionId: n,
@@ -60,58 +89,58 @@ const l = (t) => {
   } catch {
     return l("session_fallback");
   }
-}, P = (t) => {
-  const e = v(), n = I(), s = C();
+}, x = (t) => {
+  const e = v(), n = E(), s = A();
   return {
     site_auth: t.siteAuth,
     session_id: e,
     user_id: n,
     device: s
   };
-}, w = () => d || (d = {
+}, _ = () => 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}` : ""
-}, d), C = () => {
-  const t = w(), e = window.innerWidth || document.documentElement.clientWidth || 0, n = window.innerHeight || document.documentElement.clientHeight || 0;
+}, d), A = () => {
+  const t = _(), 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)
   };
-}, A = (t) => {
+}, b = (t) => {
   const e = t.search;
   if (u && u.search === e)
     return u.params;
   const n = new URLSearchParams(e), s = {};
-  return D.forEach((r) => {
-    const o = n.get(r);
-    if (o) {
-      const a = r.replace("utm_", "");
-      s[a] = o;
+  return D.forEach((o) => {
+    const r = n.get(o);
+    if (r) {
+      const c = o.replace("utm_", "");
+      s[c] = r;
     }
   }), 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")}`;
+    const t = (/* @__PURE__ */ new Date()).getTimezoneOffset(), e = t > 0 ? "-" : "+", n = Math.abs(t), s = Math.floor(n / 60), o = n % 60;
+    return `${e}${s.toString().padStart(2, "0")}:${o.toString().padStart(2, "0")}`;
   } catch {
     return "+00:00";
   }
-}, N = () => {
+}, M = () => {
   try {
-    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}`;
+    const t = /* @__PURE__ */ new Date(), e = O(), n = t.getFullYear(), s = (t.getMonth() + 1).toString().padStart(2, "0"), o = t.getDate().toString().padStart(2, "0"), r = t.getHours().toString().padStart(2, "0"), c = t.getMinutes().toString().padStart(2, "0"), a = t.getSeconds().toString().padStart(2, "0");
+    return `${n}-${s}-${o}T${r}:${c}:${a}${e}`;
   } catch {
     return (/* @__PURE__ */ new Date()).toISOString();
   }
-}, R = (t, e = typeof window < "u" ? window.location : {}) => {
-  const n = N(), s = w(), { properties: r } = t, o = {};
-  Object.keys(r).forEach((c) => {
-    _.includes(c) || (o[c] = r[c]);
+}, Y = (t, e = typeof window < "u" ? window.location : {}) => {
+  const n = M(), s = _(), { properties: o } = t, r = {};
+  Object.keys(o).forEach((i) => {
+    p.includes(i) || (r[i] = o[i]);
   });
-  const a = {
+  const c = {
     url: e.href,
     doc_encoding: s.doc_encoding,
     doc_hash: e.hash,
@@ -119,28 +148,28 @@ const l = (t) => {
     doc_search: e.search,
     doc_host: e.hostname,
     doc_path: e.pathname,
-    title: r.title ?? document?.title
-  }, i = A(e);
+    title: o.title ?? document?.title
+  }, a = b(e);
   return {
     ...t,
-    page: a,
-    ...Object.keys(i).length > 0 && { utm: i },
+    page: c,
+    ...Object.keys(a).length > 0 && { utm: a },
     // Only include custom if there are user-provided properties
-    ...Object.keys(o).length > 0 && { custom: o },
+    ...Object.keys(r).length > 0 && { custom: r },
     local_time: n
   };
 };
-function b(t, e) {
+function L(t, e) {
   let n = 0;
   return (...s) => {
-    const r = Date.now();
-    r - n >= e && (t(...s), n = r);
+    const o = Date.now();
+    o - n >= e && (t(...s), n = o);
   };
 }
-function x(t) {
+function B(t) {
   return t.dataset.dotIdentifier || null;
 }
-function Y(t) {
+function F(t) {
   return {
     identifier: t.dataset.dotIdentifier || "",
     inode: t.dataset.dotInode || "",
@@ -149,51 +178,59 @@ function Y(t) {
     baseType: t.dataset.dotBasetype || ""
   };
 }
-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) => {
+const z = 100, N = () => typeof window < "u" && typeof document < "u", H = () => Array.from(document.querySelectorAll(`.${h}`)), J = (t, e = I) => {
+  const n = L(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) => {
-      if (c.nodeType !== Node.ELEMENT_NODE)
+    ].some((m) => {
+      if (m.nodeType !== Node.ELEMENT_NODE)
         return !1;
-      const S = c;
+      const S = m;
       return S.classList?.contains(h) ? !0 : S.querySelector?.(`.${h}`) !== null;
     })) && n();
-  });
-  return s.observe(document.body, {
+  }), o = document.body || document.documentElement;
+  return o ? s.observe(o, {
     childList: !0,
     subtree: !0,
     attributes: !1,
     characterData: !1
+  }) : window.addEventListener("DOMContentLoaded", () => {
+    document.body && s.observe(document.body, {
+      childList: !0,
+      subtree: !0,
+      attributes: !1,
+      characterData: !1
+    });
   }), s;
-}, z = (t) => {
-  M() && (window.addEventListener("beforeunload", t), window.addEventListener("pagehide", t));
-}, H = (t, e) => {
+}, K = (t) => {
+  N() && (window.addEventListener("beforeunload", t), window.addEventListener("pagehide", t));
+}, j = (t, e) => {
   const n = e.logLevel ?? (e.debug ? "debug" : "warn");
-  return new E("Analytics", t, n);
-}, J = (t, e, n) => [
+  return new y("Analytics", t, n);
+}, W = (t, e, n) => [
   t.impressions && e(t),
   t.clicks && n(t)
 ].filter(Boolean);
 export {
-  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,
+  z as INITIAL_SCAN_DELAY_MS,
+  J as createContentletObserver,
+  j as createPluginLogger,
+  L as createThrottle,
+  Y as enrichPagePayloadOptimized,
+  F as extractContentletData,
+  B as extractContentletIdentifier,
+  b as extractUTMParameters,
+  H as findContentlets,
   l as generateSecureId,
-  P as getAnalyticsContext,
-  C as getDeviceDataForContext,
-  J as getEnhancedTrackingPlugins,
-  N as getLocalTime,
+  x as getAnalyticsContext,
+  A as getDeviceDataForContext,
+  W as getEnhancedTrackingPlugins,
+  M as getLocalTime,
   v as getSessionId,
-  I as getUserId,
-  M as isBrowser,
-  z as setupPluginCleanup,
-  $ as validateAnalyticsConfig
+  E as getUserId,
+  N as isBrowser,
+  R as safeSessionStorage,
+  K as setupPluginCleanup,
+  P as validateAnalyticsConfig
 };

package/lib/react/hook/useContentAnalytics.d.ts

@@ -51,7 +51,6 @@ import { DotCMSAnalytics, DotCMSAnalyticsConfig } from '../../core/shared/models
  * @param config.server - The URL of your DotCMS Analytics server
  * @param config.siteKey - Your unique site key for authentication
  * @param config.debug - Optional. Set to true to see analytics events in the console
- * @returns Object with `track()` and `pageView()` methods for analytics tracking
- * @throws {Error} If the configuration is invalid (missing server or siteKey)
+ * @returns Object with `track()`, `pageView()`, and `conversion()` methods for analytics tracking
  */
 export declare const useContentAnalytics: (config: DotCMSAnalyticsConfig) => DotCMSAnalytics;

package/lib/react/hook/useContentAnalytics.js

@@ -1,35 +1,47 @@
-import { useMemo as s, useCallback as o } from "react";
+import { useMemo as c, useCallback as r } from "react";
 import { getUVEState as l } from "../../../uve/src/lib/core/core.utils.js";
 import "../../../uve/src/internal/constants.js";
-import { initializeAnalytics as m } from "../internal/utils.js";
-const h = (i) => {
-  const t = s(() => m(i), [i.server, i.siteAuth]), e = s(() => !!l(), []);
+import { initializeAnalytics as u } from "../internal/utils.js";
+const A = {
+  track: () => {
+  },
+  pageView: () => {
+  },
+  conversion: () => {
+  }
+}, v = (i) => {
+  const t = c(() => {
+    const e = u(i);
+    return e || (l() ? console.warn(
+      "DotCMS Analytics [React]: Analytics is not initialized because the site is inside the UVE editor. All tracking calls will be ignored."
+    ) : console.error(
+      "DotCMS Analytics [React]: Failed to initialize. Please verify the required configuration (server and siteAuth)."
+    )), e;
+  }, [i.server, i.siteAuth]);
   if (!t)
-    throw new Error(
-      "DotCMS Analytics: Failed to initialize. Please verify the required configuration (server and siteAuth)."
-    );
-  const a = o(
-    (r, n = {}) => {
-      e || t.track(r, n);
+    return A;
+  const o = r(
+    (e, n = {}) => {
+      t.track(e, n);
     },
-    [t, e]
-  ), c = o(
-    (r = {}) => {
-      e || t.pageView(r);
+    [t]
+  ), s = r(
+    (e = {}) => {
+      t.pageView(e);
     },
-    [t, e]
-  ), u = o(
-    (r, n = {}) => {
-      e || t.conversion(r, n);
+    [t]
+  ), a = r(
+    (e, n = {}) => {
+      t.conversion(e, n);
     },
-    [t, e]
+    [t]
   );
   return {
-    track: a,
-    pageView: c,
-    conversion: u
+    track: o,
+    pageView: s,
+    conversion: a
   };
 };
 export {
-  h as useContentAnalytics
+  v as useContentAnalytics
 };

package/lib/react/hook/useRouterTracker.d.ts

@@ -2,7 +2,7 @@ import { DotCMSAnalytics } from '../../core/shared/models';
 /**
  * Tracks page views on route changes using Next.js App Router signals.
  * - Fires a single pageView per unique path+search.
- * - Disabled inside UVE editor.
+ * - Automatically disabled inside UVE editor (analytics instance is null).
  * - Requires Next.js App Router; no SPA fallback.
  *
  * @param analytics Analytics singleton instance; if null, does nothing

package/lib/react/hook/useRouterTracker.js

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

package/package.json

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