@xyo-network/diviner 2.33.0-rc.8 → 2.33.0

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

@@ -1,12 +1,12 @@
-import { Archivist, XyoArchivist } from '@xyo-network/archivist';
+import { PayloadArchivist } from '@xyo-network/archivist';
 import { PartialModuleConfig, XyoModuleResolverFunc } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 import { XyoArchivistPayloadDivinerConfig } from './Config';
 export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
-    protected readonly archivist?: Archivist;
-    constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist, resolver?: XyoModuleResolverFunc);
-    queries(): import("../../Queries").XyoDivinerQuerySchema[];
+    protected readonly archivist?: PayloadArchivist | null;
+    constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: PayloadArchivist, resolver?: XyoModuleResolverFunc);
+    queries(): ("network.xyo.query.diviner.divine" | ("network.xyo.query.module.subscribe" | "network.xyo.query.module.discover" | "network.xyo.query.module.initialize" | "network.xyo.query.module.shutdown"))[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAmD,MAAM,wBAAwB,CAAA;AACjH,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,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,CAAC,EAAE,SAAS,CAAA;gBAE5B,MAAM,CAAC,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAS7H,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAYxE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAmD,MAAM,wBAAwB,CAAA;AAC1G,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,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,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,UAAU,GAAG,IAAI,CAAC;CAYxE"}

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

@@ -13,7 +13,7 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
         const configArchivistAddress = config?.archivist;
         const resolvedArchivist = archivist ?? (configArchivistAddress ? this.resolver?.(configArchivistAddress) : null);
         if (resolvedArchivist) {
-            this.archivist = new XyoArchivistWrapper(resolvedArchivist);
+            this.archivist = resolvedArchivist ? new XyoArchivistWrapper(resolvedArchivist) : null;
         }
     }
     queries() {

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,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,CAAY;IAExC,YAAY,MAA8D,EAAE,SAAwB,EAAE,QAAgC;QACpI,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QACzF,MAAM,sBAAsB,GAAG,MAAM,EAAE,SAAS,CAAA;QAChD,MAAM,iBAAiB,GAAG,SAAS,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QAChH,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,GAAG,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAA;SAC5D;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,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,GAAG,IAAI,CAAC,SAAS,CAAA;QACrC,IAAI,cAAc,EAAE;YAClB,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CACvG,CAAA;YACD,OAAO,OAAO,IAAI,IAAI,CAAA;SACvB;QACD,OAAO,IAAI,CAAA;IACb,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,EAAoB,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAE1G,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,CAA0B;IAEtD,YAAY,MAA8D,EAAE,SAA4B,EAAE,QAAgC;QACxI,KAAK,CAAC,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,sCAAsC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;QACzF,MAAM,sBAAsB,GAAG,MAAM,EAAE,SAAS,CAAA;QAChD,MAAM,iBAAiB,GACrB,SAAS,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,sBAAsB,CAAiC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACzH,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;SACvF;IACH,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,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,GAAG,IAAI,CAAC,SAAS,CAAA;QACrC,IAAI,cAAc,EAAE;YAClB,MAAM,CAAC,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAC1C,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CACvG,CAAA;YACD,OAAO,OAAO,IAAI,IAAI,CAAA;SACvB;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/dist/esm/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;
-    queries(): import("../../Queries").XyoDivinerQuerySchema[];
+    queries(): ("network.xyo.query.diviner.divine" | ("network.xyo.query.module.subscribe" | "network.xyo.query.module.discover" | "network.xyo.query.module.initialize" | "network.xyo.query.module.shutdown"))[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

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

@@ -1,5 +1,7 @@
-import { XyoModuleQuery } from '@xyo-network/module';
+import { XyoModuleQuery, XyoQuery } 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;
+declare type XyoDivinerQueryBase<TDivineResult extends XyoPayload = XyoPayload> = XyoDivinerDivineQuery<TDivineResult> | XyoModuleQuery;
+export declare type XyoDivinerQuery<TDivineResult extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery ? XyoDivinerQueryBase<TDivineResult> | TQuery : XyoDivinerQueryBase<TDivineResult>;
+export {};
 //# sourceMappingURL=Payload.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Queries/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAEhD,aAAK,mBAAmB,CAAC,aAAa,SAAS,UAAU,GAAG,UAAU,IAAI,qBAAqB,CAAC,aAAa,CAAC,GAAG,cAAc,CAAA;AAE/H,oBAAY,eAAe,CAAC,aAAa,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GACvI,mBAAmB,CAAC,aAAa,CAAC,GAAG,MAAM,GAC3C,mBAAmB,CAAC,aAAa,CAAC,CAAA"}

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

@@ -1,4 +1,6 @@
 import { XyoModuleQuerySchema } from '@xyo-network/module';
 import { XyoDivinerDivineQuerySchema } from './Divine';
-export declare type XyoDivinerQuerySchema = XyoDivinerDivineQuerySchema | XyoModuleQuerySchema;
+declare type XyoDivinerQuerySchemaBase = XyoDivinerDivineQuerySchema | XyoModuleQuerySchema;
+export declare type XyoDivinerQuerySchema<T extends string | void = void> = T extends string ? XyoDivinerQuerySchemaBase | T : XyoDivinerQuerySchemaBase;
+export {};
 //# sourceMappingURL=Schema.d.ts.map

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

@@ -1 +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"}
+{"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,aAAK,yBAAyB,GAAG,2BAA2B,GAAG,oBAAoB,CAAA;AAEnF,oBAAY,qBAAqB,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,MAAM,GAAG,yBAAyB,GAAG,CAAC,GAAG,yBAAyB,CAAA"}

package/dist/esm/XyoDiviner.d.ts

@@ -4,7 +4,7 @@ import { Promisable } from '@xyo-network/promise';
 import { XyoDivinerConfig } from './Config';
 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> {
+export declare abstract class XyoDiviner<TDivineResult extends XyoPayload = XyoPayload, TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery<TDivineResult> = XyoDivinerQuery<TDivineResult>> extends XyoModule<TQuery, TDivineResult, TConfig> implements DivinerModule<TDivineResult, TQuery, TDivineResult> {
     abstract divine(payloads?: XyoPayloads<TDivineResult>): Promisable<TDivineResult | null>;
     queries(): (TQuery['schema'] | XyoDivinerQuerySchema)[];
     query(query: TQuery): Promise<XyoModuleQueryResult<TDivineResult>>;

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

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AACA,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,sBAAsB,CAAA;AAEjD,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;CAgBzE;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"}
+{"version":3,"file":"XyoDiviner.d.ts","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AACA,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,sBAAsB,CAAA;AAEjD,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,MAAM,EAAE,aAAa,EAAE,OAAO,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;CAgBzE;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/package.json

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
-    "@xyo-network/account": "^2.33.0-rc.8",
-    "@xyo-network/archivist": "^2.33.0-rc.8",
-    "@xyo-network/module": "^2.33.0-rc.8",
-    "@xyo-network/payload": "^2.33.0-rc.8",
-    "@xyo-network/promise": "^2.33.0-rc.8",
+    "@xyo-network/account": "^2.33.0",
+    "@xyo-network/archivist": "^2.33.0",
+    "@xyo-network/module": "^2.33.0",
+    "@xyo-network/payload": "^2.33.0",
+    "@xyo-network/promise": "^2.33.0",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -51,6 +51,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.0-rc.8",
-  "stableVersion": "2.32.1"
+  "version": "2.33.0"
 }

package/src/Payload/Archivist/Diviner.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/assert'
-import { Archivist, XyoArchivist, XyoArchivistGetQuerySchema, XyoArchivistWrapper } from '@xyo-network/archivist'
+import { PayloadArchivist, XyoArchivistGetQuerySchema, XyoArchivistWrapper } from '@xyo-network/archivist'
 import { PartialModuleConfig, XyoModuleResolverFunc } from '@xyo-network/module'
 import { Huri, XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
@@ -10,14 +10,15 @@ import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
 import { XyoArchivistPayloadDivinerConfig, XyoArchivistPayloadDivinerConfigSchema } from './Config'
 
 export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoPayload, XyoArchivistPayloadDivinerConfig> {
-  protected readonly archivist?: Archivist
+  protected readonly archivist?: PayloadArchivist | null
 
-  constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: XyoArchivist, resolver?: XyoModuleResolverFunc) {
+  constructor(config?: PartialModuleConfig<XyoArchivistPayloadDivinerConfig>, archivist?: PayloadArchivist, resolver?: XyoModuleResolverFunc) {
     super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema }, undefined, resolver)
     const configArchivistAddress = config?.archivist
-    const resolvedArchivist = archivist ?? (configArchivistAddress ? this.resolver?.(configArchivistAddress) : null)
+    const resolvedArchivist: PayloadArchivist | null =
+      archivist ?? (configArchivistAddress ? (this.resolver?.(configArchivistAddress) as unknown as PayloadArchivist) : null)
     if (resolvedArchivist) {
-      this.archivist = new XyoArchivistWrapper(resolvedArchivist)
+      this.archivist = resolvedArchivist ? new XyoArchivistWrapper(resolvedArchivist) : null
     }
   }
 

package/src/Queries/Payload.ts

@@ -1,6 +1,10 @@
-import { XyoModuleQuery } from '@xyo-network/module'
+import { XyoModuleQuery, XyoQuery } from '@xyo-network/module'
 import { XyoPayload } from '@xyo-network/payload'
 
 import { XyoDivinerDivineQuery } from './Divine'
 
-export type XyoDivinerQuery<T extends XyoPayload = XyoPayload> = XyoDivinerDivineQuery<T> | XyoModuleQuery
+type XyoDivinerQueryBase<TDivineResult extends XyoPayload = XyoPayload> = XyoDivinerDivineQuery<TDivineResult> | XyoModuleQuery
+
+export type XyoDivinerQuery<TDivineResult extends XyoPayload = XyoPayload, TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery
+  ? XyoDivinerQueryBase<TDivineResult> | TQuery
+  : XyoDivinerQueryBase<TDivineResult>

package/src/Queries/Schema.ts

@@ -2,4 +2,6 @@ import { XyoModuleQuerySchema } from '@xyo-network/module'
 
 import { XyoDivinerDivineQuerySchema } from './Divine'
 
-export type XyoDivinerQuerySchema = XyoDivinerDivineQuerySchema | XyoModuleQuerySchema
+type XyoDivinerQuerySchemaBase = XyoDivinerDivineQuerySchema | XyoModuleQuerySchema
+
+export type XyoDivinerQuerySchema<T extends string | void = void> = T extends string ? XyoDivinerQuerySchemaBase | T : XyoDivinerQuerySchemaBase

package/src/XyoDiviner.ts

@@ -12,7 +12,7 @@ export abstract class XyoDiviner<
     TConfig extends XyoDivinerConfig = XyoDivinerConfig,
     TQuery extends XyoDivinerQuery<TDivineResult> = XyoDivinerQuery<TDivineResult>,
   >
-  extends XyoModule<TConfig, TQuery, TDivineResult>
+  extends XyoModule<TQuery, TDivineResult, TConfig>
   implements DivinerModule<TDivineResult, TQuery, TDivineResult>
 {
   abstract divine(payloads?: XyoPayloads<TDivineResult>): Promisable<TDivineResult | null>