@magicfeedback/popup-sdk 1.0.11 → 1.0.12

package/dist/index.js

@@ -1721,10 +1721,18 @@ var require_magicfeedback_sdk_browser = __commonJS({
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  DeepdotsPopups: () => DeepdotsPopups
+  DeepdotsPopups: () => DeepdotsPopups,
+  POPUP_TRIGGER_CONDITION_STATUSES: () => POPUP_TRIGGER_CONDITION_STATUSES
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/types/index.ts
+var POPUP_TRIGGER_CONDITION_STATUSES = [
+  "SHOWED",
+  "PARTIAL",
+  "COMPLETED"
+];
+
 // src/ui/renderPopup.ts
 var import_native = __toESM(require_magicfeedback_sdk_browser());
 function ensureMagicFeedbackStyles(popup) {
@@ -2186,6 +2194,7 @@ async function renderPopup(container, surveyId, productId, actions, emit, onClos
         updateButtons("completed");
         return;
       }
+      emit("popup_clicked", surveyId, { action: "partial" });
       if (total > 1 && progress > 0 && progress < total) {
         updateButtons("in_progress_next");
       } else {
@@ -2222,6 +2231,9 @@ function setupTrigger(popups, trigger) {
     case "exit":
       setupExitTrigger(popups, trigger);
       break;
+    case "event":
+      setupEventTrigger(popups, trigger);
+      break;
     case "click":
       setupClickTrigger(popups, trigger);
       break;
@@ -2230,7 +2242,7 @@ function setupTrigger(popups, trigger) {
 function setupTimeTrigger(popups, trigger) {
   const delay = trigger.value || 5e3;
   setTimeout(() => {
-    popups.triggerSurvey(trigger.surveyId);
+    popups.triggerSurvey(trigger.surveyId, trigger.popupId);
   }, delay);
   popups.debug(`Time trigger set for ${delay}ms`);
 }
@@ -2239,7 +2251,7 @@ function setupScrollTrigger(popups, trigger) {
   const handler = () => {
     const scrollPercentage = window.scrollY / (document.documentElement.scrollHeight - window.innerHeight) * 100;
     if (scrollPercentage >= threshold) {
-      popups.triggerSurvey(trigger.surveyId);
+      popups.triggerSurvey(trigger.surveyId, trigger.popupId);
       window.removeEventListener("scroll", handler);
     }
   };
@@ -2247,86 +2259,103 @@ function setupScrollTrigger(popups, trigger) {
   popups.debug(`Scroll trigger set for ${threshold}%`);
 }
 function setupExitTrigger(popups, trigger) {
-  let fired = false;
-  let lastUrl = typeof window !== "undefined" ? window.location.href : "";
-  const historyRef = typeof window !== "undefined" ? window.history : null;
-  const originalPushState = historyRef ? historyRef.pushState.bind(historyRef) : null;
-  const originalReplaceState = historyRef ? historyRef.replaceState.bind(historyRef) : null;
-  const cleanup = () => {
-    document.removeEventListener("click", handleNavClick, true);
-    window.removeEventListener("popstate", handlePopState);
-    if (historyRef && originalPushState) historyRef.pushState = originalPushState;
-    if (historyRef && originalReplaceState) historyRef.replaceState = originalReplaceState;
+  if (typeof window === "undefined") return;
+  const delaySeconds = parseExitDelaySeconds(trigger.value);
+  const historyRef = window.history;
+  const originalPushState = historyRef.pushState.bind(historyRef);
+  const originalReplaceState = historyRef.replaceState.bind(historyRef);
+  let lastUrl = normalizeUrl(window.location.href);
+  let lastQueuedKey = "";
+  let lastQueuedAt = 0;
+  const queueLeave = (fromRaw, toRaw) => {
+    const from = normalizeUrl(fromRaw);
+    const to = normalizeUrl(toRaw);
+    if (!from || !to || from === to) return;
+    const key = `${from}=>${to}`;
+    const now = Date.now();
+    if (key === lastQueuedKey && now - lastQueuedAt < 150) return;
+    lastQueuedKey = key;
+    lastQueuedAt = now;
+    popups.queueExitPopup(trigger.surveyId, delaySeconds, from, trigger.popupId);
   };
-  const fireOnce = () => {
-    if (fired) return;
-    fired = true;
-    popups.triggerSurvey(trigger.surveyId);
-    cleanup();
+  const handleNavigation = (to) => {
+    const from = lastUrl;
+    queueLeave(from, to);
+    lastUrl = normalizeUrl(to);
   };
-  const handleNavClick = (e) => {
-    if (fired) return;
-    if (e.defaultPrevented) return;
-    if (e.button !== 0) return;
-    if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
-    const target = e.target?.closest?.("a");
-    if (!target) return;
-    const href = target.getAttribute("href");
-    if (!href || href.startsWith("#")) return;
-    const targetAttr = target.getAttribute("target");
-    if (targetAttr && targetAttr !== "_self") return;
-    let url;
-    try {
-      url = new URL(href, window.location.href);
-    } catch {
+  const handleDocumentClick = (event) => {
+    if (event.defaultPrevented) return;
+    if (event.button !== 0) return;
+    if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
+    const anchor = event.target?.closest?.("a");
+    if (!(anchor instanceof HTMLAnchorElement)) return;
+    const href = anchor.getAttribute("href");
+    if (!href || href.startsWith("javascript:") || href.startsWith("mailto:") || href.startsWith("tel:")) {
       return;
     }
-    if (url.origin !== window.location.origin) return;
-    e.preventDefault();
-    fireOnce();
-  };
-  const shouldBlockUrl = (rawUrl) => {
-    if (!rawUrl) return false;
-    let url;
+    const target = anchor.getAttribute("target");
+    if (target && target !== "_self") return;
+    let destination;
     try {
-      url = rawUrl instanceof URL ? rawUrl : new URL(rawUrl, window.location.href);
+      destination = new URL(href, window.location.href);
     } catch {
-      return false;
+      return;
     }
-    if (url.origin !== window.location.origin) return false;
-    if (url.href === window.location.href) return false;
-    return true;
+    if (destination.origin !== window.location.origin) return;
+    queueLeave(window.location.href, destination.href);
+  };
+  const handleHashChange = (event) => {
+    const to = event.newURL || window.location.href;
+    const from = event.oldURL || lastUrl;
+    queueLeave(from, to);
+    lastUrl = normalizeUrl(to);
   };
   const handlePopState = () => {
-    if (fired) return;
-    fireOnce();
-    if (historyRef && originalPushState && lastUrl) {
-      originalPushState(null, document.title, lastUrl);
-    }
+    handleNavigation(window.location.href);
   };
-  if (historyRef && originalPushState && originalReplaceState) {
-    historyRef.pushState = function(data, unused, url) {
-      if (!fired && shouldBlockUrl(url)) {
-        fireOnce();
-        return;
-      }
-      const result = originalPushState(data, unused, url);
-      lastUrl = window.location.href;
-      return result;
-    };
-    historyRef.replaceState = function(data, unused, url) {
-      if (!fired && shouldBlockUrl(url)) {
-        fireOnce();
-        return;
-      }
-      const result = originalReplaceState(data, unused, url);
-      lastUrl = window.location.href;
-      return result;
-    };
-  }
-  document.addEventListener("click", handleNavClick, true);
+  historyRef.pushState = function(data, unused, url) {
+    const from = window.location.href;
+    const result = originalPushState(data, unused, url);
+    queueLeave(from, window.location.href);
+    lastUrl = normalizeUrl(window.location.href);
+    return result;
+  };
+  historyRef.replaceState = function(data, unused, url) {
+    const from = window.location.href;
+    const result = originalReplaceState(data, unused, url);
+    queueLeave(from, window.location.href);
+    lastUrl = normalizeUrl(window.location.href);
+    return result;
+  };
+  document.addEventListener("click", handleDocumentClick, true);
+  window.addEventListener("hashchange", handleHashChange);
   window.addEventListener("popstate", handlePopState);
-  popups.debug("Exit intent trigger set (navigation/spa)");
+  popups.debug("Exit trigger set (deferred to next route)", {
+    surveyId: trigger.surveyId,
+    delaySeconds
+  });
+}
+function setupEventTrigger(popups, trigger) {
+  popups.debug("Event trigger registered", {
+    popupId: trigger.popupId,
+    surveyId: trigger.surveyId,
+    eventName: String(trigger.value || "")
+  });
+}
+function parseExitDelaySeconds(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return Math.max(0, value);
+  }
+  if (typeof value === "string" && value.trim()) {
+    const parsed = Number(value);
+    if (Number.isFinite(parsed)) return Math.max(0, parsed);
+  }
+  return 0;
+}
+function normalizeUrl(value) {
+  if (!value) return "";
+  const withoutIndex = value.replace(/\/index\.html(?=($|[?#]))/i, "");
+  return withoutIndex.length > 1 && withoutIndex.endsWith("/") ? withoutIndex.slice(0, -1) : withoutIndex;
 }
 function setupClickTrigger(popups, trigger) {
   const targetId = typeof trigger.value === "string" ? trigger.value : "";
@@ -2342,7 +2371,7 @@ function setupClickTrigger(popups, trigger) {
     }
     const handler = (e) => {
       if (e.defaultPrevented) return;
-      popups.triggerSurvey(trigger.surveyId);
+      popups.triggerSurvey(trigger.surveyId, trigger.popupId);
       el.removeEventListener("click", handler);
     };
     el.addEventListener("click", handler);
@@ -2464,6 +2493,8 @@ function createDefaultRenderer() {
 }
 
 // src/core/deepdots-popups.ts
+var EXIT_QUEUE_STORAGE_KEY = "__deepdots_exit_popup_queue__";
+var DAY_IN_MS = 24 * 60 * 60 * 1e3;
 var DeepdotsPopups = class {
   constructor() {
     this.config = null;
@@ -2477,10 +2508,12 @@ var DeepdotsPopups = class {
     this.popupsLoaded = false;
     this.pendingAutoLaunch = false;
     this.answeredSurveys = /* @__PURE__ */ new Set();
+    this.surveyProgress = /* @__PURE__ */ new Map();
     this.lastShown = /* @__PURE__ */ new Map();
     // popupId -> timestamp mostrado
     this.surveyToPopupId = /* @__PURE__ */ new Map();
     // surveyId -> popupId
+    this.deferredExitTimers = [];
     this.baseUrl = "";
     this.env = "production";
   }
@@ -2505,15 +2538,17 @@ var DeepdotsPopups = class {
     if (this.renderer.init) this.renderer.init();
     this.setupPopupContainer();
     if (this.config.mode === "client") {
-      this.popupDefinitions = this.config.popups || [];
+      this.popupDefinitions = this.validatePopupDefinitions(this.config.popups || []);
       this.popupsLoaded = true;
       this.configureTriggersFromDefinitions();
+      this.processDeferredExitQueue();
     } else {
       this.fetchPopupsFromServer().then((defs) => {
-        this.popupDefinitions = defs;
+        this.popupDefinitions = this.validatePopupDefinitions(defs);
         this.popupsLoaded = true;
-        this.log("Popups loaded from server (fake)", defs);
+        this.log("Popups loaded from server (fake)", this.popupDefinitions);
         this.configureTriggersFromDefinitions();
+        this.processDeferredExitQueue();
         if (this.pendingAutoLaunch) {
           this.startTriggers();
         }
@@ -2539,7 +2574,6 @@ var DeepdotsPopups = class {
   }
   /** Show a popup immediately (supports legacy ShowOptions and new PopupDefinition) */
   show(options) {
-    console.log("Show popup called with options:", options);
     if (!this.initialized) {
       throw new Error("SDK not initialized. Call init() first.");
     }
@@ -2548,6 +2582,7 @@ var DeepdotsPopups = class {
       const def = options;
       this.log("Showing popup (definition)", def);
       this.surveyToPopupId.set(def.surveyId, def.id);
+      this.lastShown.set(def.id, Date.now());
       this.renderPopup(def.surveyId, def.productId, def.actions);
       this.emitEvent("popup_shown", def.surveyId, { popupId: def.id });
     } else {
@@ -2559,7 +2594,7 @@ var DeepdotsPopups = class {
   }
   /** Mostrar popup por id de definición (usa surveyId interno) */
   showByPopupId(popupId) {
-    const def = this.popupDefinitions.find((p) => p.id === popupId);
+    const def = this.popupDefinitions.find((popup) => popup.id === popupId);
     if (!def) {
       this.log("Popup definition not found", popupId);
       return;
@@ -2577,75 +2612,89 @@ var DeepdotsPopups = class {
   /** Deriva triggers desde las definiciones de popup */
   configureTriggersFromDefinitions() {
     const derived = [];
-    const validDefs = this.validatePopupDefinitions(this.popupDefinitions);
-    console.log("validDefs", validDefs);
-    validDefs.forEach((def) => {
-      if (!def.triggers) return;
-      const t = def.triggers;
-      let type;
-      switch (t.type) {
-        case "time_on_page":
-          type = "time";
-          break;
-        case "scroll":
-          type = "scroll";
-          break;
-        case "exit":
-          type = "exit";
-          break;
-        case "click":
-          type = "click";
-          break;
-        default:
-          this.debug("Unsupported trigger type", t.type);
+    this.debug("Validated popup definitions", this.popupDefinitions);
+    this.popupDefinitions.forEach((def) => {
+      def.triggers.forEach((trigger) => {
+        const type = this.mapPopupTriggerType(trigger.type);
+        if (!type) {
+          this.debug("Unsupported trigger type", trigger.type);
           return;
-      }
-      const value = type === "time" && typeof t.value === "number" ? t.value * 1e3 : t.value;
-      derived.push({ type, value, surveyId: def.surveyId });
+        }
+        const value = type === "time" && typeof trigger.value === "number" ? trigger.value * 1e3 : trigger.value;
+        derived.push({ type, value, surveyId: def.surveyId, popupId: def.id });
+      });
     });
     if (derived.length) {
       this.configureTriggers(derived);
     }
   }
   /** Lógica para evaluar condiciones antes de mostrar una encuesta */
-  triggerSurvey(surveyId) {
-    const def = this.popupDefinitions.find((p) => p.surveyId === surveyId);
+  triggerSurvey(surveyId, popupId) {
+    const def = this.findPopupDefinition(surveyId, popupId);
     if (!def) {
-      this.debug("No popup definition for surveyId", surveyId);
+      this.debug("No popup definition for trigger", { surveyId, popupId });
       return;
     }
     if (!this.shouldShow(def)) {
       this.debug("Conditions prevented showing popup", def.id);
       return;
     }
+    this.showDefinition(def);
+  }
+  /** Trigger popups configured with trigger.type = 'event' and matching trigger.value */
+  triggerEvent(eventName) {
+    if (!this.initialized) {
+      throw new Error("SDK not initialized. Call init() first.");
+    }
+    const normalized = String(eventName || "").trim();
+    if (!normalized) {
+      this.debug("Ignoring empty event trigger name");
+      return;
+    }
+    const candidates = this.popupDefinitions.filter((def) => {
+      return def.triggers.some((trigger) => {
+        const triggerValue = String(trigger.value ?? "").trim();
+        return trigger.type === "event" && triggerValue === normalized;
+      });
+    });
+    if (!candidates.length) {
+      this.debug("No event popup definitions found", { eventName: normalized });
+      return;
+    }
+    const matched = candidates.find((def) => this.shouldShow(def));
+    if (!matched) {
+      this.debug("Event popup blocked by conditions/segments", { eventName: normalized });
+      return;
+    }
+    this.showDefinition(matched);
+  }
+  showDefinition(def) {
     this.show(def);
-    this.lastShown.set(def.id, Date.now());
   }
-  shouldShow(def) {
-    if (!this.matchesSegmentsPath(def)) {
+  shouldShow(def, pathUrl, skipPathCheck = false) {
+    if (!skipPathCheck && !this.matchesSegmentsPath(def, pathUrl)) {
+      return false;
+    }
+    const cooldowns = def.cooldown || [];
+    if (cooldowns.length && !cooldowns.every((cooldown) => this.evaluateCooldown(def, cooldown))) {
       return false;
     }
-    const conditions = def.triggers.condition || [];
-    if (!conditions.length) return true;
-    return conditions.every((c) => this.evaluateCondition(def, c));
+    const legacyConditions = def.legacyConditions || [];
+    if (!legacyConditions.length) return true;
+    return legacyConditions.every((condition) => this.evaluateLegacyCondition(def, condition));
   }
-  matchesSegmentsPath(def) {
+  matchesSegmentsPath(def, pathUrl) {
     const paths = def.segments?.path;
     if (!paths || paths.length === 0) return true;
     if (typeof window === "undefined" || !window.location) {
       this.debug("No window.location available for path comparison", { popupId: def.id, paths });
       return true;
     }
-    const currentPath = window.location.pathname || "";
-    const currentHref = window.location.href || "";
-    const normalize = (value) => {
-      if (value.length > 1 && value.endsWith("/")) return value.slice(0, -1);
-      return value;
-    };
-    const normalizedPath = normalize(currentPath);
-    const normalizedHref = normalize(currentHref);
+    const normalizedHref = this.normalizeUrl(pathUrl || window.location.href || "");
+    const currentUrl = this.safeParseUrl(normalizedHref);
+    const normalizedPath = this.normalizeUrl(currentUrl?.pathname || window.location.pathname || "");
     const matches = paths.some((rawCandidate) => {
-      const candidate = normalize(rawCandidate);
+      const candidate = this.normalizeUrl(rawCandidate);
       let match = false;
       if (candidate.startsWith("http://") || candidate.startsWith("https://")) {
         match = normalizedHref === candidate;
@@ -2668,33 +2717,166 @@ var DeepdotsPopups = class {
     }
     return matches;
   }
-  evaluateCondition(def, condition) {
+  evaluateCooldown(def, condition) {
+    switch (condition.answered) {
+      case "SHOWED":
+        return this.hasCooldownElapsed(this.lastShown.get(def.id), condition.cooldownDays);
+      case "PARTIAL":
+      case "COMPLETED": {
+        const progress = this.surveyProgress.get(def.surveyId);
+        if (!progress || progress.status !== condition.answered) {
+          return true;
+        }
+        return this.hasCooldownElapsed(progress.timestamp, condition.cooldownDays);
+      }
+      default:
+        return true;
+    }
+  }
+  evaluateLegacyCondition(def, condition) {
     if (!condition.answered && this.answeredSurveys.has(def.surveyId)) {
       return false;
     }
-    if (condition.cooldownDays) {
-      const last = this.lastShown.get(def.id);
-      if (last) {
-        const msSince = Date.now() - last;
-        const required = condition.cooldownDays * 24 * 60 * 60 * 1e3;
-        if (msSince < required) return false;
-      }
+    return this.hasCooldownElapsed(this.lastShown.get(def.id), condition.cooldownDays);
+  }
+  hasCooldownElapsed(timestamp, cooldownDays) {
+    if (!timestamp || !cooldownDays) {
+      return true;
     }
-    return true;
+    return Date.now() - timestamp >= cooldownDays * DAY_IN_MS;
   }
   /** Marcar encuesta como contestada externamente */
   markSurveyAnswered(surveyId) {
     this.answeredSurveys.add(surveyId);
+    this.markSurveyProgress(surveyId, "COMPLETED");
+  }
+  /** Queue an exit popup so it can render after navigation */
+  queueExitPopup(surveyId, delaySeconds, sourceUrl, popupId) {
+    const def = this.findPopupDefinition(surveyId, popupId);
+    if (!def) {
+      this.debug("No popup definition for exit trigger", { surveyId, popupId });
+      return;
+    }
+    const originUrl = sourceUrl || (typeof window !== "undefined" ? window.location.href : "");
+    if (!originUrl) {
+      this.debug("Exit popup skipped: missing source URL", { surveyId });
+      return;
+    }
+    if (!this.shouldShow(def, originUrl)) {
+      this.debug("Exit popup skipped by conditions/path", { popupId: def.id, sourceUrl: originUrl });
+      return;
+    }
+    const safeDelayMs = Number.isFinite(delaySeconds) ? Math.max(0, delaySeconds * 1e3) : 0;
+    const deferred = {
+      id: def.id,
+      surveyId: def.surveyId,
+      sourceUrl: this.normalizeUrl(originUrl),
+      dueAt: Date.now() + safeDelayMs
+    };
+    const queue = this.getDeferredExitQueue().filter((item) => !(item.id === deferred.id && item.sourceUrl === deferred.sourceUrl));
+    queue.push(deferred);
+    this.setDeferredExitQueue(queue);
+    this.scheduleDeferredExitPopup(deferred);
+    this.debug("Exit popup queued", deferred);
+  }
+  processDeferredExitQueue() {
+    const queue = this.getDeferredExitQueue();
+    if (!queue.length) return;
+    const pending = [];
+    const now = Date.now();
+    queue.forEach((item) => {
+      const def = this.popupDefinitions.find((popup) => popup.id === item.id && popup.surveyId === item.surveyId);
+      if (!def) {
+        return;
+      }
+      if (item.dueAt <= now) {
+        this.tryShowDeferredExitPopup(item);
+        return;
+      }
+      pending.push(item);
+      this.scheduleDeferredExitPopup(item);
+    });
+    this.setDeferredExitQueue(pending);
+  }
+  scheduleDeferredExitPopup(item) {
+    if (typeof window === "undefined") return;
+    const delay = Math.max(0, item.dueAt - Date.now());
+    const timer = window.setTimeout(() => this.tryShowDeferredExitPopup(item), delay);
+    this.deferredExitTimers.push(timer);
+  }
+  tryShowDeferredExitPopup(item) {
+    const def = this.popupDefinitions.find((popup) => popup.id === item.id && popup.surveyId === item.surveyId);
+    if (!def) {
+      this.removeDeferredExitPopup(item);
+      return;
+    }
+    const currentUrl = typeof window !== "undefined" ? this.normalizeUrl(window.location.href || "") : "";
+    if (!currentUrl || currentUrl === this.normalizeUrl(item.sourceUrl)) {
+      this.removeDeferredExitPopup(item);
+      this.debug("Exit popup dropped because route did not change", item);
+      return;
+    }
+    if (!this.shouldShow(def, void 0, true)) {
+      this.removeDeferredExitPopup(item);
+      this.debug("Exit popup skipped at render-time conditions", item);
+      return;
+    }
+    this.showDefinition(def);
+    this.removeDeferredExitPopup(item);
+  }
+  findPopupDefinition(surveyId, popupId) {
+    if (popupId) {
+      const byId = this.popupDefinitions.find((popup) => popup.id === popupId);
+      if (byId) return byId;
+    }
+    return this.popupDefinitions.find((popup) => popup.surveyId === surveyId);
+  }
+  removeDeferredExitPopup(item) {
+    const queue = this.getDeferredExitQueue().filter((entry) => !(entry.id === item.id && entry.sourceUrl === item.sourceUrl));
+    this.setDeferredExitQueue(queue);
+  }
+  getDeferredExitQueue() {
+    if (typeof window === "undefined") return [];
+    try {
+      const raw = window.sessionStorage.getItem(EXIT_QUEUE_STORAGE_KEY);
+      if (!raw) return [];
+      const parsed = JSON.parse(raw);
+      if (!Array.isArray(parsed)) return [];
+      return parsed.filter((entry) => {
+        if (typeof entry !== "object" || entry === null) return false;
+        const item = entry;
+        return typeof item.id === "string" && typeof item.surveyId === "string" && typeof item.sourceUrl === "string" && typeof item.dueAt === "number" && Number.isFinite(item.dueAt);
+      }).map((item) => ({
+        ...item,
+        sourceUrl: this.normalizeUrl(item.sourceUrl)
+      }));
+    } catch {
+      return [];
+    }
+  }
+  setDeferredExitQueue(queue) {
+    if (typeof window === "undefined") return;
+    try {
+      if (!queue.length) {
+        window.sessionStorage.removeItem(EXIT_QUEUE_STORAGE_KEY);
+        return;
+      }
+      window.sessionStorage.setItem(EXIT_QUEUE_STORAGE_KEY, JSON.stringify(queue));
+    } catch {
+    }
   }
   /** Fetch al servidor para obtener popups */
   async fetchPopupsFromServer() {
     const apiKey = this.config?.apiKey;
     const baseUrl = this.baseUrl;
+    const userId = this.config?.userId;
     if (!apiKey || !baseUrl) {
       this.log("Missing apiKey or baseUrl. Skipping popups fetch.");
       return [];
     }
-    const endpoint = `${baseUrl}/sdk/${encodeURIComponent(apiKey)}/popups`;
+    const filter = userId ? { where: { userId } } : null;
+    const query = filter ? `?filter=${encodeURIComponent(JSON.stringify(filter))}` : "";
+    const endpoint = `${baseUrl}/sdk/${encodeURIComponent(apiKey)}/popups${query}`;
     try {
       const response = await fetch(endpoint);
       if (!response.ok) {
@@ -2707,7 +2889,7 @@ var DeepdotsPopups = class {
         this.log("Unexpected popups payload", parsed);
         return [];
       }
-      console.log("res: ", parsed, this.validatePopupDefinitions(parsed));
+      this.debug("Fetched popups payload", parsed);
       return parsed;
     } catch (error) {
       this.log("Error fetching popups", error);
@@ -2814,6 +2996,9 @@ var DeepdotsPopups = class {
   emitEvent(type, surveyId, data) {
     const event = { type, surveyId, timestamp: Date.now(), data };
     this.log("Event emitted", event);
+    if (type === "popup_clicked" && data?.action === "partial") {
+      this.markSurveyProgress(surveyId, "PARTIAL");
+    }
     if (type === "survey_completed") {
       this.markSurveyAnswered(surveyId);
     }
@@ -2855,26 +3040,103 @@ var DeepdotsPopups = class {
       this.renderer.init();
     }
   }
-  // Type guards
+  normalizeUrl(value) {
+    if (!value) return "";
+    const withoutIndex = value.replace(/\/index\.html(?=($|[?#]))/i, "");
+    return withoutIndex.length > 1 && withoutIndex.endsWith("/") ? withoutIndex.slice(0, -1) : withoutIndex;
+  }
+  safeParseUrl(url) {
+    if (!url) return null;
+    try {
+      return new URL(url, typeof window !== "undefined" ? window.location.href : void 0);
+    } catch {
+      return null;
+    }
+  }
+  mapPopupTriggerType(type) {
+    switch (type) {
+      case "time_on_page":
+        return "time";
+      case "scroll":
+        return "scroll";
+      case "exit":
+        return "exit";
+      case "click":
+        return "click";
+      case "event":
+        return "event";
+      default:
+        return null;
+    }
+  }
+  markSurveyProgress(surveyId, status) {
+    const current = this.surveyProgress.get(surveyId);
+    if (current?.status === "COMPLETED" && status !== "COMPLETED") {
+      return;
+    }
+    this.surveyProgress.set(surveyId, { status, timestamp: Date.now() });
+  }
   isPopupDefinition(value) {
     if (typeof value !== "object" || value === null) return false;
-    const v = value;
-    const trigger = v.triggers || v.triggers;
-    if (!trigger) return false;
-    return typeof v.id === "string" && typeof v.title === "string" && typeof v.message === "string" && typeof v.surveyId === "string" && typeof v.productId === "string";
+    const popup = value;
+    return typeof popup.id === "string" && typeof popup.title === "string" && typeof popup.message === "string" && typeof popup.surveyId === "string" && typeof popup.productId === "string" && Array.isArray(popup.triggers) && popup.triggers.length > 0 && popup.triggers.every((trigger) => this.isPopupTrigger(trigger)) && (!popup.cooldown || popup.cooldown.every((condition) => this.isPopupTriggerCondition(condition)));
+  }
+  isPopupTrigger(value) {
+    if (typeof value !== "object" || value === null) return false;
+    const trigger = value;
+    return this.isPopupTriggerType(trigger.type) && (typeof trigger.value === "number" || typeof trigger.value === "string");
+  }
+  isPopupTriggerType(value) {
+    return value === "time_on_page" || value === "scroll" || value === "exit" || value === "click" || value === "event";
+  }
+  isPopupTriggerCondition(value) {
+    if (typeof value !== "object" || value === null) return false;
+    const condition = value;
+    return POPUP_TRIGGER_CONDITION_STATUSES.includes(condition.answered) && typeof condition.cooldownDays === "number" && Number.isFinite(condition.cooldownDays) && condition.cooldownDays >= 0;
+  }
+  isLegacyPopupTriggerCondition(value) {
+    if (typeof value !== "object" || value === null) return false;
+    const condition = value;
+    if (condition.answered !== void 0 && typeof condition.answered !== "boolean") {
+      return false;
+    }
+    if (condition.cooldownDays !== void 0) {
+      return typeof condition.cooldownDays === "number" && Number.isFinite(condition.cooldownDays) && condition.cooldownDays >= 0;
+    }
+    return true;
+  }
+  normalizeTriggers(value) {
+    const items = Array.isArray(value) ? value : value ? [value] : [];
+    return items.filter((trigger) => this.isPopupTrigger(trigger)).map((trigger) => ({
+      type: trigger.type,
+      value: trigger.value
+    }));
+  }
+  normalizeCooldown(value) {
+    if (!Array.isArray(value)) return [];
+    return value.filter((condition) => this.isPopupTriggerCondition(condition));
+  }
+  normalizeLegacyConditions(value) {
+    if (!Array.isArray(value)) return [];
+    return value.filter((condition) => this.isLegacyPopupTriggerCondition(condition));
   }
   normalizePopupDefinition(def) {
     if (typeof def !== "object" || def === null) return null;
     const raw = def;
-    const trigger = raw.triggers || raw.triggers;
-    if (!trigger) return null;
-    const condition = trigger.condition ?? raw.conditions ?? [];
+    const rawTriggers = raw.triggers ?? raw.trigger;
+    const triggers = this.normalizeTriggers(rawTriggers);
+    if (!triggers.length) return null;
+    const rawTriggerList = Array.isArray(rawTriggers) ? rawTriggers : rawTriggers ? [rawTriggers] : [];
+    const legacyConditions = [
+      ...this.normalizeLegacyConditions(raw.conditions),
+      ...rawTriggerList.flatMap((trigger) => this.normalizeLegacyConditions(trigger.condition))
+    ];
+    const cooldown = this.normalizeCooldown(raw.cooldown);
     return {
       ...raw,
-      triggers: {
-        ...trigger,
-        condition
-      }
+      triggers,
+      cooldown,
+      legacyConditions
     };
   }
   validatePopupDefinitions(defs) {