@dotcms/analytics 1.2.5-next.2 → 1.2.5-next.4

package/lib/core/shared/models/data.model.d.ts

@@ -96,8 +96,8 @@ export interface DotCMSEventUtmData {
 export type DotCMSEventPageData = Pick<DotCMSBrowserData, 'url' | 'doc_path' | 'doc_hash' | 'doc_search' | 'doc_host' | 'doc_protocol' | 'doc_encoding'> & {
     /** Page title */
     title: string | undefined;
-    /** Language identifier */
-    language_id?: string;
+    /** Locale identifier (e.g., es-es, en-us) */
+    locale_id: string;
     /** Persona identifier */
     persona?: string;
 };

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

@@ -1,11 +1,11 @@
-import { ANALYTICS_JS_DEFAULT_PROPERTIES as p, SESSION_STORAGE_KEY as g, DEFAULT_SESSION_TIMEOUT_MINUTES as T, USER_ID_KEY as f, EXPECTED_UTM_KEYS as I, CONTENTLET_CLASS as h, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as D } from "../constants/dot-analytics.constants.js";
+import { ANALYTICS_JS_DEFAULT_PROPERTIES as T, SESSION_STORAGE_KEY as h, DEFAULT_SESSION_TIMEOUT_MINUTES as p, USER_ID_KEY as f, EXPECTED_UTM_KEYS as I, CONTENTLET_CLASS as m, DEFAULT_IMPRESSION_MUTATION_OBSERVER_DEBOUNCE_MS as D } 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;
 }
-let d = null, u = null;
-const l = (t) => {
+let u = null, l = null;
+const g = (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}`;
 }, w = {
@@ -48,7 +48,7 @@ const l = (t) => {
 }, E = () => {
   let t = w.getItem(f);
   if (!t) {
-    t = l("user");
+    t = g("user");
     try {
       w.setItem(f, t);
     } catch {
@@ -65,14 +65,14 @@ const l = (t) => {
 }, v = () => {
   const t = Date.now();
   if (typeof window > "u")
-    return l("session_fallback");
+    return g("session_fallback");
   try {
-    const e = sessionStorage.getItem(g);
+    const e = sessionStorage.getItem(h);
     if (e) {
-      const { sessionId: o, startTime: r, lastActivity: c } = JSON.parse(e), a = !C(r), i = t - c < T * 60 * 1e3;
-      if (a && i)
+      const { sessionId: o, startTime: r, lastActivity: c } = JSON.parse(e), a = !C(r), d = t - c < p * 60 * 1e3;
+      if (a && d)
         return sessionStorage.setItem(
-          g,
+          h,
           JSON.stringify({
             sessionId: o,
             startTime: r,
@@ -80,14 +80,14 @@ const l = (t) => {
           })
         ), o;
     }
-    const n = l("session"), s = {
+    const n = g("session"), s = {
       sessionId: n,
       startTime: t,
       lastActivity: t
     };
-    return sessionStorage.setItem(g, JSON.stringify(s)), n;
+    return sessionStorage.setItem(h, JSON.stringify(s)), n;
   } catch {
-    return l("session_fallback");
+    return g("session_fallback");
   }
 }, x = (t) => {
   const e = v(), n = E(), s = A();
@@ -97,11 +97,11 @@ const l = (t) => {
     user_id: n,
     device: s
   };
-}, _ = () => d || (d = {
+}, _ = () => u || (u = {
   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), A = () => {
+}, u), A = () => {
   const t = _(), e = window.innerWidth || document.documentElement.clientWidth || 0, n = window.innerHeight || document.documentElement.clientHeight || 0;
   return {
     screen_resolution: t.screen_resolution ?? "",
@@ -111,8 +111,8 @@ const l = (t) => {
   };
 }, b = (t) => {
   const e = t.search;
-  if (u && u.search === e)
-    return u.params;
+  if (l && l.search === e)
+    return l.params;
   const n = new URLSearchParams(e), s = {};
   return I.forEach((o) => {
     const r = n.get(o);
@@ -120,7 +120,7 @@ const l = (t) => {
       const c = o.replace("utm_", "");
       s[c] = r;
     }
-  }), u = { search: e, params: s }, s;
+  }), l = { 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), o = n % 60;
@@ -138,9 +138,9 @@ const l = (t) => {
 }, 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]);
+    T.includes(i) || (r[i] = o[i]);
   });
-  const c = {
+  const c = t.context?.device?.language?.toLowerCase() ?? "", a = {
     url: e.href,
     doc_encoding: s.doc_encoding,
     doc_hash: e.hash,
@@ -148,12 +148,13 @@ const l = (t) => {
     doc_search: e.search,
     doc_host: e.hostname,
     doc_path: e.pathname,
-    title: o.title ?? document?.title
-  }, a = b(e);
+    title: o.title ?? document?.title,
+    locale_id: c
+  }, d = b(e);
   return {
     ...t,
-    page: c,
-    ...Object.keys(a).length > 0 && { utm: a },
+    page: a,
+    ...Object.keys(d).length > 0 && { utm: d },
     // Only include custom if there are user-provided properties
     ...Object.keys(r).length > 0 && { custom: r },
     local_time: n
@@ -178,16 +179,16 @@ function F(t) {
     baseType: t.dataset.dotBasetype || ""
   };
 }
-const z = 100, N = () => typeof window < "u" && typeof document < "u", H = () => Array.from(document.querySelectorAll(`.${h}`)), J = (t, e = D) => {
+const z = 100, N = () => typeof window < "u" && typeof document < "u", H = () => Array.from(document.querySelectorAll(`.${m}`)), J = (t, e = D) => {
   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((m) => {
-      if (m.nodeType !== Node.ELEMENT_NODE)
+    ].some((i) => {
+      if (i.nodeType !== Node.ELEMENT_NODE)
         return !1;
-      const S = m;
-      return S.classList?.contains(h) ? !0 : S.querySelector?.(`.${h}`) !== null;
+      const S = i;
+      return S.classList?.contains(m) ? !0 : S.querySelector?.(`.${m}`) !== null;
     })) && n();
   }), o = document.body || document.documentElement;
   return o ? s.observe(o, {
@@ -222,7 +223,7 @@ export {
   B as extractContentletIdentifier,
   b as extractUTMParameters,
   H as findContentlets,
-  l as generateSecureId,
+  g as generateSecureId,
   x as getAnalyticsContext,
   A as getDeviceDataForContext,
   W as getEnhancedTrackingPlugins,

package/package.json

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