@loro-extended/change 5.4.0 → 5.4.2

package/dist/index.js

@@ -99,6 +99,11 @@ function deriveValueShapePlaceholder(shape) {
   }
 }
 
+// src/diff-overlay.ts
+function createDiffOverlay(doc, batch) {
+  return new Map(doc.diff(batch.to, batch.from, false));
+}
+
 // src/functional-helpers.ts
 import {
   LoroDoc as LoroDoc2
@@ -547,6 +552,10 @@ var BaseRefInternals = class {
   getDoc() {
     return this.params.getDoc();
   }
+  /** Get the diff overlay map (if provided) */
+  getOverlay() {
+    return this.params.overlay;
+  }
   /**
    * Get the TypedRefParams needed to recreate this ref.
    * Used by change() to create draft refs with modified params.
@@ -561,7 +570,8 @@ var BaseRefInternals = class {
       getContainer: this.params.getContainer,
       autoCommit: this.params.autoCommit,
       batchedMutation: this.params.batchedMutation,
-      getDoc: this.params.getDoc
+      getDoc: this.params.getDoc,
+      overlay: this.params.overlay
     };
   }
   /** Get the loro namespace (cached) */
@@ -630,6 +640,14 @@ var CounterRefInternals = class extends BaseRefInternals {
   getValue() {
     const container = this.getContainer();
     const containerValue = container.value;
+    const overlay = this.getOverlay();
+    if (overlay) {
+      const diff = overlay.get(container.id);
+      if (diff && diff.type === "counter") {
+        const counterDiff = diff;
+        return containerValue + counterDiff.increment;
+      }
+    }
     if (containerValue !== 0 || this.materialized) {
       return containerValue;
     }
@@ -850,6 +868,33 @@ function convertInputToRef(value, shape) {
 // src/typed-refs/list-ref-base.ts
 var ListRefBaseInternals = class extends BaseRefInternals {
   itemCache = /* @__PURE__ */ new Map();
+  overlayListCache;
+  getOverlayList() {
+    const overlay = this.getOverlay();
+    if (!overlay) {
+      return void 0;
+    }
+    const shape = this.getShape();
+    if (!isValueShape(shape.shape)) {
+      return void 0;
+    }
+    if (!this.overlayListCache) {
+      const container = this.getContainer();
+      const diff = overlay.get(container.id);
+      if (!diff || diff.type !== "list") {
+        return void 0;
+      }
+      const afterValues = [];
+      for (let i = 0; i < container.length; i++) {
+        afterValues.push(container.get(i));
+      }
+      this.overlayListCache = applyListDelta(
+        afterValues,
+        diff.diff
+      );
+    }
+    return this.overlayListCache;
+  }
   /** Get typed ref params for creating child refs at an index */
   getChildTypedRefParams(index, shape) {
     return {
@@ -866,17 +911,22 @@ var ListRefBaseInternals = class extends BaseRefInternals {
       },
       autoCommit: this.getAutoCommit(),
       batchedMutation: this.getBatchedMutation(),
-      getDoc: () => this.getDoc()
+      getDoc: () => this.getDoc(),
+      overlay: this.getOverlay()
     };
   }
   /** Get item for predicate functions (returns plain value) */
   getPredicateItem(index) {
     const shape = this.getShape();
     const container = this.getContainer();
+    const overlayList = this.getOverlayList();
     const cachedItem = this.itemCache.get(index);
     if (cachedItem && isValueShape(shape.shape)) {
       return cachedItem;
     }
+    if (overlayList && isValueShape(shape.shape)) {
+      return overlayList[index];
+    }
     const containerItem = container.get(index);
     if (containerItem === void 0) {
       return void 0;
@@ -900,7 +950,8 @@ var ListRefBaseInternals = class extends BaseRefInternals {
   getMutableItem(index) {
     const shape = this.getShape();
     const container = this.getContainer();
-    const containerItem = container.get(index);
+    const overlayList = this.getOverlayList();
+    const containerItem = overlayList ? overlayList[index] : container.get(index);
     if (containerItem === void 0) {
       return void 0;
     }
@@ -920,6 +971,11 @@ var ListRefBaseInternals = class extends BaseRefInternals {
       this.itemCache.set(index, cachedItem2);
       return cachedItem2;
     }
+    if (!this.getBatchedMutation()) {
+      return createContainerTypedRef(
+        this.getChildTypedRefParams(index, shape.shape)
+      );
+    }
     let cachedItem = this.itemCache.get(index);
     if (!cachedItem) {
       cachedItem = createContainerTypedRef(
@@ -1133,6 +1189,10 @@ var ListRefBase = class extends TypedRef {
     return this[INTERNAL_SYMBOL].getMutableItem(index);
   }
   toArray() {
+    const overlayList = this[INTERNAL_SYMBOL].getOverlayList();
+    if (overlayList) {
+      return [...overlayList];
+    }
     const result = [];
     for (let i = 0; i < this.length; i++) {
       result.push(this[INTERNAL_SYMBOL].getPredicateItem(i));
@@ -1141,8 +1201,9 @@ var ListRefBase = class extends TypedRef {
   }
   toJSON() {
     const shape = this[INTERNAL_SYMBOL].getShape();
+    const overlayList = this[INTERNAL_SYMBOL].getOverlayList();
     const container = this[INTERNAL_SYMBOL].getContainer();
-    const nativeJson = container.toJSON();
+    const nativeJson = overlayList ?? container.toJSON();
     if (isContainerShape(shape.shape) || isValueShape(shape.shape) && shape.shape.valueType === "struct") {
       const itemPlaceholder = deriveShapePlaceholder(shape.shape);
       return nativeJson.map(
@@ -1169,10 +1230,32 @@ var ListRefBase = class extends TypedRef {
     };
   }
   get length() {
+    const overlayList = this[INTERNAL_SYMBOL].getOverlayList();
+    if (overlayList) {
+      return overlayList.length;
+    }
     const container = this[INTERNAL_SYMBOL].getContainer();
     return container.length;
   }
 };
+function applyListDelta(input, delta) {
+  const result = [];
+  let index = 0;
+  for (const op of delta) {
+    if (op.retain !== void 0) {
+      result.push(...input.slice(index, index + op.retain));
+      index += op.retain;
+    } else if (op.delete !== void 0) {
+      index += op.delete;
+    } else if (op.insert !== void 0) {
+      result.push(...op.insert);
+    }
+  }
+  if (index < input.length) {
+    result.push(...input.slice(index));
+  }
+  return result;
+}
 
 // src/typed-refs/list-ref-internals.ts
 var ListRefInternals = class extends ListRefBaseInternals {
@@ -1359,6 +1442,17 @@ var RecordRefInternals = class extends BaseRefInternals {
     const shape = recordShape.shape;
     const container = this.getContainer();
     if (isValueShape(shape)) {
+      const overlay = this.getOverlay();
+      if (overlay) {
+        const containerId = container.id;
+        const diff = overlay.get(containerId);
+        if (diff && diff.type === "map") {
+          const mapDiff = diff;
+          if (key in mapDiff.updated) {
+            return mapDiff.updated[key];
+          }
+        }
+      }
       if (!this.getBatchedMutation()) {
         const containerValue = container.get(key);
         if (containerValue !== void 0) {
@@ -1668,6 +1762,17 @@ var StructRefInternals = class extends BaseRefInternals {
     const actualShape = shape || structShape.shapes[key];
     const container = this.getContainer();
     if (isValueShape(actualShape)) {
+      const overlay = this.getOverlay();
+      if (overlay) {
+        const containerId = container.id;
+        const diff = overlay.get(containerId);
+        if (diff && diff.type === "map") {
+          const mapDiff = diff;
+          if (key in mapDiff.updated) {
+            return mapDiff.updated[key];
+          }
+        }
+      }
       if (!this.getBatchedMutation()) {
         const containerValue = container.get(key);
         if (containerValue !== void 0) {
@@ -1948,6 +2053,14 @@ var TextRefInternals = class extends BaseRefInternals {
   /** Get the text as a string */
   getStringValue() {
     const container = this.getContainer();
+    const overlay = this.getOverlay();
+    if (overlay) {
+      const diff = overlay.get(container.id);
+      if (diff && diff.type === "text") {
+        const containerValue2 = container.toString();
+        return applyTextDelta(containerValue2, diff.diff);
+      }
+    }
     const containerValue = container.toString();
     if (containerValue !== "" || this.materialized) {
       return containerValue;
@@ -1960,11 +2073,28 @@ var TextRefInternals = class extends BaseRefInternals {
   }
   /** Get the text as a delta */
   toDelta() {
-    return this.getContainer().toDelta();
+    const container = this.getContainer();
+    const overlay = this.getOverlay();
+    if (overlay) {
+      const diff = overlay.get(container.id);
+      if (diff && diff.type === "text") {
+        const base = container.toDelta();
+        return applyDeltaToDelta(base, diff.diff);
+      }
+    }
+    return container.toDelta();
   }
   /** Get the length of the text */
   getLength() {
-    return this.getContainer().length;
+    const container = this.getContainer();
+    const overlay = this.getOverlay();
+    if (overlay) {
+      const diff = overlay.get(container.id);
+      if (diff && diff.type === "text") {
+        return applyTextDelta(container.toString(), diff.diff).length;
+      }
+    }
+    return container.length;
   }
   /** No plain values in text */
   absorbPlainValues() {
@@ -1985,6 +2115,29 @@ var TextRefInternals = class extends BaseRefInternals {
     };
   }
 };
+function applyTextDelta(text, delta) {
+  let result = "";
+  let index = 0;
+  for (const op of delta) {
+    if (op.retain !== void 0) {
+      result += text.slice(index, index + op.retain);
+      index += op.retain;
+    } else if (op.delete !== void 0) {
+      index += op.delete;
+    } else if (op.insert !== void 0) {
+      result += op.insert;
+    }
+  }
+  if (index < text.length) {
+    result += text.slice(index);
+  }
+  return result;
+}
+function applyDeltaToDelta(base, diff) {
+  const baseText = base.map((op) => op.insert !== void 0 ? op.insert : "").join("");
+  const nextText = applyTextDelta(baseText, diff);
+  return nextText ? [{ insert: nextText }] : [];
+}
 
 // src/typed-refs/text-ref.ts
 var TextRef = class extends TypedRef {
@@ -2686,7 +2839,8 @@ var DocRefInternals = class extends BaseRefInternals {
       getContainer: () => getter(key),
       autoCommit: this.getAutoCommit(),
       batchedMutation: this.getBatchedMutation(),
-      getDoc: () => this.doc
+      getDoc: () => this.doc,
+      overlay: this.getOverlay()
     };
   }
   /** Get or create a typed ref for a key */
@@ -2967,13 +3121,15 @@ var TypedDocInternal = class {
   shape;
   placeholder;
   doc;
+  overlay;
   valueRef = null;
   // Reference to the proxy for returning from change()
   proxy = null;
-  constructor(shape, doc = new LoroDoc()) {
+  constructor(shape, doc = new LoroDoc(), overlay) {
     this.shape = shape;
     this.placeholder = derivePlaceholder(shape);
     this.doc = doc;
+    this.overlay = overlay;
     validatePlaceholder(this.placeholder, this.shape);
   }
   get value() {
@@ -2982,7 +3138,8 @@ var TypedDocInternal = class {
         shape: this.shape,
         placeholder: this.placeholder,
         doc: this.doc,
-        autoCommit: true
+        autoCommit: true,
+        overlay: this.overlay
       });
     }
     return this.valueRef;
@@ -3001,8 +3158,9 @@ var TypedDocInternal = class {
       placeholder: this.placeholder,
       doc: this.doc,
       autoCommit: false,
-      batchedMutation: true
+      batchedMutation: true,
       // Enable value shape caching for find-and-mutate patterns
+      overlay: this.overlay
     });
     fn(draft);
     draft[INTERNAL_SYMBOL].absorbPlainValues();
@@ -3029,8 +3187,12 @@ var TypedDocInternal = class {
     return this.doc.toJSON();
   }
 };
-function createTypedDoc(shape, existingDoc) {
-  const internal = new TypedDocInternal(shape, existingDoc || new LoroDoc());
+function createTypedDoc(shape, options = {}) {
+  const internal = new TypedDocInternal(
+    shape,
+    options.doc || new LoroDoc(),
+    options.overlay
+  );
   const loroNamespace = {
     get doc() {
       return internal.loroDoc;
@@ -3057,7 +3219,7 @@ function createTypedDoc(shape, existingDoc) {
   };
   const forkAtFunction = (frontiers) => {
     const forkedLoroDoc = internal.loroDoc.forkAt(frontiers);
-    return createTypedDoc(internal.docShape, forkedLoroDoc);
+    return createTypedDoc(internal.docShape, { doc: forkedLoroDoc });
   };
   const proxy = new Proxy(internal.value, {
     get(target, prop, receiver) {
@@ -3161,13 +3323,13 @@ function fork(doc, options) {
   if (options?.preservePeerId) {
     forkedLoroDoc.setPeerId(loroDoc.peerId);
   }
-  return createTypedDoc(shape, forkedLoroDoc);
+  return createTypedDoc(shape, { doc: forkedLoroDoc });
 }
 function forkAt(doc, frontiers) {
   const loroDoc = loro(doc).doc;
   const forkedLoroDoc = loroDoc.forkAt(frontiers);
   const shape = loro(doc).docShape;
-  return createTypedDoc(shape, forkedLoroDoc);
+  return createTypedDoc(shape, { doc: forkedLoroDoc });
 }
 function shallowForkAt(doc, frontiers, options) {
   const loroDoc = loro(doc).doc;
@@ -3180,7 +3342,19 @@ function shallowForkAt(doc, frontiers, options) {
   if (options?.preservePeerId) {
     shallowLoroDoc.setPeerId(loroDoc.peerId);
   }
-  return createTypedDoc(shape, shallowLoroDoc);
+  return createTypedDoc(shape, { doc: shallowLoroDoc });
+}
+function getTransition(doc, event) {
+  if (event.by === "checkout") {
+    throw new Error("getTransition does not support checkout events");
+  }
+  const loroDoc = getLoroDoc(doc);
+  const shape = loro(doc).docShape;
+  const overlay = createDiffOverlay(loroDoc, event);
+  return {
+    before: createTypedDoc(shape, { doc: loroDoc, overlay }),
+    after: createTypedDoc(shape, { doc: loroDoc })
+  };
 }
 
 // src/path-builder.ts
@@ -3913,6 +4087,7 @@ export {
   Shape,
   change,
   compileToJsonPath,
+  createDiffOverlay,
   createPathBuilder,
   createPlaceholderProxy,
   createTypedDoc,
@@ -3924,6 +4099,7 @@ export {
   forkAt,
   getLoroContainer,
   getLoroDoc,
+  getTransition,
   hasWildcard,
   loro,
   mergeValue,