json-patch-to-crdt 0.1.0 → 0.1.1

package/README.md

@@ -64,6 +64,7 @@ import { applyPatch, createState, forkState, mergeState, toJson } from "json-pat
 const origin = createState({ count: 0, items: ["a"] }, { actor: "origin" });
 
 // Fork shared-origin replicas with local actor identities.
+// Actor IDs must be unique per live peer (same-actor reuse is rejected by default).
 const peerA = forkState(origin, "A");
 const peerB = forkState(origin, "B");
 
@@ -315,7 +316,7 @@ Internals helpers like `jsonPatchToCrdtSafe` and `tryMergeDoc` return the same s
 ### State helpers
 
 - `createState(initial, { actor, start? })` - Create a new CRDT state from JSON.
-- `forkState(origin, actor)` - Fork a shared-origin replica with a new local actor ID.
+- `forkState(origin, actor, options?)` - Fork a shared-origin replica with a new local actor ID. Reusing `origin` actor IDs is rejected by default (`options.allowActorReuse: true` to opt in explicitly).
 - `applyPatch(state, patch, options?)` - Apply a patch immutably, returning a new state (`semantics: "sequential"` by default).
 - `applyPatchInPlace(state, patch, options?)` - Apply a patch by mutating state in place (`atomic: true` by default).
 - `tryApplyPatch(state, patch, options?)` - Non-throwing immutable apply (`{ ok: true, state }` or `{ ok: false, error }`).
@@ -394,6 +395,9 @@ No. It is deterministic and usually compact, but not guaranteed to be minimal.
 **How do I merge states from two peers?**
 Use `forkState(origin, actor)` to create each peer from the same origin, then `mergeState(local, remote, { actor: localActorId })`. Each peer should keep a stable unique actor ID across merges. See the [Multi-Peer Sync](#multi-peer-sync) example above.
 
+**Why did `forkState` throw about actor uniqueness?**
+By default, `forkState` blocks reusing `origin.clock.actor` because same-actor forks can mint duplicate dots and produce order-dependent merges. If you intentionally need same-actor cloning, pass `forkState(origin, actor, { allowActorReuse: true })`.
+
 **Why can my local counter jump after a merge?**
 Array inserts that target an existing predecessor may need to outrank sibling insert dots for deterministic ordering. The library can fast-forward the local counter in constant time to avoid expensive loops, but the resulting counter value may still jump upward when merging with peers that already have high counters.
 

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { $ as PatchErrorReason, C as toJson, D as ActorId, E as validateJsonPatch, G as JsonPrimitive, H as JsonPatch, I as CrdtState, K as JsonValue, L as DiffOptions, M as ApplyPatchOptions, O as ApplyError, S as forkState, T as tryApplyPatchInPlace, U as JsonPatchOp, Y as MergeStateOptions, _ as PatchError, a as tryMergeState, b as applyPatchInPlace, ct as SerializedState, et as PatchSemantics, f as diffJsonPatch, ft as TryMergeStateResult, j as ApplyPatchInPlaceOptions, l as serializeState, lt as TryApplyPatchInPlaceResult, pt as ValidatePatchResult, r as mergeState, s as deserializeState, t as MergeError, ut as TryApplyPatchResult, v as applyPatch, w as tryApplyPatch, x as createState } from "./merge-BrNGGkXj.mjs";
-export { type ActorId, type ApplyError, type ApplyPatchInPlaceOptions, type ApplyPatchOptions, type CrdtState, type DiffOptions, type JsonPatch, type JsonPatchOp, type JsonPrimitive, type JsonValue, MergeError, type MergeStateOptions, PatchError, type PatchErrorReason, type PatchSemantics, type SerializedState, type TryApplyPatchInPlaceResult, type TryApplyPatchResult, type TryMergeStateResult, type ValidatePatchResult, applyPatch, applyPatchInPlace, createState, deserializeState, diffJsonPatch, forkState, mergeState, serializeState, toJson, tryApplyPatch, tryApplyPatchInPlace, tryMergeState, validateJsonPatch };
+import { C as toJson, D as ActorId, E as validateJsonPatch, I as CrdtState, K as JsonPrimitive, L as DiffOptions, M as ApplyPatchOptions, O as ApplyError, S as forkState, T as tryApplyPatchInPlace, U as JsonPatch, V as ForkStateOptions, W as JsonPatchOp, X as MergeStateOptions, _ as PatchError, a as tryMergeState, b as applyPatchInPlace, dt as TryApplyPatchResult, et as PatchErrorReason, f as diffJsonPatch, j as ApplyPatchInPlaceOptions, l as serializeState, lt as SerializedState, mt as ValidatePatchResult, pt as TryMergeStateResult, q as JsonValue, r as mergeState, s as deserializeState, t as MergeError, tt as PatchSemantics, ut as TryApplyPatchInPlaceResult, v as applyPatch, w as tryApplyPatch, x as createState } from "./merge-DQ_KDtnE.mjs";
+export { type ActorId, type ApplyError, type ApplyPatchInPlaceOptions, type ApplyPatchOptions, type CrdtState, type DiffOptions, type ForkStateOptions, type JsonPatch, type JsonPatchOp, type JsonPrimitive, type JsonValue, MergeError, type MergeStateOptions, PatchError, type PatchErrorReason, type PatchSemantics, type SerializedState, type TryApplyPatchInPlaceResult, type TryApplyPatchResult, type TryMergeStateResult, type ValidatePatchResult, applyPatch, applyPatchInPlace, createState, deserializeState, diffJsonPatch, forkState, mergeState, serializeState, toJson, tryApplyPatch, tryApplyPatchInPlace, tryMergeState, validateJsonPatch };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { $ as PatchErrorReason, C as toJson, D as ActorId, E as validateJsonPatch, G as JsonPrimitive, H as JsonPatch, I as CrdtState, K as JsonValue, L as DiffOptions, M as ApplyPatchOptions, O as ApplyError, S as forkState, T as tryApplyPatchInPlace, U as JsonPatchOp, Y as MergeStateOptions, _ as PatchError, a as tryMergeState, b as applyPatchInPlace, ct as SerializedState, et as PatchSemantics, f as diffJsonPatch, ft as TryMergeStateResult, j as ApplyPatchInPlaceOptions, l as serializeState, lt as TryApplyPatchInPlaceResult, pt as ValidatePatchResult, r as mergeState, s as deserializeState, t as MergeError, ut as TryApplyPatchResult, v as applyPatch, w as tryApplyPatch, x as createState } from "./merge-DW1-p9Hj.js";
-export { type ActorId, type ApplyError, type ApplyPatchInPlaceOptions, type ApplyPatchOptions, type CrdtState, type DiffOptions, type JsonPatch, type JsonPatchOp, type JsonPrimitive, type JsonValue, MergeError, type MergeStateOptions, PatchError, type PatchErrorReason, type PatchSemantics, type SerializedState, type TryApplyPatchInPlaceResult, type TryApplyPatchResult, type TryMergeStateResult, type ValidatePatchResult, applyPatch, applyPatchInPlace, createState, deserializeState, diffJsonPatch, forkState, mergeState, serializeState, toJson, tryApplyPatch, tryApplyPatchInPlace, tryMergeState, validateJsonPatch };
+import { C as toJson, D as ActorId, E as validateJsonPatch, I as CrdtState, K as JsonPrimitive, L as DiffOptions, M as ApplyPatchOptions, O as ApplyError, S as forkState, T as tryApplyPatchInPlace, U as JsonPatch, V as ForkStateOptions, W as JsonPatchOp, X as MergeStateOptions, _ as PatchError, a as tryMergeState, b as applyPatchInPlace, dt as TryApplyPatchResult, et as PatchErrorReason, f as diffJsonPatch, j as ApplyPatchInPlaceOptions, l as serializeState, lt as SerializedState, mt as ValidatePatchResult, pt as TryMergeStateResult, q as JsonValue, r as mergeState, s as deserializeState, t as MergeError, tt as PatchSemantics, ut as TryApplyPatchInPlaceResult, v as applyPatch, w as tryApplyPatch, x as createState } from "./merge-B8nmGV-o.js";
+export { type ActorId, type ApplyError, type ApplyPatchInPlaceOptions, type ApplyPatchOptions, type CrdtState, type DiffOptions, type ForkStateOptions, type JsonPatch, type JsonPatchOp, type JsonPrimitive, type JsonValue, MergeError, type MergeStateOptions, PatchError, type PatchErrorReason, type PatchSemantics, type SerializedState, type TryApplyPatchInPlaceResult, type TryApplyPatchResult, type TryMergeStateResult, type ValidatePatchResult, applyPatch, applyPatchInPlace, createState, deserializeState, diffJsonPatch, forkState, mergeState, serializeState, toJson, tryApplyPatch, tryApplyPatchInPlace, tryMergeState, validateJsonPatch };

package/dist/index.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_merge = require('./merge-CtJfKEt1.js');
+const require_merge = require('./merge-BAfuC6bf.js');
 
 exports.MergeError = require_merge.MergeError;
 exports.PatchError = require_merge.PatchError;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { _ as tryApplyPatch, a as tryMergeState, d as applyPatch, g as toJson, h as forkState, j as diffJsonPatch, l as serializeState, m as createState, p as applyPatchInPlace, r as mergeState, s as deserializeState, t as MergeError, u as PatchError, v as tryApplyPatchInPlace, y as validateJsonPatch } from "./merge-BqROEw61.mjs";
+import { _ as tryApplyPatch, a as tryMergeState, d as applyPatch, g as toJson, h as forkState, j as diffJsonPatch, l as serializeState, m as createState, p as applyPatchInPlace, r as mergeState, s as deserializeState, t as MergeError, u as PatchError, v as tryApplyPatchInPlace, y as validateJsonPatch } from "./merge-CKcP1ZPt.mjs";
 
 export { MergeError, PatchError, applyPatch, applyPatchInPlace, createState, deserializeState, diffJsonPatch, forkState, mergeState, serializeState, toJson, tryApplyPatch, tryApplyPatchInPlace, tryMergeState, validateJsonPatch };

package/dist/internals.d.mts

@@ -1,4 +1,4 @@
-import { $ as PatchErrorReason, A as ApplyPatchAsActorResult, B as ElemId, C as toJson, D as ActorId, E as validateJsonPatch, F as CompilePatchOptions, G as JsonPrimitive, H as JsonPatch, I as CrdtState, J as MergeDocOptions, K as JsonValue, L as DiffOptions, M as ApplyPatchOptions, N as ApplyResult, O as ApplyError, P as Clock, Q as ObjNode, R as Doc, S as forkState, T as tryApplyPatchInPlace, U as JsonPatchOp, V as IntentOp, W as JsonPatchToCrdtOptions, X as Node, Y as MergeStateOptions, Z as ObjEntry, _ as PatchError, a as tryMergeState, at as SerializedDoc, b as applyPatchInPlace, c as serializeDoc, ct as SerializedState, d as compileJsonPatchToIntent, dt as TryMergeDocResult, et as PatchSemantics, f as diffJsonPatch, ft as TryMergeStateResult, g as stringifyJsonPointer, h as parseJsonPointer, i as tryMergeDoc, it as SerializedClock, j as ApplyPatchInPlaceOptions, k as ApplyPatchAsActorOptions, l as serializeState, lt as TryApplyPatchInPlaceResult, m as jsonEquals, mt as VersionVector, n as mergeDoc, nt as RgaElem, o as deserializeDoc, ot as SerializedNode, p as getAtJson, pt as ValidatePatchResult, q as LwwReg, r as mergeState, rt as RgaSeq, s as deserializeState, st as SerializedRgaElem, t as MergeError, tt as ROOT_KEY, u as PatchCompileError, ut as TryApplyPatchResult, v as applyPatch, w as tryApplyPatch, x as createState, y as applyPatchAsActor, z as Dot } from "./merge-BrNGGkXj.mjs";
+import { $ as ObjNode, A as ApplyPatchAsActorResult, B as ElemId, C as toJson, D as ActorId, E as validateJsonPatch, F as CompilePatchOptions, G as JsonPatchToCrdtOptions, H as IntentOp, I as CrdtState, J as LwwReg, K as JsonPrimitive, L as DiffOptions, M as ApplyPatchOptions, N as ApplyResult, O as ApplyError, P as Clock, Q as ObjEntry, R as Doc, S as forkState, T as tryApplyPatchInPlace, U as JsonPatch, V as ForkStateOptions, W as JsonPatchOp, X as MergeStateOptions, Y as MergeDocOptions, Z as Node, _ as PatchError, a as tryMergeState, at as SerializedClock, b as applyPatchInPlace, c as serializeDoc, ct as SerializedRgaElem, d as compileJsonPatchToIntent, dt as TryApplyPatchResult, et as PatchErrorReason, f as diffJsonPatch, ft as TryMergeDocResult, g as stringifyJsonPointer, h as parseJsonPointer, ht as VersionVector, i as tryMergeDoc, it as RgaSeq, j as ApplyPatchInPlaceOptions, k as ApplyPatchAsActorOptions, l as serializeState, lt as SerializedState, m as jsonEquals, mt as ValidatePatchResult, n as mergeDoc, nt as ROOT_KEY, o as deserializeDoc, ot as SerializedDoc, p as getAtJson, pt as TryMergeStateResult, q as JsonValue, r as mergeState, rt as RgaElem, s as deserializeState, st as SerializedNode, t as MergeError, tt as PatchSemantics, u as PatchCompileError, ut as TryApplyPatchInPlaceResult, v as applyPatch, w as tryApplyPatch, x as createState, y as applyPatchAsActor, z as Dot } from "./merge-DQ_KDtnE.mjs";
 
 //#region src/clock.d.ts
 /**
@@ -100,4 +100,4 @@ declare function rgaDelete(seq: RgaSeq, id: ElemId): void;
 declare function rgaIdAtIndex(seq: RgaSeq, index: number): ElemId | undefined;
 declare function rgaPrevForInsertAtIndex(seq: RgaSeq, index: number): ElemId;
 //#endregion
-export { ActorId, ApplyError, type ApplyPatchAsActorOptions, type ApplyPatchAsActorResult, ApplyPatchInPlaceOptions, ApplyPatchOptions, type ApplyResult, type Clock, type CompilePatchOptions, CrdtState, DiffOptions, type Doc, type Dot, type ElemId, HEAD, type IntentOp, JsonPatch, JsonPatchOp, type JsonPatchToCrdtOptions, JsonPrimitive, JsonValue, type LwwReg, type MergeDocOptions, MergeError, MergeStateOptions, type Node, type ObjEntry, type ObjNode, PatchCompileError, PatchError, PatchErrorReason, PatchSemantics, ROOT_KEY, type RgaElem, type RgaSeq, type SerializedClock, type SerializedDoc, type SerializedNode, type SerializedRgaElem, SerializedState, TryApplyPatchInPlaceResult, TryApplyPatchResult, type TryMergeDocResult, TryMergeStateResult, ValidatePatchResult, type VersionVector, applyIntentsToCrdt, applyPatch, applyPatchAsActor, applyPatchInPlace, cloneClock, cloneDoc, compareDot, compileJsonPatchToIntent, crdtToFullReplace, crdtToJsonPatch, createClock, createState, deserializeDoc, deserializeState, diffJsonPatch, docFromJson, docFromJsonWithDot, dotToElemId, forkState, getAtJson, jsonEquals, jsonPatchToCrdt, jsonPatchToCrdtSafe, lwwSet, materialize, mergeDoc, mergeState, newObj, newReg, newSeq, nextDotForActor, objRemove, objSet, observeDot, parseJsonPointer, rgaDelete, rgaIdAtIndex, rgaInsertAfter, rgaLinearizeIds, rgaPrevForInsertAtIndex, serializeDoc, serializeState, stringifyJsonPointer, toJson, tryApplyPatch, tryApplyPatchInPlace, tryJsonPatchToCrdt, tryMergeDoc, tryMergeState, validateJsonPatch, vvHasDot, vvMerge };
+export { ActorId, ApplyError, type ApplyPatchAsActorOptions, type ApplyPatchAsActorResult, ApplyPatchInPlaceOptions, ApplyPatchOptions, type ApplyResult, type Clock, type CompilePatchOptions, CrdtState, DiffOptions, type Doc, type Dot, type ElemId, ForkStateOptions, HEAD, type IntentOp, JsonPatch, JsonPatchOp, type JsonPatchToCrdtOptions, JsonPrimitive, JsonValue, type LwwReg, type MergeDocOptions, MergeError, MergeStateOptions, type Node, type ObjEntry, type ObjNode, PatchCompileError, PatchError, PatchErrorReason, PatchSemantics, ROOT_KEY, type RgaElem, type RgaSeq, type SerializedClock, type SerializedDoc, type SerializedNode, type SerializedRgaElem, SerializedState, TryApplyPatchInPlaceResult, TryApplyPatchResult, type TryMergeDocResult, TryMergeStateResult, ValidatePatchResult, type VersionVector, applyIntentsToCrdt, applyPatch, applyPatchAsActor, applyPatchInPlace, cloneClock, cloneDoc, compareDot, compileJsonPatchToIntent, crdtToFullReplace, crdtToJsonPatch, createClock, createState, deserializeDoc, deserializeState, diffJsonPatch, docFromJson, docFromJsonWithDot, dotToElemId, forkState, getAtJson, jsonEquals, jsonPatchToCrdt, jsonPatchToCrdtSafe, lwwSet, materialize, mergeDoc, mergeState, newObj, newReg, newSeq, nextDotForActor, objRemove, objSet, observeDot, parseJsonPointer, rgaDelete, rgaIdAtIndex, rgaInsertAfter, rgaLinearizeIds, rgaPrevForInsertAtIndex, serializeDoc, serializeState, stringifyJsonPointer, toJson, tryApplyPatch, tryApplyPatchInPlace, tryJsonPatchToCrdt, tryMergeDoc, tryMergeState, validateJsonPatch, vvHasDot, vvMerge };

package/dist/internals.d.ts

@@ -1,4 +1,4 @@
-import { $ as PatchErrorReason, A as ApplyPatchAsActorResult, B as ElemId, C as toJson, D as ActorId, E as validateJsonPatch, F as CompilePatchOptions, G as JsonPrimitive, H as JsonPatch, I as CrdtState, J as MergeDocOptions, K as JsonValue, L as DiffOptions, M as ApplyPatchOptions, N as ApplyResult, O as ApplyError, P as Clock, Q as ObjNode, R as Doc, S as forkState, T as tryApplyPatchInPlace, U as JsonPatchOp, V as IntentOp, W as JsonPatchToCrdtOptions, X as Node, Y as MergeStateOptions, Z as ObjEntry, _ as PatchError, a as tryMergeState, at as SerializedDoc, b as applyPatchInPlace, c as serializeDoc, ct as SerializedState, d as compileJsonPatchToIntent, dt as TryMergeDocResult, et as PatchSemantics, f as diffJsonPatch, ft as TryMergeStateResult, g as stringifyJsonPointer, h as parseJsonPointer, i as tryMergeDoc, it as SerializedClock, j as ApplyPatchInPlaceOptions, k as ApplyPatchAsActorOptions, l as serializeState, lt as TryApplyPatchInPlaceResult, m as jsonEquals, mt as VersionVector, n as mergeDoc, nt as RgaElem, o as deserializeDoc, ot as SerializedNode, p as getAtJson, pt as ValidatePatchResult, q as LwwReg, r as mergeState, rt as RgaSeq, s as deserializeState, st as SerializedRgaElem, t as MergeError, tt as ROOT_KEY, u as PatchCompileError, ut as TryApplyPatchResult, v as applyPatch, w as tryApplyPatch, x as createState, y as applyPatchAsActor, z as Dot } from "./merge-DW1-p9Hj.js";
+import { $ as ObjNode, A as ApplyPatchAsActorResult, B as ElemId, C as toJson, D as ActorId, E as validateJsonPatch, F as CompilePatchOptions, G as JsonPatchToCrdtOptions, H as IntentOp, I as CrdtState, J as LwwReg, K as JsonPrimitive, L as DiffOptions, M as ApplyPatchOptions, N as ApplyResult, O as ApplyError, P as Clock, Q as ObjEntry, R as Doc, S as forkState, T as tryApplyPatchInPlace, U as JsonPatch, V as ForkStateOptions, W as JsonPatchOp, X as MergeStateOptions, Y as MergeDocOptions, Z as Node, _ as PatchError, a as tryMergeState, at as SerializedClock, b as applyPatchInPlace, c as serializeDoc, ct as SerializedRgaElem, d as compileJsonPatchToIntent, dt as TryApplyPatchResult, et as PatchErrorReason, f as diffJsonPatch, ft as TryMergeDocResult, g as stringifyJsonPointer, h as parseJsonPointer, ht as VersionVector, i as tryMergeDoc, it as RgaSeq, j as ApplyPatchInPlaceOptions, k as ApplyPatchAsActorOptions, l as serializeState, lt as SerializedState, m as jsonEquals, mt as ValidatePatchResult, n as mergeDoc, nt as ROOT_KEY, o as deserializeDoc, ot as SerializedDoc, p as getAtJson, pt as TryMergeStateResult, q as JsonValue, r as mergeState, rt as RgaElem, s as deserializeState, st as SerializedNode, t as MergeError, tt as PatchSemantics, u as PatchCompileError, ut as TryApplyPatchInPlaceResult, v as applyPatch, w as tryApplyPatch, x as createState, y as applyPatchAsActor, z as Dot } from "./merge-B8nmGV-o.js";
 
 //#region src/clock.d.ts
 /**
@@ -100,4 +100,4 @@ declare function rgaDelete(seq: RgaSeq, id: ElemId): void;
 declare function rgaIdAtIndex(seq: RgaSeq, index: number): ElemId | undefined;
 declare function rgaPrevForInsertAtIndex(seq: RgaSeq, index: number): ElemId;
 //#endregion
-export { ActorId, ApplyError, type ApplyPatchAsActorOptions, type ApplyPatchAsActorResult, ApplyPatchInPlaceOptions, ApplyPatchOptions, type ApplyResult, type Clock, type CompilePatchOptions, CrdtState, DiffOptions, type Doc, type Dot, type ElemId, HEAD, type IntentOp, JsonPatch, JsonPatchOp, type JsonPatchToCrdtOptions, JsonPrimitive, JsonValue, type LwwReg, type MergeDocOptions, MergeError, MergeStateOptions, type Node, type ObjEntry, type ObjNode, PatchCompileError, PatchError, PatchErrorReason, PatchSemantics, ROOT_KEY, type RgaElem, type RgaSeq, type SerializedClock, type SerializedDoc, type SerializedNode, type SerializedRgaElem, SerializedState, TryApplyPatchInPlaceResult, TryApplyPatchResult, type TryMergeDocResult, TryMergeStateResult, ValidatePatchResult, type VersionVector, applyIntentsToCrdt, applyPatch, applyPatchAsActor, applyPatchInPlace, cloneClock, cloneDoc, compareDot, compileJsonPatchToIntent, crdtToFullReplace, crdtToJsonPatch, createClock, createState, deserializeDoc, deserializeState, diffJsonPatch, docFromJson, docFromJsonWithDot, dotToElemId, forkState, getAtJson, jsonEquals, jsonPatchToCrdt, jsonPatchToCrdtSafe, lwwSet, materialize, mergeDoc, mergeState, newObj, newReg, newSeq, nextDotForActor, objRemove, objSet, observeDot, parseJsonPointer, rgaDelete, rgaIdAtIndex, rgaInsertAfter, rgaLinearizeIds, rgaPrevForInsertAtIndex, serializeDoc, serializeState, stringifyJsonPointer, toJson, tryApplyPatch, tryApplyPatchInPlace, tryJsonPatchToCrdt, tryMergeDoc, tryMergeState, validateJsonPatch, vvHasDot, vvMerge };
+export { ActorId, ApplyError, type ApplyPatchAsActorOptions, type ApplyPatchAsActorResult, ApplyPatchInPlaceOptions, ApplyPatchOptions, type ApplyResult, type Clock, type CompilePatchOptions, CrdtState, DiffOptions, type Doc, type Dot, type ElemId, ForkStateOptions, HEAD, type IntentOp, JsonPatch, JsonPatchOp, type JsonPatchToCrdtOptions, JsonPrimitive, JsonValue, type LwwReg, type MergeDocOptions, MergeError, MergeStateOptions, type Node, type ObjEntry, type ObjNode, PatchCompileError, PatchError, PatchErrorReason, PatchSemantics, ROOT_KEY, type RgaElem, type RgaSeq, type SerializedClock, type SerializedDoc, type SerializedNode, type SerializedRgaElem, SerializedState, TryApplyPatchInPlaceResult, TryApplyPatchResult, type TryMergeDocResult, TryMergeStateResult, ValidatePatchResult, type VersionVector, applyIntentsToCrdt, applyPatch, applyPatchAsActor, applyPatchInPlace, cloneClock, cloneDoc, compareDot, compileJsonPatchToIntent, crdtToFullReplace, crdtToJsonPatch, createClock, createState, deserializeDoc, deserializeState, diffJsonPatch, docFromJson, docFromJsonWithDot, dotToElemId, forkState, getAtJson, jsonEquals, jsonPatchToCrdt, jsonPatchToCrdtSafe, lwwSet, materialize, mergeDoc, mergeState, newObj, newReg, newSeq, nextDotForActor, objRemove, objSet, observeDot, parseJsonPointer, rgaDelete, rgaIdAtIndex, rgaInsertAfter, rgaLinearizeIds, rgaPrevForInsertAtIndex, serializeDoc, serializeState, stringifyJsonPointer, toJson, tryApplyPatch, tryApplyPatchInPlace, tryJsonPatchToCrdt, tryMergeDoc, tryMergeState, validateJsonPatch, vvHasDot, vvMerge };

package/dist/internals.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_merge = require('./merge-CtJfKEt1.js');
+const require_merge = require('./merge-BAfuC6bf.js');
 
 exports.HEAD = require_merge.HEAD;
 exports.MergeError = require_merge.MergeError;

package/dist/internals.mjs

@@ -1,3 +1,3 @@
-import { $ as vvMerge, A as compileJsonPatchToIntent, B as newSeq, C as crdtToJsonPatch, D as jsonPatchToCrdtSafe, E as jsonPatchToCrdt, F as stringifyJsonPointer, G as rgaDelete, H as objSet, I as ROOT_KEY, J as rgaLinearizeIds, K as rgaIdAtIndex, L as lwwSet, M as getAtJson, N as jsonEquals, O as tryJsonPatchToCrdt, P as parseJsonPointer, Q as vvHasDot, R as newObj, S as crdtToFullReplace, T as docFromJsonWithDot, U as materialize, V as objRemove, W as HEAD, X as compareDot, Y as rgaPrevForInsertAtIndex, Z as dotToElemId, _ as tryApplyPatch, a as tryMergeState, b as applyIntentsToCrdt, c as serializeDoc, d as applyPatch, et as cloneClock, f as applyPatchAsActor, g as toJson, h as forkState, i as tryMergeDoc, j as diffJsonPatch, k as PatchCompileError, l as serializeState, m as createState, n as mergeDoc, nt as nextDotForActor, o as deserializeDoc, p as applyPatchInPlace, q as rgaInsertAfter, r as mergeState, rt as observeDot, s as deserializeState, t as MergeError, tt as createClock, u as PatchError, v as tryApplyPatchInPlace, w as docFromJson, x as cloneDoc, y as validateJsonPatch, z as newReg } from "./merge-BqROEw61.mjs";
+import { $ as vvMerge, A as compileJsonPatchToIntent, B as newSeq, C as crdtToJsonPatch, D as jsonPatchToCrdtSafe, E as jsonPatchToCrdt, F as stringifyJsonPointer, G as rgaDelete, H as objSet, I as ROOT_KEY, J as rgaLinearizeIds, K as rgaIdAtIndex, L as lwwSet, M as getAtJson, N as jsonEquals, O as tryJsonPatchToCrdt, P as parseJsonPointer, Q as vvHasDot, R as newObj, S as crdtToFullReplace, T as docFromJsonWithDot, U as materialize, V as objRemove, W as HEAD, X as compareDot, Y as rgaPrevForInsertAtIndex, Z as dotToElemId, _ as tryApplyPatch, a as tryMergeState, b as applyIntentsToCrdt, c as serializeDoc, d as applyPatch, et as cloneClock, f as applyPatchAsActor, g as toJson, h as forkState, i as tryMergeDoc, j as diffJsonPatch, k as PatchCompileError, l as serializeState, m as createState, n as mergeDoc, nt as nextDotForActor, o as deserializeDoc, p as applyPatchInPlace, q as rgaInsertAfter, r as mergeState, rt as observeDot, s as deserializeState, t as MergeError, tt as createClock, u as PatchError, v as tryApplyPatchInPlace, w as docFromJson, x as cloneDoc, y as validateJsonPatch, z as newReg } from "./merge-CKcP1ZPt.mjs";
 
 export { HEAD, MergeError, PatchCompileError, PatchError, ROOT_KEY, applyIntentsToCrdt, applyPatch, applyPatchAsActor, applyPatchInPlace, cloneClock, cloneDoc, compareDot, compileJsonPatchToIntent, crdtToFullReplace, crdtToJsonPatch, createClock, createState, deserializeDoc, deserializeState, diffJsonPatch, docFromJson, docFromJsonWithDot, dotToElemId, forkState, getAtJson, jsonEquals, jsonPatchToCrdt, jsonPatchToCrdtSafe, lwwSet, materialize, mergeDoc, mergeState, newObj, newReg, newSeq, nextDotForActor, objRemove, objSet, observeDot, parseJsonPointer, rgaDelete, rgaIdAtIndex, rgaInsertAfter, rgaLinearizeIds, rgaPrevForInsertAtIndex, serializeDoc, serializeState, stringifyJsonPointer, toJson, tryApplyPatch, tryApplyPatchInPlace, tryJsonPatchToCrdt, tryMergeDoc, tryMergeState, validateJsonPatch, vvHasDot, vvMerge };

package/dist/{merge-BrNGGkXj.d.mts → merge-B8nmGV-o.d.ts}

@@ -161,6 +161,14 @@ type CrdtState = {
   doc: Doc;
   clock: Clock;
 };
+/** Options for `forkState`. */
+interface ForkStateOptions {
+  /**
+   * Allow reusing the origin actor ID when forking.
+   * Defaults to `false` to prevent duplicate-dot collisions across replicas.
+   */
+  allowActorReuse?: boolean;
+}
 /** Result from applying a patch for a specific actor using a shared version vector. */
 type ApplyPatchAsActorResult = {
   /** Updated CRDT state for the actor that produced this patch. */state: CrdtState; /** Updated version vector after applying the patch. */
@@ -310,8 +318,9 @@ declare function createState(initial: JsonValue, options: {
 /**
  * Fork a replica from a shared origin state while assigning a new local actor ID.
  * The forked state has an independent document clone and clock.
+ * By default this rejects actor reuse to prevent duplicate-dot collisions across peers.
  */
-declare function forkState(origin: CrdtState, actor: ActorId): CrdtState;
+declare function forkState(origin: CrdtState, actor: ActorId, options?: ForkStateOptions): CrdtState;
 /**
  * Materialize a CRDT document or state back to a plain JSON value.
  * @param target - A `Doc` or `CrdtState` to materialize.
@@ -442,4 +451,4 @@ declare function mergeState(a: CrdtState, b: CrdtState, options?: MergeStateOpti
 /** Non-throwing `mergeState` variant with structured conflict details. */
 declare function tryMergeState(a: CrdtState, b: CrdtState, options?: MergeStateOptions): TryMergeStateResult;
 //#endregion
-export { PatchErrorReason as $, ApplyPatchAsActorResult as A, ElemId as B, toJson as C, ActorId as D, validateJsonPatch as E, CompilePatchOptions as F, JsonPrimitive as G, JsonPatch as H, CrdtState as I, MergeDocOptions as J, JsonValue as K, DiffOptions as L, ApplyPatchOptions as M, ApplyResult as N, ApplyError as O, Clock as P, ObjNode as Q, Doc as R, forkState as S, tryApplyPatchInPlace as T, JsonPatchOp as U, IntentOp as V, JsonPatchToCrdtOptions as W, Node as X, MergeStateOptions as Y, ObjEntry as Z, PatchError as _, tryMergeState as a, SerializedDoc as at, applyPatchInPlace as b, serializeDoc as c, SerializedState as ct, compileJsonPatchToIntent as d, TryMergeDocResult as dt, PatchSemantics as et, diffJsonPatch as f, TryMergeStateResult as ft, stringifyJsonPointer as g, parseJsonPointer as h, tryMergeDoc as i, SerializedClock as it, ApplyPatchInPlaceOptions as j, ApplyPatchAsActorOptions as k, serializeState as l, TryApplyPatchInPlaceResult as lt, jsonEquals as m, VersionVector as mt, mergeDoc as n, RgaElem as nt, deserializeDoc as o, SerializedNode as ot, getAtJson as p, ValidatePatchResult as pt, LwwReg as q, mergeState as r, RgaSeq as rt, deserializeState as s, SerializedRgaElem as st, MergeError as t, ROOT_KEY as tt, PatchCompileError as u, TryApplyPatchResult as ut, applyPatch as v, tryApplyPatch as w, createState as x, applyPatchAsActor as y, Dot as z };
+export { ObjNode as $, ApplyPatchAsActorResult as A, ElemId as B, toJson as C, ActorId as D, validateJsonPatch as E, CompilePatchOptions as F, JsonPatchToCrdtOptions as G, IntentOp as H, CrdtState as I, LwwReg as J, JsonPrimitive as K, DiffOptions as L, ApplyPatchOptions as M, ApplyResult as N, ApplyError as O, Clock as P, ObjEntry as Q, Doc as R, forkState as S, tryApplyPatchInPlace as T, JsonPatch as U, ForkStateOptions as V, JsonPatchOp as W, MergeStateOptions as X, MergeDocOptions as Y, Node as Z, PatchError as _, tryMergeState as a, SerializedClock as at, applyPatchInPlace as b, serializeDoc as c, SerializedRgaElem as ct, compileJsonPatchToIntent as d, TryApplyPatchResult as dt, PatchErrorReason as et, diffJsonPatch as f, TryMergeDocResult as ft, stringifyJsonPointer as g, parseJsonPointer as h, VersionVector as ht, tryMergeDoc as i, RgaSeq as it, ApplyPatchInPlaceOptions as j, ApplyPatchAsActorOptions as k, serializeState as l, SerializedState as lt, jsonEquals as m, ValidatePatchResult as mt, mergeDoc as n, ROOT_KEY as nt, deserializeDoc as o, SerializedDoc as ot, getAtJson as p, TryMergeStateResult as pt, JsonValue as q, mergeState as r, RgaElem as rt, deserializeState as s, SerializedNode as st, MergeError as t, PatchSemantics as tt, PatchCompileError as u, TryApplyPatchInPlaceResult as ut, applyPatch as v, tryApplyPatch as w, createState as x, applyPatchAsActor as y, Dot as z };

package/dist/{merge-CtJfKEt1.js → merge-BAfuC6bf.js}

@@ -216,13 +216,37 @@ var PatchCompileError = class extends Error {
 function parseJsonPointer(ptr) {
 	if (ptr === "") return [];
 	if (!ptr.startsWith("/")) throw new Error(`Invalid pointer: ${ptr}`);
-	return ptr.slice(1).split("/").map((s) => s.replace(/~1/g, "/").replace(/~0/g, "~"));
+	return ptr.slice(1).split("/").map(unescapeJsonPointerToken);
 }
 /** Convert a path array back to an RFC 6901 JSON Pointer string. */
 function stringifyJsonPointer(path) {
 	if (path.length === 0) return "";
 	return `/${path.map(escapeJsonPointer).join("/")}`;
 }
+function unescapeJsonPointerToken(token) {
+	let out = "";
+	for (let i = 0; i < token.length; i++) {
+		const ch = token[i];
+		if (ch !== "~") {
+			out += ch;
+			continue;
+		}
+		const esc = token[i + 1];
+		if (esc === "0") {
+			out += "~";
+			i += 1;
+			continue;
+		}
+		if (esc === "1") {
+			out += "/";
+			i += 1;
+			continue;
+		}
+		const sequence = esc === void 0 ? "~" : `~${esc}`;
+		throw new Error(`Invalid pointer escape sequence '${sequence}'`);
+	}
+	return out;
+}
 /**
 * Navigate a JSON value by path and return the value at that location.
 * Throws if the path is invalid, out of bounds, or traverses a non-container.
@@ -230,8 +254,8 @@ function stringifyJsonPointer(path) {
 function getAtJson(base, path) {
 	let cur = base;
 	for (const seg of path) if (Array.isArray(cur)) {
-		const idx = seg === "-" ? cur.length : Number(seg);
-		if (!Number.isInteger(idx)) throw new Error(`Expected array index, got ${seg}`);
+		if (!ARRAY_INDEX_TOKEN_PATTERN.test(seg)) throw new Error(`Expected array index, got ${seg}`);
+		const idx = Number(seg);
 		if (idx < 0 || idx >= cur.length) throw new Error(`Index out of bounds at ${seg}`);
 		cur = cur[idx];
 	} else if (cur && typeof cur === "object") {
@@ -255,7 +279,7 @@ function compileJsonPatchToIntent(baseJson, patch, options = {}) {
 	for (let opIndex = 0; opIndex < patch.length; opIndex++) {
 		const op = patch[opIndex];
 		const compileBase = semantics === "sequential" ? workingBase : baseJson;
-		intents.push(...compileSingleOp(compileBase, op, opIndex));
+		intents.push(...compileSingleOp(compileBase, op, opIndex, semantics));
 		if (semantics === "sequential") workingBase = applyPatchOpToJson(workingBase, op, opIndex);
 	}
 	return intents;
@@ -398,6 +422,7 @@ function jsonEquals(a, b) {
 function isPlainObject(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+const ARRAY_INDEX_TOKEN_PATTERN = /^(0|[1-9][0-9]*)$/;
 function hasOwn(value, key) {
 	return Object.prototype.hasOwnProperty.call(value, key);
 }
@@ -408,7 +433,7 @@ function pathValueAt(base, path) {
 function assertNever$1(_value, message) {
 	throw new Error(message);
 }
-function compileSingleOp(baseJson, op, opIndex) {
+function compileSingleOp(baseJson, op, opIndex, semantics) {
 	if (op.op === "test") return [{
 		t: "Test",
 		path: parsePointerOrThrow(op.path, op.path, opIndex),
@@ -419,15 +444,29 @@ function compileSingleOp(baseJson, op, opIndex) {
 		const toPath = parsePointerOrThrow(op.path, op.path, opIndex);
 		if (op.op === "move" && isStrictDescendantPath(fromPath, toPath)) throw compileError("INVALID_MOVE", `cannot move a value into one of its descendants at ${op.path}`, op.path, opIndex);
 		const val = lookupValueOrThrow(baseJson, fromPath, op.from, opIndex);
+		if (op.op === "move" && isSamePath(fromPath, toPath)) return [];
+		if (op.op === "move" && semantics === "sequential") {
+			const removeOp = {
+				op: "remove",
+				path: op.from
+			};
+			const addOp = {
+				op: "add",
+				path: op.path,
+				value: val
+			};
+			const baseAfterRemove = applyPatchOpToJson(baseJson, removeOp, opIndex);
+			return [...compileSingleOp(baseJson, removeOp, opIndex, semantics), ...compileSingleOp(baseAfterRemove, addOp, opIndex, semantics)];
+		}
 		const out = compileSingleOp(baseJson, {
 			op: "add",
 			path: op.path,
 			value: val
-		}, opIndex);
+		}, opIndex, semantics);
 		if (op.op === "move") out.push(...compileSingleOp(baseJson, {
 			op: "remove",
 			path: op.from
-		}, opIndex));
+		}, opIndex, semantics));
 		return out;
 	}
 	const path = parsePointerOrThrow(op.path, op.path, opIndex);
@@ -563,7 +602,7 @@ function parseArrayIndexToken(token, op, arrLength, path, opIndex) {
 		if (op !== "add") throw compileError("INVALID_POINTER", `'-' index is only valid for add at ${path}`, path, opIndex);
 		return Number.POSITIVE_INFINITY;
 	}
-	if (!/^[0-9]+$/.test(token)) throw compileError("INVALID_POINTER", `expected array index at ${path}`, path, opIndex);
+	if (!ARRAY_INDEX_TOKEN_PATTERN.test(token)) throw compileError("INVALID_POINTER", `expected array index at ${path}`, path, opIndex);
 	const index = Number(token);
 	if (!Number.isSafeInteger(index)) throw compileError("OUT_OF_BOUNDS", `array index is too large at ${path}`, path, opIndex);
 	if (op === "add") {
@@ -572,12 +611,31 @@ function parseArrayIndexToken(token, op, arrLength, path, opIndex) {
 	return index;
 }
 function compileErrorFromLookup(error, path, opIndex) {
+	const mapped = mapLookupErrorToPatchReason(error);
+	return compileError(mapped.reason, mapped.message, path, opIndex);
+}
+function mapLookupErrorToPatchReason(error) {
 	const message = error instanceof Error ? error.message : "invalid path";
-	if (message.includes("Expected array index")) return compileError("INVALID_POINTER", message, path, opIndex);
-	if (message.includes("Index out of bounds")) return compileError("OUT_OF_BOUNDS", message, path, opIndex);
-	if (message.includes("Missing key")) return compileError("MISSING_PARENT", message, path, opIndex);
-	if (message.includes("Cannot traverse into non-container")) return compileError("INVALID_TARGET", message, path, opIndex);
-	return compileError("INVALID_PATCH", message, path, opIndex);
+	if (message.includes("Expected array index")) return {
+		reason: "INVALID_POINTER",
+		message
+	};
+	if (message.includes("Index out of bounds")) return {
+		reason: "OUT_OF_BOUNDS",
+		message
+	};
+	if (message.includes("Missing key")) return {
+		reason: "MISSING_PARENT",
+		message
+	};
+	if (message.includes("Cannot traverse into non-container")) return {
+		reason: "INVALID_TARGET",
+		message
+	};
+	return {
+		reason: "INVALID_PATCH",
+		message
+	};
 }
 function compileError(reason, message, path, opIndex) {
 	return new PatchCompileError(reason, message, path, opIndex);
@@ -587,6 +645,11 @@ function isStrictDescendantPath(from, to) {
 	for (let i = 0; i < from.length; i++) if (from[i] !== to[i]) return false;
 	return true;
 }
+function isSamePath(a, b) {
+	if (a.length !== b.length) return false;
+	for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
+	return true;
+}
 
 //#endregion
 //#region src/doc.ts
@@ -1057,8 +1120,7 @@ function jsonPatchToCrdtInternal(options) {
 	const shadowBump = (ctr) => {
 		if (shadowCtr < ctr) shadowCtr = ctr;
 	};
-	for (let opIndex = 0; opIndex < options.patch.length; opIndex++) {
-		const op = options.patch[opIndex];
+	const applySequentialOp = (op, opIndex) => {
 		const baseJson = materialize(shadowBase.root);
 		let intents;
 		try {
@@ -1072,6 +1134,42 @@ function jsonPatchToCrdtInternal(options) {
 			const shadowStep = applyIntentsToCrdt(shadowBase, shadowBase, intents, shadowDot, "base", shadowBump);
 			if (!shadowStep.ok) return withOpIndex(shadowStep, opIndex);
 		} else shadowBase = cloneDoc(options.head);
+		return { ok: true };
+	};
+	for (let opIndex = 0; opIndex < options.patch.length; opIndex++) {
+		const op = options.patch[opIndex];
+		if (op.op === "move") {
+			const baseJson = materialize(shadowBase.root);
+			let fromValue;
+			try {
+				fromValue = structuredClone(getAtJson(baseJson, parseJsonPointer(op.from)));
+			} catch {
+				try {
+					compileJsonPatchToIntent(baseJson, [{
+						op: "remove",
+						path: op.from
+					}], { semantics: "sequential" });
+				} catch (error) {
+					return withOpIndex(toApplyError$1(error), opIndex);
+				}
+				return withOpIndex(toApplyError$1(/* @__PURE__ */ new Error(`failed to resolve move source at ${op.from}`)), opIndex);
+			}
+			if (op.from === op.path) continue;
+			const removeStep = applySequentialOp({
+				op: "remove",
+				path: op.from
+			}, opIndex);
+			if (!removeStep.ok) return removeStep;
+			const addStep = applySequentialOp({
+				op: "add",
+				path: op.path,
+				value: fromValue
+			}, opIndex);
+			if (!addStep.ok) return addStep;
+			continue;
+		}
+		const step = applySequentialOp(op, opIndex);
+		if (!step.ok) return step;
 	}
 	return { ok: true };
 }
@@ -1143,8 +1241,10 @@ function createState(initial, options) {
 /**
 * Fork a replica from a shared origin state while assigning a new local actor ID.
 * The forked state has an independent document clone and clock.
+* By default this rejects actor reuse to prevent duplicate-dot collisions across peers.
 */
-function forkState(origin, actor) {
+function forkState(origin, actor, options = {}) {
+	if (actor === origin.clock.actor && !options.allowActorReuse) throw new Error(`forkState actor must be unique; refusing to reuse origin actor '${actor}'`);
 	return {
 		doc: cloneDoc(origin.doc),
 		clock: createClock(actor, origin.clock.ctr)
@@ -1262,8 +1362,8 @@ function applyPatchInternal(state, patch, options) {
 			doc: cloneDoc(options.base.doc),
 			clock: createClock("__base__", 0)
 		} : null;
-		for (const op of patch) {
-			const step = applyPatchOpSequential(state, op, options, explicitBaseState ? explicitBaseState.doc : cloneDoc(state.doc));
+		for (const [opIndex, op] of patch.entries()) {
+			const step = applyPatchOpSequential(state, op, options, explicitBaseState ? explicitBaseState.doc : cloneDoc(state.doc), opIndex);
 			if (!step.ok) return step;
 			if (explicitBaseState && op.op !== "test") {
 				const baseStep = applyPatchInternal(explicitBaseState, [op], {
@@ -1280,10 +1380,12 @@ function applyPatchInternal(state, patch, options) {
 	if (!compiled.ok) return compiled;
 	return applyIntentsToCrdt(baseDoc, state.doc, compiled.intents, () => state.clock.next(), options.testAgainst ?? "head", (ctr) => bumpClockCounter(state, ctr));
 }
-function applyPatchOpSequential(state, op, options, baseDoc) {
+function applyPatchOpSequential(state, op, options, baseDoc, opIndex) {
 	const baseJson = materialize(baseDoc.root);
 	if (op.op === "move") {
-		const fromValue = getAtJson(baseJson, parseJsonPointer(op.from));
+		const fromResolved = resolveValueAtPointer(baseJson, op.from, opIndex);
+		if (!fromResolved.ok) return fromResolved;
+		const fromValue = fromResolved.value;
 		const removeRes = applySinglePatchOp(state, baseDoc, {
 			op: "remove",
 			path: op.from
@@ -1296,7 +1398,9 @@ function applyPatchOpSequential(state, op, options, baseDoc) {
 		}, options);
 	}
 	if (op.op === "copy") {
-		const fromValue = getAtJson(baseJson, parseJsonPointer(op.from));
+		const fromResolved = resolveValueAtPointer(baseJson, op.from, opIndex);
+		if (!fromResolved.ok) return fromResolved;
+		const fromValue = fromResolved.value;
 		return applySinglePatchOp(state, baseDoc, {
 			op: "add",
 			path: op.path,
@@ -1305,6 +1409,22 @@ function applyPatchOpSequential(state, op, options, baseDoc) {
 	}
 	return applySinglePatchOp(state, baseDoc, op, options);
 }
+function resolveValueAtPointer(baseJson, pointer, opIndex) {
+	let path;
+	try {
+		path = parseJsonPointer(pointer);
+	} catch (error) {
+		return toPointerParseApplyError(error, pointer, opIndex);
+	}
+	try {
+		return {
+			ok: true,
+			value: getAtJson(baseJson, path)
+		};
+	} catch (error) {
+		return toPointerLookupApplyError(error, pointer, opIndex);
+	}
+}
 function applySinglePatchOp(state, baseDoc, op, options) {
 	const compiled = compileIntents(materialize(baseDoc.root), [op], "sequential");
 	if (!compiled.ok) return compiled;
@@ -1363,6 +1483,27 @@ function toApplyError(error) {
 		message: error instanceof Error ? error.message : "failed to compile patch"
 	};
 }
+function toPointerParseApplyError(error, pointer, opIndex) {
+	return {
+		ok: false,
+		code: 409,
+		reason: "INVALID_POINTER",
+		message: error instanceof Error ? error.message : "invalid pointer",
+		path: pointer,
+		opIndex
+	};
+}
+function toPointerLookupApplyError(error, pointer, opIndex) {
+	const mapped = mapLookupErrorToPatchReason(error);
+	return {
+		ok: false,
+		code: 409,
+		reason: mapped.reason,
+		message: mapped.message,
+		path: pointer,
+		opIndex
+	};
+}
 
 //#endregion
 //#region src/serialize.ts

package/dist/{merge-BqROEw61.mjs → merge-CKcP1ZPt.mjs}

@@ -215,13 +215,37 @@ var PatchCompileError = class extends Error {
 function parseJsonPointer(ptr) {
 	if (ptr === "") return [];
 	if (!ptr.startsWith("/")) throw new Error(`Invalid pointer: ${ptr}`);
-	return ptr.slice(1).split("/").map((s) => s.replace(/~1/g, "/").replace(/~0/g, "~"));
+	return ptr.slice(1).split("/").map(unescapeJsonPointerToken);
 }
 /** Convert a path array back to an RFC 6901 JSON Pointer string. */
 function stringifyJsonPointer(path) {
 	if (path.length === 0) return "";
 	return `/${path.map(escapeJsonPointer).join("/")}`;
 }
+function unescapeJsonPointerToken(token) {
+	let out = "";
+	for (let i = 0; i < token.length; i++) {
+		const ch = token[i];
+		if (ch !== "~") {
+			out += ch;
+			continue;
+		}
+		const esc = token[i + 1];
+		if (esc === "0") {
+			out += "~";
+			i += 1;
+			continue;
+		}
+		if (esc === "1") {
+			out += "/";
+			i += 1;
+			continue;
+		}
+		const sequence = esc === void 0 ? "~" : `~${esc}`;
+		throw new Error(`Invalid pointer escape sequence '${sequence}'`);
+	}
+	return out;
+}
 /**
 * Navigate a JSON value by path and return the value at that location.
 * Throws if the path is invalid, out of bounds, or traverses a non-container.
@@ -229,8 +253,8 @@ function stringifyJsonPointer(path) {
 function getAtJson(base, path) {
 	let cur = base;
 	for (const seg of path) if (Array.isArray(cur)) {
-		const idx = seg === "-" ? cur.length : Number(seg);
-		if (!Number.isInteger(idx)) throw new Error(`Expected array index, got ${seg}`);
+		if (!ARRAY_INDEX_TOKEN_PATTERN.test(seg)) throw new Error(`Expected array index, got ${seg}`);
+		const idx = Number(seg);
 		if (idx < 0 || idx >= cur.length) throw new Error(`Index out of bounds at ${seg}`);
 		cur = cur[idx];
 	} else if (cur && typeof cur === "object") {
@@ -254,7 +278,7 @@ function compileJsonPatchToIntent(baseJson, patch, options = {}) {
 	for (let opIndex = 0; opIndex < patch.length; opIndex++) {
 		const op = patch[opIndex];
 		const compileBase = semantics === "sequential" ? workingBase : baseJson;
-		intents.push(...compileSingleOp(compileBase, op, opIndex));
+		intents.push(...compileSingleOp(compileBase, op, opIndex, semantics));
 		if (semantics === "sequential") workingBase = applyPatchOpToJson(workingBase, op, opIndex);
 	}
 	return intents;
@@ -397,6 +421,7 @@ function jsonEquals(a, b) {
 function isPlainObject(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+const ARRAY_INDEX_TOKEN_PATTERN = /^(0|[1-9][0-9]*)$/;
 function hasOwn(value, key) {
 	return Object.prototype.hasOwnProperty.call(value, key);
 }
@@ -407,7 +432,7 @@ function pathValueAt(base, path) {
 function assertNever$1(_value, message) {
 	throw new Error(message);
 }
-function compileSingleOp(baseJson, op, opIndex) {
+function compileSingleOp(baseJson, op, opIndex, semantics) {
 	if (op.op === "test") return [{
 		t: "Test",
 		path: parsePointerOrThrow(op.path, op.path, opIndex),
@@ -418,15 +443,29 @@ function compileSingleOp(baseJson, op, opIndex) {
 		const toPath = parsePointerOrThrow(op.path, op.path, opIndex);
 		if (op.op === "move" && isStrictDescendantPath(fromPath, toPath)) throw compileError("INVALID_MOVE", `cannot move a value into one of its descendants at ${op.path}`, op.path, opIndex);
 		const val = lookupValueOrThrow(baseJson, fromPath, op.from, opIndex);
+		if (op.op === "move" && isSamePath(fromPath, toPath)) return [];
+		if (op.op === "move" && semantics === "sequential") {
+			const removeOp = {
+				op: "remove",
+				path: op.from
+			};
+			const addOp = {
+				op: "add",
+				path: op.path,
+				value: val
+			};
+			const baseAfterRemove = applyPatchOpToJson(baseJson, removeOp, opIndex);
+			return [...compileSingleOp(baseJson, removeOp, opIndex, semantics), ...compileSingleOp(baseAfterRemove, addOp, opIndex, semantics)];
+		}
 		const out = compileSingleOp(baseJson, {
 			op: "add",
 			path: op.path,
 			value: val
-		}, opIndex);
+		}, opIndex, semantics);
 		if (op.op === "move") out.push(...compileSingleOp(baseJson, {
 			op: "remove",
 			path: op.from
-		}, opIndex));
+		}, opIndex, semantics));
 		return out;
 	}
 	const path = parsePointerOrThrow(op.path, op.path, opIndex);
@@ -562,7 +601,7 @@ function parseArrayIndexToken(token, op, arrLength, path, opIndex) {
 		if (op !== "add") throw compileError("INVALID_POINTER", `'-' index is only valid for add at ${path}`, path, opIndex);
 		return Number.POSITIVE_INFINITY;
 	}
-	if (!/^[0-9]+$/.test(token)) throw compileError("INVALID_POINTER", `expected array index at ${path}`, path, opIndex);
+	if (!ARRAY_INDEX_TOKEN_PATTERN.test(token)) throw compileError("INVALID_POINTER", `expected array index at ${path}`, path, opIndex);
 	const index = Number(token);
 	if (!Number.isSafeInteger(index)) throw compileError("OUT_OF_BOUNDS", `array index is too large at ${path}`, path, opIndex);
 	if (op === "add") {
@@ -571,12 +610,31 @@ function parseArrayIndexToken(token, op, arrLength, path, opIndex) {
 	return index;
 }
 function compileErrorFromLookup(error, path, opIndex) {
+	const mapped = mapLookupErrorToPatchReason(error);
+	return compileError(mapped.reason, mapped.message, path, opIndex);
+}
+function mapLookupErrorToPatchReason(error) {
 	const message = error instanceof Error ? error.message : "invalid path";
-	if (message.includes("Expected array index")) return compileError("INVALID_POINTER", message, path, opIndex);
-	if (message.includes("Index out of bounds")) return compileError("OUT_OF_BOUNDS", message, path, opIndex);
-	if (message.includes("Missing key")) return compileError("MISSING_PARENT", message, path, opIndex);
-	if (message.includes("Cannot traverse into non-container")) return compileError("INVALID_TARGET", message, path, opIndex);
-	return compileError("INVALID_PATCH", message, path, opIndex);
+	if (message.includes("Expected array index")) return {
+		reason: "INVALID_POINTER",
+		message
+	};
+	if (message.includes("Index out of bounds")) return {
+		reason: "OUT_OF_BOUNDS",
+		message
+	};
+	if (message.includes("Missing key")) return {
+		reason: "MISSING_PARENT",
+		message
+	};
+	if (message.includes("Cannot traverse into non-container")) return {
+		reason: "INVALID_TARGET",
+		message
+	};
+	return {
+		reason: "INVALID_PATCH",
+		message
+	};
 }
 function compileError(reason, message, path, opIndex) {
 	return new PatchCompileError(reason, message, path, opIndex);
@@ -586,6 +644,11 @@ function isStrictDescendantPath(from, to) {
 	for (let i = 0; i < from.length; i++) if (from[i] !== to[i]) return false;
 	return true;
 }
+function isSamePath(a, b) {
+	if (a.length !== b.length) return false;
+	for (let i = 0; i < a.length; i++) if (a[i] !== b[i]) return false;
+	return true;
+}
 
 //#endregion
 //#region src/doc.ts
@@ -1056,8 +1119,7 @@ function jsonPatchToCrdtInternal(options) {
 	const shadowBump = (ctr) => {
 		if (shadowCtr < ctr) shadowCtr = ctr;
 	};
-	for (let opIndex = 0; opIndex < options.patch.length; opIndex++) {
-		const op = options.patch[opIndex];
+	const applySequentialOp = (op, opIndex) => {
 		const baseJson = materialize(shadowBase.root);
 		let intents;
 		try {
@@ -1071,6 +1133,42 @@ function jsonPatchToCrdtInternal(options) {
 			const shadowStep = applyIntentsToCrdt(shadowBase, shadowBase, intents, shadowDot, "base", shadowBump);
 			if (!shadowStep.ok) return withOpIndex(shadowStep, opIndex);
 		} else shadowBase = cloneDoc(options.head);
+		return { ok: true };
+	};
+	for (let opIndex = 0; opIndex < options.patch.length; opIndex++) {
+		const op = options.patch[opIndex];
+		if (op.op === "move") {
+			const baseJson = materialize(shadowBase.root);
+			let fromValue;
+			try {
+				fromValue = structuredClone(getAtJson(baseJson, parseJsonPointer(op.from)));
+			} catch {
+				try {
+					compileJsonPatchToIntent(baseJson, [{
+						op: "remove",
+						path: op.from
+					}], { semantics: "sequential" });
+				} catch (error) {
+					return withOpIndex(toApplyError$1(error), opIndex);
+				}
+				return withOpIndex(toApplyError$1(/* @__PURE__ */ new Error(`failed to resolve move source at ${op.from}`)), opIndex);
+			}
+			if (op.from === op.path) continue;
+			const removeStep = applySequentialOp({
+				op: "remove",
+				path: op.from
+			}, opIndex);
+			if (!removeStep.ok) return removeStep;
+			const addStep = applySequentialOp({
+				op: "add",
+				path: op.path,
+				value: fromValue
+			}, opIndex);
+			if (!addStep.ok) return addStep;
+			continue;
+		}
+		const step = applySequentialOp(op, opIndex);
+		if (!step.ok) return step;
 	}
 	return { ok: true };
 }
@@ -1142,8 +1240,10 @@ function createState(initial, options) {
 /**
 * Fork a replica from a shared origin state while assigning a new local actor ID.
 * The forked state has an independent document clone and clock.
+* By default this rejects actor reuse to prevent duplicate-dot collisions across peers.
 */
-function forkState(origin, actor) {
+function forkState(origin, actor, options = {}) {
+	if (actor === origin.clock.actor && !options.allowActorReuse) throw new Error(`forkState actor must be unique; refusing to reuse origin actor '${actor}'`);
 	return {
 		doc: cloneDoc(origin.doc),
 		clock: createClock(actor, origin.clock.ctr)
@@ -1261,8 +1361,8 @@ function applyPatchInternal(state, patch, options) {
 			doc: cloneDoc(options.base.doc),
 			clock: createClock("__base__", 0)
 		} : null;
-		for (const op of patch) {
-			const step = applyPatchOpSequential(state, op, options, explicitBaseState ? explicitBaseState.doc : cloneDoc(state.doc));
+		for (const [opIndex, op] of patch.entries()) {
+			const step = applyPatchOpSequential(state, op, options, explicitBaseState ? explicitBaseState.doc : cloneDoc(state.doc), opIndex);
 			if (!step.ok) return step;
 			if (explicitBaseState && op.op !== "test") {
 				const baseStep = applyPatchInternal(explicitBaseState, [op], {
@@ -1279,10 +1379,12 @@ function applyPatchInternal(state, patch, options) {
 	if (!compiled.ok) return compiled;
 	return applyIntentsToCrdt(baseDoc, state.doc, compiled.intents, () => state.clock.next(), options.testAgainst ?? "head", (ctr) => bumpClockCounter(state, ctr));
 }
-function applyPatchOpSequential(state, op, options, baseDoc) {
+function applyPatchOpSequential(state, op, options, baseDoc, opIndex) {
 	const baseJson = materialize(baseDoc.root);
 	if (op.op === "move") {
-		const fromValue = getAtJson(baseJson, parseJsonPointer(op.from));
+		const fromResolved = resolveValueAtPointer(baseJson, op.from, opIndex);
+		if (!fromResolved.ok) return fromResolved;
+		const fromValue = fromResolved.value;
 		const removeRes = applySinglePatchOp(state, baseDoc, {
 			op: "remove",
 			path: op.from
@@ -1295,7 +1397,9 @@ function applyPatchOpSequential(state, op, options, baseDoc) {
 		}, options);
 	}
 	if (op.op === "copy") {
-		const fromValue = getAtJson(baseJson, parseJsonPointer(op.from));
+		const fromResolved = resolveValueAtPointer(baseJson, op.from, opIndex);
+		if (!fromResolved.ok) return fromResolved;
+		const fromValue = fromResolved.value;
 		return applySinglePatchOp(state, baseDoc, {
 			op: "add",
 			path: op.path,
@@ -1304,6 +1408,22 @@ function applyPatchOpSequential(state, op, options, baseDoc) {
 	}
 	return applySinglePatchOp(state, baseDoc, op, options);
 }
+function resolveValueAtPointer(baseJson, pointer, opIndex) {
+	let path;
+	try {
+		path = parseJsonPointer(pointer);
+	} catch (error) {
+		return toPointerParseApplyError(error, pointer, opIndex);
+	}
+	try {
+		return {
+			ok: true,
+			value: getAtJson(baseJson, path)
+		};
+	} catch (error) {
+		return toPointerLookupApplyError(error, pointer, opIndex);
+	}
+}
 function applySinglePatchOp(state, baseDoc, op, options) {
 	const compiled = compileIntents(materialize(baseDoc.root), [op], "sequential");
 	if (!compiled.ok) return compiled;
@@ -1362,6 +1482,27 @@ function toApplyError(error) {
 		message: error instanceof Error ? error.message : "failed to compile patch"
 	};
 }
+function toPointerParseApplyError(error, pointer, opIndex) {
+	return {
+		ok: false,
+		code: 409,
+		reason: "INVALID_POINTER",
+		message: error instanceof Error ? error.message : "invalid pointer",
+		path: pointer,
+		opIndex
+	};
+}
+function toPointerLookupApplyError(error, pointer, opIndex) {
+	const mapped = mapLookupErrorToPatchReason(error);
+	return {
+		ok: false,
+		code: 409,
+		reason: mapped.reason,
+		message: mapped.message,
+		path: pointer,
+		opIndex
+	};
+}
 
 //#endregion
 //#region src/serialize.ts

package/dist/{merge-DW1-p9Hj.d.ts → merge-DQ_KDtnE.d.mts}

@@ -161,6 +161,14 @@ type CrdtState = {
   doc: Doc;
   clock: Clock;
 };
+/** Options for `forkState`. */
+interface ForkStateOptions {
+  /**
+   * Allow reusing the origin actor ID when forking.
+   * Defaults to `false` to prevent duplicate-dot collisions across replicas.
+   */
+  allowActorReuse?: boolean;
+}
 /** Result from applying a patch for a specific actor using a shared version vector. */
 type ApplyPatchAsActorResult = {
   /** Updated CRDT state for the actor that produced this patch. */state: CrdtState; /** Updated version vector after applying the patch. */
@@ -310,8 +318,9 @@ declare function createState(initial: JsonValue, options: {
 /**
  * Fork a replica from a shared origin state while assigning a new local actor ID.
  * The forked state has an independent document clone and clock.
+ * By default this rejects actor reuse to prevent duplicate-dot collisions across peers.
  */
-declare function forkState(origin: CrdtState, actor: ActorId): CrdtState;
+declare function forkState(origin: CrdtState, actor: ActorId, options?: ForkStateOptions): CrdtState;
 /**
  * Materialize a CRDT document or state back to a plain JSON value.
  * @param target - A `Doc` or `CrdtState` to materialize.
@@ -442,4 +451,4 @@ declare function mergeState(a: CrdtState, b: CrdtState, options?: MergeStateOpti
 /** Non-throwing `mergeState` variant with structured conflict details. */
 declare function tryMergeState(a: CrdtState, b: CrdtState, options?: MergeStateOptions): TryMergeStateResult;
 //#endregion
-export { PatchErrorReason as $, ApplyPatchAsActorResult as A, ElemId as B, toJson as C, ActorId as D, validateJsonPatch as E, CompilePatchOptions as F, JsonPrimitive as G, JsonPatch as H, CrdtState as I, MergeDocOptions as J, JsonValue as K, DiffOptions as L, ApplyPatchOptions as M, ApplyResult as N, ApplyError as O, Clock as P, ObjNode as Q, Doc as R, forkState as S, tryApplyPatchInPlace as T, JsonPatchOp as U, IntentOp as V, JsonPatchToCrdtOptions as W, Node as X, MergeStateOptions as Y, ObjEntry as Z, PatchError as _, tryMergeState as a, SerializedDoc as at, applyPatchInPlace as b, serializeDoc as c, SerializedState as ct, compileJsonPatchToIntent as d, TryMergeDocResult as dt, PatchSemantics as et, diffJsonPatch as f, TryMergeStateResult as ft, stringifyJsonPointer as g, parseJsonPointer as h, tryMergeDoc as i, SerializedClock as it, ApplyPatchInPlaceOptions as j, ApplyPatchAsActorOptions as k, serializeState as l, TryApplyPatchInPlaceResult as lt, jsonEquals as m, VersionVector as mt, mergeDoc as n, RgaElem as nt, deserializeDoc as o, SerializedNode as ot, getAtJson as p, ValidatePatchResult as pt, LwwReg as q, mergeState as r, RgaSeq as rt, deserializeState as s, SerializedRgaElem as st, MergeError as t, ROOT_KEY as tt, PatchCompileError as u, TryApplyPatchResult as ut, applyPatch as v, tryApplyPatch as w, createState as x, applyPatchAsActor as y, Dot as z };
+export { ObjNode as $, ApplyPatchAsActorResult as A, ElemId as B, toJson as C, ActorId as D, validateJsonPatch as E, CompilePatchOptions as F, JsonPatchToCrdtOptions as G, IntentOp as H, CrdtState as I, LwwReg as J, JsonPrimitive as K, DiffOptions as L, ApplyPatchOptions as M, ApplyResult as N, ApplyError as O, Clock as P, ObjEntry as Q, Doc as R, forkState as S, tryApplyPatchInPlace as T, JsonPatch as U, ForkStateOptions as V, JsonPatchOp as W, MergeStateOptions as X, MergeDocOptions as Y, Node as Z, PatchError as _, tryMergeState as a, SerializedClock as at, applyPatchInPlace as b, serializeDoc as c, SerializedRgaElem as ct, compileJsonPatchToIntent as d, TryApplyPatchResult as dt, PatchErrorReason as et, diffJsonPatch as f, TryMergeDocResult as ft, stringifyJsonPointer as g, parseJsonPointer as h, VersionVector as ht, tryMergeDoc as i, RgaSeq as it, ApplyPatchInPlaceOptions as j, ApplyPatchAsActorOptions as k, serializeState as l, SerializedState as lt, jsonEquals as m, ValidatePatchResult as mt, mergeDoc as n, ROOT_KEY as nt, deserializeDoc as o, SerializedDoc as ot, getAtJson as p, TryMergeStateResult as pt, JsonValue as q, mergeState as r, RgaElem as rt, deserializeState as s, SerializedNode as st, MergeError as t, PatchSemantics as tt, PatchCompileError as u, TryApplyPatchInPlaceResult as ut, applyPatch as v, tryApplyPatch as w, createState as x, applyPatchAsActor as y, Dot as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-patch-to-crdt",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Convert JSON Patch (RFC 6902) to and from a CRDT-friendly representation.",
   "keywords": [
     "crdt",
@@ -54,8 +54,5 @@
   },
   "peerDependencies": {
     "typescript": "^5"
-  },
-  "engines": {
-    "node": ">=18"
   }
 }