@xyo-network/diviner 2.33.9 → 2.33.11

package/dist/esm/Diviner.d.ts

@@ -2,9 +2,9 @@ import { Module } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { XyoDivinerQuery } from './Queries';
-export interface Diviner<TDivineResponse extends XyoPayload = XyoPayload> {
-    divine(payloads?: XyoPayloads): Promisable<TDivineResponse | null>;
+export interface Diviner {
+    divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>;
 }
-export interface DivinerModule<TDivineResult extends XyoPayload = XyoPayload, TQuery extends XyoDivinerQuery<TDivineResult> = XyoDivinerQuery<TDivineResult>, TQueryResult extends XyoPayload = XyoPayload> extends Module<TQuery, TQueryResult>, Diviner<TDivineResult> {
+export interface DivinerModule<TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends Module<TQuery>, Diviner {
 }
 //# sourceMappingURL=Diviner.d.ts.map

package/dist/esm/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,WAAW,OAAO,CAAC,eAAe,SAAS,UAAU,GAAG,UAAU;IACtE,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,CAAA;CACnE;AAED,MAAM,WAAW,aAAa,CAC5B,aAAa,SAAS,UAAU,GAAG,UAAU,EAC7C,MAAM,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,EAC9E,YAAY,SAAS,UAAU,GAAG,UAAU,CAC5C,SAAQ,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAClC,OAAO,CAAC,aAAa,CAAC;CAAG"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;CAC9D;AAED,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO;CAAG"}

package/dist/esm/Payload/Archivist/Diviner.d.ts

@@ -3,7 +3,7 @@ import { PartialModuleConfig, XyoModuleResolverFunc } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfig } from './Config';
-export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
+export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPayloadDivinerConfig> {
     protected readonly archivist?: PayloadArchivist | null;
     constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: PayloadArchivist, resolver?: XyoModuleResolverFunc);
     queries(): ("network.xyo.query.diviner.divine" | "network.xyo.query.module.subscribe" | "network.xyo.query.module.discover" | "network.xyo.query.module.initialize" | "network.xyo.query.module.shutdown")[];

package/dist/esm/Payload/Archivist/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAmD,MAAM,wBAAwB,CAAA;AAC1G,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AAEnG,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,UAAU,EAAE,gCAAgC,CAAC;IAC7G,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;gBAE1C,MAAM,CAAC,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAUjI,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAYxE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAmD,MAAM,wBAAwB,CAAA;AAC1G,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AAEnG,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,gCAAgC,CAAC;IACjG,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;gBAE1C,MAAM,CAAC,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAUjI,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAYxE"}

package/dist/esm/Payload/Archivist/Diviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAoB,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE1G,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,MAAM,OAAO,0BAA2B,SAAQ,iBAA+D;IAC1F,SAAS,CAA0B;IAEtD,YAAY,MAA8D,EAAE,SAA4B,EAAE,QAAgC;QACxI,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QACzF,MAAM,sBAAsB,GAAG,MAAM,EAAE,SAAS,CAAA;QAChD,MAAM,iBAAiB,GACrB,SAAS,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,sBAAsB,CAAiC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACzH,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;SACvF;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,CAAC,CAAA;QACvH,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAA;QACrC,IAAI,cAAc,EAAE;YAClB,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CACvG,CAAA;YACD,OAAO,OAAO,IAAI,IAAI,CAAA;SACvB;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAoB,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE1G,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,MAAM,OAAO,0BAA2B,SAAQ,iBAAmD;IAC9E,SAAS,CAA0B;IAEtD,YAAY,MAA8D,EAAE,SAA4B,EAAE,QAAgC;QACxI,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QACzF,MAAM,sBAAsB,GAAG,MAAM,EAAE,SAAS,CAAA;QAChD,MAAM,iBAAiB,GACrB,SAAS,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,sBAAsB,CAAiC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACzH,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;SACvF;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAsB;QACxC,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,CAAC,CAAA;QACvH,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAA;QACrC,IAAI,cAAc,EAAE;YAClB,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CACvG,CAAA;YACD,OAAO,OAAO,IAAI,IAAI,CAAA;SACvB;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/dist/esm/Payload/Huri/Diviner.d.ts

@@ -1,7 +1,7 @@
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoHuriPayloadDivinerConfig } from './Config';
-export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoHuriPayloadDivinerConfig> {
+export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerConfig> {
     protected get options(): import("@xyo-network/payload").HuriOptions | undefined;
     queries(): ("network.xyo.query.diviner.divine" | "network.xyo.query.module.subscribe" | "network.xyo.query.module.discover" | "network.xyo.query.module.initialize" | "network.xyo.query.module.shutdown")[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;

package/dist/esm/Payload/Huri/Diviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,qBAAa,qBAAsB,SAAQ,iBAAiB,CAAC,UAAU,EAAE,2BAA2B,CAAC;IACnG,SAAS,KAAK,OAAO,2DAEpB;IAEQ,OAAO;IAID,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAM1E"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,qBAAa,qBAAsB,SAAQ,iBAAiB,CAAC,2BAA2B,CAAC;IACvF,SAAS,KAAK,OAAO,2DAEpB;IAEQ,OAAO;IAID,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAM1E"}

package/dist/esm/Payload/Huri/Diviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA0D;IACnG,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,QAAsB;QAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,CAAC,CAAA;QACvH,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACtD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,OAAO,OAAO,IAAI,IAAI,CAAA;IACxB,CAAC;CACF"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA8C;IACvF,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,QAAsB;QAC1C,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,CAAC,CAAA;QACvH,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACtD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,OAAO,OAAO,IAAI,IAAI,CAAA;IACxB,CAAC;CACF"}

package/dist/esm/Payload/XyoPayloadDiviner.d.ts

@@ -1,7 +1,6 @@
-import { XyoPayload } from '@xyo-network/payload';
 import { XyoDivinerConfig } from '../Config';
 import { XyoDivinerQuery } from '../Queries';
 import { XyoDiviner } from '../XyoDiviner';
-export declare abstract class XyoPayloadDiviner<T extends XyoPayload = XyoPayload, C extends XyoDivinerConfig<T> = XyoDivinerConfig<T>, Q extends XyoDivinerQuery<T> = XyoDivinerQuery<T>> extends XyoDiviner<T, C, Q> {
+export declare abstract class XyoPayloadDiviner<C extends XyoDivinerConfig = XyoDivinerConfig, Q extends XyoDivinerQuery = XyoDivinerQuery> extends XyoDiviner<C, Q> {
 }
 //# sourceMappingURL=XyoPayloadDiviner.d.ts.map

package/dist/esm/Payload/XyoPayloadDiviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoPayloadDiviner.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,8BAAsB,iBAAiB,CACrC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EACnD,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CACjD,SAAQ,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"XyoPayloadDiviner.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,8BAAsB,iBAAiB,CACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;CAAG"}

package/dist/esm/Payload/XyoPayloadDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,OAAgB,iBAIpB,SAAQ,UAAmB;CAAG"}
+{"version":3,"file":"XyoPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,OAAgB,iBAGpB,SAAQ,UAAgB;CAAG"}

package/dist/esm/Queries/index.d.ts

@@ -3,6 +3,5 @@ import { XyoModuleQuery, XyoQuery } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { XyoDivinerDivineQuery } from './Divine';
 export declare type XyoDivinerQueryBase<TDivineResult extends XyoPayload = XyoPayload> = XyoDivinerDivineQuery<TDivineResult>;
-export declare type XyoDivinerQuery<TDivineResult extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery ? XyoModuleQuery<XyoDivinerQueryBase<TDivineResult> | TQuery> : XyoModuleQuery<XyoDivinerQueryBase<TDivineResult>>;
-export declare type XyoDivinerQuerySchema = XyoDivinerQuery['schema'];
+export declare type XyoDivinerQuery<TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery ? XyoModuleQuery<XyoDivinerQueryBase<XyoPayload> | TQuery> : XyoModuleQuery<XyoDivinerQueryBase<XyoPayload>>;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/Queries/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AAExB,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhD,oBAAY,mBAAmB,CAAC,aAAa,SAAS,UAAU,GAAG,UAAU,IAAI,qBAAqB,CAAC,aAAa,CAAC,CAAA;AAErH,oBAAY,eAAe,CAAC,aAAa,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GACvI,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,GAC3D,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,CAAA;AAEtD,oBAAY,qBAAqB,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AAExB,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhD,oBAAY,mBAAmB,CAAC,aAAa,SAAS,UAAU,GAAG,UAAU,IAAI,qBAAqB,CAAC,aAAa,CAAC,CAAA;AAErH,oBAAY,eAAe,CAAC,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GACxF,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,GACxD,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAA"}

package/dist/esm/XyoDiviner.d.ts

@@ -3,18 +3,18 @@ import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { XyoDivinerConfig } from './Config';
 import { DivinerModule } from './Diviner';
-import { XyoDivinerQuery, XyoDivinerQuerySchema } from './Queries';
-export declare abstract class XyoDiviner<TDivineResult extends XyoPayload = XyoPayload, TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery<TDivineResult> = XyoDivinerQuery<TDivineResult>> extends XyoModule<TQuery, TDivineResult, TConfig> implements DivinerModule<TDivineResult, TQuery, TDivineResult> {
-    abstract divine(payloads?: XyoPayloads<TDivineResult>): Promisable<TDivineResult | null>;
-    queries(): (TQuery['schema'] | XyoDivinerQuerySchema)[];
-    query(query: TQuery): Promise<XyoModuleQueryResult<TDivineResult>>;
+import { XyoDivinerQuery } from './Queries';
+export declare abstract class XyoDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoModule<TQuery, TConfig> implements DivinerModule<TQuery> {
+    abstract divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>;
+    queries(): TQuery['schema'][];
+    query(query: TQuery): Promise<XyoModuleQueryResult>;
 }
-export declare abstract class XyoTimestampDiviner<TPayload extends XyoPayload = XyoPayload, TConfig extends XyoDivinerConfig<TPayload> = XyoDivinerConfig<TPayload>, TQuery extends XyoDivinerQuery<TPayload> = XyoDivinerQuery<TPayload>> extends XyoDiviner<TPayload, TConfig, TQuery> {
+export declare abstract class XyoTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoDiviner<TConfig, TQuery> {
 }
 /** @deprecated use XyoDiviner instead*/
-export declare abstract class XyoAbstractDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoDiviner<XyoPayload, TConfig, TQuery> {
+export declare abstract class XyoAbstractDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoDiviner<TConfig, TQuery> {
 }
 /** @deprecated use XyoDiviner instead*/
-export declare abstract class XyoAbstractTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoTimestampDiviner<XyoPayload, TConfig, TQuery> {
+export declare abstract class XyoAbstractTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoTimestampDiviner<TConfig, TQuery> {
 }
 //# sourceMappingURL=XyoDiviner.d.ts.map

package/dist/esm/XyoDiviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAkC,oBAAoB,EAAgC,MAAM,qBAAqB,CAAA;AACnI,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAA+B,eAAe,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAE/F,8BAAsB,UAAU,CAC5B,aAAa,SAAS,UAAU,GAAG,UAAU,EAC7C,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,CAEhF,SAAQ,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAChD,YAAW,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC;IAE9D,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC;IAExE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,qBAAqB,CAAC,EAAE;IAIjE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;CAgBzE;AAED,8BAAsB,mBAAmB,CACvC,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,OAAO,SAAS,gBAAgB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EACvE,MAAM,SAAS,eAAe,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CACpE,SAAQ,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG;AAElD,wCAAwC;AACxC,8BAAsB,kBAAkB,CACtC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG;AAEpD,wCAAwC;AACxC,8BAAsB,2BAA2B,CAC/C,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG"}
+{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAkC,oBAAoB,EAAgC,MAAM,qBAAqB,CAAA;AACnI,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAA+B,eAAe,EAAE,MAAM,WAAW,CAAA;AAExE,8BAAsB,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EAAE,MAAM,SAAS,eAAe,GAAG,eAAe,CACpI,SAAQ,SAAS,CAAC,MAAM,EAAE,OAAO,CACjC,YAAW,aAAa,CAAC,MAAM,CAAC;IAEhC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC;IAEtD,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE;IAIvC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAgB1D;AAED,8BAAsB,mBAAmB,CACvC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;CAAG;AAExC,wCAAwC;AACxC,8BAAsB,kBAAkB,CACtC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;CAAG;AAExC,wCAAwC;AACxC,8BAAsB,2BAA2B,CAC/C,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC;CAAG"}

package/dist/esm/XyoDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,8BAA8B,EAAwB,4BAA4B,EAAE,MAAM,qBAAqB,CAAA;AAMnI,OAAO,EAAE,2BAA2B,EAA0C,MAAM,WAAW,CAAA;AAE/F,MAAM,OAAgB,UAKpB,SAAQ,SAAyC;IAKjC,OAAO;QACrB,OAAO,CAAC,8BAA8B,EAAE,4BAA4B,EAAE,2BAA2B,CAAC,CAAA;IACpG,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAa;QACvB,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;YAC7D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;SAC1D;QAED,MAAM,QAAQ,GAA6B,EAAE,CAAA;QAC7C,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,KAAK,2BAA2B;gBAC9B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAChD,MAAK;YACP;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SAC5B;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IACxD,CAAC;CACF;AAED,MAAM,OAAgB,mBAIpB,SAAQ,UAAqC;CAAG;AAElD,wCAAwC;AACxC,MAAM,OAAgB,kBAGpB,SAAQ,UAAuC;CAAG;AAEpD,wCAAwC;AACxC,MAAM,OAAgB,2BAGpB,SAAQ,mBAAgD;CAAG"}
+{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,8BAA8B,EAAwB,4BAA4B,EAAE,MAAM,qBAAqB,CAAA;AAMnI,OAAO,EAAE,2BAA2B,EAAmB,MAAM,WAAW,CAAA;AAExE,MAAM,OAAgB,UACpB,SAAQ,SAA0B;IAKlB,OAAO;QACrB,OAAO,CAAC,8BAA8B,EAAE,4BAA4B,EAAE,2BAA2B,CAAC,CAAA;IACpG,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAa;QACvB,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;YAC7D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;SAC1D;QAED,MAAM,QAAQ,GAAgB,EAAE,CAAA;QAChC,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,KAAK,2BAA2B;gBAC9B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAChD,MAAK;YACP;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SAC5B;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IACxD,CAAC;CACF;AAED,MAAM,OAAgB,mBAGpB,SAAQ,UAA2B;CAAG;AAExC,wCAAwC;AACxC,MAAM,OAAgB,kBAGpB,SAAQ,UAA2B;CAAG;AAExC,wCAAwC;AACxC,MAAM,OAAgB,2BAGpB,SAAQ,mBAAoC;CAAG"}

package/package.json

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/account": "^2.33.9",
-    "@xyo-network/archivist": "^2.33.9",
-    "@xyo-network/module": "^2.33.9",
-    "@xyo-network/payload": "^2.33.9",
-    "@xyo-network/promise": "^2.33.9",
+    "@xyo-network/account": "^2.33.11",
+    "@xyo-network/archivist": "^2.33.11",
+    "@xyo-network/module": "^2.33.11",
+    "@xyo-network/payload": "^2.33.11",
+    "@xyo-network/promise": "^2.33.11",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -51,5 +51,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.9"
+  "version": "2.33.11"
 }

package/src/Diviner.ts

@@ -4,13 +4,8 @@ import { Promisable } from '@xyo-network/promise'
 
 import { XyoDivinerQuery } from './Queries'
 
-export interface Diviner<TDivineResponse extends XyoPayload = XyoPayload> {
-  divine(payloads?: XyoPayloads): Promisable<TDivineResponse | null>
+export interface Diviner {
+  divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>
 }
 
-export interface DivinerModule<
-  TDivineResult extends XyoPayload = XyoPayload,
-  TQuery extends XyoDivinerQuery<TDivineResult> = XyoDivinerQuery<TDivineResult>,
-  TQueryResult extends XyoPayload = XyoPayload,
-> extends Module<TQuery, TQueryResult>,
-    Diviner<TDivineResult> {}
+export interface DivinerModule<TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends Module<TQuery>, Diviner {}

package/src/Payload/Archivist/Diviner.ts

@@ -9,7 +9,7 @@ import { XyoHuriPayload, XyoHuriSchema } from '../XyoHuriPayload'
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoArchivistPayloadDivinerConfig, XyoArchivistPayloadDivinerConfigSchema } from './Config'
 
-export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
+export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPayloadDivinerConfig> {
   protected readonly archivist?: PayloadArchivist | null
 
   constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: PayloadArchivist, resolver?: XyoModuleResolverFunc) {

package/src/Payload/Huri/Diviner.ts

@@ -7,7 +7,7 @@ import { XyoHuriPayload, XyoHuriSchema } from '../XyoHuriPayload'
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoHuriPayloadDivinerConfig } from './Config'
 
-export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoHuriPayloadDivinerConfig> {
+export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerConfig> {
   protected get options() {
     return this.config?.options
   }

package/src/Payload/XyoPayloadDiviner.ts

@@ -1,11 +1,8 @@
-import { XyoPayload } from '@xyo-network/payload'
-
 import { XyoDivinerConfig } from '../Config'
 import { XyoDivinerQuery } from '../Queries'
 import { XyoDiviner } from '../XyoDiviner'
 
 export abstract class XyoPayloadDiviner<
-  T extends XyoPayload = XyoPayload,
-  C extends XyoDivinerConfig<T> = XyoDivinerConfig<T>,
-  Q extends XyoDivinerQuery<T> = XyoDivinerQuery<T>,
-> extends XyoDiviner<T, C, Q> {}
+  C extends XyoDivinerConfig = XyoDivinerConfig,
+  Q extends XyoDivinerQuery = XyoDivinerQuery,
+> extends XyoDiviner<C, Q> {}

package/src/Queries/index.ts

@@ -7,8 +7,6 @@ import { XyoDivinerDivineQuery } from './Divine'
 
 export type XyoDivinerQueryBase<TDivineResult extends XyoPayload = XyoPayload> = XyoDivinerDivineQuery<TDivineResult>
 
-export type XyoDivinerQuery<TDivineResult extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery
-  ? XyoModuleQuery<XyoDivinerQueryBase<TDivineResult> | TQuery>
-  : XyoModuleQuery<XyoDivinerQueryBase<TDivineResult>>
-
-export type XyoDivinerQuerySchema = XyoDivinerQuery['schema']
+export type XyoDivinerQuery<TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery
+  ? XyoModuleQuery<XyoDivinerQueryBase<XyoPayload> | TQuery>
+  : XyoModuleQuery<XyoDivinerQueryBase<XyoPayload>>

package/src/XyoDiviner.ts

@@ -5,29 +5,25 @@ import { Promisable } from '@xyo-network/promise'
 
 import { XyoDivinerConfig } from './Config'
 import { DivinerModule } from './Diviner'
-import { XyoDivinerDivineQuerySchema, XyoDivinerQuery, XyoDivinerQuerySchema } from './Queries'
-
-export abstract class XyoDiviner<
-    TDivineResult extends XyoPayload = XyoPayload,
-    TConfig extends XyoDivinerConfig = XyoDivinerConfig,
-    TQuery extends XyoDivinerQuery<TDivineResult> = XyoDivinerQuery<TDivineResult>,
-  >
-  extends XyoModule<TQuery, TDivineResult, TConfig>
-  implements DivinerModule<TDivineResult, TQuery, TDivineResult>
+import { XyoDivinerDivineQuerySchema, XyoDivinerQuery } from './Queries'
+
+export abstract class XyoDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery>
+  extends XyoModule<TQuery, TConfig>
+  implements DivinerModule<TQuery>
 {
-  abstract divine(payloads?: XyoPayloads<TDivineResult>): Promisable<TDivineResult | null>
+  abstract divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>
 
-  public override queries(): (TQuery['schema'] | XyoDivinerQuerySchema)[] {
+  public override queries(): TQuery['schema'][] {
     return [XyoModuleInitializeQuerySchema, XyoModuleShutdownQuerySchema, XyoDivinerDivineQuerySchema]
   }
 
-  async query(query: TQuery): Promise<XyoModuleQueryResult<TDivineResult>> {
+  async query(query: TQuery): Promise<XyoModuleQueryResult> {
     const queryAccount = new XyoAccount()
     if (!this.queries().find((schema) => schema === query.schema)) {
       console.error(`Undeclared Module Query: ${query.schema}`)
     }
 
-    const payloads: (TDivineResult | null)[] = []
+    const payloads: XyoPayloads = []
     switch (query.schema) {
       case XyoDivinerDivineQuerySchema:
         payloads.push(await this.divine(query.payloads))
@@ -40,19 +36,18 @@ export abstract class XyoDiviner<
 }
 
 export abstract class XyoTimestampDiviner<
-  TPayload extends XyoPayload = XyoPayload,
-  TConfig extends XyoDivinerConfig<TPayload> = XyoDivinerConfig<TPayload>,
-  TQuery extends XyoDivinerQuery<TPayload> = XyoDivinerQuery<TPayload>,
-> extends XyoDiviner<TPayload, TConfig, TQuery> {}
+  TConfig extends XyoDivinerConfig = XyoDivinerConfig,
+  TQuery extends XyoDivinerQuery = XyoDivinerQuery,
+> extends XyoDiviner<TConfig, TQuery> {}
 
 /** @deprecated use XyoDiviner instead*/
 export abstract class XyoAbstractDiviner<
   TConfig extends XyoDivinerConfig = XyoDivinerConfig,
   TQuery extends XyoDivinerQuery = XyoDivinerQuery,
-> extends XyoDiviner<XyoPayload, TConfig, TQuery> {}
+> extends XyoDiviner<TConfig, TQuery> {}
 
 /** @deprecated use XyoDiviner instead*/
 export abstract class XyoAbstractTimestampDiviner<
   TConfig extends XyoDivinerConfig = XyoDivinerConfig,
   TQuery extends XyoDivinerQuery = XyoDivinerQuery,
-> extends XyoTimestampDiviner<XyoPayload, TConfig, TQuery> {}
+> extends XyoTimestampDiviner<TConfig, TQuery> {}