clivly 0.12.0 → 0.14.1

package/{sync-engine-Dwm_KDUS.cjs → sync-engine-BGVDsrOQ.cjs}

@@ -1,67 +1,103 @@
 const require_view_compiler = require("./view-compiler-xiwm5iar.cjs");
 //#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,
@@ -217,6 +265,12 @@ Object.defineProperty(exports, "computeSampleWarnings", {
 		return computeSampleWarnings;
 	}
 });
+Object.defineProperty(exports, "isRemovalAction", {
+	enumerable: true,
+	get: function() {
+		return isRemovalAction;
+	}
+});
 Object.defineProperty(exports, "previewSync", {
 	enumerable: true,
 	get: function() {
@@ -229,6 +283,12 @@ Object.defineProperty(exports, "reconcile", {
 		return reconcile;
 	}
 });
+Object.defineProperty(exports, "resolveActions", {
+	enumerable: true,
+	get: function() {
+		return resolveActions;
+	}
+});
 Object.defineProperty(exports, "runSync", {
 	enumerable: true,
 	get: function() {

package/{sync-engine-V3_UutGv.d.cts → sync-engine-CYsWOujz.d.cts}

@@ -30,77 +30,112 @@ interface SourceRow {
 /** An existing mirror row, as far as reconciliation needs to know. */
 interface MirrorRecord {
   archivedAt: Date | null;
-  /** Host-side company key; only consulted in composite (join-table) mode. */
+  /** Host-side key of the row's primary company (its `company_source_ref`). */
   companyRef: string | null;
+  /**
+   * Host-side keys of the person's ACTIVE memberships. Only listed for
+   * contacts; reconciliation ends any membership absent from a full sync.
+   */
+  companyRefs?: string[];
   id: string;
   sourceRef: string;
 }
-type SyncAction = {
+/**
+ * The tenants a person belongs to, as seen in this batch. Present on contact
+ * actions only (the `memberships` reconcile option); `companyRef` alongside it
+ * is the one picked as primary.
+ */
+interface MembershipSet {
+  companyRefs?: string[];
+}
+type SyncAction = ({
   kind: "create";
   sourceRef: string;
   fields: Record<string, string | null>;
   companyRef: string | null;
-} | {
+} & MembershipSet) | ({
   kind: "update";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyRef: string | null;
-} | {
+} & MembershipSet) | ({
   kind: "restore";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyRef: string | null;
-} | {
+} & MembershipSet) | {
   kind: "archive";
   id: string;
   sourceRef: string;
+} | {
+  kind: "endMembership";
+  id: string;
+  sourceRef: string;
+  companyRef: string;
 };
+/** A membership with its host tenant key resolved to a `crm_companies.id`. */
+interface ResolvedMembership {
+  companyId: string | null;
+  companyRef: string;
+}
+interface ResolvedMembershipSet {
+  memberships?: ResolvedMembership[];
+}
 /** A persist action with the company ref resolved to a `crm_companies.id`. */
-type PersistAction = {
+type PersistAction = ({
   kind: "create";
   sourceRef: string;
   fields: Record<string, string | null>;
   companyId: string | null;
   companySourceRef: string | null;
-} | {
+} & ResolvedMembershipSet) | ({
   kind: "update";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyId: string | null;
   companySourceRef: string | null;
-} | {
+} & ResolvedMembershipSet) | ({
   kind: "restore";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyId: string | null;
   companySourceRef: string | null;
-} | {
+} & ResolvedMembershipSet) | {
   kind: "archive";
   id: string;
   sourceRef: string;
+} | {
+  kind: "endMembership";
+  id: string;
+  sourceRef: string;
+  companyRef: string;
 };
+/** Actions that remove something — only safe when the source set is complete. */
+declare function isRemovalAction(action: {
+  kind: string;
+}): boolean;
 /**
  * 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.
  */
 declare function reconcile(source: SourceRow[], mirror: MirrorRecord[], opts?: {
-  composite?: boolean;
+  memberships?: boolean;
 }): SyncAction[];
 /** DB I/O port. The concrete store lives in the SDK/drizzle package. */
 interface SyncStore {
@@ -147,6 +182,12 @@ interface SyncResult {
     archived: number;
   };
 }
+/**
+ * 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.
+ */
+declare function resolveActions(store: SyncStore, actions: SyncAction[]): Promise<PersistAction[]>;
 /**
  * Run a full sync: compile the config's views, then reconcile + persist each,
  * companies first. Returns per-entity and total action counts.
@@ -181,4 +222,4 @@ declare function previewSync(store: SyncStore, view: CompiledView, opts: {
   sourceTable: string;
 }): Promise<PreviewResult>;
 //#endregion
-export { PreviewWarning as a, SyncResult as c, previewSync as d, reconcile as f, PreviewResult as i, SyncStore as l, MirrorRecord as n, SourceRow as o, runSync as p, PersistAction as r, SyncAction as s, EntitySyncResult as t, computeSampleWarnings as u };
+export { PreviewWarning as a, SyncAction as c, computeSampleWarnings as d, isRemovalAction as f, runSync as g, resolveActions as h, PreviewResult as i, SyncResult as l, reconcile as m, MirrorRecord as n, ResolvedMembership as o, previewSync as p, PersistAction as r, SourceRow as s, EntitySyncResult as t, SyncStore as u };

package/{sync-engine--M9EaONC.d.mts → sync-engine-C_5TpvfX.d.mts}

@@ -30,77 +30,112 @@ interface SourceRow {
 /** An existing mirror row, as far as reconciliation needs to know. */
 interface MirrorRecord {
   archivedAt: Date | null;
-  /** Host-side company key; only consulted in composite (join-table) mode. */
+  /** Host-side key of the row's primary company (its `company_source_ref`). */
   companyRef: string | null;
+  /**
+   * Host-side keys of the person's ACTIVE memberships. Only listed for
+   * contacts; reconciliation ends any membership absent from a full sync.
+   */
+  companyRefs?: string[];
   id: string;
   sourceRef: string;
 }
-type SyncAction = {
+/**
+ * The tenants a person belongs to, as seen in this batch. Present on contact
+ * actions only (the `memberships` reconcile option); `companyRef` alongside it
+ * is the one picked as primary.
+ */
+interface MembershipSet {
+  companyRefs?: string[];
+}
+type SyncAction = ({
   kind: "create";
   sourceRef: string;
   fields: Record<string, string | null>;
   companyRef: string | null;
-} | {
+} & MembershipSet) | ({
   kind: "update";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyRef: string | null;
-} | {
+} & MembershipSet) | ({
   kind: "restore";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyRef: string | null;
-} | {
+} & MembershipSet) | {
   kind: "archive";
   id: string;
   sourceRef: string;
+} | {
+  kind: "endMembership";
+  id: string;
+  sourceRef: string;
+  companyRef: string;
 };
+/** A membership with its host tenant key resolved to a `crm_companies.id`. */
+interface ResolvedMembership {
+  companyId: string | null;
+  companyRef: string;
+}
+interface ResolvedMembershipSet {
+  memberships?: ResolvedMembership[];
+}
 /** A persist action with the company ref resolved to a `crm_companies.id`. */
-type PersistAction = {
+type PersistAction = ({
   kind: "create";
   sourceRef: string;
   fields: Record<string, string | null>;
   companyId: string | null;
   companySourceRef: string | null;
-} | {
+} & ResolvedMembershipSet) | ({
   kind: "update";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyId: string | null;
   companySourceRef: string | null;
-} | {
+} & ResolvedMembershipSet) | ({
   kind: "restore";
   id: string;
   sourceRef: string;
   fields: Record<string, string | null>;
   companyId: string | null;
   companySourceRef: string | null;
-} | {
+} & ResolvedMembershipSet) | {
   kind: "archive";
   id: string;
   sourceRef: string;
+} | {
+  kind: "endMembership";
+  id: string;
+  sourceRef: string;
+  companyRef: string;
 };
+/** Actions that remove something — only safe when the source set is complete. */
+declare function isRemovalAction(action: {
+  kind: string;
+}): boolean;
 /**
  * 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.
  */
 declare function reconcile(source: SourceRow[], mirror: MirrorRecord[], opts?: {
-  composite?: boolean;
+  memberships?: boolean;
 }): SyncAction[];
 /** DB I/O port. The concrete store lives in the SDK/drizzle package. */
 interface SyncStore {
@@ -147,6 +182,12 @@ interface SyncResult {
     archived: number;
   };
 }
+/**
+ * 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.
+ */
+declare function resolveActions(store: SyncStore, actions: SyncAction[]): Promise<PersistAction[]>;
 /**
  * Run a full sync: compile the config's views, then reconcile + persist each,
  * companies first. Returns per-entity and total action counts.
@@ -181,4 +222,4 @@ declare function previewSync(store: SyncStore, view: CompiledView, opts: {
   sourceTable: string;
 }): Promise<PreviewResult>;
 //#endregion
-export { PreviewWarning as a, SyncResult as c, previewSync as d, reconcile as f, PreviewResult as i, SyncStore as l, MirrorRecord as n, SourceRow as o, runSync as p, PersistAction as r, SyncAction as s, EntitySyncResult as t, computeSampleWarnings as u };
+export { PreviewWarning as a, SyncAction as c, computeSampleWarnings as d, isRemovalAction as f, runSync as g, resolveActions as h, PreviewResult as i, SyncResult as l, reconcile as m, MirrorRecord as n, ResolvedMembership as o, previewSync as p, PersistAction as r, SourceRow as s, EntitySyncResult as t, SyncStore as u };