@xyo-network/witness 2.52.1 → 2.53.0

package/dist/esm/AbstractWitness.js

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert';
 import { Account } from '@xyo-network/account';
-import { AbstractModule, QueryBoundWitnessWrapper, XyoErrorBuilder, } from '@xyo-network/module';
+import { AbstractModule, QueryBoundWitnessWrapper, XyoErrorBuilder } from '@xyo-network/module';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { XyoWitnessConfigSchema } from './Config';
 import { XyoWitnessObserveQuerySchema } from './Queries';
@@ -30,9 +30,9 @@ export class AbstractWitness extends AbstractModule {
         try {
             switch (typedQuery.schema) {
                 case XyoWitnessObserveQuerySchema: {
-                    await this.emit('reportStart', { inPayloads: payloads });
+                    await this.emit('reportStart', { inPayloads: payloads, module: this });
                     const resultPayloads = await this.observe(filteredObservation);
-                    await this.emit('reportEnd', { inPayloads: payloads, outPayloads: resultPayloads });
+                    await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads });
                     return this.bindResult(resultPayloads, queryAccount);
                 }
                 default: {

package/dist/esm/AbstractWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EACL,cAAc,EAId,wBAAwB,EACxB,eAAe,GAEhB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAG7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACjD,OAAO,EAAE,4BAA4B,EAAmB,MAAM,WAAW,CAAA;AAGzE,MAAM,OAAO,eAA+D,SAAQ,cAAuB;IACzG,MAAM,CAAU,YAAY,GAAW,sBAAsB,CAAA;IAE7D,IAAa,OAAO;QAClB,OAAO,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;IAC/B,CAAC;IAED,OAAO,CAAC,QAAuB;QAC7B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAA;QACnE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,8BAA8B,CAAC,CAAA;QAChE,WAAW,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAA;QACtF,uEAAuE;QACvE,OAAO,WAAW,CAAA;IACpB,CAAC;IAEQ,KAAK,CAAC,KAAK,CAClB,KAAQ,EACR,QAAuB,EACvB,WAAqB;QAErB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAkB,KAAK,EAAE,QAAQ,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;QACxC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACtD,kFAAkF;QAClF,MAAM,mBAAmB,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QACrG,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAA;QAClC,IAAI;YACF,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,4BAA4B,CAAC,CAAC;oBACjC,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAA;oBACxD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;oBAC9D,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAA;oBACnF,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;iBACrD;gBACD,OAAO,CAAC,CAAC;oBACP,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;iBACpC;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;SACnG;IACH,CAAC"}
+{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAmC,wBAAwB,EAAE,eAAe,EAAwB,MAAM,qBAAqB,CAAA;AAEtJ,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAG7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACjD,OAAO,EAAE,4BAA4B,EAAmB,MAAM,WAAW,CAAA;AAGzE,MAAM,OAAO,eAA+D,SAAQ,cAA+C;IACjI,MAAM,CAAU,YAAY,GAAW,sBAAsB,CAAA;IAE7D,IAAa,OAAO;QAClB,OAAO,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;IAC/B,CAAC;IAED,OAAO,CAAC,QAAuB;QAC7B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAA;QACnE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,8BAA8B,CAAC,CAAA;QAChE,WAAW,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAA;QACtF,uEAAuE;QACvE,OAAO,WAAW,CAAA;IACpB,CAAC;IAEQ,KAAK,CAAC,KAAK,CAClB,KAAQ,EACR,QAAuB,EACvB,WAAqB;QAErB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAkB,KAAK,EAAE,QAAQ,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;QACxC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACtD,kFAAkF;QAClF,MAAM,mBAAmB,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QACrG,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAA;QAClC,IAAI;YACF,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,4BAA4B,CAAC,CAAC;oBACjC,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;oBACtE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;oBAC9D,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAA;oBACjG,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;iBACrD;gBACD,OAAO,CAAC,CAAC;oBACP,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;iBACpC;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;SACnG;IACH,CAAC"}

package/dist/types/AbstractWitness.d.ts

@@ -1,8 +1,8 @@
-import { AbstractModule, Module, ModuleConfig, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
+import { AbstractModule, ModuleConfig, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
-import { WitnessModule, WitnessParams } from './Witness';
-export declare class AbstractWitness<TParams extends WitnessParams = WitnessParams> extends AbstractModule<TParams> implements WitnessModule, Module {
+import { WitnessModuleEventData, WitnessParams } from './Witness';
+export declare class AbstractWitness<TParams extends WitnessParams = WitnessParams> extends AbstractModule<TParams, WitnessModuleEventData> {
     static configSchema: string;
     get queries(): string[];
     get targetSet(): (import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/payload-model").PayloadSet & {

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,MAAM,EACN,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAIjD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAExD,qBAAa,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,aAAa,EAAE,MAAM;IAC1I,OAAgB,YAAY,EAAE,MAAM,CAAyB;IAE7D,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;IAED,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAS3C,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACrH,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAwB9B"}
+{"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAA6C,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACtJ,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAIjD,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEjE,qBAAa,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,cAAc,CAAC,OAAO,EAAE,sBAAsB,CAAC;IACjI,OAAgB,YAAY,EAAE,MAAM,CAAyB;IAE7D,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;IAED,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAS3C,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EACrH,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;CAwB9B"}

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

@@ -2,8 +2,8 @@ import { EventData, ModuleEventArgs } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 export type WitnessReportEndEventArgs = ModuleEventArgs<{
     errors?: Error[];
-    inPayload?: XyoPayload[];
-    outPayload?: XyoPayload[];
+    inPayloads?: XyoPayload[];
+    outPayloads?: XyoPayload[];
 }>;
 export interface WitnessReportEndEventData extends EventData {
     reportEnd: WitnessReportEndEventArgs;

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

@@ -1 +1 @@
-{"version":3,"file":"ReportEnd.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportEnd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,yBAAyB,GAAG,eAAe,CAAC;IACtD,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,SAAS,CAAC,EAAE,UAAU,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,UAAU,EAAE,CAAA;CAC1B,CAAC,CAAA;AAEF,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,SAAS,EAAE,yBAAyB,CAAA;CACrC"}
+{"version":3,"file":"ReportEnd.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportEnd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,yBAAyB,GAAG,eAAe,CAAC;IACtD,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,UAAU,EAAE,CAAA;IACzB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAA;CAC3B,CAAC,CAAA;AAEF,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,SAAS,EAAE,yBAAyB,CAAA;CACrC"}

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

@@ -1,7 +1,7 @@
 import { EventData, ModuleEventArgs } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload-model';
 export type WitnessReportStartEventArgs = ModuleEventArgs<{
-    inPayload?: XyoPayload[];
+    inPayloads?: XyoPayload[];
 }>;
 export interface WitnessReportStartEventData extends EventData {
     reportStart: WitnessReportStartEventArgs;

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

@@ -1 +1 @@
-{"version":3,"file":"ReportStart.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportStart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,2BAA2B,GAAG,eAAe,CAAC;IACxD,SAAS,CAAC,EAAE,UAAU,EAAE,CAAA;CACzB,CAAC,CAAA;AAEF,MAAM,WAAW,2BAA4B,SAAQ,SAAS;IAC5D,WAAW,EAAE,2BAA2B,CAAA;CACzC"}
+{"version":3,"file":"ReportStart.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportStart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,2BAA2B,GAAG,eAAe,CAAC;IACxD,UAAU,CAAC,EAAE,UAAU,EAAE,CAAA;CAC1B,CAAC,CAAA;AAEF,MAAM,WAAW,2BAA4B,SAAQ,SAAS;IAC5D,WAAW,EAAE,2BAA2B,CAAA;CACzC"}

package/dist/types/Witness.d.ts

@@ -9,6 +9,6 @@ export interface Witness {
 }
 export interface WitnessModuleEventData extends WitnessReportEndEventData, WitnessReportStartEventData, ModuleEventData {
 }
-export type WitnessParams<TConfig extends AnyConfigSchema<XyoWitnessConfig> = AnyConfigSchema<XyoWitnessConfig>, TEventData extends WitnessModuleEventData = WitnessModuleEventData, TAdditionalParams extends AnyObject | undefined = undefined> = ModuleParams<TConfig, TEventData, TAdditionalParams>;
-export type WitnessModule<TParams extends WitnessParams = WitnessParams> = Witness & Module<TParams>;
+export type WitnessParams<TConfig extends AnyConfigSchema<XyoWitnessConfig> = AnyConfigSchema<XyoWitnessConfig>, TAdditionalParams extends AnyObject | undefined = undefined> = ModuleParams<TConfig, TAdditionalParams>;
+export type WitnessModule<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData> = Witness & Module<TParams, TEventData>;
 //# sourceMappingURL=Witness.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEjF,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA;CAC/D;AAED,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB,EAAE,2BAA2B,EAAE,eAAe;CAAG;AAE1H,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,eAAe,CAAC,gBAAgB,CAAC,GAAG,eAAe,CAAC,gBAAgB,CAAC,EACrF,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,EAClE,iBAAiB,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACzD,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAA;AAExD,MAAM,MAAM,aAAa,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEjF,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC,CAAA;CAC/D;AAED,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB,EAAE,2BAA2B,EAAE,eAAe;CAAG;AAE1H,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,eAAe,CAAC,gBAAgB,CAAC,GAAG,eAAe,CAAC,gBAAgB,CAAC,EACrF,iBAAiB,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IACzD,YAAY,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AAE5C,MAAM,MAAM,aAAa,CACvB,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,IAChE,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA"}

package/package.json

@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.4",
-    "@xyo-network/account": "^2.52.1",
-    "@xyo-network/account-model": "^2.52.1",
-    "@xyo-network/core": "^2.52.1",
-    "@xyo-network/module": "^2.52.1",
-    "@xyo-network/module-model": "^2.52.1",
-    "@xyo-network/payload-model": "^2.52.1",
-    "@xyo-network/payload-wrapper": "^2.52.1",
-    "@xyo-network/promise": "^2.52.1"
+    "@xyo-network/account": "^2.53.0",
+    "@xyo-network/account-model": "^2.53.0",
+    "@xyo-network/core": "^2.53.0",
+    "@xyo-network/module": "^2.53.0",
+    "@xyo-network/module-model": "^2.53.0",
+    "@xyo-network/payload-model": "^2.53.0",
+    "@xyo-network/payload-wrapper": "^2.53.0",
+    "@xyo-network/promise": "^2.53.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.16.1",
@@ -58,5 +58,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.52.1"
+  "version": "2.53.0"
 }

package/src/AbstractWitness.ts

@@ -1,23 +1,15 @@
 import { assertEx } from '@xylabs/assert'
 import { Account } from '@xyo-network/account'
-import {
-  AbstractModule,
-  Module,
-  ModuleConfig,
-  ModuleQueryResult,
-  QueryBoundWitnessWrapper,
-  XyoErrorBuilder,
-  XyoQueryBoundWitness,
-} from '@xyo-network/module'
+import { AbstractModule, ModuleConfig, ModuleQueryResult, QueryBoundWitnessWrapper, XyoErrorBuilder, XyoQueryBoundWitness } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable } from '@xyo-network/promise'
 
 import { XyoWitnessConfigSchema } from './Config'
 import { XyoWitnessObserveQuerySchema, XyoWitnessQuery } from './Queries'
-import { WitnessModule, WitnessParams } from './Witness'
+import { WitnessModuleEventData, WitnessParams } from './Witness'
 
-export class AbstractWitness<TParams extends WitnessParams = WitnessParams> extends AbstractModule<TParams> implements WitnessModule, Module {
+export class AbstractWitness<TParams extends WitnessParams = WitnessParams> extends AbstractModule<TParams, WitnessModuleEventData> {
   static override configSchema: string = XyoWitnessConfigSchema
 
   override get queries(): string[] {
@@ -51,9 +43,9 @@ export class AbstractWitness<TParams extends WitnessParams = WitnessParams> exte
     try {
       switch (typedQuery.schema) {
         case XyoWitnessObserveQuerySchema: {
-          await this.emit('reportStart', { inPayloads: payloads })
+          await this.emit('reportStart', { inPayloads: payloads, module: this })
           const resultPayloads = await this.observe(filteredObservation)
-          await this.emit('reportEnd', { inPayloads: payloads, outPayloads: resultPayloads })
+          await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
           return this.bindResult(resultPayloads, queryAccount)
         }
         default: {

package/src/Events/ReportEnd.ts

@@ -3,8 +3,8 @@ import { XyoPayload } from '@xyo-network/payload-model'
 
 export type WitnessReportEndEventArgs = ModuleEventArgs<{
   errors?: Error[]
-  inPayload?: XyoPayload[]
-  outPayload?: XyoPayload[]
+  inPayloads?: XyoPayload[]
+  outPayloads?: XyoPayload[]
 }>
 
 export interface WitnessReportEndEventData extends EventData {

package/src/Events/ReportStart.ts

@@ -2,7 +2,7 @@ import { EventData, ModuleEventArgs } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload-model'
 
 export type WitnessReportStartEventArgs = ModuleEventArgs<{
-  inPayload?: XyoPayload[]
+  inPayloads?: XyoPayload[]
 }>
 
 export interface WitnessReportStartEventData extends EventData {

package/src/Witness.ts

@@ -14,8 +14,10 @@ export interface WitnessModuleEventData extends WitnessReportEndEventData, Witne
 
 export type WitnessParams<
   TConfig extends AnyConfigSchema<XyoWitnessConfig> = AnyConfigSchema<XyoWitnessConfig>,
-  TEventData extends WitnessModuleEventData = WitnessModuleEventData,
   TAdditionalParams extends AnyObject | undefined = undefined,
-> = ModuleParams<TConfig, TEventData, TAdditionalParams>
+> = ModuleParams<TConfig, TAdditionalParams>
 
-export type WitnessModule<TParams extends WitnessParams = WitnessParams> = Witness & Module<TParams>
+export type WitnessModule<
+  TParams extends WitnessParams = WitnessParams,
+  TEventData extends WitnessModuleEventData = WitnessModuleEventData,
+> = Witness & Module<TParams, TEventData>