@xyo-network/diviner 2.26.19 → 2.27.0-rc.2

package/dist/esm/Abstract.d.ts

@@ -1,8 +1,8 @@
 import { XyoAbstractModule } from '@xyo-network/module';
 import { XyoDivinerConfig } from './Config';
 import { XyoDiviner, XyoDivinerQueryPayload } from './Diviner';
-export declare abstract class XyoAbstractDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload, C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoAbstractModule<Q, C> implements XyoDiviner<Q> {
+export declare abstract class XyoAbstractDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> extends XyoAbstractModule<TConfig, TQuery> implements XyoDiviner<TQuery> {
 }
-export declare abstract class XyoAbstractTimestampDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> extends XyoAbstractDiviner<Q> {
+export declare abstract class XyoAbstractTimestampDiviner<C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoAbstractDiviner<C> {
 }
 //# sourceMappingURL=Abstract.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAE9D,8BAAsB,kBAAkB,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,EAAE,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC/I,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAC9B,YAAW,UAAU,CAAC,CAAC,CAAC;CAAG;AAE7B,8BAAsB,2BAA2B,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAE9D,8BAAsB,kBAAkB,CACpC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,sBAAsB,GAAG,sBAAsB,CAEhE,SAAQ,iBAAiB,CAAC,OAAO,EAAE,MAAM,CACzC,YAAW,UAAU,CAAC,MAAM,CAAC;CAAG;AAElC,8BAAsB,2BAA2B,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;CAAG"}

package/dist/esm/Abstract.js.map

@@ -1 +1 @@
-{"version":3,"file":"Abstract.js","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKvD,MAAM,OAAgB,kBACpB,SAAQ,iBAAuB;CACJ;AAE7B,MAAM,OAAgB,2BAAuF,SAAQ,kBAAqB;CAAG"}
+{"version":3,"file":"Abstract.js","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAKvD,MAAM,OAAgB,kBAIpB,SAAQ,iBAAkC;CACV;AAElC,MAAM,OAAgB,2BAA2E,SAAQ,kBAAqB;CAAG"}

package/dist/esm/Config.d.ts

@@ -2,7 +2,7 @@ import { XyoModuleConfig } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 export declare type XyoDivinerConfigSchema = 'network.xyo.diviner.config';
 export declare const XyoDivinerConfigSchema: XyoDivinerConfigSchema;
-export declare type XyoDivinerConfig<T extends XyoPayload = XyoPayload<{
+export declare type XyoDivinerConfig<TConfig extends XyoPayload = XyoPayload<{
     schema: XyoDivinerConfigSchema | string;
-}>> = XyoModuleConfig<T>;
+}>> = XyoModuleConfig<TConfig>;
 //# sourceMappingURL=Config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,oBAAY,sBAAsB,GAAG,4BAA4B,CAAA;AACjE,eAAO,MAAM,sBAAsB,EAAE,sBAAqD,CAAA;AAE1F,oBAAY,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAC;IAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAA;CAAE,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,oBAAY,sBAAsB,GAAG,4BAA4B,CAAA;AACjE,eAAO,MAAM,sBAAsB,EAAE,sBAAqD,CAAA;AAE1F,oBAAY,gBAAgB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,CAAC;IAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAA;CAAE,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAA"}

package/dist/esm/Diviner.d.ts

@@ -1,5 +1,10 @@
 import { XyoModule, XyoQueryPayload } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
-export declare type XyoDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<T>;
+export declare type XyoDivinerQueryPayloadSchema = 'network.xyo.diviner.query';
+export declare const XyoDivinerQueryPayloadSchema: XyoDivinerQueryPayloadSchema;
+export declare type XyoDivinerQueryPayload<TSchema extends string = string, TQuery extends XyoQueryPayload = XyoQueryPayload, TPayload extends XyoPayload = XyoPayload> = XyoQueryPayload<{
+    schema: TSchema;
+    payloads: TPayload[];
+} & TQuery>;
 export declare type XyoDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> = XyoModule<Q>;
 //# 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,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,oBAAY,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC,CAAC,CAAC,CAAA;AAE1F,oBAAY,UAAU,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,oBAAY,4BAA4B,GAAG,2BAA2B,CAAA;AACtE,eAAO,MAAM,4BAA4B,EAAE,4BAA0D,CAAA;AAErG,oBAAY,sBAAsB,CAChC,OAAO,SAAS,MAAM,GAAG,MAAM,EAC/B,MAAM,SAAS,eAAe,GAAG,eAAe,EAChD,QAAQ,SAAS,UAAU,GAAG,UAAU,IACtC,eAAe,CACjB;IACE,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,QAAQ,EAAE,CAAA;CACrB,GAAG,MAAM,CACX,CAAA;AAED,oBAAY,UAAU,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAA"}

package/dist/esm/Diviner.js

@@ -1,2 +1,2 @@
-export {};
+export const XyoDivinerQueryPayloadSchema = 'network.xyo.diviner.query';
 //# sourceMappingURL=Diviner.js.map

package/dist/esm/Diviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":""}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,4BAA4B,GAAiC,2BAA2B,CAAA"}

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

@@ -1,10 +1,10 @@
 import { XyoModuleQueryResult } from '@xyo-network/module';
+import { XyoAbstractDiviner } from '../../Abstract';
 import { XyoPayloadDivinerQueryPayload } from '../Query';
-import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfig } from './Config';
-import { XyoArchivistPayloadDivinerQuery } from './Query';
-export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPayloadDivinerQuery, XyoArchivistPayloadDivinerConfig> {
+export declare class XyoArchivistPayloadDiviner extends XyoAbstractDiviner<XyoArchivistPayloadDivinerConfig, XyoPayloadDivinerQueryPayload> {
     protected get archivist(): import("@xyo-network/archivist").XyoArchivist<import("@xyo-network/archivist").XyoArchivistQueryPayload>;
+    get queries(): "network.xyo.diviner.payload.query"[];
     query(query: XyoPayloadDivinerQueryPayload): Promise<XyoModuleQueryResult>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

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,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAI1D,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,SAAS,CAAA;AAEzD,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,+BAA+B,EAAE,gCAAgC,CAAC;IAClI,SAAS,KAAK,SAAS,6GAEtB;IAEc,KAAK,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAQ1F"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAG1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAEnD,OAAO,EAAE,6BAA6B,EAAuC,MAAM,UAAU,CAAA;AAC7F,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAE3D,qBAAa,0BAA2B,SAAQ,kBAAkB,CAAC,gCAAgC,EAAE,6BAA6B,CAAC;IACjI,SAAS,KAAK,SAAS,6GAEtB;IAED,IAAa,OAAO,0CAEnB;IAEc,KAAK,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAQ1F"}

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

@@ -1,11 +1,15 @@
 import { XyoArchivistGetQueryPayloadSchema } from '@xyo-network/archivist';
 import { Huri } from '@xyo-network/payload';
+import { XyoAbstractDiviner } from '../../Abstract';
 import { profile } from '../lib';
-import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
-export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
+import { XyoPayloadDivinerQueryPayloadSchema } from '../Query';
+export class XyoArchivistPayloadDiviner extends XyoAbstractDiviner {
     get archivist() {
         return this.config.archivist;
     }
+    get queries() {
+        return [XyoPayloadDivinerQueryPayloadSchema];
+    }
     async query(query) {
         const huri = new Huri(query.huri);
         const [[, payloads = []]] = await profile(async () => await this.archivist.query({ hashes: [huri.hash], schema: XyoArchivistGetQueryPayloadSchema }));

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,iCAAiC,EAAE,MAAM,wBAAwB,CAAA;AAE1E,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIxD,MAAM,OAAO,0BAA2B,SAAQ,iBAAoF;IAClI,IAAc,SAAS;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAoC;QACvD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,CAAC,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC,GAAG,MAAM,OAAO,CACvC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iCAAiC,EAAE,CAAC,CAC3G,CAAA;QACD,MAAM,cAAc,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3D,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,CAAA;IAC5D,CAAC;CACF"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAA;AAE1E,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAiC,mCAAmC,EAAE,MAAM,UAAU,CAAA;AAG7F,MAAM,OAAO,0BAA2B,SAAQ,kBAAmF;IACjI,IAAc,SAAS;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,mCAAmC,CAAC,CAAA;IAC9C,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAoC;QACvD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,CAAC,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC,GAAG,MAAM,OAAO,CACvC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iCAAiC,EAAE,CAAC,CAC3G,CAAA;QACD,MAAM,cAAc,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3D,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,CAAA;IAC5D,CAAC;CACF"}

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

@@ -1,4 +1,3 @@
 export * from './Config';
 export * from './Diviner';
-export * from './Query';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA"}

package/dist/esm/Payload/Archivist/index.js

@@ -1,4 +1,3 @@
 export * from './Config';
 export * from './Diviner';
-export * from './Query';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA"}

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

@@ -1,9 +1,10 @@
 import { XyoModuleQueryResult } from '@xyo-network/module';
+import { XyoPayloadDivinerQueryPayload } from '../Query';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoHuriPayloadDivinerConfig } from './Config';
-import { XyoHuriPayloadDivinerQuery } from './Query';
-export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerQuery, XyoHuriPayloadDivinerConfig> {
+export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerConfig, XyoPayloadDivinerQueryPayload> {
     protected get options(): import("@xyo-network/payload").HuriOptions | undefined;
-    query(query: XyoHuriPayloadDivinerQuery): Promise<XyoModuleQueryResult>;
+    get queries(): "network.xyo.diviner.payload.query"[];
+    query(query: XyoPayloadDivinerQueryPayload): Promise<XyoModuleQueryResult>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

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":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAI1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,SAAS,CAAA;AAEpD,qBAAa,qBAAsB,SAAQ,iBAAiB,CAAC,0BAA0B,EAAE,2BAA2B,CAAC;IACnH,SAAS,KAAK,OAAO,2DAEpB;IAEc,KAAK,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAMvF"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAI1D,OAAO,EAAE,6BAA6B,EAAuC,MAAM,UAAU,CAAA;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,qBAAa,qBAAsB,SAAQ,iBAAiB,CAAC,2BAA2B,EAAE,6BAA6B,CAAC;IACtH,SAAS,KAAK,OAAO,2DAEpB;IAED,IAAa,OAAO,0CAEnB;IAEc,KAAK,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAM1F"}

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

@@ -1,12 +1,16 @@
 import { Huri } from '@xyo-network/payload';
 import { profile } from '../lib';
+import { XyoPayloadDivinerQueryPayloadSchema } from '../Query';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 export class XyoHuriPayloadDiviner extends XyoPayloadDiviner {
     get options() {
         return this.config.options;
     }
+    get queries() {
+        return [XyoPayloadDivinerQueryPayloadSchema];
+    }
     async query(query) {
-        const huri = new Huri(query.huri, query.options ?? this.options);
+        const huri = new Huri(query.huri, this.options);
         const [payload = null] = await profile(async () => await huri.fetch());
         const payloads = payload ? [payload] : [];
         return [this.bindPayloads(payloads), payloads];

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAIxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA0E;IACnH,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAiC;QACpD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;QAChE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;CACF"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAiC,mCAAmC,EAAE,MAAM,UAAU,CAAA;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA6E;IACtH,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,mCAAmC,CAAC,CAAA;IAC9C,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAoC;QACvD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC/C,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;CACF"}

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

@@ -1,7 +1,8 @@
-import { XyoPayload, XyoQueryPayload } from '@xyo-network/payload';
+import { XyoPayload } from '@xyo-network/payload';
+import { XyoDivinerQueryPayload } from '../Diviner';
 export declare type XyoPayloadDivinerQueryPayloadSchema = 'network.xyo.diviner.payload.query';
 export declare const XyoPayloadDivinerQueryPayloadSchema: XyoPayloadDivinerQueryPayloadSchema;
-export declare type XyoPayloadDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<{
+export declare type XyoPayloadDivinerQueryPayload<TSchema extends string = XyoPayloadDivinerQueryPayloadSchema, TConfig extends XyoPayload = XyoPayload> = XyoDivinerQueryPayload<TSchema, {
     huri: string;
-} & T>;
+} & TConfig>;
 //# sourceMappingURL=Query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../src/Payload/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAElE,oBAAY,mCAAmC,GAAG,mCAAmC,CAAA;AACrF,eAAO,MAAM,mCAAmC,EAAE,mCAAyE,CAAA;AAE3H,oBAAY,6BAA6B,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAC5F;IACE,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,CAAC,CACN,CAAA"}
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../src/Payload/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnD,oBAAY,mCAAmC,GAAG,mCAAmC,CAAA;AACrF,eAAO,MAAM,mCAAmC,EAAE,mCAAyE,CAAA;AAE3H,oBAAY,6BAA6B,CACvC,OAAO,SAAS,MAAM,GAAG,mCAAmC,EAC5D,OAAO,SAAS,UAAU,GAAG,UAAU,IACrC,sBAAsB,CACxB,OAAO,EACP;IACE,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CACZ,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../../src/Payload/Query.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,mCAAmC,GAAwC,mCAAmC,CAAA"}
+{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../../src/Payload/Query.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,mCAAmC,GAAwC,mCAAmC,CAAA"}

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

@@ -1,6 +1,6 @@
 import { XyoAbstractDiviner } from '../Abstract';
 import { XyoDivinerConfig } from '../Config';
 import { XyoPayloadDivinerQueryPayload } from './Query';
-export declare abstract class XyoPayloadDiviner<Q extends XyoPayloadDivinerQueryPayload = XyoPayloadDivinerQueryPayload, C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoAbstractDiviner<Q, C> {
+export declare abstract class XyoPayloadDiviner<C extends XyoDivinerConfig = XyoDivinerConfig, Q extends XyoPayloadDivinerQueryPayload = XyoPayloadDivinerQueryPayload> extends XyoAbstractDiviner<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,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAA;AAEvD,8BAAsB,iBAAiB,CACrC,CAAC,SAAS,6BAA6B,GAAG,6BAA6B,EACvE,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"XyoPayloadDiviner.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAA;AAEvD,8BAAsB,iBAAiB,CACrC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,6BAA6B,GAAG,6BAA6B,CACvE,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;CAAG"}

package/dist/esm/Query.d.ts

@@ -0,0 +1,8 @@
+import { XyoDivinerQueryPayload } from './Diviner';
+export declare type XyoPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.query';
+export declare const XyoPayloadDivinerQuerySchema: XyoPayloadDivinerQuerySchema;
+export declare type XyoHuriPayloadDivinerQuery = XyoDivinerQueryPayload<XyoPayloadDivinerQuerySchema, {
+    schema: XyoPayloadDivinerQuerySchema;
+    huri: string;
+}>;
+//# sourceMappingURL=Query.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAElD,oBAAY,4BAA4B,GAAG,mCAAmC,CAAA;AAC9E,eAAO,MAAM,4BAA4B,EAAE,4BAAkE,CAAA;AAE7G,oBAAY,0BAA0B,GAAG,sBAAsB,CAC7D,4BAA4B,EAC5B;IACE,MAAM,EAAE,4BAA4B,CAAA;IACpC,IAAI,EAAE,MAAM,CAAA;CACb,CACF,CAAA"}

package/dist/esm/Query.js

@@ -0,0 +1,2 @@
+export const XyoPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.query';
+//# sourceMappingURL=Query.js.map

package/dist/esm/Query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../src/Query.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,4BAA4B,GAAiC,mCAAmC,CAAA"}

package/dist/esm/Sequence/XyoSequenceDiviner.d.ts

@@ -1,8 +1,9 @@
 import { XyoModuleQueryResult } from '@xyo-network/module';
 import { Promisable } from '@xyo-network/promisable';
 import { XyoAbstractDiviner } from '../Abstract';
+import { XyoDivinerConfig } from '../Config';
 import { XyoSequenceDivinerQueryPayload } from './XyoSequenceDivinerQueryPayload';
-export declare abstract class XyoSequenceDiviner<TQueryPayload extends XyoSequenceDivinerQueryPayload = XyoSequenceDivinerQueryPayload> extends XyoAbstractDiviner<TQueryPayload> {
+export declare abstract class XyoSequenceDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQueryPayload extends XyoSequenceDivinerQueryPayload = XyoSequenceDivinerQueryPayload> extends XyoAbstractDiviner<TConfig, TQueryPayload> {
     query(query: XyoSequenceDivinerQueryPayload): Promisable<XyoModuleQueryResult>;
 }
 //# sourceMappingURL=XyoSequenceDiviner.d.ts.map

package/dist/esm/Sequence/XyoSequenceDiviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoSequenceDiviner.d.ts","sourceRoot":"","sources":["../../../src/Sequence/XyoSequenceDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAA;AAEjF,8BAAsB,kBAAkB,CACtC,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,CACrF,SAAQ,kBAAkB,CAAC,aAAa,CAAC;IAChC,KAAK,CAAC,KAAK,EAAE,8BAA8B,GAAG,UAAU,CAAC,oBAAoB,CAAC;CAGxF"}
+{"version":3,"file":"XyoSequenceDiviner.d.ts","sourceRoot":"","sources":["../../../src/Sequence/XyoSequenceDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAA;AAEjF,8BAAsB,kBAAkB,CACtC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,aAAa,SAAS,8BAA8B,GAAG,8BAA8B,CACrF,SAAQ,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC;IACzC,KAAK,CAAC,KAAK,EAAE,8BAA8B,GAAG,UAAU,CAAC,oBAAoB,CAAC;CAGxF"}

package/dist/esm/Sequence/XyoSequenceDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoSequenceDiviner.js","sourceRoot":"","sources":["../../../src/Sequence/XyoSequenceDiviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD,MAAM,OAAgB,kBAEpB,SAAQ,kBAAiC;IAChC,KAAK,CAAC,KAAqC;QAClD,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAA;IAC3E,CAAC;CACF"}
+{"version":3,"file":"XyoSequenceDiviner.js","sourceRoot":"","sources":["../../../src/Sequence/XyoSequenceDiviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAIhD,MAAM,OAAgB,kBAGpB,SAAQ,kBAA0C;IACzC,KAAK,CAAC,KAAqC;QAClD,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,CAAA;IAC3E,CAAC;CACF"}

package/dist/esm/Sequence/XyoSequenceDivinerQueryPayload.d.ts

@@ -1,7 +1,7 @@
 import { XyoDivinerQueryPayload } from '../Diviner';
 export declare type XyoSequenceDivinerQueryPayloadSchema = 'network.xyo.diviner.sequence.query';
 export declare const XyoSequenceDivinerQueryPayloadSchema: XyoSequenceDivinerQueryPayloadSchema;
-export declare type XyoSequenceDivinerQueryPayload = XyoDivinerQueryPayload<{
+export declare type XyoSequenceDivinerQueryPayload = XyoDivinerQueryPayload<XyoSequenceDivinerQueryPayloadSchema, {
     schema: XyoSequenceDivinerQueryPayloadSchema;
     payload_hashes: string[];
     payload_schemas: string[];

package/dist/esm/Sequence/XyoSequenceDivinerQueryPayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoSequenceDivinerQueryPayload.d.ts","sourceRoot":"","sources":["../../../src/Sequence/XyoSequenceDivinerQueryPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnD,oBAAY,oCAAoC,GAAG,oCAAoC,CAAA;AACvF,eAAO,MAAM,oCAAoC,EAAE,oCAA2E,CAAA;AAE9H,oBAAY,8BAA8B,GAAG,sBAAsB,CAAC;IAClE,MAAM,EAAE,oCAAoC,CAAA;IAC5C,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,eAAe,EAAE,MAAM,EAAE,CAAA;CAC1B,CAAC,CAAA"}
+{"version":3,"file":"XyoSequenceDivinerQueryPayload.d.ts","sourceRoot":"","sources":["../../../src/Sequence/XyoSequenceDivinerQueryPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnD,oBAAY,oCAAoC,GAAG,oCAAoC,CAAA;AACvF,eAAO,MAAM,oCAAoC,EAAE,oCAA2E,CAAA;AAE9H,oBAAY,8BAA8B,GAAG,sBAAsB,CACjE,oCAAoC,EACpC;IACE,MAAM,EAAE,oCAAoC,CAAA;IAC5C,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,eAAe,EAAE,MAAM,EAAE,CAAA;CAC1B,CACF,CAAA"}

package/dist/esm/index.d.ts

@@ -1,5 +1,6 @@
 export * from './Abstract';
 export * from './Diviner';
 export * from './Payload';
+export * from './Query';
 export * from './Sequence';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,YAAY,CAAA"}

package/dist/esm/index.js

@@ -1,5 +1,6 @@
 export * from './Abstract';
 export * from './Diviner';
 export * from './Payload';
+export * from './Query';
 export * from './Sequence';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,YAAY,CAAA"}

package/package.json

@@ -10,15 +10,15 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/archivist": "^2.26.19",
-    "@xyo-network/module": "^2.26.19",
-    "@xyo-network/payload": "^2.26.19",
-    "@xyo-network/promisable": "^2.26.19",
+    "@xyo-network/archivist": "^2.27.0-rc.2",
+    "@xyo-network/module": "^2.27.0-rc.2",
+    "@xyo-network/payload": "^2.27.0-rc.2",
+    "@xyo-network/promisable": "^2.27.0-rc.2",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
-    "@xylabs/tsconfig": "^2.5.121"
+    "@xylabs/tsconfig": "^2.5.123"
   },
   "browser": "dist/esm/index.js",
   "docs": "dist/docs.json",
@@ -52,5 +52,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.26.19"
+  "version": "2.27.0-rc.2",
+  "stableVersion": "2.26.19"
 }

package/src/Abstract.ts

@@ -3,8 +3,11 @@ import { XyoAbstractModule } from '@xyo-network/module'
 import { XyoDivinerConfig } from './Config'
 import { XyoDiviner, XyoDivinerQueryPayload } from './Diviner'
 
-export abstract class XyoAbstractDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload, C extends XyoDivinerConfig = XyoDivinerConfig>
-  extends XyoAbstractModule<Q, C>
-  implements XyoDiviner<Q> {}
+export abstract class XyoAbstractDiviner<
+    TConfig extends XyoDivinerConfig = XyoDivinerConfig,
+    TQuery extends XyoDivinerQueryPayload = XyoDivinerQueryPayload,
+  >
+  extends XyoAbstractModule<TConfig, TQuery>
+  implements XyoDiviner<TQuery> {}
 
-export abstract class XyoAbstractTimestampDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> extends XyoAbstractDiviner<Q> {}
+export abstract class XyoAbstractTimestampDiviner<C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoAbstractDiviner<C> {}

package/src/Config.ts

@@ -4,4 +4,4 @@ import { XyoPayload } from '@xyo-network/payload'
 export type XyoDivinerConfigSchema = 'network.xyo.diviner.config'
 export const XyoDivinerConfigSchema: XyoDivinerConfigSchema = 'network.xyo.diviner.config'
 
-export type XyoDivinerConfig<T extends XyoPayload = XyoPayload<{ schema: XyoDivinerConfigSchema | string }>> = XyoModuleConfig<T>
+export type XyoDivinerConfig<TConfig extends XyoPayload = XyoPayload<{ schema: XyoDivinerConfigSchema | string }>> = XyoModuleConfig<TConfig>

package/src/Diviner.ts

@@ -1,6 +1,18 @@
 import { XyoModule, XyoQueryPayload } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 
-export type XyoDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<T>
+export type XyoDivinerQueryPayloadSchema = 'network.xyo.diviner.query'
+export const XyoDivinerQueryPayloadSchema: XyoDivinerQueryPayloadSchema = 'network.xyo.diviner.query'
+
+export type XyoDivinerQueryPayload<
+  TSchema extends string = string,
+  TQuery extends XyoQueryPayload = XyoQueryPayload,
+  TPayload extends XyoPayload = XyoPayload,
+> = XyoQueryPayload<
+  {
+    schema: TSchema
+    payloads: TPayload[]
+  } & TQuery
+>
 
 export type XyoDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> = XyoModule<Q>

package/src/Payload/Archivist/Diviner.ts

@@ -2,17 +2,20 @@ import { XyoArchivistGetQueryPayloadSchema } from '@xyo-network/archivist'
 import { XyoModuleQueryResult } from '@xyo-network/module'
 import { Huri } from '@xyo-network/payload'
 
+import { XyoAbstractDiviner } from '../../Abstract'
 import { profile } from '../lib'
-import { XyoPayloadDivinerQueryPayload } from '../Query'
-import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
+import { XyoPayloadDivinerQueryPayload, XyoPayloadDivinerQueryPayloadSchema } from '../Query'
 import { XyoArchivistPayloadDivinerConfig } from './Config'
-import { XyoArchivistPayloadDivinerQuery } from './Query'
 
-export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPayloadDivinerQuery, XyoArchivistPayloadDivinerConfig> {
+export class XyoArchivistPayloadDiviner extends XyoAbstractDiviner<XyoArchivistPayloadDivinerConfig, XyoPayloadDivinerQueryPayload> {
   protected get archivist() {
     return this.config.archivist
   }
 
+  override get queries() {
+    return [XyoPayloadDivinerQueryPayloadSchema]
+  }
+
   override async query(query: XyoPayloadDivinerQueryPayload): Promise<XyoModuleQueryResult> {
     const huri = new Huri(query.huri)
     const [[, payloads = []]] = await profile(

package/src/Payload/Archivist/index.ts

@@ -1,3 +1,2 @@
 export * from './Config'
 export * from './Diviner'
-export * from './Query'

package/src/Payload/Huri/Diviner.ts

@@ -2,17 +2,21 @@ import { XyoModuleQueryResult } from '@xyo-network/module'
 import { Huri } from '@xyo-network/payload'
 
 import { profile } from '../lib'
+import { XyoPayloadDivinerQueryPayload, XyoPayloadDivinerQueryPayloadSchema } from '../Query'
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoHuriPayloadDivinerConfig } from './Config'
-import { XyoHuriPayloadDivinerQuery } from './Query'
 
-export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerQuery, XyoHuriPayloadDivinerConfig> {
+export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerConfig, XyoPayloadDivinerQueryPayload> {
   protected get options() {
     return this.config.options
   }
 
-  override async query(query: XyoHuriPayloadDivinerQuery): Promise<XyoModuleQueryResult> {
-    const huri = new Huri(query.huri, query.options ?? this.options)
+  override get queries() {
+    return [XyoPayloadDivinerQueryPayloadSchema]
+  }
+
+  override async query(query: XyoPayloadDivinerQueryPayload): Promise<XyoModuleQueryResult> {
+    const huri = new Huri(query.huri, this.options)
     const [payload = null] = await profile(async () => await huri.fetch())
     const payloads = payload ? [payload] : []
     return [this.bindPayloads(payloads), payloads]

package/src/Payload/Query.ts

@@ -1,10 +1,16 @@
-import { XyoPayload, XyoQueryPayload } from '@xyo-network/payload'
+import { XyoPayload } from '@xyo-network/payload'
+
+import { XyoDivinerQueryPayload } from '../Diviner'
 
 export type XyoPayloadDivinerQueryPayloadSchema = 'network.xyo.diviner.payload.query'
 export const XyoPayloadDivinerQueryPayloadSchema: XyoPayloadDivinerQueryPayloadSchema = 'network.xyo.diviner.payload.query'
 
-export type XyoPayloadDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<
+export type XyoPayloadDivinerQueryPayload<
+  TSchema extends string = XyoPayloadDivinerQueryPayloadSchema,
+  TConfig extends XyoPayload = XyoPayload,
+> = XyoDivinerQueryPayload<
+  TSchema,
   {
     huri: string
-  } & T
+  } & TConfig
 >

package/src/Payload/XyoPayloadDiviner.ts

@@ -3,6 +3,6 @@ import { XyoDivinerConfig } from '../Config'
 import { XyoPayloadDivinerQueryPayload } from './Query'
 
 export abstract class XyoPayloadDiviner<
-  Q extends XyoPayloadDivinerQueryPayload = XyoPayloadDivinerQueryPayload,
   C extends XyoDivinerConfig = XyoDivinerConfig,
-> extends XyoAbstractDiviner<Q, C> {}
+  Q extends XyoPayloadDivinerQueryPayload = XyoPayloadDivinerQueryPayload,
+> extends XyoAbstractDiviner<C, Q> {}

package/src/Query.ts

@@ -0,0 +1,12 @@
+import { XyoDivinerQueryPayload } from './Diviner'
+
+export type XyoPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.query'
+export const XyoPayloadDivinerQuerySchema: XyoPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.query'
+
+export type XyoHuriPayloadDivinerQuery = XyoDivinerQueryPayload<
+  XyoPayloadDivinerQuerySchema,
+  {
+    schema: XyoPayloadDivinerQuerySchema
+    huri: string
+  }
+>

package/src/Sequence/XyoSequenceDiviner.ts

@@ -2,11 +2,13 @@ import { XyoModuleQueryResult } from '@xyo-network/module'
 import { Promisable } from '@xyo-network/promisable'
 
 import { XyoAbstractDiviner } from '../Abstract'
+import { XyoDivinerConfig } from '../Config'
 import { XyoSequenceDivinerQueryPayload } from './XyoSequenceDivinerQueryPayload'
 
 export abstract class XyoSequenceDiviner<
+  TConfig extends XyoDivinerConfig = XyoDivinerConfig,
   TQueryPayload extends XyoSequenceDivinerQueryPayload = XyoSequenceDivinerQueryPayload,
-> extends XyoAbstractDiviner<TQueryPayload> {
+> extends XyoAbstractDiviner<TConfig, TQueryPayload> {
   override query(query: XyoSequenceDivinerQueryPayload): Promisable<XyoModuleQueryResult> {
     return [this.bindHashes(query.payload_hashes, query.payload_schemas), []]
   }

package/src/Sequence/XyoSequenceDivinerQueryPayload.ts

@@ -3,8 +3,11 @@ import { XyoDivinerQueryPayload } from '../Diviner'
 export type XyoSequenceDivinerQueryPayloadSchema = 'network.xyo.diviner.sequence.query'
 export const XyoSequenceDivinerQueryPayloadSchema: XyoSequenceDivinerQueryPayloadSchema = 'network.xyo.diviner.sequence.query'
 
-export type XyoSequenceDivinerQueryPayload = XyoDivinerQueryPayload<{
-  schema: XyoSequenceDivinerQueryPayloadSchema
-  payload_hashes: string[]
-  payload_schemas: string[]
-}>
+export type XyoSequenceDivinerQueryPayload = XyoDivinerQueryPayload<
+  XyoSequenceDivinerQueryPayloadSchema,
+  {
+    schema: XyoSequenceDivinerQueryPayloadSchema
+    payload_hashes: string[]
+    payload_schemas: string[]
+  }
+>

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from './Abstract'
 export * from './Diviner'
 export * from './Payload'
+export * from './Query'
 export * from './Sequence'

package/dist/cjs/Payload/Archivist/Query.d.ts

@@ -1,7 +0,0 @@
-import { XyoPayloadDivinerQueryPayload } from '../Query';
-export declare type XyoArchivistPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.archivist.query';
-export declare const XyoArchivistPayloadDivinerQuerySchema: XyoArchivistPayloadDivinerQuerySchema;
-export declare type XyoArchivistPayloadDivinerQuery = XyoPayloadDivinerQueryPayload<{
-    schema: XyoArchivistPayloadDivinerQuerySchema;
-}>;
-//# sourceMappingURL=Query.d.ts.map

package/dist/cjs/Payload/Archivist/Query.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AAExD,oBAAY,qCAAqC,GAAG,6CAA6C,CAAA;AACjG,eAAO,MAAM,qCAAqC,EAAE,qCAAqF,CAAA;AAEzI,oBAAY,+BAA+B,GAAG,6BAA6B,CAAC;IAC1E,MAAM,EAAE,qCAAqC,CAAA;CAC9C,CAAC,CAAA"}

package/dist/cjs/Payload/Archivist/Query.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoArchivistPayloadDivinerQuerySchema = void 0;
-exports.XyoArchivistPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.archivist.query';
-//# sourceMappingURL=Query.js.map

package/dist/cjs/Payload/Archivist/Query.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Query.ts"],"names":[],"mappings":";;;AAGa,QAAA,qCAAqC,GAA0C,6CAA6C,CAAA"}

package/dist/cjs/Payload/Huri/Query.d.ts

@@ -1,10 +0,0 @@
-import { HuriOptions } from '@xyo-network/payload';
-import { XyoDivinerQueryPayload } from '../../Diviner';
-export declare type XyoHuriPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.huri.query';
-export declare const XyoHuriPayloadDivinerQuerySchema: XyoHuriPayloadDivinerQuerySchema;
-export declare type XyoHuriPayloadDivinerQuery = XyoDivinerQueryPayload<{
-    schema: XyoHuriPayloadDivinerQuerySchema;
-    options?: HuriOptions;
-    huri: string;
-}>;
-//# sourceMappingURL=Query.d.ts.map

package/dist/cjs/Payload/Huri/Query.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAEtD,oBAAY,gCAAgC,GAAG,wCAAwC,CAAA;AACvF,eAAO,MAAM,gCAAgC,EAAE,gCAA2E,CAAA;AAE1H,oBAAY,0BAA0B,GAAG,sBAAsB,CAAC;IAC9D,MAAM,EAAE,gCAAgC,CAAA;IACxC,OAAO,CAAC,EAAE,WAAW,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA"}

package/dist/cjs/Payload/Huri/Query.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XyoHuriPayloadDivinerQuerySchema = void 0;
-exports.XyoHuriPayloadDivinerQuerySchema = 'network.xyo.diviner.payload.huri.query';
-//# sourceMappingURL=Query.js.map

package/dist/cjs/Payload/Huri/Query.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Query.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Query.ts"],"names":[],"mappings":";;;AAKa,QAAA,gCAAgC,GAAqC,wCAAwC,CAAA"}