@xyo-network/diviner 2.43.7 → 2.43.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import { DivinerConfig, DivinerModule } from '@xyo-network/diviner-model';
2
- import { AbstractModule, ModuleParams, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
2
+ import { AbstractModule, AbstractModuleConfig, ModuleParams, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
3
3
  import { XyoPayload } from '@xyo-network/payload-model';
4
4
  import { Promisable } from '@xyo-network/promise';
5
5
  export type DivinerParams = ModuleParams;
@@ -9,7 +9,7 @@ export declare abstract class AbstractDiviner<TConfig extends DivinerConfig = Di
9
9
  get targetSchema(): string | undefined;
10
10
  static create(params?: Partial<ModuleParams<DivinerConfig>>): Promise<AbstractDiviner>;
11
11
  queries(): string[];
12
- query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<ModuleQueryResult<XyoPayload>>;
12
+ query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends AbstractModuleConfig = AbstractModuleConfig>(query: T, payloads?: XyoPayload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
13
13
  abstract divine(payloads?: XyoPayload[]): Promisable<XyoPayload[]>;
14
14
  }
15
15
  //# sourceMappingURL=AbstractDiviner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAgD,MAAM,4BAA4B,CAAA;AACvH,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAA6C,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACtJ,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,MAAM,aAAa,GAAG,YAAY,CAAA;AAExC,8BAAsB,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,aAAa;IAC3I,OAAgB,YAAY,EAAE,MAAM,CAAA;IACpC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAW,YAAY,uBAEtB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAIrF,OAAO,IAAI,MAAM,EAAE;IAIpB,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EACxE,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,GACtB,OAAO,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAuBzC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;CACnE"}
1
+ {"version":3,"file":"AbstractDiviner.d.ts","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAgD,MAAM,4BAA4B,CAAA;AACvH,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,MAAM,aAAa,GAAG,YAAY,CAAA;AAExC,8BAAsB,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,aAAa;IAC3I,OAAgB,YAAY,EAAE,MAAM,CAAA;IACpC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAA;IAE3B,IAAW,YAAY,uBAEtB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAIrF,OAAO,IAAI,MAAM,EAAE;IAIpB,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EACrI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,UAAU,EAAE,EACvB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IAqB7B,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;CACnE"}
@@ -1,7 +1,7 @@
1
1
  import { assertEx } from '@xylabs/assert';
2
2
  import { Account } from '@xyo-network/account';
3
3
  import { XyoDivinerDivineQuerySchema } from '@xyo-network/diviner-model';
4
- import { AbstractModule, QueryBoundWitnessWrapper, XyoErrorBuilder } from '@xyo-network/module';
4
+ import { AbstractModule, QueryBoundWitnessWrapper, XyoErrorBuilder, } from '@xyo-network/module';
5
5
  export class AbstractDiviner extends AbstractModule {
6
6
  static configSchema;
7
7
  static targetSchema;
@@ -14,10 +14,10 @@ export class AbstractDiviner extends AbstractModule {
14
14
  queries() {
15
15
  return [XyoDivinerDivineQuerySchema, ...super.queries()];
16
16
  }
17
- async query(query, payloads) {
17
+ async query(query, payloads, queryConfig) {
18
18
  const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
19
19
  const typedQuery = wrapper.query;
20
- assertEx(await this.queryable(query, payloads));
20
+ assertEx(this.queryable(query, payloads, queryConfig));
21
21
  const queryAccount = new Account();
22
22
  const resultPayloads = [];
23
23
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractDiviner.js","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAgC,2BAA2B,EAAmB,MAAM,4BAA4B,CAAA;AACvH,OAAO,EAAE,cAAc,EAAmC,wBAAwB,EAAE,eAAe,EAAwB,MAAM,qBAAqB,CAAA;AAMtJ,MAAM,OAAgB,eAA+D,SAAQ,cAAuB;IAClH,MAAM,CAAU,YAAY,CAAQ;IACpC,MAAM,CAAC,YAAY,CAAQ;IAE3B,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,CAAA;IAClC,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA6C;QACxE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAoB,CAAA;IACxD,CAAC;IAEe,OAAO;QACrB,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEQ,KAAK,CAAC,KAAK,CAClB,KAAQ,EACR,QAAuB;QAEvB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAkB,KAAK,EAAE,QAAQ,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,QAAQ,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;QAE/C,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAA;QAElC,MAAM,cAAc,GAAiB,EAAE,CAAA;QACvC,IAAI;YACF,QAAQ,UAAU,CAAC,UAAU,EAAE;gBAC7B,KAAK,2BAA2B;oBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACrD,MAAK;gBACP;oBACE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;aACtC;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,cAAc,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;SAChF;QACD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;IAC5D,CAAC;CAGF"}
1
+ {"version":3,"file":"AbstractDiviner.js","sourceRoot":"","sources":["../../src/AbstractDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAgC,2BAA2B,EAAmB,MAAM,4BAA4B,CAAA;AACvH,OAAO,EACL,cAAc,EAId,wBAAwB,EACxB,eAAe,GAEhB,MAAM,qBAAqB,CAAA;AAM5B,MAAM,OAAgB,eAA+D,SAAQ,cAAuB;IAClH,MAAM,CAAU,YAAY,CAAQ;IACpC,MAAM,CAAC,YAAY,CAAQ;IAE3B,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,CAAA;IAClC,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA6C;QACxE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAoB,CAAA;IACxD,CAAC;IAEe,OAAO;QACrB,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEQ,KAAK,CAAC,KAAK,CAClB,KAAQ,EACR,QAAuB,EACvB,WAAqB;QAErB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAkB,KAAK,EAAE,QAAQ,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACtD,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAA;QAClC,MAAM,cAAc,GAAiB,EAAE,CAAA;QACvC,IAAI;YACF,QAAQ,UAAU,CAAC,UAAU,EAAE;gBAC7B,KAAK,2BAA2B;oBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACrD,MAAK;gBACP;oBACE,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;aACtC;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,cAAc,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;SAChF;QACD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;IAC5D,CAAC;CAGF"}
@@ -1 +1 @@
1
- {"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,2BAA2B,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAEzF,qBAAa,kBAAmB,SAAQ,sBAAsB,CAAC,2BAA2B,CAAC;IACzF,OAAgB,YAAY,EAAE,iCAAiC,CAAA;IAE/D,SAAS,KAAK,OAAO,wDAEpB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIvG,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAW5D,OAAO;CAGjB"}
1
+ {"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Huri/Diviner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,2BAA2B,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAA;AAEzF,qBAAa,kBAAmB,SAAQ,sBAAsB,CAAC,2BAA2B,CAAC;IACzF,OAAgB,YAAY,EAAE,iCAAiC,CAAA;IAE/D,SAAS,KAAK,OAAO,wDAEpB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIvG,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAa5D,OAAO;CAGjB"}
@@ -15,7 +15,9 @@ export class HuriPayloadDiviner extends AbstractPayloadDiviner {
15
15
  }
16
16
  async divine(payloads) {
17
17
  const huriPayloads = assertEx(payloads?.filter((payload) => payload?.schema === XyoHuriSchema), `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`);
18
- const huriList = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new Huri(huri))).flat();
18
+ const huriList = huriPayloads
19
+ .map((huriPayload, index) => huriPayload.huri.map((huri) => new Huri(huri, { token: huriPayload.tokens?.[index] })))
20
+ .flat();
19
21
  const settled = await Promise.allSettled(huriList.map((huri) => huri.fetch()));
20
22
  return compact(settled.filter(fulfilled).map((settle) => settle.value));
21
23
  }
@@ -1 +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,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAGxC,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAGjE,MAAM,OAAO,kBAAmB,SAAQ,sBAAmD;IACzF,MAAM,CAAU,YAAY,CAAmC;IAE/D,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA2D;QACtF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAuB,CAAA;IAC3D,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,QAAuB;QAC3C,MAAM,YAAY,GAAG,QAAQ,CAC3B,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,EAC3F,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClE,CAAA;QACD,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAEzG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC9E,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACzE,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;CACF"}
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,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAGxC,OAAO,OAAO,MAAM,gBAAgB,CAAA;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAGjE,MAAM,OAAO,kBAAmB,SAAQ,sBAAmD;IACzF,MAAM,CAAU,YAAY,CAAmC;IAE/D,IAAc,OAAO;QACnB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAA2D;QACtF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAuB,CAAA;IAC3D,CAAC;IAEQ,KAAK,CAAC,MAAM,CAAC,QAAuB;QAC3C,MAAM,YAAY,GAAG,QAAQ,CAC3B,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,EAC3F,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClE,CAAA;QACD,MAAM,QAAQ,GAAG,YAAY;aAC1B,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;aACnH,IAAI,EAAE,CAAA;QAET,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QAC9E,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACzE,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;CACF"}
@@ -4,5 +4,6 @@ export declare const XyoHuriSchema: XyoHuriSchema;
4
4
  export type XyoHuriPayload = XyoPayload<{
5
5
  huri: string[];
6
6
  schema: 'network.xyo.huri';
7
+ tokens?: string[];
7
8
  }>;
8
9
  //# sourceMappingURL=XyoHuriPayload.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"XyoHuriPayload.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoHuriPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,aAAa,GAAG,kBAAkB,CAAA;AAC9C,eAAO,MAAM,aAAa,EAAE,aAAkC,CAAA;AAE9D,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC;IACtC,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,MAAM,EAAE,kBAAkB,CAAA;CAC3B,CAAC,CAAA"}
1
+ {"version":3,"file":"XyoHuriPayload.d.ts","sourceRoot":"","sources":["../../../src/Payload/XyoHuriPayload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,aAAa,GAAG,kBAAkB,CAAA;AAC9C,eAAO,MAAM,aAAa,EAAE,aAAkC,CAAA;AAE9D,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC;IACtC,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,MAAM,EAAE,kBAAkB,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB,CAAC,CAAA"}
package/package.json CHANGED
@@ -12,23 +12,23 @@
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.6.15",
14
14
  "@xylabs/promise": "^2.6.15",
15
- "@xyo-network/account": "^2.43.7",
16
- "@xyo-network/archivist": "^2.43.7",
17
- "@xyo-network/archivist-wrapper": "^2.43.7",
18
- "@xyo-network/boundwitness-model": "^2.43.7",
19
- "@xyo-network/boundwitness-wrapper": "^2.43.7",
20
- "@xyo-network/diviner-model": "^2.43.7",
21
- "@xyo-network/diviner-wrapper": "^2.43.7",
22
- "@xyo-network/huri": "^2.43.7",
23
- "@xyo-network/module": "^2.43.7",
24
- "@xyo-network/module-model": "^2.43.7",
25
- "@xyo-network/payload-model": "^2.43.7",
26
- "@xyo-network/payload-wrapper": "^2.43.7",
27
- "@xyo-network/promise": "^2.43.7",
15
+ "@xyo-network/account": "^2.43.9",
16
+ "@xyo-network/archivist": "^2.43.9",
17
+ "@xyo-network/archivist-wrapper": "^2.43.9",
18
+ "@xyo-network/boundwitness-model": "^2.43.9",
19
+ "@xyo-network/boundwitness-wrapper": "^2.43.9",
20
+ "@xyo-network/diviner-model": "^2.43.9",
21
+ "@xyo-network/diviner-wrapper": "^2.43.9",
22
+ "@xyo-network/huri": "^2.43.9",
23
+ "@xyo-network/module": "^2.43.9",
24
+ "@xyo-network/module-model": "^2.43.9",
25
+ "@xyo-network/payload-model": "^2.43.9",
26
+ "@xyo-network/payload-wrapper": "^2.43.9",
27
+ "@xyo-network/promise": "^2.43.9",
28
28
  "lodash": "^4.17.21"
29
29
  },
30
30
  "devDependencies": {
31
- "@xylabs/ts-scripts-yarn3": "^2.12.0"
31
+ "@xylabs/ts-scripts-yarn3": "^2.12.21"
32
32
  },
33
33
  "description": "Primary SDK for using XYO Protocol 2.0",
34
34
  "browser": "dist/esm/index.js",
@@ -63,5 +63,5 @@
63
63
  },
64
64
  "sideEffects": false,
65
65
  "types": "dist/esm/index.d.ts",
66
- "version": "2.43.7"
66
+ "version": "2.43.9"
67
67
  }
@@ -1,7 +1,15 @@
1
1
  import { assertEx } from '@xylabs/assert'
2
2
  import { Account } from '@xyo-network/account'
3
3
  import { DivinerConfig, DivinerModule, XyoDivinerDivineQuerySchema, XyoDivinerQuery } from '@xyo-network/diviner-model'
4
- import { AbstractModule, ModuleParams, ModuleQueryResult, QueryBoundWitnessWrapper, XyoErrorBuilder, XyoQueryBoundWitness } from '@xyo-network/module'
4
+ import {
5
+ AbstractModule,
6
+ AbstractModuleConfig,
7
+ ModuleParams,
8
+ ModuleQueryResult,
9
+ QueryBoundWitnessWrapper,
10
+ XyoErrorBuilder,
11
+ XyoQueryBoundWitness,
12
+ } from '@xyo-network/module'
5
13
  import { XyoPayload } from '@xyo-network/payload-model'
6
14
  import { Promisable } from '@xyo-network/promise'
7
15
 
@@ -23,16 +31,15 @@ export abstract class AbstractDiviner<TConfig extends DivinerConfig = DivinerCon
23
31
  return [XyoDivinerDivineQuerySchema, ...super.queries()]
24
32
  }
25
33
 
26
- override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(
34
+ override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends AbstractModuleConfig = AbstractModuleConfig>(
27
35
  query: T,
28
36
  payloads?: XyoPayload[],
29
- ): Promise<ModuleQueryResult<XyoPayload>> {
37
+ queryConfig?: TConfig,
38
+ ): Promise<ModuleQueryResult> {
30
39
  const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoDivinerQuery>(query, payloads)
31
40
  const typedQuery = wrapper.query
32
- assertEx(await this.queryable(query, payloads))
33
-
41
+ assertEx(this.queryable(query, payloads, queryConfig))
34
42
  const queryAccount = new Account()
35
-
36
43
  const resultPayloads: XyoPayload[] = []
37
44
  try {
38
45
  switch (typedQuery.schemaName) {
@@ -26,7 +26,9 @@ export class HuriPayloadDiviner extends AbstractPayloadDiviner<XyoHuriPayloadDiv
26
26
  payloads?.filter((payload): payload is XyoHuriPayload => payload?.schema === XyoHuriSchema),
27
27
  `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`,
28
28
  )
29
- const huriList = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new Huri(huri))).flat()
29
+ const huriList = huriPayloads
30
+ .map((huriPayload, index) => huriPayload.huri.map((huri) => new Huri(huri, { token: huriPayload.tokens?.[index] })))
31
+ .flat()
30
32
 
31
33
  const settled = await Promise.allSettled(huriList.map((huri) => huri.fetch()))
32
34
  return compact(settled.filter(fulfilled).map((settle) => settle.value))
@@ -6,4 +6,5 @@ export const XyoHuriSchema: XyoHuriSchema = 'network.xyo.huri'
6
6
  export type XyoHuriPayload = XyoPayload<{
7
7
  huri: string[]
8
8
  schema: 'network.xyo.huri'
9
+ tokens?: string[]
9
10
  }>