@xyo-network/diviner 2.27.0-rc.7 → 2.27.0

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<TConfig extends XyoPayload = XyoPayload<{
-    schema: XyoDivinerConfigSchema | string;
-}>> = XyoModuleConfig<TConfig>;
+export declare type XyoDivinerConfig<TTargetPayload extends XyoPayload = XyoPayload, TConfig extends XyoPayload = XyoPayload> = XyoModuleConfig<TConfig & {
+    targetSchema: TTargetPayload['schema'];
+}>;
 //# 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,OAAO,SAAS,UAAU,GAAG,UAAU,CAAC;IAAE,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAAA;CAAE,CAAC,IAAI,eAAe,CAAC,OAAO,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,cAAc,SAAS,UAAU,GAAG,UAAU,EAAE,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CACrI,OAAO,GAAG;IAAE,YAAY,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAA;CAAE,CACrD,CAAA"}

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

@@ -1,8 +1,9 @@
 import { XyoArchivist } from '@xyo-network/archivist';
-import { XyoHuriPayloadDivinerConfig } from '../Huri';
+import { XyoPayload } from '@xyo-network/payload';
+import { XyoDivinerConfig } from '../../Config';
 export declare type XyoArchivistPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.archivist.config';
 export declare const XyoArchivistPayloadDivinerConfigSchema: XyoArchivistPayloadDivinerConfigSchema;
-export declare type XyoArchivistPayloadDivinerConfig = XyoHuriPayloadDivinerConfig<{
+export declare type XyoArchivistPayloadDivinerConfig<TTargetPayload extends XyoPayload = XyoPayload, T extends XyoPayload = XyoPayload> = XyoDivinerConfig<TTargetPayload, T & {
     schema: XyoArchivistPayloadDivinerConfigSchema;
     archivist: XyoArchivist;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAA;AAErD,oBAAY,sCAAsC,GAAG,8CAA8C,CAAA;AACnG,eAAO,MAAM,sCAAsC,EAAE,sCAAuF,CAAA;AAE5I,oBAAY,gCAAgC,GAAG,2BAA2B,CAAC;IACzE,MAAM,EAAE,sCAAsC,CAAA;IAC9C,SAAS,EAAE,YAAY,CAAA;CACxB,CAAC,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,oBAAY,sCAAsC,GAAG,8CAA8C,CAAA;AACnG,eAAO,MAAM,sCAAsC,EAAE,sCAAuF,CAAA;AAE5I,oBAAY,gCAAgC,CAAC,cAAc,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,gBAAgB,CAChJ,cAAc,EACd,CAAC,GAAG;IACF,MAAM,EAAE,sCAAsC,CAAA;IAC9C,SAAS,EAAE,YAAY,CAAA;CACxB,CACF,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Config.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,sCAAsC,GAA2C,8CAA8C,CAAA"}
+{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Config.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,sCAAsC,GAA2C,8CAA8C,CAAA"}

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

@@ -1,9 +1,9 @@
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfig } from './Config';
-export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPayloadDivinerConfig> {
+export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
     protected get archivist(): import("@xyo-network/archivist").XyoArchivist<import("@xyo-network/archivist").XyoArchivistQueryPayload<never>>;
     get queries(): "network.xyo.query.diviner.divine"[];
-    divine(_payloads: XyoPayloads): Promise<XyoPayload | null>;
+    divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# 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,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAIpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAE3D,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,gCAAgC,CAAC;IACjG,SAAS,KAAK,SAAS,oHAEtB;IAED,IAAa,OAAO,yCAEnB;IAEY,MAAM,CAAC,SAAS,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAOxE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAAE,MAAM,UAAU,CAAA;AAE3D,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,UAAU,EAAE,gCAAgC,CAAC;IAC7G,SAAS,KAAK,SAAS,oHAEtB;IAED,IAAa,OAAO,yCAEnB;IAEY,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAQxE"}

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

@@ -1,7 +1,9 @@
+import { assertEx } from '@xylabs/assert';
 import { XyoArchivistGetQueryPayloadSchema } from '@xyo-network/archivist';
 import { Huri } from '@xyo-network/payload';
 import { XyoDivinerDivineQuerySchema } from '../../Query';
 import { profile } from '../lib';
+import { XyoHuriPayloadSchema } from '../XyoHuriPayload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
     get archivist() {
@@ -10,10 +12,11 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
     get queries() {
         return [XyoDivinerDivineQuerySchema];
     }
-    async divine(_payloads) {
-        const huriObj = new Huri(this.config.huri);
-        const [[, payloads = []]] = await profile(async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQueryPayloadSchema }));
-        return payloads?.[0] ?? null;
+    async divine(payloads) {
+        const huriPayload = assertEx(payloads?.find((payload) => payload?.schema === XyoHuriPayloadSchema));
+        const huriObj = new Huri(huriPayload.huri);
+        const [[, resultPayloads = []]] = await profile(async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQueryPayloadSchema }));
+        return resultPayloads?.[0] ?? null;
     }
 }
 //# sourceMappingURL=Diviner.js.map

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;AAC1E,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,0BAA2B,SAAQ,iBAAmD;IACjG,IAAc,SAAS;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,2BAA2B,CAAC,CAAA;IACtC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,SAAsB;QACxC,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC1C,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,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iCAAiC,EAAE,CAAC,CAC9G,CAAA;QACD,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;IAC9B,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,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,0BAA2B,SAAQ,iBAA+D;IAC7G,IAAc,SAAS;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,2BAA2B,CAAC,CAAA;IACtC,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,oBAAoB,CAAC,CAAC,CAAA;QAC9H,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,CAAC,CAAC,EAAE,cAAc,GAAG,EAAE,CAAC,CAAC,GAAG,MAAM,OAAO,CAC7C,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,iCAAiC,EAAE,CAAC,CAC9G,CAAA;QACD,OAAO,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;IACpC,CAAC;CACF"}

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

@@ -2,9 +2,8 @@ import { HuriOptions, XyoPayload } from '@xyo-network/payload';
 import { XyoDivinerConfig } from '../../Config';
 export declare type XyoHuriPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.huri.config';
 export declare const XyoHuriPayloadDivinerConfigSchema: XyoHuriPayloadDivinerConfigSchema;
-export declare type XyoHuriPayloadDivinerConfig<T extends XyoPayload = XyoPayload> = XyoDivinerConfig<T & {
+export declare type XyoHuriPayloadDivinerConfig<TTargetPayload extends XyoPayload = XyoPayload, T extends XyoPayload = XyoPayload> = XyoDivinerConfig<TTargetPayload, T & {
     schema: XyoHuriPayloadDivinerConfigSchema;
-    huri: string;
     options?: HuriOptions;
 }>;
 //# sourceMappingURL=Config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,oBAAY,iCAAiC,GAAG,yCAAyC,CAAA;AACzF,eAAO,MAAM,iCAAiC,EAAE,iCAA6E,CAAA;AAE7H,oBAAY,2BAA2B,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,gBAAgB,CAC3F,CAAC,GAAG;IACF,MAAM,EAAE,iCAAiC,CAAA;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,WAAW,CAAA;CACtB,CACF,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,oBAAY,iCAAiC,GAAG,yCAAyC,CAAA;AACzF,eAAO,MAAM,iCAAiC,EAAE,iCAA6E,CAAA;AAE7H,oBAAY,2BAA2B,CAAC,cAAc,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,gBAAgB,CAC3I,cAAc,EACd,CAAC,GAAG;IACF,MAAM,EAAE,iCAAiC,CAAA;IACzC,OAAO,CAAC,EAAE,WAAW,CAAA;CACtB,CACF,CAAA"}

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

@@ -1,9 +1,9 @@
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoHuriPayloadDivinerConfig } from './Config';
-export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerConfig> {
+export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoHuriPayloadDivinerConfig> {
     protected get options(): import("@xyo-network/payload").HuriOptions | undefined;
     get queries(): "network.xyo.query.diviner.divine"[];
-    divine(_payloads?: XyoPayloads): Promise<XyoPayload | null>;
+    divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# 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,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAIpE,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;IAED,IAAa,OAAO,yCAEnB;IAEc,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAK3E"}
+{"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;IAED,IAAa,OAAO,yCAEnB;IAEc,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAM1E"}

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

@@ -1,6 +1,8 @@
+import { assertEx } from '@xylabs/assert';
 import { Huri } from '@xyo-network/payload';
 import { XyoDivinerDivineQuerySchema } from '../../Query';
 import { profile } from '../lib';
+import { XyoHuriPayloadSchema } from '../XyoHuriPayload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 export class XyoHuriPayloadDiviner extends XyoPayloadDiviner {
     get options() {
@@ -9,8 +11,9 @@ export class XyoHuriPayloadDiviner extends XyoPayloadDiviner {
     get queries() {
         return [XyoDivinerDivineQuerySchema];
     }
-    async divine(_payloads) {
-        const huri = new Huri(this.config.huri, this.options);
+    async divine(payloads) {
+        const huriPayload = assertEx(payloads?.find((payload) => payload?.schema === XyoHuriPayloadSchema));
+        const huri = new Huri(huriPayload?.huri, this.options);
         const [payload = null] = await profile(async () => await huri.fetch());
         return payload;
     }

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,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA8C;IACvF,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,2BAA2B,CAAC,CAAA;IACtC,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,SAAuB;QAC3C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QACrD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,OAAO,OAAO,CAAA;IAChB,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,aAAa,CAAA;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA0D;IACnG,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,2BAA2B,CAAC,CAAA;IACtC,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,oBAAoB,CAAC,CAAC,CAAA;QAC9H,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,CAAA;IAChB,CAAC;CACF"}

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

@@ -0,0 +1,8 @@
+import { XyoPayload } from '@xyo-network/payload';
+export declare type XyoHuriPayloadSchema = 'network.xyo.huri';
+export declare const XyoHuriPayloadSchema: XyoHuriPayloadSchema;
+export declare type XyoHuriPayload = XyoPayload<{
+    schema: 'network.xyo.huri';
+    huri: string;
+}>;
+//# sourceMappingURL=XyoHuriPayload.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"XyoHuriPayload.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoHuriPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,oBAAY,oBAAoB,GAAG,kBAAkB,CAAA;AACrD,eAAO,MAAM,oBAAoB,EAAE,oBAAyC,CAAA;AAE5E,oBAAY,cAAc,GAAG,UAAU,CAAC;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA"}

package/dist/esm/Payload/XyoHuriPayload.js

@@ -0,0 +1,2 @@
+export const XyoHuriPayloadSchema = 'network.xyo.huri';
+//# sourceMappingURL=XyoHuriPayload.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"XyoHuriPayload.js","sourceRoot":"","sources":["../../../src/Payload/XyoHuriPayload.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,oBAAoB,GAAyB,kBAAkB,CAAA"}

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

@@ -1,5 +1,7 @@
-import { XyoAbstractDiviner } from '../Abstract';
+import { XyoPayload } from '@xyo-network/payload';
 import { XyoDivinerConfig } from '../Config';
-export declare abstract class XyoPayloadDiviner<C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoAbstractDiviner<C> {
+import { XyoDivinerQueryPayload } from '../Query';
+import { XyoDiviner } from '../XyoDiviner';
+export declare abstract class XyoPayloadDiviner<T extends XyoPayload = XyoPayload, C extends XyoDivinerConfig<T> = XyoDivinerConfig<T>, Q extends XyoDivinerQueryPayload<T> = XyoDivinerQueryPayload<T>> extends XyoDiviner<T, 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;AAE5C,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;CAAG"}
+{"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,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACjD,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,sBAAsB,CAAC,CAAC,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAC/D,SAAQ,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG"}

package/dist/esm/Payload/XyoPayloadDiviner.js

@@ -1,4 +1,4 @@
-import { XyoAbstractDiviner } from '../Abstract';
-export class XyoPayloadDiviner extends XyoAbstractDiviner {
+import { XyoDiviner } from '../XyoDiviner';
+export class XyoPayloadDiviner extends XyoDiviner {
 }
 //# sourceMappingURL=XyoPayloadDiviner.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"XyoPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAGhD,MAAM,OAAgB,iBAAiE,SAAQ,kBAAqB;CAAG"}
+{"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"}

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

@@ -1,5 +1,5 @@
 export * from './Archivist';
 export * from './Huri';
-export * from './Query';
+export * from './XyoHuriPayload';
 export * from './XyoPayloadDiviner';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Payload/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Payload/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA"}

package/dist/esm/Payload/index.js

@@ -1,5 +1,5 @@
 export * from './Archivist';
 export * from './Huri';
-export * from './Query';
+export * from './XyoHuriPayload';
 export * from './XyoPayloadDiviner';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Payload/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Payload/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA"}

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

@@ -1,8 +1,8 @@
-import { XyoPayloads, XyoQueryPayload } from '@xyo-network/payload';
+import { XyoPayload, XyoPayloads, XyoQueryPayload } from '@xyo-network/payload';
 export declare type XyoDivinerDivineQuerySchema = 'network.xyo.query.diviner.divine';
 export declare const XyoDivinerDivineQuerySchema: XyoDivinerDivineQuerySchema;
-export declare type XyoDivinerDivineQueryPayload = XyoQueryPayload<{
+export declare type XyoDivinerDivineQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<{
     schema: XyoDivinerDivineQuerySchema;
-    payloads?: XyoPayloads;
+    payloads?: XyoPayloads<T>;
 }>;
 //# sourceMappingURL=Divine.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Query/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEnE,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,4BAA4B,GAAG,eAAe,CAAC;IACzD,MAAM,EAAE,2BAA2B,CAAA;IACnC,QAAQ,CAAC,EAAE,WAAW,CAAA;CACvB,CAAC,CAAA"}
+{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Query/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE/E,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,4BAA4B,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC;IAC5F,MAAM,EAAE,2BAA2B,CAAA;IACnC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAC1B,CAAC,CAAA"}

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

@@ -1,4 +1,5 @@
 import { XyoModuleQueryPayload } from '@xyo-network/module';
+import { XyoPayload } from '@xyo-network/payload';
 import { XyoDivinerDivineQueryPayload } from './Divine';
-export declare type XyoDivinerQueryPayload = XyoDivinerDivineQueryPayload | XyoModuleQueryPayload;
+export declare type XyoDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoDivinerDivineQueryPayload<T> | XyoModuleQueryPayload;
 //# sourceMappingURL=Payload.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAEvD,oBAAY,sBAAsB,GAAG,4BAA4B,GAAG,qBAAqB,CAAA"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAEvD,oBAAY,sBAAsB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,4BAA4B,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAA"}

package/dist/esm/XyoDiviner.d.ts

@@ -1,4 +1,19 @@
-import { XyoModule } from '@xyo-network/module';
-import { XyoDivinerQueryPayload } from './Query';
-export declare type XyoDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> = XyoModule<Q>;
+import { XyoAbstractModule, XyoModuleQueryResult } from '@xyo-network/module';
+import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
+import { Promisable } from '@xyo-network/promisable';
+import { XyoDivinerConfig } from './Config';
+import { XyoDivinerQueryPayload, XyoDivinerQuerySchema } from './Query';
+export declare abstract class XyoDiviner<TPayload extends XyoPayload = XyoPayload, TConfig extends XyoDivinerConfig<TPayload> = XyoDivinerConfig<TPayload>, TQuery extends XyoDivinerQueryPayload<TPayload> = XyoDivinerQueryPayload<TPayload>> extends XyoAbstractModule<TConfig, TQuery> {
+    abstract divine(payloads?: XyoPayloads<TPayload>): Promisable<TPayload | null>;
+    get queries(): (TQuery['schema'] | XyoDivinerQuerySchema)[];
+    query(query: TQuery): Promise<XyoModuleQueryResult>;
+}
+export declare abstract class XyoTimestampDiviner<TPayload extends XyoPayload = XyoPayload, TConfig extends XyoDivinerConfig<TPayload> = XyoDivinerConfig<TPayload>, TQuery extends XyoDivinerQueryPayload<TPayload> = XyoDivinerQueryPayload<TPayload>> extends XyoDiviner<TPayload, TConfig, TQuery> {
+}
+/** @deprecated use XyoDiviner instead*/
+export declare abstract class XyoAbstractDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> extends XyoDiviner<XyoPayload, TConfig, TQuery> {
+}
+/** @deprecated use XyoDiviner instead*/
+export declare abstract class XyoAbstractTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> extends XyoTimestampDiviner<XyoPayload, 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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAA;AAEhD,oBAAY,UAAU,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAA+B,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAEpG,8BAAsB,UAAU,CAC9B,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,OAAO,SAAS,gBAAgB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EACvE,MAAM,SAAS,sBAAsB,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAClF,SAAQ,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1C,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;IAE9E,IAAoB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,qBAAqB,CAAC,EAAE,CAE1E;IAEK,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAa1D;AAED,8BAAsB,mBAAmB,CACvC,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,OAAO,SAAS,gBAAgB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EACvE,MAAM,SAAS,sBAAsB,CAAC,QAAQ,CAAC,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAClF,SAAQ,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG;AAElD,wCAAwC;AACxC,8BAAsB,kBAAkB,CACtC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,sBAAsB,GAAG,sBAAsB,CAC9D,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,sBAAsB,GAAG,sBAAsB,CAC9D,SAAQ,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG"}

package/dist/esm/XyoDiviner.js

@@ -1,2 +1,28 @@
-export {};
+import { XyoAbstractModule } from '@xyo-network/module';
+import { XyoDivinerDivineQuerySchema } from './Query';
+export class XyoDiviner extends XyoAbstractModule {
+    get queries() {
+        return [XyoDivinerDivineQuerySchema];
+    }
+    async query(query) {
+        if (!this.queries.find((schema) => schema === query.schema)) {
+            console.error(`Undeclared Module Query: ${query.schema}`);
+        }
+        const payloads = [];
+        switch (query.schema) {
+            case XyoDivinerDivineQuerySchema:
+                payloads.push(await this.divine(query.payloads));
+                break;
+        }
+        return [this.bindPayloads(payloads), payloads];
+    }
+}
+export class XyoTimestampDiviner extends XyoDiviner {
+}
+/** @deprecated use XyoDiviner instead*/
+export class XyoAbstractDiviner extends XyoDiviner {
+}
+/** @deprecated use XyoDiviner instead*/
+export class XyoAbstractTimestampDiviner extends XyoTimestampDiviner {
+}
 //# sourceMappingURL=XyoDiviner.js.map

package/dist/esm/XyoDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":""}
+{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAwB,MAAM,qBAAqB,CAAA;AAK7E,OAAO,EAAE,2BAA2B,EAAiD,MAAM,SAAS,CAAA;AAEpG,MAAM,OAAgB,UAIpB,SAAQ,iBAAkC;IAG1C,IAAoB,OAAO;QACzB,OAAO,CAAC,2BAA2B,CAAC,CAAA;IACtC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAa;QACvB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;YAC3D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;SAC1D;QAED,MAAM,QAAQ,GAAwB,EAAE,CAAA;QACxC,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;SACR;QACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,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"}

package/dist/esm/index.d.ts

@@ -1,4 +1,3 @@
-export * from './Abstract';
 export * from './Config';
 export * from './Diviner';
 export * from './Payload';

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,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA"}

package/dist/esm/index.js

@@ -1,4 +1,3 @@
-export * from './Abstract';
 export * from './Config';
 export * from './Diviner';
 export * from './Payload';

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,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,cAAc,CAAA"}

package/package.json

@@ -10,10 +10,11 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/archivist": "^2.27.0-rc.7",
-    "@xyo-network/module": "^2.27.0-rc.7",
-    "@xyo-network/payload": "^2.27.0-rc.7",
-    "@xyo-network/promisable": "^2.27.0-rc.7",
+    "@xylabs/assert": "^2.6.7",
+    "@xyo-network/archivist": "^2.27.0",
+    "@xyo-network/module": "^2.27.0",
+    "@xyo-network/payload": "^2.27.0",
+    "@xyo-network/promisable": "^2.27.0",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -52,6 +53,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.27.0-rc.7",
-  "stableVersion": "2.26.19"
+  "version": "2.27.0"
 }

package/src/Config.ts

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

package/src/Payload/Archivist/Config.ts

@@ -1,11 +1,15 @@
 import { XyoArchivist } from '@xyo-network/archivist'
+import { XyoPayload } from '@xyo-network/payload'
 
-import { XyoHuriPayloadDivinerConfig } from '../Huri'
+import { XyoDivinerConfig } from '../../Config'
 
 export type XyoArchivistPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.archivist.config'
 export const XyoArchivistPayloadDivinerConfigSchema: XyoArchivistPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.archivist.config'
 
-export type XyoArchivistPayloadDivinerConfig = XyoHuriPayloadDivinerConfig<{
-  schema: XyoArchivistPayloadDivinerConfigSchema
-  archivist: XyoArchivist
-}>
+export type XyoArchivistPayloadDivinerConfig<TTargetPayload extends XyoPayload = XyoPayload, T extends XyoPayload = XyoPayload> = XyoDivinerConfig<
+  TTargetPayload,
+  T & {
+    schema: XyoArchivistPayloadDivinerConfigSchema
+    archivist: XyoArchivist
+  }
+>

package/src/Payload/Archivist/Diviner.ts

@@ -1,12 +1,14 @@
+import { assertEx } from '@xylabs/assert'
 import { XyoArchivistGetQueryPayloadSchema } from '@xyo-network/archivist'
 import { Huri, XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
 import { XyoDivinerDivineQuerySchema } from '../../Query'
 import { profile } from '../lib'
+import { XyoHuriPayload, XyoHuriPayloadSchema } from '../XyoHuriPayload'
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoArchivistPayloadDivinerConfig } from './Config'
 
-export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPayloadDivinerConfig> {
+export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
   protected get archivist() {
     return this.config.archivist
   }
@@ -15,11 +17,12 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPa
     return [XyoDivinerDivineQuerySchema]
   }
 
-  public async divine(_payloads: XyoPayloads): Promise<XyoPayload | null> {
-    const huriObj = new Huri(this.config.huri)
-    const [[, payloads = []]] = await profile(
+  public async divine(payloads?: XyoPayloads): Promise<XyoPayload | null> {
+    const huriPayload = assertEx(payloads?.find((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriPayloadSchema))
+    const huriObj = new Huri(huriPayload.huri)
+    const [[, resultPayloads = []]] = await profile(
       async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQueryPayloadSchema }),
     )
-    return payloads?.[0] ?? null
+    return resultPayloads?.[0] ?? null
   }
 }

package/src/Payload/Huri/Config.ts

@@ -5,10 +5,10 @@ import { XyoDivinerConfig } from '../../Config'
 export type XyoHuriPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.huri.config'
 export const XyoHuriPayloadDivinerConfigSchema: XyoHuriPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.huri.config'
 
-export type XyoHuriPayloadDivinerConfig<T extends XyoPayload = XyoPayload> = XyoDivinerConfig<
+export type XyoHuriPayloadDivinerConfig<TTargetPayload extends XyoPayload = XyoPayload, T extends XyoPayload = XyoPayload> = XyoDivinerConfig<
+  TTargetPayload,
   T & {
     schema: XyoHuriPayloadDivinerConfigSchema
-    huri: string
     options?: HuriOptions
   }
 >

package/src/Payload/Huri/Diviner.ts

@@ -1,11 +1,13 @@
+import { assertEx } from '@xylabs/assert'
 import { Huri, XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
 import { XyoDivinerDivineQuerySchema } from '../../Query'
 import { profile } from '../lib'
+import { XyoHuriPayload, XyoHuriPayloadSchema } from '../XyoHuriPayload'
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoHuriPayloadDivinerConfig } from './Config'
 
-export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerConfig> {
+export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoHuriPayloadDivinerConfig> {
   protected get options() {
     return this.config.options
   }
@@ -14,8 +16,9 @@ export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivin
     return [XyoDivinerDivineQuerySchema]
   }
 
-  override async divine(_payloads?: XyoPayloads): Promise<XyoPayload | null> {
-    const huri = new Huri(this.config.huri, this.options)
+  override async divine(payloads?: XyoPayloads): Promise<XyoPayload | null> {
+    const huriPayload = assertEx(payloads?.find((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriPayloadSchema))
+    const huri = new Huri(huriPayload?.huri, this.options)
     const [payload = null] = await profile(async () => await huri.fetch())
     return payload
   }

package/src/Payload/XyoHuriPayload.ts

@@ -0,0 +1,9 @@
+import { XyoPayload } from '@xyo-network/payload'
+
+export type XyoHuriPayloadSchema = 'network.xyo.huri'
+export const XyoHuriPayloadSchema: XyoHuriPayloadSchema = 'network.xyo.huri'
+
+export type XyoHuriPayload = XyoPayload<{
+  schema: 'network.xyo.huri'
+  huri: string
+}>

package/src/Payload/XyoPayloadDiviner.ts

@@ -1,4 +1,11 @@
-import { XyoAbstractDiviner } from '../Abstract'
+import { XyoPayload } from '@xyo-network/payload'
+
 import { XyoDivinerConfig } from '../Config'
+import { XyoDivinerQueryPayload } from '../Query'
+import { XyoDiviner } from '../XyoDiviner'
 
-export abstract class XyoPayloadDiviner<C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoAbstractDiviner<C> {}
+export abstract class XyoPayloadDiviner<
+  T extends XyoPayload = XyoPayload,
+  C extends XyoDivinerConfig<T> = XyoDivinerConfig<T>,
+  Q extends XyoDivinerQueryPayload<T> = XyoDivinerQueryPayload<T>,
+> extends XyoDiviner<T, C, Q> {}

package/src/Payload/index.ts

@@ -1,4 +1,4 @@
 export * from './Archivist'
 export * from './Huri'
-export * from './Query'
+export * from './XyoHuriPayload'
 export * from './XyoPayloadDiviner'

package/src/Query/Divine.ts

@@ -1,9 +1,9 @@
-import { XyoPayloads, XyoQueryPayload } from '@xyo-network/payload'
+import { XyoPayload, XyoPayloads, XyoQueryPayload } from '@xyo-network/payload'
 
 export type XyoDivinerDivineQuerySchema = 'network.xyo.query.diviner.divine'
 export const XyoDivinerDivineQuerySchema: XyoDivinerDivineQuerySchema = 'network.xyo.query.diviner.divine'
 
-export type XyoDivinerDivineQueryPayload = XyoQueryPayload<{
+export type XyoDivinerDivineQueryPayload<T extends XyoPayload = XyoPayload> = XyoQueryPayload<{
   schema: XyoDivinerDivineQuerySchema
-  payloads?: XyoPayloads
+  payloads?: XyoPayloads<T>
 }>

package/src/Query/Payload.ts

@@ -1,5 +1,6 @@
 import { XyoModuleQueryPayload } from '@xyo-network/module'
+import { XyoPayload } from '@xyo-network/payload'
 
 import { XyoDivinerDivineQueryPayload } from './Divine'
 
-export type XyoDivinerQueryPayload = XyoDivinerDivineQueryPayload | XyoModuleQueryPayload
+export type XyoDivinerQueryPayload<T extends XyoPayload = XyoPayload> = XyoDivinerDivineQueryPayload<T> | XyoModuleQueryPayload