@xyo-network/module-model 2.50.4 → 2.50.6

package/dist/esm/Events/EventArgs.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EventArgs.js.map

package/dist/esm/Events/EventArgs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventArgs.js","sourceRoot":"","sources":["../../../src/Events/EventArgs.ts"],"names":[],"mappings":""}

package/dist/esm/Events/EventListener.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EventListener.js.map

package/dist/esm/Events/EventListener.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventListener.js","sourceRoot":"","sources":["../../../src/Events/EventListener.ts"],"names":[],"mappings":""}

package/dist/esm/Events/ModuleEventEmitter.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ModuleEventEmitter.js.map

package/dist/esm/Events/ModuleEventEmitter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModuleEventEmitter.js","sourceRoot":"","sources":["../../../src/Events/ModuleEventEmitter.ts"],"names":[],"mappings":""}

package/dist/esm/Events/ModuleQueried.js

@@ -0,0 +1,2 @@
+export const ModuleQueriedEvent = 'moduleQueried';
+//# sourceMappingURL=ModuleQueried.js.map

package/dist/esm/Events/ModuleQueried.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModuleQueried.js","sourceRoot":"","sources":["../../../src/Events/ModuleQueried.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,kBAAkB,GAAuB,eAAe,CAAA"}

package/dist/esm/Events/index.js

@@ -0,0 +1,5 @@
+export * from './EventArgs';
+export * from './EventListener';
+export * from './ModuleEventEmitter';
+export * from './ModuleQueried';
+//# sourceMappingURL=index.js.map

package/dist/esm/Events/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Events/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA"}

package/dist/esm/index.js

@@ -1,4 +1,5 @@
 export * from './Config';
+export * from './Events';
 export * from './model';
 export * from './ModuleFilter';
 export * from './ModuleQueryResult';

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/dist/types/Events/EventArgs.d.ts

@@ -0,0 +1,4 @@
+import { AnyObject } from '@xyo-network/core';
+export type Event = string;
+export type EventArgs<Args extends AnyObject = AnyObject> = Args;
+//# sourceMappingURL=EventArgs.d.ts.map

package/dist/types/Events/EventArgs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventArgs.d.ts","sourceRoot":"","sources":["../../../src/Events/EventArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAE7C,MAAM,MAAM,KAAK,GAAG,MAAM,CAAA;AAE1B,MAAM,MAAM,SAAS,CAAC,IAAI,SAAS,SAAS,GAAG,SAAS,IAAI,IAAI,CAAA"}

package/dist/types/Events/EventListener.d.ts

@@ -0,0 +1,3 @@
+import { EventArgs } from './EventArgs';
+export type EventListener<T extends EventArgs = EventArgs> = (args: T) => void;
+//# sourceMappingURL=EventListener.d.ts.map

package/dist/types/Events/EventListener.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventListener.d.ts","sourceRoot":"","sources":["../../../src/Events/EventListener.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAA"}

package/dist/types/Events/ModuleEventEmitter.d.ts

@@ -0,0 +1,7 @@
+import { EventArgs } from './EventArgs';
+import { EventListener } from './EventListener';
+export type EventEmitterFunc<TResult, TEvent extends string = never, TEventArgs extends EventArgs = EventArgs> = (event: TEvent, handler: EventListener<TEventArgs>) => TResult;
+export interface ModuleEventEmitter<TEvent extends string = never, TEventArgs extends EventArgs = EventArgs> {
+    on: EventEmitterFunc<this, TEvent, TEventArgs>;
+}
+//# sourceMappingURL=ModuleEventEmitter.d.ts.map

package/dist/types/Events/ModuleEventEmitter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModuleEventEmitter.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleEventEmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,MAAM,gBAAgB,CAAC,OAAO,EAAE,MAAM,SAAS,MAAM,GAAG,KAAK,EAAE,UAAU,SAAS,SAAS,GAAG,SAAS,IAAI,CAC/G,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,KAC/B,OAAO,CAAA;AAEZ,MAAM,WAAW,kBAAkB,CAAC,MAAM,SAAS,MAAM,GAAG,KAAK,EAAE,UAAU,SAAS,SAAS,GAAG,SAAS;IACzG,EAAE,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;CAC/C"}

package/dist/types/Events/ModuleQueried.d.ts

@@ -0,0 +1,21 @@
+import { XyoBoundWitness } from '@xyo-network/boundwitness-model';
+import { AnyObject } from '@xyo-network/core';
+import { XyoPayload } from '@xyo-network/payload-model';
+import { Module } from '../model';
+import { XyoQueryBoundWitness } from '../Query';
+import { EventArgs } from './EventArgs';
+import { ModuleEventEmitter } from './ModuleEventEmitter';
+export type ModuleQueriedEvent = 'moduleQueried';
+export declare const ModuleQueriedEvent: ModuleQueriedEvent;
+export type ModuleEventArgs<TArgs extends AnyObject | undefined = undefined> = TArgs extends AnyObject ? EventArgs<{
+    module: Module;
+} & TArgs> : EventArgs<{
+    module: Module;
+}>;
+export type ModuleQueriedEventArgs = ModuleEventArgs<{
+    payloads?: XyoPayload[];
+    query: XyoQueryBoundWitness;
+    result: [XyoBoundWitness, XyoPayload[]];
+}>;
+export type ModuleQueriedEventEmitter = ModuleEventEmitter<ModuleQueriedEvent, ModuleQueriedEventArgs>;
+//# sourceMappingURL=ModuleQueried.d.ts.map

package/dist/types/Events/ModuleQueried.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModuleQueried.d.ts","sourceRoot":"","sources":["../../../src/Events/ModuleQueried.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,MAAM,kBAAkB,GAAG,eAAe,CAAA;AAChD,eAAO,MAAM,kBAAkB,EAAE,kBAAoC,CAAA;AAErE,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IAAI,KAAK,SAAS,SAAS,GAClG,SAAS,CACP;IACE,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,KAAK,CACV,GACD,SAAS,CAAC;IACR,MAAM,EAAE,MAAM,CAAA;CACf,CAAC,CAAA;AAEN,MAAM,MAAM,sBAAsB,GAAG,eAAe,CAAC;IACnD,QAAQ,CAAC,EAAE,UAAU,EAAE,CAAA;IACvB,KAAK,EAAE,oBAAoB,CAAA;IAC3B,MAAM,EAAE,CAAC,eAAe,EAAE,UAAU,EAAE,CAAC,CAAA;CACxC,CAAC,CAAA;AAEF,MAAM,MAAM,yBAAyB,GAAG,kBAAkB,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAA"}

package/dist/types/Events/index.d.ts

@@ -0,0 +1,5 @@
+export * from './EventArgs';
+export * from './EventListener';
+export * from './ModuleEventEmitter';
+export * from './ModuleQueried';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/Events/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Events/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,sBAAsB,CAAA;AACpC,cAAc,iBAAiB,CAAA"}

package/dist/types/index.d.ts

@@ -1,4 +1,5 @@
 export * from './Config';
+export * from './Events';
 export * from './model';
 export * from './ModuleFilter';
 export * from './ModuleQueryResult';

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/dist/types/model/Module.d.ts

@@ -1,6 +1,7 @@
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { ModuleConfig } from '../Config';
+import { ModuleEventEmitter, ModuleQueriedEventEmitter } from '../Events';
 import { ModuleFilter } from '../ModuleFilter';
 import { ModuleQueryResult } from '../ModuleQueryResult';
 import { XyoQueryBoundWitness } from '../Query';
@@ -10,10 +11,11 @@ export interface ModuleResolver {
     removeResolver: (resolver: ModuleResolver) => this;
     resolve<T extends Module = Module>(filter?: ModuleFilter): Promisable<T[]>;
 }
-export type Module<TConfig extends ModuleConfig = ModuleConfig> = {
+export type Module<TConfig extends ModuleConfig = ModuleConfig, TModuleEventEmitter extends ModuleEventEmitter | undefined = undefined> = {
     address: string;
     config: TConfig;
     readonly downResolver: ModuleResolver;
+    on: TModuleEventEmitter extends ModuleEventEmitter ? ModuleQueriedEventEmitter['on'] | TModuleEventEmitter['on'] : ModuleQueriedEventEmitter['on'];
     queries: string[];
     query: <T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(query: T, payloads?: XyoPayload[], queryConfig?: TConf) => Promisable<ModuleQueryResult>;
     queryable: <T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(query: T, payloads?: XyoPayload[], queryConfig?: TConf) => Promisable<boolean>;

package/dist/types/model/Module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../../src/model/Module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAE/C,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAA;IAC/C,gBAAgB,EAAE,OAAO,CAAA;IACzB,cAAc,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAA;IAClD,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAA;CAC3E;AAED,MAAM,MAAM,MAAM,CAAC,OAAO,SAAS,YAAY,GAAG,YAAY,IAAI;IAChE,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IAGf,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAA;IAErC,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,KAAK,EAAE,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,SAAS,YAAY,GAAG,YAAY,EACtG,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,KAAK,KAChB,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAClC,SAAS,EAAE,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,SAAS,YAAY,GAAG,YAAY,EAC1G,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,KAAK,KAChB,UAAU,CAAC,OAAO,CAAC,CAAA;IAIxB,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAA;CACpC,CAAA"}
+{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../../src/model/Module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAE/C,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAA;IAC/C,gBAAgB,EAAE,OAAO,CAAA;IACzB,cAAc,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAA;IAClD,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC,CAAC,EAAE,CAAC,CAAA;CAC3E;AAED,MAAM,MAAM,MAAM,CAAC,OAAO,SAAS,YAAY,GAAG,YAAY,EAAE,mBAAmB,SAAS,kBAAkB,GAAG,SAAS,GAAG,SAAS,IAAI;IACxI,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IAGf,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAA;IAErC,EAAE,EAAE,mBAAmB,SAAS,kBAAkB,GAAG,yBAAyB,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAA;IAElJ,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,KAAK,EAAE,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,SAAS,YAAY,GAAG,YAAY,EACtG,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,KAAK,KAChB,UAAU,CAAC,iBAAiB,CAAC,CAAA;IAClC,SAAS,EAAE,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,SAAS,YAAY,GAAG,YAAY,EAC1G,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,KAAK,KAChB,UAAU,CAAC,OAAO,CAAC,CAAA;IAIxB,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAA;CACpC,CAAA"}

package/package.json

@@ -10,14 +10,14 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/boundwitness-model": "^2.50.4",
-    "@xyo-network/core": "^2.50.4",
-    "@xyo-network/payload-model": "^2.50.4",
-    "@xyo-network/promise": "^2.50.4"
+    "@xyo-network/boundwitness-model": "^2.50.6",
+    "@xyo-network/core": "^2.50.6",
+    "@xyo-network/payload-model": "^2.50.6",
+    "@xyo-network/promise": "^2.50.6"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.16.0-rc.2",
-    "@xylabs/tsconfig": "^2.16.0-rc.2",
+    "@xylabs/ts-scripts-yarn3": "^2.16.0",
+    "@xylabs/tsconfig": "^2.16.0",
     "typescript": "^4.9.5"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -53,5 +53,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.50.4"
+  "version": "2.50.6"
 }

package/src/Events/EventArgs.ts

@@ -0,0 +1,5 @@
+import { AnyObject } from '@xyo-network/core'
+
+export type Event = string
+
+export type EventArgs<Args extends AnyObject = AnyObject> = Args

package/src/Events/EventListener.ts

@@ -0,0 +1,3 @@
+import { EventArgs } from './EventArgs'
+
+export type EventListener<T extends EventArgs = EventArgs> = (args: T) => void

package/src/Events/ModuleEventEmitter.ts

@@ -0,0 +1,11 @@
+import { EventArgs } from './EventArgs'
+import { EventListener } from './EventListener'
+
+export type EventEmitterFunc<TResult, TEvent extends string = never, TEventArgs extends EventArgs = EventArgs> = (
+  event: TEvent,
+  handler: EventListener<TEventArgs>,
+) => TResult
+
+export interface ModuleEventEmitter<TEvent extends string = never, TEventArgs extends EventArgs = EventArgs> {
+  on: EventEmitterFunc<this, TEvent, TEventArgs>
+}

package/src/Events/ModuleQueried.ts

@@ -0,0 +1,29 @@
+import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
+import { AnyObject } from '@xyo-network/core'
+import { XyoPayload } from '@xyo-network/payload-model'
+
+import { Module } from '../model'
+import { XyoQueryBoundWitness } from '../Query'
+import { EventArgs } from './EventArgs'
+import { ModuleEventEmitter } from './ModuleEventEmitter'
+
+export type ModuleQueriedEvent = 'moduleQueried'
+export const ModuleQueriedEvent: ModuleQueriedEvent = 'moduleQueried'
+
+export type ModuleEventArgs<TArgs extends AnyObject | undefined = undefined> = TArgs extends AnyObject
+  ? EventArgs<
+      {
+        module: Module
+      } & TArgs
+    >
+  : EventArgs<{
+      module: Module
+    }>
+
+export type ModuleQueriedEventArgs = ModuleEventArgs<{
+  payloads?: XyoPayload[]
+  query: XyoQueryBoundWitness
+  result: [XyoBoundWitness, XyoPayload[]]
+}>
+
+export type ModuleQueriedEventEmitter = ModuleEventEmitter<ModuleQueriedEvent, ModuleQueriedEventArgs>

package/src/Events/index.ts

@@ -0,0 +1,4 @@
+export * from './EventArgs'
+export * from './EventListener'
+export * from './ModuleEventEmitter'
+export * from './ModuleQueried'

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from './Config'
+export * from './Events'
 export * from './model'
 export * from './ModuleFilter'
 export * from './ModuleQueryResult'

package/src/model/Module.ts

@@ -2,6 +2,7 @@ import { XyoPayload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 import { ModuleConfig } from '../Config'
+import { ModuleEventEmitter, ModuleQueriedEventEmitter } from '../Events'
 import { ModuleFilter } from '../ModuleFilter'
 import { ModuleQueryResult } from '../ModuleQueryResult'
 import { XyoQueryBoundWitness } from '../Query'
@@ -13,13 +14,15 @@ export interface ModuleResolver {
   resolve<T extends Module = Module>(filter?: ModuleFilter): Promisable<T[]>
 }
 
-export type Module<TConfig extends ModuleConfig = ModuleConfig> = {
+export type Module<TConfig extends ModuleConfig = ModuleConfig, TModuleEventEmitter extends ModuleEventEmitter | undefined = undefined> = {
   address: string
   config: TConfig
 
   /* The resolver is a 'down' resolver.  It can resolve the module or any children (if it is a node for example), that are in the module*/
   readonly downResolver: ModuleResolver
 
+  on: TModuleEventEmitter extends ModuleEventEmitter ? ModuleQueriedEventEmitter['on'] | TModuleEventEmitter['on'] : ModuleQueriedEventEmitter['on']
+
   queries: string[]
   query: <T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(
     query: T,