@liveblocks/core 3.13.0-rc1 → 3.13.0-rc3

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.13.0-rc1";
+var PKG_VERSION = "3.13.0-rc3";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -1606,6 +1606,7 @@ function createApiClient({
         comment: {
           id: commentId,
           body: options.body,
+          metadata: options.commentMetadata,
           attachmentIds: options.attachmentIds
         },
         metadata: options.metadata
@@ -1659,6 +1660,16 @@ function createApiClient({
       options.metadata
     );
   }
+  async function editCommentMetadata(options) {
+    return await httpClient.post(
+      url`/v2/c/rooms/${options.roomId}/threads/${options.threadId}/comments/${options.commentId}/metadata`,
+      await authManager.getAuthValue({
+        requestedScope: "comments:read",
+        roomId: options.roomId
+      }),
+      options.metadata
+    );
+  }
   async function createComment(options) {
     const commentId = _nullishCoalesce(options.commentId, () => ( createCommentId()));
     const comment = await httpClient.post(
@@ -1670,6 +1681,7 @@ function createApiClient({
       {
         id: commentId,
         body: options.body,
+        metadata: options.metadata,
         attachmentIds: options.attachmentIds
       }
     );
@@ -1684,7 +1696,8 @@ function createApiClient({
       }),
       {
         body: options.body,
-        attachmentIds: options.attachmentIds
+        attachmentIds: options.attachmentIds,
+        metadata: options.metadata
       }
     );
     return convertToCommentData(comment);
@@ -2426,6 +2439,7 @@ function createApiClient({
     editThreadMetadata,
     createComment,
     editComment,
+    editCommentMetadata,
     deleteComment,
     addReaction,
     removeReaction,
@@ -3090,7 +3104,7 @@ var ServerMsgCode = Object.freeze({
   BROADCASTED_EVENT: 103,
   ROOM_STATE: 104,
   // For Storage
-  INITIAL_STORAGE_STATE: 200,
+  STORAGE_STATE: 200,
   UPDATE_STORAGE: 201,
   // For Yjs Docs
   UPDATE_YDOC: 300,
@@ -3104,6 +3118,7 @@ var ServerMsgCode = Object.freeze({
   COMMENT_DELETED: 404,
   COMMENT_REACTION_ADDED: 405,
   COMMENT_REACTION_REMOVED: 406,
+  COMMENT_METADATA_UPDATED: 409,
   // Error codes
   REJECT_STORAGE_OP: 299
   // Sent if a mutation was not allowed on the server (i.e. due to permissions, limit exceeded, etc)
@@ -5922,9 +5937,7 @@ var OpCode = Object.freeze({
   DELETE_CRDT: 5,
   DELETE_OBJECT_KEY: 6,
   CREATE_MAP: 7,
-  CREATE_REGISTER: 8,
-  ACK: 9
-  // Will only appear in v8+
+  CREATE_REGISTER: 8
 });
 function isAckOp(op) {
   return op.type === OpCode.DELETE_CRDT && op.id === "ACK";
@@ -7581,7 +7594,20 @@ function isRootCrdt(id, _) {
 }
 var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   #map;
-  #propToLastUpdate;
+  /**
+   * Tracks unacknowledged local changes per property to preserve optimistic
+   * updates. Maps property keys to their pending operation IDs.
+   *
+   * INVARIANT: Only locally-generated opIds are ever stored here. Remote opIds
+   * are only compared against (to detect ACKs), never stored.
+   *
+   * When a local change is made, the opId is stored here. When a remote op
+   * arrives for the same key:
+   * - If no entry exists → apply remote op
+   * - If opId matches → it's an ACK, clear the entry
+   * - If opId differs → ignore remote op to preserve optimistic update
+   */
+  #unackedOpsByKey;
   /**
    * Enable or disable detection of too large LiveObjects.
    * When enabled, throws an error if LiveObject static data exceeds 128KB, which
@@ -7624,7 +7650,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
   }
   constructor(obj = {}) {
     super();
-    this.#propToLastUpdate = /* @__PURE__ */ new Map();
+    this.#unackedOpsByKey = /* @__PURE__ */ new Map();
     const o = compactObject(obj);
     for (const key of Object.keys(o)) {
       const value = o[key];
@@ -7698,16 +7724,16 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
     const { id, opId, parentKey: key } = op;
     const child = creationOpToLson(op);
     if (this._pool.getNode(id) !== void 0) {
-      if (this.#propToLastUpdate.get(key) === opId) {
-        this.#propToLastUpdate.delete(key);
+      if (this.#unackedOpsByKey.get(key) === opId) {
+        this.#unackedOpsByKey.delete(key);
       }
       return { modified: false };
     }
     if (source === 0 /* LOCAL */) {
-      this.#propToLastUpdate.set(key, nn(opId));
-    } else if (this.#propToLastUpdate.get(key) === void 0) {
-    } else if (this.#propToLastUpdate.get(key) === opId) {
-      this.#propToLastUpdate.delete(key);
+      this.#unackedOpsByKey.set(key, nn(opId));
+    } else if (this.#unackedOpsByKey.get(key) === void 0) {
+    } else if (this.#unackedOpsByKey.get(key) === opId) {
+      this.#unackedOpsByKey.delete(key);
       return { modified: false };
     } else {
       return { modified: false };
@@ -7835,11 +7861,11 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
         continue;
       }
       if (isLocal) {
-        this.#propToLastUpdate.set(key, nn(op.opId));
-      } else if (this.#propToLastUpdate.get(key) === void 0) {
+        this.#unackedOpsByKey.set(key, nn(op.opId));
+      } else if (this.#unackedOpsByKey.get(key) === void 0) {
         isModified = true;
-      } else if (this.#propToLastUpdate.get(key) === op.opId) {
-        this.#propToLastUpdate.delete(key);
+      } else if (this.#unackedOpsByKey.get(key) === op.opId) {
+        this.#unackedOpsByKey.delete(key);
         continue;
       } else {
         continue;
@@ -7871,7 +7897,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
     if (oldValue === void 0) {
       return { modified: false };
     }
-    if (!isLocal && this.#propToLastUpdate.get(key) !== void 0) {
+    if (!isLocal && this.#unackedOpsByKey.get(key) !== void 0) {
       return { modified: false };
     }
     const id = nn(this._id);
@@ -8059,12 +8085,12 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
           (op) => op.parentId === this._id
         );
         if (createCrdtOp) {
-          this.#propToLastUpdate.set(key, nn(createCrdtOp.opId));
+          this.#unackedOpsByKey.set(key, nn(createCrdtOp.opId));
         }
         ops.push(...newAttachChildOps);
       } else {
         updatedProps[key] = newValue;
-        this.#propToLastUpdate.set(key, opId);
+        this.#unackedOpsByKey.set(key, opId);
       }
       this.#map.set(key, newValue);
       this.invalidate();
@@ -8662,6 +8688,8 @@ function defaultMessageFromContext(context) {
       return "Could not delete thread";
     case "EDIT_THREAD_METADATA_ERROR":
       return "Could not edit thread metadata";
+    case "EDIT_COMMENT_METADATA_ERROR":
+      return "Could not edit comment metadata";
     case "MARK_THREAD_AS_RESOLVED_ERROR":
       return "Could not mark thread as resolved";
     case "MARK_THREAD_AS_UNRESOLVED_ERROR":
@@ -9165,13 +9193,13 @@ function createRoom(options, config) {
       presence: false
     };
     const createdNodeIds = /* @__PURE__ */ new Set();
-    const ops = rawOps.map((op) => {
+    const ops = isLocal ? rawOps.map((op) => {
       if (op.type !== "presence" && !op.opId) {
         return { ...op, opId: context.pool.generateOpId() };
       } else {
         return op;
       }
-    });
+    }) : Array.from(rawOps);
     for (const op of ops) {
       if (op.type === "presence") {
         const reverse = {
@@ -9195,10 +9223,11 @@ function createRoom(options, config) {
         let source;
         if (isLocal) {
           source = 0 /* LOCAL */;
+        } else if (op.opId !== void 0) {
+          context.unacknowledgedOps.delete(op.opId);
+          source = 2 /* OURS */;
         } else {
-          const opId = nn(op.opId);
-          const deleted = context.unacknowledgedOps.delete(opId);
-          source = deleted ? 2 /* OURS */ : 1 /* THEIRS */;
+          source = 1 /* THEIRS */;
         }
         const applyOpResult = applyOp(op, source);
         if (applyOpResult.modified) {
@@ -9475,7 +9504,7 @@ function createRoom(options, config) {
           updates.others.push(onRoomStateMessage(message));
           break;
         }
-        case ServerMsgCode.INITIAL_STORAGE_STATE: {
+        case ServerMsgCode.STORAGE_STATE: {
           processInitialStorage(message);
           break;
         }
@@ -9517,7 +9546,8 @@ function createRoom(options, config) {
         case ServerMsgCode.COMMENT_REACTION_REMOVED:
         case ServerMsgCode.COMMENT_CREATED:
         case ServerMsgCode.COMMENT_EDITED:
-        case ServerMsgCode.COMMENT_DELETED: {
+        case ServerMsgCode.COMMENT_DELETED:
+        case ServerMsgCode.COMMENT_METADATA_UPDATED: {
           eventHub.comments.notify(message);
           break;
         }
@@ -9633,7 +9663,7 @@ function createRoom(options, config) {
   async function streamStorage() {
     if (!managedSocket.authValue) return;
     const items = await httpClient.streamStorage({ roomId });
-    processInitialStorage({ type: ServerMsgCode.INITIAL_STORAGE_STATE, items });
+    processInitialStorage({ type: ServerMsgCode.STORAGE_STATE, items });
   }
   function refreshStorage(options2) {
     const messages = context.buffer.messages;
@@ -9869,6 +9899,7 @@ function createRoom(options, config) {
       commentId: options2.commentId,
       metadata: options2.metadata,
       body: options2.body,
+      commentMetadata: options2.commentMetadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9881,6 +9912,18 @@ function createRoom(options, config) {
   }) {
     return httpClient.editThreadMetadata({ roomId, threadId, metadata });
   }
+  async function editCommentMetadata({
+    threadId,
+    commentId,
+    metadata
+  }) {
+    return httpClient.editCommentMetadata({
+      roomId,
+      threadId,
+      commentId,
+      metadata
+    });
+  }
   async function markThreadAsResolved(threadId) {
     return httpClient.markThreadAsResolved({ roomId, threadId });
   }
@@ -9902,6 +9945,7 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
+      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9911,6 +9955,7 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
+      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -10098,6 +10143,7 @@ function createRoom(options, config) {
       unsubscribeFromThread,
       createComment,
       editComment,
+      editCommentMetadata,
       deleteComment,
       addReaction,
       removeReaction,