Skip to content

Commit 7fc70bc

Browse files
committed
Use Type.Omit(..., []) in schema intersections & fix: #1674
Replace direct schema references inside Type.Intersect with Type.Omit(schema, []) in two places (OB11MessageSchema and OB11MessageImageSchema). This avoids reusing the original schema metadata/$id when intersecting, preventing duplicate-id or type-merging issues with TypeBox/OpenAPI generation.
1 parent 6758825 commit 7fc70bc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

packages/napcat-onebot/action/schemas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export const lastestMessageSchema = Type.Object({
8585
}, { $id: 'OB11LatestMessage', description: '最后一条消息' });
8686

8787
export const OB11MessageSchema = Type.Intersect([
88-
lastestMessageSchema,
88+
Type.Omit(lastestMessageSchema, []),
8989
Type.Object({
9090
message_id: Type.Number({ description: '消息ID' }),
9191
message_seq: Type.Number({ description: '消息序列号' }),

packages/napcat-onebot/types/message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export const OB11MessageFileBaseSchema = Type.Object({
9494
export const OB11MessageImageSchema = Type.Object({
9595
type: Type.Literal(OB11MessageDataType.image),
9696
data: Type.Intersect([
97-
FileBaseDataSchema,
97+
Type.Omit(FileBaseDataSchema, []),
9898
Type.Object({
9999
summary: Type.Optional(Type.String({ description: '图片摘要' })),
100100
sub_type: Type.Optional(Type.Number({ description: '图片子类型' })),

0 commit comments

Comments
 (0)