@xyo-network/module-model 2.53.0 → 2.53.2

package/dist/esm/index.js

@@ -2,10 +2,8 @@ export * from './Config';
 export * from './CreatableModule';
 export * from './Module';
 export * from './ModuleDescription';
-export * from './ModuleEventArgs';
 export * from './ModuleFilter';
 export * from './ModuleParams';
-export * from './ModuleQueried';
 export * from './ModuleQueryResult';
 export * from './ModuleRepository';
 export * from './Queries';

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,mBAAmB,CAAA;AACjC,cAAc,UAAU,CAAA;AACxB,cAAc,qBAAqB,CAAA;AACnC,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,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,mBAAmB,CAAA;AACjC,cAAc,UAAU,CAAA;AACxB,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/dist/types/Config.d.ts

@@ -1,13 +1,13 @@
 import { WithAdditional } from '@xyo-network/core';
-import { XyoPayload } from '@xyo-network/payload-model';
+import { Payload } from '@xyo-network/payload-model';
 export type ModuleConfigSchema = 'network.xyo.module.config';
 export declare const ModuleConfigSchema: ModuleConfigSchema;
 export type AddressString = string;
 export type CosigningAddressSet = string[];
 export type SchemaString = string;
-export type ModuleConfigBase<TConfig extends XyoPayload | undefined = undefined> = XyoPayload<WithAdditional<{
+export type ModuleConfigBase<TConfig extends Payload | undefined = undefined> = Payload<WithAdditional<{
     name?: string;
-    schema: TConfig extends XyoPayload ? TConfig['schema'] : ModuleConfigSchema;
+    schema: TConfig extends Payload ? TConfig['schema'] : ModuleConfigSchema;
     security?: {
         allowAnonymous?: boolean;
         allowed?: Record<SchemaString, (AddressString | CosigningAddressSet)[]>;
@@ -15,5 +15,5 @@ export type ModuleConfigBase<TConfig extends XyoPayload | undefined = undefined>
     };
     storeQueries?: boolean;
 }, Omit<TConfig, 'schema'>>>;
-export type ModuleConfig<TConfig extends XyoPayload | undefined = undefined> = ModuleConfigBase<TConfig>;
+export type ModuleConfig<TConfig extends Payload | undefined = undefined> = ModuleConfigBase<TConfig>;
 //# sourceMappingURL=Config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,kBAAkB,GAAG,2BAA2B,CAAA;AAC5D,eAAO,MAAM,kBAAkB,EAAE,kBAAgD,CAAA;AAEjF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAA;AAClC,MAAM,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAA;AAC1C,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA;AAEjC,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,UAAU,GAAG,SAAS,GAAG,SAAS,IAAI,UAAU,CAC3F,cAAc,CACZ;IAEE,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,MAAM,EAAE,OAAO,SAAS,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAA;IAG3E,QAAQ,CAAC,EAAE;QAET,cAAc,CAAC,EAAE,OAAO,CAAA;QAGxB,OAAO,CAAC,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,aAAa,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAGvE,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAA;KACnD,CAAA;IAGD,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,EACD,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CACxB,CACF,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,UAAU,GAAG,SAAS,GAAG,SAAS,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,kBAAkB,GAAG,2BAA2B,CAAA;AAC5D,eAAO,MAAM,kBAAkB,EAAE,kBAAgD,CAAA;AAEjF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAA;AAClC,MAAM,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAA;AAC1C,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA;AAEjC,MAAM,MAAM,gBAAgB,CAAC,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,IAAI,OAAO,CACrF,cAAc,CACZ;IAEE,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,MAAM,EAAE,OAAO,SAAS,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAA;IAGxE,QAAQ,CAAC,EAAE;QAET,cAAc,CAAC,EAAE,OAAO,CAAA;QAGxB,OAAO,CAAC,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,aAAa,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAGvE,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAA;KACnD,CAAA;IAGD,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,EACD,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CACxB,CACF,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAA"}

package/dist/types/Module.d.ts

@@ -1,10 +1,10 @@
-import { EventFunctions } from '@xyo-network/module-events';
-import { XyoPayload } from '@xyo-network/payload-model';
+import { BoundWitness } from '@xyo-network/boundwitness-model';
+import { EventArgs, EventData, EventFunctions } from '@xyo-network/module-events';
+import { Payload } from '@xyo-network/payload-model';
 import { Promisable } from '@xyo-network/promise';
 import { ModuleConfig } from './Config';
 import { ModuleFilter } from './ModuleFilter';
 import { AnyConfigSchema, ModuleParams } from './ModuleParams';
-import { ModuleEventData } from './ModuleQueried';
 import { ModuleQueryResult } from './ModuleQueryResult';
 import { XyoQueryBoundWitness } from './Query';
 export interface ModuleResolver {
@@ -13,14 +13,27 @@ export interface ModuleResolver {
     removeResolver: (resolver: ModuleResolver) => this;
     resolve<T extends Module = Module>(filter?: ModuleFilter): Promisable<T[]>;
 }
+export type ModuleEventArgs<TModule extends Module = Module, TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs ? {
+    module: TModule;
+} & TArgs : {
+    module: TModule;
+};
+export type ModuleQueriedEventArgs = ModuleEventArgs<Module, {
+    payloads?: Payload[];
+    query: XyoQueryBoundWitness;
+    result: [BoundWitness, Payload[]];
+}>;
+export interface ModuleEventData extends EventData {
+    moduleQueried: ModuleQueriedEventArgs;
+}
 export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>> = {
     address: string;
     config: TParams['config'];
     readonly downResolver: ModuleResolver;
     params: TParams;
     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>;
+    query: <T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConf) => Promisable<ModuleQueryResult>;
+    queryable: <T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConf) => Promisable<boolean>;
     start?: () => Promisable<void>;
     readonly upResolver: ModuleResolver;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../src/Module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAE9C,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,YAAY,CAAC,OAAO,SAAS,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,IAAI;IACpI,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;IAGzB,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAA;IAErC,MAAM,EAAE,OAAO,CAAA;IAEf,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;IAExB,KAAK,CAAC,EAAE,MAAM,UAAU,CAAC,IAAI,CAAC,CAAA;IAI9B,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAA;CACpC,CAAA;AAED,MAAM,MAAM,MAAM,CAChB,OAAO,SAAS,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,GAAG,YAAY,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,EACzG,UAAU,SAAS,eAAe,GAAG,eAAe,IAClD,YAAY,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA"}
+{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../src/Module.ts"],"names":[],"mappings":"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"}

package/dist/types/ModuleQueryResult.d.ts

@@ -1,4 +1,4 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model';
-import { XyoPayload } from '@xyo-network/payload-model';
-export type ModuleQueryResult<T extends XyoPayload = XyoPayload> = [XyoBoundWitness, T[]];
+import { BoundWitness } from '@xyo-network/boundwitness-model';
+import { Payload } from '@xyo-network/payload-model';
+export type ModuleQueryResult<T extends Payload = Payload> = [BoundWitness, T[]];
 //# sourceMappingURL=ModuleQueryResult.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleQueryResult.d.ts","sourceRoot":"","sources":["../../src/ModuleQueryResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC,CAAA"}
+{"version":3,"file":"ModuleQueryResult.d.ts","sourceRoot":"","sources":["../../src/ModuleQueryResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,CAAA"}

package/dist/types/Query/Payload.d.ts

@@ -1,4 +1,4 @@
-import { XyoPayload } from '@xyo-network/payload-model';
+import { Payload } from '@xyo-network/payload-model';
 export interface XyoQueryFields {
     /** @field The addresses of the intended handlers */
     address?: string | [string];
@@ -9,5 +9,5 @@ export interface XyoQueryFields {
     /** @field The starting point for the bidding on the query */
     minBid?: number;
 }
-export type XyoQuery<T extends XyoPayload | void = void> = T extends XyoPayload ? XyoPayload<T & XyoQueryFields> : XyoPayload<XyoQueryFields>;
+export type XyoQuery<T extends Payload | void = void> = T extends Payload ? Payload<T & XyoQueryFields> : Payload<XyoQueryFields>;
 //# sourceMappingURL=Payload.d.ts.map

package/dist/types/Query/Payload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,CAAA;IAE3B,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;IAExF,6DAA6D;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,UAAU,GAAG,UAAU,CAAC,CAAC,GAAG,cAAc,CAAC,GAAG,UAAU,CAAC,cAAc,CAAC,CAAA"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,WAAW,cAAc;IAC7B,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,CAAA;IAE3B,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;IAExF,6DAA6D;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,OAAO,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA"}

package/dist/types/Query/XyoQueryBoundWitness.d.ts

@@ -1,7 +1,7 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model';
+import { BoundWitness } from '@xyo-network/boundwitness-model';
 export type XyoQueryBoundWitnessSchema = 'network.xyo.boundwitness';
 export declare const XyoQueryBoundWitnessSchema: XyoQueryBoundWitnessSchema;
-export type XyoQueryBoundWitness = XyoBoundWitness<{
+export type XyoQueryBoundWitness = BoundWitness<{
     query: string;
     resultSet?: string;
     schema: XyoQueryBoundWitnessSchema;

package/dist/types/Query/XyoQueryBoundWitness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoQueryBoundWitness.d.ts","sourceRoot":"","sources":["../../../src/Query/XyoQueryBoundWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAEjE,MAAM,MAAM,0BAA0B,GAAG,0BAA0B,CAAA;AACnE,eAAO,MAAM,0BAA0B,EAAE,0BAAuD,CAAA;AAEhG,MAAM,MAAM,oBAAoB,GAAG,eAAe,CAAC;IACjD,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,0BAA0B,CAAA;CACnC,CAAC,CAAA"}
+{"version":3,"file":"XyoQueryBoundWitness.d.ts","sourceRoot":"","sources":["../../../src/Query/XyoQueryBoundWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE9D,MAAM,MAAM,0BAA0B,GAAG,0BAA0B,CAAA;AACnE,eAAO,MAAM,0BAA0B,EAAE,0BAAuD,CAAA;AAEhG,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC;IAC9C,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,0BAA0B,CAAA;CACnC,CAAC,CAAA"}

package/dist/types/index.d.ts

@@ -2,10 +2,8 @@ export * from './Config';
 export * from './CreatableModule';
 export * from './Module';
 export * from './ModuleDescription';
-export * from './ModuleEventArgs';
 export * from './ModuleFilter';
 export * from './ModuleParams';
-export * from './ModuleQueried';
 export * from './ModuleQueryResult';
 export * from './ModuleRepository';
 export * from './Queries';

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,mBAAmB,CAAA;AACjC,cAAc,UAAU,CAAA;AACxB,cAAc,qBAAqB,CAAA;AACnC,cAAc,mBAAmB,CAAA;AACjC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,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,mBAAmB,CAAA;AACjC,cAAc,UAAU,CAAA;AACxB,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA;AAClC,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}

package/package.json

@@ -10,13 +10,13 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/account-model": "^2.53.0",
-    "@xyo-network/boundwitness-model": "^2.53.0",
-    "@xyo-network/core": "^2.53.0",
-    "@xyo-network/module-events": "^2.53.0",
-    "@xyo-network/payload-model": "^2.53.0",
-    "@xyo-network/promise": "^2.53.0",
-    "@xyo-network/wallet-model": "^2.53.0"
+    "@xyo-network/account-model": "^2.53.2",
+    "@xyo-network/boundwitness-model": "^2.53.2",
+    "@xyo-network/core": "^2.53.2",
+    "@xyo-network/module-events": "^2.53.2",
+    "@xyo-network/payload-model": "^2.53.2",
+    "@xyo-network/promise": "^2.53.2",
+    "@xyo-network/wallet-model": "^2.53.2"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.16.1",
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.53.0"
+  "version": "2.53.2"
 }

package/src/Config.ts

@@ -1,5 +1,5 @@
 import { WithAdditional } from '@xyo-network/core'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 
 export type ModuleConfigSchema = 'network.xyo.module.config'
 export const ModuleConfigSchema: ModuleConfigSchema = 'network.xyo.module.config'
@@ -8,13 +8,13 @@ export type AddressString = string
 export type CosigningAddressSet = string[]
 export type SchemaString = string
 
-export type ModuleConfigBase<TConfig extends XyoPayload | undefined = undefined> = XyoPayload<
+export type ModuleConfigBase<TConfig extends Payload | undefined = undefined> = Payload<
   WithAdditional<
     {
       //friendly name of module (not collision resistent)
       name?: string
 
-      schema: TConfig extends XyoPayload ? TConfig['schema'] : ModuleConfigSchema
+      schema: TConfig extends Payload ? TConfig['schema'] : ModuleConfigSchema
 
       //if both allowed and disallowed is specified, then disallowed takes priority
       security?: {
@@ -35,4 +35,4 @@ export type ModuleConfigBase<TConfig extends XyoPayload | undefined = undefined>
   >
 >
 
-export type ModuleConfig<TConfig extends XyoPayload | undefined = undefined> = ModuleConfigBase<TConfig>
+export type ModuleConfig<TConfig extends Payload | undefined = undefined> = ModuleConfigBase<TConfig>

package/src/Module.ts

@@ -1,11 +1,11 @@
-import { EventFunctions } from '@xyo-network/module-events'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { BoundWitness } from '@xyo-network/boundwitness-model'
+import { EventArgs, EventData, EventFunctions } from '@xyo-network/module-events'
+import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 import { ModuleConfig } from './Config'
 import { ModuleFilter } from './ModuleFilter'
 import { AnyConfigSchema, ModuleParams } from './ModuleParams'
-import { ModuleEventData } from './ModuleQueried'
 import { ModuleQueryResult } from './ModuleQueryResult'
 import { XyoQueryBoundWitness } from './Query'
 
@@ -16,6 +16,27 @@ export interface ModuleResolver {
   resolve<T extends Module = Module>(filter?: ModuleFilter): Promisable<T[]>
 }
 
+export type ModuleEventArgs<TModule extends Module = Module, TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs
+  ? {
+      module: TModule
+    } & TArgs
+  : {
+      module: TModule
+    }
+
+export type ModuleQueriedEventArgs = ModuleEventArgs<
+  Module,
+  {
+    payloads?: Payload[]
+    query: XyoQueryBoundWitness
+    result: [BoundWitness, Payload[]]
+  }
+>
+
+export interface ModuleEventData extends EventData {
+  moduleQueried: ModuleQueriedEventArgs
+}
+
 export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>> = {
   address: string
   config: TParams['config']
@@ -28,12 +49,12 @@ export type ModuleFields<TParams extends ModuleParams<AnyConfigSchema<ModuleConf
   queries: string[]
   query: <T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(
     query: T,
-    payloads?: XyoPayload[],
+    payloads?: Payload[],
     queryConfig?: TConf,
   ) => Promisable<ModuleQueryResult>
   queryable: <T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConf extends ModuleConfig = ModuleConfig>(
     query: T,
-    payloads?: XyoPayload[],
+    payloads?: Payload[],
     queryConfig?: TConf,
   ) => Promisable<boolean>
 

package/src/ModuleQueryResult.ts

@@ -1,4 +1,4 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
-import { XyoPayload } from '@xyo-network/payload-model'
+import { BoundWitness } from '@xyo-network/boundwitness-model'
+import { Payload } from '@xyo-network/payload-model'
 
-export type ModuleQueryResult<T extends XyoPayload = XyoPayload> = [XyoBoundWitness, T[]]
+export type ModuleQueryResult<T extends Payload = Payload> = [BoundWitness, T[]]

package/src/Query/Payload.ts

@@ -1,4 +1,4 @@
-import { XyoPayload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 
 export interface XyoQueryFields {
   /** @field The addresses of the intended handlers */
@@ -14,4 +14,4 @@ export interface XyoQueryFields {
   minBid?: number
 }
 
-export type XyoQuery<T extends XyoPayload | void = void> = T extends XyoPayload ? XyoPayload<T & XyoQueryFields> : XyoPayload<XyoQueryFields>
+export type XyoQuery<T extends Payload | void = void> = T extends Payload ? Payload<T & XyoQueryFields> : Payload<XyoQueryFields>

package/src/Query/XyoQueryBoundWitness.ts

@@ -1,9 +1,9 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
+import { BoundWitness } from '@xyo-network/boundwitness-model'
 
 export type XyoQueryBoundWitnessSchema = 'network.xyo.boundwitness'
 export const XyoQueryBoundWitnessSchema: XyoQueryBoundWitnessSchema = 'network.xyo.boundwitness'
 
-export type XyoQueryBoundWitness = XyoBoundWitness<{
+export type XyoQueryBoundWitness = BoundWitness<{
   query: string
   resultSet?: string
   schema: XyoQueryBoundWitnessSchema

package/src/index.ts

@@ -2,10 +2,8 @@ export * from './Config'
 export * from './CreatableModule'
 export * from './Module'
 export * from './ModuleDescription'
-export * from './ModuleEventArgs'
 export * from './ModuleFilter'
 export * from './ModuleParams'
-export * from './ModuleQueried'
 export * from './ModuleQueryResult'
 export * from './ModuleRepository'
 export * from './Queries'

package/dist/cjs/ModuleEventArgs.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=ModuleEventArgs.js.map

package/dist/cjs/ModuleEventArgs.js.map

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

package/dist/cjs/ModuleQueried.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=ModuleQueried.js.map

package/dist/cjs/ModuleQueried.js.map

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

package/dist/esm/ModuleEventArgs.js

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

package/dist/esm/ModuleEventArgs.js.map

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

package/dist/esm/ModuleQueried.js

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

package/dist/esm/ModuleQueried.js.map

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

package/dist/types/ModuleEventArgs.d.ts

@@ -1,8 +0,0 @@
-import { EventArgs } from '@xyo-network/module-events';
-import { Module } from './Module';
-export type ModuleEventArgs<TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs ? {
-    module: Module;
-} & TArgs : {
-    module: Module;
-};
-//# sourceMappingURL=ModuleEventArgs.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleEventArgs.d.ts","sourceRoot":"","sources":["../../src/ModuleEventArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAEjC,MAAM,MAAM,eAAe,CAAC,KAAK,SAAS,SAAS,GAAG,SAAS,GAAG,SAAS,IAAI,KAAK,SAAS,SAAS,GAClG;IACE,MAAM,EAAE,MAAM,CAAA;CACf,GAAG,KAAK,GACT;IACE,MAAM,EAAE,MAAM,CAAA;CACf,CAAA"}

package/dist/types/ModuleQueried.d.ts

@@ -1,14 +0,0 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model';
-import { EventData } from '@xyo-network/module-events';
-import { XyoPayload } from '@xyo-network/payload-model';
-import { ModuleEventArgs } from './ModuleEventArgs';
-import { XyoQueryBoundWitness } from './Query';
-export type ModuleQueriedEventArgs = ModuleEventArgs<{
-    payloads?: XyoPayload[];
-    query: XyoQueryBoundWitness;
-    result: [XyoBoundWitness, XyoPayload[]];
-}>;
-export interface ModuleEventData extends EventData {
-    moduleQueried: ModuleQueriedEventArgs;
-}
-//# sourceMappingURL=ModuleQueried.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleQueried.d.ts","sourceRoot":"","sources":["../../src/ModuleQueried.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAA;AAE9C,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,WAAW,eAAgB,SAAQ,SAAS;IAChD,aAAa,EAAE,sBAAsB,CAAA;CACtC"}

package/src/ModuleEventArgs.ts

@@ -1,11 +0,0 @@
-import { EventArgs } from '@xyo-network/module-events'
-
-import { Module } from './Module'
-
-export type ModuleEventArgs<TArgs extends EventArgs | undefined = undefined> = TArgs extends EventArgs
-  ? {
-      module: Module
-    } & TArgs
-  : {
-      module: Module
-    }

package/src/ModuleQueried.ts

@@ -1,16 +0,0 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness-model'
-import { EventData } from '@xyo-network/module-events'
-import { XyoPayload } from '@xyo-network/payload-model'
-
-import { ModuleEventArgs } from './ModuleEventArgs'
-import { XyoQueryBoundWitness } from './Query'
-
-export type ModuleQueriedEventArgs = ModuleEventArgs<{
-  payloads?: XyoPayload[]
-  query: XyoQueryBoundWitness
-  result: [XyoBoundWitness, XyoPayload[]]
-}>
-
-export interface ModuleEventData extends EventData {
-  moduleQueried: ModuleQueriedEventArgs
-}