@antelopejs/dms-marketing 0.6.1 → 0.7.1

package/dist/services/declared-funnel.js

@@ -11,11 +11,6 @@ const declarations_1 = require("./declarations");
 const experiment_definitions_1 = require("./experiment-definitions");
 const website_rules_1 = require("./website-rules");
 const OPERATION = "EnsureFunnel";
-const DECLARED_TRANSITIONS = {
-    draft: ["draft", "running", "stopped"],
-    running: ["running", "stopped"],
-    stopped: ["stopped", "running"],
-};
 const windowSchema = zod_1.z
     .number()
     .finite()
@@ -64,25 +59,6 @@ function declaredContent(id, declaration) {
         experiment: declaredExperiment(id, declaration.experiment),
     };
 }
-function storedContent(funnel) {
-    const experiment = funnel.experiment ?? null;
-    return {
-        websiteId: funnel.websiteId,
-        name: funnel.name,
-        steps: funnel.steps.map((step) => ({ kind: step.kind, value: step.value })),
-        conversionWindowMs: funnel.conversionWindowMs,
-        experiment: experiment
-            ? {
-                key: experiment.key,
-                variations: experiment.variations.map((v) => ({
-                    key: v.key,
-                    weight: v.weight,
-                })),
-                status: experiment.status,
-            }
-            : null,
-    };
-}
 function runInstant(id, field, value) {
     const now = Date.now();
     if (value === undefined) {
@@ -94,52 +70,22 @@ function runInstant(id, field, value) {
     }
     return at;
 }
-function declaredRuns(id, existing, to, declaration) {
-    const runs = existing?.runs.map((run) => ({ ...run })) ?? [];
-    const from = existing?.status ?? "draft";
-    if (!DECLARED_TRANSITIONS[from].includes(to)) {
-        throw refuse(id, `the experiment cannot move from ${from} to ${to}`);
-    }
-    if (from === to) {
-        return runs;
-    }
-    const last = runs[runs.length - 1];
-    if (to === "stopped" && from === "running" && last) {
-        const stoppedAt = runInstant(id, "stoppedAt", declaration?.stoppedAt);
-        if (stoppedAt < last.startedAt) {
-            throw refuse(id, "experiment.stoppedAt: before the run started");
-        }
-        last.stoppedAt = stoppedAt;
-        return runs;
+function declaredRuns(id, to, declaration) {
+    if (to === "draft") {
+        return [];
     }
     const startedAt = runInstant(id, "startedAt", declaration?.startedAt);
-    if (last?.stoppedAt != null && startedAt < last.stoppedAt) {
-        throw refuse(id, "experiment.startedAt: before the previous run ended");
-    }
     if (to === "running") {
-        runs.push({ startedAt, stoppedAt: null });
-        return runs;
+        return [{ startedAt, stoppedAt: null }];
     }
     const stoppedAt = runInstant(id, "stoppedAt", declaration?.stoppedAt);
     if (stoppedAt < startedAt) {
         throw refuse(id, "experiment.stoppedAt: before experiment.startedAt");
     }
-    runs.push({ startedAt, stoppedAt });
-    return runs;
+    return [{ startedAt, stoppedAt }];
 }
-function resolvedExperiment(id, content, current, declaration) {
-    const existing = current?.experiment ?? null;
+function resolvedExperiment(id, content, declaration) {
     const requested = content.experiment;
-    if (existing && existing.status !== "draft") {
-        const frozen = requested !== null &&
-            requested.key === existing.key &&
-            JSON.stringify(requested.variations) ===
-                JSON.stringify(existing.variations.map((v) => ({ key: v.key, weight: v.weight }))) &&
-            content.websiteId === current?.websiteId;
-        if (!frozen) {
-            throw refuse(id, "the experiment has left draft: its key, variations and website can no longer change");
-        }
-    }
     if (!requested) {
         return null;
     }
@@ -147,7 +93,7 @@ function resolvedExperiment(id, content, current, declaration) {
         key: requested.key,
         status: requested.status,
         variations: requested.variations,
-        runs: declaredRuns(id, existing, requested.status, declaration.experiment),
+        runs: declaredRuns(id, requested.status, declaration.experiment),
     };
 }
 async function assertWebsiteOfTenant(id, websiteId, tenantId) {
@@ -161,38 +107,6 @@ async function assertUniqueKey(id, model, websiteId, experiment) {
         throw refuse(id, `another funnel of the website already uses the experiment key "${experiment.key}"`);
     }
 }
-async function refreshFunnel(model, existing, content, declaration) {
-    const id = existing._id;
-    if (!(0, declarations_1.isUntouchedSinceDeclared)(existing.declaredHash, storedContent(existing))) {
-        if (existing.declaredHash) {
-            await model.compareDeclared(existing, { declaredHash: "" });
-        }
-        return { id, status: "kept" };
-    }
-    const declaredHash = (0, declarations_1.contentHash)(content);
-    if (declaredHash === existing.declaredHash) {
-        return { id, status: "unchanged" };
-    }
-    const experiment = resolvedExperiment(id, content, existing, declaration);
-    await assertUniqueKey(id, model, content.websiteId, experiment);
-    const previousWebsiteId = existing.websiteId;
-    const applied = await model.compareDeclared(existing, {
-        websiteId: content.websiteId,
-        name: content.name,
-        steps: content.steps,
-        conversionWindowMs: content.conversionWindowMs,
-        experiment,
-        declaredHash,
-    });
-    if (!applied) {
-        return { id, status: "kept" };
-    }
-    (0, experiment_definitions_1.invalidateExperimentDefinitions)(content.websiteId);
-    if (previousWebsiteId !== content.websiteId) {
-        (0, experiment_definitions_1.invalidateExperimentDefinitions)(previousWebsiteId);
-    }
-    return { id, status: "updated" };
-}
 async function ensureFunnel(declaration) {
     const id = (0, declarations_1.requireDeclaredId)(OPERATION, declaration?.id);
     const tenantId = (0, declarations_1.declaredTenant)(OPERATION, id, declaration.tenantId);
@@ -201,9 +115,9 @@ async function ensureFunnel(declaration) {
     const model = (0, interface_database_decorators_1.GetModel)(db_1.FunnelsModel, tenantId);
     const existing = await model.get(id);
     if (existing) {
-        return refreshFunnel(model, existing, content, declaration);
+        return { id, status: "kept" };
     }
-    const experiment = resolvedExperiment(id, content, undefined, declaration);
+    const experiment = resolvedExperiment(id, content, declaration);
     await assertUniqueKey(id, model, content.websiteId, experiment);
     const funnel = {
         _id: id,
@@ -212,17 +126,15 @@ async function ensureFunnel(declaration) {
         steps: content.steps,
         conversionWindowMs: content.conversionWindowMs,
         experiment,
-        declaredHash: (0, declarations_1.contentHash)(content),
     };
     try {
         await model.insert(funnel);
     }
     catch (err) {
-        const raced = await model.get(id);
-        if (!raced) {
+        if (!(await model.get(id))) {
             throw err;
         }
-        return refreshFunnel(model, raced, content, declaration);
+        return { id, status: "kept" };
     }
     (0, experiment_definitions_1.invalidateExperimentDefinitions)(content.websiteId);
     return { id, status: "created" };

package/dist/services/declared-funnel.js.map

@@ -1 +1 @@
-{"version":3,"file":"declared-funnel.js","sourceRoot":"","sources":["../../src/services/declared-funnel.ts"],"names":[],"mappings":";;AAgUA,oCAkCC;AAlWD,6FAAqE;AAMrE,6BAAwB;AACxB,6BAAmD;AAQnD,iDAI2B;AAC3B,6DAA+D;AAC/D,iEAA6D;AAC7D,iDASwB;AACxB,qEAA2E;AAC3E,mDAA6C;AAE7C,MAAM,SAAS,GAAG,cAAc,CAAC;AAQjC,MAAM,oBAAoB,GAAiD;IACzE,KAAK,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC;IACtC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,YAAY,GAAG,OAAC;KACnB,MAAM,EAAE;KACR,MAAM,EAAE;KACR,GAAG,CAAC,CAAC,CAAC;KACN,GAAG,CAAC,uCAA2B,CAAC;KAChC,QAAQ,EAAE,CAAC;AAkBd,SAAS,MAAM,CAAC,EAAU,EAAE,MAAc;IACxC,OAAO,IAAI,wCAAyB,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,aAAa,CAAI,EAAU,EAAE,KAAa,EAAE,KAAc;IACjE,IAAI,CAAC;QACH,OAAO,KAAK,EAAE,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,CAAC,EAAE,EAAE,GAAG,KAAK,KAAK,IAAA,4BAAa,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CACzB,EAAU,EACV,UAA6D;IAE7D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAClD,IAAA,sCAAoB,EAClB,UAAU;QACR,CAAC,CAAC;YACE,GAAG,EAAE,UAAU,CAAC,GAAG;YACnB,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B;QACH,CAAC,CAAC,IAAI,CACT,CACF,CAAC;IACF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO;QACL,GAAG,EAAE,MAAM,CAAC,GAAG;QACf,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACxC,GAAG,EAAE,CAAC,CAAC,GAAG;YACV,MAAM,EAAE,CAAC,CAAC,MAAM;SACjB,CAAC,CAAC;QACH,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,OAAO;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,EAAU,EACV,WAAuC;IAEvC,MAAM,IAAI,GAAG,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAC1C,0BAAU,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CACnC,CAAC;IACF,MAAM,KAAK,GAAG,aAAa,CAAC,EAAE,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAC5D,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,qBAAqB,CAAC,CACtD,CAAC;IACF,OAAO;QACL,SAAS,EAAE,aAAa,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAC7C,+BAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAC9C;QACD,IAAI;QACJ,KAAK,EAAE,aAAa,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CACrC,IAAA,oCAAgB,EAAC,WAAW,CAAC,KAAK,CAAC,CACpC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QACzD,kBAAkB,EAChB,CAAC,KAAK,IAAI,2CAA+B,CAAC,GAAG,uBAAW;QAC1D,UAAU,EAAE,kBAAkB,CAAC,EAAE,EAAE,WAAW,CAAC,UAAU,CAAC;KAC3D,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC;IAC7C,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3E,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;QAC7C,UAAU,EAAE,UAAU;YACpB,CAAC,CAAC;gBACE,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC5C,GAAG,EAAE,CAAC,CAAC,GAAG;oBACV,MAAM,EAAE,CAAC,CAAC,MAAM;iBACjB,CAAC,CAAC;gBACH,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B;YACH,CAAC,CAAC,IAAI;KACT,CAAC;AACJ,CAAC;AAGD,SAAS,UAAU,CAAC,EAAU,EAAE,KAAa,EAAE,KAAc;IAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,GAAG,CAAC;IACb,CAAC;IACD,MAAM,EAAE,GAAG,IAAA,wBAAS,EAAC,KAAK,CAAC,CAAC;IAC5B,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,GAAG,GAAG,EAAE,CAAC;QACjC,MAAM,MAAM,CAAC,EAAE,EAAE,cAAc,KAAK,sBAAsB,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAQD,SAAS,YAAY,CACnB,EAAU,EACV,QAAiC,EACjC,EAAoB,EACpB,WAA8D;IAE9D,MAAM,IAAI,GAAG,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,MAAM,IAAI,GAAG,QAAQ,EAAE,MAAM,IAAI,OAAO,CAAC;IACzC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7C,MAAM,MAAM,CAAC,EAAE,EAAE,mCAAmC,IAAI,OAAO,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnC,IAAI,EAAE,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,UAAU,CAAC,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACtE,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC/B,MAAM,MAAM,CAAC,EAAE,EAAE,8CAA8C,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACtE,IAAI,IAAI,EAAE,SAAS,IAAI,IAAI,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1D,MAAM,MAAM,CAAC,EAAE,EAAE,qDAAqD,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;IACtE,IAAI,SAAS,GAAG,SAAS,EAAE,CAAC;QAC1B,MAAM,MAAM,CAAC,EAAE,EAAE,mDAAmD,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IACpC,OAAO,IAAI,CAAC;AACd,CAAC;AAOD,SAAS,kBAAkB,CACzB,EAAU,EACV,OAAsB,EACtB,OAA2B,EAC3B,WAAuC;IAEvC,MAAM,QAAQ,GAAG,OAAO,EAAE,UAAU,IAAI,IAAI,CAAC;IAC7C,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IACrC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC5C,MAAM,MAAM,GACV,SAAS,KAAK,IAAI;YAClB,SAAS,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG;YAC9B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC;gBAClC,IAAI,CAAC,SAAS,CACZ,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CACnE;YACH,OAAO,CAAC,SAAS,KAAK,OAAO,EAAE,SAAS,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,MAAM,CACV,EAAE,EACF,qFAAqF,CACtF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO;QACL,GAAG,EAAE,SAAS,CAAC,GAAG;QAClB,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,IAAI,EAAE,YAAY,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,EAAU,EACV,SAAiB,EACjB,QAAgB;IAEhB,MAAM,OAAO,GAAG,MAAM,IAAA,wCAAQ,EAAC,kBAAa,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC7D,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC9C,MAAM,MAAM,CAAC,EAAE,EAAE,eAAe,SAAS,oBAAoB,QAAQ,GAAG,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,EAAU,EACV,KAAmB,EACnB,SAAiB,EACjB,UAAmC;IAEnC,IAAI,UAAU,IAAI,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,MAAM,CACV,EAAE,EACF,kEAAkE,UAAU,CAAC,GAAG,GAAG,CACpF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,KAAmB,EACnB,QAAgB,EAChB,OAAsB,EACtB,WAAuC;IAEvC,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC;IACxB,IACE,CAAC,IAAA,uCAAwB,EAAC,QAAQ,CAAC,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,EACzE,CAAC;QACD,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,CAAC;IACD,MAAM,YAAY,GAAG,IAAA,0BAAW,EAAC,OAAO,CAAC,CAAC;IAC1C,IAAI,YAAY,KAAK,QAAQ,CAAC,YAAY,EAAE,CAAC;QAC3C,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IACrC,CAAC;IACD,MAAM,UAAU,GAAG,kBAAkB,CAAC,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1E,MAAM,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAChE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,SAAS,CAAC;IAC7C,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE;QACpD,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,UAAU;QACV,YAAY;KACb,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,CAAC;IACD,IAAA,wDAA+B,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACnD,IAAI,iBAAiB,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC;QAC5C,IAAA,wDAA+B,EAAC,iBAAiB,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AACnC,CAAC;AAGM,KAAK,UAAU,YAAY,CAChC,WAAuC;IAEvC,MAAM,EAAE,GAAG,IAAA,gCAAiB,EAAC,SAAS,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAA,6BAAc,EAAC,SAAS,EAAE,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,eAAe,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IACjD,MAAM,qBAAqB,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAA,wCAAQ,EAAC,iBAAY,EAAE,QAAQ,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACrC,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,UAAU,GAAG,kBAAkB,CAAC,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IAC3E,MAAM,eAAe,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG;QACb,GAAG,EAAE,EAAE;QACP,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,UAAU;QACV,YAAY,EAAE,IAAA,0BAAW,EAAC,OAAO,CAAC;KACzB,CAAC;IACZ,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,OAAO,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC3D,CAAC;IACD,IAAA,wDAA+B,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACnD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;AACnC,CAAC"}
+{"version":3,"file":"declared-funnel.js","sourceRoot":"","sources":["../../src/services/declared-funnel.ts"],"names":[],"mappings":"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"}

package/dist/services/declared-snapshot.js

@@ -10,17 +10,6 @@ const declarations_1 = require("./declarations");
 const snapshots_1 = require("./snapshots");
 const url_1 = require("./url");
 const OPERATION = "EnsurePageSnapshot";
-function storedContent(row) {
-    return {
-        origin: row.origin,
-        viewport: { width: row.viewportWidth, height: row.viewportHeight },
-        document: { width: row.documentWidth, height: row.documentHeight },
-        colorScheme: row.colorScheme ?? null,
-        html: row.html
-            ? (0, node_zlib_1.gunzipSync)(Buffer.from(row.html, "base64")).toString("utf8")
-            : "",
-    };
-}
 function refuse(url, reason) {
     return new declarations_1.MarketingDeclarationError(OPERATION, url, reason);
 }
@@ -34,21 +23,10 @@ async function requireWebsite(url, websiteId, tenantId) {
     }
     return website;
 }
-async function refreshSnapshot(model, existing, row) {
-    if (!(0, declarations_1.isUntouchedSinceDeclared)(existing.declaredHash, storedContent(existing))) {
-        return "kept";
-    }
-    if (row.declaredHash === existing.declaredHash) {
-        return "unchanged";
-    }
-    const { _id: _unchangedId, ...patch } = row;
-    return (await model.replaceIfUnchanged(existing, patch)) ? "updated" : "kept";
-}
 async function writeSnapshot(tenantId, website, row) {
     const model = (0, interface_database_decorators_1.GetModel)(db_1.PageSnapshotsModel, tenantId);
-    const existing = await model.get(row._id);
-    if (existing) {
-        return refreshSnapshot(model, existing, row);
+    if (await model.get(row._id)) {
+        return "kept";
     }
     if ((await model.countByWebsite(website._id)) >= constants_1.MAX_SNAPSHOTS_PER_WEBSITE) {
         throw refuse(row.url, `the website "${website._id}" already holds its ${constants_1.MAX_SNAPSHOTS_PER_WEBSITE} snapshots`);
@@ -57,11 +35,10 @@ async function writeSnapshot(tenantId, website, row) {
         await model.insert(row);
     }
     catch (err) {
-        const raced = await model.get(row._id);
-        if (!raced) {
+        if (!(await model.get(row._id))) {
             throw err;
         }
-        return refreshSnapshot(model, raced, row);
+        return "kept";
     }
     return "created";
 }
@@ -80,13 +57,7 @@ async function ensurePageSnapshot(declaration) {
     }
     const url = (0, url_1.parseTrackedUrl)(input.url).path;
     const layout = (0, types_1.layoutOfWidth)(input.viewport.width);
-    const content = {
-        origin,
-        viewport: input.viewport,
-        document: input.document,
-        colorScheme: input.colorScheme ?? null,
-        html: (0, snapshots_1.sanitizeSnapshotHtml)(input.html),
-    };
+    const html = (0, snapshots_1.sanitizeSnapshotHtml)(input.html);
     const now = new Date();
     const row = {
         _id: (0, snapshots_1.snapshotId)(website._id, layout, url),
@@ -101,11 +72,11 @@ async function ensurePageSnapshot(declaration) {
         colorScheme: input.colorScheme,
         capturedAt: now,
         bytes: Buffer.byteLength(input.html),
-        html: (0, node_zlib_1.gzipSync)(content.html).toString("base64"),
-        declaredHash: (0, declarations_1.contentHash)(content),
+        scrollRoot: (0, snapshots_1.hasScrollRoot)(html),
+        html: (0, node_zlib_1.gzipSync)(html).toString("base64"),
     };
     const status = await writeSnapshot(tenantId, website, row);
-    if (status === "created" || status === "updated") {
+    if (status === "created") {
         (0, snapshots_1.rememberCaptureTime)(row._id, now.getTime());
     }
     return { url, layout, status };

package/dist/services/declared-snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"declared-snapshot.js","sourceRoot":"","sources":["../../src/services/declared-snapshot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"declared-snapshot.js","sourceRoot":"","sources":["../../src/services/declared-snapshot.ts"],"names":[],"mappings":"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"}

package/dist/services/declared-website.js

@@ -5,9 +5,6 @@ const interface_database_decorators_1 = require("@antelopejs/interface-database-
 const zod_1 = require("zod");
 const db_1 = require("@/db");
 const declarations_1 = require("./declarations");
-const experiment_definitions_1 = require("./experiment-definitions");
-const origin_guard_1 = require("./origin-guard");
-const snapshots_1 = require("./snapshots");
 const website_cache_1 = require("./website-cache");
 const website_rules_1 = require("./website-rules");
 const OPERATION = "EnsureWebsite";
@@ -34,54 +31,17 @@ function declaredContent(id, declaration) {
         snapshotMaskText: data.snapshotMaskText ?? false,
     };
 }
-function storedContent(website) {
-    return {
-        name: website.name,
-        domain: website.domain,
-        extraDomains: website.extraDomains ?? [],
-        trackingEnabled: website.trackingEnabled,
-        snapshotsEnabled: website.snapshotsEnabled ?? false,
-        snapshotMaskText: website.snapshotMaskText ?? false,
-    };
-}
 async function assertHostsFree(website) {
     const conflict = await (0, website_rules_1.tenantHostConflict)(website);
     if (conflict) {
         throw new declarations_1.MarketingDeclarationError(OPERATION, website._id, `the host "${conflict.hostname}" is already declared by the website "${conflict.website.name}"`);
     }
 }
-async function refreshWebsite(existing, tenantId, content) {
-    const id = existing._id;
+function keptWebsite(existing, tenantId) {
     if (existing.tenantId !== tenantId) {
-        throw new declarations_1.MarketingDeclarationError(OPERATION, id, "this id already names a website of another tenant");
-    }
-    if (!(0, declarations_1.isUntouchedSinceDeclared)(existing.declaredHash, storedContent(existing))) {
-        if (existing.declaredHash) {
-            await (0, interface_database_decorators_1.GetModel)(db_1.WebsitesModel).compareDeclared(existing, {
-                declaredHash: "",
-            });
-        }
-        return { id, status: "kept" };
+        throw new declarations_1.MarketingDeclarationError(OPERATION, existing._id, "this id already names a website of another tenant");
     }
-    const declaredHash = (0, declarations_1.contentHash)(content);
-    if (declaredHash === existing.declaredHash) {
-        return { id, status: "unchanged" };
-    }
-    const before = storedContent(existing);
-    const patch = { ...content, declaredHash, updatedAt: new Date() };
-    const refreshed = Object.assign({}, existing, patch);
-    await assertHostsFree(refreshed);
-    if (!(await (0, interface_database_decorators_1.GetModel)(db_1.WebsitesModel).compareDeclared(existing, patch))) {
-        return { id, status: "kept" };
-    }
-    if (before.snapshotsEnabled !== content.snapshotsEnabled ||
-        before.snapshotMaskText !== content.snapshotMaskText) {
-        await (0, snapshots_1.deleteSnapshots)(tenantId, id);
-    }
-    (0, website_cache_1.invalidateWebsiteCache)(id);
-    (0, experiment_definitions_1.invalidateExperimentDefinitions)(id);
-    (0, origin_guard_1.forgetAcceptedSources)(refreshed);
-    return { id, status: "updated" };
+    return { id: existing._id, status: "kept" };
 }
 async function ensureWebsite(declaration) {
     const id = (0, declarations_1.requireDeclaredId)(OPERATION, declaration?.id);
@@ -90,14 +50,13 @@ async function ensureWebsite(declaration) {
     const model = (0, interface_database_decorators_1.GetModel)(db_1.WebsitesModel);
     const existing = await model.get(id);
     if (existing) {
-        return refreshWebsite(existing, tenantId, content);
+        return keptWebsite(existing, tenantId);
     }
     const now = new Date();
     const website = {
         _id: id,
         tenantId,
         ...content,
-        declaredHash: (0, declarations_1.contentHash)(content),
         createdAt: now,
         updatedAt: now,
     };
@@ -110,7 +69,7 @@ async function ensureWebsite(declaration) {
         if (!raced) {
             throw err;
         }
-        return refreshWebsite(raced, tenantId, content);
+        return keptWebsite(raced, tenantId);
     }
     (0, website_cache_1.invalidateWebsiteCache)(id);
     return { id, status: "created" };

package/dist/services/declared-website.js.map

@@ -1 +1 @@
-{"version":3,"file":"declared-website.js","sourceRoot":"","sources":["../../src/services/declared-website.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"declared-website.js","sourceRoot":"","sources":["../../src/services/declared-website.ts"],"names":[],"mappings":"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"}

package/dist/services/funnels-table.d.ts

@@ -3,6 +3,7 @@ import type { CellSubline, DefaultDisplays } from "@antelopejs/interface-dms/bas
 import type { ComposedText } from "@antelopejs/interface-dms/base/types/composed-text";
 import type { ConfirmDialog } from "@antelopejs/interface-dms/base/types/confirm-dialog";
 import type { Funnel } from "@/db/tables/funnels.table";
+import type { ComparisonKind } from "./period";
 import type { FunnelSummaryRow } from "./funnel-report";
 export interface FunnelTableRow {
     _id: string;
@@ -18,7 +19,7 @@ export interface FunnelTableRow {
     comparison: CellSubline | null;
     status: string | null;
 }
-export declare function funnelTablePayload(rows: FunnelSummaryRow[], kind: string | undefined): {
+export declare function funnelTablePayload(rows: FunnelSummaryRow[], kind: string | undefined, comparison?: ComparisonKind): {
     results: FunnelTableRow[];
     total: number;
 };
@@ -27,5 +28,5 @@ export interface FunnelCoverage {
     period: boolean;
     previous: boolean;
 }
-export declare function winnerBanner(rows: FunnelSummaryRow[], coverage?: FunnelCoverage): BannerContent | null;
+export declare function winnerBanner(rows: FunnelSummaryRow[], coverage?: FunnelCoverage, comparison?: ComparisonKind): BannerContent | null;
 export declare function funnelDeleteConfirmation(funnel: Funnel): ConfirmDialog;

package/dist/services/funnels-table.js

@@ -95,7 +95,7 @@ const day = (value) => ({
     value,
     format: "day",
 });
-function comparisonOf(row) {
+function comparisonOf(row, comparison) {
     const experiment = row.experiment;
     if (experiment?.status === "running" && experiment.since) {
         return {
@@ -125,7 +125,7 @@ function comparisonOf(row) {
     const tone = (0, composed_1.deltaTone)(row.deltaPoints);
     return {
         text: {
-            key: `${COMPOSE_PREFIX}delta`,
+            key: `${COMPOSE_PREFIX}${comparison === "previous-year" ? "delta_previous_year" : "delta"}`,
             params: {
                 sign,
                 value: {
@@ -137,7 +137,7 @@ function comparisonOf(row) {
         tone: tone === "success" || tone === "error" ? tone : "muted",
     };
 }
-function funnelTablePayload(rows, kind) {
+function funnelTablePayload(rows, kind, comparison = "previous-period") {
     const results = rows
         .filter((row) => !kind || row.kind === kind)
         .map((row) => ({
@@ -151,7 +151,7 @@ function funnelTablePayload(rows, kind) {
         completed: row.completed,
         conversion: row.conversion,
         conversionText: (0, composed_1.percentText)(row.conversion),
-        comparison: comparisonOf(row),
+        comparison: comparisonOf(row, comparison),
         status: row.experiment?.status ?? null,
     }));
     return { results, total: results.length };
@@ -191,7 +191,7 @@ function winnerOf(rows) {
         ],
     };
 }
-function coverageBanner(coverage) {
+function coverageBanner(coverage, comparison) {
     if (coverage.since === null || (!coverage.period && !coverage.previous)) {
         return null;
     }
@@ -202,15 +202,15 @@ function coverageBanner(coverage) {
         icon: "i-ph-clock-counter-clockwise",
         title: coverage.period
             ? { key: `${COVERAGE_PREFIX}period_title`, params }
-            : `${COVERAGE_PREFIX}previous_title`,
+            : `${COVERAGE_PREFIX}${comparison === "previous-year" ? "previous_year_title" : "previous_title"}`,
         description: { key: `${COVERAGE_PREFIX}description`, params },
     };
 }
-function winnerBanner(rows, coverage) {
+function winnerBanner(rows, coverage, comparison = "previous-period") {
     if (coverage?.period) {
-        return coverageBanner(coverage);
+        return coverageBanner(coverage, comparison);
     }
-    return winnerOf(rows) ?? (coverage ? coverageBanner(coverage) : null);
+    return (winnerOf(rows) ?? (coverage ? coverageBanner(coverage, comparison) : null));
 }
 function funnelDeleteConfirmation(funnel) {
     const running = funnel.experiment?.status === "running";

package/dist/services/funnels-table.js.map

@@ -1 +1 @@
-{"version":3,"file":"funnels-table.js","sourceRoot":"","sources":["../../src/services/funnels-table.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"funnels-table.js","sourceRoot":"","sources":["../../src/services/funnels-table.ts"],"names":[],"mappings":";;AA4LA,gDAsBC;AAkFD,oCAWC;AAOD,4DAcC;AA5TD,iDAA0D;AAC1D,yCAAoD;AAIpD,MAAM,UAAU,GAAG,8BAA8B,CAAC;AAClD,MAAM,aAAa,GAAG,iCAAiC,CAAC;AACxD,MAAM,eAAe,GAAG,mCAAmC,CAAC;AAC5D,MAAM,cAAc,GAAG,0BAA0B,CAAC;AAClD,MAAM,aAAa,GAAG,gCAAgC,CAAC;AAEvD,MAAM,QAAQ,GAAG,EAAE,CAAC;AAEpB,MAAM,UAAU,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,YAAY,EAAW,CAAC;AAuBxE,SAAS,MAAM,CAAC,KAAa;IAC3B,OAAO,MAAM,CAAC,YAAY,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,aAAa,CAAC,KAAa;IAClC,OAAO;QACL,GAAG,EAAE,GAAG,cAAc,QAAQ;QAC9B,MAAM,EAAE;YACN,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;YAC7C,KAAK,EAAE,IAAA,sBAAW,EAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAiB;SACpD;KACF,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,GAAqB;IACrC,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QACnB,OAAO;YACL,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,UAAU,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,EAAE,EAAE;YACtE,IAAI,EAAE,SAAS;SAChB,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;IAClC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO;YACL,IAAI,EAAE;gBACJ,GAAG,EAAE,GAAG,UAAU,OAAO;gBACzB,MAAM,EAAE;oBACN,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE;oBACjD,KAAK,EAAE,GAAG,CAAC,WAAW;iBACvB;aACF;SACF,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAClC,OAAO;YACL,IAAI,EAAE;gBACJ,GAAG,EAAE,GAAG,UAAU,OAAO;gBACzB,MAAM,EAAE;oBACN,GAAG,EAAE,UAAU,CAAC,GAAG;oBACnB,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,EAAE;iBACvD;aACF;SACF,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO;YACL,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,UAAU,YAAY,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,EAAE;YACzE,IAAI,EAAE,UAAU,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;SAC9D,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IACjC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,UAAU,WAAW,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,EAAE;SACzE,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACvB,OAAO;YACL,IAAI,EAAE;gBACJ,GAAG,EAAE,GAAG,UAAU,eAAe;gBACjC,MAAM,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE;aAChC;SACF,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,UAAU,QAAQ;YAC1B,MAAM,EAAE;gBACN,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC5B,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC;aACnC;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,GAAqB;IACpC,OAAO,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC5B,IAAI,CAAC,IAAI,KAAK,QAAQ;QACpB,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;QAC5D,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAC1B,CAAC;AACJ,CAAC;AAED,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAAC;IAC9B,IAAI,EAAE,MAAe;IACrB,KAAK;IACL,MAAM,EAAE,KAAc;CACvB,CAAC,CAAC;AAEH,SAAS,YAAY,CACnB,GAAqB,EACrB,UAA0B;IAE1B,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;IAClC,IAAI,UAAU,EAAE,MAAM,KAAK,SAAS,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACzD,OAAO;YACL,IAAI,EAAE;gBACJ,GAAG,EAAE,GAAG,UAAU,OAAO;gBACzB,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;aACxC;YACD,IAAI,EAAE,QAAQ;SACf,CAAC;IACJ,CAAC;IACD,IACE,UAAU,EAAE,MAAM,KAAK,SAAS;QAChC,UAAU,CAAC,KAAK;QAChB,UAAU,CAAC,KAAK,EAChB,CAAC;QACD,OAAO;YACL,IAAI,EAAE;gBACJ,GAAG,EAAE,GAAG,cAAc,OAAO;gBAC7B,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;aACnE;YACD,IAAI,EAAE,QAAQ;SACf,CAAC;IACJ,CAAC;IAGD,IAAI,GAAG,CAAC,WAAW,KAAK,IAAI,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACzD,MAAM,IAAI,GAAG,IAAA,oBAAS,EAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACxC,OAAO;QACL,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,cAAc,GAAG,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,EAAE;YAC3F,MAAM,EAAE;gBACN,IAAI;gBACJ,KAAK,EAAE;oBACL,GAAG,EAAE,GAAG,cAAc,QAAQ;oBAC9B,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;iBAChE;aACF;SACF;QACD,IAAI,EAAE,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;KAC9D,CAAC;AACJ,CAAC;AAMD,SAAgB,kBAAkB,CAChC,IAAwB,EACxB,IAAwB,EACxB,aAA6B,iBAAiB;IAE9C,MAAM,OAAO,GAAG,IAAI;SACjB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC;SAC3C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACb,GAAG,EAAE,GAAG,CAAC,EAAE;QACX,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;QAC1B,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC;QACrB,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;QACnB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,cAAc,EAAE,IAAA,sBAAW,EAAC,GAAG,CAAC,UAAU,CAAC;QAC3C,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,UAAU,CAAC;QACzC,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,MAAM,IAAI,IAAI;KACvC,CAAC,CAAC,CAAC;IACN,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;AAC5C,CAAC;AAQD,SAAS,QAAQ,CAAC,IAAwB;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK,CACtE,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,EAAE,UAAU,CAAC;IACtC,MAAM,MAAM,GAAG,UAAU,EAAE,MAAM,CAAC;IAClC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE;YACL,GAAG,EAAE,GAAG,aAAa,OAAO;YAC5B,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI,EAAE,IAAA,sBAAW,EAAC,MAAM,CAAC,MAAM,CAAiB;aACjD;SACF;QACD,WAAW,EAAE;YACX,GAAG,EAAE,GAAG,aAAa,aAAa;YAClC,MAAM,EAAE;gBACN,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,SAAS,IAAI,CAAC,CAAC;gBAC7C,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,CAAC;gBAC/C,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,EAAE;gBACtD,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;aAC5D;SACF;QACD,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,GAAG,aAAa,QAAQ;gBAC/B,EAAE,EAAE,GAAG,iCAAqB,cAAc,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;gBACzE,KAAK,EAAE,SAAS;aACjB;SACF;KACF,CAAC;AACJ,CAAC;AAaD,SAAS,cAAc,CACrB,QAAwB,EACxB,UAA0B;IAE1B,IAAI,QAAQ,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;IAC7C,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,8BAA8B;QACpC,KAAK,EAAE,QAAQ,CAAC,MAAM;YACpB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,eAAe,cAAc,EAAE,MAAM,EAAE;YACnD,CAAC,CAAC,GAAG,eAAe,GAAG,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,gBAAgB,EAAE;QACpG,WAAW,EAAE,EAAE,GAAG,EAAE,GAAG,eAAe,aAAa,EAAE,MAAM,EAAE;KAC9D,CAAC;AACJ,CAAC;AAQD,SAAgB,YAAY,CAC1B,IAAwB,EACxB,QAAyB,EACzB,aAA6B,iBAAiB;IAE9C,IAAI,QAAQ,EAAE,MAAM,EAAE,CAAC;QACrB,OAAO,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,CACL,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAC3E,CAAC;AACJ,CAAC;AAOD,SAAgB,wBAAwB,CAAC,MAAc;IACrD,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,MAAM,KAAK,SAAS,CAAC;IACxD,OAAO;QACL,KAAK,EAAE,GAAG,aAAa,OAAO;QAC9B,WAAW,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,EAAE;QACjF,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE;QAChE,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,GAAG,aAAa,SAAS;QACvC,WAAW,EAAE,MAAM,CAAC,IAAI;QACxB,MAAM,EAAE,OAAO;YACb,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,aAAa,gBAAgB,EAAE,CAAC;YAClE,CAAC,CAAC,SAAS;KACd,CAAC;AACJ,CAAC"}

package/dist/services/heatmap.d.ts

@@ -5,14 +5,20 @@ export interface MarketingScrollDepthPayload {
     reached: number[];
     truncated: boolean;
 }
+export declare function mergeClickHeatmaps(heatmaps: MarketingHeatmapPayload[]): MarketingHeatmapPayload;
 export declare function computeClickHeatmap(tenantId: string, websiteIds: string[], path: string, window: QueryWindow): Promise<MarketingHeatmapPayload>;
 export declare function computeScrollDepth(tenantId: string, websiteIds: string[], path: string, window: QueryWindow): Promise<MarketingScrollDepthPayload>;
+export declare function mergeScrollDepths(depths: MarketingScrollDepthPayload[]): MarketingScrollDepthPayload;
 export interface PageActivity {
     clicks: Map<string, number>;
     sampled: Map<string, number>;
     sampleRate: number | null;
 }
 export declare function computePageActivity(tenantId: string, websiteId: string, window: QueryWindow): Promise<PageActivity>;
+export declare function computeScopedPageActivity(sites: Array<{
+    tenantId: string;
+    websiteId: string;
+}>, window: QueryWindow): Promise<PageActivity>;
 export interface HeatmapData {
     events: number;
     snapshots: number;