@xyo-network/diviner 2.35.0 → 2.36.0-rc.1

package/dist/cjs/Diviner.d.ts

@@ -2,7 +2,7 @@ import { Module } from '@xyo-network/module';
 import { XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 export interface Diviner {
-    divine: (context?: string, payloads?: XyoPayloads) => Promisable<XyoPayloads>;
+    divine: (payloads?: XyoPayloads) => Promisable<XyoPayloads>;
 }
 export interface DivinerModule extends Module, Diviner {
 }

package/dist/cjs/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,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAO;IAEtB,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,KAAK,UAAU,CAAC,WAAW,CAAC,CAAA;CAC9E;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,EAAE,OAAO;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,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAO;IAEtB,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,WAAW,KAAK,UAAU,CAAC,WAAW,CAAC,CAAA;CAC5D;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,EAAE,OAAO;CAAG"}

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

@@ -7,6 +7,6 @@ export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArc
     protected readonly archivist?: PayloadArchivist | null;
     constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: PayloadArchivist, resolver?: XyoModuleResolverFunc);
     queries(): string[];
-    divine(context?: string, payloads?: XyoPayloads): Promise<XyoPayloads>;
+    divine(payloads?: XyoPayloads): Promise<XyoPayloads>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

package/dist/cjs/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,EAAyE,MAAM,wBAAwB,CAAA;AAChI,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAwB,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKxE,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,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAqBpF"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAyE,MAAM,wBAAwB,CAAA;AAChI,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,EAAwB,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAIxE,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,WAAW,CAAC;CAclE"}

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

@@ -6,7 +6,6 @@ const assert_1 = require("@xylabs/assert");
 const archivist_1 = require("@xyo-network/archivist");
 const payload_1 = require("@xyo-network/payload");
 const Queries_1 = require("../../Queries");
-const lib_1 = require("../lib");
 const XyoHuriPayload_1 = require("../XyoHuriPayload");
 const XyoPayloadDiviner_1 = require("../XyoPayloadDiviner");
 const Config_1 = require("./Config");
@@ -23,19 +22,15 @@ class XyoArchivistPayloadDiviner extends XyoPayloadDiviner_1.XyoPayloadDiviner {
     queries() {
         return [Queries_1.XyoDivinerDivineQuerySchema, ...super.queries()];
     }
-    divine(context, payloads) {
+    divine(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const huriPayloads = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.filter((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === XyoHuriPayload_1.XyoHuriSchema), `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`);
-            const huriPayload = context
-                ? (0, assert_1.assertEx)(huriPayloads.find((payload) => payload_1.PayloadWrapper.hash(payload) === context), `context hash provided not found [${context}, ${JSON.stringify(payloads, null, 2)}]`)
-                : huriPayloads[0];
-            const hashes = huriPayload.huri.map((huri) => new payload_1.Huri(huri).hash);
+            const hashes = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new payload_1.Huri(huri).hash)).flat();
             const activeArchivist = this.archivist;
             if (activeArchivist) {
-                const query = { hashes, schema: archivist_1.XyoArchivistGetQuerySchema };
-                const bw = (yield this.bindPayloads([query]))[0];
-                const [[, payloads]] = yield (0, lib_1.profile)(() => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield activeArchivist.query(bw, query); }));
-                return payloads;
+                const queryPayload = payload_1.PayloadWrapper.parse({ hashes, schema: archivist_1.XyoArchivistGetQuerySchema });
+                const query = yield this.bindQuery([queryPayload.body], queryPayload.hash);
+                return (yield activeArchivist.query(query[0], query[1]))[1];
             }
             return [];
         });

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,sDAAgI;AAEhI,kDAAwE;AAExE,2CAA2D;AAC3D,gCAAgC;AAChC,sDAAiE;AACjE,4DAAwD;AACxD,qCAAmG;AAEnG,MAAa,0BAA2B,SAAQ,qCAAmD;IAGjG,YAAY,MAA8D,EAAE,SAA4B,EAAE,QAAgC;;QACxI,KAAK,iCAAM,MAAM,KAAE,MAAM,EAAE,+CAAsC,KAAI,SAAS,EAAE,QAAQ,CAAC,CAAA;QACzF,MAAM,sBAAsB,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAA;QAChD,MAAM,iBAAiB,GACrB,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,MAAC,MAAA,IAAI,CAAC,QAAQ,qDAAG,sBAAsB,CAAiC,mCAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACjI,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,+BAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;SACvF;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,qCAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEY,MAAM,CAAC,OAAgB,EAAE,QAAsB;;YAC1D,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAC3B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,8BAAa,CAAC,EAC3F,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClE,CAAA;YACD,MAAM,WAAW,GAAG,OAAO;gBACzB,CAAC,CAAC,IAAA,iBAAQ,EACN,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,wBAAc,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,EACxE,oCAAoC,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CACrF;gBACH,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;YACnB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,cAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAA;YAClE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAA;YACtC,IAAI,eAAe,EAAE;gBACnB,MAAM,KAAK,GAAyB,EAAE,MAAM,EAAE,MAAM,EAAE,sCAA0B,EAAE,CAAA;gBAClF,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAChD,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,MAAM,IAAA,aAAO,EAAC,GAAS,EAAE,wDAAC,OAAA,MAAM,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA,GAAA,CAAC,CAAA;gBACxF,OAAO,QAAQ,CAAA;aAChB;YACD,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;CACF;AAtCD,gEAsCC"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,sDAAgI;AAEhI,kDAAwE;AAExE,2CAA2D;AAC3D,sDAAiE;AACjE,4DAAwD;AACxD,qCAAmG;AAEnG,MAAa,0BAA2B,SAAQ,qCAAmD;IAGjG,YAAY,MAA8D,EAAE,SAA4B,EAAE,QAAgC;;QACxI,KAAK,iCAAM,MAAM,KAAE,MAAM,EAAE,+CAAsC,KAAI,SAAS,EAAE,QAAQ,CAAC,CAAA;QACzF,MAAM,sBAAsB,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAA;QAChD,MAAM,iBAAiB,GACrB,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,MAAC,MAAA,IAAI,CAAC,QAAQ,qDAAG,sBAAsB,CAAiC,mCAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACjI,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,+BAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;SACvF;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,qCAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEY,MAAM,CAAC,QAAsB;;YACxC,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAC3B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,8BAAa,CAAC,EAC3F,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClE,CAAA;YACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,cAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YAC5G,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAA;YACtC,IAAI,eAAe,EAAE;gBACnB,MAAM,YAAY,GAAG,wBAAc,CAAC,KAAK,CAAuB,EAAE,MAAM,EAAE,MAAM,EAAE,sCAA0B,EAAE,CAAC,CAAA;gBAC/G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;gBAC1E,OAAO,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;aAC5D;YACD,OAAO,EAAE,CAAA;QACX,CAAC;KAAA;CACF;AA/BD,gEA+BC"}

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

@@ -4,6 +4,6 @@ import { XyoHuriPayloadDivinerConfig } from './Config';
 export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerConfig> {
     protected get options(): import("@xyo-network/payload").HuriOptions | undefined;
     queries(): string[];
-    divine(context?: string, payloads?: XyoPayloads): Promise<XyoPayloads>;
+    divine(payloads?: XyoPayloads): Promise<XyoPayloads>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

package/dist/cjs/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,EAAwB,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKxE,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,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAQtF"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKxD,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,WAAW,CAAC;CAUpE"}

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

@@ -16,12 +16,11 @@ class XyoHuriPayloadDiviner extends XyoPayloadDiviner_1.XyoPayloadDiviner {
     queries() {
         return [Queries_1.XyoDivinerDivineQuerySchema, ...super.queries()];
     }
-    divine(context, payloads) {
+    divine(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const huriPayloads = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.filter((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === XyoHuriPayload_1.XyoHuriSchema));
-            const huriPayload = (0, assert_1.assertEx)(huriPayloads.find((payload) => payload_1.PayloadWrapper.hash(payload) === context));
-            const huriObj = huriPayload.huri.map((huri) => new payload_1.Huri(huri));
-            const settled = yield Promise.allSettled(huriObj.map((huri) => huri.fetch()));
+            const huriPayloads = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.filter((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === XyoHuriPayload_1.XyoHuriSchema), `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`);
+            const huriList = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new payload_1.Huri(huri))).flat();
+            const settled = yield Promise.allSettled(huriList.map((huri) => huri.fetch()));
             return (0, compact_1.default)(settled.map((settle) => (settle.status === 'fulfilled' ? settle.value : null)));
         });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAwE;AACxE,qEAAoC;AAEpC,2CAA2D;AAC3D,sDAAiE;AACjE,4DAAwD;AAGxD,MAAa,qBAAsB,SAAQ,qCAA8C;IACvF,IAAc,OAAO;;QACnB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAA;IAC7B,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,qCAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEc,MAAM,CAAC,OAAgB,EAAE,QAAsB;;YAC5D,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,8BAAa,CAAC,CAAC,CAAA;YAC1H,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,wBAAc,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,CAAC,CAAA;YACtG,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,cAAI,CAAC,IAAI,CAAC,CAAC,CAAA;YAE9D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAC7E,OAAO,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAChG,CAAC;KAAA;CACF;AAjBD,sDAiBC"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAwD;AACxD,qEAAoC;AAEpC,2CAA2D;AAC3D,sDAAiE;AACjE,4DAAwD;AAGxD,MAAa,qBAAsB,SAAQ,qCAA8C;IACvF,IAAc,OAAO;;QACnB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAA;IAC7B,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,qCAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEc,MAAM,CAAC,QAAsB;;YAC1C,MAAM,YAAY,GAAG,IAAA,iBAAQ,EAC3B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,8BAAa,CAAC,EAC3F,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClE,CAAA;YACD,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,cAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YAEzG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;YAC9E,OAAO,IAAA,iBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAChG,CAAC;KAAA;CACF;AAnBD,sDAmBC"}

package/dist/cjs/Queries/Divine.d.ts

@@ -1,10 +1,7 @@
 import { XyoQuery } from '@xyo-network/module';
-import { XyoPayloads } from '@xyo-network/payload';
 export declare type XyoDivinerDivineQuerySchema = 'network.xyo.query.diviner.divine';
 export declare const XyoDivinerDivineQuerySchema: XyoDivinerDivineQuerySchema;
 export declare type XyoDivinerDivineQuery = XyoQuery<{
     schema: XyoDivinerDivineQuerySchema;
-    context?: string;
-    payloads?: XyoPayloads;
 }>;
 //# sourceMappingURL=Divine.d.ts.map

package/dist/cjs/Queries/Divine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Queries/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,2BAA2B,CAAA;IACnC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,WAAW,CAAA;CACvB,CAAC,CAAA"}
+{"version":3,"file":"Divine.d.ts","sourceRoot":"","sources":["../../../src/Queries/Divine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,2BAA2B,CAAA;CACpC,CAAC,CAAA"}

package/dist/cjs/Queries/Divine.js.map

@@ -1 +1 @@
-{"version":3,"file":"Divine.js","sourceRoot":"","sources":["../../../src/Queries/Divine.ts"],"names":[],"mappings":";;;AAIa,QAAA,2BAA2B,GAAgC,kCAAkC,CAAA"}
+{"version":3,"file":"Divine.js","sourceRoot":"","sources":["../../../src/Queries/Divine.ts"],"names":[],"mappings":";;;AAGa,QAAA,2BAA2B,GAAgC,kCAAkC,CAAA"}

package/dist/cjs/XyoDiviner.d.ts

@@ -1,13 +1,12 @@
-import { XyoBoundWitness } from '@xyo-network/boundwitness';
-import { XyoModule, XyoModuleQueryResult, XyoQuery } from '@xyo-network/module';
+import { ModuleQueryResult, XyoModule, XyoQueryBoundWitness } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { XyoDivinerConfig } from './Config';
 import { DivinerModule } from './Diviner';
 export declare abstract class XyoDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoModule<TConfig> implements DivinerModule {
-    abstract divine(context?: string, data?: XyoPayloads): Promisable<XyoPayloads>;
+    abstract divine(payloads?: XyoPayloads): Promisable<XyoPayloads>;
     queries(): string[];
-    query<T extends XyoQuery = XyoQuery>(bw: XyoBoundWitness, query: T): Promise<XyoModuleQueryResult<XyoPayload>>;
+    query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayloads): Promise<ModuleQueryResult<XyoPayload>>;
 }
 export declare abstract class XyoTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoDiviner<TConfig> {
 }

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

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAkC,oBAAoB,EAAgC,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC7I,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;AAGzC,8BAAsB,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAE,YAAW,aAAa;IACvI,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;IAE9D,OAAO,IAAI,MAAM,EAAE;IAIpB,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;CAmB9H;AAED,8BAAsB,mBAAmB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;CAAG;AAE7H,wCAAwC;AACxC,8BAAsB,kBAAkB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;CAAG;AAE5H,wCAAwC;AACxC,8BAAsB,2BAA2B,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,mBAAmB,CAAC,OAAO,CAAC;CAAG"}
+{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EAGT,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,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;AAGzC,8BAAsB,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAE,YAAW,aAAa;IACvI,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;IAEhD,OAAO,IAAI,MAAM,EAAE;IAIpB,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACxE,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;CAiB1C;AAED,8BAAsB,mBAAmB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;CAAG;AAE7H,wCAAwC;AACxC,8BAAsB,kBAAkB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;CAAG;AAE5H,wCAAwC;AACxC,8BAAsB,2BAA2B,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,mBAAmB,CAAC,OAAO,CAAC;CAAG"}

package/dist/cjs/XyoDiviner.js

@@ -10,26 +10,24 @@ class XyoDiviner extends module_1.XyoModule {
     queries() {
         return [module_1.XyoModuleInitializeQuerySchema, module_1.XyoModuleShutdownQuerySchema, Queries_1.XyoDivinerDivineQuerySchema];
     }
-    query(bw, query) {
+    query(query, payloads) {
         const _super = Object.create(null, {
             query: { get: () => super.query }
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            (0, assert_1.assertEx)(this.queryable(query.schema, bw.addresses));
+            const wrapper = module_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
+            const typedQuery = wrapper.query;
+            (0, assert_1.assertEx)(this.queryable(query.schema, wrapper.addresses));
             const queryAccount = new account_1.XyoAccount();
-            if (!this.queries().find((schema) => schema === query.schema)) {
-                console.error(`Undeclared Module Query: ${query.schema}`);
-            }
-            const payloads = [];
-            const typedQuery = query;
-            switch (typedQuery.schema) {
+            const resultPayloads = [];
+            switch (typedQuery.schemaName) {
                 case Queries_1.XyoDivinerDivineQuerySchema:
-                    payloads.push(...(yield this.divine(typedQuery.context, typedQuery.payloads)));
+                    resultPayloads.push(...(yield this.divine(payloads)));
                     break;
                 default:
-                    return _super.query.call(this, bw, typedQuery);
+                    return _super.query.call(this, query);
             }
-            return yield this.bindPayloads(payloads, queryAccount);
+            return yield this.bindResult(resultPayloads, queryAccount);
         });
     }
 }

package/dist/cjs/XyoDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAiD;AAEjD,gDAA6I;AAM7I,uCAAwE;AAExE,MAAsB,UAAgE,SAAQ,kBAAkB;IAG9F,OAAO;QACrB,OAAO,CAAC,uCAA8B,EAAE,qCAA4B,EAAE,qCAA2B,CAAC,CAAA;IACpG,CAAC;IAEc,KAAK,CAAgC,EAAmB,EAAE,KAAQ;;;;;YAC/E,IAAA,iBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;YAEpD,MAAM,YAAY,GAAG,IAAI,oBAAU,EAAE,CAAA;YACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;gBAC7D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;aAC1D;YAED,MAAM,QAAQ,GAAgB,EAAE,CAAA;YAChC,MAAM,UAAU,GAAG,KAAwB,CAAA;YAC3C,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,qCAA2B;oBAC9B,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oBAC9E,MAAK;gBACP;oBACE,OAAO,OAAM,KAAK,YAAC,EAAE,EAAE,UAAU,EAAC;aACrC;YACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;QACxD,CAAC;KAAA;CACF;AA1BD,gCA0BC;AAED,MAAsB,mBAAyE,SAAQ,UAAmB;CAAG;AAA7H,kDAA6H;AAE7H,wCAAwC;AACxC,MAAsB,kBAAwE,SAAQ,UAAmB;CAAG;AAA5H,gDAA4H;AAE5H,wCAAwC;AACxC,MAAsB,2BAAiF,SAAQ,mBAA4B;CAAG;AAA9I,kEAA8I"}
+{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAiD;AACjD,gDAO4B;AAM5B,uCAAwE;AAExE,MAAsB,UAAgE,SAAQ,kBAAkB;IAG9F,OAAO;QACrB,OAAO,CAAC,uCAA8B,EAAE,qCAA4B,EAAE,qCAA2B,CAAC,CAAA;IACpG,CAAC;IAEc,KAAK,CAClB,KAAQ,EACR,QAAsB;;;;;YAEtB,MAAM,OAAO,GAAG,iCAAwB,CAAC,UAAU,CAAkB,KAAK,EAAE,QAAQ,CAAC,CAAA;YACrF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAA;YAChC,IAAA,iBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;YAEzD,MAAM,YAAY,GAAG,IAAI,oBAAU,EAAE,CAAA;YAErC,MAAM,cAAc,GAAgB,EAAE,CAAA;YACtC,QAAQ,UAAU,CAAC,UAAU,EAAE;gBAC7B,KAAK,qCAA2B;oBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACrD,MAAK;gBACP;oBACE,OAAO,OAAM,KAAK,YAAC,KAAK,EAAC;aAC5B;YACD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;QAC5D,CAAC;KAAA;CACF;AA3BD,gCA2BC;AAED,MAAsB,mBAAyE,SAAQ,UAAmB;CAAG;AAA7H,kDAA6H;AAE7H,wCAAwC;AACxC,MAAsB,kBAAwE,SAAQ,UAAmB;CAAG;AAA5H,gDAA4H;AAE5H,wCAAwC;AACxC,MAAsB,2BAAiF,SAAQ,mBAA4B;CAAG;AAA9I,kEAA8I"}

package/dist/cjs/XyoDivinerWrapper.d.ts

@@ -2,6 +2,6 @@ import { XyoModuleWrapper } from '@xyo-network/module';
 import { XyoPayloads } from '@xyo-network/payload';
 import { Diviner } from './Diviner';
 export declare class XyoDivinerWrapper extends XyoModuleWrapper implements Diviner {
-    divine(context?: string, payloads?: XyoPayloads): Promise<XyoPayloads>;
+    divine(payloads?: XyoPayloads): Promise<XyoPayloads>;
 }
 //# sourceMappingURL=XyoDivinerWrapper.d.ts.map

package/dist/cjs/XyoDivinerWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDivinerWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,qBAAa,iBAAkB,SAAQ,gBAAiB,YAAW,OAAO;IAClE,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAK7E"}
+{"version":3,"file":"XyoDivinerWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAkB,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,qBAAa,iBAAkB,SAAQ,gBAAiB,YAAW,OAAO;IAClE,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;CAK3D"}

package/dist/cjs/XyoDivinerWrapper.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoDivinerWrapper = void 0;
 const tslib_1 = require("tslib");
 const module_1 = require("@xyo-network/module");
+const payload_1 = require("@xyo-network/payload");
 const Queries_1 = require("./Queries");
 class XyoDivinerWrapper extends module_1.XyoModuleWrapper {
-    divine(context, payloads) {
+    divine(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const query = { context, payloads, schema: Queries_1.XyoDivinerDivineQuerySchema };
-            const bw = (yield this.bindPayloads([query]))[0];
-            return (yield this.module.query(bw, query))[1];
+            const queryPayload = payload_1.PayloadWrapper.parse({ schema: Queries_1.XyoDivinerDivineQuerySchema });
+            const boundQuery = yield this.bindQuery([queryPayload.body, ...(payloads !== null && payloads !== void 0 ? payloads : [])], queryPayload.hash);
+            return (yield this.module.query(boundQuery[0], boundQuery[1]))[1];
         });
     }
 }

package/dist/cjs/XyoDivinerWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDivinerWrapper.js","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAAsD;AAItD,uCAA8E;AAE9E,MAAa,iBAAkB,SAAQ,yBAAgB;IAC/C,MAAM,CAAC,OAAgB,EAAE,QAAsB;;YACnD,MAAM,KAAK,GAA0B,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,qCAA2B,EAAE,CAAA;YAC/F,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAChD,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAChD,CAAC;KAAA;CACF;AAND,8CAMC"}
+{"version":3,"file":"XyoDivinerWrapper.js","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAAsD;AACtD,kDAAkE;AAGlE,uCAA8E;AAE9E,MAAa,iBAAkB,SAAQ,yBAAgB;IAC/C,MAAM,CAAC,QAAsB;;YACjC,MAAM,YAAY,GAAG,wBAAc,CAAC,KAAK,CAAwB,EAAE,MAAM,EAAE,qCAA2B,EAAE,CAAC,CAAA;YACzG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;YACpG,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACnE,CAAC;KAAA;CACF;AAND,8CAMC"}