@liveblocks/core 2.8.0-beta3 → 2.8.0

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "2.8.0-beta3";
+var PKG_VERSION = "2.8.0";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -2055,11 +2055,16 @@ function toURLSearchParams(params) {
   return result;
 }
 function urljoin(baseUrl, path, params) {
-  const url = new URL(path, baseUrl);
+  const url2 = new URL(path, baseUrl);
   if (params !== void 0) {
-    url.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
+    url2.search = (params instanceof URLSearchParams ? params : toURLSearchParams(params)).toString();
   }
-  return url.toString();
+  return url2.toString();
+}
+function url(strings, ...values) {
+  return strings.reduce(
+    (result, str, i) => result + encodeURIComponent(values[i - 1] ?? "") + str
+  );
 }
 
 // src/notifications.ts
@@ -2071,6 +2076,9 @@ function createNotificationsApi({
   fetcher
 }) {
   async function fetchJson(endpoint, options, params) {
+    if (!endpoint.startsWith("/v2/c/")) {
+      raise("Expected a /v2/c/* endpoint");
+    }
     const authValue = await authManager.getAuthValue({
       requestedScope: "comments:read"
     });
@@ -2078,8 +2086,8 @@ function createNotificationsApi({
       const userId = authValue.token.parsed.uid;
       currentUserIdStore.set(() => userId);
     }
-    const url = urljoin(baseUrl, `/v2/c${endpoint}`, params);
-    const response = await fetcher(url.toString(), {
+    const url2 = urljoin(baseUrl, endpoint, params);
+    const response = await fetcher(url2.toString(), {
       ...options,
       headers: {
         ...options?.headers,
@@ -2114,7 +2122,7 @@ function createNotificationsApi({
     return body;
   }
   async function getInboxNotifications() {
-    const json = await fetchJson("/inbox-notifications", void 0, {});
+    const json = await fetchJson(url`/v2/c/inbox-notifications`, void 0, {});
     return {
       threads: json.threads.map(convertToThreadData),
       inboxNotifications: json.inboxNotifications.map(
@@ -2124,7 +2132,7 @@ function createNotificationsApi({
     };
   }
   async function getInboxNotificationsSince(options) {
-    const json = await fetchJson("/inbox-notifications", void 0, {
+    const json = await fetchJson(url`/v2/c/inbox-notifications`, void 0, {
       since: options.since.toISOString()
     });
     return {
@@ -2142,11 +2150,11 @@ function createNotificationsApi({
     };
   }
   async function getUnreadInboxNotificationsCount() {
-    const { count } = await fetchJson("/inbox-notifications/count");
+    const { count } = await fetchJson(url`/v2/c/inbox-notifications/count`);
     return count;
   }
   async function markAllInboxNotificationsAsRead() {
-    await fetchJson("/inbox-notifications/read", {
+    await fetchJson(url`/v2/c/inbox-notifications/read`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -2155,7 +2163,7 @@ function createNotificationsApi({
     });
   }
   async function markInboxNotificationsAsRead(inboxNotificationIds) {
-    await fetchJson("/inbox-notifications/read", {
+    await fetchJson(url`/v2/c/inbox-notifications/read`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -2175,24 +2183,21 @@ function createNotificationsApi({
     await batchedMarkInboxNotificationsAsRead.get(inboxNotificationId);
   }
   async function deleteAllInboxNotifications() {
-    await fetchJson("/inbox-notifications", {
+    await fetchJson(url`/v2/c/inbox-notifications`, {
       method: "DELETE"
     });
   }
   async function deleteInboxNotification(inboxNotificationId) {
-    await fetchJson(
-      `/inbox-notifications/${encodeURIComponent(inboxNotificationId)}`,
-      {
-        method: "DELETE"
-      }
-    );
+    await fetchJson(url`/v2/c/inbox-notifications/${inboxNotificationId}`, {
+      method: "DELETE"
+    });
   }
   async function getThreads(options) {
     let query;
     if (options?.query) {
       query = objectToQuery(options.query);
     }
-    const json = await fetchJson("/threads", void 0, {
+    const json = await fetchJson(url`/v2/c/threads`, void 0, {
       query
     });
     return {
@@ -2208,7 +2213,7 @@ function createNotificationsApi({
     if (options?.query) {
       query = objectToQuery(options.query);
     }
-    const json = await fetchJson("/threads", void 0, {
+    const json = await fetchJson(url`/v2/c/threads`, void 0, {
       since: options.since.toISOString(),
       query
     });
@@ -4796,7 +4801,7 @@ function findNonSerializableValue(value, path = "") {
 }
 
 // src/lib/autoRetry.ts
-async function autoRetry(promiseFn, maxTries, backoff, exitCondition) {
+async function autoRetry(promiseFn, maxTries, backoff, throwError) {
   const fallbackBackoff = backoff.length > 0 ? backoff[backoff.length - 1] : 0;
   let attempt = 0;
   while (true) {
@@ -4805,7 +4810,7 @@ async function autoRetry(promiseFn, maxTries, backoff, exitCondition) {
     try {
       return await promise;
     } catch (err) {
-      if (exitCondition && exitCondition(err)) {
+      if (throwError?.(err)) {
         throw err;
       }
       if (attempt >= maxTries) {
@@ -5501,15 +5506,14 @@ function createRoom(options, config) {
     ydoc: makeEventSource(),
     comments: makeEventSource()
   };
-  async function fetchClientApi(roomId, endpoint, authValue, options2, params) {
-    const url = urljoin(
-      config.baseUrl,
-      `/v2/c/rooms/${encodeURIComponent(roomId)}${endpoint}`,
-      params
-    );
+  async function fetchClientApi(endpoint, authValue, options2, params) {
+    if (!endpoint.startsWith("/v2/c/rooms/")) {
+      raise("Expected a /v2/c/rooms/* endpoint");
+    }
+    const url2 = urljoin(config.baseUrl, endpoint, params);
     const fetcher = config.polyfills?.fetch || /* istanbul ignore next */
     fetch;
-    return await fetcher(url, {
+    return await fetcher(url2, {
       ...options2,
       headers: {
         ...options2?.headers,
@@ -5518,7 +5522,7 @@ function createRoom(options, config) {
     });
   }
   async function streamFetch(authValue, roomId) {
-    return fetchClientApi(roomId, "/storage", authValue, {
+    return fetchClientApi(url`/v2/c/rooms/${roomId}/storage`, authValue, {
       method: "GET",
       headers: {
         "Content-Type": "application/json"
@@ -5529,21 +5533,24 @@ function createRoom(options, config) {
     if (!managedSocket.authValue) {
       throw new Error("Not authorized");
     }
-    return fetchClientApi(config.roomId, endpoint, managedSocket.authValue, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body)
-    });
+    return fetchClientApi(
+      endpoint === "/send-message" ? url`/v2/c/rooms/${config.roomId}/send-message` : url`/v2/c/rooms/${config.roomId}/text-metadata`,
+      managedSocket.authValue,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(body)
+      }
+    );
   }
   async function createTextMention(userId, mentionId) {
     if (!managedSocket.authValue) {
       throw new Error("Not authorized");
     }
     return fetchClientApi(
-      config.roomId,
-      "/text-mentions",
+      url`/v2/c/rooms/${config.roomId}/text-mentions`,
       managedSocket.authValue,
       {
         method: "POST",
@@ -5562,8 +5569,7 @@ function createRoom(options, config) {
       throw new Error("Not authorized");
     }
     return fetchClientApi(
-      config.roomId,
-      `/text-mentions/${mentionId}`,
+      url`/v2/c/rooms/${config.roomId}/text-mentions/${mentionId}`,
       managedSocket.authValue,
       {
         method: "DELETE"
@@ -5572,39 +5578,41 @@ function createRoom(options, config) {
   }
   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
-      })
-    });
+    return fetchClientApi(
+      url`/v2/c/rooms/${config.roomId}/text-metadata`,
+      authValue,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ type, rootKey })
+      }
+    );
   }
   async function listTextVersions() {
-    const authValue = await delegates.authenticate();
-    return fetchClientApi(config.roomId, "/versions/", authValue, {
-      method: "GET"
-    });
-  }
-  async function getTextVersion(versionId) {
     const authValue = await delegates.authenticate();
     return fetchClientApi(
-      config.roomId,
-      `/y-version/${encodeURIComponent(versionId)}`,
+      url`/v2/c/rooms/${config.roomId}/versions`,
       authValue,
       {
         method: "GET"
       }
     );
   }
+  async function getTextVersion(versionId) {
+    const authValue = await delegates.authenticate();
+    return fetchClientApi(
+      url`/v2/c/rooms/${config.roomId}/y-version/${versionId}`,
+      authValue,
+      { method: "GET" }
+    );
+  }
   async function createTextVersion() {
     const authValue = await delegates.authenticate();
-    return fetchClientApi(config.roomId, "/version", authValue, {
-      method: "POST"
-    });
+    return fetchClientApi(
+      url`/v2/c/rooms/${config.roomId}/version`,
+      authValue,
+      { method: "POST" }
+    );
   }
   function sendMessages(messages) {
     const serializedPayload = JSON.stringify(messages);
@@ -6436,7 +6444,7 @@ ${Array.from(traces).join("\n\n")}`
   };
   async function fetchCommentsApi(endpoint, params, options2) {
     const authValue = await delegates.authenticate();
-    return fetchClientApi(config.roomId, endpoint, authValue, options2, params);
+    return fetchClientApi(endpoint, authValue, options2, params);
   }
   async function fetchCommentsJson(endpoint, options2, params) {
     const response = await fetchCommentsApi(endpoint, params, options2);
@@ -6466,7 +6474,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function getThreadsSince(options2) {
     const response = await fetchCommentsApi(
-      "/threads",
+      url`/v2/c/rooms/${config.roomId}/threads`,
       {
         since: options2?.since?.toISOString()
       },
@@ -6513,15 +6521,9 @@ ${Array.from(traces).join("\n\n")}`
       query = objectToQuery(options2.query);
     }
     const response = await fetchCommentsApi(
-      "/threads",
-      {
-        query
-      },
-      {
-        headers: {
-          "Content-Type": "application/json"
-        }
-      }
+      url`/v2/c/rooms/${config.roomId}/threads`,
+      { query },
+      { headers: { "Content-Type": "application/json" } }
     );
     if (response.ok) {
       const json = await response.json();
@@ -6546,7 +6548,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function getThread(threadId) {
     const response = await fetchCommentsApi(
-      `/thread-with-notification/${threadId}`
+      url`/v2/c/rooms/${config.roomId}/thread-with-notification/${threadId}`
     );
     if (response.ok) {
       const json = await response.json();
@@ -6570,34 +6572,38 @@ ${Array.from(traces).join("\n\n")}`
     threadId = createThreadId(),
     attachmentIds
   }) {
-    const thread = await fetchCommentsJson("/threads", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({
-        id: threadId,
-        comment: {
-          id: commentId,
-          body,
-          attachmentIds
+    const thread = await fetchCommentsJson(
+      url`/v2/c/rooms/${config.roomId}/threads`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
         },
-        metadata
-      })
-    });
+        body: JSON.stringify({
+          id: threadId,
+          comment: {
+            id: commentId,
+            body,
+            attachmentIds
+          },
+          metadata
+        })
+      }
+    );
     return convertToThreadData(thread);
   }
   async function deleteThread(threadId) {
-    await fetchCommentsJson(`/threads/${encodeURIComponent(threadId)}`, {
-      method: "DELETE"
-    });
+    await fetchCommentsJson(
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}`,
+      { method: "DELETE" }
+    );
   }
   async function editThreadMetadata({
     metadata,
     threadId
   }) {
     return await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/metadata`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/metadata`,
       {
         method: "POST",
         headers: {
@@ -6609,18 +6615,14 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function markThreadAsResolved(threadId) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/mark-as-resolved`,
-      {
-        method: "POST"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/mark-as-resolved`,
+      { method: "POST" }
     );
   }
   async function markThreadAsUnresolved(threadId) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/mark-as-unresolved`,
-      {
-        method: "POST"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/mark-as-unresolved`,
+      { method: "POST" }
     );
   }
   async function createComment({
@@ -6630,7 +6632,7 @@ ${Array.from(traces).join("\n\n")}`
     attachmentIds
   }) {
     const comment = await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments`,
       {
         method: "POST",
         headers: {
@@ -6652,9 +6654,7 @@ ${Array.from(traces).join("\n\n")}`
     attachmentIds
   }) {
     const comment = await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}`,
       {
         method: "POST",
         headers: {
@@ -6673,12 +6673,8 @@ ${Array.from(traces).join("\n\n")}`
     commentId
   }) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}`,
-      {
-        method: "DELETE"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}`,
+      { method: "DELETE" }
     );
   }
   async function addReaction({
@@ -6687,9 +6683,7 @@ ${Array.from(traces).join("\n\n")}`
     emoji
   }) {
     const reaction = await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}/reactions`,
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}/reactions`,
       {
         method: "POST",
         headers: {
@@ -6706,12 +6700,8 @@ ${Array.from(traces).join("\n\n")}`
     emoji
   }) {
     await fetchCommentsJson(
-      `/threads/${encodeURIComponent(threadId)}/comments/${encodeURIComponent(
-        commentId
-      )}/reactions/${encodeURIComponent(emoji)}`,
-      {
-        method: "DELETE"
-      }
+      url`/v2/c/rooms/${config.roomId}/threads/${threadId}/comments/${commentId}/reactions/${emoji}`,
+      { method: "DELETE" }
     );
   }
   function prepareAttachment(file) {
@@ -6746,7 +6736,7 @@ ${Array.from(traces).join("\n\n")}`
     if (attachment.size <= ATTACHMENT_PART_SIZE) {
       return autoRetry(
         () => fetchCommentsJson(
-          `/attachments/${encodeURIComponent(attachment.id)}/upload/${encodeURIComponent(attachment.name)}`,
+          url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/upload/${encodeURIComponent(attachment.name)}`,
           {
             method: "PUT",
             body: attachment.file,
@@ -6765,7 +6755,7 @@ ${Array.from(traces).join("\n\n")}`
       const uploadedParts = [];
       const createMultiPartUpload = await autoRetry(
         () => fetchCommentsJson(
-          `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(attachment.name)}`,
+          url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${encodeURIComponent(attachment.name)}`,
           {
             method: "POST",
             signal: abortSignal
@@ -6791,7 +6781,7 @@ ${Array.from(traces).join("\n\n")}`
             uploadedPartsPromises.push(
               autoRetry(
                 () => fetchCommentsJson(
-                  `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(createMultiPartUpload.uploadId)}/${encodeURIComponent(partNumber)}`,
+                  url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${createMultiPartUpload.uploadId}/${String(partNumber)}`,
                   {
                     method: "PUT",
                     body: part,
@@ -6813,7 +6803,7 @@ ${Array.from(traces).join("\n\n")}`
           (a, b) => a.partNumber - b.partNumber
         );
         return fetchCommentsJson(
-          `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(uploadId)}/complete`,
+          url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${uploadId}/complete`,
           {
             method: "POST",
             headers: {
@@ -6827,7 +6817,7 @@ ${Array.from(traces).join("\n\n")}`
         if (uploadId && error3?.name && (error3.name === "AbortError" || error3.name === "TimeoutError")) {
           try {
             await fetchCommentsApi(
-              `/attachments/${encodeURIComponent(attachment.id)}/multipart/${encodeURIComponent(uploadId)}`,
+              url`/v2/c/rooms/${config.roomId}/attachments/${attachment.id}/multipart/${uploadId}`,
               void 0,
               {
                 method: "DELETE"
@@ -6842,7 +6832,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function getAttachmentUrls(attachmentIds) {
     const { urls } = await fetchCommentsJson(
-      "/attachments/presigned-urls",
+      url`/v2/c/rooms/${config.roomId}/attachments/presigned-urls`,
       {
         method: "POST",
         headers: {
@@ -6858,7 +6848,7 @@ ${Array.from(traces).join("\n\n")}`
       const attachmentIds = batchedAttachmentIds.flat();
       const attachmentUrls = await getAttachmentUrls(attachmentIds);
       return attachmentUrls.map(
-        (url) => url ?? new Error("There was an error while getting this attachment's URL")
+        (url2) => url2 ?? new Error("There was an error while getting this attachment's URL")
       );
     },
     { delay: GET_ATTACHMENT_URLS_BATCH_DELAY }
@@ -6869,12 +6859,7 @@ ${Array.from(traces).join("\n\n")}`
   }
   async function fetchNotificationsJson(endpoint, options2) {
     const authValue = await delegates.authenticate();
-    const response = await fetchClientApi(
-      config.roomId,
-      endpoint,
-      authValue,
-      options2
-    );
+    const response = await fetchClientApi(endpoint, authValue, options2);
     if (!response.ok) {
       if (response.status >= 400 && response.status < 600) {
         let error3;
@@ -6904,12 +6889,12 @@ ${Array.from(traces).join("\n\n")}`
   }
   function getNotificationSettings() {
     return fetchNotificationsJson(
-      "/notification-settings"
+      url`/v2/c/rooms/${config.roomId}/notification-settings`
     );
   }
   function updateNotificationSettings(settings) {
     return fetchNotificationsJson(
-      "/notification-settings",
+      url`/v2/c/rooms/${config.roomId}/notification-settings`,
       {
         method: "POST",
         body: JSON.stringify(settings),
@@ -6920,13 +6905,16 @@ ${Array.from(traces).join("\n\n")}`
     );
   }
   async function markInboxNotificationsAsRead(inboxNotificationIds) {
-    await fetchNotificationsJson("/inbox-notifications/read", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ inboxNotificationIds })
-    });
+    await fetchNotificationsJson(
+      url`/v2/c/rooms/${config.roomId}/inbox-notifications/read`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ inboxNotificationIds })
+      }
+    );
   }
   const batchedMarkInboxNotificationsAsRead = new Batch(
     async (batchedInboxNotificationIds) => {
@@ -7157,19 +7145,19 @@ function makeCreateSocketDelegateForRoom(roomId, baseUrl, WebSocketPolyfill) {
         "To use Liveblocks client in a non-DOM environment, you need to provide a WebSocket polyfill."
       );
     }
-    const url = new URL(baseUrl);
-    url.protocol = url.protocol === "http:" ? "ws" : "wss";
-    url.pathname = "/v7";
-    url.searchParams.set("roomId", roomId);
+    const url2 = new URL(baseUrl);
+    url2.protocol = url2.protocol === "http:" ? "ws" : "wss";
+    url2.pathname = "/v7";
+    url2.searchParams.set("roomId", roomId);
     if (authValue.type === "secret") {
-      url.searchParams.set("tok", authValue.token.raw);
+      url2.searchParams.set("tok", authValue.token.raw);
     } else if (authValue.type === "public") {
-      url.searchParams.set("pubkey", authValue.publicApiKey);
+      url2.searchParams.set("pubkey", authValue.publicApiKey);
     } else {
       return assertNever(authValue, "Unhandled case");
     }
-    url.searchParams.set("version", PKG_VERSION || "dev");
-    return new ws(url.toString());
+    url2.searchParams.set("version", PKG_VERSION || "dev");
+    return new ws(url2.toString());
   };
 }
 
@@ -7431,7 +7419,7 @@ function createDevelopmentWarning(condition, ...args) {
 
 // src/comments/comment-body.ts
 function isCommentBodyParagraph(element) {
-  return "type" in element && element.type === "mention";
+  return "type" in element && element.type === "paragraph";
 }
 function isCommentBodyText(element) {
   return !("type" in element) && "text" in element && typeof element.text === "string";
@@ -7606,11 +7594,11 @@ var MarkdownSafeString = class {
 function markdown(strings, ...values) {
   return new MarkdownSafeString(strings, values);
 }
-function toAbsoluteUrl(url) {
-  if (url.startsWith("http://") || url.startsWith("https://")) {
-    return url;
-  } else if (url.startsWith("www.")) {
-    return "https://" + url;
+function toAbsoluteUrl(url2) {
+  if (url2.startsWith("http://") || url2.startsWith("https://")) {
+    return url2;
+  } else if (url2.startsWith("www.")) {
+    return "https://" + url2;
   }
   return;
 }
@@ -8294,6 +8282,8 @@ export {
   throwUsageError,
   toPlainLson,
   tryParseJson,
+  url,
+  urljoin,
   wait,
   withTimeout
 };