@xyo-network/module-abstract 2.52.0 → 2.53.0-rc.1

package/src/ModuleWrapper.ts

@@ -3,7 +3,7 @@ import { Account } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
 import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { BaseParams } from '@xyo-network/core'
+import { Base, BaseParams } from '@xyo-network/core'
 import { EventAnyListener, EventListener } from '@xyo-network/module-events'
 import {
   Module,
@@ -20,7 +20,6 @@ import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable, PromiseEx } from '@xyo-network/promise'
 import compact from 'lodash/compact'
 
-import { BaseEmitter } from './BaseEmitter'
 import { XyoError, XyoErrorSchema } from './Error'
 import { duplicateModules } from './lib'
 import { QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from './Query'
@@ -48,11 +47,13 @@ export type ModuleWrapperParams<TWrappedModule extends Module = Module> = BasePa
 
 @moduleConstructable()
 export class ModuleWrapper<TWrappedModule extends Module = Module>
-  extends BaseEmitter<TWrappedModule['params']>
-  implements Module<TWrappedModule['params']>
+  extends Base<TWrappedModule['params']>
+  implements Module<TWrappedModule['params'], TWrappedModule['eventData']>
 {
   static requiredQueries: string[] = [ModuleDiscoverQuerySchema]
 
+  eventData = {} as TWrappedModule['eventData']
+
   protected readonly wrapperParams: ModuleWrapperParams<TWrappedModule>
 
   constructor(params: ModuleWrapperParams<TWrappedModule>) {
@@ -126,7 +127,7 @@ export class ModuleWrapper<TWrappedModule extends Module = Module>
     return assertEx(this.tryWrap(module, account), 'Unable to wrap module as ModuleWrapper')
   }
 
-  override clearListeners(eventNames: keyof TWrappedModule['params']['eventData'] | keyof TWrappedModule['params']['eventData'][]) {
+  clearListeners(eventNames: Parameters<TWrappedModule['clearListeners']>[0]) {
     return this.module.clearListeners(eventNames)
   }
 
@@ -156,51 +157,42 @@ export class ModuleWrapper<TWrappedModule extends Module = Module>
     return this.sendQuery(queryPayload)
   }
 
-  override emit(
-    eventName: keyof TWrappedModule['params']['eventData'],
-    eventArgs?: TWrappedModule['params']['eventData'][keyof TWrappedModule['params']['eventData']],
-  ) {
+  emit(eventName: Parameters<TWrappedModule['emit']>[0], eventArgs: Parameters<TWrappedModule['emit']>[1]) {
     return this.module.emit(eventName, eventArgs)
   }
 
-  override emitSerial(
-    eventName: keyof TWrappedModule['params']['eventData'],
-    eventArgs?: TWrappedModule['params']['eventData'][keyof TWrappedModule['params']['eventData']],
-  ) {
+  emitSerial(eventName: Parameters<TWrappedModule['emitSerial']>[0], eventArgs: Parameters<TWrappedModule['emitSerial']>[1]) {
     return this.module.emitSerial(eventName, eventArgs)
   }
 
-  override listenerCount(eventNames: keyof TWrappedModule['params']['eventData'] | keyof TWrappedModule['params']['eventData'][]) {
+  listenerCount(eventNames: Parameters<TWrappedModule['listenerCount']>[0]) {
     return this.module.listenerCount(eventNames)
   }
 
-  override off(
-    eventNames: keyof TWrappedModule['params']['eventData'] | keyof TWrappedModule['params']['eventData'][],
-    listener: EventListener<TWrappedModule['params']['eventData']>,
+  off<TEventName extends keyof TWrappedModule['eventData']>(
+    eventNames: TEventName,
+    listener: EventListener<TWrappedModule['eventData'][TEventName]>,
   ) {
     return this.module.off(eventNames, listener)
   }
 
-  override offAny(listener: EventAnyListener<TWrappedModule['params']['eventData']>) {
+  offAny(listener: EventAnyListener) {
     return this.module.offAny(listener)
   }
 
-  override on(
-    eventNames: keyof TWrappedModule['params']['eventData'] | keyof TWrappedModule['params']['eventData'][],
-    listener: EventListener<TWrappedModule['params']['eventData']>,
-  ) {
+  on<TEventName extends keyof TWrappedModule['eventData']>(eventNames: TEventName, listener: EventListener<TWrappedModule['eventData'][TEventName]>) {
     return this.module.on(eventNames, listener)
   }
 
-  override onAny(listener: EventAnyListener<TWrappedModule['params']['eventData']>) {
+  onAny(listener: EventAnyListener) {
     return this.module.onAny(listener)
   }
 
-  override once(
-    eventNames: keyof TWrappedModule['params']['eventData'] | keyof TWrappedModule['params']['eventData'][],
-    listener: EventListener<TWrappedModule['params']['eventData']>,
+  once<TEventName extends keyof TWrappedModule['eventData']>(
+    eventName: TEventName,
+    listener: EventListener<TWrappedModule['eventData'][TEventName]>,
   ) {
-    return this.module.once(eventNames, listener)
+    return this.module.once(eventName, listener)
   }
 
   async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult> {