保存

src/events/impl/EventBuilderImpl.ts

@@ -13,12 +13,13 @@ export class EventBuilderImpl<Events extends IEventMap> implements IEventBuilder
    * @param eventName 事件名称
    * @param handler 监听器
    * @param options { immediate: 立即执行一次 immediateArgs: 立即执行的参数 once: 只监听一次 }
+   * @returns 返回一个 `unsubscribe` 函数，用于移除当前监听
    * @example
-   * eventBus.addEventListener('noArgs', () => {})
-   * eventBus.addEventListener('greet', name => {}, { immediate: true, immediateArgs: ['abc'] })
-   * eventBus.addEventListener('onResize', (w, h) => {}, { immediate: true, immediateArgs: [1, 2] })
+   * eventBus.subscribe('noArgs', () => {})
+   * eventBus.subscribe('greet', name => {}, { immediate: true, immediateArgs: ['abc'] })
+   * eventBus.subscribe('onResize', (w, h) => {}, { immediate: true, immediateArgs: [1, 2] })
    */
-  addEventListener<E extends keyof Events, F extends Events[E]>(
+  subscribe<E extends keyof Events, F extends Events[E]>(
     eventName: E,
     handler: F,
     options?: {
@@ -26,15 +27,16 @@ export class EventBuilderImpl<Events extends IEventMap> implements IEventBuilder
       immediateArgs?: Parameters<F>
       once?: boolean
     },
-  ) {
-    if (!handler) return
+  ): () => void {
+    if (!handler) return () => {}
     if (!this._eventHandlers.has(eventName)) {
       this._eventHandlers.set(eventName, new Set<HandlerWrapper<F>>())
     }
 
     const set = this._eventHandlers.get(eventName)!
+    const wrapper: HandlerWrapper<F> = { fn: handler, once: options?.once ?? false }
     if (![...set].some((wrapper) => wrapper.fn === handler)) {
-      set.add({ fn: handler, once: options?.once ?? false })
+      set.add(wrapper)
     }
 
     if (options?.immediate) {
@@ -44,6 +46,12 @@ export class EventBuilderImpl<Events extends IEventMap> implements IEventBuilder
         console.error(e)
       }
     }
+
+    return () => {
+      set.delete(wrapper)
+      // 如果该事件下无监听器，则删除集合
+      if (set.size === 0) this._eventHandlers.delete(eventName)
+    }
   }
 
   /**
@@ -51,9 +59,9 @@ export class EventBuilderImpl<Events extends IEventMap> implements IEventBuilder
    * @param eventName 事件名称
    * @param handler 监听器
    * @example
-   * eventBus.removeEventListener('noArgs', () => {})
+   * eventBus.remove('noArgs', () => {})
    */
-  removeEventListener<E extends keyof Events, F extends Events[E]>(eventName: E, handler: F) {
+  remove<E extends keyof Events, F extends Events[E]>(eventName: E, handler: F) {
     const set = this._eventHandlers.get(eventName)
     if (!set) return
 
@@ -62,6 +70,9 @@ export class EventBuilderImpl<Events extends IEventMap> implements IEventBuilder
         set.delete(wrapper)
       }
     }
+    if (set.size === 0) {
+      this._eventHandlers.delete(eventName)
+    }
   }
 
   /**
@@ -69,11 +80,11 @@ export class EventBuilderImpl<Events extends IEventMap> implements IEventBuilder
    * @param eventName 事件名称
    * @param args 参数
    * @example
-   * eventBus.notifyEvent('noArgs')
-   * eventBus.notifyEvent('greet', 'Alice')
-   * eventBus.notifyEvent('onResize', 1, 2)
+   * eventBus.notify('noArgs')
+   * eventBus.notify('greet', 'Alice')
+   * eventBus.notify('onResize', 1, 2)
    */
-  notifyEvent<E extends keyof Events, F extends Events[E]>(eventName: E, ...args: Parameters<F>) {
+  notify<E extends keyof Events, F extends Events[E]>(eventName: E, ...args: Parameters<F>) {
     if (!this._eventHandlers.has(eventName)) return
 
     const set = this._eventHandlers.get(eventName)!