@liveblocks/core 3.13.0-metadata1 → 3.13.0-rc1

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-metadata1";
+var PKG_VERSION = "3.13.0-rc1";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -1606,7 +1606,6 @@ function createApiClient({
         comment: {
           id: commentId,
           body: options.body,
-          metadata: options.commentMetadata,
           attachmentIds: options.attachmentIds
         },
         metadata: options.metadata
@@ -1660,16 +1659,6 @@ 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(
@@ -1681,7 +1670,6 @@ function createApiClient({
       {
         id: commentId,
         body: options.body,
-        metadata: options.metadata,
         attachmentIds: options.attachmentIds
       }
     );
@@ -1696,8 +1684,7 @@ function createApiClient({
       }),
       {
         body: options.body,
-        attachmentIds: options.attachmentIds,
-        metadata: options.metadata
+        attachmentIds: options.attachmentIds
       }
     );
     return convertToCommentData(comment);
@@ -2439,7 +2426,6 @@ function createApiClient({
     editThreadMetadata,
     createComment,
     editComment,
-    editCommentMetadata,
     deleteComment,
     addReaction,
     removeReaction,
@@ -3118,7 +3104,6 @@ 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)
@@ -5941,9 +5926,8 @@ var OpCode = Object.freeze({
   ACK: 9
   // Will only appear in v8+
 });
-function isAck(op) {
-  return op.type === OpCode.ACK || // >= v8
-  op.type === OpCode.DELETE_CRDT && op.id === "ACK";
+function isAckOp(op) {
+  return op.type === OpCode.DELETE_CRDT && op.id === "ACK";
 }
 
 // src/crdts/AbstractCrdt.ts
@@ -6629,17 +6613,17 @@ var LiveList = class _LiveList extends AbstractCrdt {
     }
     let result;
     if (op.intent === "set") {
-      if (source === 1 /* REMOTE */) {
+      if (source === 1 /* THEIRS */) {
         result = this.#applySetRemote(op);
-      } else if (source === 2 /* ACK */) {
+      } else if (source === 2 /* OURS */) {
         result = this.#applySetAck(op);
       } else {
         result = this.#applySetUndoRedo(op);
       }
     } else {
-      if (source === 1 /* REMOTE */) {
+      if (source === 1 /* THEIRS */) {
         result = this.#applyRemoteInsert(op);
-      } else if (source === 2 /* ACK */) {
+      } else if (source === 2 /* OURS */) {
         result = this.#applyInsertAck(op);
       } else {
         result = this.#applyInsertUndoRedo(op);
@@ -6802,9 +6786,9 @@ var LiveList = class _LiveList extends AbstractCrdt {
   }
   /** @internal */
   _setChildKey(newKey, child, source) {
-    if (source === 1 /* REMOTE */) {
+    if (source === 1 /* THEIRS */) {
       return this.#applySetChildKeyRemote(newKey, child);
-    } else if (source === 2 /* ACK */) {
+    } else if (source === 2 /* OURS */) {
       return this.#applySetChildKeyAck(newKey, child);
     } else {
       return this.#applySetChildKeyUndoRedo(newKey, child);
@@ -7318,7 +7302,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
     if (this._pool.getNode(id) !== void 0) {
       return { modified: false };
     }
-    if (source === 2 /* ACK */) {
+    if (source === 2 /* OURS */) {
       const lastUpdateOpId = this.#unacknowledgedSet.get(key);
       if (lastUpdateOpId === opId) {
         this.#unacknowledgedSet.delete(key);
@@ -7326,7 +7310,7 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
       } else if (lastUpdateOpId !== void 0) {
         return { modified: false };
       }
-    } else if (source === 1 /* REMOTE */) {
+    } else if (source === 1 /* THEIRS */) {
       this.#unacknowledgedSet.delete(key);
     }
     const previousValue = this.#map.get(key);
@@ -7719,7 +7703,7 @@ var LiveObject = (_class2 = class _LiveObject extends AbstractCrdt {
       }
       return { modified: false };
     }
-    if (source === 0 /* UNDOREDO_RECONNECT */) {
+    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) {
@@ -8678,8 +8662,6 @@ 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":
@@ -9127,7 +9109,11 @@ function createRoom(options, config) {
       currentItems.set(id, node._serialize());
     }
     const ops = getTreesDiffOperations(currentItems, new Map(items));
-    const result = applyOps(ops, false);
+    const result = applyOps(
+      ops,
+      /* isLocal */
+      false
+    );
     notify(result.updates);
   }
   function _addToRealUndoStack(historyOps) {
@@ -9208,11 +9194,11 @@ function createRoom(options, config) {
       } else {
         let source;
         if (isLocal) {
-          source = 0 /* UNDOREDO_RECONNECT */;
+          source = 0 /* LOCAL */;
         } else {
           const opId = nn(op.opId);
           const deleted = context.unacknowledgedOps.delete(opId);
-          source = deleted ? 2 /* ACK */ : 1 /* REMOTE */;
+          source = deleted ? 2 /* OURS */ : 1 /* THEIRS */;
         }
         const applyOpResult = applyOp(op, source);
         if (applyOpResult.modified) {
@@ -9243,7 +9229,7 @@ function createRoom(options, config) {
     };
   }
   function applyOp(op, source) {
-    if (isAck(op)) {
+    if (isAckOp(op)) {
       return { modified: false };
     }
     switch (op.type) {
@@ -9254,7 +9240,7 @@ function createRoom(options, config) {
         if (node === void 0) {
           return { modified: false };
         }
-        return node._apply(op, source === 0 /* UNDOREDO_RECONNECT */);
+        return node._apply(op, source === 0 /* LOCAL */);
       }
       case OpCode.SET_PARENT_KEY: {
         const node = context.pool.nodes.get(op.id);
@@ -9425,7 +9411,11 @@ function createRoom(options, config) {
     }
     const messages = [];
     const inOps = Array.from(offlineOps.values());
-    const result = applyOps(inOps, true);
+    const result = applyOps(
+      inOps,
+      /* isLocal */
+      true
+    );
     messages.push({
       type: ClientMsgCode.UPDATE_STORAGE,
       ops: result.ops
@@ -9489,9 +9479,12 @@ function createRoom(options, config) {
           processInitialStorage(message);
           break;
         }
-        // Write event
         case ServerMsgCode.UPDATE_STORAGE: {
-          const applyResult = applyOps(message.ops, false);
+          const applyResult = applyOps(
+            message.ops,
+            /* isLocal */
+            false
+          );
           for (const [key, value] of applyResult.updates.storageUpdates) {
             updates.storageUpdates.set(
               key,
@@ -9524,8 +9517,7 @@ function createRoom(options, config) {
         case ServerMsgCode.COMMENT_REACTION_REMOVED:
         case ServerMsgCode.COMMENT_CREATED:
         case ServerMsgCode.COMMENT_EDITED:
-        case ServerMsgCode.COMMENT_DELETED:
-        case ServerMsgCode.COMMENT_METADATA_UPDATED: {
+        case ServerMsgCode.COMMENT_DELETED: {
           eventHub.comments.notify(message);
           break;
         }
@@ -9706,7 +9698,11 @@ function createRoom(options, config) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyOps(historyOps, true);
+    const result = applyOps(
+      historyOps,
+      /* isLocal */
+      true
+    );
     notify(result.updates);
     context.redoStack.push(result.reverse);
     onHistoryChange();
@@ -9726,7 +9722,11 @@ function createRoom(options, config) {
       return;
     }
     context.pausedHistory = null;
-    const result = applyOps(historyOps, true);
+    const result = applyOps(
+      historyOps,
+      /* isLocal */
+      true
+    );
     notify(result.updates);
     context.undoStack.push(result.reverse);
     onHistoryChange();
@@ -9869,7 +9869,6 @@ function createRoom(options, config) {
       commentId: options2.commentId,
       metadata: options2.metadata,
       body: options2.body,
-      commentMetadata: options2.commentMetadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9882,18 +9881,6 @@ 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 });
   }
@@ -9915,7 +9902,6 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
-      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -9925,7 +9911,6 @@ function createRoom(options, config) {
       threadId: options2.threadId,
       commentId: options2.commentId,
       body: options2.body,
-      metadata: options2.metadata,
       attachmentIds: options2.attachmentIds
     });
   }
@@ -10113,7 +10098,6 @@ function createRoom(options, config) {
       unsubscribeFromThread,
       createComment,
       editComment,
-      editCommentMetadata,
       deleteComment,
       addReaction,
       removeReaction,
@@ -10236,7 +10220,7 @@ function makeAuthDelegateForRoom(roomId, authManager) {
     return authManager.getAuthValue({ requestedScope: "room:read", roomId });
   };
 }
-function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
+function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill, engine) {
   return (authValue) => {
     const ws = _nullishCoalesce(WebSocketPolyfill, () => ( (typeof WebSocket === "undefined" ? void 0 : WebSocket)));
     if (ws === void 0) {
@@ -10256,6 +10240,9 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
       return assertNever(authValue, "Unhandled case");
     }
     url2.searchParams.set("version", PKG_VERSION || "dev");
+    if (engine !== void 0) {
+      url2.searchParams.set("e", String(engine));
+    }
     return new ws(url2.toString());
   };
 }
@@ -10375,7 +10362,8 @@ function createClient(options) {
           createSocket: makeCreateSocketDelegateForRoom(
             roomId,
             baseUrl,
-            _optionalChain([clientOptions, 'access', _224 => _224.polyfills, 'optionalAccess', _225 => _225.WebSocket])
+            _optionalChain([clientOptions, 'access', _224 => _224.polyfills, 'optionalAccess', _225 => _225.WebSocket]),
+            options2.engine
           ),
           authenticate: makeAuthDelegateForRoom(roomId, authManager)
         })),