From c290fd54a2810497281086c1b65f44c8b0944d12 Mon Sep 17 00:00:00 2001 From: Shigma Date: Tue, 20 Jun 2023 04:09:22 +0800 Subject: [PATCH] refa: upgrade schema, removing `as const` --- adapters/discord/src/message.ts | 12 ++++++------ adapters/kook/src/http.ts | 2 +- adapters/kook/src/message.ts | 6 +++--- adapters/kook/src/ws.ts | 2 +- adapters/onebot/src/http.ts | 2 +- adapters/onebot/src/ws.ts | 4 ++-- adapters/telegram/src/polling.ts | 2 +- adapters/telegram/src/server.ts | 2 +- packages/core/package.json | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/adapters/discord/src/message.ts b/adapters/discord/src/message.ts index 187d30c8..6f945523 100644 --- a/adapters/discord/src/message.ts +++ b/adapters/discord/src/message.ts @@ -327,14 +327,14 @@ export namespace DiscordMessenger { export const Config: Schema = Schema.object({ handleExternalAsset: Schema.union([ - Schema.const('download' as const).description('先下载后发送'), - Schema.const('direct' as const).description('直接发送链接'), - Schema.const('auto' as const).description('发送一个 HEAD 请求，根据返回的 Content-Type 决定发送方式'), + Schema.const('download').description('先下载后发送'), + Schema.const('direct').description('直接发送链接'), + Schema.const('auto').description('发送一个 HEAD 请求，根据返回的 Content-Type 决定发送方式'), ]).role('radio').description('发送外链资源时采用的方式。').default('auto'), handleMixedContent: Schema.union([ - Schema.const('separate' as const).description('将每个不同形式的内容分开发送'), - Schema.const('attach' as const).description('图片前如果有文本内容，则将文本作为图片的附带信息进行发送'), - Schema.const('auto' as const).description('如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送'), + Schema.const('separate').description('将每个不同形式的内容分开发送'), + Schema.const('attach').description('图片前如果有文本内容，则将文本作为图片的附带信息进行发送'), + Schema.const('auto').description('如果图片本身采用直接发送则与前面的文本分开，否则将文本作为图片的附带信息发送'), ]).role('radio').description('发送图文等混合内容时采用的方式。').default('auto'), }).description('发送设置') } diff --git a/adapters/kook/src/http.ts b/adapters/kook/src/http.ts index e5e2f468..ddca363c 100644 --- a/adapters/kook/src/http.ts +++ b/adapters/kook/src/http.ts @@ -44,7 +44,7 @@ export namespace HttpServer { } export const Config: Schema = Schema.object({ - protocol: Schema.const('http' as const).required(), + protocol: Schema.const('http').required(), path: Schema.string().description('服务器监听的路径。').default('/kook'), token: Schema.string().description('机器人的用户令牌。').role('secret').required(), verifyToken: Schema.string().description('机器人的验证令牌。').role('secret').required(), diff --git a/adapters/kook/src/message.ts b/adapters/kook/src/message.ts index b2cd5c81..6dc7bbcd 100644 --- a/adapters/kook/src/message.ts +++ b/adapters/kook/src/message.ts @@ -205,9 +205,9 @@ export namespace KookMessenger { export const Config: Schema = Schema.object({ handleMixedContent: Schema.union([ - Schema.const('separate' as const).description('将每个不同形式的内容分开发送'), - Schema.const('card' as const).description('使用卡片发送内容'), - Schema.const('mixed' as const).description('使用混合模式发送内容'), + Schema.const('separate').description('将每个不同形式的内容分开发送'), + Schema.const('card').description('使用卡片发送内容'), + Schema.const('mixed').description('使用混合模式发送内容'), ]).role('radio').description('发送图文等混合内容时采用的方式。').default('separate'), }).description('发送设置') } diff --git a/adapters/kook/src/ws.ts b/adapters/kook/src/ws.ts index 425681f4..749b8e77 100644 --- a/adapters/kook/src/ws.ts +++ b/adapters/kook/src/ws.ts @@ -72,7 +72,7 @@ export namespace WsClient { export const Config: Schema = Schema.intersect([ Schema.object({ - protocol: Schema.const('ws' as const).required(process.env.KOISHI_ENV !== 'browser'), + protocol: Schema.const('ws').required(process.env.KOISHI_ENV !== 'browser'), token: Schema.string().description('机器人的用户令牌。').role('secret').required(), }), Adapter.WsClient.Config, diff --git a/adapters/onebot/src/http.ts b/adapters/onebot/src/http.ts index f1e9f507..775b6082 100644 --- a/adapters/onebot/src/http.ts +++ b/adapters/onebot/src/http.ts @@ -63,7 +63,7 @@ export namespace HttpServer { export const Config: Schema = Schema.intersect([ Schema.object({ - protocol: Schema.const('http' as const).required(), + protocol: Schema.const('http').required(), path: Schema.string().description('服务器监听的路径。').default('/onebot'), secret: Schema.string().description('接收事件推送时用于验证的字段，应该与 OneBot 的 secret 配置保持一致。').role('secret'), }).description('连接设置'), diff --git a/adapters/onebot/src/ws.ts b/adapters/onebot/src/ws.ts index 358709c1..c20891dd 100644 --- a/adapters/onebot/src/ws.ts +++ b/adapters/onebot/src/ws.ts @@ -25,7 +25,7 @@ export namespace WsClient { export const Config: Schema = Schema.intersect([ Schema.object({ - protocol: Schema.const('ws' as const).required(process.env.KOISHI_ENV !== 'browser'), + protocol: Schema.const('ws').required(process.env.KOISHI_ENV !== 'browser'), responseTimeout: Schema.natural().role('time').default(Time.minute).description('等待响应的时间 (单位为毫秒)。'), }).description('连接设置'), Quester.createConfig(true), @@ -71,7 +71,7 @@ export namespace WsServer { } export const Config: Schema = Schema.object({ - protocol: Schema.const('ws-reverse' as const).required(process.env.KOISHI_ENV === 'browser'), + protocol: Schema.const('ws-reverse').required(process.env.KOISHI_ENV === 'browser'), path: Schema.string().description('服务器监听的路径。').default('/onebot'), responseTimeout: Schema.natural().role('time').default(Time.minute).description('等待响应的时间 (单位为毫秒)。'), }).description('连接设置') diff --git a/adapters/telegram/src/polling.ts b/adapters/telegram/src/polling.ts index 5b762b69..2614ec1d 100644 --- a/adapters/telegram/src/polling.ts +++ b/adapters/telegram/src/polling.ts @@ -82,7 +82,7 @@ export namespace HttpPolling { } export const Config: Schema = Schema.object({ - protocol: Schema.const('polling' as const).required(process.env.KOISHI_ENV !== 'browser'), + protocol: Schema.const('polling').required(process.env.KOISHI_ENV !== 'browser'), pollingTimeout: Schema.natural().role('ms').default(Time.second * 25).description('通过长轮询获取更新时请求的超时 (单位为毫秒)。'), retryTimes: Schema.natural().description('初次连接时的最大重试次数。').default(6), retryInterval: Schema.natural().role('ms').default(Time.second * 5).description('长轮询断开后的重试时间间隔 (单位为毫秒)。'), diff --git a/adapters/telegram/src/server.ts b/adapters/telegram/src/server.ts index 4a917dfe..5b45ae6e 100644 --- a/adapters/telegram/src/server.ts +++ b/adapters/telegram/src/server.ts @@ -48,7 +48,7 @@ export namespace HttpServer { } export const Config: Schema = Schema.object({ - protocol: Schema.const('server' as const).required(), + protocol: Schema.const('server').required(), path: Schema.string().description('服务器监听的路径。').default('/telegram'), selfUrl: Schema.string().role('link').description('服务器暴露在公网的地址。缺省时将使用全局配置。'), }) diff --git a/packages/core/package.json b/packages/core/package.json index 6e02a632..e9a09eb9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -40,6 +40,6 @@ "cosmokit": "^1.4.2", "ws": "^8.13.0", "reggol": "^1.4.2", - "schemastery": "^3.9.0" + "schemastery": "^3.10.0" } }