Skip to content

chore: fix AJV strictTypes warnings in rest-typings oneOf branches #40282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 2 commits into from
Apr 23, 2026
Merged

chore: fix AJV strictTypes warnings in rest-typings oneOf branches #40282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52e695e
chore: fix AJV strictTypes warnings in rest-typings oneOf branches
KevLehman Apr 23, 2026
b09e62e
chore: fix AJV strictTypes warnings at root schema level
KevLehman Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/meteor/app/api/server/v1/invites.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ const invites = API.v1
authRequired: true,
response: {
200: ajv.compile<IInvite[]>({
additionalProperties: false,
Comment thread
KevLehman marked this conversation as resolved.
type: 'array',
items: {
$ref: '#/components/schemas/IInvite',
Expand Down
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/channels/ChannelsFilesListProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ const channelsFilesListPropsSchema = {
type: 'boolean',
},
},
oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
oneOf: [
{ type: 'object', required: ['roomId'] },
{ type: 'object', required: ['roomName'] },
],
required: [],
additionalProperties: false,
};
Expand Down
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/dm/DmFileProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ const dmFilesListPropsSchema = {
type: 'boolean',
},
},
oneOf: [{ required: ['roomId'] }, { required: ['username'] }],
oneOf: [
{ type: 'object', required: ['roomId'] },
{ type: 'object', required: ['username'] },
],
required: [],
additionalProperties: false,
};
Expand Down
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/groups/GroupsFilesProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ const GroupsFilesPropsSchema = {
type: 'boolean',
},
},
oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
oneOf: [
{ type: 'object', required: ['roomId'] },
{ type: 'object', required: ['roomName'] },
],
required: [],
additionalProperties: true, // keep additional properties for backwards compatibility, otherwise this would be a breaking change
};
Expand Down
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/moderation/ArchiveReportProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ const archiveReportPropsSchema = {
nullable: true,
},
},
oneOf: [{ required: ['msgId'] }, { required: ['userId'] }],
oneOf: [
{ type: 'object', required: ['msgId'] },
{ type: 'object', required: ['userId'] },
],
additionalProperties: false,
};

Expand Down
11 changes: 9 additions & 2 deletions packages/rest-typings/src/v1/rooms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,10 @@ const RoomsIsMemberPropsSchema = {
userId: { type: 'string', minLength: 1 },
username: { type: 'string', minLength: 1 },
},
oneOf: [{ required: ['roomId', 'userId'] }, { required: ['roomId', 'username'] }],
oneOf: [
{ type: 'object', required: ['roomId', 'userId'] },
{ type: 'object', required: ['roomId', 'username'] },
],
additionalProperties: false,
};

Expand Down Expand Up @@ -770,6 +773,7 @@ type MembersOrderedByRoleProps = {
export type RoomsMembersOrderedByRoleProps = PaginatedRequest<MembersOrderedByRoleProps>;

const membersOrderedByRoleRolePropsSchema = {
type: 'object',
properties: {
roomId: {
type: 'string',
Expand All @@ -796,7 +800,10 @@ const membersOrderedByRoleRolePropsSchema = {
type: 'string',
},
},
oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
oneOf: [
{ type: 'object', required: ['roomId'] },
{ type: 'object', required: ['roomName'] },
],
additionalProperties: false,
};

Expand Down
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/teams/TeamsInfoProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ const teamsInfoPropsSchema = {
teamId: { type: 'string' },
teamName: { type: 'string' },
},
oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }],
oneOf: [
{ type: 'object', required: ['teamId'] },
{ type: 'object', required: ['teamName'] },
],
additionalProperties: false,
};

Expand Down
6 changes: 5 additions & 1 deletion packages/rest-typings/src/v1/teams/TeamsListChildren.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ const TeamsListChildrenPropsSchema = {
sort: { type: 'string' },
},
additionalProperties: false,
oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }, { required: ['roomId'] }],
oneOf: [
{ type: 'object', required: ['teamId'] },
{ type: 'object', required: ['teamName'] },
{ type: 'object', required: ['roomId'] },
],
};

export const isTeamsListChildrenProps = ajvQuery.compile<TeamsListChildrenProps>(TeamsListChildrenPropsSchema);
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/teams/TeamsListRoomsOfUserProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ const teamsListRoomsOfUserPropsSchema = {
count: { type: 'number', nullable: true },
sort: { type: 'string', nullable: true },
},
oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }],
oneOf: [
{ type: 'object', required: ['teamId'] },
{ type: 'object', required: ['teamName'] },
],
required: ['userId'],
additionalProperties: false,
};
Expand Down
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/teams/TeamsListRoomsProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ const teamsListRoomsPropsSchema = {
count: { type: 'number', nullable: true },
sort: { type: 'string', nullable: true },
},
oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }],
oneOf: [
{ type: 'object', required: ['teamId'] },
{ type: 'object', required: ['teamName'] },
],
additionalProperties: false,
};

Expand Down
5 changes: 4 additions & 1 deletion packages/rest-typings/src/v1/teams/TeamsMembersProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ const teamsMembersPropsSchema = {
count: { type: 'number', nullable: true },
sort: { type: 'string', nullable: true },
},
oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }],
oneOf: [
{ type: 'object', required: ['teamId'] },
{ type: 'object', required: ['teamName'] },
],
additionalProperties: false,
};

Expand Down
Loading