@liveblocks/core 2.0.0-alpha1 → 2.0.0-alpha2

package/dist/index.js

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.0.0-alpha1";
+var PKG_VERSION = "2.0.0-alpha2";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -3954,18 +3954,6 @@ var LiveMap = class _LiveMap extends AbstractCrdt {
 
 // src/crdts/LiveObject.ts
 var LiveObject = class _LiveObject extends AbstractCrdt {
-  constructor(obj = {}) {
-    super();
-    this._propToLastUpdate = /* @__PURE__ */ new Map();
-    const o = compactObject(obj);
-    for (const key of Object.keys(o)) {
-      const value = o[key];
-      if (isLiveNode(value)) {
-        value._setParentLink(this, key);
-      }
-    }
-    this._map = new Map(Object.entries(o));
-  }
   /** @internal */
   static _buildRootAndParentToChildren(items) {
     const parentToChildren = /* @__PURE__ */ new Map();
@@ -3997,6 +3985,18 @@ var LiveObject = class _LiveObject extends AbstractCrdt {
       pool
     );
   }
+  constructor(obj = {}) {
+    super();
+    this._propToLastUpdate = /* @__PURE__ */ new Map();
+    const o = compactObject(obj);
+    for (const key of Object.keys(o)) {
+      const value = o[key];
+      if (isLiveNode(value)) {
+        value._setParentLink(this, key);
+      }
+    }
+    this._map = new Map(Object.entries(o));
+  }
   /** @internal */
   _toOps(parentId, parentKey, pool) {
     if (this._id === void 0) {
@@ -5610,6 +5610,52 @@ function createRoom(options, config) {
       body: JSON.stringify(body)
     });
   }
+  async function createTextMention(userId, mentionId) {
+    if (!managedSocket.authValue) {
+      throw new Error("Not authorized");
+    }
+    return fetchClientApi(
+      config.roomId,
+      "/text-mentions",
+      managedSocket.authValue,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          userId,
+          mentionId
+        })
+      }
+    );
+  }
+  async function deleteTextMention(mentionId) {
+    if (!managedSocket.authValue) {
+      throw new Error("Not authorized");
+    }
+    return fetchClientApi(
+      config.roomId,
+      `/text-mentions/${mentionId}`,
+      managedSocket.authValue,
+      {
+        method: "DELETE"
+      }
+    );
+  }
+  async function reportTextEditor(type, rootKey) {
+    const authValue = await delegates.authenticate();
+    return fetchClientApi(config.roomId, "/text-metadata", authValue, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        type,
+        rootKey
+      })
+    });
+  }
   function sendMessages(messages) {
     const serializedPayload = JSON.stringify(messages);
     const nonce = _optionalChain([context, 'access', _135 => _135.dynamicSessionInfo, 'access', _136 => _136.current, 'optionalAccess', _137 => _137.nonce]);
@@ -6498,6 +6544,12 @@ ${Array.from(traces).join("\n\n")}`
           return context.nodes.size;
         },
         // prettier-ignore
+        // send metadata when using a text editor
+        reportTextEditor,
+        // create a text mention when using a text editor
+        createTextMention,
+        // delete a text mention when using a text editor
+        deleteTextMention,
         // Support for the Liveblocks browser extension
         getSelf_forDevTools: () => selfAsTreeNode.current,
         getOthers_forDevTools: () => others_forDevTools.current,
@@ -6684,6 +6736,7 @@ function createClientStore() {
     inboxNotifications: {},
     notificationSettings: {}
   });
+  const optimisticUpdatesEventSource = makeEventSource();
   return {
     ...store,
     deleteThread(threadId) {
@@ -6750,6 +6803,7 @@ function createClientStore() {
       }));
     },
     pushOptimisticUpdate(optimisticUpdate) {
+      optimisticUpdatesEventSource.notify(optimisticUpdate);
       store.set((state) => ({
         ...state,
         optimisticUpdates: [...state.optimisticUpdates, optimisticUpdate]
@@ -6763,7 +6817,8 @@ function createClientStore() {
           [queryKey]: queryState
         }
       }));
-    }
+    },
+    optimisticUpdatesEventSource
   };
 }
 function deleteKeyImmutable(record, key) {
@@ -6928,15 +6983,13 @@ function applyThreadUpdates(existingThreads, updates) {
     const existingThread = updatedThreads[thread.id];
     if (existingThread) {
       const result = compareThreads(existingThread, thread);
-      if (result === 1)
-        return;
+      if (result === 1) return;
     }
     updatedThreads[thread.id] = thread;
   });
   updates.deletedThreads.forEach(({ id, deletedAt }) => {
     const existingThread = updatedThreads[id];
-    if (existingThread === void 0)
-      return;
+    if (existingThread === void 0) return;
     existingThread.deletedAt = deletedAt;
     existingThread.updatedAt = deletedAt;
     existingThread.comments = [];
@@ -6952,8 +7005,7 @@ function applyNotificationsUpdates(existingInboxNotifications, updates) {
         existingNotification,
         notification
       );
-      if (result === 1)
-        return;
+      if (result === 1) return;
     }
     updatedInboxNotifications[notification.id] = notification;
   });
@@ -7181,22 +7233,22 @@ function createClient(options) {
     roomsById.delete(room.id);
     room.destroy();
   }
-  function leaseRoom(info) {
+  function leaseRoom(details) {
     const leave = () => {
       const self = leave;
-      if (!info.unsubs.delete(self)) {
+      if (!details.unsubs.delete(self)) {
         warn(
           "This leave function was already called. Calling it more than once has no effect."
         );
       } else {
-        if (info.unsubs.size === 0) {
-          teardownRoom(info.room);
+        if (details.unsubs.size === 0) {
+          teardownRoom(details.room);
         }
       }
     };
-    info.unsubs.add(leave);
+    details.unsubs.add(leave);
     return {
-      room: info.room,
+      room: details.room,
       leave
     };
   }
@@ -7235,11 +7287,11 @@ function createClient(options) {
         unstable_streamData: !!clientOptions.unstable_streamData
       }
     );
-    const newRoomInfo = {
+    const newRoomDetails = {
       room: newRoom,
       unsubs: /* @__PURE__ */ new Set()
     };
-    roomsById.set(roomId, newRoomInfo);
+    roomsById.set(roomId, newRoomDetails);
     setupDevTools(() => Array.from(roomsById.keys()));
     linkDevTools(roomId, newRoom);
     const shouldConnect = _nullishCoalesce(options2.autoConnect, () => ( true));
@@ -7254,22 +7306,12 @@ function createClient(options) {
       }
       newRoom.connect();
     }
-    return leaseRoom(newRoomInfo);
-  }
-  function enter(roomId, options2) {
-    const { room, leave: _ } = enterRoom(roomId, options2);
-    return room;
+    return leaseRoom(newRoomDetails);
   }
   function getRoom(roomId) {
     const room = _optionalChain([roomsById, 'access', _168 => _168.get, 'call', _169 => _169(roomId), 'optionalAccess', _170 => _170.room]);
     return room ? room : null;
   }
-  function forceLeave(roomId) {
-    const unsubs = _nullishCoalesce(_optionalChain([roomsById, 'access', _171 => _171.get, 'call', _172 => _172(roomId), 'optionalAccess', _173 => _173.unsubs]), () => ( /* @__PURE__ */ new Set()));
-    for (const unsub of unsubs) {
-      unsub();
-    }
-  }
   function logout() {
     authManager.reset();
     for (const { room } of roomsById.values()) {
@@ -7286,7 +7328,7 @@ function createClient(options) {
     markInboxNotificationAsRead
   } = createNotificationsApi({
     baseUrl,
-    fetcher: _optionalChain([clientOptions, 'access', _174 => _174.polyfills, 'optionalAccess', _175 => _175.fetch]) || /* istanbul ignore next */
+    fetcher: _optionalChain([clientOptions, 'access', _171 => _171.polyfills, 'optionalAccess', _172 => _172.fetch]) || /* istanbul ignore next */
     fetch,
     authManager,
     currentUserIdStore
@@ -7300,7 +7342,7 @@ function createClient(options) {
   const usersStore = createBatchStore(
     async (batchedUserIds) => {
       const userIds = batchedUserIds.flat();
-      const users = await _optionalChain([resolveUsers, 'optionalCall', _176 => _176({ userIds })]);
+      const users = await _optionalChain([resolveUsers, 'optionalCall', _173 => _173({ userIds })]);
       warnIfNoResolveUsers();
       return _nullishCoalesce(users, () => ( userIds.map(() => void 0)));
     },
@@ -7314,7 +7356,7 @@ function createClient(options) {
   const roomsInfoStore = createBatchStore(
     async (batchedRoomIds) => {
       const roomIds = batchedRoomIds.flat();
-      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _177 => _177({ roomIds })]);
+      const roomsInfo = await _optionalChain([resolveRoomsInfo, 'optionalCall', _174 => _174({ roomIds })]);
       warnIfNoResolveRoomsInfo();
       return _nullishCoalesce(roomsInfo, () => ( roomIds.map(() => void 0)));
     },
@@ -7322,13 +7364,9 @@ function createClient(options) {
   );
   return Object.defineProperty(
     {
-      logout,
-      // Old, deprecated APIs
-      enter,
-      getRoom,
-      leave: forceLeave,
-      // New, preferred API
       enterRoom,
+      getRoom,
+      logout,
       // Internal
       [kInternal]: {
         notifications: {
@@ -7370,8 +7408,7 @@ function checkBounds(option, value, min, max, recommendedMin) {
   return value;
 }
 function getBackgroundKeepAliveTimeout(value) {
-  if (value === void 0)
-    return void 0;
+  if (value === void 0) return void 0;
   return checkBounds(
     "backgroundKeepAliveTimeout",
     value,
@@ -7431,7 +7468,7 @@ var commentBodyElementsTypes = {
   mention: "inline"
 };
 function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
-  if (!body || !_optionalChain([body, 'optionalAccess', _178 => _178.content])) {
+  if (!body || !_optionalChain([body, 'optionalAccess', _175 => _175.content])) {
     return;
   }
   const element = typeof elementOrVisitor === "string" ? elementOrVisitor : void 0;
@@ -7441,13 +7478,13 @@ function traverseCommentBody(body, elementOrVisitor, possiblyVisitor) {
   for (const block of body.content) {
     if (type === "all" || type === "block") {
       if (guard(block)) {
-        _optionalChain([visitor, 'optionalCall', _179 => _179(block)]);
+        _optionalChain([visitor, 'optionalCall', _176 => _176(block)]);
       }
     }
     if (type === "all" || type === "inline") {
       for (const inline of block.children) {
         if (guard(inline)) {
-          _optionalChain([visitor, 'optionalCall', _180 => _180(inline)]);
+          _optionalChain([visitor, 'optionalCall', _177 => _177(inline)]);
         }
       }
     }
@@ -7472,7 +7509,7 @@ async function resolveUsersInCommentBody(body, resolveUsers) {
     userIds
   });
   for (const [index, userId] of userIds.entries()) {
-    const user = _optionalChain([users, 'optionalAccess', _181 => _181[index]]);
+    const user = _optionalChain([users, 'optionalAccess', _178 => _178[index]]);
     if (user) {
       resolvedUsers.set(userId, user);
     }
@@ -7595,7 +7632,7 @@ var stringifyCommentBodyPlainElements = {
   text: ({ element }) => element.text,
   link: ({ element }) => element.url,
   mention: ({ element, user }) => {
-    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _182 => _182.name]), () => ( element.id))}`;
+    return `@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _179 => _179.name]), () => ( element.id))}`;
   }
 };
 var stringifyCommentBodyHtmlElements = {
@@ -7625,7 +7662,7 @@ var stringifyCommentBodyHtmlElements = {
     return html`<a href="${href}" target="_blank" rel="noopener noreferrer">${element.url}</a>`;
   },
   mention: ({ element, user }) => {
-    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _183 => _183.name]), () => ( element.id))}</span>`;
+    return html`<span data-mention>@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _180 => _180.name]), () => ( element.id))}</span>`;
   }
 };
 var stringifyCommentBodyMarkdownElements = {
@@ -7655,19 +7692,19 @@ var stringifyCommentBodyMarkdownElements = {
     return markdown`[${element.url}](${href})`;
   },
   mention: ({ element, user }) => {
-    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _184 => _184.name]), () => ( element.id))}`;
+    return markdown`@${_nullishCoalesce(_optionalChain([user, 'optionalAccess', _181 => _181.name]), () => ( element.id))}`;
   }
 };
 async function stringifyCommentBody(body, options) {
-  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _185 => _185.format]), () => ( "plain"));
-  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _186 => _186.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
+  const format = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _182 => _182.format]), () => ( "plain"));
+  const separator = _nullishCoalesce(_optionalChain([options, 'optionalAccess', _183 => _183.separator]), () => ( (format === "markdown" ? "\n\n" : "\n")));
   const elements = {
     ...format === "html" ? stringifyCommentBodyHtmlElements : format === "markdown" ? stringifyCommentBodyMarkdownElements : stringifyCommentBodyPlainElements,
-    ..._optionalChain([options, 'optionalAccess', _187 => _187.elements])
+    ..._optionalChain([options, 'optionalAccess', _184 => _184.elements])
   };
   const resolvedUsers = await resolveUsersInCommentBody(
     body,
-    _optionalChain([options, 'optionalAccess', _188 => _188.resolveUsers])
+    _optionalChain([options, 'optionalAccess', _185 => _185.resolveUsers])
   );
   const blocks = body.content.flatMap((block, blockIndex) => {
     switch (block.type) {
@@ -7942,12 +7979,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _189 => _189.updates, 'access', _190 => _190[key], 'optionalAccess', _191 => _191.type]) === "update") {
+          if (_optionalChain([update, 'access', _186 => _186.updates, 'access', _187 => _187[key], 'optionalAccess', _188 => _188.type]) === "update") {
             const val = update.node.get(key);
             if (val !== void 0) {
               newState[key] = lsonToJson(val);
             }
-          } else if (_optionalChain([update, 'access', _192 => _192.updates, 'access', _193 => _193[key], 'optionalAccess', _194 => _194.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _189 => _189.updates, 'access', _190 => _190[key], 'optionalAccess', _191 => _191.type]) === "delete") {
             delete newState[key];
           }
         }
@@ -8008,12 +8045,12 @@ function legacy_patchImmutableNode(state, path, update) {
         }
         const newState = Object.assign({}, state);
         for (const key in update.updates) {
-          if (_optionalChain([update, 'access', _195 => _195.updates, 'access', _196 => _196[key], 'optionalAccess', _197 => _197.type]) === "update") {
+          if (_optionalChain([update, 'access', _192 => _192.updates, 'access', _193 => _193[key], 'optionalAccess', _194 => _194.type]) === "update") {
             const value = update.node.get(key);
             if (value !== void 0) {
               newState[key] = lsonToJson(value);
             }
-          } else if (_optionalChain([update, 'access', _198 => _198.updates, 'access', _199 => _199[key], 'optionalAccess', _200 => _200.type]) === "delete") {
+          } else if (_optionalChain([update, 'access', _195 => _195.updates, 'access', _196 => _196[key], 'optionalAccess', _197 => _197.type]) === "delete") {
             delete newState[key];
           }
         }