@xyo-network/diviner 2.31.5 → 2.32.0-rc.3

package/dist/cjs/Diviner.d.ts

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

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,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,MAAM,WAAW,OAAO,CAAC,eAAe;IACtC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;CAC5D"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,WAAW,OAAO,CAAC,eAAe,SAAS,UAAU,GAAG,UAAU;IACtE,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,CAAA;CACnE;AAED,MAAM,WAAW,aAAa,CAC5B,aAAa,SAAS,UAAU,GAAG,UAAU,EAC7C,MAAM,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,EAC9E,YAAY,SAAS,UAAU,GAAG,UAAU,CAC5C,SAAQ,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAClC,OAAO,CAAC,aAAa,CAAC;CAAG"}

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

@@ -1,10 +1,9 @@
-import { XyoArchivist } from '@xyo-network/archivist';
 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<T extends XyoPayload = XyoPayload> = XyoDivinerConfig<T & {
     schema: XyoArchivistPayloadDivinerConfigSchema;
-    archivist: XyoArchivist;
+    archivist?: string;
 }>;
 //# sourceMappingURL=Config.d.ts.map

package/dist/cjs/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;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,IAAI,gBAAgB,CAChG,CAAC,GAAG;IACF,MAAM,EAAE,sCAAsC,CAAA;IAC9C,SAAS,EAAE,YAAY,CAAA;CACxB,CACF,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Config.ts"],"names":[],"mappings":"AAAA,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,IAAI,gBAAgB,CAChG,CAAC,GAAG;IACF,MAAM,EAAE,sCAAsC,CAAA;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CACF,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Config.ts"],"names":[],"mappings":";;;AAMa,QAAA,sCAAsC,GAA2C,8CAA8C,CAAA"}
+{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Config.ts"],"names":[],"mappings":";;;AAKa,QAAA,sCAAsC,GAA2C,8CAA8C,CAAA"}

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

@@ -1,16 +1,12 @@
+import { Archivist, XyoArchivist } from '@xyo-network/archivist';
+import { PartialModuleConfig } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
-import { PartialDivinerConfig } from '../../PartialDivinerConfig';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfig } from './Config';
 export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
-    constructor(config: PartialDivinerConfig<XyoArchivistPayloadDivinerConfig>);
-    protected get archivist(): import("@xyo-network/archivist").XyoArchivist<{
-        schema: string;
-        previousHash?: string | undefined;
-        sources?: string[] | undefined;
-        timestamp?: number | undefined;
-    }>;
-    get queries(): "network.xyo.query.diviner.divine"[];
+    protected readonly archivist: Archivist;
+    constructor(config: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist);
+    queries(): import("../../Queries").XyoDivinerQuerySchema[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# 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":"AAEA,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAIjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AAEnG,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,UAAU,EAAE,gCAAgC,CAAC;gBACjG,MAAM,EAAE,oBAAoB,CAAC,gCAAgC,CAAC;IAI1E,SAAS,KAAK,SAAS;;;;;OAEtB;IAED,IAAa,OAAO,yCAEnB;IAEY,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAQxE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAmD,MAAM,wBAAwB,CAAA;AACjH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,gCAAgC,EAA0C,MAAM,UAAU,CAAA;AAEnG,qBAAa,0BAA2B,SAAQ,iBAAiB,CAAC,UAAU,EAAE,gCAAgC,CAAC;IAC7G,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;gBAE3B,MAAM,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,YAAY;IAU1F,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAQxE"}

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

@@ -5,26 +5,31 @@ const tslib_1 = require("tslib");
 const assert_1 = require("@xylabs/assert");
 const archivist_1 = require("@xyo-network/archivist");
 const payload_1 = require("@xyo-network/payload");
-const Query_1 = require("../../Query");
+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");
 class XyoArchivistPayloadDiviner extends XyoPayloadDiviner_1.XyoPayloadDiviner {
-    constructor(config) {
+    constructor(config, archivist) {
+        var _a;
         super(Object.assign(Object.assign({}, config), { schema: Config_1.XyoArchivistPayloadDivinerConfigSchema }));
+        if (archivist) {
+            this.archivist = new archivist_1.XyoArchivistWrapper(archivist);
+        }
+        else {
+            const resolvedArchivist = (_a = this.resolver) === null || _a === void 0 ? void 0 : _a.call(this, (0, assert_1.assertEx)(config.archivist, 'No archivist specified'));
+            this.archivist = new archivist_1.XyoArchivistWrapper((0, assert_1.assertEx)(resolvedArchivist, 'Unable to resolve archivist'));
+        }
     }
-    get archivist() {
-        return this.config.archivist;
-    }
-    get queries() {
-        return [Query_1.XyoDivinerDivineQuerySchema];
+    queries() {
+        return [Queries_1.XyoDivinerDivineQuerySchema, ...super.queries()];
     }
     divine(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const huriPayload = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.find((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === XyoHuriPayload_1.XyoHuriPayloadSchema));
+            const huriPayload = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.find((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === XyoHuriPayload_1.XyoHuriSchema));
             const huriObj = new payload_1.Huri(huriPayload.huri);
-            const [[, [payload = null]]] = yield (0, lib_1.profile)(() => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.archivist.query({ hashes: [huriObj.hash], schema: archivist_1.XyoArchivistGetQueryPayloadSchema }); }));
+            const [[, [payload = null]]] = yield (0, lib_1.profile)(() => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.archivist.query({ hashes: [huriObj.hash], schema: archivist_1.XyoArchivistGetQuerySchema }); }));
             return payload !== null && payload !== void 0 ? payload : null;
         });
     }

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,sDAA0E;AAC1E,kDAAoE;AAGpE,uCAAyD;AACzD,gCAAgC;AAChC,sDAAwE;AACxE,4DAAwD;AACxD,qCAAmG;AAEnG,MAAa,0BAA2B,SAAQ,qCAA+D;IAC7G,YAAY,MAA8D;QACxE,KAAK,iCAAM,MAAM,KAAE,MAAM,EAAE,+CAAsC,IAAG,CAAA;IACtE,CAAC;IAED,IAAc,SAAS;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAA;IAC9B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,mCAA2B,CAAC,CAAA;IACtC,CAAC;IAEY,MAAM,CAAC,QAAsB;;YACxC,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,qCAAoB,CAAC,CAAC,CAAA;YAC9H,MAAM,OAAO,GAAG,IAAI,cAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YAC1C,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,IAAA,aAAO,EAC1C,GAAS,EAAE,wDAAC,OAAA,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,6CAAiC,EAAE,CAAC,CAAA,GAAA,CAC9G,CAAA;YACD,OAAO,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAA;QACxB,CAAC;KAAA;CACF;AArBD,gEAqBC"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,sDAAiH;AAEjH,kDAAoE;AAEpE,2CAA2D;AAC3D,gCAAgC;AAChC,sDAAiE;AACjE,4DAAwD;AACxD,qCAAmG;AAEnG,MAAa,0BAA2B,SAAQ,qCAA+D;IAG7G,YAAY,MAA6D,EAAE,SAAwB;;QACjG,KAAK,iCAAM,MAAM,KAAE,MAAM,EAAE,+CAAsC,IAAG,CAAA;QACpE,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,SAAS,GAAG,IAAI,+BAAmB,CAAC,SAAS,CAAC,CAAA;SACpD;aAAM;YACL,MAAM,iBAAiB,GAAG,MAAA,IAAI,CAAC,QAAQ,qDAAG,IAAA,iBAAQ,EAAC,MAAM,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAA;YAC/F,IAAI,CAAC,SAAS,GAAG,IAAI,+BAAmB,CAAC,IAAA,iBAAQ,EAAC,iBAAiB,EAAE,6BAA6B,CAAC,CAAC,CAAA;SACrG;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,qCAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEY,MAAM,CAAC,QAAsB;;YACxC,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,8BAAa,CAAC,CAAC,CAAA;YACvH,MAAM,OAAO,GAAG,IAAI,cAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YAC1C,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,IAAA,aAAO,EAC1C,GAAS,EAAE,wDAAC,OAAA,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,sCAA0B,EAAE,CAAC,CAAA,GAAA,CACvG,CAAA;YACD,OAAO,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAA;QACxB,CAAC;KAAA;CACF;AAzBD,gEAyBC"}

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

@@ -3,7 +3,7 @@ import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoHuriPayloadDivinerConfig } from './Config';
 export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoHuriPayloadDivinerConfig> {
     protected get options(): import("@xyo-network/payload").HuriOptions | undefined;
-    get queries(): "network.xyo.query.diviner.divine"[];
+    queries(): import("../../Queries").XyoDivinerQuerySchema[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# 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,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"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,qBAAa,qBAAsB,SAAQ,iBAAiB,CAAC,UAAU,EAAE,2BAA2B,CAAC;IACnG,SAAS,KAAK,OAAO,2DAEpB;IAEQ,OAAO;IAID,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAM1E"}

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

@@ -4,20 +4,21 @@ exports.XyoHuriPayloadDiviner = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = require("@xylabs/assert");
 const payload_1 = require("@xyo-network/payload");
-const Query_1 = require("../../Query");
+const Queries_1 = require("../../Queries");
 const lib_1 = require("../lib");
 const XyoHuriPayload_1 = require("../XyoHuriPayload");
 const XyoPayloadDiviner_1 = require("../XyoPayloadDiviner");
 class XyoHuriPayloadDiviner extends XyoPayloadDiviner_1.XyoPayloadDiviner {
     get options() {
-        return this.config.options;
+        var _a;
+        return (_a = this.config) === null || _a === void 0 ? void 0 : _a.options;
     }
-    get queries() {
-        return [Query_1.XyoDivinerDivineQuerySchema];
+    queries() {
+        return [Queries_1.XyoDivinerDivineQuerySchema, ...super.queries()];
     }
     divine(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const huriPayload = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.find((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === XyoHuriPayload_1.XyoHuriPayloadSchema));
+            const huriPayload = (0, assert_1.assertEx)(payloads === null || payloads === void 0 ? void 0 : payloads.find((payload) => (payload === null || payload === void 0 ? void 0 : payload.schema) === XyoHuriPayload_1.XyoHuriSchema));
             const huri = new payload_1.Huri(huriPayload === null || huriPayload === void 0 ? void 0 : huriPayload.huri, this.options);
             const [payload = null] = yield (0, lib_1.profile)(() => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield huri.fetch(); }));
             return payload !== null && payload !== void 0 ? payload : 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,kDAAoE;AAEpE,uCAAyD;AACzD,gCAAgC;AAChC,sDAAwE;AACxE,4DAAwD;AAGxD,MAAa,qBAAsB,SAAQ,qCAA0D;IACnG,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,mCAA2B,CAAC,CAAA;IACtC,CAAC;IAEc,MAAM,CAAC,QAAsB;;YAC1C,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,qCAAoB,CAAC,CAAC,CAAA;YAC9H,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YACtD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,IAAA,aAAO,EAAC,GAAS,EAAE,wDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA,GAAA,CAAC,CAAA;YACtE,OAAO,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAA;QACxB,CAAC;KAAA;CACF;AAfD,sDAeC"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAAoE;AAEpE,2CAA2D;AAC3D,gCAAgC;AAChC,sDAAiE;AACjE,4DAAwD;AAGxD,MAAa,qBAAsB,SAAQ,qCAA0D;IACnG,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,WAAW,GAAG,IAAA,iBAAQ,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,MAAK,8BAAa,CAAC,CAAC,CAAA;YACvH,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;YACtD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,IAAA,aAAO,EAAC,GAAS,EAAE,wDAAC,OAAA,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA,GAAA,CAAC,CAAA;YACtE,OAAO,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,CAAA;QACxB,CAAC;KAAA;CACF;AAfD,sDAeC"}

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

@@ -1,6 +1,6 @@
 import { XyoPayload } from '@xyo-network/payload';
-export declare type XyoHuriPayloadSchema = 'network.xyo.huri';
-export declare const XyoHuriPayloadSchema: XyoHuriPayloadSchema;
+export declare type XyoHuriSchema = 'network.xyo.huri';
+export declare const XyoHuriSchema: XyoHuriSchema;
 export declare type XyoHuriPayload = XyoPayload<{
     schema: 'network.xyo.huri';
     huri: string;

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

@@ -1 +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"}
+{"version":3,"file":"XyoHuriPayload.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoHuriPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,oBAAY,aAAa,GAAG,kBAAkB,CAAA;AAC9C,eAAO,MAAM,aAAa,EAAE,aAAkC,CAAA;AAE9D,oBAAY,cAAc,GAAG,UAAU,CAAC;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA"}

package/dist/cjs/Payload/XyoHuriPayload.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"XyoHuriPayload.js","sourceRoot":"","sources":["../../../src/Payload/XyoHuriPayload.ts"],"names":[],"mappings":";;;AAGa,QAAA,oBAAoB,GAAyB,kBAAkB,CAAA"}
+{"version":3,"file":"XyoHuriPayload.js","sourceRoot":"","sources":["../../../src/Payload/XyoHuriPayload.ts"],"names":[],"mappings":";;;AAGa,QAAA,aAAa,GAAkB,kBAAkB,CAAA"}

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

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

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

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

package/dist/cjs/{Query → Queries}/Divine.d.ts

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

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

@@ -0,0 +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,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAE9D,oBAAY,2BAA2B,GAAG,kCAAkC,CAAA;AAC5E,eAAO,MAAM,2BAA2B,EAAE,2BAAgE,CAAA;AAE1G,oBAAY,qBAAqB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,QAAQ,CAAC;IAC9E,MAAM,EAAE,2BAA2B,CAAA;IACnC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CAC1B,CAAC,CAAA"}

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

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

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Queries/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhD,oBAAY,eAAe,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,qBAAqB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAA"}

package/dist/cjs/{Query → Queries}/Payload.js.map

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

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

@@ -0,0 +1,4 @@
+import { XyoModuleQuerySchema } from '@xyo-network/module';
+import { XyoDivinerDivineQuerySchema } from './Divine';
+export declare type XyoDivinerQuerySchema = XyoDivinerDivineQuerySchema | XyoModuleQuerySchema;
+//# sourceMappingURL=Schema.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/Queries/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AAEtD,oBAAY,qBAAqB,GAAG,2BAA2B,GAAG,oBAAoB,CAAA"}

package/dist/cjs/{Query → Queries}/Schema.js.map

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

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":";;;AAAA,mDAAwB;AACxB,oDAAyB;AACzB,mDAAwB"}

package/dist/cjs/XyoDiviner.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACrE,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,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAA+B,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAEpG,8BAAsB,UAAU,CAC5B,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,CAEpF,SAAQ,SAAS,CAAC,OAAO,CACzB,YAAW,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAEnC,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"}
+{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkC,oBAAoB,EAAgC,MAAM,qBAAqB,CAAA;AACnI,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAA+B,eAAe,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAA;AAE/F,8BAAsB,UAAU,CAC5B,aAAa,SAAS,UAAU,GAAG,UAAU,EAC7C,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,CAEhF,SAAQ,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAChD,YAAW,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC;IAE9D,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,GAAG,UAAU,CAAC,aAAa,GAAG,IAAI,CAAC;IAExE,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,qBAAqB,CAAC,EAAE;IAIjE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;CAazE;AAED,8BAAsB,mBAAmB,CACvC,QAAQ,SAAS,UAAU,GAAG,UAAU,EACxC,OAAO,SAAS,gBAAgB,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAC,QAAQ,CAAC,EACvE,MAAM,SAAS,eAAe,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CACpE,SAAQ,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG;AAElD,wCAAwC;AACxC,8BAAsB,kBAAkB,CACtC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG;AAEpD,wCAAwC;AACxC,8BAAsB,2BAA2B,CAC/C,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC;CAAG"}

package/dist/cjs/XyoDiviner.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoAbstractTimestampDiviner = exports.XyoAbstractDiviner = exports.XyoTimestampDiviner = exports.XyoDiviner = void 0;
 const tslib_1 = require("tslib");
 const module_1 = require("@xyo-network/module");
-const Query_1 = require("./Query");
+const Queries_1 = require("./Queries");
 class XyoDiviner extends module_1.XyoModule {
-    get queries() {
-        return [Query_1.XyoDivinerDivineQuerySchema];
+    queries() {
+        return [module_1.XyoModuleInitializeQuerySchema, module_1.XyoModuleShutdownQuerySchema, Queries_1.XyoDivinerDivineQuerySchema];
     }
     query(query) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.queries.find((schema) => schema === query.schema)) {
+            if (!this.queries().find((schema) => schema === query.schema)) {
                 console.error(`Undeclared Module Query: ${query.schema}`);
             }
             const payloads = [];
             switch (query.schema) {
-                case Query_1.XyoDivinerDivineQuerySchema:
+                case Queries_1.XyoDivinerDivineQuerySchema:
                     payloads.push(yield this.divine(query.payloads));
                     break;
             }

package/dist/cjs/XyoDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":";;;;AAAA,gDAAqE;AAMrE,mCAAoG;AAEpG,MAAsB,UAKpB,SAAQ,kBAAkB;IAK1B,IAAoB,OAAO;QACzB,OAAO,CAAC,mCAA2B,CAAC,CAAA;IACtC,CAAC;IAEK,KAAK,CAAC,KAAa;;YACvB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;gBAC3D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;aAC1D;YAED,MAAM,QAAQ,GAAwB,EAAE,CAAA;YACxC,QAAQ,KAAK,CAAC,MAAM,EAAE;gBACpB,KAAK,mCAA2B;oBAC9B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;oBAChD,MAAK;aACR;YACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;QAChD,CAAC;KAAA;CACF;AA3BD,gCA2BC;AAED,MAAsB,mBAIpB,SAAQ,UAAqC;CAAG;AAJlD,kDAIkD;AAElD,wCAAwC;AACxC,MAAsB,kBAGpB,SAAQ,UAAuC;CAAG;AAHpD,gDAGoD;AAEpD,wCAAwC;AACxC,MAAsB,2BAGpB,SAAQ,mBAAgD;CAAG;AAH7D,kEAG6D"}
+{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":";;;;AAAA,gDAAmI;AAMnI,uCAA+F;AAE/F,MAAsB,UAKpB,SAAQ,kBAAyC;IAKjC,OAAO;QACrB,OAAO,CAAC,uCAA8B,EAAE,qCAA4B,EAAE,qCAA2B,CAAC,CAAA;IACpG,CAAC;IAEK,KAAK,CAAC,KAAa;;YACvB,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,GAA6B,EAAE,CAAA;YAC7C,QAAQ,KAAK,CAAC,MAAM,EAAE;gBACpB,KAAK,qCAA2B;oBAC9B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;oBAChD,MAAK;aACR;YACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;QAChD,CAAC;KAAA;CACF;AA3BD,gCA2BC;AAED,MAAsB,mBAIpB,SAAQ,UAAqC;CAAG;AAJlD,kDAIkD;AAElD,wCAAwC;AACxC,MAAsB,kBAGpB,SAAQ,UAAuC;CAAG;AAHpD,gDAGoD;AAEpD,wCAAwC;AACxC,MAAsB,2BAGpB,SAAQ,mBAAgD;CAAG;AAH7D,kEAG6D"}

package/dist/cjs/XyoDivinerWrapper.d.ts

@@ -1,10 +1,7 @@
-import { XyoModule } from '@xyo-network/module';
+import { XyoModuleWrapper } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { Diviner } from './Diviner';
-export declare class XyoDivinerWrapper implements Diviner<XyoPayload | null> {
-    protected module: XyoModule;
-    constructor(module: XyoModule);
-    get queries(): string[];
+export declare class XyoDivinerWrapper extends XyoModuleWrapper implements Diviner {
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# 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,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,qBAAa,iBAAkB,YAAW,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAClE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAA;gBAEf,MAAM,EAAE,SAAS;IAI7B,IAAW,OAAO,aAEjB;IAEK,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAIjE"}
+{"version":3,"file":"XyoDivinerWrapper.d.ts","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,qBAAa,iBAAkB,SAAQ,gBAAiB,YAAW,OAAO;IAClE,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAIjE"}

package/dist/cjs/XyoDivinerWrapper.js

@@ -2,17 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XyoDivinerWrapper = void 0;
 const tslib_1 = require("tslib");
-const Query_1 = require("./Query");
-class XyoDivinerWrapper {
-    constructor(module) {
-        this.module = module;
-    }
-    get queries() {
-        return this.module.queries;
-    }
+const module_1 = require("@xyo-network/module");
+const Queries_1 = require("./Queries");
+class XyoDivinerWrapper extends module_1.XyoModuleWrapper {
     divine(payloads) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const query = { payloads, schema: Query_1.XyoDivinerDivineQuerySchema };
+            const query = { payloads, schema: Queries_1.XyoDivinerDivineQuerySchema };
             return (yield this.module.query(query))[1][0];
         });
     }

package/dist/cjs/XyoDivinerWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDivinerWrapper.js","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":";;;;AAIA,mCAAmF;AAEnF,MAAa,iBAAiB;IAG5B,YAAY,MAAiB;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAEK,MAAM,CAAC,QAAsB;;YACjC,MAAM,KAAK,GAAiC,EAAE,QAAQ,EAAE,MAAM,EAAE,mCAA2B,EAAE,CAAA;YAC7F,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/C,CAAC;KAAA;CACF;AAfD,8CAeC"}
+{"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,QAAsB;;YACjC,MAAM,KAAK,GAA0B,EAAE,QAAQ,EAAE,MAAM,EAAE,qCAA2B,EAAE,CAAA;YACtF,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/C,CAAC;KAAA;CACF;AALD,8CAKC"}

package/dist/cjs/index.d.ts

@@ -1,8 +1,7 @@
 export * from './Config';
 export * from './Diviner';
-export * from './PartialDivinerConfig';
 export * from './Payload';
-export * from './Query';
+export * from './Queries';
 export * from './XyoDiviner';
 export * from './XyoDivinerWrapper';
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/cjs/index.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./Config"), exports);
 tslib_1.__exportStar(require("./Diviner"), exports);
-tslib_1.__exportStar(require("./PartialDivinerConfig"), exports);
 tslib_1.__exportStar(require("./Payload"), exports);
-tslib_1.__exportStar(require("./Query"), exports);
+tslib_1.__exportStar(require("./Queries"), exports);
 tslib_1.__exportStar(require("./XyoDiviner"), exports);
 tslib_1.__exportStar(require("./XyoDivinerWrapper"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAAwB;AACxB,oDAAyB;AACzB,iEAAsC;AACtC,oDAAyB;AACzB,kDAAuB;AACvB,uDAA4B;AAC5B,8DAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAAwB;AACxB,oDAAyB;AACzB,oDAAyB;AACzB,oDAAyB;AACzB,uDAA4B;AAC5B,8DAAmC"}