@xyo-network/witness 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,4 +1,4 @@
1
- import { AbstractModule, ModuleParams, XyoQueryBoundWitness } from '@xyo-network/module';
1
+ import { AbstractModule, AbstractModuleConfig, ModuleParams, ModuleQueryResult, XyoQueryBoundWitness } from '@xyo-network/module';
2
2
  import { XyoPayload } from '@xyo-network/payload-model';
3
3
  import { Promisable } from '@xyo-network/promise';
4
4
  import { XyoWitnessConfig } from './Config';
@@ -11,9 +11,7 @@ export declare abstract class AbstractWitness<TConfig extends XyoWitnessConfig =
11
11
  static create(params?: Partial<ModuleParams<XyoWitnessConfig>>): Promise<AbstractWitness>;
12
12
  observe(payloads?: XyoPayload[]): Promisable<XyoPayload[]>;
13
13
  queries(): string[];
14
- query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]): Promise<import("@xyo-network/module").ModuleQueryResult<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & {
15
- schema: string;
16
- }>>;
14
+ query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends AbstractModuleConfig = AbstractModuleConfig>(query: T, payloads?: XyoPayload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
17
15
  }
18
16
  /** @deprecated use AbstractWitness instead */
19
17
  export declare abstract class XyoWitness<TTarget extends XyoPayload = XyoPayload, TConfig extends XyoWitnessConfig<TTarget> = XyoWitnessConfig<TTarget>> extends AbstractWitness<TConfig> {
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,YAAY,EAA6C,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACnI,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,8BAAsB,eAAe,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,OAAO;IAC3I,OAAgB,YAAY,EAAE,MAAM,CAAA;IAEpC,IAAW,SAAS;;mBAEnB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAMjG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAOxD,OAAO;IAID,KAAK,CAAC,CAAC,SAAS,oBAAoB,GAAG,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,EAAE;;;CAuB9G;AAED,8CAA8C;AAC9C,8BAAsB,UAAU,CAC9B,OAAO,SAAS,UAAU,GAAG,UAAU,EACvC,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACrE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAG"}
1
+ {"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EAGjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,8BAAsB,eAAe,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAE,YAAW,OAAO;IAC3I,OAAgB,YAAY,EAAE,MAAM,CAAA;IAEpC,IAAW,SAAS;;mBAEnB;WAEqB,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAMjG,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IAOxD,OAAO;IAID,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;CAsB9B;AAED,8CAA8C;AAC9C,8BAAsB,UAAU,CAC9B,OAAO,SAAS,UAAU,GAAG,UAAU,EACvC,OAAO,SAAS,gBAAgB,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CACrE,SAAQ,eAAe,CAAC,OAAO,CAAC;CAAG"}
@@ -1,6 +1,6 @@
1
1
  import { assertEx } from '@xylabs/assert';
2
2
  import { Account } from '@xyo-network/account';
3
- import { AbstractModule, QueryBoundWitnessWrapper, XyoErrorBuilder } from '@xyo-network/module';
3
+ import { AbstractModule, QueryBoundWitnessWrapper, XyoErrorBuilder, } from '@xyo-network/module';
4
4
  import { PayloadWrapper } from '@xyo-network/payload-wrapper';
5
5
  import { XyoWitnessObserveQuerySchema } from './Queries';
6
6
  export class AbstractWitness extends AbstractModule {
@@ -22,10 +22,10 @@ export class AbstractWitness extends AbstractModule {
22
22
  queries() {
23
23
  return [XyoWitnessObserveQuerySchema, ...super.queries()];
24
24
  }
25
- async query(query, payloads) {
25
+ async query(query, payloads, queryConfig) {
26
26
  const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
27
27
  const typedQuery = wrapper.query.payload;
28
- assertEx(await this.queryable(query, payloads));
28
+ assertEx(this.queryable(query, payloads, queryConfig));
29
29
  // Remove the query payload from the arguments passed to us so we don't observe it
30
30
  const filteredObservation = payloads?.filter((p) => new PayloadWrapper(p).hash !== query.query) || [];
31
31
  const queryAccount = new Account();
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAgB,wBAAwB,EAAE,eAAe,EAAwB,MAAM,qBAAqB,CAAA;AAEnI,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAI7D,OAAO,EAAE,4BAA4B,EAAmB,MAAM,WAAW,CAAA;AAGzE,MAAM,OAAgB,eAAqE,SAAQ,cAAuB;IACxH,MAAM,CAAU,YAAY,CAAQ;IAEpC,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;IAC/B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAgD;QAC3E,MAAM,YAAY,GAA4C,MAAM,IAAI,EAAE,CAAA;QAC1E,YAAY,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAA;QACrE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAoB,CAAA;IAC9D,CAAC;IAEM,OAAO,CAAC,QAAuB;QACpC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,QAAQ,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAA;QAC1E,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;QAClE,OAAO,QAAQ,IAAI,EAAE,CAAA;IACvB,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC3D,CAAC;IAEQ,KAAK,CAAC,KAAK,CAAwD,KAAQ,EAAE,QAAuB;QAC3G,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAkB,KAAK,EAAE,QAAQ,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;QACxC,QAAQ,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC/C,kFAAkF;QAClF,MAAM,mBAAmB,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QACrG,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAA;QAClC,IAAI;YACF,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,4BAA4B,CAAC,CAAC;oBACjC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;oBAC9D,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;iBACrD;gBAED,OAAO,CAAC,CAAC;oBACP,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;iBACpC;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;SACnG;IACH,CAAC;CACF;AAED,8CAA8C;AAC9C,MAAM,OAAgB,UAGpB,SAAQ,eAAwB;CAAG"}
1
+ {"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -11,15 +11,15 @@
11
11
  },
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.6.15",
14
- "@xyo-network/account": "^2.43.7",
15
- "@xyo-network/module": "^2.43.7",
16
- "@xyo-network/module-model": "^2.43.7",
17
- "@xyo-network/payload-model": "^2.43.7",
18
- "@xyo-network/payload-wrapper": "^2.43.7",
19
- "@xyo-network/promise": "^2.43.7"
14
+ "@xyo-network/account": "^2.43.9",
15
+ "@xyo-network/module": "^2.43.9",
16
+ "@xyo-network/module-model": "^2.43.9",
17
+ "@xyo-network/payload-model": "^2.43.9",
18
+ "@xyo-network/payload-wrapper": "^2.43.9",
19
+ "@xyo-network/promise": "^2.43.9"
20
20
  },
21
21
  "devDependencies": {
22
- "@xylabs/ts-scripts-yarn3": "^2.12.0"
22
+ "@xylabs/ts-scripts-yarn3": "^2.12.21"
23
23
  },
24
24
  "description": "Primary SDK for using XYO Protocol 2.0",
25
25
  "browser": "dist/esm/index.js",
@@ -54,5 +54,5 @@
54
54
  },
55
55
  "sideEffects": false,
56
56
  "types": "dist/esm/index.d.ts",
57
- "version": "2.43.7"
57
+ "version": "2.43.9"
58
58
  }
@@ -1,6 +1,14 @@
1
1
  import { assertEx } from '@xylabs/assert'
2
2
  import { Account } from '@xyo-network/account'
3
- import { AbstractModule, ModuleParams, QueryBoundWitnessWrapper, XyoErrorBuilder, XyoQueryBoundWitness } from '@xyo-network/module'
3
+ import {
4
+ AbstractModule,
5
+ AbstractModuleConfig,
6
+ ModuleParams,
7
+ ModuleQueryResult,
8
+ QueryBoundWitnessWrapper,
9
+ XyoErrorBuilder,
10
+ XyoQueryBoundWitness,
11
+ } from '@xyo-network/module'
4
12
  import { XyoPayload } from '@xyo-network/payload-model'
5
13
  import { PayloadWrapper } from '@xyo-network/payload-wrapper'
6
14
  import { Promisable } from '@xyo-network/promise'
@@ -33,10 +41,14 @@ export abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitn
33
41
  return [XyoWitnessObserveQuerySchema, ...super.queries()]
34
42
  }
35
43
 
36
- override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(query: T, payloads?: XyoPayload[]) {
44
+ override async query<T extends XyoQueryBoundWitness = XyoQueryBoundWitness, TConfig extends AbstractModuleConfig = AbstractModuleConfig>(
45
+ query: T,
46
+ payloads?: XyoPayload[],
47
+ queryConfig?: TConfig,
48
+ ): Promise<ModuleQueryResult> {
37
49
  const wrapper = QueryBoundWitnessWrapper.parseQuery<XyoWitnessQuery>(query, payloads)
38
50
  const typedQuery = wrapper.query.payload
39
- assertEx(await this.queryable(query, payloads))
51
+ assertEx(this.queryable(query, payloads, queryConfig))
40
52
  // Remove the query payload from the arguments passed to us so we don't observe it
41
53
  const filteredObservation = payloads?.filter((p) => new PayloadWrapper(p).hash !== query.query) || []
42
54
  const queryAccount = new Account()
@@ -46,7 +58,6 @@ export abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitn
46
58
  const resultPayloads = await this.observe(filteredObservation)
47
59
  return this.bindResult(resultPayloads, queryAccount)
48
60
  }
49
-
50
61
  default: {
51
62
  return super.query(query, payloads)
52
63
  }