@liveblocks/core 1.11.3 → 1.12.0-test2

package/dist/index.mjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "1.11.3";
+var PKG_VERSION = "1.12.0-test2";
 var PKG_FORMAT = "esm";
 
 // src/dupe-detection.ts
@@ -1389,7 +1389,6 @@ function createAuthManager(authOptions) {
         room: options.roomId
       });
       const parsed = parseAuthToken(response.token);
-      verifyTokenPermissions(parsed, options);
       if (seenTokens.has(parsed.raw)) {
         throw new StopRetrying(
           "The same Liveblocks auth token was issued from the backend before. Caching Liveblocks tokens is not supported."
@@ -1402,7 +1401,6 @@ function createAuthManager(authOptions) {
       if (response && typeof response === "object") {
         if (typeof response.token === "string") {
           const parsed = parseAuthToken(response.token);
-          verifyTokenPermissions(parsed, options);
           return parsed;
         } else if (typeof response.error === "string") {
           const reason = `Authentication failed: ${"reason" in response && typeof response.reason === "string" ? response.reason : "Forbidden"}`;
@@ -1421,23 +1419,6 @@ function createAuthManager(authOptions) {
       "Unexpected authentication type. Must be private or custom."
     );
   }
-  function verifyTokenPermissions(parsedToken, options) {
-    if (!options.roomId && parsedToken.parsed.k === "acc" /* ACCESS_TOKEN */) {
-      if (Object.entries(parsedToken.parsed.perms).length === 0) {
-        return;
-      }
-      for (const [resource, scopes] of Object.entries(
-        parsedToken.parsed.perms
-      )) {
-        if (resource.includes("*") && hasCorrespondingScopes(options.requestedScope, scopes)) {
-          return;
-        }
-      }
-      throw new StopRetrying(
-        "The issued access token doesn't grant enough permissions. Please follow the instructions at https://liveblocks.io/docs/errors/liveblocks-client/access-tokens-not-enough-permissions"
-      );
-    }
-  }
   async function getAuthValue(requestOptions) {
     if (authentication.type === "public") {
       return { type: "public", publicApiKey: authentication.publicApiKey };
@@ -2035,6 +2016,18 @@ function convertToCommentUserReaction(data) {
 function convertToInboxNotificationData(data) {
   const notifiedAt = new Date(data.notifiedAt);
   const readAt = data.readAt ? new Date(data.readAt) : null;
+  if ("activities" in data) {
+    const activities = data.activities.map((activity) => ({
+      ...activity,
+      createdAt: new Date(activity.createdAt)
+    }));
+    return {
+      ...data,
+      notifiedAt,
+      readAt,
+      activities
+    };
+  }
   return {
     ...data,
     notifiedAt,
@@ -4768,6 +4761,115 @@ function isJsonObject(data) {
   return !isJsonScalar(data) && !isJsonArray(data);
 }
 
+// src/lib/objectToQuery.ts
+var identifierRegex = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+function objectToQuery(obj) {
+  let filterList = [];
+  const entries2 = Object.entries(obj);
+  const keyValuePairs = [];
+  const keyValuePairsWithOperator = [];
+  const indexedKeys = [];
+  entries2.forEach(([key, value]) => {
+    if (!identifierRegex.test(key)) {
+      throw new Error("Key must only contain letters, numbers, _");
+    }
+    if (isSimpleValue(value)) {
+      keyValuePairs.push([key, value]);
+    } else if (isValueWithOperator(value)) {
+      keyValuePairsWithOperator.push([key, value]);
+    } else if (typeof value === "object" && !("startsWith" in value)) {
+      indexedKeys.push([key, value]);
+    }
+  });
+  filterList = [
+    ...getFiltersFromKeyValuePairs(keyValuePairs),
+    ...getFiltersFromKeyValuePairsWithOperator(keyValuePairsWithOperator)
+  ];
+  indexedKeys.forEach(([key, value]) => {
+    const nestedEntries = Object.entries(value);
+    const nKeyValuePairs = [];
+    const nKeyValuePairsWithOperator = [];
+    nestedEntries.forEach(([nestedKey, nestedValue]) => {
+      if (isStringEmpty(nestedKey)) {
+        throw new Error("Key cannot be empty");
+      }
+      if (isSimpleValue(nestedValue)) {
+        nKeyValuePairs.push([formatFilterKey(key, nestedKey), nestedValue]);
+      } else if (isValueWithOperator(nestedValue)) {
+        nKeyValuePairsWithOperator.push([
+          formatFilterKey(key, nestedKey),
+          nestedValue
+        ]);
+      }
+    });
+    filterList = [
+      ...filterList,
+      ...getFiltersFromKeyValuePairs(nKeyValuePairs),
+      ...getFiltersFromKeyValuePairsWithOperator(nKeyValuePairsWithOperator)
+    ];
+  });
+  return filterList.map(
+    ({ key, operator, value }) => formatFilter(key, operator, formatFilterValue(value))
+  ).join(" AND ");
+}
+var getFiltersFromKeyValuePairs = (keyValuePairs) => {
+  const filters = [];
+  keyValuePairs.forEach(([key, value]) => {
+    filters.push({
+      key,
+      operator: ":",
+      value
+    });
+  });
+  return filters;
+};
+var getFiltersFromKeyValuePairsWithOperator = (keyValuePairsWithOperator) => {
+  const filters = [];
+  keyValuePairsWithOperator.forEach(([key, value]) => {
+    if ("startsWith" in value && typeof value.startsWith === "string") {
+      filters.push({
+        key,
+        operator: "^",
+        value: value.startsWith
+      });
+    }
+  });
+  return filters;
+};
+var isSimpleValue = (value) => {
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return true;
+  }
+  return false;
+};
+var isValueWithOperator = (value) => {
+  if (typeof value === "object" && value !== null && "startsWith" in value) {
+    return true;
+  }
+  return false;
+};
+var formatFilter = (key, operator, value) => {
+  return `${key}${operator}${value}`;
+};
+var formatFilterKey = (key, nestedKey) => {
+  if (nestedKey) {
+    return `${key}[${JSON.stringify(nestedKey)}]`;
+  }
+  return key;
+};
+var formatFilterValue = (value) => {
+  if (typeof value === "string") {
+    if (isStringEmpty(value)) {
+      throw new Error("Value cannot be empty");
+    }
+    return JSON.stringify(value);
+  }
+  return value.toString();
+};
+var isStringEmpty = (value) => {
+  return !value || value.toString().trim() === "";
+};
+
 // src/protocol/ClientMsg.ts
 var ClientMsgCode = /* @__PURE__ */ ((ClientMsgCode2) => {
   ClientMsgCode2[ClientMsgCode2["UPDATE_PRESENCE"] = 100] = "UPDATE_PRESENCE";
@@ -5070,19 +5172,20 @@ function createCommentsApi(roomId, getAuthValue, fetchClientApi) {
     return body;
   }
   async function getThreads(options) {
+    let query;
+    if (options?.query) {
+      query = objectToQuery(options.query);
+    }
     const response = await fetchCommentsApi(
-      "/threads/search",
+      "/threads",
       {
-        since: options?.since?.toISOString()
+        since: options?.since?.toISOString(),
+        query
       },
       {
-        body: JSON.stringify({
-          ...options?.query?.metadata && { metadata: options.query.metadata }
-        }),
         headers: {
           "Content-Type": "application/json"
-        },
-        method: "POST"
+        }
       }
     );
     if (response.ok) {
@@ -6617,7 +6720,7 @@ function createClientStore() {
           threads: deleteKeyImmutable(state.threads, threadId),
           inboxNotifications: Object.fromEntries(
             Object.entries(state.inboxNotifications).filter(
-              ([_id, notification]) => notification.threadId !== threadId
+              ([_id, notification]) => notification.kind === "thread" && notification.threadId !== threadId
             )
           )
         };
@@ -6759,7 +6862,7 @@ function applyOptimisticUpdates(state) {
           optimisticUpdate.comment
         );
         const inboxNotification = Object.values(result.inboxNotifications).find(
-          (notification) => notification.threadId === thread.id
+          (notification) => notification.kind === "thread" && notification.threadId !== thread.id
         );
         if (inboxNotification === void 0) {
           break;
@@ -8121,6 +8224,7 @@ export {
   fancy_console_exports as console,
   convertToCommentData,
   convertToCommentUserReaction,
+  convertToInboxNotificationData,
   convertToThreadData,
   createClient,
   deleteComment,
@@ -8144,6 +8248,7 @@ export {
   makePoller,
   makePosition,
   nn,
+  objectToQuery,
   patchLiveObjectKey,
   raise,
   removeReaction,