@liveblocks/core 1.2.2-test1 → 1.2.2-test2

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.2.2-test1";
+var PKG_VERSION = "1.2.2-test2";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -2068,7 +2068,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     super();
     this._items = [];
     this._implicitlyDeletedItems = /* @__PURE__ */ new WeakSet();
-    this._unacknowledgedDeletedIds = /* @__PURE__ */ new Set();
+    this._unacknowledgedSets = /* @__PURE__ */ new Map();
     let position = void 0;
     for (const item of items) {
       const newPosition = makePosition(position);
@@ -2211,9 +2211,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (deletedDelta) {
       delta.push(deletedDelta);
     }
-    if (this._unacknowledgedDeletedIds.has(op.id)) {
-      this._unacknowledgedDeletedIds.delete(op.id);
-      return delta.length === 0 ? { modified: false } : { modified: makeUpdate(this, delta), reverse: [] };
+    const unacknowledgedOpId = this._unacknowledgedSets.get(op.parentKey);
+    if (unacknowledgedOpId !== void 0) {
+      if (unacknowledgedOpId !== op.opId) {
+        return delta.length === 0 ? { modified: false } : { modified: makeUpdate(this, delta), reverse: [] };
+      } else {
+        this._unacknowledgedSets.delete(op.parentKey);
+      }
     }
     const indexOfItemWithSamePosition = this._indexOfPosition(op.parentKey);
     const existingItem = this._items.find((item) => item._id === op.id);
@@ -2312,11 +2316,6 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   /** @internal */
   _applyInsertAck(op) {
-    if (this._unacknowledgedDeletedIds.has(op.id)) {
-      return {
-        modified: false
-      };
-    }
     const existingItem = this._items.find((item) => item._id === op.id);
     const key = asPos(op.parentKey);
     const itemIndexAtPosition = this._indexOfPosition(key);
@@ -2397,6 +2396,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     if (_optionalChain([this, 'access', _56 => _56._pool, 'optionalAccess', _57 => _57.getNode, 'call', _58 => _58(id)]) !== void 0) {
       return { modified: false };
     }
+    this._unacknowledgedSets.set(key, nn(op.opId));
     const indexOfItemWithSameKey = this._indexOfPosition(key);
     child._attach(id, nn(this._pool));
     child._setParentLink(this, key);
@@ -2658,7 +2658,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     _optionalChain([this, 'access', _74 => _74._pool, 'optionalAccess', _75 => _75.assertStorageIsWritable, 'call', _76 => _76()]);
     if (index < 0 || index > this._items.length) {
       throw new Error(
-        `Cannot insert list item at index "${index}". index should be between 0 and ${this._items.length}`
+        `Cannot insert list item at index "${index}". index should be between 0 and ${this._items.length}`
       );
     }
     const before2 = this._items[index - 1] ? this._items[index - 1]._parentPos : void 0;
@@ -2746,7 +2746,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
     _optionalChain([this, 'access', _80 => _80._pool, 'optionalAccess', _81 => _81.assertStorageIsWritable, 'call', _82 => _82()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
-        `Cannot delete list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
+        `Cannot delete list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
       );
     }
     const item = this._items[index];
@@ -2754,8 +2754,8 @@ var LiveList = class _LiveList extends AbstractCrdt {
     this._items.splice(index, 1);
     this.invalidate();
     if (this._pool) {
-      const childId = item._id;
-      if (childId) {
+      const childRecordId = item._id;
+      if (childRecordId) {
         const storageUpdates = /* @__PURE__ */ new Map();
         storageUpdates.set(
           nn(this._id),
@@ -2764,7 +2764,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         this._pool.dispatch(
           [
             {
-              id: childId,
+              id: childRecordId,
               opId: this._pool.generateOpId(),
               type: 5 /* DELETE_CRDT */
             }
@@ -2813,16 +2813,13 @@ var LiveList = class _LiveList extends AbstractCrdt {
     _optionalChain([this, 'access', _86 => _86._pool, 'optionalAccess', _87 => _87.assertStorageIsWritable, 'call', _88 => _88()]);
     if (index < 0 || index >= this._items.length) {
       throw new Error(
-        `Cannot set list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
+        `Cannot set list item at index "${index}". index should be between 0 and ${this._items.length - 1}`
       );
     }
     const existingItem = this._items[index];
     const position = existingItem._getParentKeyOrThrow();
     const existingId = existingItem._id;
     existingItem._detach();
-    if (existingId !== void 0) {
-      this._unacknowledgedDeletedIds.add(existingId);
-    }
     const value = lsonToLiveNode(item);
     value._setParentLink(this, position);
     this._items[index] = value;
@@ -2836,6 +2833,7 @@ var LiveList = class _LiveList extends AbstractCrdt {
         value._toOps(this._id, position, this._pool),
         existingId
       );
+      this._unacknowledgedSets.set(position, nn(ops[0].opId));
       const reverseOps = HACK_addIntentAndDeletedIdToOperation(
         existingItem._toOps(this._id, position, void 0),
         id