@xyo-network/diviner 2.33.13 → 2.33.14

package/dist/esm/Diviner.d.ts

@@ -1,10 +1,9 @@
 import { Module } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
-import { XyoDivinerQuery } from './Queries';
 export interface Diviner {
     divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>;
 }
-export interface DivinerModule<TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends Module<TQuery>, Diviner {
+export interface DivinerModule extends Module, Diviner {
 }
 //# 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,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;CAC9D;AAED,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,eAAe,GAAG,eAAe,CAAE,SAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO;CAAG"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,OAAO;IACtB,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,CAAA;CAC9D;AAED,MAAM,WAAW,aAAc,SAAQ,MAAM,EAAE,OAAO;CAAG"}

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

@@ -6,7 +6,7 @@ import { XyoArchivistPayloadDivinerConfig } from './Config';
 export declare class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPayloadDivinerConfig> {
     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")[];
+    queries(): string[];
     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,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,gCAAgC,CAAC;IACjG,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;gBAE1C,MAAM,CAAC,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAUjI,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAYxE"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAyE,MAAM,wBAAwB,CAAA;AAChI,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,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,gCAAgC,CAAC;IACjG,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;gBAE1C,MAAM,CAAC,EAAE,mBAAmB,CAAC,gCAAgC,CAAC,EAAE,SAAS,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,qBAAqB;IAUjI,OAAO;IAIH,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAYxE"}

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

@@ -11,7 +11,7 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
     constructor(config, archivist, resolver) {
         super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema }, undefined, resolver);
         const configArchivistAddress = config?.archivist;
-        const resolvedArchivist = archivist ?? (configArchivistAddress ? this.resolver?.(configArchivistAddress) : null);
+        const resolvedArchivist = archivist ?? (configArchivistAddress ? this.resolver?.(configArchivistAddress) ?? null : null);
         if (resolvedArchivist) {
             this.archivist = resolvedArchivist ? new XyoArchivistWrapper(resolvedArchivist) : 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,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,iBAAmD;IAC9E,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"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAA0C,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAEhI,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,iBAAmD;IAC9E,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,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACjI,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,CAAuB,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAC7H,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<XyoHuriPayloadDivinerConfig> {
     protected get options(): import("@xyo-network/payload").HuriOptions | undefined;
-    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")[];
+    queries(): string[];
     divine(payloads?: XyoPayloads): Promise<XyoPayload | null>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

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

@@ -1,6 +1,5 @@
 import { XyoDivinerConfig } from '../Config';
-import { XyoDivinerQuery } from '../Queries';
 import { XyoDiviner } from '../XyoDiviner';
-export declare abstract class XyoPayloadDiviner<C extends XyoDivinerConfig = XyoDivinerConfig, Q extends XyoDivinerQuery = XyoDivinerQuery> extends XyoDiviner<C, Q> {
+export declare abstract class XyoPayloadDiviner<C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoDiviner<C> {
 }
 //# 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,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,gBAAgB,GAAG,gBAAgB,EAC7C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;CAAG"}
+{"version":3,"file":"XyoPayloadDiviner.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;CAAG"}

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

@@ -1 +1 @@
-{"version":3,"file":"XyoPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,OAAgB,iBAGpB,SAAQ,UAAgB;CAAG"}
+{"version":3,"file":"XyoPayloadDiviner.js","sourceRoot":"","sources":["../../../src/Payload/XyoPayloadDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,OAAgB,iBAAiE,SAAQ,UAAa;CAAG"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AAExB,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,oBAAY,mBAAmB,CAAC,aAAa,SAAS,UAAU,GAAG,UAAU,IAAI,qBAAqB,CAAC,aAAa,CAAC,CAAA;AAErH,oBAAY,eAAe,CAAC,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,MAAM,SAAS,QAAQ,GACxF,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,GACxD,cAAc,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AAExB,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,oBAAY,mBAAmB,CAAC,aAAa,SAAS,UAAU,GAAG,UAAU,IAAI,qBAAqB,CAAC,aAAa,CAAC,CAAA;AAErH,oBAAY,eAAe,CAAC,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,cAAc,CACjF,MAAM,SAAS,QAAQ,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,MAAM,GAAG,mBAAmB,CAAC,UAAU,CAAC,CACrG,CAAA"}

package/dist/esm/XyoDiviner.d.ts

@@ -1,20 +1,19 @@
-import { XyoModule, XyoModuleQueryResult } from '@xyo-network/module';
+import { XyoModule, XyoModuleQueryResult, XyoQuery } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload';
 import { Promisable } from '@xyo-network/promise';
 import { XyoDivinerConfig } from './Config';
 import { DivinerModule } from './Diviner';
-import { XyoDivinerQuery } from './Queries';
-export declare abstract class XyoDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoModule<TQuery, TConfig> implements DivinerModule<TQuery> {
+export declare abstract class XyoDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoModule<TConfig> implements DivinerModule {
     abstract divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>;
-    queries(): TQuery['schema'][];
-    query(query: TQuery): Promise<XyoModuleQueryResult>;
+    queries(): string[];
+    query<T extends XyoQuery = XyoQuery>(query: T): Promise<XyoModuleQueryResult>;
 }
-export declare abstract class XyoTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoDiviner<TConfig, TQuery> {
+export declare abstract class XyoTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoDiviner<TConfig> {
 }
 /** @deprecated use XyoDiviner instead*/
-export declare abstract class XyoAbstractDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoDiviner<TConfig, TQuery> {
+export declare abstract class XyoAbstractDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoDiviner<TConfig> {
 }
 /** @deprecated use XyoDiviner instead*/
-export declare abstract class XyoAbstractTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends XyoTimestampDiviner<TConfig, TQuery> {
+export declare abstract class XyoAbstractTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoTimestampDiviner<TConfig> {
 }
 //# 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":"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,MAAM,WAAW,CAAA;AAExE,8BAAsB,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EAAE,MAAM,SAAS,eAAe,GAAG,eAAe,CACpI,SAAQ,SAAS,CAAC,MAAM,EAAE,OAAO,CACjC,YAAW,aAAa,CAAC,MAAM,CAAC;IAEhC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC;IAEtD,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE;IAIvC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAgB1D;AAED,8BAAsB,mBAAmB,CACvC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;CAAG;AAExC,wCAAwC;AACxC,8BAAsB,kBAAkB,CACtC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;CAAG;AAExC,wCAAwC;AACxC,8BAAsB,2BAA2B,CAC/C,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EACnD,MAAM,SAAS,eAAe,GAAG,eAAe,CAChD,SAAQ,mBAAmB,CAAC,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,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAC7I,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAGzC,8BAAsB,UAAU,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,SAAS,CAAC,OAAO,CAAE,YAAW,aAAa;IACvI,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC;IAEtD,OAAO,IAAI,MAAM,EAAE;IAI7B,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAiBpF;AAED,8BAAsB,mBAAmB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;CAAG;AAE7H,wCAAwC;AACxC,8BAAsB,kBAAkB,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC;CAAG;AAE5H,wCAAwC;AACxC,8BAAsB,2BAA2B,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,mBAAmB,CAAC,OAAO,CAAC;CAAG"}

package/dist/esm/XyoDiviner.js

@@ -11,12 +11,13 @@ export class XyoDiviner extends XyoModule {
             console.error(`Undeclared Module Query: ${query.schema}`);
         }
         const payloads = [];
-        switch (query.schema) {
+        const typedQuery = query;
+        switch (typedQuery.schema) {
             case XyoDivinerDivineQuerySchema:
-                payloads.push(await this.divine(query.payloads));
+                payloads.push(await this.divine(typedQuery.payloads));
                 break;
             default:
-                return super.query(query);
+                return super.query(typedQuery);
         }
         return await this.bindPayloads(payloads, queryAccount);
     }

package/dist/esm/XyoDiviner.js.map

@@ -1 +1 @@
-{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,8BAA8B,EAAwB,4BAA4B,EAAE,MAAM,qBAAqB,CAAA;AAMnI,OAAO,EAAE,2BAA2B,EAAmB,MAAM,WAAW,CAAA;AAExE,MAAM,OAAgB,UACpB,SAAQ,SAA0B;IAKlB,OAAO;QACrB,OAAO,CAAC,8BAA8B,EAAE,4BAA4B,EAAE,2BAA2B,CAAC,CAAA;IACpG,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAa;QACvB,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;YAC7D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;SAC1D;QAED,MAAM,QAAQ,GAAgB,EAAE,CAAA;QAChC,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;YACP;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SAC5B;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IACxD,CAAC;CACF;AAED,MAAM,OAAgB,mBAGpB,SAAQ,UAA2B;CAAG;AAExC,wCAAwC;AACxC,MAAM,OAAgB,kBAGpB,SAAQ,UAA2B;CAAG;AAExC,wCAAwC;AACxC,MAAM,OAAgB,2BAGpB,SAAQ,mBAAoC;CAAG"}
+{"version":3,"file":"XyoDiviner.js","sourceRoot":"","sources":["../../src/XyoDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,8BAA8B,EAAwB,4BAA4B,EAAY,MAAM,qBAAqB,CAAA;AAM7I,OAAO,EAAE,2BAA2B,EAAmB,MAAM,WAAW,CAAA;AAExE,MAAM,OAAgB,UAAgE,SAAQ,SAAkB;IAG9F,OAAO;QACrB,OAAO,CAAC,8BAA8B,EAAE,4BAA4B,EAAE,2BAA2B,CAAC,CAAA;IACpG,CAAC;IAED,KAAK,CAAC,KAAK,CAAgC,KAAQ;QACjD,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAA;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;YAC7D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;SAC1D;QAED,MAAM,QAAQ,GAAgB,EAAE,CAAA;QAChC,MAAM,UAAU,GAAG,KAAwB,CAAA;QAC3C,QAAQ,UAAU,CAAC,MAAM,EAAE;YACzB,KAAK,2BAA2B;gBAC9B,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAA;gBACrD,MAAK;YACP;gBACE,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;SACjC;QACD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IACxD,CAAC;CACF;AAED,MAAM,OAAgB,mBAAyE,SAAQ,UAAmB;CAAG;AAE7H,wCAAwC;AACxC,MAAM,OAAgB,kBAAwE,SAAQ,UAAmB;CAAG;AAE5H,wCAAwC;AACxC,MAAM,OAAgB,2BAAiF,SAAQ,mBAA4B;CAAG"}

package/package.json

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

package/src/Diviner.ts

@@ -2,10 +2,8 @@ import { Module } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 
-import { XyoDivinerQuery } from './Queries'
-
 export interface Diviner {
   divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>
 }
 
-export interface DivinerModule<TQuery extends XyoDivinerQuery = XyoDivinerQuery> extends Module<TQuery>, Diviner {}
+export interface DivinerModule extends Module, Diviner {}

package/src/Payload/Archivist/Diviner.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/assert'
-import { PayloadArchivist, XyoArchivistGetQuerySchema, XyoArchivistWrapper } from '@xyo-network/archivist'
+import { PayloadArchivist, XyoArchivistGetQuery, XyoArchivistGetQuerySchema, XyoArchivistWrapper } from '@xyo-network/archivist'
 import { PartialModuleConfig, XyoModuleResolverFunc } from '@xyo-network/module'
 import { Huri, XyoPayload, XyoPayloads } from '@xyo-network/payload'
 
@@ -16,7 +16,7 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPa
     super({ ...config, schema: XyoArchivistPayloadDivinerConfigSchema }, undefined, resolver)
     const configArchivistAddress = config?.archivist
     const resolvedArchivist: PayloadArchivist | null =
-      archivist ?? (configArchivistAddress ? (this.resolver?.(configArchivistAddress) as unknown as PayloadArchivist) : null)
+      archivist ?? (configArchivistAddress ? (this.resolver?.(configArchivistAddress) as unknown as PayloadArchivist) ?? null : null)
     if (resolvedArchivist) {
       this.archivist = resolvedArchivist ? new XyoArchivistWrapper(resolvedArchivist) : null
     }
@@ -32,7 +32,7 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner<XyoArchivistPa
     const activeArchvist = this.archivist
     if (activeArchvist) {
       const [[, [payload = null]]] = await profile(
-        async () => await activeArchvist.query({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }),
+        async () => await activeArchvist.query<XyoArchivistGetQuery>({ hashes: [huriObj.hash], schema: XyoArchivistGetQuerySchema }),
       )
       return payload ?? null
     }

package/src/Payload/XyoPayloadDiviner.ts

@@ -1,8 +1,4 @@
 import { XyoDivinerConfig } from '../Config'
-import { XyoDivinerQuery } from '../Queries'
 import { XyoDiviner } from '../XyoDiviner'
 
-export abstract class XyoPayloadDiviner<
-  C extends XyoDivinerConfig = XyoDivinerConfig,
-  Q extends XyoDivinerQuery = XyoDivinerQuery,
-> extends XyoDiviner<C, Q> {}
+export abstract class XyoPayloadDiviner<C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoDiviner<C> {}

package/src/Queries/index.ts

@@ -7,6 +7,6 @@ import { XyoDivinerDivineQuery } from './Divine'
 
 export type XyoDivinerQueryBase<TDivineResult extends XyoPayload = XyoPayload> = XyoDivinerDivineQuery<TDivineResult>
 
-export type XyoDivinerQuery<TQuery extends XyoQuery | void = void> = TQuery extends XyoQuery
-  ? XyoModuleQuery<XyoDivinerQueryBase<XyoPayload> | TQuery>
-  : XyoModuleQuery<XyoDivinerQueryBase<XyoPayload>>
+export type XyoDivinerQuery<TQuery extends XyoQuery | void = void> = XyoModuleQuery<
+  TQuery extends XyoQuery ? XyoDivinerQueryBase<XyoPayload> | TQuery : XyoDivinerQueryBase<XyoPayload>
+>

package/src/XyoDiviner.ts

@@ -1,5 +1,5 @@
 import { XyoAccount } from '@xyo-network/account'
-import { XyoModule, XyoModuleInitializeQuerySchema, XyoModuleQueryResult, XyoModuleShutdownQuerySchema } from '@xyo-network/module'
+import { XyoModule, XyoModuleInitializeQuerySchema, XyoModuleQueryResult, XyoModuleShutdownQuerySchema, XyoQuery } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload'
 import { Promisable } from '@xyo-network/promise'
 
@@ -7,47 +7,36 @@ import { XyoDivinerConfig } from './Config'
 import { DivinerModule } from './Diviner'
 import { XyoDivinerDivineQuerySchema, XyoDivinerQuery } from './Queries'
 
-export abstract class XyoDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig, TQuery extends XyoDivinerQuery = XyoDivinerQuery>
-  extends XyoModule<TQuery, TConfig>
-  implements DivinerModule<TQuery>
-{
+export abstract class XyoDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoModule<TConfig> implements DivinerModule {
   abstract divine(payloads?: XyoPayloads): Promisable<XyoPayload | null>
 
-  public override queries(): TQuery['schema'][] {
+  public override queries(): string[] {
     return [XyoModuleInitializeQuerySchema, XyoModuleShutdownQuerySchema, XyoDivinerDivineQuerySchema]
   }
 
-  async query(query: TQuery): Promise<XyoModuleQueryResult> {
+  async query<T extends XyoQuery = XyoQuery>(query: T): Promise<XyoModuleQueryResult> {
     const queryAccount = new XyoAccount()
     if (!this.queries().find((schema) => schema === query.schema)) {
       console.error(`Undeclared Module Query: ${query.schema}`)
     }
 
     const payloads: XyoPayloads = []
-    switch (query.schema) {
+    const typedQuery = query as XyoDivinerQuery
+    switch (typedQuery.schema) {
       case XyoDivinerDivineQuerySchema:
-        payloads.push(await this.divine(query.payloads))
+        payloads.push(await this.divine(typedQuery.payloads))
         break
       default:
-        return super.query(query)
+        return super.query(typedQuery)
     }
     return await this.bindPayloads(payloads, queryAccount)
   }
 }
 
-export abstract class XyoTimestampDiviner<
-  TConfig extends XyoDivinerConfig = XyoDivinerConfig,
-  TQuery extends XyoDivinerQuery = XyoDivinerQuery,
-> extends XyoDiviner<TConfig, TQuery> {}
+export abstract class XyoTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoDiviner<TConfig> {}
 
 /** @deprecated use XyoDiviner instead*/
-export abstract class XyoAbstractDiviner<
-  TConfig extends XyoDivinerConfig = XyoDivinerConfig,
-  TQuery extends XyoDivinerQuery = XyoDivinerQuery,
-> extends XyoDiviner<TConfig, TQuery> {}
+export abstract class XyoAbstractDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoDiviner<TConfig> {}
 
 /** @deprecated use XyoDiviner instead*/
-export abstract class XyoAbstractTimestampDiviner<
-  TConfig extends XyoDivinerConfig = XyoDivinerConfig,
-  TQuery extends XyoDivinerQuery = XyoDivinerQuery,
-> extends XyoTimestampDiviner<TConfig, TQuery> {}
+export abstract class XyoAbstractTimestampDiviner<TConfig extends XyoDivinerConfig = XyoDivinerConfig> extends XyoTimestampDiviner<TConfig> {}