@zhin.js/core 1.0.13 → 1.0.14

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @zhin.js/core
 
+## 1.0.14
+
+### Patch Changes
+
+- 547028f: fix: 优化包结构,优化客户端支持
+- Updated dependencies [547028f]
+  - @zhin.js/database@1.0.4
+  - @zhin.js/hmr@1.0.7
+
 ## 1.0.13
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/core",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Zhin机器人核心框架",
   "type": "module",
   "main": "./lib/index.js",
@@ -29,8 +29,8 @@
     "toml": "^3.0.0",
     "dotenv": "^16.3.1",
     "cron-parser": "latest",
-    "@zhin.js/hmr": "1.0.6",
-    "@zhin.js/database": "1.0.3"
+    "@zhin.js/hmr": "1.0.7",
+    "@zhin.js/database": "1.0.4"
   },
   "peerDependencies": {
     "@zhin.js/logger": "0.1.1"
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@types/node": "^24.3.0",
     "typescript": "^5.3.0",
-    "@zhin.js/types": "1.0.4"
+    "@zhin.js/types": "1.0.5"
   },
   "scripts": {
     "build": "tsc",

package/tests/bot.test.ts

@@ -1,32 +1,42 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest'
 import type { Bot } from '../src/bot'
-import type { BotConfig, SendOptions } from '../src/types'
+import type {SendOptions } from '../src/types'
+import { Message } from '../src/message'
 
 describe('Bot接口测试', () => {
   // 创建一个测试用的Bot实现类
-  class TestBot implements Bot {
+  class TestBot implements Bot<any, Bot.Config> {
     connected = false
+    $config: Bot.Config
+    constructor(public config: Bot.Config) {
+      this.$config = config
+    }
 
-    constructor(public config: BotConfig) {}
-
-    async connect(): Promise<void> {
+    async $connect(): Promise<void> {
       this.connected = true
     }
 
-    async disconnect(): Promise<void> {
+    async $disconnect(): Promise<void> {
       this.connected = false
     }
 
-    async sendMessage(options: SendOptions): Promise<void> {
+    async $sendMessage(options: SendOptions): Promise<string> {
       if (!this.connected) {
         throw new Error('机器人未连接')
       }
       // 模拟发送消息
+      return '123'
+    }
+    async $recallMessage(id: string): Promise<void> {
+      // 模拟撤回消息
+    }
+    $formatMessage(message: any): Message<any> {
+      return message
     }
   }
 
   let bot: TestBot
-  let testConfig: BotConfig
+  let testConfig: Bot.Config
 
   beforeEach(() => {
     testConfig = {
@@ -48,13 +58,13 @@ describe('Bot接口测试', () => {
 
   describe('连接管理测试', () => {
     it('应该正确处理连接', async () => {
-      await bot.connect()
+      await bot.$connect()
       expect(bot.connected).toBe(true)
     })
 
     it('应该正确处理断开连接', async () => {
-      await bot.connect()
-      await bot.disconnect()
+      await bot.$connect()
+      await bot.$disconnect()
       expect(bot.connected).toBe(false)
     })
   })
@@ -69,7 +79,7 @@ describe('Bot接口测试', () => {
         content: '测试消息'
       }
 
-      await expect(bot.sendMessage(options)).rejects.toThrow('机器人未连接')
+      await expect(bot.$sendMessage(options)).rejects.toThrow('机器人未连接')
     })
 
     it('连接后应该正确发送消息', async () => {
@@ -81,39 +91,48 @@ describe('Bot接口测试', () => {
         content: '测试消息'
       }
 
-      const sendSpy = vi.spyOn(bot, 'sendMessage')
-      await bot.connect()
-      await bot.sendMessage(options)
+      const sendSpy = vi.spyOn(bot, '$sendMessage')
+      await bot.$connect()
+      await bot.$sendMessage(options)
       expect(sendSpy).toHaveBeenCalledWith(options)
     })
   })
 
   describe('自定义配置测试', () => {
     it('应该支持扩展的配置类型', () => {
-      interface ExtendedConfig extends BotConfig {
+      interface ExtendedConfig extends Bot.Config {
         token: string
         platform: string
       }
 
       class ExtendedBot implements Bot<ExtendedConfig> {
         connected = false
+        $config: ExtendedConfig
+        constructor(public config: ExtendedConfig) {
+          this.$config = config
+        }
 
-        constructor(public config: ExtendedConfig) {}
-
-        async connect(): Promise<void> {
+        async $connect(): Promise<void> {
           this.connected = true
         }
 
-        async disconnect(): Promise<void> {
+        async $disconnect(): Promise<void> {
           this.connected = false
         }
 
-        async sendMessage(options: SendOptions): Promise<void> {
+        async $sendMessage(options: SendOptions): Promise<string> {
           if (!this.connected) {
             throw new Error('机器人未连接')
           }
+          return '123'
           // 模拟发送消息
         }
+        async $recallMessage(id: string): Promise<void> {
+          // 模拟撤回消息
+        }
+        $formatMessage(message: any): Message<any> {
+          return message
+        }
       }
 
       const extendedConfig: ExtendedConfig = {

package/src/jsx.d.ts

@@ -1,52 +0,0 @@
-import { SendContent } from './types.js';
-import { Component,ComponentContext } from './component.js';
-import { MessageElement } from './types.js';
-
-declare global {
-    namespace JSX {
-        interface Element {
-            type: string | Component<any>;
-            data: Record<string, any>;
-            children?: JSXChildren;
-        }
-
-        interface ElementClass {
-            render(props: any, context?: ComponentContext): MaybePromise<SendContent>;
-        }
-
-        interface ElementAttributesProperty {
-            data: {};
-        }
-
-        interface ElementChildrenAttribute {
-            children: {};
-        }
-
-        interface IntrinsicElements {
-            // 简化的组件元素
-            fetch: JSXFetchElement;
-        }
-    }
-}
-
-// 简化的组件属性接口
-interface JSXBaseElement {
-    children?: JSXChildren;
-}
-
-interface JSXFetchElement extends JSXBaseElement {
-    url?: string;
-}
-
-// JSX 子元素类型
-type JSXChildren = MessageElement | string | number | boolean | null | undefined | JSXChildren[];
-
-// JSX 元素类型
-type JSXElement = {
-    type: string | Component<any>;
-    data: Record<string, any>;
-    children?: JSXChildren;
-};
-
-// 类型辅助
-type MaybePromise<T> = T | Promise<T>;