@liveblocks/node 3.20.0-exp6 → 3.20.0-perm1

package/dist/index.d.cts

@@ -1,9 +1,7 @@
-import { Json, DFMD, FeedCreateMetadata, OptionalTupleUnless, BaseUserMeta, DU, PartialUnless, DE, JsonObject, PlainLsonObject, ToJson, DS, QueryMetadata, DTM, ThreadData, DCM, UserSubscriptionData, CommentData, BaseMetadata, CommentBody, Patchable, SubscriptionData, CommentUserReaction, InboxNotificationData, UserRoomSubscriptionSettings, RoomSubscriptionSettings, KDAD, DAD, NotificationSettings, PartialNotificationSettings, GroupScopes, GroupData, LiveObject, Awaitable, DFM, Feed, FeedUpdateMetadata, FeedMessage, NotificationChannel } from '@liveblocks/core';
-export { CommentBody, CommentBodyBlockElement, CommentBodyElement, CommentBodyInlineElement, CommentBodyLink, CommentBodyLinkElementArgs, CommentBodyMention, CommentBodyMentionElementArgs, CommentBodyParagraph, CommentBodyParagraphElementArgs, CommentBodyText, CommentBodyTextElementArgs, CommentData, CommentUserReaction, IUserInfo, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveMap, LiveObject, LiveStructure, Lson, LsonObject, PlainLsonObject, ResolveUsersArgs, StringifyCommentBodyElements, StringifyCommentBodyOptions, ThreadData, User, getMentionsFromCommentBody, isNotificationChannelEnabled, stringifyCommentBody } from '@liveblocks/core';
+import { RoomPermissionInput, Json, DFMD, FeedCreateMetadata, RoomAccessesInput, OptionalTupleUnless, BaseUserMeta, DU, PartialUnless, RoomPermission, RoomAccesses, RoomAccessesUpdateInput, DE, JsonObject, PlainLsonObject, ToJson, DS, QueryMetadata, DTM, ThreadData, DCM, UserSubscriptionData, CommentData, BaseMetadata, CommentBody, Patchable, SubscriptionData, CommentUserReaction, InboxNotificationData, UserRoomSubscriptionSettings, RoomSubscriptionSettings, KDAD, DAD, NotificationSettings, PartialNotificationSettings, GroupScopes, GroupData, LiveObject, Awaitable, DFM, Feed, FeedUpdateMetadata, FeedMessage, NotificationChannel } from '@liveblocks/core';
+export { CommentBody, CommentBodyBlockElement, CommentBodyElement, CommentBodyInlineElement, CommentBodyLink, CommentBodyLinkElementArgs, CommentBodyMention, CommentBodyMentionElementArgs, CommentBodyParagraph, CommentBodyParagraphElementArgs, CommentBodyText, CommentBodyTextElementArgs, CommentData, CommentUserReaction, IUserInfo, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveMap, LiveObject, LiveStructure, Lson, LsonObject, PlainLsonObject, ResolveUsersArgs, RoomAccesses, RoomPermission, StringifyCommentBodyElements, StringifyCommentBodyOptions, ThreadData, User, getMentionsFromCommentBody, isNotificationChannelEnabled, stringifyCommentBody } from '@liveblocks/core';
 import { IncomingHttpHeaders } from 'http';
 
-declare const ALL_PERMISSIONS: readonly ["room:write", "room:read", "room:presence:write", "comments:write", "comments:read", "feeds:write"];
-type Permission = (typeof ALL_PERMISSIONS)[number];
 /**
  * Class to help you construct the exact permission set to grant a user, used
  * when making `.authorizeUser()` calls.
@@ -28,22 +26,15 @@ type Permission = (typeof ALL_PERMISSIONS)[number];
  * You can define at most 10 room IDs (or patterns) in a single token,
  * otherwise the token would become too large and unwieldy.
  *
- * All permissions granted are additive. You cannot "remove" permissions once
- * you grant them. For example:
+ * You can also use object notation for resource-specific access:
  *
- *    session
- *      .allow('abc:*',   session.FULL_ACCESS)
- *      .allow('abc:123', session.READ_ACCESS)
- *
- * Here, room `abc:123` would have full access. The second .allow() call only
- * _adds_ read permissions, but that has no effect since full access
- * permissions were already added to the set.
+ *    session.allow('my-room', { default: 'write', storage: 'none' })
  */
 declare class Session {
     #private;
     readonly FULL_ACCESS: readonly ["room:write"];
-    readonly READ_ACCESS: readonly ["room:read", "room:presence:write", "comments:read"];
-    allow(roomIdOrPattern: string, newPerms: readonly Permission[]): this;
+    readonly READ_ACCESS: readonly ["room:read"];
+    allow(roomIdOrPattern: string, newPerms: RoomPermissionInput): this;
     /**
      * Call this to authorize the session to access Liveblocks. Note that this
      * will return a Liveblocks "access token". Anyone that obtains such access
@@ -130,8 +121,7 @@ type CreateCommentOptions<CM extends BaseMetadata> = {
         metadata: CM;
     }>;
 };
-type RoomPermission = [] | ["room:write"] | ["room:read", "room:presence:write"] | ["room:read", "room:presence:write", "comments:write"];
-type RoomAccesses = Record<string, ["room:write"] | ["room:read", "room:presence:write"] | ["room:read", "room:presence:write", "comments:write"]>;
+
 type RoomMetadata = Record<string, string | string[]>;
 type QueryRoomMetadata = Record<string, string>;
 type RoomData = {
@@ -318,9 +308,9 @@ type Page<T> = {
 type GetRoomsOptions = RoomsQueryCriteria & PaginationOptions;
 type GetInboxNotificationsOptions = InboxNotificationsQueryCriteria & PaginationOptions;
 type CreateRoomOptions = {
-    defaultAccesses: RoomPermission;
-    groupsAccesses?: RoomAccesses;
-    usersAccesses?: RoomAccesses;
+    defaultAccesses: RoomPermissionInput;
+    groupsAccesses?: RoomAccessesInput;
+    usersAccesses?: RoomAccessesInput;
     metadata?: RoomMetadata;
     /**
      * @deprecated Use `organizationId` instead.
@@ -334,13 +324,9 @@ type CreateRoomOptions = {
     engine?: 1 | 2;
 };
 type UpdateRoomOptions = {
-    defaultAccesses?: RoomPermission | null;
-    groupsAccesses?: Record<string, [
-        "room:write"
-    ] | ["room:read", "room:presence:write"] | null>;
-    usersAccesses?: Record<string, [
-        "room:write"
-    ] | ["room:read", "room:presence:write"] | null>;
+    defaultAccesses?: RoomPermissionInput | null;
+    groupsAccesses?: RoomAccessesUpdateInput;
+    usersAccesses?: RoomAccessesUpdateInput;
     metadata?: Record<string, string | string[] | null>;
 };
 type UpsertRoomOptions = {
@@ -2001,4 +1987,4 @@ declare function isTextMentionNotificationEvent(event: WebhookEvent): event is T
  */
 declare function isCustomNotificationEvent(event: WebhookEvent): event is CustomNotificationEvent;
 
-export { type AiCopilot, type CommentCreatedEvent, type CommentDeletedEvent, type CommentEditedEvent, type CommentReactionAdded, type CommentReactionRemoved, type CreateAiCopilotOptions, type CreateFeedMessageOptions, type CreateFeedOptions, type CreateFileKnowledgeSourceOptions, type CreateRoomOptions, type CreateWebKnowledgeSourceOptions, type CustomNotificationEvent, type GetAiCopilotsOptions, type GetInboxNotificationsOptions, type GetKnowledgeSourcesOptions, type GetRoomsOptions, type GetWebKnowledgeSourceLinksOptions, type InboxNotificationsQueryCriteria, type KnowledgeSource, Liveblocks, LiveblocksError, type LiveblocksOptions, type MassMutateStorageCallback, type MassMutateStorageOptions, type MutateStorageCallback, type MutateStorageOptions, type NotificationEvent, type Page, type PaginationOptions, type RoomAccesses, type RoomCreatedEvent, type RoomData, type RoomDeletedEvent, type RoomPermission, type RoomUser, type RoomsQueryCriteria, type SetPresenceOptions, type StorageUpdatedEvent, type TextMentionNotificationEvent, type ThreadCreatedEvent, type ThreadDeletedEvent, type ThreadMarkedAsResolvedEvent, type ThreadMarkedAsUnresolvedEvent, type ThreadMetadataUpdatedEvent, type ThreadNotificationEvent, type ThreadParticipants, type UpdateAiCopilotOptions, type UpdateFeedMessageOptions, type UpdateFeedOptions, type UpdateRoomOptions, type UpsertRoomOptions, type UserEnteredEvent, type UserLeftEvent, type WebKnowledgeSourceLink, type WebhookEvent, WebhookHandler, type WebhookRequest, type YDocUpdatedEvent, isCustomNotificationEvent, isTextMentionNotificationEvent, isThreadNotificationEvent, markdownToCommentBody };
+export { type AiCopilot, type CommentCreatedEvent, type CommentDeletedEvent, type CommentEditedEvent, type CommentReactionAdded, type CommentReactionRemoved, type CreateAiCopilotOptions, type CreateFeedMessageOptions, type CreateFeedOptions, type CreateFileKnowledgeSourceOptions, type CreateRoomOptions, type CreateWebKnowledgeSourceOptions, type CustomNotificationEvent, type GetAiCopilotsOptions, type GetInboxNotificationsOptions, type GetKnowledgeSourcesOptions, type GetRoomsOptions, type GetWebKnowledgeSourceLinksOptions, type InboxNotificationsQueryCriteria, type KnowledgeSource, Liveblocks, LiveblocksError, type LiveblocksOptions, type MassMutateStorageCallback, type MassMutateStorageOptions, type MutateStorageCallback, type MutateStorageOptions, type NotificationEvent, type Page, type PaginationOptions, type RoomCreatedEvent, type RoomData, type RoomDeletedEvent, type RoomUser, type RoomsQueryCriteria, type SetPresenceOptions, type StorageUpdatedEvent, type TextMentionNotificationEvent, type ThreadCreatedEvent, type ThreadDeletedEvent, type ThreadMarkedAsResolvedEvent, type ThreadMarkedAsUnresolvedEvent, type ThreadMetadataUpdatedEvent, type ThreadNotificationEvent, type ThreadParticipants, type UpdateAiCopilotOptions, type UpdateFeedMessageOptions, type UpdateFeedOptions, type UpdateRoomOptions, type UpsertRoomOptions, type UserEnteredEvent, type UserLeftEvent, type WebKnowledgeSourceLink, type WebhookEvent, WebhookHandler, type WebhookRequest, type YDocUpdatedEvent, isCustomNotificationEvent, isTextMentionNotificationEvent, isThreadNotificationEvent, markdownToCommentBody };

package/dist/index.d.ts

@@ -1,9 +1,7 @@
-import { Json, DFMD, FeedCreateMetadata, OptionalTupleUnless, BaseUserMeta, DU, PartialUnless, DE, JsonObject, PlainLsonObject, ToJson, DS, QueryMetadata, DTM, ThreadData, DCM, UserSubscriptionData, CommentData, BaseMetadata, CommentBody, Patchable, SubscriptionData, CommentUserReaction, InboxNotificationData, UserRoomSubscriptionSettings, RoomSubscriptionSettings, KDAD, DAD, NotificationSettings, PartialNotificationSettings, GroupScopes, GroupData, LiveObject, Awaitable, DFM, Feed, FeedUpdateMetadata, FeedMessage, NotificationChannel } from '@liveblocks/core';
-export { CommentBody, CommentBodyBlockElement, CommentBodyElement, CommentBodyInlineElement, CommentBodyLink, CommentBodyLinkElementArgs, CommentBodyMention, CommentBodyMentionElementArgs, CommentBodyParagraph, CommentBodyParagraphElementArgs, CommentBodyText, CommentBodyTextElementArgs, CommentData, CommentUserReaction, IUserInfo, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveMap, LiveObject, LiveStructure, Lson, LsonObject, PlainLsonObject, ResolveUsersArgs, StringifyCommentBodyElements, StringifyCommentBodyOptions, ThreadData, User, getMentionsFromCommentBody, isNotificationChannelEnabled, stringifyCommentBody } from '@liveblocks/core';
+import { RoomPermissionInput, Json, DFMD, FeedCreateMetadata, RoomAccessesInput, OptionalTupleUnless, BaseUserMeta, DU, PartialUnless, RoomPermission, RoomAccesses, RoomAccessesUpdateInput, DE, JsonObject, PlainLsonObject, ToJson, DS, QueryMetadata, DTM, ThreadData, DCM, UserSubscriptionData, CommentData, BaseMetadata, CommentBody, Patchable, SubscriptionData, CommentUserReaction, InboxNotificationData, UserRoomSubscriptionSettings, RoomSubscriptionSettings, KDAD, DAD, NotificationSettings, PartialNotificationSettings, GroupScopes, GroupData, LiveObject, Awaitable, DFM, Feed, FeedUpdateMetadata, FeedMessage, NotificationChannel } from '@liveblocks/core';
+export { CommentBody, CommentBodyBlockElement, CommentBodyElement, CommentBodyInlineElement, CommentBodyLink, CommentBodyLinkElementArgs, CommentBodyMention, CommentBodyMentionElementArgs, CommentBodyParagraph, CommentBodyParagraphElementArgs, CommentBodyText, CommentBodyTextElementArgs, CommentData, CommentUserReaction, IUserInfo, Json, JsonArray, JsonObject, JsonScalar, LiveList, LiveMap, LiveObject, LiveStructure, Lson, LsonObject, PlainLsonObject, ResolveUsersArgs, RoomAccesses, RoomPermission, StringifyCommentBodyElements, StringifyCommentBodyOptions, ThreadData, User, getMentionsFromCommentBody, isNotificationChannelEnabled, stringifyCommentBody } from '@liveblocks/core';
 import { IncomingHttpHeaders } from 'http';
 
-declare const ALL_PERMISSIONS: readonly ["room:write", "room:read", "room:presence:write", "comments:write", "comments:read", "feeds:write"];
-type Permission = (typeof ALL_PERMISSIONS)[number];
 /**
  * Class to help you construct the exact permission set to grant a user, used
  * when making `.authorizeUser()` calls.
@@ -28,22 +26,15 @@ type Permission = (typeof ALL_PERMISSIONS)[number];
  * You can define at most 10 room IDs (or patterns) in a single token,
  * otherwise the token would become too large and unwieldy.
  *
- * All permissions granted are additive. You cannot "remove" permissions once
- * you grant them. For example:
+ * You can also use object notation for resource-specific access:
  *
- *    session
- *      .allow('abc:*',   session.FULL_ACCESS)
- *      .allow('abc:123', session.READ_ACCESS)
- *
- * Here, room `abc:123` would have full access. The second .allow() call only
- * _adds_ read permissions, but that has no effect since full access
- * permissions were already added to the set.
+ *    session.allow('my-room', { default: 'write', storage: 'none' })
  */
 declare class Session {
     #private;
     readonly FULL_ACCESS: readonly ["room:write"];
-    readonly READ_ACCESS: readonly ["room:read", "room:presence:write", "comments:read"];
-    allow(roomIdOrPattern: string, newPerms: readonly Permission[]): this;
+    readonly READ_ACCESS: readonly ["room:read"];
+    allow(roomIdOrPattern: string, newPerms: RoomPermissionInput): this;
     /**
      * Call this to authorize the session to access Liveblocks. Note that this
      * will return a Liveblocks "access token". Anyone that obtains such access
@@ -130,8 +121,7 @@ type CreateCommentOptions<CM extends BaseMetadata> = {
         metadata: CM;
     }>;
 };
-type RoomPermission = [] | ["room:write"] | ["room:read", "room:presence:write"] | ["room:read", "room:presence:write", "comments:write"];
-type RoomAccesses = Record<string, ["room:write"] | ["room:read", "room:presence:write"] | ["room:read", "room:presence:write", "comments:write"]>;
+
 type RoomMetadata = Record<string, string | string[]>;
 type QueryRoomMetadata = Record<string, string>;
 type RoomData = {
@@ -318,9 +308,9 @@ type Page<T> = {
 type GetRoomsOptions = RoomsQueryCriteria & PaginationOptions;
 type GetInboxNotificationsOptions = InboxNotificationsQueryCriteria & PaginationOptions;
 type CreateRoomOptions = {
-    defaultAccesses: RoomPermission;
-    groupsAccesses?: RoomAccesses;
-    usersAccesses?: RoomAccesses;
+    defaultAccesses: RoomPermissionInput;
+    groupsAccesses?: RoomAccessesInput;
+    usersAccesses?: RoomAccessesInput;
     metadata?: RoomMetadata;
     /**
      * @deprecated Use `organizationId` instead.
@@ -334,13 +324,9 @@ type CreateRoomOptions = {
     engine?: 1 | 2;
 };
 type UpdateRoomOptions = {
-    defaultAccesses?: RoomPermission | null;
-    groupsAccesses?: Record<string, [
-        "room:write"
-    ] | ["room:read", "room:presence:write"] | null>;
-    usersAccesses?: Record<string, [
-        "room:write"
-    ] | ["room:read", "room:presence:write"] | null>;
+    defaultAccesses?: RoomPermissionInput | null;
+    groupsAccesses?: RoomAccessesUpdateInput;
+    usersAccesses?: RoomAccessesUpdateInput;
     metadata?: Record<string, string | string[] | null>;
 };
 type UpsertRoomOptions = {
@@ -2001,4 +1987,4 @@ declare function isTextMentionNotificationEvent(event: WebhookEvent): event is T
  */
 declare function isCustomNotificationEvent(event: WebhookEvent): event is CustomNotificationEvent;
 
-export { type AiCopilot, type CommentCreatedEvent, type CommentDeletedEvent, type CommentEditedEvent, type CommentReactionAdded, type CommentReactionRemoved, type CreateAiCopilotOptions, type CreateFeedMessageOptions, type CreateFeedOptions, type CreateFileKnowledgeSourceOptions, type CreateRoomOptions, type CreateWebKnowledgeSourceOptions, type CustomNotificationEvent, type GetAiCopilotsOptions, type GetInboxNotificationsOptions, type GetKnowledgeSourcesOptions, type GetRoomsOptions, type GetWebKnowledgeSourceLinksOptions, type InboxNotificationsQueryCriteria, type KnowledgeSource, Liveblocks, LiveblocksError, type LiveblocksOptions, type MassMutateStorageCallback, type MassMutateStorageOptions, type MutateStorageCallback, type MutateStorageOptions, type NotificationEvent, type Page, type PaginationOptions, type RoomAccesses, type RoomCreatedEvent, type RoomData, type RoomDeletedEvent, type RoomPermission, type RoomUser, type RoomsQueryCriteria, type SetPresenceOptions, type StorageUpdatedEvent, type TextMentionNotificationEvent, type ThreadCreatedEvent, type ThreadDeletedEvent, type ThreadMarkedAsResolvedEvent, type ThreadMarkedAsUnresolvedEvent, type ThreadMetadataUpdatedEvent, type ThreadNotificationEvent, type ThreadParticipants, type UpdateAiCopilotOptions, type UpdateFeedMessageOptions, type UpdateFeedOptions, type UpdateRoomOptions, type UpsertRoomOptions, type UserEnteredEvent, type UserLeftEvent, type WebKnowledgeSourceLink, type WebhookEvent, WebhookHandler, type WebhookRequest, type YDocUpdatedEvent, isCustomNotificationEvent, isTextMentionNotificationEvent, isThreadNotificationEvent, markdownToCommentBody };
+export { type AiCopilot, type CommentCreatedEvent, type CommentDeletedEvent, type CommentEditedEvent, type CommentReactionAdded, type CommentReactionRemoved, type CreateAiCopilotOptions, type CreateFeedMessageOptions, type CreateFeedOptions, type CreateFileKnowledgeSourceOptions, type CreateRoomOptions, type CreateWebKnowledgeSourceOptions, type CustomNotificationEvent, type GetAiCopilotsOptions, type GetInboxNotificationsOptions, type GetKnowledgeSourcesOptions, type GetRoomsOptions, type GetWebKnowledgeSourceLinksOptions, type InboxNotificationsQueryCriteria, type KnowledgeSource, Liveblocks, LiveblocksError, type LiveblocksOptions, type MassMutateStorageCallback, type MassMutateStorageOptions, type MutateStorageCallback, type MutateStorageOptions, type NotificationEvent, type Page, type PaginationOptions, type RoomCreatedEvent, type RoomData, type RoomDeletedEvent, type RoomUser, type RoomsQueryCriteria, type SetPresenceOptions, type StorageUpdatedEvent, type TextMentionNotificationEvent, type ThreadCreatedEvent, type ThreadDeletedEvent, type ThreadMarkedAsResolvedEvent, type ThreadMarkedAsUnresolvedEvent, type ThreadMetadataUpdatedEvent, type ThreadNotificationEvent, type ThreadParticipants, type UpdateAiCopilotOptions, type UpdateFeedMessageOptions, type UpdateFeedOptions, type UpdateRoomOptions, type UpsertRoomOptions, type UserEnteredEvent, type UserLeftEvent, type WebKnowledgeSourceLink, type WebhookEvent, WebhookHandler, type WebhookRequest, type YDocUpdatedEvent, isCustomNotificationEvent, isTextMentionNotificationEvent, isThreadNotificationEvent, markdownToCommentBody };

package/dist/index.js

@@ -3,7 +3,7 @@ import { detectDupes } from "@liveblocks/core";
 
 // src/version.ts
 var PKG_NAME = "@liveblocks/node";
-var PKG_VERSION = "3.20.0-exp6";
+var PKG_VERSION = "3.20.0-perm1";
 var PKG_FORMAT = "esm";
 
 // src/client.ts
@@ -22,6 +22,9 @@ import {
   isPlainObject,
   LiveObject,
   makeAbortController,
+  normalizeRoomAccessesInput,
+  normalizeRoomAccessesUpdateInput,
+  normalizeRoomPermissionInput as normalizeRoomPermissionInput2,
   objectToQuery,
   tryParseJson,
   url as url2,
@@ -106,7 +109,12 @@ function xwarn(resp, method, path) {
 }
 
 // src/Session.ts
-import { url } from "@liveblocks/core";
+import {
+  getRoomPermissionConflicts,
+  normalizeRoomPermissionInput,
+  Permission,
+  url
+} from "@liveblocks/core";
 
 // src/utils.ts
 var DEFAULT_BASE_URL = "https://api.liveblocks.io";
@@ -160,26 +168,9 @@ function normalizeStatusCode(statusCode) {
 }
 
 // src/Session.ts
-var ALL_PERMISSIONS = Object.freeze([
-  "room:write",
-  "room:read",
-  "room:presence:write",
-  "comments:write",
-  "comments:read",
-  "feeds:write"
-]);
-function isPermission(value) {
-  return ALL_PERMISSIONS.includes(value);
-}
 var MAX_PERMS_PER_SET = 10;
-var READ_ACCESS = Object.freeze([
-  "room:read",
-  "room:presence:write",
-  // TODO: Remove once backend no longer requires this
-  "comments:read"
-  // TODO: Remove — implied by room:read
-]);
-var FULL_ACCESS = Object.freeze(["room:write"]);
+var READ_ACCESS = Object.freeze([Permission.RoomRead]);
+var FULL_ACCESS = Object.freeze([Permission.RoomWrite]);
 var roomPatternRegex = /^([*]|[^*]{1,128}[*]?)$/;
 var Session = class {
   FULL_ACCESS = FULL_ACCESS;
@@ -226,13 +217,14 @@ var Session = class {
     if (!roomPatternRegex.test(roomIdOrPattern)) {
       throw new Error("Invalid room name or pattern");
     }
-    if (newPerms.length === 0) {
+    const normalizedPermissions = normalizeRoomPermissionInput(newPerms);
+    if (normalizedPermissions.length === 0) {
       throw new Error("Permission list cannot be empty");
     }
     const existingPerms = this.#getOrCreate(roomIdOrPattern);
-    for (const perm of newPerms) {
-      if (!isPermission(perm)) {
-        throw new Error(`Not a valid permission: ${perm}`);
+    for (const perm of normalizedPermissions) {
+      for (const conflictingPerm of getRoomPermissionConflicts(perm)) {
+        existingPerms.delete(conflictingPerm);
       }
       existingPerms.add(perm);
     }
@@ -308,6 +300,22 @@ function inflateRoomData(room) {
     lastConnectionAt
   };
 }
+function normalizeCreateRoomOptions(options) {
+  return {
+    ...options,
+    defaultAccesses: normalizeRoomPermissionInput2(options.defaultAccesses),
+    groupsAccesses: normalizeRoomAccessesInput(options.groupsAccesses),
+    usersAccesses: normalizeRoomAccessesInput(options.usersAccesses)
+  };
+}
+function normalizeUpdateRoomOptions(options) {
+  return {
+    ...options,
+    defaultAccesses: options.defaultAccesses === void 0 || options.defaultAccesses === null ? options.defaultAccesses : normalizeRoomPermissionInput2(options.defaultAccesses),
+    groupsAccesses: normalizeRoomAccessesUpdateInput(options.groupsAccesses),
+    usersAccesses: normalizeRoomAccessesUpdateInput(options.usersAccesses)
+  };
+}
 function inflateAiCopilot(copilot) {
   return {
     ...copilot,
@@ -614,6 +622,7 @@ var Liveblocks = class {
    * @returns The created room.
    */
   async createRoom(roomId, params, options) {
+    const normalizedParams = normalizeCreateRoomOptions(params);
     const {
       defaultAccesses,
       groupsAccesses,
@@ -621,7 +630,7 @@ var Liveblocks = class {
       metadata,
       tenantId,
       organizationId
-    } = params;
+    } = normalizedParams;
     const body = {
       id: roomId,
       defaultAccesses,
@@ -674,9 +683,13 @@ var Liveblocks = class {
    * @returns The room.
    */
   async upsertRoom(roomId, params, options) {
+    const body = {
+      update: normalizeUpdateRoomOptions(params.update),
+      create: params.create === void 0 ? void 0 : normalizeCreateRoomOptions(params.create)
+    };
     const res = await this.#post(
       url2`/v2/rooms/${roomId}/upsert`,
-      params,
+      body,
       options
     );
     if (!res.ok) {
@@ -711,7 +724,7 @@ var Liveblocks = class {
    * @returns The updated room.
    */
   async updateRoom(roomId, params, options) {
-    const { defaultAccesses, groupsAccesses, usersAccesses, metadata } = params;
+    const { defaultAccesses, groupsAccesses, usersAccesses, metadata } = normalizeUpdateRoomOptions(params);
     const res = await this.#post(
       url2`/v2/rooms/${roomId}`,
       {