@xyo-network/diviner 2.26.4 → 2.26.7

package/dist/esm/Abstract.d.ts

@@ -1,9 +1,7 @@
 import { XyoAbstractModule, XyoModuleConfig } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { XyoDiviner, XyoDivinerQueryPayload } from './Diviner';
-export declare type XyoDivinerConfig<T extends XyoPayload = XyoPayload> = XyoModuleConfig<{
-    targetSchema: string;
-} & T>;
+export declare type XyoDivinerConfig<T extends XyoPayload = XyoPayload> = XyoModuleConfig<T>;
 export declare abstract class XyoAbstractDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload, C extends XyoDivinerConfig = XyoDivinerConfig> extends XyoAbstractModule<Q, C> implements XyoDiviner<Q> {
 }
 export declare abstract class XyoAbstractTimestampDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload> extends XyoAbstractDiviner<Q> {

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

@@ -1 +1 @@
-{"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAE9D,oBAAY,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAC/E;IACE,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,CAAC,CACN,CAAA;AACD,8BAAsB,kBAAkB,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,EAAE,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC/I,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAC9B,YAAW,UAAU,CAAC,CAAC,CAAC;CAAG;AAE7B,8BAAsB,2BAA2B,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAA;AAE9D,oBAAY,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAAC,CAAC,CAAC,CAAA;AACpF,8BAAsB,kBAAkB,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,EAAE,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC/I,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAC9B,YAAW,UAAU,CAAC,CAAC,CAAC;CAAG;AAE7B,8BAAsB,2BAA2B,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,kBAAkB,CAAC,CAAC,CAAC;CAAG"}

package/dist/esm/Abstract.js.map

@@ -1 +1 @@
-{"version":3,"file":"Abstract.js","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAmB,MAAM,qBAAqB,CAAA;AAUxE,MAAM,OAAgB,kBACpB,SAAQ,iBAAuB;CACJ;AAE7B,MAAM,OAAgB,2BAAuF,SAAQ,kBAAqB;CAAG"}
+{"version":3,"file":"Abstract.js","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAmB,MAAM,qBAAqB,CAAA;AAMxE,MAAM,OAAgB,kBACpB,SAAQ,iBAAuB;CACJ;AAE7B,MAAM,OAAgB,2BAAuF,SAAQ,kBAAqB;CAAG"}

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

@@ -4,7 +4,7 @@ import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
     archivist;
     constructor(account, archivist) {
-        super({ account, schema: 'network.xyo.diviner.payload.config', targetSchema: 'network.xyo.payload' });
+        super({ account, schema: 'network.xyo.diviner.payload.config' });
         this.archivist = archivist;
     }
     async query(query) {

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,0BAA2B,SAAQ,iBAAiB;IACrD,SAAS,CAAc;IAEjC,YAAY,OAAmB,EAAE,SAAuB;QACtD,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,oCAAoC,EAAE,YAAY,EAAE,qBAAqB,EAAE,CAAC,CAAA;QACrG,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAoC;QACvD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACxF,MAAM,cAAc,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3D,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,CAAA;IAC5D,CAAC;CACF"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAc,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,OAAO,0BAA2B,SAAQ,iBAAiB;IACrD,SAAS,CAAc;IAEjC,YAAY,OAAmB,EAAE,SAAuB;QACtD,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC,CAAA;QAChE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAoC;QACvD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACxF,MAAM,cAAc,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3D,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,CAAA;IAC5D,CAAC;CACF"}

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

@@ -3,18 +3,17 @@ import { HuriOptions, XyoPayload } from '@xyo-network/payload';
 import { XyoDivinerConfig } from '../../Abstract';
 import { XyoDivinerQueryPayload } from '../../Diviner';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
-import { XyoPayloadDivinerQueryPayload } from '../XyoPayloadDivinerQueryPayload';
 export declare type XyoHuriPayloadDivinerConfig = XyoDivinerConfig<{
     schema: 'network.xyo.diviner.payload.huri.config';
-    huriOptions: HuriOptions;
-    huri: string;
+    options?: HuriOptions;
 }>;
 export declare type XyoHuriPayloadDivinerQuery = XyoDivinerQueryPayload<{
     schema: 'network.xyo.diviner.payload.huri.query';
+    options?: HuriOptions;
     huri: string;
 }>;
 export declare class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerQuery, XyoHuriPayloadDivinerConfig> {
-    protected get options(): HuriOptions;
-    query(query: XyoPayloadDivinerQueryPayload): Promise<[XyoBoundWitness, XyoPayload[]]>;
+    protected get options(): HuriOptions | undefined;
+    query(query: XyoHuriPayloadDivinerQuery): Promise<[XyoBoundWitness, XyoPayload[]]>;
 }
 //# sourceMappingURL=Diviner.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAQ,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAA;AAEhF,oBAAY,2BAA2B,GAAG,gBAAgB,CAAC;IACzD,MAAM,EAAE,yCAAyC,CAAA;IACjD,WAAW,EAAE,WAAW,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA;AAEF,oBAAY,0BAA0B,GAAG,sBAAsB,CAAC;IAC9D,MAAM,EAAE,wCAAwC,CAAA;IAChD,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA;AAEF,qBAAa,qBAAsB,SAAQ,iBAAiB,CAAC,0BAA0B,EAAE,2BAA2B,CAAC;IACnH,SAAS,KAAK,OAAO,gBAEpB;IAEc,KAAK,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,UAAU,EAAE,CAAC,CAAC;CAMrG"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAQ,WAAW,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAExD,oBAAY,2BAA2B,GAAG,gBAAgB,CAAC;IACzD,MAAM,EAAE,yCAAyC,CAAA;IACjD,OAAO,CAAC,EAAE,WAAW,CAAA;CACtB,CAAC,CAAA;AAEF,oBAAY,0BAA0B,GAAG,sBAAsB,CAAC;IAC9D,MAAM,EAAE,wCAAwC,CAAA;IAChD,OAAO,CAAC,EAAE,WAAW,CAAA;IACrB,IAAI,EAAE,MAAM,CAAA;CACb,CAAC,CAAA;AAEF,qBAAa,qBAAsB,SAAQ,iBAAiB,CAAC,0BAA0B,EAAE,2BAA2B,CAAC;IACnH,SAAS,KAAK,OAAO,4BAEpB;IAEc,KAAK,CAAC,KAAK,EAAE,0BAA0B,GAAG,OAAO,CAAC,CAAC,eAAe,EAAE,UAAU,EAAE,CAAC,CAAC;CAMlG"}

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

@@ -3,10 +3,10 @@ import { profile } from '../lib';
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner';
 export class XyoHuriPayloadDiviner extends XyoPayloadDiviner {
     get options() {
-        return this.config.huriOptions;
+        return this.config.options;
     }
     async query(query) {
-        const huri = new Huri(query.huri, this.options);
+        const huri = new Huri(query.huri, query.options ?? this.options);
         const [payload = null] = await profile(async () => await huri.fetch());
         const payloads = payload ? [payload] : [];
         return [this.bindPayloads(payloads), payloads];

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAIpE,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAcxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA0E;IACnH,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAA;IAChC,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAoC;QACvD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC/C,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;CACF"}
+{"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA2B,MAAM,sBAAsB,CAAA;AAIpE,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAaxD,MAAM,OAAO,qBAAsB,SAAQ,iBAA0E;IACnH,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;IAC5B,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAC,KAAiC;QACpD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAA;QAChE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAA;QACtE,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACzC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;CACF"}

package/package.json

@@ -10,11 +10,11 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/account": "^2.26.4",
-    "@xyo-network/archivist": "^2.26.4",
-    "@xyo-network/boundwitness": "^2.26.4",
-    "@xyo-network/module": "^2.26.4",
-    "@xyo-network/payload": "^2.26.4",
+    "@xyo-network/account": "^2.26.7",
+    "@xyo-network/archivist": "^2.26.7",
+    "@xyo-network/boundwitness": "^2.26.7",
+    "@xyo-network/module": "^2.26.7",
+    "@xyo-network/payload": "^2.26.7",
     "tslib": "^2.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -53,5 +53,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.26.4"
+  "version": "2.26.7"
 }

package/src/Abstract.ts

@@ -3,11 +3,7 @@ import { XyoPayload } from '@xyo-network/payload'
 
 import { XyoDiviner, XyoDivinerQueryPayload } from './Diviner'
 
-export type XyoDivinerConfig<T extends XyoPayload = XyoPayload> = XyoModuleConfig<
-  {
-    targetSchema: string
-  } & T
->
+export type XyoDivinerConfig<T extends XyoPayload = XyoPayload> = XyoModuleConfig<T>
 export abstract class XyoAbstractDiviner<Q extends XyoDivinerQueryPayload = XyoDivinerQueryPayload, C extends XyoDivinerConfig = XyoDivinerConfig>
   extends XyoAbstractModule<Q, C>
   implements XyoDiviner<Q> {}

package/src/Payload/Archivist/Diviner.ts

@@ -11,7 +11,7 @@ export class XyoArchivistPayloadDiviner extends XyoPayloadDiviner {
   protected archivist: XyoArchivist
 
   constructor(account: XyoAccount, archivist: XyoArchivist) {
-    super({ account, schema: 'network.xyo.diviner.payload.config', targetSchema: 'network.xyo.payload' })
+    super({ account, schema: 'network.xyo.diviner.payload.config' })
     this.archivist = archivist
   }
 

package/src/Payload/Huri/Diviner.ts

@@ -5,26 +5,25 @@ import { XyoDivinerConfig } from '../../Abstract'
 import { XyoDivinerQueryPayload } from '../../Diviner'
 import { profile } from '../lib'
 import { XyoPayloadDiviner } from '../XyoPayloadDiviner'
-import { XyoPayloadDivinerQueryPayload } from '../XyoPayloadDivinerQueryPayload'
 
 export type XyoHuriPayloadDivinerConfig = XyoDivinerConfig<{
   schema: 'network.xyo.diviner.payload.huri.config'
-  huriOptions: HuriOptions
-  huri: string
+  options?: HuriOptions
 }>
 
 export type XyoHuriPayloadDivinerQuery = XyoDivinerQueryPayload<{
   schema: 'network.xyo.diviner.payload.huri.query'
+  options?: HuriOptions
   huri: string
 }>
 
 export class XyoHuriPayloadDiviner extends XyoPayloadDiviner<XyoHuriPayloadDivinerQuery, XyoHuriPayloadDivinerConfig> {
   protected get options() {
-    return this.config.huriOptions
+    return this.config.options
   }
 
-  override async query(query: XyoPayloadDivinerQueryPayload): Promise<[XyoBoundWitness, XyoPayload[]]> {
-    const huri = new Huri(query.huri, this.options)
+  override async query(query: XyoHuriPayloadDivinerQuery): Promise<[XyoBoundWitness, XyoPayload[]]> {
+    const huri = new Huri(query.huri, query.options ?? this.options)
     const [payload = null] = await profile(async () => await huri.fetch())
     const payloads = payload ? [payload] : []
     return [this.bindPayloads(payloads), payloads]