@yorkie-js/react 0.6.24 → 0.6.26

package/dist/yorkie-js-react.es.js

@@ -8370,12 +8370,12 @@ class ElementRHT {
   set(key, value, executedAt) {
     let removed;
     const node = this.nodeMapByKey.get(key);
-    if (node != null && !node.isRemoved() && node.remove(executedAt)) {
+    if (!!node && !node.isRemoved() && node.remove(executedAt)) {
       removed = node.getValue();
     }
     const newNode = ElementRHTNode.of(key, value);
     this.nodeMapByCreatedAt.set(value.getCreatedAt().toIDString(), newNode);
-    if (node == null || executedAt.after(node.getValue().getPositionedAt())) {
+    if (!node || executedAt.after(node.getValue().getPositionedAt())) {
       this.nodeMapByKey.set(key, newNode);
       value.setMovedAt(executedAt);
     }
@@ -8429,7 +8429,7 @@ class ElementRHT {
    */
   deleteByKey(key, removedAt) {
     const node = this.nodeMapByKey.get(key);
-    if (node == null) {
+    if (!node) {
       return;
     }
     if (!node.remove(removedAt)) {
@@ -8442,7 +8442,7 @@ class ElementRHT {
    */
   has(key) {
     const node = this.nodeMapByKey.get(key);
-    if (node == null) {
+    if (!node) {
       return false;
     }
     return !node.isRemoved();
@@ -14413,6 +14413,12 @@ class VersionVector {
   get(actorID) {
     return this.vector.get(actorID);
   }
+  /**
+   * `has` checks if the given actor exists in the VersionVector.
+   */
+  has(actorID) {
+    return this.vector.has(actorID);
+  }
   /**
    * `maxLamport` returns max lamport value from vector
    */
@@ -14570,7 +14576,6 @@ class ChangeID {
    */
   setClocks(otherLamport, vector) {
     const lamport = otherLamport > this.lamport ? otherLamport + 1n : this.lamport + 1n;
-    vector.unset(InitialActorID);
     const maxVersionVector = this.versionVector.max(vector);
     maxVersionVector.set(this.actor, lamport);
     return ChangeID.of(this.clientSeq, lamport, this.actor, maxVersionVector);
@@ -15286,11 +15291,12 @@ class RGATreeSplitNode extends SplayNode {
   /**
    * `canDelete` checks if node is able to delete.
    */
-  canDelete(editedAt, clientLamportAtChange) {
-    const justRemoved = !this.removedAt;
-    const nodeExisted = this.getCreatedAt().getLamport() <= clientLamportAtChange;
-    if (nodeExisted && (!this.removedAt || editedAt.after(this.removedAt))) {
-      return justRemoved;
+  canRemove(creationKnown) {
+    if (!creationKnown) {
+      return false;
+    }
+    if (!this.removedAt) {
+      return true;
     }
     return false;
   }
@@ -15302,10 +15308,22 @@ class RGATreeSplitNode extends SplayNode {
     return nodeExisted && (!this.removedAt || editedAt.after(this.removedAt));
   }
   /**
-   * `remove` removes node of given edited time.
+   * `setRemovedAt` sets the remove time of this node.
    */
-  remove(editedAt) {
-    this.removedAt = editedAt;
+  setRemovedAt(removedAt) {
+    this.removedAt = removedAt;
+  }
+  /**
+   * `remove` removes the node of the given edited time.
+   */
+  remove(removedAt, tombstoneKnown) {
+    if (!this.removedAt) {
+      this.removedAt = removedAt;
+      return;
+    }
+    if (!tombstoneKnown && removedAt.after(this.removedAt)) {
+      this.removedAt = removedAt;
+    }
   }
   /**
    * `createRange` creates ranges of RGATreeSplitPos.
@@ -15636,43 +15654,34 @@ class RGATreeSplit {
     subDataSize(diff, prvSize);
     return [splitNode, diff];
   }
-  deleteNodes(candidates, editedAt, versionVector) {
+  deleteNodes(candidates, editedAt, vector) {
     if (!candidates.length) {
       return [[], /* @__PURE__ */ new Map()];
     }
-    const [nodesToDelete, nodesToKeep] = this.filterNodes(
-      candidates,
-      editedAt,
-      versionVector
-    );
-    const removedNodes = /* @__PURE__ */ new Map();
-    const changes = this.makeChanges(nodesToKeep, editedAt);
-    for (const node of nodesToDelete) {
-      removedNodes.set(node.getID().toIDString(), node);
-      node.remove(editedAt);
-    }
-    this.deleteIndexNodes(nodesToKeep);
-    return [changes, removedNodes];
-  }
-  filterNodes(candidates, editedAt, versionVector) {
-    const nodesToDelete = [];
+    const isLocal = vector === void 0;
+    const nodesToRemove = [];
     const nodesToKeep = [];
     const [leftEdge, rightEdge] = this.findEdgesOfCandidates(candidates);
     nodesToKeep.push(leftEdge);
     for (const node of candidates) {
-      const actorID = node.getCreatedAt().getActorID();
-      let clientLamportAtChange = MaxLamport;
-      if (versionVector != void 0) {
-        clientLamportAtChange = versionVector.get(actorID) ? versionVector.get(actorID) : 0n;
-      }
-      if (node.canDelete(editedAt, clientLamportAtChange)) {
-        nodesToDelete.push(node);
+      if (node.canRemove(isLocal || vector.afterOrEqual(node.getCreatedAt()))) {
+        nodesToRemove.push(node);
       } else {
         nodesToKeep.push(node);
       }
     }
     nodesToKeep.push(rightEdge);
-    return [nodesToDelete, nodesToKeep];
+    const changes = this.makeChanges(nodesToKeep, editedAt);
+    const removedNodes = /* @__PURE__ */ new Map();
+    for (const node of nodesToRemove) {
+      removedNodes.set(node.getID().toIDString(), node);
+      node.remove(
+        editedAt,
+        node.isRemoved() && (isLocal || vector.afterOrEqual(node.getRemovedAt()))
+      );
+    }
+    this.deleteIndexNodes(nodesToKeep);
+    return [changes, removedNodes];
   }
   /**
    * `findEdgesOfCandidates` finds the edges outside `candidates`,
@@ -16970,7 +16979,7 @@ function fromTextNode(pbTextNode) {
     fromTextNodeID(pbTextNode.id),
     textValue
   );
-  textNode.remove(fromTimeTicket(pbTextNode.removedAt));
+  textNode.setRemovedAt(fromTimeTicket(pbTextNode.removedAt));
   return textNode;
 }
 function fromTreePos(pbTreePos) {
@@ -17508,6 +17517,7 @@ class Attachment {
     __publicField(this, "docID");
     __publicField(this, "syncMode");
     __publicField(this, "remoteChangeEventReceived");
+    __publicField(this, "cancelled");
     __publicField(this, "watchStream");
     __publicField(this, "watchLoopTimerID");
     __publicField(this, "watchAbortController");
@@ -17517,6 +17527,7 @@ class Attachment {
     this.docID = docID;
     this.syncMode = syncMode;
     this.remoteChangeEventReceived = false;
+    this.cancelled = false;
     this.unsubscribeBroadcastEvent = unsubscribeBroacastEvent;
   }
   /**
@@ -17553,10 +17564,12 @@ class Attachment {
         [this.watchStream, this.watchAbortController] = await watchStreamCreator(() => {
           this.watchStream = void 0;
           this.watchAbortController = void 0;
-          this.watchLoopTimerID = setTimeout(
-            doLoop,
-            this.reconnectStreamDelay
-          );
+          if (!this.cancelled) {
+            this.watchLoopTimerID = setTimeout(
+              doLoop,
+              this.reconnectStreamDelay
+            );
+          }
         });
       } catch {
       }
@@ -17567,6 +17580,7 @@ class Attachment {
    * `cancelWatchStream` cancels the watch stream.
    */
   cancelWatchStream() {
+    this.cancelled = true;
     if (this.watchStream && this.watchAbortController) {
       this.watchAbortController.abort();
       this.watchStream = void 0;
@@ -17625,7 +17639,7 @@ function validateValue(value, rule) {
           errors: [
             {
               path: rule.path,
-              message: `Expected object at path ${rule.path}`
+              message: `expected object at path ${rule.path}`
             }
           ]
         };
@@ -17638,7 +17652,7 @@ function validateValue(value, rule) {
           errors: [
             {
               path: rule.path,
-              message: `Expected array at path ${rule.path}`
+              message: `expected array at path ${rule.path}`
             }
           ]
         };
@@ -17651,7 +17665,7 @@ function validateValue(value, rule) {
           errors: [
             {
               path: rule.path,
-              message: `Expected yorkie.Text at path ${rule.path}`
+              message: `expected yorkie.Text at path ${rule.path}`
             }
           ]
         };
@@ -17664,7 +17678,7 @@ function validateValue(value, rule) {
           errors: [
             {
               path: rule.path,
-              message: `Expected yorkie.Tree at path ${rule.path}`
+              message: `expected yorkie.Tree at path ${rule.path}`
             }
           ]
         };
@@ -17677,7 +17691,7 @@ function validateValue(value, rule) {
           errors: [
             {
               path: rule.path,
-              message: `Expected yorkie.Counter at path ${rule.path}`
+              message: `expected yorkie.Counter at path ${rule.path}`
             }
           ]
         };
@@ -17721,7 +17735,7 @@ function validatePrimitiveValue(value, rule) {
     errors: [
       {
         path: rule.path,
-        message: `Expected ${rule.type} at path ${rule.path}`
+        message: `expected ${rule.type} at path ${rule.path}`
       }
     ]
   };
@@ -21572,7 +21586,7 @@ function createAuthInterceptor(apiKey, token) {
   };
 }
 const name$1 = "@yorkie-js/sdk";
-const version$1 = "0.6.24";
+const version$1 = "0.6.26";
 const pkg$1 = {
   name: name$1,
   version: version$1
@@ -22335,6 +22349,7 @@ class Client {
       return;
     }
     attachment.cancelWatchStream();
+    attachment.doc.resetOnlineClients();
     attachment.unsubscribeBroadcastEvent();
     this.attachmentMap.delete(docKey);
   }
@@ -22462,7 +22477,7 @@ if (typeof globalThis !== "undefined") {
   };
 }
 const name = "@yorkie-js/react";
-const version = "0.6.24";
+const version = "0.6.26";
 const pkg = {
   name,
   version