@korajs/merge 0.3.2 → 0.5.0

package/dist/index.cjs

@@ -32,12 +32,22 @@ var index_exports = {};
 __export(index_exports, {
   MergeEngine: () => MergeEngine,
   addWinsSet: () => addWinsSet,
+  appendOnlyMerge: () => appendOnlyMerge,
+  applySchemaStrategy: () => applySchemaStrategy,
+  buildMergeRelationLookup: () => buildMergeRelationLookup,
   checkConstraints: () => checkConstraints,
+  checkReferentialIntegrityOnDelete: () => checkReferentialIntegrityOnDelete,
+  counterMerge: () => counterMerge,
   lastWriteWins: () => lastWriteWins,
+  maxMerge: () => maxMerge,
+  mergeAtomicOps: () => mergeAtomicOps,
   mergeField: () => mergeField,
   mergeRichtext: () => mergeRichtext,
+  minMerge: () => minMerge,
   resolveConstraintViolation: () => resolveConstraintViolation,
+  resolveDeleteVsInsertConflict: () => resolveDeleteVsInsertConflict,
   richtextToString: () => richtextToString,
+  serverAuthoritativeMerge: () => serverAuthoritativeMerge,
   stringToRichtextUpdate: () => stringToRichtextUpdate
 });
 module.exports = __toCommonJS(index_exports);
@@ -114,6 +124,68 @@ function addWinsSet(localArray, remoteArray, baseArray) {
   return result;
 }
 
+// src/strategies/atomic-merge.ts
+function mergeAtomicOps(localAtomicOp, remoteAtomicOp, baseValue) {
+  if (localAtomicOp.type !== remoteAtomicOp.type) {
+    return { merged: false };
+  }
+  switch (localAtomicOp.type) {
+    case "increment": {
+      const base = typeof baseValue === "number" ? baseValue : 0;
+      const localDelta = localAtomicOp.value;
+      const remoteDelta = remoteAtomicOp.value;
+      return {
+        merged: true,
+        value: base + localDelta + remoteDelta,
+        strategy: "atomic-increment"
+      };
+    }
+    case "max": {
+      const base = typeof baseValue === "number" ? baseValue : Number.NEGATIVE_INFINITY;
+      const localVal = localAtomicOp.value;
+      const remoteVal = remoteAtomicOp.value;
+      return {
+        merged: true,
+        value: Math.max(base, localVal, remoteVal),
+        strategy: "atomic-max"
+      };
+    }
+    case "min": {
+      const base = typeof baseValue === "number" ? baseValue : Number.POSITIVE_INFINITY;
+      const localVal = localAtomicOp.value;
+      const remoteVal = remoteAtomicOp.value;
+      return {
+        merged: true,
+        value: Math.min(base, localVal, remoteVal),
+        strategy: "atomic-min"
+      };
+    }
+    case "append": {
+      const base = Array.isArray(baseValue) ? [...baseValue] : [];
+      base.push(localAtomicOp.value);
+      base.push(remoteAtomicOp.value);
+      return {
+        merged: true,
+        value: base,
+        strategy: "atomic-append"
+      };
+    }
+    case "remove": {
+      const base = Array.isArray(baseValue) ? [...baseValue] : [];
+      const localItem = localAtomicOp.value;
+      const remoteItem = remoteAtomicOp.value;
+      const result = base.filter((item) => item !== localItem && item !== remoteItem);
+      return {
+        merged: true,
+        value: result,
+        strategy: "atomic-remove"
+      };
+    }
+    default:
+      return { merged: false };
+  }
+}
+
 // src/strategies/yjs-richtext.ts
 var Y = __toESM(require("yjs"), 1);
 var TEXT_KEY = "content";
@@ -150,6 +222,88 @@ function toYjsUpdate(value) {
   throw new Error("Richtext value must be a string, Uint8Array, ArrayBuffer, null, or undefined.");
 }
 
+// src/strategies/schema-strategies.ts
+var import_core2 = require("@korajs/core");
+function counterMerge(localValue, remoteValue, baseValue) {
+  const base = typeof baseValue === "number" ? baseValue : 0;
+  const local = typeof localValue === "number" ? localValue : base;
+  const remote = typeof remoteValue === "number" ? remoteValue : base;
+  const localDelta = local - base;
+  const remoteDelta = remote - base;
+  return base + localDelta + remoteDelta;
+}
+function maxMerge(localValue, remoteValue, baseValue) {
+  const vals = [];
+  if (typeof baseValue === "number") vals.push(baseValue);
+  if (typeof localValue === "number") vals.push(localValue);
+  if (typeof remoteValue === "number") vals.push(remoteValue);
+  if (vals.length === 0) return baseValue;
+  return Math.max(...vals);
+}
+function minMerge(localValue, remoteValue, baseValue) {
+  const vals = [];
+  if (typeof baseValue === "number") vals.push(baseValue);
+  if (typeof localValue === "number") vals.push(localValue);
+  if (typeof remoteValue === "number") vals.push(remoteValue);
+  if (vals.length === 0) return baseValue;
+  return Math.min(...vals);
+}
+function appendOnlyMerge(localValue, remoteValue, baseValue) {
+  const base = Array.isArray(baseValue) ? baseValue : [];
+  const local = Array.isArray(localValue) ? localValue : [];
+  const remote = Array.isArray(remoteValue) ? remoteValue : [];
+  const serialize = (v) => JSON.stringify(v);
+  const baseSet = new Set(base.map(serialize));
+  const result = [...base];
+  const resultSet = new Set(base.map(serialize));
+  for (const item of local) {
+    const s = serialize(item);
+    if (!baseSet.has(s) && !resultSet.has(s)) {
+      result.push(item);
+      resultSet.add(s);
+    }
+  }
+  for (const item of remote) {
+    const s = serialize(item);
+    if (!baseSet.has(s) && !resultSet.has(s)) {
+      result.push(item);
+      resultSet.add(s);
+    }
+  }
+  return result;
+}
+function serverAuthoritativeMerge(_localValue, remoteValue, _baseValue) {
+  return remoteValue;
+}
+function applySchemaStrategy(strategy, localValue, remoteValue, baseValue, localTimestamp, remoteTimestamp) {
+  switch (strategy) {
+    case "counter":
+      return {
+        value: counterMerge(localValue, remoteValue, baseValue),
+        strategyName: "schema-counter"
+      };
+    case "max":
+      return { value: maxMerge(localValue, remoteValue, baseValue), strategyName: "schema-max" };
+    case "min":
+      return { value: minMerge(localValue, remoteValue, baseValue), strategyName: "schema-min" };
+    case "append-only":
+      return {
+        value: appendOnlyMerge(localValue, remoteValue, baseValue),
+        strategyName: "schema-append-only"
+      };
+    case "server-authoritative":
+      return {
+        value: serverAuthoritativeMerge(localValue, remoteValue, baseValue),
+        strategyName: "schema-server-authoritative"
+      };
+    case "lww":
+    case "union":
+      return null;
+    default:
+      return null;
+  }
+}
+
 // src/engine/field-merger.ts
 function mergeField(fieldName, localOp, remoteOp, baseState, fieldDescriptor, resolver) {
   const startTime = Date.now();
@@ -219,6 +373,53 @@ function mergeField(fieldName, localOp, remoteOp, baseState, fieldDescriptor, re
       startTime
     );
   }
+  const localAtomicOp = localOp.atomicOps?.[fieldName];
+  const remoteAtomicOp = remoteOp.atomicOps?.[fieldName];
+  if (localAtomicOp !== void 0 && remoteAtomicOp !== void 0) {
+    const atomicResult = mergeAtomicOps(
+      localAtomicOp,
+      remoteAtomicOp,
+      baseValue
+    );
+    if (atomicResult.merged) {
+      return createResult(
+        atomicResult.value,
+        fieldName,
+        localOp,
+        remoteOp,
+        localValue,
+        remoteValue,
+        baseValue,
+        atomicResult.strategy,
+        1,
+        startTime
+      );
+    }
+  }
+  if (fieldDescriptor.mergeStrategy !== null && fieldDescriptor.mergeStrategy !== void 0) {
+    const schemaResult = applySchemaStrategy(
+      fieldDescriptor.mergeStrategy,
+      localValue,
+      remoteValue,
+      baseValue,
+      localOp.timestamp,
+      remoteOp.timestamp
+    );
+    if (schemaResult !== null) {
+      return createResult(
+        schemaResult.value,
+        fieldName,
+        localOp,
+        remoteOp,
+        localValue,
+        remoteValue,
+        baseValue,
+        schemaResult.strategyName,
+        1,
+        startTime
+      );
+    }
+  }
   return autoMerge(
     fieldName,
     localOp,
@@ -413,13 +614,13 @@ function matchesWhere(record, where) {
 }
 
 // src/constraints/resolvers.ts
-var import_core2 = require("@korajs/core");
+var import_core3 = require("@korajs/core");
 function resolveConstraintViolation(violation, mergedRecord, localOp, remoteOp, baseState) {
   const startTime = Date.now();
   const { constraint } = violation;
   switch (constraint.onConflict) {
     case "last-write-wins": {
-      const comparison = import_core2.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
+      const comparison = import_core3.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
       const winner = comparison >= 0 ? localOp : remoteOp;
       const resolvedRecord = applyWinnerFields(mergedRecord, winner, violation.fields);
       return createResolution(
@@ -433,7 +634,7 @@ function resolveConstraintViolation(violation, mergedRecord, localOp, remoteOp,
       );
     }
     case "first-write-wins": {
-      const comparison = import_core2.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
+      const comparison = import_core3.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
       const winner = comparison <= 0 ? localOp : remoteOp;
       const resolvedRecord = applyWinnerFields(mergedRecord, winner, violation.fields);
       return createResolution(
@@ -449,7 +650,7 @@ function resolveConstraintViolation(violation, mergedRecord, localOp, remoteOp,
     case "priority-field": {
       const priorityField = constraint.priorityField;
       if (priorityField === void 0) {
-        const comparison = import_core2.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
+        const comparison = import_core3.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
         const winner2 = comparison >= 0 ? localOp : remoteOp;
         const resolvedRecord2 = applyWinnerFields(mergedRecord, winner2, violation.fields);
         return createResolution(
@@ -493,7 +694,7 @@ function resolveConstraintViolation(violation, mergedRecord, localOp, remoteOp,
     }
     case "custom": {
       if (constraint.resolve === void 0) {
-        const comparison = import_core2.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
+        const comparison = import_core3.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
         const winner = comparison >= 0 ? localOp : remoteOp;
         const resolvedRecord2 = applyWinnerFields(mergedRecord, winner, violation.fields);
         return createResolution(
@@ -584,8 +785,426 @@ function extractFields(record, fields) {
   return result;
 }
 
+// src/constraints/referential-integrity.ts
+var import_core4 = require("@korajs/core");
+function buildMergeRelationLookup(schema) {
+  const lookup = /* @__PURE__ */ new Map();
+  const relationNames = Object.keys(schema.relations).sort();
+  for (const relationName of relationNames) {
+    const relation = schema.relations[relationName];
+    if (relation === void 0) {
+      continue;
+    }
+    const targetCollection = relation.to;
+    const existing = lookup.get(targetCollection) ?? [];
+    existing.push({
+      relationName,
+      sourceCollection: relation.from,
+      foreignKeyField: relation.field,
+      onDelete: relation.onDelete
+    });
+    lookup.set(targetCollection, existing);
+  }
+  for (const [, relations] of lookup) {
+    relations.sort(
+      (a, b) => a.relationName < b.relationName ? -1 : a.relationName > b.relationName ? 1 : 0
+    );
+  }
+  return lookup;
+}
+async function checkReferentialIntegrityOnDelete(deleteOp, schema, ctx, relationLookup) {
+  const lookup = relationLookup ?? buildMergeRelationLookup(schema);
+  const incomingRelations = lookup.get(deleteOp.collection);
+  if (incomingRelations === void 0 || incomingRelations.length === 0) {
+    return { allowed: true, sideEffectOps: [], traces: [] };
+  }
+  const allSideEffects = [];
+  const allTraces = [];
+  for (const relation of incomingRelations) {
+    const startTime = Date.now();
+    const referencingRecords = await ctx.queryRecords(relation.sourceCollection, {
+      [relation.foreignKeyField]: deleteOp.recordId
+    });
+    const sortedRecords = [...referencingRecords].sort((a, b) => {
+      const idA = String(a.id ?? "");
+      const idB = String(b.id ?? "");
+      return idA < idB ? -1 : idA > idB ? 1 : 0;
+    });
+    if (sortedRecords.length === 0) {
+      const trace = createReferentialTrace(
+        deleteOp,
+        relation,
+        `referential-${relation.onDelete}`,
+        null,
+        null,
+        true,
+        startTime
+      );
+      allTraces.push(trace);
+      continue;
+    }
+    switch (relation.onDelete) {
+      case "restrict": {
+        const trace = createReferentialTrace(
+          deleteOp,
+          relation,
+          "referential-restrict",
+          sortedRecords.map((r) => String(r.id ?? "")),
+          null,
+          false,
+          startTime
+        );
+        allTraces.push(trace);
+        return {
+          allowed: false,
+          sideEffectOps: [],
+          traces: allTraces
+        };
+      }
+      case "cascade": {
+        for (const record of sortedRecords) {
+          const recordId = String(record.id ?? "");
+          allSideEffects.push({
+            type: "delete",
+            collection: relation.sourceCollection,
+            recordId,
+            data: null,
+            previousData: null,
+            policy: "cascade",
+            relationName: relation.relationName
+          });
+        }
+        const trace = createReferentialTrace(
+          deleteOp,
+          relation,
+          "referential-cascade",
+          sortedRecords.map((r) => String(r.id ?? "")),
+          sortedRecords.map((r) => ({ type: "delete", recordId: String(r.id ?? "") })),
+          true,
+          startTime
+        );
+        allTraces.push(trace);
+        break;
+      }
+      case "set-null": {
+        for (const record of sortedRecords) {
+          const recordId = String(record.id ?? "");
+          const previousValue = record[relation.foreignKeyField];
+          allSideEffects.push({
+            type: "update",
+            collection: relation.sourceCollection,
+            recordId,
+            data: { [relation.foreignKeyField]: null },
+            previousData: { [relation.foreignKeyField]: previousValue },
+            policy: "set-null",
+            relationName: relation.relationName
+          });
+        }
+        const trace = createReferentialTrace(
+          deleteOp,
+          relation,
+          "referential-set-null",
+          sortedRecords.map((r) => String(r.id ?? "")),
+          sortedRecords.map((r) => ({
+            type: "update",
+            recordId: String(r.id ?? ""),
+            field: relation.foreignKeyField,
+            newValue: null
+          })),
+          true,
+          startTime
+        );
+        allTraces.push(trace);
+        break;
+      }
+      case "no-action": {
+        const trace = createReferentialTrace(
+          deleteOp,
+          relation,
+          "referential-no-action",
+          sortedRecords.map((r) => String(r.id ?? "")),
+          null,
+          true,
+          startTime
+        );
+        allTraces.push(trace);
+        break;
+      }
+    }
+  }
+  return {
+    allowed: true,
+    sideEffectOps: allSideEffects,
+    traces: allTraces
+  };
+}
+function resolveDeleteVsInsertConflict(deleteOp, insertOp, relation) {
+  const startTime = Date.now();
+  switch (relation.onDelete) {
+    case "restrict": {
+      const trace = createDeleteVsInsertTrace(
+        deleteOp,
+        insertOp,
+        relation,
+        "referential-restrict",
+        "block-delete",
+        startTime
+      );
+      return {
+        action: "block-delete",
+        sideEffects: [],
+        trace
+      };
+    }
+    case "cascade": {
+      const sideEffect = {
+        type: "delete",
+        collection: relation.sourceCollection,
+        recordId: insertOp.recordId,
+        data: null,
+        previousData: null,
+        policy: "cascade",
+        relationName: relation.relationName
+      };
+      const trace = createDeleteVsInsertTrace(
+        deleteOp,
+        insertOp,
+        relation,
+        "referential-cascade",
+        "allow-delete",
+        startTime
+      );
+      return {
+        action: "allow-delete",
+        sideEffects: [sideEffect],
+        trace
+      };
+    }
+    case "set-null": {
+      const fkValue = insertOp.data !== null ? insertOp.data[relation.foreignKeyField] : void 0;
+      const sideEffect = {
+        type: "update",
+        collection: relation.sourceCollection,
+        recordId: insertOp.recordId,
+        data: { [relation.foreignKeyField]: null },
+        previousData: { [relation.foreignKeyField]: fkValue ?? null },
+        policy: "set-null",
+        relationName: relation.relationName
+      };
+      const trace = createDeleteVsInsertTrace(
+        deleteOp,
+        insertOp,
+        relation,
+        "referential-set-null",
+        "allow-delete",
+        startTime
+      );
+      return {
+        action: "allow-delete",
+        sideEffects: [sideEffect],
+        trace
+      };
+    }
+    case "no-action": {
+      const trace = createDeleteVsInsertTrace(
+        deleteOp,
+        insertOp,
+        relation,
+        "referential-no-action",
+        "allow-delete",
+        startTime
+      );
+      return {
+        action: "allow-delete",
+        sideEffects: [],
+        trace
+      };
+    }
+  }
+}
+function createReferentialTrace(deleteOp, relation, strategy, referencingRecordIds, sideEffects, allowed, startTime) {
+  return {
+    operationA: deleteOp,
+    // For referential integrity checks, operationB is the same as operationA
+    // because we are checking constraints against the delete operation itself,
+    // not merging two conflicting operations.
+    operationB: deleteOp,
+    field: `${relation.sourceCollection}.${relation.foreignKeyField}`,
+    strategy,
+    inputA: { recordId: deleteOp.recordId, collection: deleteOp.collection },
+    inputB: referencingRecordIds,
+    base: null,
+    output: { allowed, sideEffects },
+    tier: 2,
+    constraintViolated: `referential:${relation.relationName}`,
+    duration: Date.now() - startTime
+  };
+}
+function createDeleteVsInsertTrace(deleteOp, insertOp, relation, strategy, action, startTime) {
+  return {
+    operationA: deleteOp,
+    operationB: insertOp,
+    field: `${relation.sourceCollection}.${relation.foreignKeyField}`,
+    strategy,
+    inputA: { type: "delete", recordId: deleteOp.recordId, collection: deleteOp.collection },
+    inputB: { type: "insert", recordId: insertOp.recordId, collection: insertOp.collection },
+    base: null,
+    output: { action },
+    tier: 2,
+    constraintViolated: `referential:${relation.relationName}`,
+    duration: Date.now() - startTime
+  };
+}
+
+// src/engine/merge-engine.ts
+var import_core6 = require("@korajs/core");
+
+// src/constraints/state-machine-constraint.ts
+var import_core5 = require("@korajs/core");
+function isValid(sm, from, to) {
+  const constraint = {
+    field: sm.field,
+    collection: "",
+    transitions: sm.transitions
+  };
+  return (0, import_core5.validateTransition)(constraint, from, to).valid;
+}
+function resolveStateMachineMerge(fieldName, localOp, remoteOp, baseState, stateMachine) {
+  const startTime = Date.now();
+  const baseValue = baseState[fieldName];
+  const localData = localOp.data ?? {};
+  const remoteData = remoteOp.data ?? {};
+  const localValue = localData[fieldName];
+  const remoteValue = remoteData[fieldName];
+  const baseStateStr = typeof baseValue === "string" ? baseValue : "";
+  const localStr = typeof localValue === "string" ? localValue : baseStateStr;
+  const remoteStr = typeof remoteValue === "string" ? remoteValue : baseStateStr;
+  const localChanged = fieldName in localData;
+  const remoteChanged = fieldName in remoteData;
+  if (localChanged && !remoteChanged) {
+    const valid = isValid(stateMachine, baseStateStr, localStr);
+    return makeResult(
+      valid ? localStr : baseStateStr,
+      fieldName,
+      localOp,
+      remoteOp,
+      localValue,
+      baseValue,
+      baseValue,
+      valid ? "state-machine-no-conflict-local" : "state-machine-invalid-local",
+      valid ? null : `Invalid transition from "${baseStateStr}" to "${localStr}"`,
+      startTime
+    );
+  }
+  if (!localChanged && remoteChanged) {
+    const valid = isValid(stateMachine, baseStateStr, remoteStr);
+    return makeResult(
+      valid ? remoteStr : baseStateStr,
+      fieldName,
+      localOp,
+      remoteOp,
+      baseValue,
+      remoteValue,
+      baseValue,
+      valid ? "state-machine-no-conflict-remote" : "state-machine-invalid-remote",
+      valid ? null : `Invalid transition from "${baseStateStr}" to "${remoteStr}"`,
+      startTime
+    );
+  }
+  if (!localChanged && !remoteChanged) {
+    return makeResult(
+      baseStateStr,
+      fieldName,
+      localOp,
+      remoteOp,
+      baseValue,
+      baseValue,
+      baseValue,
+      "state-machine-no-conflict-unchanged",
+      null,
+      startTime
+    );
+  }
+  const localValid = isValid(stateMachine, baseStateStr, localStr);
+  const remoteValid = isValid(stateMachine, baseStateStr, remoteStr);
+  if (localValid && remoteValid) {
+    const comparison = import_core5.HybridLogicalClock.compare(localOp.timestamp, remoteOp.timestamp);
+    const winner = comparison >= 0 ? localStr : remoteStr;
+    return makeResult(
+      winner,
+      fieldName,
+      localOp,
+      remoteOp,
+      localValue,
+      remoteValue,
+      baseValue,
+      "state-machine-lww",
+      null,
+      startTime
+    );
+  }
+  if (localValid && !remoteValid) {
+    return makeResult(
+      localStr,
+      fieldName,
+      localOp,
+      remoteOp,
+      localValue,
+      remoteValue,
+      baseValue,
+      "state-machine-valid-wins",
+      `Remote transition from "${baseStateStr}" to "${remoteStr}" is invalid; local "${localStr}" wins`,
+      startTime
+    );
+  }
+  if (!localValid && remoteValid) {
+    return makeResult(
+      remoteStr,
+      fieldName,
+      localOp,
+      remoteOp,
+      localValue,
+      remoteValue,
+      baseValue,
+      "state-machine-valid-wins",
+      `Local transition from "${baseStateStr}" to "${localStr}" is invalid; remote "${remoteStr}" wins`,
+      startTime
+    );
+  }
+  return makeResult(
+    baseStateStr,
+    fieldName,
+    localOp,
+    remoteOp,
+    localValue,
+    remoteValue,
+    baseValue,
+    "state-machine-both-invalid",
+    `Both transitions invalid from "${baseStateStr}": local to "${localStr}", remote to "${remoteStr}". Keeping base state.`,
+    startTime
+  );
+}
+function isStateMachineField(collectionDef, fieldName) {
+  return collectionDef.stateMachine !== void 0 && collectionDef.stateMachine.field === fieldName;
+}
+function makeResult(value, field, operationA, operationB, inputA, inputB, base, strategy, constraintViolated, startTime) {
+  const trace = {
+    operationA,
+    operationB,
+    field,
+    strategy,
+    inputA,
+    inputB,
+    base,
+    output: value,
+    tier: 2,
+    constraintViolated,
+    duration: Date.now() - startTime
+  };
+  return { value, trace };
+}
+
 // src/engine/merge-engine.ts
-var import_core3 = require("@korajs/core");
 var MergeEngine = class {
   /**
    * Merge two concurrent operations with all three tiers.
@@ -607,7 +1226,8 @@ var MergeEngine = class {
       return {
         mergedData: {},
         traces: [],
-        appliedOperation: "merged"
+        appliedOperation: "merged",
+        sideEffects: []
       };
     }
     if (input.local.type === "delete" || input.remote.type === "delete") {
@@ -625,6 +1245,7 @@ var MergeEngine = class {
       );
       let mergedData = fieldResult.mergedData;
       const allTraces = [...fieldResult.traces];
+      const allSideEffects = [...fieldResult.sideEffects];
       for (const violation of violations) {
         const resolution = resolveConstraintViolation(
           violation,
@@ -635,11 +1256,15 @@ var MergeEngine = class {
         );
         mergedData = resolution.resolvedRecord;
         allTraces.push(resolution.trace);
+        if (resolution.sideEffects) {
+          allSideEffects.push(...resolution.sideEffects);
+        }
       }
       return {
         mergedData,
         traces: allTraces,
-        appliedOperation: determineAppliedOperation(allTraces)
+        appliedOperation: determineAppliedOperation(allTraces),
+        sideEffects: allSideEffects
       };
     }
     return fieldResult;
@@ -663,6 +1288,20 @@ var MergeEngine = class {
       if (fieldDef === void 0) {
         continue;
       }
+      if (collectionDef.stateMachine !== void 0 && isStateMachineField(collectionDef, fieldName)) {
+        const smResult = resolveStateMachineMerge(
+          fieldName,
+          local,
+          remote,
+          baseState,
+          collectionDef.stateMachine
+        );
+        mergedData[fieldName] = smResult.value;
+        if (smResult.trace.strategy !== "state-machine-no-conflict-unchanged") {
+          traces.push(smResult.trace);
+        }
+        continue;
+      }
       const resolver = collectionDef.resolvers[fieldName];
       const result = mergeField(fieldName, local, remote, baseState, fieldDef, resolver);
       mergedData[fieldName] = result.value;
@@ -673,7 +1312,8 @@ var MergeEngine = class {
     return {
       mergedData,
       traces,
-      appliedOperation: determineAppliedOperation(traces)
+      appliedOperation: determineAppliedOperation(traces),
+      sideEffects: []
     };
   }
   /**
@@ -682,24 +1322,26 @@ var MergeEngine = class {
    */
   mergeWithDelete(input) {
     const { local, remote } = input;
-    const comparison = import_core3.HybridLogicalClock.compare(local.timestamp, remote.timestamp);
+    const comparison = import_core6.HybridLogicalClock.compare(local.timestamp, remote.timestamp);
     if (comparison >= 0) {
       if (local.type === "delete") {
-        return { mergedData: {}, traces: [], appliedOperation: "local" };
+        return { mergedData: {}, traces: [], appliedOperation: "local", sideEffects: [] };
       }
       return {
         mergedData: { ...input.baseState, ...local.data ?? {} },
         traces: [],
-        appliedOperation: "local"
+        appliedOperation: "local",
+        sideEffects: []
       };
     }
     if (remote.type === "delete") {
-      return { mergedData: {}, traces: [], appliedOperation: "remote" };
+      return { mergedData: {}, traces: [], appliedOperation: "remote", sideEffects: [] };
     }
     return {
       mergedData: { ...input.baseState, ...remote.data ?? {} },
       traces: [],
-      appliedOperation: "remote"
+      appliedOperation: "remote",
+      sideEffects: []
     };
   }
 };
@@ -752,12 +1394,22 @@ function determineAppliedOperation(traces) {
 0 && (module.exports = {
   MergeEngine,
   addWinsSet,
+  appendOnlyMerge,
+  applySchemaStrategy,
+  buildMergeRelationLookup,
   checkConstraints,
+  checkReferentialIntegrityOnDelete,
+  counterMerge,
   lastWriteWins,
+  maxMerge,
+  mergeAtomicOps,
   mergeField,
   mergeRichtext,
+  minMerge,
   resolveConstraintViolation,
+  resolveDeleteVsInsertConflict,
   richtextToString,
+  serverAuthoritativeMerge,
   stringToRichtextUpdate
 });
 //# sourceMappingURL=index.cjs.map