fix: 修复含通配符时的事件类型匹配

zhangfisher · zhangfisher · commit 1ba3faa45986 · 2025-10-10T18:02:44.000+08:00
diff --git a/packages/native/src/__tests__/types/transform.type.test.ts b/packages/native/src/__tests__/types/transform.type.test.ts
@@ -3,7 +3,8 @@
 import { describe, test, expect } from 'vitest';
 import type { Equal, Expect } from '@type-challenges/utils';
 import { FastEvent } from '../../event';
-import { FastEventMessage, FastEventListener, TypedFastEventListener, AssertFastMessage as NotPayload, PickTransformedEvents } from '../../types';
+import {  AssertFastMessage as NotPayload, PickTransformedEvents, TransformedEvents, RecordValues, ClosestWildcardEvents } from '../../types';
+
 
 describe('启用Transform时的类型支持', () => {
     test('自定义事件转换', () => {
@@ -154,4 +155,46 @@ describe('启用Transform时的类型支持', () => {
             resolve();
         });
     });
+    test('所有Scope自定义事件转换', () => {
+        type WebEvents = TransformedEvents<{
+            'rooms/*/$join': { room: string; welcome: string; users: string[] }
+            'rooms/*/$leave': string
+            'rooms/*/$error': string
+            'rooms/*/$add': string
+            'rooms/*/$remove': string
+            'rooms/*/*': number
+        }>
+         const emitter = new FastEvent<WebEvents>()
+        emitter.on('rooms/xssss/$join', (message) => {
+            type cases = [                
+                Expect<Equal<typeof message.room, string>>,
+                Expect<Equal<typeof message.welcome, string>>,
+                Expect<Equal<typeof message.users, string[]>>
+            ]
+        })
+        emitter.once('rooms/xssss/$join', (message) => {
+            type cases = [                
+                Expect<Equal<typeof message.room, string>>,
+                Expect<Equal<typeof message.welcome, string>>,
+                Expect<Equal<typeof message.users, string[]>>
+            ]
+        })
+        const scope = emitter.scope('rooms/test')
+        type ScopeEvents = typeof scope.types.events
+        type JoinEvents = ScopeEvents['$join']['type']
+        type SJoinEventss = ClosestWildcardEvents<ScopeEvents, '$join'>
+        type JoinEventss = RecordValues<ClosestWildcardEvents<ScopeEvents, '$join'>>
+        
+        
+        scope.on('$join', (message) => {
+            message.room
+            message.welcome
+            message.users
+            type cases = [                
+                Expect<Equal<typeof message.room, string>>,
+                Expect<Equal<typeof message.welcome, string>>,
+                Expect<Equal<typeof message.users, string[]>>
+            ]
+        })
+    })
 });
diff --git a/packages/native/src/types/FirstObjectItem.ts b/packages/native/src/types/FirstObjectItem.ts
@@ -4,12 +4,70 @@ import { Keys } from './Keys';
  * 保留对象中第一项
  */
 export type FirstObjectItem<T extends Record<string, any>> = Pick<T, Keys<T> extends any[] ? Keys<T>[0] : never>;
+  
+// type isEmpty<T extends Record<string, any>> = keyof T extends never ? true : false;
+// // 获取所有Key包括通配符字符*的项
+// export type GetWildcardItems<T extends Record<string, any>> = {
+//     [K in keyof T as K extends `${string}*${string}` ? K : K extends `*`  ? K : never]: T[K];
+// }
 
-// type Events = {
-//     'rooms/*/join': string;
-//     'rooms/*/*': number;
-// };
+// export type GetNotWildcardItems<T extends Record<string, any>> = {
+//     [K in keyof T as K extends `${string}*${string}` ? never : K extends `*`  ? never : K]: T[K];
+// }
 
-// type R = FirstObjectItem<Events>
+// export type GetFirstMatchedItem<T extends Record<string, any>> =FirstObjectItem<isEmpty<GetNotWildcardItems<T>> extends true
+//     ? GetWildcardItems<T>
+//     : GetNotWildcardItems<T>>
 
-type d = Pick<{ a: 1 }, never>;
+
+// // type Events = {
+// //    'rooms/*/$join': { room: string; welcome: string; users: string[] }
+// //     'rooms/*/$leave': string
+// //     'rooms/*/$error': string
+// //     'rooms/*/$add': string
+// //     'rooms/*/$remove': string
+// //     'rooms/*/*': number
+// // };
+// type F1 =GetWildcardItems<{
+//     'a': string
+//     'b': number    
+//     'rooms/*/$join': number 
+//     'c': number    
+//     '*': string
+// }>
+// type F2 =GetNotWildcardItems<{
+//     'a': string
+//     'b': number    
+//     'rooms/*/$join': number 
+//     'c': number    
+//     '*': string
+// }>
+
+// type f1 = GetFirstMatchedItem<{
+//     'rooms/*/$join': number
+//     'rooms/a/$join': string
+// }>
+// type f2 = GetFirstMatchedItem<{
+//     'rooms/a/$join': string
+//     'rooms/*/$join': number    
+// }>
+
+// type f3 = GetFirstMatchedItem<{
+//     'rooms/a/$join': string
+//     'rooms/b/$join': number    
+//     'rooms/c/$join': number    
+//     '*': string
+// }>
+// type f4 = GetFirstMatchedItem<{
+//     'a': string
+//     'b': number    
+//     'c': number    
+//     '*': string
+// }>
+// type f5 = GetFirstMatchedItem<{
+//     'rooms/a/$join': string
+//     'rooms/b/$join': number    
+//     'rooms/c/$join': number    
+//     '*': string
+// }>
+// type f6 = GetFirstMatchedItem<{}>
diff --git a/packages/native/src/types/Keys.ts b/packages/native/src/types/Keys.ts
@@ -9,3 +9,4 @@ type LastOfUnion<T> = UnionToIntersection<T extends any ? (x: T) => 0 : never> e
 // 将联合类型转换为交叉类型
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 export type Keys<T extends Record<string, any>> = UnionToTuple<keyof T>;
+
diff --git a/packages/native/src/types/WildcardEvents.ts b/packages/native/src/types/WildcardEvents.ts
@@ -1,4 +1,4 @@
-import { FirstObjectItem } from './FirstObjectItem';
+import { Keys } from './Keys';
 
 // MergeUnion<{ a: 1 } | { b: 2 }> === { a: 1, b: 2 }
 export type MergeUnion<T> = (T extends any ? (x: T) => void : never) extends (x: infer U) => void ? { [K in keyof U]: U[K] } : never;
@@ -39,6 +39,9 @@ type Fallback<T, F> = [T] extends [never]
     ? F // 处理undefined情况
     : T; // 否则返回原类型
 
+  
+
+
 /**
  *
  * 返回所有匹配事件的类型
@@ -64,7 +67,65 @@ export type WildcardEvents<Events extends Record<string, any>, T extends string>
         }
     >
 >;
+
+
+/**
+ * 保留对象中第一项
+ */
+type FirstObjectItem<T extends Record<string, any>> = Pick<T, Keys<T> extends any[] ? Keys<T>[0] : never>;
+  
+type isEmpty<T extends Record<string, any>> = keyof T extends never ? true : false;
+// 获取所有Key包括通配符字符*的项
+type GetWildcardItems<T extends Record<string, any>> = {
+    [K in keyof T as K extends `${string}*${string}` ? K : K extends `*`  ? K : never]: T[K];
+}
+
+export type GetNotWildcardItems<T extends Record<string, any>> = {
+    [K in keyof T as K extends `${string}*${string}` ? never : K extends `*`  ? never : K]: T[K];
+}
+
+export type GetFirstMatchedItem<T extends Record<string, any>> =FirstObjectItem<isEmpty<GetNotWildcardItems<T>> extends true
+    ? GetWildcardItems<T>
+    : GetNotWildcardItems<T>>
+
+    
 // 只返回最相近匹配的事件类型
-export type ClosestWildcardEvents<Events extends Record<string, any>, T extends string> = FirstObjectItem<WildcardEvents<Events, T>>;
+export type ClosestWildcardEvents<Events extends Record<string, any>, T extends string> 
+= GetFirstMatchedItem<WildcardEvents<Events, T>>
+
+
+  
+
+
+
+// type  Events2 = ClosestWildcardEvents<{
+//     '$join': { room: string; welcome: string; users: string[] }
+//     '$leave': string
+//     '$error': string
+//     '$add': string
+//     '$remove': string
+//     '*': number
+// },'$join'>
+
+
+
+// type WebEvents = ClosestWildcardEvents<{
+//     'rooms/*/$join': { room: string; welcome: string; users: string[] }
+//     'rooms/*/$leave': string
+//     'rooms/*/$error': string
+//     'rooms/*/$add': string
+//     'rooms/*/$remove': string
+//     'rooms/*/*': number
+// },'rooms/*/$join'>
+
+
 
-type s = ClosestWildcardEvents<any, 'xxx'>;
+// type  Events = ClosestWildcardEvents<{
+//     '$join': { room: string; welcome: string; users: string[] }
+//     '$leave': string
+//     '$error': string
+//     '$add': string
+//     '$remove': string
+//     '*': number
+// },'$join'>
+   
