@sovereignbase/convergent-replicated-list 1.3.4 → 1.3.6

package/dist/index.js

@@ -294,8 +294,17 @@ function trySpliceReplacement(crListReplica, insertedEntries, reparentedEntries,
   } else if (crListReplica.childrenMap.get(inserted.uuidv7)?.length) {
     return false;
   }
-  if (predecessor?.next !== next) return false;
-  if (!predecessor && crListReplica.cursor !== next) return false;
+  if (predecessor) {
+    if (predecessor.next !== next) return false;
+  } else {
+    let reachable = 0;
+    let current2 = next;
+    while (current2) {
+      reachable++;
+      current2 = current2.next;
+    }
+    if (reachable !== crListReplica.parentMap.size - 1) return false;
+  }
   const expectedIndex = predecessor ? predecessor.index + 1 : 0;
   void linkEntryBetween(predecessor, inserted, next);
   let current = inserted;
@@ -312,6 +321,48 @@ function trySpliceReplacement(crListReplica, insertedEntries, reparentedEntries,
   return true;
 }
 
+// src/.helpers/trySpliceSiblingInsert/index.ts
+function trySpliceSiblingInsert(crListReplica, insertedEntries, reparentedEntries, tombstoneCount) {
+  if (tombstoneCount !== 0 || insertedEntries.length !== 1 || reparentedEntries.length !== 0)
+    return false;
+  const inserted = insertedEntries[0];
+  if (inserted.predecessor === "\0") return false;
+  if (crListReplica.childrenMap.get(inserted.uuidv7)?.length) return false;
+  const predecessor = crListReplica.parentMap.get(inserted.predecessor);
+  const siblings = crListReplica.childrenMap.get(inserted.predecessor);
+  if (!predecessor || !siblings || siblings.length < 2) return false;
+  void siblings.sort((a, b) => a.uuidv7 > b.uuidv7 ? 1 : -1);
+  const siblingIndex = siblings.indexOf(inserted);
+  if (siblingIndex === -1) return false;
+  const lastSibling = siblings[siblings.length - 1];
+  if (lastSibling !== inserted && lastSibling.next) return false;
+  const previousSibling = siblings[siblingIndex - 1];
+  const nextSibling = siblings[siblingIndex + 1];
+  if (previousSibling?.uuidv7) {
+    if (crListReplica.childrenMap.get(previousSibling.uuidv7)?.length)
+      return false;
+    if (previousSibling.next !== nextSibling) return false;
+  } else if (predecessor.next !== nextSibling) {
+    return false;
+  }
+  const prev = previousSibling ?? predecessor;
+  const next = nextSibling;
+  if (next && next.prev !== prev) return false;
+  void linkEntryBetween(prev, inserted, next);
+  let current = inserted;
+  let index = prev.index + 1;
+  while (current) {
+    current.index = index;
+    index++;
+    current = current.next;
+  }
+  crListReplica.index = /* @__PURE__ */ new Map([[inserted.index, inserted]]);
+  crListReplica.cursor = inserted;
+  crListReplica.cursorIndex = inserted.index;
+  crListReplica.size = crListReplica.parentMap.size;
+  return true;
+}
+
 // src/core/crud/create/index.ts
 import { isUuidV7 as isUuidV72, prototype } from "@sovereignbase/utils";
 function __create(snapshot) {
@@ -385,6 +436,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
   if (listValues.length === 0) return false;
   const change = {};
   const delta = { values: [], tombstones: [] };
+  let displacedEntry;
   for (const listValue of listValues) {
     const v7 = uuidv7();
     const linkedListEntry = {
@@ -433,15 +485,27 @@ function __update(listIndex, listValues, crListReplica, mode) {
           linkedListEntry,
           entryToOverwrite.next
         );
-        if (entryToOverwrite.next) {
-          if (entryToOverwrite.next.predecessor === entryToOverwrite.uuidv7) {
-            void moveEntryToPredecessor(
-              crListReplica,
-              entryToOverwrite.next,
-              linkedListEntry.uuidv7,
-              delta
-            );
+        if (entryToOverwrite.next?.predecessor === entryToOverwrite.uuidv7) {
+          const overwriteNext = entryToOverwrite.next;
+          const owSibs = crListReplica.childrenMap.get(
+            overwriteNext.predecessor
+          );
+          if (owSibs) {
+            const i = owSibs.indexOf(overwriteNext);
+            if (i !== -1) owSibs.splice(i, 1);
           }
+          overwriteNext.predecessor = linkedListEntry.uuidv7;
+          const newSibs = crListReplica.childrenMap.get(linkedListEntry.uuidv7);
+          if (newSibs) newSibs.push(overwriteNext);
+          else
+            crListReplica.childrenMap.set(linkedListEntry.uuidv7, [
+              overwriteNext
+            ]);
+          delta.values?.push({
+            uuidv7: overwriteNext.uuidv7,
+            value: overwriteNext.value,
+            predecessor: overwriteNext.predecessor
+          });
         }
         void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
         void crListReplica.tombstones.add(entryToOverwrite.uuidv7);
@@ -475,20 +539,24 @@ function __update(listIndex, listValues, crListReplica, mode) {
         linkedListEntry.index = actualIndex + 1;
         linkedListEntry.predecessor = crListReplica.cursor.uuidv7;
         void linkEntryBetween(crListReplica.cursor, linkedListEntry, next);
-        if (next) {
-          if (next.predecessor === crListReplica.cursor.uuidv7) {
-            void moveEntryToPredecessor(
-              crListReplica,
-              next,
-              linkedListEntry.uuidv7,
-              delta
-            );
+        if (next && next.predecessor === crListReplica.cursor.uuidv7) {
+          if (!displacedEntry) {
+            displacedEntry = next;
+            const sibs = crListReplica.childrenMap.get(next.predecessor);
+            if (sibs) {
+              const i = sibs.indexOf(next);
+              if (i !== -1) sibs.splice(i, 1);
+            }
           }
+          displacedEntry.predecessor = linkedListEntry.uuidv7;
         }
         void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
         crListReplica.cursor = linkedListEntry;
         crListReplica.cursorIndex = linkedListEntry.index;
-        if (next) crListReplica.index = /* @__PURE__ */ new Map();
+        if (next) {
+          if (crListReplica.index) crListReplica.index.clear();
+          else crListReplica.index = /* @__PURE__ */ new Map();
+        }
         void crListReplica.index?.set(linkedListEntry.index, linkedListEntry);
         change[linkedListEntry.index] = linkedListEntry.value;
         break;
@@ -512,17 +580,23 @@ function __update(listIndex, listValues, crListReplica, mode) {
         linkedListEntry.predecessor = prev?.uuidv7 ?? "\0";
         void linkEntryBetween(prev, linkedListEntry, crListReplica.cursor);
         if (crListReplica.cursor.predecessor === linkedListEntry.predecessor) {
-          void moveEntryToPredecessor(
-            crListReplica,
-            crListReplica.cursor,
-            linkedListEntry.uuidv7,
-            delta
-          );
+          if (!displacedEntry) {
+            displacedEntry = crListReplica.cursor;
+            const sibs = crListReplica.childrenMap.get(
+              crListReplica.cursor.predecessor
+            );
+            if (sibs) {
+              const i = sibs.indexOf(crListReplica.cursor);
+              if (i !== -1) sibs.splice(i, 1);
+            }
+          }
+          displacedEntry.predecessor = linkedListEntry.uuidv7;
         }
         void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
         crListReplica.cursor = linkedListEntry;
         crListReplica.cursorIndex = actualIndex;
-        crListReplica.index = /* @__PURE__ */ new Map();
+        if (crListReplica.index) crListReplica.index.clear();
+        else crListReplica.index = /* @__PURE__ */ new Map();
         void crListReplica.index?.set(linkedListEntry.index, linkedListEntry);
         change[actualIndex] = linkedListEntry.value;
         mode = "after";
@@ -533,6 +607,19 @@ function __update(listIndex, listValues, crListReplica, mode) {
     crListReplica.size = crListReplica.parentMap.size;
     listIndex++;
   }
+  if (displacedEntry) {
+    const sibs = crListReplica.childrenMap.get(displacedEntry.predecessor);
+    if (sibs) sibs.push(displacedEntry);
+    else
+      crListReplica.childrenMap.set(displacedEntry.predecessor, [
+        displacedEntry
+      ]);
+    delta.values?.push({
+      uuidv7: displacedEntry.uuidv7,
+      value: displacedEntry.value,
+      predecessor: displacedEntry.predecessor
+    });
+  }
   return { change, delta };
 }
 
@@ -645,7 +732,7 @@ function __merge(crListReplica, crListDelta) {
       }
     }
   }
-  if (!Object.hasOwn(crListDelta, "values") || !Array.isArray(crListDelta.values)) {
+  if (!Object.hasOwn(crListDelta, "values") || !Array.isArray(crListDelta.values) || crListDelta.values.length === 0 && tailTombstoneMovedCursor) {
     if (newTombsIndices.length === 0) return false;
     if (newTombsIndices.length === 1 && tailTombstoneMovedCursor) {
       if (crListReplica.cursor) {
@@ -714,7 +801,12 @@ function __merge(crListReplica, crListDelta) {
     }
   }
   if (needsRelink) {
-    if (!trySpliceInsertedParent(crListReplica, newVals, reparentedVals) && !trySpliceReplacement(
+    if (!trySpliceSiblingInsert(
+      crListReplica,
+      newVals,
+      reparentedVals,
+      newTombsIndices.length
+    ) && !trySpliceInsertedParent(crListReplica, newVals, reparentedVals) && !trySpliceReplacement(
       crListReplica,
       newVals,
       reparentedVals,
@@ -868,32 +960,32 @@ var CRList = class {
     return this.state.size;
   }
   /**
-   * Inserts a value before an index.
+   * Inserts values before an index.
    *
-   * If `beforeIndex` is omitted, the value is inserted at the start of the list.
+   * If `beforeIndex` is omitted, values are inserted at the start of the list.
    *
-   * @param value - The value to insert.
+   * @param values - Values to insert.
    * @param beforeIndex - The index to insert before.
    */
-  prepend(value, beforeIndex) {
-    const result = __update(beforeIndex ?? 0, [value], this.state, "before");
+  prepend(values, beforeIndex) {
+    const result = __update(beforeIndex ?? 0, values, this.state, "before");
     if (!result) return;
     const { delta, change } = result;
     if (delta) void dispatchCRListEvent(this.eventTarget, "delta", delta);
     if (change) void dispatchCRListEvent(this.eventTarget, "change", change);
   }
   /**
-   * Inserts a value after an index.
+   * Inserts values after an index.
    *
-   * If `afterIndex` is omitted, the value is appended at the end of the list.
+   * If `afterIndex` is omitted, values are appended at the end of the list.
    *
-   * @param value - The value to insert.
+   * @param values - Values to insert.
    * @param afterIndex - The index to insert after.
    */
-  append(value, afterIndex) {
+  append(values, afterIndex) {
     const result = __update(
       afterIndex ?? this.state.size,
-      [value],
+      values,
       this.state,
       "after"
     );
@@ -903,12 +995,26 @@ var CRList = class {
     if (change) void dispatchCRListEvent(this.eventTarget, "change", change);
   }
   /**
-   * Removes the entry at an index.
+   * Overwrites entries starting at an index.
+   *
+   * @param index - The index to start overwriting at.
+   * @param values - Values to write.
+   */
+  update(index, values) {
+    const result = __update(index, values, this.state, "overwrite");
+    if (!result) return;
+    const { delta, change } = result;
+    if (delta) void dispatchCRListEvent(this.eventTarget, "delta", delta);
+    if (change) void dispatchCRListEvent(this.eventTarget, "change", change);
+  }
+  /**
+   * Removes one or more entries starting at an index.
    *
-   * @param index - The index to remove.
+   * @param index - The first index to remove.
+   * @param count - Number of entries to remove. Defaults to `1`.
    */
-  remove(index) {
-    const result = __delete(this.state, index, index + 1);
+  remove(index, count = 1) {
+    const result = __delete(this.state, index, index + count);
     if (!result) return;
     const { delta, change } = result;
     if (delta) void dispatchCRListEvent(this.eventTarget, "delta", delta);