@sovereignbase/convergent-replicated-list 1.3.2 → 1.3.4

package/dist/index.cjs

@@ -237,10 +237,10 @@ function moveEntryToPredecessor(crListReplica, linkedListEntry, predecessor, del
 
 // src/.helpers/indexFromPropertyKey/index.ts
 function indexFromPropertyKey(index) {
-  if (typeof index !== "string" || !/^(0|[1-9]\d*)$/.test(index))
-    return void 0;
+  if (typeof index !== "string") return void 0;
   const listIndex = Number(index);
-  return Number.isSafeInteger(listIndex) ? listIndex : void 0;
+  if (!Number.isSafeInteger(listIndex) || listIndex < 0) return void 0;
+  return String(listIndex) === index ? listIndex : void 0;
 }
 
 // src/.helpers/trySpliceInsertedParent/index.ts
@@ -276,6 +276,42 @@ function trySpliceInsertedParent(crListReplica, insertedEntries, reparentedEntri
   return true;
 }
 
+// src/.helpers/trySpliceReplacement/index.ts
+function trySpliceReplacement(crListReplica, insertedEntries, reparentedEntries, tombstoneCount) {
+  if (tombstoneCount === 0 || insertedEntries.length !== 1 || reparentedEntries.length > 1)
+    return false;
+  const inserted = insertedEntries[0];
+  const predecessor = inserted.predecessor === "\0" ? void 0 : crListReplica.parentMap.get(inserted.predecessor);
+  if (inserted.predecessor !== "\0" && !predecessor) return false;
+  const siblings = crListReplica.childrenMap.get(inserted.predecessor);
+  if (_optionalChain([siblings, 'optionalAccess', _20 => _20.length]) !== 1 || siblings[0] !== inserted) return false;
+  const reparented = reparentedEntries[0];
+  const next = _optionalChain([reparented, 'optionalAccess', _21 => _21.entry]);
+  if (next) {
+    const children = crListReplica.childrenMap.get(inserted.uuidv7);
+    if (next.predecessor !== inserted.uuidv7 || !crListReplica.tombstones.has(reparented.previousPredecessor) || _optionalChain([children, 'optionalAccess', _22 => _22.length]) !== 1 || children[0] !== next || next.prev !== predecessor)
+      return false;
+  } else if (_optionalChain([crListReplica, 'access', _23 => _23.childrenMap, 'access', _24 => _24.get, 'call', _25 => _25(inserted.uuidv7), 'optionalAccess', _26 => _26.length])) {
+    return false;
+  }
+  if (_optionalChain([predecessor, 'optionalAccess', _27 => _27.next]) !== next) return false;
+  if (!predecessor && crListReplica.cursor !== next) return false;
+  const expectedIndex = predecessor ? predecessor.index + 1 : 0;
+  void linkEntryBetween(predecessor, inserted, next);
+  let current = inserted;
+  let index = expectedIndex;
+  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
 
 function __create(snapshot) {
@@ -307,11 +343,11 @@ function __create(snapshot) {
     );
     if (!linkedListEntry) continue;
     void attachEntryToIndexes(crListReplica, linkedListEntry);
-    if (canUseLinearProjection && linkedListEntry.predecessor === (_nullishCoalesce(_optionalChain([previous, 'optionalAccess', _20 => _20.uuidv7]), () => ( "\0")))) {
+    if (canUseLinearProjection && linkedListEntry.predecessor === (_nullishCoalesce(_optionalChain([previous, 'optionalAccess', _28 => _28.uuidv7]), () => ( "\0")))) {
       linkedListEntry.index = crListReplica.parentMap.size - 1;
       void linkEntryBetween(previous, linkedListEntry, void 0);
       previous = linkedListEntry;
-      void _optionalChain([crListReplica, 'access', _21 => _21.index, 'optionalAccess', _22 => _22.set, 'call', _23 => _23(linkedListEntry.index, linkedListEntry)]);
+      void _optionalChain([crListReplica, 'access', _29 => _29.index, 'optionalAccess', _30 => _30.set, 'call', _31 => _31(linkedListEntry.index, linkedListEntry)]);
       continue;
     }
     canUseLinearProjection = false;
@@ -330,7 +366,7 @@ function __create(snapshot) {
 function __read(targetIndex, crListReplica) {
   try {
     void seekCursorToIndex(targetIndex, crListReplica);
-    return _optionalChain([crListReplica, 'access', _24 => _24.cursor, 'optionalAccess', _25 => _25.value]);
+    return _optionalChain([crListReplica, 'access', _32 => _32.cursor, 'optionalAccess', _33 => _33.value]);
   } catch (e) {
     return void 0;
   }
@@ -366,7 +402,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
             crListReplica.cursor = linkedListEntry;
             crListReplica.cursorIndex = linkedListEntry.index;
             void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
-            _optionalChain([crListReplica, 'access', _26 => _26.index, 'optionalAccess', _27 => _27.set, 'call', _28 => _28(linkedListEntry.index, linkedListEntry)]);
+            _optionalChain([crListReplica, 'access', _34 => _34.index, 'optionalAccess', _35 => _35.set, 'call', _36 => _36(linkedListEntry.index, linkedListEntry)]);
             change[linkedListEntry.index] = linkedListEntry.value;
             break;
           }
@@ -382,7 +418,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
           void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
           crListReplica.cursor = linkedListEntry;
           crListReplica.cursorIndex = linkedListEntry.index;
-          void _optionalChain([crListReplica, 'access', _29 => _29.index, 'optionalAccess', _30 => _30.set, 'call', _31 => _31(linkedListEntry.index, linkedListEntry)]);
+          void _optionalChain([crListReplica, 'access', _37 => _37.index, 'optionalAccess', _38 => _38.set, 'call', _39 => _39(linkedListEntry.index, linkedListEntry)]);
           change[linkedListEntry.index] = linkedListEntry.value;
           break;
         }
@@ -409,13 +445,13 @@ function __update(listIndex, listValues, crListReplica, mode) {
         }
         void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
         void crListReplica.tombstones.add(entryToOverwrite.uuidv7);
-        void _optionalChain([delta, 'access', _32 => _32.tombstones, 'optionalAccess', _33 => _33.push, 'call', _34 => _34(entryToOverwrite.uuidv7)]);
+        void _optionalChain([delta, 'access', _40 => _40.tombstones, 'optionalAccess', _41 => _41.push, 'call', _42 => _42(entryToOverwrite.uuidv7)]);
         void detachEntryFromIndexes(crListReplica, entryToOverwrite);
         entryToOverwrite.next = void 0;
         entryToOverwrite.prev = void 0;
         crListReplica.cursor = linkedListEntry;
         crListReplica.cursorIndex = actualIndex;
-        void _optionalChain([crListReplica, 'access', _35 => _35.index, 'optionalAccess', _36 => _36.set, 'call', _37 => _37(linkedListEntry.index, linkedListEntry)]);
+        void _optionalChain([crListReplica, 'access', _43 => _43.index, 'optionalAccess', _44 => _44.set, 'call', _45 => _45(linkedListEntry.index, linkedListEntry)]);
         change[actualIndex] = linkedListEntry.value;
         break;
       }
@@ -424,7 +460,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
           crListReplica.cursor = linkedListEntry;
           crListReplica.cursorIndex = linkedListEntry.index;
           void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
-          void _optionalChain([crListReplica, 'access', _38 => _38.index, 'optionalAccess', _39 => _39.set, 'call', _40 => _40(linkedListEntry.index, linkedListEntry)]);
+          void _optionalChain([crListReplica, 'access', _46 => _46.index, 'optionalAccess', _47 => _47.set, 'call', _48 => _48(linkedListEntry.index, linkedListEntry)]);
           change[linkedListEntry.index] = linkedListEntry.value;
           break;
         }
@@ -453,7 +489,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
         crListReplica.cursor = linkedListEntry;
         crListReplica.cursorIndex = linkedListEntry.index;
         if (next) crListReplica.index = /* @__PURE__ */ new Map();
-        void _optionalChain([crListReplica, 'access', _41 => _41.index, 'optionalAccess', _42 => _42.set, 'call', _43 => _43(linkedListEntry.index, linkedListEntry)]);
+        void _optionalChain([crListReplica, 'access', _49 => _49.index, 'optionalAccess', _50 => _50.set, 'call', _51 => _51(linkedListEntry.index, linkedListEntry)]);
         change[linkedListEntry.index] = linkedListEntry.value;
         break;
       }
@@ -462,7 +498,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
           crListReplica.cursor = linkedListEntry;
           crListReplica.cursorIndex = linkedListEntry.index;
           void attachEntryToIndexes(crListReplica, linkedListEntry, delta);
-          void _optionalChain([crListReplica, 'access', _44 => _44.index, 'optionalAccess', _45 => _45.set, 'call', _46 => _46(linkedListEntry.index, linkedListEntry)]);
+          void _optionalChain([crListReplica, 'access', _52 => _52.index, 'optionalAccess', _53 => _53.set, 'call', _54 => _54(linkedListEntry.index, linkedListEntry)]);
           change[linkedListEntry.index] = linkedListEntry.value;
           mode = "after";
           listIndex = linkedListEntry.index - 1;
@@ -473,7 +509,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
         const actualIndex = _nullishCoalesce(crListReplica.cursorIndex, () => ( listIndex));
         const prev = crListReplica.cursor.prev;
         linkedListEntry.index = actualIndex;
-        linkedListEntry.predecessor = _nullishCoalesce(_optionalChain([prev, 'optionalAccess', _47 => _47.uuidv7]), () => ( "\0"));
+        linkedListEntry.predecessor = _nullishCoalesce(_optionalChain([prev, 'optionalAccess', _55 => _55.uuidv7]), () => ( "\0"));
         void linkEntryBetween(prev, linkedListEntry, crListReplica.cursor);
         if (crListReplica.cursor.predecessor === linkedListEntry.predecessor) {
           void moveEntryToPredecessor(
@@ -487,7 +523,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
         crListReplica.cursor = linkedListEntry;
         crListReplica.cursorIndex = actualIndex;
         crListReplica.index = /* @__PURE__ */ new Map();
-        void _optionalChain([crListReplica, 'access', _48 => _48.index, 'optionalAccess', _49 => _49.set, 'call', _50 => _50(linkedListEntry.index, linkedListEntry)]);
+        void _optionalChain([crListReplica, 'access', _56 => _56.index, 'optionalAccess', _57 => _57.set, 'call', _58 => _58(linkedListEntry.index, linkedListEntry)]);
         change[actualIndex] = linkedListEntry.value;
         mode = "after";
         listIndex = linkedListEntry.index - 1;
@@ -501,6 +537,7 @@ function __update(listIndex, listValues, crListReplica, mode) {
 }
 
 // src/core/crud/delete/index.ts
+
 function __delete(crListReplica, startIndex, endIndex) {
   const change = {};
   const delta = { values: [], tombstones: [] };
@@ -513,17 +550,43 @@ function __delete(crListReplica, startIndex, endIndex) {
   void seekCursorToIndex(listIndex, crListReplica);
   if (!crListReplica.cursor) return false;
   let current = crListReplica.cursor;
+  const predecessor = _nullishCoalesce(_optionalChain([current, 'access', _59 => _59.prev, 'optionalAccess', _60 => _60.uuidv7]), () => ( "\0"));
+  const deletedIds = /* @__PURE__ */ new Set();
   let deleted = 0;
   let currentIndex = _nullishCoalesce(crListReplica.cursorIndex, () => ( listIndex));
   while (current && deleted < deleteCount) {
     const next = current.next;
     change[currentIndex] = void 0;
-    void _optionalChain([crListReplica, 'access', _51 => _51.index, 'optionalAccess', _52 => _52.delete, 'call', _53 => _53(currentIndex)]);
+    void deletedIds.add(current.uuidv7);
+    void _optionalChain([crListReplica, 'access', _61 => _61.index, 'optionalAccess', _62 => _62.delete, 'call', _63 => _63(currentIndex)]);
     void deleteLiveEntry(crListReplica, current, delta);
     current = next;
     currentIndex++;
     deleted++;
   }
+  if (current && deletedIds.has(current.predecessor)) {
+    const replacement = {
+      uuidv7: _uuid.v7.call(void 0, ),
+      value: current.value,
+      predecessor,
+      index: listIndex,
+      next: void 0,
+      prev: void 0
+    };
+    const prev = current.prev;
+    const next = current.next;
+    void deleteLiveEntry(crListReplica, current, delta);
+    void linkEntryBetween(prev, replacement, next);
+    void attachEntryToIndexes(crListReplica, replacement, delta);
+    if (_optionalChain([next, 'optionalAccess', _64 => _64.predecessor]) === current.uuidv7)
+      void moveEntryToPredecessor(
+        crListReplica,
+        next,
+        replacement.uuidv7,
+        delta
+      );
+    current = replacement;
+  }
   crListReplica.size = crListReplica.parentMap.size;
   crListReplica.cursor = _nullishCoalesce(current, () => ( crListReplica.cursor));
   crListReplica.cursorIndex = current ? listIndex : crListReplica.cursor ? Math.max(0, crListReplica.size - 1) : void 0;
@@ -544,6 +607,7 @@ function __merge(crListReplica, crListDelta) {
   const newTombsIndices = [];
   const reparentedVals = [];
   const change = {};
+  let tailTombstoneMovedCursor = false;
   let needsRelink = false;
   if (Object.hasOwn(crListDelta, "values") && Array.isArray(crListDelta.values) && crListDelta.values.length === 1 && (!Object.hasOwn(crListDelta, "tombstones") || Array.isArray(crListDelta.tombstones) && crListDelta.tombstones.length === 0)) {
     const linkedListEntry = materializeSnapshotEntry(
@@ -560,7 +624,7 @@ function __merge(crListReplica, crListDelta) {
       crListReplica.cursorIndex = linkedListEntry.index;
       void attachEntryToIndexes(crListReplica, linkedListEntry);
       crListReplica.size = crListReplica.parentMap.size;
-      void _optionalChain([crListReplica, 'access', _54 => _54.index, 'optionalAccess', _55 => _55.set, 'call', _56 => _56(linkedListEntry.index, linkedListEntry)]);
+      void _optionalChain([crListReplica, 'access', _65 => _65.index, 'optionalAccess', _66 => _66.set, 'call', _67 => _67(linkedListEntry.index, linkedListEntry)]);
       return { [linkedListEntry.index]: linkedListEntry.value };
     }
   }
@@ -571,15 +635,31 @@ function __merge(crListReplica, crListDelta) {
       void crListReplica.tombstones.add(tombstone);
       const linkedListEntry = crListReplica.parentMap.get(tombstone);
       if (linkedListEntry) {
+        const wasTail = linkedListEntry.next === void 0;
+        const wasCursor = crListReplica.cursor === linkedListEntry;
         void newTombsIndices.push(linkedListEntry.index);
-        void _optionalChain([crListReplica, 'access', _57 => _57.index, 'optionalAccess', _58 => _58.delete, 'call', _59 => _59(linkedListEntry.index)]);
+        void _optionalChain([crListReplica, 'access', _68 => _68.index, 'optionalAccess', _69 => _69.delete, 'call', _70 => _70(linkedListEntry.index)]);
         void deleteLiveEntry(crListReplica, linkedListEntry);
+        tailTombstoneMovedCursor = wasTail && wasCursor;
         needsRelink = true;
       }
     }
   }
   if (!Object.hasOwn(crListDelta, "values") || !Array.isArray(crListDelta.values)) {
     if (newTombsIndices.length === 0) return false;
+    if (newTombsIndices.length === 1 && tailTombstoneMovedCursor) {
+      if (crListReplica.cursor) {
+        crListReplica.cursorIndex = crListReplica.size - 1;
+        void _optionalChain([crListReplica, 'access', _71 => _71.index, 'optionalAccess', _72 => _72.set, 'call', _73 => _73(
+          crListReplica.cursorIndex,
+          crListReplica.cursor
+        )]);
+      } else {
+        crListReplica.cursorIndex = void 0;
+      }
+      change[newTombsIndices[0]] = void 0;
+      return change;
+    }
     void rebuildLiveIndex(crListReplica);
     for (const index of newTombsIndices) {
       change[index] = void 0;
@@ -617,7 +697,7 @@ function __merge(crListReplica, crListDelta) {
         crListReplica.cursor = linkedListEntry;
         crListReplica.cursorIndex = linkedListEntry.index;
         crListReplica.size = crListReplica.parentMap.size;
-        void _optionalChain([crListReplica, 'access', _60 => _60.index, 'optionalAccess', _61 => _61.set, 'call', _62 => _62(linkedListEntry.index, linkedListEntry)]);
+        void _optionalChain([crListReplica, 'access', _74 => _74.index, 'optionalAccess', _75 => _75.set, 'call', _76 => _76(linkedListEntry.index, linkedListEntry)]);
       } else {
         needsRelink = true;
       }
@@ -628,13 +708,18 @@ function __merge(crListReplica, crListDelta) {
       crListReplica.cursor = linkedListEntry;
       crListReplica.cursorIndex = linkedListEntry.index;
       crListReplica.size = crListReplica.parentMap.size;
-      void _optionalChain([crListReplica, 'access', _63 => _63.index, 'optionalAccess', _64 => _64.set, 'call', _65 => _65(linkedListEntry.index, linkedListEntry)]);
+      void _optionalChain([crListReplica, 'access', _77 => _77.index, 'optionalAccess', _78 => _78.set, 'call', _79 => _79(linkedListEntry.index, linkedListEntry)]);
     } else {
       needsRelink = true;
     }
   }
   if (needsRelink) {
-    if (!trySpliceInsertedParent(crListReplica, newVals, reparentedVals)) {
+    if (!trySpliceInsertedParent(crListReplica, newVals, reparentedVals) && !trySpliceReplacement(
+      crListReplica,
+      newVals,
+      reparentedVals,
+      newTombsIndices.length
+    )) {
       void rebuildLiveProjection(crListReplica);
     }
   }
@@ -839,8 +924,8 @@ var CRList = class {
    * @param thisArg - Optional `this` value for the predicate.
    */
   find(predicate, thisArg) {
-    let linkedListEntry = _nullishCoalesce(_optionalChain([this, 'access', _66 => _66.state, 'access', _67 => _67.index, 'optionalAccess', _68 => _68.get, 'call', _69 => _69(0)]), () => ( this.state.cursor));
-    while (_optionalChain([linkedListEntry, 'optionalAccess', _70 => _70.prev])) linkedListEntry = linkedListEntry.prev;
+    let linkedListEntry = _nullishCoalesce(_optionalChain([this, 'access', _80 => _80.state, 'access', _81 => _81.index, 'optionalAccess', _82 => _82.get, 'call', _83 => _83(0)]), () => ( this.state.cursor));
+    while (_optionalChain([linkedListEntry, 'optionalAccess', _84 => _84.prev])) linkedListEntry = linkedListEntry.prev;
     let index = 0;
     while (linkedListEntry) {
       if (predicate.call(thisArg, linkedListEntry.value, index, this))
@@ -950,9 +1035,11 @@ var CRList = class {
    * Iterates over current live values in index order.
    */
   *[Symbol.iterator]() {
-    for (let index = 0; index < this.size; index++) {
-      const value = this[index];
-      yield value;
+    let linkedListEntry = _nullishCoalesce(_optionalChain([this, 'access', _85 => _85.state, 'access', _86 => _86.index, 'optionalAccess', _87 => _87.get, 'call', _88 => _88(0)]), () => ( this.state.cursor));
+    while (_optionalChain([linkedListEntry, 'optionalAccess', _89 => _89.prev])) linkedListEntry = linkedListEntry.prev;
+    while (linkedListEntry) {
+      yield linkedListEntry.value;
+      linkedListEntry = linkedListEntry.next;
     }
   }
   /**
@@ -965,8 +1052,13 @@ var CRList = class {
    * @param thisArg - Optional `this` value for the callback.
    */
   forEach(callback, thisArg) {
-    for (let index = 0; index < this.size; index++) {
-      void callback.call(thisArg, this[index], index, this);
+    let linkedListEntry = _nullishCoalesce(_optionalChain([this, 'access', _90 => _90.state, 'access', _91 => _91.index, 'optionalAccess', _92 => _92.get, 'call', _93 => _93(0)]), () => ( this.state.cursor));
+    while (_optionalChain([linkedListEntry, 'optionalAccess', _94 => _94.prev])) linkedListEntry = linkedListEntry.prev;
+    let index = 0;
+    while (linkedListEntry) {
+      void callback.call(thisArg, linkedListEntry.value, index, this);
+      linkedListEntry = linkedListEntry.next;
+      index++;
     }
   }
 };