@liveblocks/core 3.20.0-perm5 → 3.20.0-perm6

package/dist/index.cjs

@@ -6,7 +6,7 @@ var __export = (target, all) => {
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/core";
-var PKG_VERSION = "3.20.0-perm5";
+var PKG_VERSION = "3.20.0-perm6";
 var PKG_FORMAT = "cjs";
 
 // src/dupe-detection.ts
@@ -5167,7 +5167,7 @@ function createReceivingToolInvocation(invocationId, name, partialArgsText = "")
   };
 }
 
-// src/protocol/Permissions.ts
+// src/permissions.ts
 var Permission = {
   /**
    * Default permission for a room.
@@ -5202,24 +5202,13 @@ var Permission = {
    */
   LegacyRoomPresenceWrite: "room:presence:write"
 };
-var ACCESS_LEVELS = [
-  "none",
-  "read",
-  "write"
-];
-var ACCESS_RANKS = {
+var ACCESS_LEVELS = ["none", "read", "write"];
+var ACCESS_LEVEL_RANKS = {
   none: 0,
   read: 1,
   write: 2
 };
-var NO_PERMISSION_MATRIX = {
-  room: "none",
-  storage: "none",
-  comments: "none",
-  feeds: "none",
-  personal: "write"
-};
-var RESOURCE_PERMISSIONS = {
+var PERMISSIONS_BY_RESOURCE = {
   room: {
     read: [Permission.Read, Permission.RoomRead],
     write: [Permission.Write, Permission.RoomWrite]
@@ -5243,14 +5232,22 @@ var RESOURCE_PERMISSIONS = {
     none: [Permission.FeedsNone]
   }
 };
-var DEFAULT_PERMISSION_RESOURCE = "room";
+var NO_PERMISSION_MATRIX = {
+  room: "none",
+  storage: "none",
+  comments: "none",
+  feeds: "none",
+  personal: "none"
+};
+var BASE_PERMISSION_RESOURCE = "room";
 var ROOM_PERMISSION_RESOURCES = [
   "storage",
   "comments",
   "feeds"
 ];
+var VALID_PERMISSIONS = new Set(Object.values(Permission));
 function resolveResourceAccess(scopes, resource) {
-  const permissions = RESOURCE_PERMISSIONS[resource];
+  const permissions = PERMISSIONS_BY_RESOURCE[resource];
   let resourceAccess;
   for (const access of ACCESS_LEVELS) {
     const scopedPermissions = permissions[access];
@@ -5260,13 +5257,14 @@ function resolveResourceAccess(scopes, resource) {
   }
   return resourceAccess;
 }
-function resolveFullPermissionMatrix(resolved) {
+function permissionMatrixFromResolvedScopes(resolved) {
   if (!resolved.hasDefaultPermission) {
-    return NO_PERMISSION_MATRIX;
+    return { ...NO_PERMISSION_MATRIX };
   }
   const matrix = {
     ...NO_PERMISSION_MATRIX,
-    [DEFAULT_PERMISSION_RESOURCE]: resolved.baseAccess
+    [BASE_PERMISSION_RESOURCE]: resolved.baseAccess,
+    personal: "write"
   };
   for (const resource of ROOM_PERMISSION_RESOURCES) {
     matrix[resource] = _nullishCoalesce(resolved.matrix[resource], () => ( resolved.baseAccess));
@@ -5274,9 +5272,9 @@ function resolveFullPermissionMatrix(resolved) {
   return matrix;
 }
 function permissionMatrixFromScopes(scopes) {
-  return resolveFullPermissionMatrix(resolvePermissionMatrix(scopes));
+  return permissionMatrixFromResolvedScopes(resolvePermissionScopes(scopes));
 }
-function resolvePermissionMatrix(scopes) {
+function resolvePermissionScopes(scopes) {
   const hasDefaultPermission = scopes.includes(Permission.Write) || scopes.includes(Permission.Read) || scopes.includes(Permission.RoomWrite) || scopes.includes(Permission.RoomRead);
   const baseAccess = scopes.includes(Permission.Write) || scopes.includes(Permission.RoomWrite) ? "write" : scopes.includes(Permission.Read) || scopes.includes(Permission.RoomRead) ? "read" : "none";
   const matrix = {};
@@ -5288,26 +5286,9 @@ function resolvePermissionMatrix(scopes) {
   }
   return { hasDefaultPermission, baseAccess, matrix };
 }
-function hasPermissionAccess(source, resource, requiredAccess) {
-  const matrix = isPermissionScopes(source) ? permissionMatrixFromScopes(source) : source;
+function hasPermissionAccess(matrix, resource, requiredAccess) {
   const access = _nullishCoalesce(matrix[resource], () => ( "none"));
-  return ACCESS_RANKS[access] >= ACCESS_RANKS[requiredAccess];
-}
-function isPermissionScopes(source) {
-  return Array.isArray(source);
-}
-
-// src/permissions.ts
-var VALID_PERMISSIONS = new Set(Object.values(Permission));
-function permissionForAccessLevel(resource, access, field = resource) {
-  const levels = RESOURCE_PERMISSIONS[resource];
-  const permissions = levels[access];
-  if (permissions === void 0 || permissions.length === 0) {
-    throw new Error(
-      `Invalid permission level for ${field}: ${_nullishCoalesce(JSON.stringify(access), () => ( String(access)))}`
-    );
-  }
-  return permissions[0];
+  return ACCESS_LEVEL_RANKS[access] >= ACCESS_LEVEL_RANKS[requiredAccess];
 }
 function resolveRoomPermissionMatrix(permissions, roomId) {
   const matchedPermissions = permissions.filter(
@@ -5321,7 +5302,7 @@ function resolveRoomPermissionMatrix(permissions, roomId) {
   const explicitMatrix = {};
   const explicitSpecificity = {};
   for (const permission of matchedPermissions) {
-    const resolved = resolvePermissionMatrix(permission.scopes);
+    const resolved = resolvePermissionScopes(permission.scopes);
     const specificity = getResourceSpecificity(permission.resource);
     if (resolved.hasDefaultPermission) {
       hasDefaultPermission = true;
@@ -5343,7 +5324,7 @@ function resolveRoomPermissionMatrix(permissions, roomId) {
       }
     }
   }
-  return resolveFullPermissionMatrix({
+  return permissionMatrixFromResolvedScopes({
     hasDefaultPermission,
     baseAccess,
     matrix: explicitMatrix
@@ -5388,16 +5369,14 @@ function mergePermissionMatrices(sources) {
     storage: strongestMatrixAccess(sources, "storage"),
     comments: strongestMatrixAccess(sources, "comments"),
     feeds: strongestMatrixAccess(sources, "feeds"),
-    personal: "write"
+    personal: strongestMatrixAccess(sources, "personal")
   };
 }
 function permissionMatrixToScopes(matrix) {
   const scopes = [];
   const baseAccess = matrix.room;
   if (baseAccess !== "none") {
-    scopes.push(
-      permissionForAccessLevel(DEFAULT_PERMISSION_RESOURCE, baseAccess)
-    );
+    scopes.push(permissionForAccessLevel(BASE_PERMISSION_RESOURCE, baseAccess));
   }
   for (const resource of ROOM_PERMISSION_RESOURCES) {
     const access = matrix[resource];
@@ -5407,6 +5386,28 @@ function permissionMatrixToScopes(matrix) {
   }
   return scopes;
 }
+function mergeRoomPermissionScopes({
+  defaultAccesses,
+  groupsAccesses,
+  userAccesses
+}) {
+  const sources = [
+    permissionMatrixFromScopes(defaultAccesses),
+    ...groupsAccesses.map((scopes) => permissionMatrixFromScopes(scopes)),
+    ...userAccesses !== void 0 ? [permissionMatrixFromScopes(userAccesses)] : []
+  ];
+  return permissionMatrixToScopes(mergePermissionMatrices(sources));
+}
+function permissionForAccessLevel(resource, access, field = resource) {
+  const levels = PERMISSIONS_BY_RESOURCE[resource];
+  const permissions = levels[access];
+  if (permissions === void 0 || permissions.length === 0) {
+    throw new Error(
+      `Invalid permission level for ${field}: ${_nullishCoalesce(JSON.stringify(access), () => ( String(access)))}`
+    );
+  }
+  return permissions[0];
+}
 function strongestMatrixAccess(sources, resource) {
   return sources.reduce(
     (strongest, source) => strongestAccess(strongest, source[resource]),
@@ -5414,7 +5415,7 @@ function strongestMatrixAccess(sources, resource) {
   );
 }
 function strongestAccess(left, right) {
-  return ACCESS_RANKS[right] > ACCESS_RANKS[left] ? right : left;
+  return ACCESS_LEVEL_RANKS[right] > ACCESS_LEVEL_RANKS[left] ? right : left;
 }
 function resourceMatchesRoomId(resource, roomId) {
   if (resource.includes("*")) {
@@ -9501,14 +9502,22 @@ var ClientMsgCode = Object.freeze({
 // src/refs/ManagedOthers.ts
 function makeUser(conn, presence) {
   const { connectionId, id, info } = conn;
-  const canWrite = hasPermissionAccess(conn.scopes, "storage", "write");
+  const canWrite = hasPermissionAccess(
+    conn.permissionMatrix,
+    "storage",
+    "write"
+  );
   return freeze(
     compactObject({
       connectionId,
       id,
       info,
       canWrite,
-      canComment: hasPermissionAccess(conn.scopes, "comments", "write"),
+      canComment: hasPermissionAccess(
+        conn.permissionMatrix,
+        "comments",
+        "write"
+      ),
       isReadOnly: !canWrite,
       // Deprecated, kept for backward-compatibility
       presence
@@ -9587,7 +9596,7 @@ var ManagedOthers = class {
           connectionId,
           id: metaUserId,
           info: metaUserInfo,
-          scopes
+          permissionMatrix: permissionMatrixFromScopes(scopes)
         })
       );
       if (!state.presences.has(connectionId)) {
@@ -9964,8 +9973,8 @@ function createRoom(options, config) {
     }
   }
   function isStorageWritable() {
-    const scopes = _optionalChain([context, 'access', _224 => _224.dynamicSessionInfoSig, 'access', _225 => _225.get, 'call', _226 => _226(), 'optionalAccess', _227 => _227.scopes]);
-    return scopes !== void 0 ? hasPermissionAccess(scopes, "storage", "write") : true;
+    const permissionMatrix = _optionalChain([context, 'access', _224 => _224.dynamicSessionInfoSig, 'access', _225 => _225.get, 'call', _226 => _226(), 'optionalAccess', _227 => _227.permissionMatrix]);
+    return permissionMatrix !== void 0 ? hasPermissionAccess(permissionMatrix, "storage", "write") : true;
   }
   const eventHub = {
     status: makeEventSource(),
@@ -10027,7 +10036,7 @@ function createRoom(options, config) {
         return null;
       } else {
         const canWrite = hasPermissionAccess(
-          dynamicSession.scopes,
+          dynamicSession.permissionMatrix,
           "storage",
           "write"
         );
@@ -10038,7 +10047,7 @@ function createRoom(options, config) {
           presence: myPresence,
           canWrite,
           canComment: hasPermissionAccess(
-            dynamicSession.scopes,
+            dynamicSession.permissionMatrix,
             "comments",
             "write"
           )
@@ -10330,7 +10339,7 @@ function createRoom(options, config) {
     context.dynamicSessionInfoSig.set({
       actor: message.actor,
       nonce: message.nonce,
-      scopes: message.scopes,
+      permissionMatrix: permissionMatrixFromScopes(message.scopes),
       meta: message.meta
     });
     context.idFactory = makeIdFactory(message.actor);
@@ -12703,5 +12712,6 @@ detectDupes(PKG_NAME, PKG_VERSION, PKG_FORMAT);
 
 
 
-exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.FeedRequestErrorCode = FeedRequestErrorCode; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.deepLiveify = deepLiveify; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.hasPermissionAccess = hasPermissionAccess; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isListStorageNode = isListStorageNode; exports.isLiveNode = isLiveNode; exports.isMapStorageNode = isMapStorageNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isObjectStorageNode = isObjectStorageNode; exports.isPlainObject = isPlainObject; exports.isRegisterStorageNode = isRegisterStorageNode; exports.isRootStorageNode = isRootStorageNode; exports.isStartsWithOperator = isStartsWithOperator; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.keys = keys; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.mergePermissionMatrices = mergePermissionMatrices; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.normalizeRoomAccessesInput = normalizeRoomAccessesInput; exports.normalizeRoomAccessesUpdateInput = normalizeRoomAccessesUpdateInput; exports.normalizeRoomPermissionInput = normalizeRoomPermissionInput; exports.objectToQuery = objectToQuery; exports.patchNotificationSettings = patchNotificationSettings; exports.permissionMatrixFromScopes = permissionMatrixFromScopes; exports.permissionMatrixToScopes = permissionMatrixToScopes; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
+
+exports.ClientMsgCode = ClientMsgCode; exports.CrdtType = CrdtType; exports.DefaultMap = DefaultMap; exports.Deque = Deque; exports.DerivedSignal = DerivedSignal; exports.FeedRequestErrorCode = FeedRequestErrorCode; exports.HttpError = HttpError; exports.LiveList = LiveList; exports.LiveMap = LiveMap; exports.LiveObject = LiveObject; exports.LiveblocksError = LiveblocksError; exports.MENTION_CHARACTER = MENTION_CHARACTER; exports.MutableSignal = MutableSignal; exports.OpCode = OpCode; exports.Permission = Permission; exports.Promise_withResolvers = Promise_withResolvers; exports.ServerMsgCode = ServerMsgCode; exports.Signal = Signal; exports.SortedList = SortedList; exports.TextEditorType = TextEditorType; exports.WebsocketCloseCodes = WebsocketCloseCodes; exports.asPos = asPos; exports.assert = assert; exports.assertNever = assertNever; exports.autoRetry = autoRetry; exports.b64decode = b64decode; exports.batch = batch; exports.checkBounds = checkBounds; exports.chunk = chunk; exports.cloneLson = cloneLson; exports.compactNodesToNodeStream = compactNodesToNodeStream; exports.compactObject = compactObject; exports.console = fancy_console_exports; exports.convertToCommentData = convertToCommentData; exports.convertToCommentUserReaction = convertToCommentUserReaction; exports.convertToGroupData = convertToGroupData; exports.convertToInboxNotificationData = convertToInboxNotificationData; exports.convertToSubscriptionData = convertToSubscriptionData; exports.convertToThreadData = convertToThreadData; exports.convertToUserSubscriptionData = convertToUserSubscriptionData; exports.createClient = createClient; exports.createCommentAttachmentId = createCommentAttachmentId; exports.createCommentId = createCommentId; exports.createInboxNotificationId = createInboxNotificationId; exports.createManagedPool = createManagedPool; exports.createNotificationSettings = createNotificationSettings; exports.createThreadId = createThreadId; exports.deepLiveify = deepLiveify; exports.defineAiTool = defineAiTool; exports.deprecate = deprecate; exports.deprecateIf = deprecateIf; exports.detectDupes = detectDupes; exports.entries = entries; exports.errorIf = errorIf; exports.findLastIndex = findLastIndex; exports.freeze = freeze; exports.generateUrl = generateUrl; exports.getMentionsFromCommentBody = getMentionsFromCommentBody; exports.getSubscriptionKey = getSubscriptionKey; exports.hasPermissionAccess = hasPermissionAccess; exports.html = html; exports.htmlSafe = htmlSafe; exports.isCommentBodyLink = isCommentBodyLink; exports.isCommentBodyMention = isCommentBodyMention; exports.isCommentBodyText = isCommentBodyText; exports.isJsonArray = isJsonArray; exports.isJsonObject = isJsonObject; exports.isJsonScalar = isJsonScalar; exports.isListStorageNode = isListStorageNode; exports.isLiveNode = isLiveNode; exports.isMapStorageNode = isMapStorageNode; exports.isNotificationChannelEnabled = isNotificationChannelEnabled; exports.isNumberOperator = isNumberOperator; exports.isObjectStorageNode = isObjectStorageNode; exports.isPlainObject = isPlainObject; exports.isRegisterStorageNode = isRegisterStorageNode; exports.isRootStorageNode = isRootStorageNode; exports.isStartsWithOperator = isStartsWithOperator; exports.isUrl = isUrl; exports.kInternal = kInternal; exports.keys = keys; exports.makeAbortController = makeAbortController; exports.makeEventSource = makeEventSource; exports.makePoller = makePoller; exports.makePosition = makePosition; exports.mapValues = mapValues; exports.memoizeOnSuccess = memoizeOnSuccess; exports.mergePermissionMatrices = mergePermissionMatrices; exports.mergeRoomPermissionScopes = mergeRoomPermissionScopes; exports.nanoid = nanoid; exports.nn = nn; exports.nodeStreamToCompactNodes = nodeStreamToCompactNodes; exports.normalizeRoomAccessesInput = normalizeRoomAccessesInput; exports.normalizeRoomAccessesUpdateInput = normalizeRoomAccessesUpdateInput; exports.normalizeRoomPermissionInput = normalizeRoomPermissionInput; exports.objectToQuery = objectToQuery; exports.patchNotificationSettings = patchNotificationSettings; exports.permissionMatrixFromScopes = permissionMatrixFromScopes; exports.permissionMatrixToScopes = permissionMatrixToScopes; exports.raise = raise; exports.resolveMentionsInCommentBody = resolveMentionsInCommentBody; exports.sanitizeUrl = sanitizeUrl; exports.shallow = shallow; exports.shallow2 = shallow2; exports.stableStringify = stableStringify; exports.stringifyCommentBody = stringifyCommentBody; exports.throwUsageError = throwUsageError; exports.toPlainLson = toPlainLson; exports.tryParseJson = tryParseJson; exports.url = url; exports.urljoin = urljoin; exports.wait = wait; exports.warnOnce = warnOnce; exports.warnOnceIf = warnOnceIf; exports.withTimeout = withTimeout;
 //# sourceMappingURL=index.cjs.map