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

package/dist/esm/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/esm/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/esm/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/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;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/esm/Payload/Archivist/Config.js.map

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

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

@@ -1,15 +1,11 @@
+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;
-    }>;
+    protected readonly archivist: Archivist;
+    constructor(config: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist);
     get queries(): "network.xyo.query.diviner.divine"[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }

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":"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;IAUnG,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,25 +1,30 @@
 import { assertEx } from '@xylabs/assert';
-import { XyoArchivistGetQueryPayloadSchema } from '@xyo-network/archivist';
+import { XyoArchivistGetQuerySchema, XyoArchivistWrapper } from '@xyo-network/archivist';
 import { Huri } from '@xyo-network/payload';
-import { XyoDivinerDivineQuerySchema } from '../../Query';
+import { XyoDivinerDivineQuerySchema } from '../../Queries';
 import { profile } from '../lib';
-import { XyoHuriPayloadSchema } from '../XyoHuriPayload';
+import { XyoHuriSchema } from '../XyoHuriPayload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfigSchema } from './Config';
 export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
-    constructor(config) {
+    archivist;
+    constructor(config, archivist) {
         super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema });
-    }
-    get archivist() {
-        return this.config.archivist;
+        if (archivist) {
+            this.archivist = new XyoArchivistWrapper(archivist);
+        }
+        else {
+            const resolvedArchivist = this.resolver?.(assertEx(config.archivist, 'No archivist specified'));
+            this.archivist = new XyoArchivistWrapper(assertEx(resolvedArchivist, 'Unable to resolve archivist'));
+        }
     }
     get queries() {
         return [XyoDivinerDivineQuerySchema];
     }
     async divine(payloads) {
-        const huriPayload = assertEx(payloads?.find((payload) => payload?.schema === XyoHuriPayloadSchema));
+        const huriPayload = assertEx(payloads?.find((payload) => payload?.schema === XyoHuriSchema));
         const huriObj = new Huri(huriPayload.huri);
-        const [[, [payload = null]]] = await profile(async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQueryPayloadSchema }));
+        const [[, [payload = null]]] = await profile(async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }));
         return payload ?? null;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAA;AAC1E,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAGpE,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;AACxD,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,MAAM,OAAO,0BAA2B,SAAQ,iBAA+D;IAC7G,YAAY,MAA8D;QACxE,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC,CAAA;IACtE,CAAC;IAED,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,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,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,OAAO,IAAI,IAAI,CAAA;IACxB,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,EAA2B,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEjH,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAoC,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,MAAM,OAAO,0BAA2B,SAAQ,iBAA+D;IAC1F,SAAS,CAAW;IAEvC,YAAY,MAA6D,EAAE,SAAwB;QACjG,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC,CAAA;QACpE,IAAI,SAAS,EAAE;YACb,IAAI,CAAC,SAAS,GAAG,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAA;SACpD;aAAM;YACL,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAA;YAC/F,IAAI,CAAC,SAAS,GAAG,IAAI,mBAAmB,CAAC,QAAQ,CAAC,iBAAiB,EAAE,6BAA6B,CAAC,CAAC,CAAA;SACrG;IACH,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,aAAa,CAAC,CAAC,CAAA;QACvH,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CACvG,CAAA;QACD,OAAO,OAAO,IAAI,IAAI,CAAA;IACxB,CAAC;CACF"}

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

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

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

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

package/dist/esm/Payload/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/esm/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/esm/Payload/XyoHuriPayload.js

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

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

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

package/dist/esm/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/esm/Payload/XyoPayloadDiviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XyoPayloadDiviner.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,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/esm/{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/esm/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/esm/Queries/Divine.js.map

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

package/dist/esm/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/esm/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/esm/{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/esm/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/esm/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/esm/{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/esm/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/esm/Queries/index.js.map

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

package/dist/esm/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>;
+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>;
     get queries(): (TQuery['schema'] | XyoDivinerQuerySchema)[];
-    query(query: TQuery): Promise<XyoModuleQueryResult>;
+    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/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,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;IAExF,IAAoB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,qBAAqB,CAAC,EAAE,CAE1E;IAEK,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/esm/XyoDiviner.js

@@ -1,8 +1,8 @@
-import { XyoModule } from '@xyo-network/module';
-import { XyoDivinerDivineQuerySchema } from './Query';
+import { XyoModule, XyoModuleInitializeQuerySchema, XyoModuleShutdownQuerySchema } from '@xyo-network/module';
+import { XyoDivinerDivineQuerySchema } from './Queries';
 export class XyoDiviner extends XyoModule {
     get queries() {
-        return [XyoDivinerDivineQuerySchema];
+        return [XyoModuleInitializeQuerySchema, XyoModuleShutdownQuerySchema, XyoDivinerDivineQuerySchema];
     }
     async query(query) {
         if (!this.queries.find((schema) => schema === query.schema)) {

package/dist/esm/XyoDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,qBAAqB,CAAA;AAMrE,OAAO,EAAE,2BAA2B,EAAiD,MAAM,SAAS,CAAA;AAEpG,MAAM,OAAgB,UAKpB,SAAQ,SAAkB;IAK1B,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"}
+{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,8BAA8B,EAAwB,4BAA4B,EAAE,MAAM,qBAAqB,CAAA;AAMnI,OAAO,EAAE,2BAA2B,EAA0C,MAAM,WAAW,CAAA;AAE/F,MAAM,OAAgB,UAKpB,SAAQ,SAAyC;IAKjD,IAAoB,OAAO;QACzB,OAAO,CAAC,8BAA8B,EAAE,4BAA4B,EAAE,2BAA2B,CAAC,CAAA;IACpG,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,GAA6B,EAAE,CAAA;QAC7C,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,KAAK,2BAA2B;gBAC9B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;gBAChD,MAAK;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/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/esm/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/esm/XyoDivinerWrapper.js

@@ -1,12 +1,6 @@
-import { XyoDivinerDivineQuerySchema } from './Query';
-export class XyoDivinerWrapper {
-    module;
-    constructor(module) {
-        this.module = module;
-    }
-    get queries() {
-        return this.module.queries;
-    }
+import { XyoModuleWrapper } from '@xyo-network/module';
+import { XyoDivinerDivineQuerySchema } from './Queries';
+export class XyoDivinerWrapper extends XyoModuleWrapper {
     async divine(payloads) {
         const query = { payloads, schema: XyoDivinerDivineQuerySchema };
         return (await this.module.query(query))[1][0];

package/dist/esm/XyoDivinerWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDivinerWrapper.js","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgC,2BAA2B,EAAE,MAAM,SAAS,CAAA;AAEnF,MAAM,OAAO,iBAAiB;IAClB,MAAM,CAAW;IAE3B,YAAY,MAAiB;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAsB;QACjC,MAAM,KAAK,GAAiC,EAAE,QAAQ,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAA;QAC7F,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,CAAC;CACF"}
+{"version":3,"file":"XyoDivinerWrapper.js","sourceRoot":"","sources":["../../src/XyoDivinerWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAItD,OAAO,EAAyB,2BAA2B,EAAE,MAAM,WAAW,CAAA;AAE9E,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IACrD,KAAK,CAAC,MAAM,CAAC,QAAsB;QACjC,MAAM,KAAK,GAA0B,EAAE,QAAQ,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAA;QACtF,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,CAAC;CACF"}

package/dist/esm/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/esm/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/esm/index.js

@@ -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.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","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.js","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/package.json

@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/archivist": "^2.31.5",
-    "@xyo-network/module": "^2.31.5",
-    "@xyo-network/payload": "^2.31.5",
-    "@xyo-network/promisable": "^2.31.5",
+    "@xyo-network/archivist": "^2.32.0-rc.1",
+    "@xyo-network/module": "^2.32.0-rc.1",
+    "@xyo-network/payload": "^2.32.0-rc.1",
+    "@xyo-network/promisable": "^2.32.0-rc.1",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -50,5 +50,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.31.5"
+  "version": "2.32.0-rc.1",
+  "stableVersion": "2.31.5"
 }

package/src/Diviner.ts

@@ -1,6 +1,16 @@
-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> {}

package/src/Payload/Archivist/Config.ts

@@ -1,4 +1,3 @@
-import { XyoArchivist } from '@xyo-network/archivist'
 import { XyoPayload } from '@xyo-network/payload'
 
 import { XyoDivinerConfig } from '../../Config'
@@ -9,6 +8,6 @@ export const XyoArchivistPayloadDivinerConfigSchema: XyoArchivistPayloadDivinerC
 export type XyoArchivistPayloadDivinerConfig<T extends XyoPayload = XyoPayload> = XyoDivinerConfig<
   T & {
     schema: XyoArchivistPayloadDivinerConfigSchema
-    archivist: XyoArchivist
+    archivist?: string
   }
 >

package/src/Payload/Archivist/Diviner.ts

@@ -1,21 +1,25 @@
 import { assertEx } from '@xylabs/assert'
-import { XyoArchivistGetQueryPayloadSchema } from '@xyo-network/archivist'
+import { Archivist, XyoArchivist, XyoArchivistGetQuerySchema, XyoArchivistWrapper } from '@xyo-network/archivist'
+import { PartialModuleConfig } from '@xyo-network/module'
 import { Huri, XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
-import { PartialDivinerConfig } from '../../PartialDivinerConfig'
-import { XyoDivinerDivineQuerySchema } from '../../Query'
+import { XyoDivinerDivineQuerySchema } from '../../Queries'
 import { profile } from '../lib'
-import { XyoHuriPayload, XyoHuriPayloadSchema } from '../XyoHuriPayload'
+import { XyoHuriPayload, XyoHuriSchema } from '../XyoHuriPayload'
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoArchivistPayloadDivinerConfig, XyoArchivistPayloadDivinerConfigSchema } from './Config'
 
 export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
-  constructor(config: PartialDivinerConfig<XyoArchivistPayloadDivinerConfig>) {
-    super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema })
-  }
+  protected readonly archivist: Archivist
 
-  protected get archivist() {
-    return this.config.archivist
+  constructor(config: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist) {
+    super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema })
+    if (archivist) {
+      this.archivist = new XyoArchivistWrapper(archivist)
+    } else {
+      const resolvedArchivist = this.resolver?.(assertEx(config.archivist, 'No archivist specified'))
+      this.archivist = new XyoArchivistWrapper(assertEx(resolvedArchivist, 'Unable to resolve archivist'))
+    }
   }
 
   override get queries() {
@@ -23,10 +27,10 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, Xy
   }
 
   public async divine(payloads?: XyoPayloads): Promise<XyoPayload | null> {
-    const huriPayload = assertEx(payloads?.find((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriPayloadSchema))
+    const huriPayload = assertEx(payloads?.find((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriSchema))
     const huriObj = new Huri(huriPayload.huri)
     const [[, [payload = null]]] = await profile(
-      async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQueryPayloadSchema }),
+      async () => await this.archivist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }),
     )
     return payload ?? null
   }

package/src/Payload/Huri/Diviner.ts

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

package/src/Payload/XyoHuriPayload.ts

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

package/src/Payload/XyoPayloadDiviner.ts

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

package/src/{Query → Queries}/Divine.ts

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