@xyo-network/module-abstract 2.59.0 → 2.60.0-rc.2

package/docs/types/ModuleError.html

@@ -17,7 +17,7 @@
 <h1>Type alias ModuleError</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-type-alias">Module<wbr/>Error</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type ">Payload</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-symbol">{ </span><br/><span>    </span><span class="tsd-kind-property">message</span><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">; </span><br/><span>    </span><span class="tsd-kind-property">schema</span><span class="tsd-signature-symbol">: </span><a href="../variables/ModuleErrorSchema-1.html" class="tsd-signature-type tsd-kind-variable">ModuleErrorSchema</a><span class="tsd-signature-symbol">; </span><br/><span>    </span><span class="tsd-kind-property">sources</span><span class="tsd-signature-symbol">?: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">[]</span><span class="tsd-signature-symbol">; </span><br/><span class="tsd-signature-symbol">}</span><span class="tsd-signature-symbol">&gt;</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/module/packages/abstract/src/Error.ts#L7">modules/packages/module/packages/abstract/src/Error.ts:7</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/module/packages/abstract/src/Error.ts#L7">modules/packages/module/packages/abstract/src/Error.ts:7</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/types/ModuleErrorSchema.html

@@ -17,8 +17,8 @@
 <h1>Type alias ModuleErrorSchema</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-type-alias">Module<wbr/>Error<wbr/>Schema</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;network.xyo.error.module&quot;</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/module/packages/abstract/src/Error.ts#L4">modules/packages/module/packages/abstract/src/Error.ts:4</a></li>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/module/packages/abstract/src/Error.ts#L5">modules/packages/module/packages/abstract/src/Error.ts:5</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/module/packages/abstract/src/Error.ts#L4">modules/packages/module/packages/abstract/src/Error.ts:4</a></li>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/module/packages/abstract/src/Error.ts#L5">modules/packages/module/packages/abstract/src/Error.ts:5</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/types/Queryable.html

@@ -15,7 +15,7 @@
 <li><a href="../modules.html">@xyo-network/module-abstract</a></li>
 <li><a href="Queryable.html">Queryable</a></li></ul>
 <h1>Type alias Queryable&lt;T&gt;</h1></div>
-<div class="tsd-signature"><span class="tsd-kind-type-alias">Queryable</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type tsd-kind-type-parameter">T</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">query</span>, <span class="tsd-kind-parameter">payloads</span><span class="tsd-signature-symbol">?</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol"> =&gt; </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">)</span></div>
+<div class="tsd-signature"><span class="tsd-kind-type-alias">Queryable</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type tsd-kind-type-parameter">T</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">query</span>, <span class="tsd-kind-parameter">payloads</span><span class="tsd-signature-symbol">?</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol"> =&gt; </span><span class="tsd-signature-type ">Promisable</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol">)</span></div>
 <section class="tsd-panel">
 <h4>Type Parameters</h4>
 <ul class="tsd-type-parameter-list">
@@ -26,7 +26,7 @@
 <ul class="tsd-parameters">
 <li class="tsd-parameter-signature">
 <ul class="tsd-signatures">
-<li class="tsd-signature" id="__type.__type-1"><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">query</span>, <span class="tsd-kind-parameter">payloads</span><span class="tsd-signature-symbol">?</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">boolean</span></li>
+<li class="tsd-signature" id="__type.__type-1"><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">query</span>, <span class="tsd-kind-parameter">payloads</span><span class="tsd-signature-symbol">?</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type ">Promisable</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">&gt;</span></li>
 <li class="tsd-description">
 <div class="tsd-parameters">
 <h4 class="tsd-parameters-title">Parameters</h4>
@@ -35,9 +35,9 @@
 <h5><span class="tsd-kind-parameter">query</span>: <span class="tsd-signature-type tsd-kind-type-parameter">T</span></h5></li>
 <li>
 <h5><code class="tsd-tag ts-flagOptional">Optional</code> <span class="tsd-kind-parameter">payloads</span>: <span class="tsd-signature-type ">Payload</span><span class="tsd-signature-symbol">[]</span></h5></li></ul></div>
-<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">boolean</span></h4></li></ul></li></ul></div><aside class="tsd-sources">
+<h4 class="tsd-returns-title">Returns <span class="tsd-signature-type ">Promisable</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">&gt;</span></h4></li></ul></li></ul></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/module/packages/abstract/src/QueryValidator/QueryValidator.ts#L4">modules/packages/module/packages/abstract/src/QueryValidator/QueryValidator.ts:4</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/module/packages/abstract/src/QueryValidator/QueryValidator.ts#L5">modules/packages/module/packages/abstract/src/QueryValidator/QueryValidator.ts:5</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/types/SortedPipedAddressesString.html

@@ -17,7 +17,7 @@
 <h1>Type alias SortedPipedAddressesString</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-type-alias">Sorted<wbr/>Piped<wbr/>Addresses<wbr/>String</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/module/packages/abstract/src/QueryValidator/ModuleConfigQueryValidator.ts#L6">modules/packages/module/packages/abstract/src/QueryValidator/ModuleConfigQueryValidator.ts:6</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/module/packages/abstract/src/QueryValidator/ModuleConfigQueryValidator.ts#L6">modules/packages/module/packages/abstract/src/QueryValidator/ModuleConfigQueryValidator.ts:6</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/ModuleErrorSchema-1.html

@@ -17,8 +17,8 @@
 <h1>Variable ModuleErrorSchema</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">Module<wbr/>Error<wbr/>Schema</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;network.xyo.error.module&quot;</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/module/packages/abstract/src/Error.ts#L4">modules/packages/module/packages/abstract/src/Error.ts:4</a></li>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/module/packages/abstract/src/Error.ts#L5">modules/packages/module/packages/abstract/src/Error.ts:5</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/module/packages/abstract/src/Error.ts#L4">modules/packages/module/packages/abstract/src/Error.ts:4</a></li>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/module/packages/abstract/src/Error.ts#L5">modules/packages/module/packages/abstract/src/Error.ts:5</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/package.json

@@ -13,24 +13,24 @@
     "@xylabs/assert": "^2.8.1",
     "@xylabs/exists": "^2.8.1",
     "@xylabs/promise": "^2.8.1",
-    "@xyo-network/account": "^2.59.0",
-    "@xyo-network/account-model": "^2.59.0",
-    "@xyo-network/address-payload-plugin": "^2.59.0",
-    "@xyo-network/archivist-model": "^2.59.0",
-    "@xyo-network/boundwitness-builder": "^2.59.0",
-    "@xyo-network/boundwitness-model": "^2.59.0",
-    "@xyo-network/boundwitness-validator": "^2.59.0",
-    "@xyo-network/boundwitness-wrapper": "^2.59.0",
-    "@xyo-network/config-payload-plugin": "^2.59.0",
-    "@xyo-network/core": "^2.59.0",
-    "@xyo-network/module-events": "^2.59.0",
-    "@xyo-network/module-model": "^2.59.0",
-    "@xyo-network/payload-builder": "^2.59.0",
-    "@xyo-network/payload-model": "^2.59.0",
-    "@xyo-network/payload-wrapper": "^2.59.0",
-    "@xyo-network/promise": "^2.59.0",
-    "@xyo-network/query-payload-plugin": "^2.59.0",
-    "@xyo-network/shared": "^2.59.0",
+    "@xyo-network/account": "^2.60.0-rc.2",
+    "@xyo-network/account-model": "^2.60.0-rc.2",
+    "@xyo-network/address-payload-plugin": "^2.60.0-rc.2",
+    "@xyo-network/archivist-model": "^2.60.0-rc.2",
+    "@xyo-network/boundwitness-builder": "^2.60.0-rc.2",
+    "@xyo-network/boundwitness-model": "^2.60.0-rc.2",
+    "@xyo-network/boundwitness-validator": "^2.60.0-rc.2",
+    "@xyo-network/boundwitness-wrapper": "^2.60.0-rc.2",
+    "@xyo-network/config-payload-plugin": "^2.60.0-rc.2",
+    "@xyo-network/core": "^2.60.0-rc.2",
+    "@xyo-network/module-events": "^2.60.0-rc.2",
+    "@xyo-network/module-model": "^2.60.0-rc.2",
+    "@xyo-network/payload-builder": "^2.60.0-rc.2",
+    "@xyo-network/payload-model": "^2.60.0-rc.2",
+    "@xyo-network/payload-wrapper": "^2.60.0-rc.2",
+    "@xyo-network/promise": "^2.60.0-rc.2",
+    "@xyo-network/query-payload-plugin": "^2.60.0-rc.2",
+    "@xyo-network/shared": "^2.60.0-rc.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
@@ -73,5 +73,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.59.0"
+  "version": "2.60.0-rc.2",
+  "stableVersion": "2.59.0"
 }

package/src/AbstractModule.ts

@@ -180,7 +180,7 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
     queryConfig?: TConfig,
   ): Promise<ModuleQueryResult> {
     this.started('throw')
-    const result = await this.queryHandler(query, payloads, queryConfig)
+    const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig)
 
     const args: ModuleQueriedEventArgs = { module: this as Module, payloads, query, result }
     await this.emit('moduleQueried', args)
@@ -326,12 +326,12 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
         console.warn(`Anonymous Queries not allowed, but running anyway [${this.config.name}], [${this.address}]`)
       }
     }
-    const typedQuery = wrapper.query.payload
+    const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
     const resultPayloads: Payload[] = []
     const queryAccount = new Account()
     try {
-      switch (typedQuery.schema) {
+      switch (queryPayload.schema) {
         case ModuleDiscoverQuerySchema: {
           resultPayloads.push(...(await this.discover()))
           break
@@ -345,13 +345,18 @@ export abstract class AbstractModule<TParams extends ModuleParams = ModuleParams
           break
         }
         default:
-          console.error(`Unsupported Query [${query.schema}]`)
+          console.error(`Unsupported Query [${(queryPayload as Payload).schema}]`)
       }
     } catch (ex) {
       const error = ex as Error
-      resultPayloads.push(new ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build())
+      resultPayloads.push(
+        new ModuleErrorBuilder()
+          .sources([await wrapper.hashAsync()])
+          .message(error.message)
+          .build(),
+      )
     }
-    return await this.bindQueryResult(typedQuery, resultPayloads, [queryAccount])
+    return await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount])
   }
 
   protected readArchivist = () => this.getArchivist('read')

package/src/Query/QueryBoundWitnessBuilder.ts

@@ -11,19 +11,23 @@ export class QueryBoundWitnessBuilder<
   private _query: PayloadWrapper<TQuery> | undefined
   private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined
 
-  override hashableFields(): TBoundWitness {
-    return { ...super.hashableFields(), query: assertEx(this._query?.hash, 'No Query Specified'), schema: QueryBoundWitnessSchema }
+  override async hashableFields(): Promise<TBoundWitness> {
+    return {
+      ...(await super.hashableFields()),
+      query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),
+      schema: QueryBoundWitnessSchema,
+    }
   }
 
   query<T extends TQuery | PayloadWrapper<TQuery>>(query: T) {
     this._query = PayloadWrapper.parse(query)
-    this.payload(this._query.payload)
+    this.payload(this._query.payload())
     return this
   }
 
   resultSet<T extends PayloadSetPayload | PayloadWrapper<PayloadSetPayload>>(payloadSet: T) {
     this._resultSet = PayloadWrapper.parse(payloadSet)
-    this.payload(this._resultSet.payload)
+    this.payload(this._resultSet.payload())
     return this
   }
 }

package/src/Query/QueryBoundWitnessValidator.ts

@@ -16,20 +16,20 @@ export class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWi
     return (obj as QueryBoundWitnessValidator)?.constructor === QueryBoundWitnessValidator
   }
 
-  override validate() {
+  override async validate() {
     return [
-      ...super.validate(),
+      ...(await super.validate()),
       // ...this.validateResultSet()
     ]
   }
 
-  validateResultSet() {
+  async validateResultSet() {
     const errors: Error[] = []
     try {
       const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet')
       const wrapper = BoundWitnessWrapper.parse(this.obj)
-      const resultSet = PayloadWrapper.parse<PayloadSetPayload>(wrapper.payloads[resultSetHash] as PayloadSetPayload)
-      const required = resultSet?.payload.required
+      const resultSet = PayloadWrapper.parse<PayloadSetPayload>((await wrapper.payloadMap())[resultSetHash] as PayloadSetPayload)
+      const required = resultSet?.payload().required
       if (required) {
         Object.entries(required).forEach(([key, value]) => {
           const found = wrapper.payloadSchemas.reduce((count, schema) => {

package/src/Query/QueryBoundWitnessWrapper.ts

@@ -1,55 +1,65 @@
 import { assertEx } from '@xylabs/assert'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
+import { PayloadHasher } from '@xyo-network/core'
 import { Query, QueryBoundWitness } from '@xyo-network/module-model'
 import { Payload, PayloadSetPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
+import compact from 'lodash/compact'
 
 import { QueryBoundWitnessValidator } from './QueryBoundWitnessValidator'
 
 export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-  private _query: PayloadWrapper<T> | undefined
-  private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined
+  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined
+  private _query: T | undefined
+  private _resultSet: PayloadSetPayload | undefined
 
   private isQueryBoundWitnessWrapper = true
 
-  override get errors() {
-    return new QueryBoundWitnessValidator(this.boundwitness).validate()
-  }
-
-  get query() {
-    return assertEx(
-      (this._query =
-        this._query ?? this.payloads[this.boundwitness.query] ? (this.payloads[this.boundwitness.query] as PayloadWrapper<T>) : undefined),
-      () => `Missing Query [${this.boundwitness}, ${JSON.stringify(this.payloads, null, 2)}]`,
-    )
-  }
-
-  get resultSet() {
-    const resultSetHash = this.boundwitness.resultSet
-    return assertEx(
-      (this._resultSet =
-        this._resultSet ??
-        (resultSetHash
-          ? this.payloads[resultSetHash]
-            ? (this.payloads[resultSetHash] as PayloadWrapper<PayloadSetPayload>)
-            : undefined
-          : undefined)),
-      () => `Missing resultSet [${resultSetHash}, ${JSON.stringify(this.payloads, null, 2)}]`,
-    )
-  }
-
   static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {
     assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')
     switch (typeof obj) {
       case 'object': {
         const castWrapper = obj as QueryBoundWitnessWrapper<T>
         const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)
-        if (!wrapper.valid) {
+        /*if (!wrapper.valid) {
           console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)
-        }
+        }*/
         return wrapper
       }
     }
     throw Error(`Unable to parse [${typeof obj}]`)
   }
+
+  override getErrors() {
+    return new QueryBoundWitnessValidator(this.boundwitness).validate()
+  }
+
+  async getQuery(): Promise<T> {
+    const payloadMap = await this.allPayloadMap()
+    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)
+    return assertEx(this._query, `Missing Query [${this.boundwitness}]`)
+  }
+
+  async getResultSet() {
+    const resultSetHash = this.boundwitness.resultSet
+    const payloadMap = await this.payloadMap()
+    return assertEx(
+      (this._resultSet = this._resultSet ?? (resultSetHash ? (payloadMap[resultSetHash] as PayloadSetPayload | undefined) : undefined)),
+      `Missing resultSet [${resultSetHash}]`,
+    )
+  }
+
+  override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {
+    this._payloadsWithoutQuery =
+      this._payloadsWithoutQuery ??
+      compact(
+        (
+          await PayloadHasher.filterExclude(
+            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),
+            this.payload().query,
+          )
+        ).map((payload) => PayloadWrapper.parse(payload)),
+      )
+    return this._payloadsWithoutQuery
+  }
 }

package/src/QueryValidator/ModuleConfigQueryValidator.ts

@@ -30,12 +30,12 @@ export class ModuleConfigQueryValidator<TConfig extends AnyConfigSchema<ModuleCo
     this.hasRules = this.hasAllowedRules || this.hasDisallowedRules
   }
 
-  queryable: Queryable = (query, payloads) => {
+  queryable: Queryable = async (query, payloads) => {
     if (!this.hasRules) return true
     const addresses = query.addresses
     if (!addresses.length) return false
     const wrapper = QueryBoundWitnessWrapper.parseQuery<ModuleQuery>(query, payloads)
-    const schema = wrapper.query.schema
+    const schema = (await wrapper.getQuery()).schema
     return this.queryAllowed(schema, addresses) && !this.queryDisallowed(schema, addresses)
   }
 

package/src/QueryValidator/QueryValidator.ts

@@ -1,7 +1,8 @@
 import { QueryBoundWitness } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
+import { Promisable } from '@xyo-network/promise'
 
-export type Queryable<T extends QueryBoundWitness = QueryBoundWitness> = (query: T, payloads?: Payload[]) => boolean
+export type Queryable<T extends QueryBoundWitness = QueryBoundWitness> = (query: T, payloads?: Payload[]) => Promisable<boolean>
 
 export interface QueryValidator<T extends QueryBoundWitness = QueryBoundWitness> {
   queryable: Queryable<T>

package/src/QueryValidator/SupportedQueryValidator.ts

@@ -4,9 +4,13 @@ import { Payload } from '@xyo-network/payload-model'
 import { QueryBoundWitnessWrapper } from '../Query'
 import { Queryable, QueryValidator } from './QueryValidator'
 
-export const isQuerySupportedByModule = <T extends QueryBoundWitness = QueryBoundWitness>(mod: Module, query: T, payloads?: Payload[]): boolean => {
+export const isQuerySupportedByModule = async <T extends QueryBoundWitness = QueryBoundWitness>(
+  mod: Module,
+  query: T,
+  payloads?: Payload[],
+): Promise<boolean> => {
   const wrapper = QueryBoundWitnessWrapper.parseQuery<ModuleQuery>(query, payloads)
-  const schema = wrapper.query.schema
+  const schema = (await wrapper.getQuery()).schema
   return mod.queries.includes(schema)
 }