clivly 0.12.0 → 0.14.1

package/{sync-engine-Df2MCs_n.mjs → sync-engine-DH058G3w.mjs}

@@ -1,67 +1,103 @@
 import { r as compileEntityViews } from "./view-compiler-C-6RydKK.mjs";
 //#region ../core/src/sync-engine.ts
+/** Actions that remove something — only safe when the source set is complete. */
+function isRemovalAction(action) {
+	return action.kind === "archive" || action.kind === "endMembership";
+}
+/** Every distinct non-null company ref in a person's rows, in arrival order. */
+function collectCompanyRefs(rows) {
+	const refs = [];
+	for (const row of rows) {
+		const ref = row.companyRef ?? null;
+		if (ref !== null && !refs.includes(ref)) refs.push(ref);
+	}
+	return refs;
+}
+/**
+* The primary company for a person: the one they already have while it is
+* still one of theirs — so the displayed organisation never flips between
+* syncs — otherwise the lowest ref, which is deterministic for a new person.
+*/
+function pickPrimaryRef(refs, current) {
+	if (current !== null && refs.includes(current)) return current;
+	return [...refs].sort()[0] ?? null;
+}
+/**
+* The mirror row that represents a source identity. Normally there is exactly
+* one; before contact consolidation has run there can be several (one per
+* tenant), and the live, earliest-listed one stands for the person while the
+* rest are left alone for the consolidation script to fold in.
+*/
+function canonicalMirror(rows) {
+	return rows.find((row) => !row.archivedAt) ?? rows[0];
+}
 /**
 * Diff a view's rows against the current mirror population for one entity.
 *
-* - source row with no mirror row      → create
-* - source row with a live mirror row  → update (overwrite identity fields)
-* - source row with an archived mirror → restore (re-activate + update)
-* - live mirror row absent from source → archive (soft delete, keep history)
-* - archived mirror row absent from source → no-op
+* - source identity with no mirror row      → create
+* - source identity with a live mirror row  → update (overwrite identity fields)
+* - source identity with an archived mirror → restore (re-activate + update)
+* - live mirror row absent from source      → archive (soft delete, keep history)
+* - archived mirror row absent from source  → no-op
 *
-* Source rows are de-duplicated by the reconciliation key (first wins). In
-* simple mode (default) the key is `sourceRef`. In composite mode — used for
-* `through` (join-table) entities, where the compiled view fans a person out
-* into one row per membership — the key is `(sourceRef, companyRef)`, so a
-* person in several companies materializes one mirror row per company and a
-* single membership leaving archives only that one row.
+* Identity is always the source primary key. A `through` (join-table) view
+* fans one person out into a row per tenant; those rows are ONE person, so they
+* collapse into one action. With `memberships` on (contacts), that action also
+* carries every tenant ref the person was seen with, and each tenant the mirror
+* still has as active but the source no longer lists yields `endMembership` —
+* a person leaving one tenant ends that membership and keeps the others.
 */
 function reconcile(source, mirror, opts = {}) {
-	const keyOf = (sourceRef, companyRef) => opts.composite ? `${sourceRef}\0${companyRef ?? ""}` : sourceRef;
-	const seen = /* @__PURE__ */ new Set();
-	const rows = [];
-	for (const row of source) {
-		const key = keyOf(row.sourceRef, row.companyRef ?? null);
-		if (!seen.has(key)) {
-			seen.add(key);
-			rows.push(row);
-		}
-	}
-	const byKey = new Map(mirror.map((m) => [keyOf(m.sourceRef, m.companyRef), m]));
-	const liveKeys = /* @__PURE__ */ new Set();
+	const rowsByRef = groupBySourceRef(source);
+	const mirrorByRef = groupBySourceRef(mirror);
 	const actions = [];
-	for (const row of rows) {
-		const companyRef = row.companyRef ?? null;
-		const key = keyOf(row.sourceRef, companyRef);
-		liveKeys.add(key);
-		const existing = byKey.get(key);
-		if (!existing) actions.push({
-			kind: "create",
-			sourceRef: row.sourceRef,
-			fields: row.fields,
-			companyRef
-		});
-		else if (existing.archivedAt) actions.push({
-			kind: "restore",
-			id: existing.id,
-			sourceRef: row.sourceRef,
-			fields: row.fields,
-			companyRef
-		});
-		else actions.push({
-			kind: "update",
-			id: existing.id,
-			sourceRef: row.sourceRef,
-			fields: row.fields,
-			companyRef
-		});
+	for (const [sourceRef, rows] of rowsByRef) {
+		const existing = canonicalMirror(mirrorByRef.get(sourceRef) ?? []);
+		actions.push(...personActions(sourceRef, rows, existing, opts));
+	}
+	for (const m of mirror) if (!(rowsByRef.has(m.sourceRef) || m.archivedAt)) actions.push({
+		kind: "archive",
+		id: m.id,
+		sourceRef: m.sourceRef
+	});
+	return actions;
+}
+function groupBySourceRef(items) {
+	const out = /* @__PURE__ */ new Map();
+	for (const item of items) {
+		const list = out.get(item.sourceRef);
+		if (list) list.push(item);
+		else out.set(item.sourceRef, [item]);
 	}
-	for (const m of mirror) {
-		const key = keyOf(m.sourceRef, m.companyRef);
-		if (!(liveKeys.has(key) || m.archivedAt)) actions.push({
-			kind: "archive",
-			id: m.id,
-			sourceRef: m.sourceRef
+	return out;
+}
+/** The create/update/restore for one present person, plus any ended tenants. */
+function personActions(sourceRef, rows, existing, opts) {
+	const first = rows[0];
+	const refs = collectCompanyRefs(rows);
+	const companyRef = opts.memberships ? pickPrimaryRef(refs, existing?.companyRef ?? null) : first.companyRef ?? null;
+	const membershipSet = opts.memberships ? { companyRefs: refs } : {};
+	if (!existing) return [{
+		kind: "create",
+		sourceRef,
+		fields: first.fields,
+		companyRef,
+		...membershipSet
+	}];
+	const actions = [{
+		kind: existing.archivedAt ? "restore" : "update",
+		id: existing.id,
+		sourceRef,
+		fields: first.fields,
+		companyRef,
+		...membershipSet
+	}];
+	if (opts.memberships) {
+		for (const held of existing.companyRefs ?? []) if (!refs.includes(held)) actions.push({
+			kind: "endMembership",
+			id: existing.id,
+			sourceRef,
+			companyRef: held
 		});
 	}
 	return actions;
@@ -74,20 +110,40 @@ const CONCEPT_ORDER = {
 function syncOrder(a, b) {
 	return (CONCEPT_ORDER[a.concept] ?? 99) - (CONCEPT_ORDER[b.concept] ?? 99);
 }
+/**
+* Resolve each action's host-side company refs — the primary one and, for
+* contacts, every membership — to `crm_companies.id`s in one lookup. Shared by
+* `runSync` and the cloud push receiver so both persist identical actions.
+*/
 async function resolveActions(store, actions) {
 	const refs = /* @__PURE__ */ new Set();
-	for (const action of actions) if (action.kind !== "archive" && action.companyRef) refs.add(action.companyRef);
+	for (const action of actions) {
+		if (isRemovalAction(action) || !("fields" in action)) continue;
+		if (action.companyRef) refs.add(action.companyRef);
+		for (const ref of action.companyRefs ?? []) refs.add(ref);
+	}
 	const resolved = refs.size ? await store.resolveCompanyRefs([...refs]) : /* @__PURE__ */ new Map();
 	return actions.map((action) => {
-		if (action.kind === "archive") return action;
+		if (action.kind === "archive" || action.kind === "endMembership") return action;
 		const companyId = action.companyRef ? resolved.get(action.companyRef) ?? null : null;
-		return {
-			kind: action.kind,
-			id: "id" in action ? action.id : "",
+		const memberships = action.companyRefs?.map((companyRef) => ({
+			companyRef,
+			companyId: resolved.get(companyRef) ?? null
+		}));
+		const base = {
 			sourceRef: action.sourceRef,
 			fields: action.fields,
 			companyId,
-			companySourceRef: action.companyRef ?? null
+			companySourceRef: action.companyRef ?? null,
+			...memberships ? { memberships } : {}
+		};
+		return action.kind === "create" ? {
+			kind: "create",
+			...base
+		} : {
+			kind: action.kind,
+			id: action.id,
+			...base
 		};
 	});
 }
@@ -96,19 +152,11 @@ function emptyTally() {
 		create: 0,
 		update: 0,
 		restore: 0,
-		archive: 0
+		archive: 0,
+		endMembership: 0
 	};
 }
 /**
-* An entity whose company relationship is a `through` (join-table) join fans out
-* into one source row per membership, so its mirror must be keyed compositely.
-*/
-function isCompositeEntity(config, entityKey) {
-	const entity = config.entities[entityKey];
-	if (!entity?.relationships) return false;
-	return Object.values(entity.relationships).some((rel) => "through" in rel.via);
-}
-/**
 * Run a full sync: compile the config's views, then reconcile + persist each,
 * companies first. Returns per-entity and total action counts.
 */
@@ -129,7 +177,7 @@ async function runSync(config, store, options = {}) {
 			role: view.role,
 			objectTypeId
 		})]);
-		const actions = reconcile(source, mirror, { composite: isCompositeEntity(config, view.entityKey) }).filter((a) => !(options.sample && a.kind === "archive"));
+		const actions = reconcile(source, mirror, { memberships: view.concept === "contact" }).filter((a) => !(options.sample && isRemovalAction(a)));
 		const persistActions = await resolveActions(store, actions);
 		await store.persist({
 			concept: view.concept,
@@ -211,4 +259,4 @@ async function previewSync(store, view, opts) {
 	};
 }
 //#endregion
-export { runSync as i, previewSync as n, reconcile as r, computeSampleWarnings as t };
+export { resolveActions as a, reconcile as i, isRemovalAction as n, runSync as o, previewSync as r, computeSampleWarnings as t };

package/vite.d.cts

@@ -1,4 +1,4 @@
-import { o as ClivlySDK } from "./namespace-probe-C5RLl74M.cjs";
+import { o as ClivlySDK } from "./namespace-probe-H7yWc0JV.cjs";
 import { Plugin } from "vite";
 //#region ../sdk/src/vite.d.ts
 export interface ClivlyViteOptions {

package/vite.d.mts

@@ -1,4 +1,4 @@
-import { o as ClivlySDK } from "./namespace-probe-CNQKSmxz.mjs";
+import { o as ClivlySDK } from "./namespace-probe-DykR0kgh.mjs";
 import { Plugin } from "vite";
 //#region ../sdk/src/vite.d.ts
 export interface ClivlyViteOptions {