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

package/docs/types/Queryable.html

@@ -37,7 +37,7 @@
 <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 ">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/4ad89cb6fd14/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>
+<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/4ad89cb6fd14/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/4ad89cb6fd14/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/4ad89cb6fd14/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.60.0-rc.1",
-    "@xyo-network/account-model": "^2.60.0-rc.1",
-    "@xyo-network/address-payload-plugin": "^2.60.0-rc.1",
-    "@xyo-network/archivist-model": "^2.60.0-rc.1",
-    "@xyo-network/boundwitness-builder": "^2.60.0-rc.1",
-    "@xyo-network/boundwitness-model": "^2.60.0-rc.1",
-    "@xyo-network/boundwitness-validator": "^2.60.0-rc.1",
-    "@xyo-network/boundwitness-wrapper": "^2.60.0-rc.1",
-    "@xyo-network/config-payload-plugin": "^2.60.0-rc.1",
-    "@xyo-network/core": "^2.60.0-rc.1",
-    "@xyo-network/module-events": "^2.60.0-rc.1",
-    "@xyo-network/module-model": "^2.60.0-rc.1",
-    "@xyo-network/payload-builder": "^2.60.0-rc.1",
-    "@xyo-network/payload-model": "^2.60.0-rc.1",
-    "@xyo-network/payload-wrapper": "^2.60.0-rc.1",
-    "@xyo-network/promise": "^2.60.0-rc.1",
-    "@xyo-network/query-payload-plugin": "^2.60.0-rc.1",
-    "@xyo-network/shared": "^2.60.0-rc.1",
+    "@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,6 +73,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.60.0-rc.1",
+  "version": "2.60.0-rc.2",
   "stableVersion": "2.59.0"
 }

package/src/Query/QueryBoundWitnessBuilder.ts

@@ -21,13 +21,13 @@ export class QueryBoundWitnessBuilder<
 
   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

@@ -29,7 +29,7 @@ export class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWi
       const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet')
       const wrapper = BoundWitnessWrapper.parse(this.obj)
       const resultSet = PayloadWrapper.parse<PayloadSetPayload>((await wrapper.payloadMap())[resultSetHash] as PayloadSetPayload)
-      const required = resultSet?.payload.required
+      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,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { Hasher } from '@xyo-network/core'
+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'
@@ -11,7 +11,7 @@ import { QueryBoundWitnessValidator } from './QueryBoundWitnessValidator'
 export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
   private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined
   private _query: T | undefined
-  private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined
+  private _resultSet: PayloadSetPayload | undefined
 
   private isQueryBoundWitnessWrapper = true
 
@@ -44,8 +44,7 @@ export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitn
     const resultSetHash = this.boundwitness.resultSet
     const payloadMap = await this.payloadMap()
     return assertEx(
-      (this._resultSet =
-        this._resultSet ?? (resultSetHash ? (payloadMap[resultSetHash] as PayloadWrapper<PayloadSetPayload> | undefined) : undefined)),
+      (this._resultSet = this._resultSet ?? (resultSetHash ? (payloadMap[resultSetHash] as PayloadSetPayload | undefined) : undefined)),
       `Missing resultSet [${resultSetHash}]`,
     )
   }
@@ -55,9 +54,9 @@ export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitn
       this._payloadsWithoutQuery ??
       compact(
         (
-          await Hasher.filterExclude(
-            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload),
-            this.payload.query,
+          await PayloadHasher.filterExclude(
+            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),
+            this.payload().query,
           )
         ).map((payload) => PayloadWrapper.parse(payload)),
       )