@xyo-network/boundwitness-builder 2.84.6 → 2.84.8

package/dist/node/index.js

@@ -1,46 +1,18 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  BoundWitnessBuilder: () => BoundWitnessBuilder,
-  QueryBoundWitnessBuilder: () => QueryBoundWitnessBuilder,
-  QueryBoundWitnessWrapper: () => QueryBoundWitnessWrapper
-});
-module.exports = __toCommonJS(src_exports);
-
 // src/Builder.ts
-var import_arraybuffer = require("@xylabs/arraybuffer");
-var import_assert = require("@xylabs/assert");
-var import_hex = require("@xylabs/hex");
-var import_boundwitness_model = require("@xyo-network/boundwitness-model");
-var import_boundwitness_wrapper = require("@xyo-network/boundwitness-wrapper");
-var import_hash = require("@xyo-network/hash");
-var import_payload = require("@xyo-network/payload");
-var import_async_mutex = require("async-mutex");
+import { toArrayBuffer, toUint8Array } from "@xylabs/arraybuffer";
+import { assertEx } from "@xylabs/assert";
+import { hexFromArrayBuffer } from "@xylabs/hex";
+import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
+import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
+import { PayloadHasher, sortFields } from "@xyo-network/hash";
+import { PayloadWrapper } from "@xyo-network/payload";
+import { Mutex } from "async-mutex";
 var BoundWitnessBuilder = class _BoundWitnessBuilder {
   constructor(config = { inlinePayloads: false }, logger) {
     this.config = config;
     this.logger = logger;
   }
-  static _buildMutex = new import_async_mutex.Mutex();
+  static _buildMutex = new Mutex();
   _accounts = [];
   _errorHashes;
   _errors = [];
@@ -51,7 +23,7 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
   _timestamp = Date.now();
   get _payload_schemas() {
     return this._payloadSchemas ?? this._payloads.map((payload) => {
-      return (0, import_assert.assertEx)(payload.schema, () => this.missingSchemaMessage(payload));
+      return assertEx(payload.schema, () => this.missingSchemaMessage(payload));
     });
   }
   async build(meta = false) {
@@ -61,7 +33,7 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     return await _BoundWitnessBuilder._buildMutex.runExclusive(async () => {
       var _a;
       const hashableFields = await this.hashableFields();
-      const _hash = await import_boundwitness_wrapper.BoundWitnessWrapper.hashAsync(hashableFields);
+      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields);
       const previousHashes = this._accounts.map((account) => account.previousHash);
       const ret = {
         ...hashableFields,
@@ -81,39 +53,39 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     });
   }
   error(payload) {
-    const unwrappedPayload = import_payload.PayloadWrapper.unwrap(payload);
-    (0, import_assert.assertEx)(this._errorHashes === void 0, "Can not set errors when hashes already set");
+    const unwrappedPayload = PayloadWrapper.unwrap(payload);
+    assertEx(this._errorHashes === void 0, "Can not set errors when hashes already set");
     if (unwrappedPayload) {
-      this._errors.push((0, import_assert.assertEx)((0, import_hash.sortFields)(unwrappedPayload)));
+      this._errors.push(assertEx(sortFields(unwrappedPayload)));
     }
     return this;
   }
   errors(errors) {
-    errors == null ? void 0 : errors.forEach((error) => {
+    for (const error of errors ?? []) {
       if (error !== null) {
         this.error(error);
       }
-    });
+    }
     return this;
   }
   async hashableFields() {
     var _a, _b;
     const addresses = this._accounts.map(
-      (account) => account.addressBytes ? (0, import_hex.hexFromArrayBuffer)(account.addressBytes, { prefix: false }) : void 0
+      (account) => account.addressBytes ? hexFromArrayBuffer(account.addressBytes, { prefix: false }) : void 0
     );
     const previous_hashes = this._accounts.map((account) => account.previousHash ?? null);
-    const payload_hashes = (0, import_assert.assertEx)(await this.getPayloadHashes(), "Missing payload_hashes");
-    const payload_schemas = (0, import_assert.assertEx)(this._payload_schemas, "Missing payload_schemas");
+    const payload_hashes = assertEx(await this.getPayloadHashes(), "Missing payload_hashes");
+    const payload_schemas = assertEx(this._payload_schemas, "Missing payload_schemas");
     const result = {
-      addresses: (0, import_assert.assertEx)(addresses, "Missing addresses"),
+      addresses: assertEx(addresses, "Missing addresses"),
       payload_hashes,
       payload_schemas,
       previous_hashes,
-      schema: import_boundwitness_model.BoundWitnessSchema
+      schema: BoundWitnessSchema
     };
-    (0, import_assert.assertEx)(((_a = result.payload_hashes) == null ? void 0 : _a.length) === ((_b = result.payload_schemas) == null ? void 0 : _b.length), "Payload hash/schema mismatch");
-    (0, import_assert.assertEx)(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), "nulls found in hashes");
-    (0, import_assert.assertEx)(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), "nulls found in schemas");
+    assertEx(((_a = result.payload_hashes) == null ? void 0 : _a.length) === ((_b = result.payload_schemas) == null ? void 0 : _b.length), "Payload hash/schema mismatch");
+    assertEx(!result.payload_hashes.some((hash) => !hash), () => "nulls found in hashes");
+    assertEx(!result.payload_schemas.some((schema) => !schema), "nulls found in schemas");
     if (this.config.timestamp ?? true) {
       result.timestamp = this._timestamp;
     }
@@ -123,25 +95,26 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     return result;
   }
   hashes(hashes, schema) {
-    (0, import_assert.assertEx)(this.payloads.length === 0, "Can not set hashes when payloads already set");
+    assertEx(this.payloads.length === 0, "Can not set hashes when payloads already set");
     this._payloadHashes = hashes;
     this._payloadSchemas = schema;
     return this;
   }
   payload(payload) {
-    const unwrappedPayload = import_payload.PayloadWrapper.unwrap(payload);
-    (0, import_assert.assertEx)(this._payloadHashes === void 0, "Can not set payloads when hashes already set");
+    const unwrappedPayload = PayloadWrapper.unwrap(payload);
+    assertEx(this._payloadHashes === void 0, "Can not set payloads when hashes already set");
     if (unwrappedPayload) {
-      this._payloads.push((0, import_assert.assertEx)((0, import_hash.sortFields)(unwrappedPayload)));
+      this._payloads.push(assertEx(sortFields(unwrappedPayload)));
     }
     return this;
   }
   payloads(payloads) {
-    payloads == null ? void 0 : payloads.forEach((payload) => {
-      if (payload !== null) {
-        this.payload(payload);
+    if (payloads)
+      for (const payload of payloads) {
+        if (payload !== null) {
+          this.payload(payload);
+        }
       }
-    });
     return this;
   }
   sourceQuery(hash) {
@@ -159,12 +132,12 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     return this;
   }
   async signatures(_hash, previousHashes) {
-    const hash = (0, import_arraybuffer.toArrayBuffer)(_hash);
-    const previousHashesBytes = previousHashes.map((ph) => ph ? (0, import_arraybuffer.toUint8Array)(ph) : void 0);
-    return await Promise.all(this._accounts.map(async (account, index) => (0, import_hex.hexFromArrayBuffer)(await account.sign(hash, previousHashesBytes[index]))));
+    const hash = toArrayBuffer(_hash);
+    const previousHashesBytes = previousHashes.map((ph) => ph ? toUint8Array(ph) : void 0);
+    return await Promise.all(this._accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hash, previousHashesBytes[index]))));
   }
   async getPayloadHashes() {
-    return this._payloadHashes ?? await Promise.all(this._payloads.map((payload) => import_hash.PayloadHasher.hashAsync(payload)));
+    return this._payloadHashes ?? await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload)));
   }
   inlinePayloads() {
     console.log("BoundWitnessBuilder: Using inlinePayloads will soon be disallowed");
@@ -182,39 +155,39 @@ ${JSON.stringify(payload, null, 2)}`;
 };
 
 // src/Query/QueryBoundWitnessBuilder.ts
-var import_assert2 = require("@xylabs/assert");
-var import_boundwitness_model2 = require("@xyo-network/boundwitness-model");
-var import_payload_wrapper = require("@xyo-network/payload-wrapper");
+import { assertEx as assertEx2 } from "@xylabs/assert";
+import { QueryBoundWitnessSchema } from "@xyo-network/boundwitness-model";
+import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
 var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   _query;
   async hashableFields() {
     var _a;
     return {
       ...await super.hashableFields(),
-      query: (0, import_assert2.assertEx)(await ((_a = this._query) == null ? void 0 : _a.hashAsync()), "No Query Specified"),
-      schema: import_boundwitness_model2.QueryBoundWitnessSchema
+      query: assertEx2(await ((_a = this._query) == null ? void 0 : _a.hashAsync()), "No Query Specified"),
+      schema: QueryBoundWitnessSchema
     };
   }
   query(query) {
-    this._query = import_payload_wrapper.PayloadWrapper.wrap(query);
+    this._query = PayloadWrapper2.wrap(query);
     this.payload(this._query.payload());
     return this;
   }
 };
 
 // src/Query/QueryBoundWitnessWrapper.ts
-var import_assert3 = require("@xylabs/assert");
-var import_lodash = require("@xylabs/lodash");
-var import_boundwitness_wrapper2 = require("@xyo-network/boundwitness-wrapper");
-var import_hash2 = require("@xyo-network/hash");
-var import_payload_wrapper2 = require("@xyo-network/payload-wrapper");
-var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends import_boundwitness_wrapper2.BoundWitnessWrapper {
+import { assertEx as assertEx3 } from "@xylabs/assert";
+import { compact } from "@xylabs/lodash";
+import { BoundWitnessWrapper as BoundWitnessWrapper2 } from "@xyo-network/boundwitness-wrapper";
+import { PayloadHasher as PayloadHasher2 } from "@xyo-network/hash";
+import { PayloadWrapper as PayloadWrapper3 } from "@xyo-network/payload-wrapper";
+var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends BoundWitnessWrapper2 {
   _payloadsWithoutQuery;
   _query;
   _resultSet;
   isQueryBoundWitnessWrapper = true;
   static parseQuery(obj, payloads) {
-    (0, import_assert3.assertEx)(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
+    assertEx3(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
     switch (typeof obj) {
       case "object": {
         const castWrapper = obj;
@@ -222,27 +195,26 @@ var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends import_bo
         return wrapper;
       }
     }
-    throw Error(`Unable to parse [${typeof obj}]`);
+    throw new Error(`Unable to parse [${typeof obj}]`);
   }
   async getQuery() {
     const payloadMap = await this.allPayloadMap();
     this._query = this._query ?? payloadMap[this.boundwitness.query];
-    return (0, import_assert3.assertEx)(this._query, `Missing Query [${this.boundwitness}]`);
+    return assertEx3(this._query, `Missing Query [${this.boundwitness}]`);
   }
   async getWrappedPayloads() {
-    this._payloadsWithoutQuery = this._payloadsWithoutQuery ?? (0, import_lodash.compact)(
-      (await import_hash2.PayloadHasher.filterExclude(
+    this._payloadsWithoutQuery = this._payloadsWithoutQuery ?? compact(
+      (await PayloadHasher2.filterExclude(
         (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),
         this.payload().query
-      )).map((payload) => import_payload_wrapper2.PayloadWrapper.wrap(payload))
+      )).map((payload) => PayloadWrapper3.wrap(payload))
     );
     return this._payloadsWithoutQuery;
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   BoundWitnessBuilder,
   QueryBoundWitnessBuilder,
   QueryBoundWitnessWrapper
-});
+};
 //# sourceMappingURL=index.js.map

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts","../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { hexFromArrayBuffer } from '@xylabs/hex'\nimport { Logger } from '@xylabs/logger'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher, sortFields } from '@xyo-network/hash'\nimport { PayloadWrapper } from '@xyo-network/payload'\nimport { ModuleError, Payload } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport interface BoundWitnessBuilderConfig {\n  /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */\n  /** @deprecated We will be removing support for inlinePayloads soon */\n  readonly inlinePayloads?: boolean\n  /** @deprecated We will be removing support for meta soon */\n  readonly meta?: boolean\n  /** @deprecated We will be removing support for timestamp soon */\n  readonly timestamp?: boolean\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: string }> = BoundWitness, TPayload extends Payload = Payload> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[] = []\n  private _errorHashes: string[] | undefined\n  private _errors: ModuleError[] = []\n  private _payloadHashes: string[] | undefined\n  private _payloadSchemas: string[] | undefined\n  private _payloads: TPayload[] = []\n  private _sourceQuery: string | undefined\n  private _timestamp = Date.now()\n\n  constructor(\n    readonly config: BoundWitnessBuilderConfig = { inlinePayloads: false },\n    protected readonly logger?: Logger,\n  ) {}\n\n  private get _payload_schemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  async build(meta = false): Promise<[TBoundWitness, TPayload[], ModuleError[]]> {\n    if (meta) {\n      console.log('BoundWitnessBuilder: Calling build with meta=true will be disallowed soon')\n    }\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const hashableFields = await this.hashableFields()\n      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields)\n\n      /* get all the previousHashes to verify atomic signing */\n      const previousHashes = this._accounts.map((account) => account.previousHash)\n\n      const ret: TBoundWitness = {\n        ...hashableFields,\n        _signatures: await this.signatures(_hash, previousHashes),\n      }\n      if (meta ?? this.config?.meta) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const bwWithMeta = ret as any\n        bwWithMeta._client = 'js'\n        bwWithMeta._hash = _hash\n        bwWithMeta._timestamp = this._timestamp\n      }\n      if (this.config.inlinePayloads) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const anyRet = ret as any\n        //leaving this in here to prevent breaking code (for now)\n        anyRet._payloads = this.inlinePayloads()\n      }\n      return [ret, this._payloads, this._errors]\n    })\n  }\n\n  error(payload?: ModuleError) {\n    const unwrappedPayload = PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    errors?.forEach((error) => {\n      if (error !== null) {\n        this.error(error)\n      }\n    })\n    return this\n  }\n\n  async hashableFields(): Promise<TBoundWitness> {\n    const addresses = this._accounts.map((account) =>\n      account.addressBytes ? hexFromArrayBuffer(account.addressBytes, { prefix: false }) : undefined,\n    )\n    const previous_hashes = this._accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = assertEx(await this.getPayloadHashes(), 'Missing payload_hashes')\n    const payload_schemas = assertEx(this._payload_schemas, 'Missing payload_schemas')\n    const result: TBoundWitness = {\n      addresses: assertEx(addresses, 'Missing addresses'),\n      payload_hashes,\n      payload_schemas,\n      previous_hashes,\n      schema: BoundWitnessSchema,\n    } as TBoundWitness\n\n    assertEx(result.payload_hashes?.length === result.payload_schemas?.length, 'Payload hash/schema mismatch')\n\n    assertEx(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), 'nulls found in hashes')\n\n    assertEx(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), 'nulls found in schemas')\n\n    if (this.config.timestamp ?? true) {\n      result.timestamp = this._timestamp\n    }\n\n    if (this._sourceQuery) {\n      result.sourceQuery = this._sourceQuery\n    }\n\n    return result\n  }\n\n  hashes(hashes: string[], schema: string[]) {\n    assertEx(this.payloads.length === 0, 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    const unwrappedPayload = PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    payloads?.forEach((payload) => {\n      if (payload !== null) {\n        this.payload(payload)\n      }\n    })\n    return this\n  }\n\n  sourceQuery(hash?: string) {\n    this._sourceQuery = hash\n    return this\n  }\n\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async signatures(_hash: string, previousHashes: (string | ArrayBuffer | undefined)[]): Promise<string[]> {\n    const hash = toArrayBuffer(_hash)\n    const previousHashesBytes = previousHashes.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(this._accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hash, previousHashesBytes[index]))))\n  }\n\n  private async getPayloadHashes(): Promise<string[]> {\n    return this._payloadHashes ?? (await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload))))\n  }\n\n  private inlinePayloads() {\n    console.log('BoundWitnessBuilder: Using inlinePayloads will soon be disallowed')\n\n    return this._payloads.map<TPayload>((payload, index) => {\n      return {\n        ...payload,\n        schema: this._payload_schemas[index],\n      }\n    })\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { BoundWitnessBuilder } from '../Builder'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: PayloadWrapper<TQuery> | undefined\n\n  override async hashableFields(): Promise<TBoundWitness> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),\n      schema: QueryBoundWitnessSchema,\n    }\n  }\n\n  query<T extends TQuery>(query: T) {\n    this._query = PayloadWrapper.wrap(query)\n    this.payload(this._query.payload())\n    return this\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload, PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {\n  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined\n  private _query: T | undefined\n  private _resultSet: PayloadSetPayload | undefined\n\n  private isQueryBoundWitnessWrapper = true\n\n  static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {\n    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')\n    switch (typeof obj) {\n      case 'object': {\n        const castWrapper = obj as QueryBoundWitnessWrapper<T>\n        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)\n        /*if (!wrapper.valid) {\n          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)\n        }*/\n        return wrapper\n      }\n    }\n    throw Error(`Unable to parse [${typeof obj}]`)\n  }\n\n  async getQuery(): Promise<T> {\n    const payloadMap = await this.allPayloadMap()\n    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)\n    return assertEx(this._query, `Missing Query [${this.boundwitness}]`)\n  }\n\n  override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {\n    this._payloadsWithoutQuery =\n      this._payloadsWithoutQuery ??\n      compact(\n        (\n          await PayloadHasher.filterExclude(\n            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),\n            this.payload().query,\n          )\n        ).map((payload) => PayloadWrapper.wrap(payload)),\n      )\n    return this._payloadsWithoutQuery\n  }\n}\n"],"mappings":"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","names":["import_assert","import_boundwitness_model","import_assert","import_boundwitness_wrapper","import_hash","import_payload_wrapper"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts","../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { hexFromArrayBuffer } from '@xylabs/hex'\nimport { Logger } from '@xylabs/logger'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher, sortFields } from '@xyo-network/hash'\nimport { PayloadWrapper } from '@xyo-network/payload'\nimport { ModuleError, Payload } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport interface BoundWitnessBuilderConfig {\n  /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */\n  /** @deprecated We will be removing support for inlinePayloads soon */\n  readonly inlinePayloads?: boolean\n  /** @deprecated We will be removing support for meta soon */\n  readonly meta?: boolean\n  /** @deprecated We will be removing support for timestamp soon */\n  readonly timestamp?: boolean\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: string }> = BoundWitness, TPayload extends Payload = Payload> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[] = []\n  private _errorHashes: string[] | undefined\n  private _errors: ModuleError[] = []\n  private _payloadHashes: string[] | undefined\n  private _payloadSchemas: string[] | undefined\n  private _payloads: TPayload[] = []\n  private _sourceQuery: string | undefined\n  private _timestamp = Date.now()\n\n  constructor(\n    readonly config: BoundWitnessBuilderConfig = { inlinePayloads: false },\n    protected readonly logger?: Logger,\n  ) {}\n\n  private get _payload_schemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  async build(meta = false): Promise<[TBoundWitness, TPayload[], ModuleError[]]> {\n    if (meta) {\n      console.log('BoundWitnessBuilder: Calling build with meta=true will be disallowed soon')\n    }\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const hashableFields = await this.hashableFields()\n      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields)\n\n      /* get all the previousHashes to verify atomic signing */\n      const previousHashes = this._accounts.map((account) => account.previousHash)\n\n      const ret: TBoundWitness = {\n        ...hashableFields,\n        _signatures: await this.signatures(_hash, previousHashes),\n      }\n      if (meta ?? this.config?.meta) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const bwWithMeta = ret as any\n        bwWithMeta._client = 'js'\n        bwWithMeta._hash = _hash\n        bwWithMeta._timestamp = this._timestamp\n      }\n      if (this.config.inlinePayloads) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const anyRet = ret as any\n        //leaving this in here to prevent breaking code (for now)\n        anyRet._payloads = this.inlinePayloads()\n      }\n      return [ret, this._payloads, this._errors]\n    })\n  }\n\n  error(payload?: ModuleError) {\n    const unwrappedPayload = PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    for (const error of errors ?? []) {\n      if (error !== null) {\n        this.error(error)\n      }\n    }\n    return this\n  }\n\n  async hashableFields(): Promise<TBoundWitness> {\n    const addresses = this._accounts.map((account) =>\n      account.addressBytes ? hexFromArrayBuffer(account.addressBytes, { prefix: false }) : undefined,\n    )\n    const previous_hashes = this._accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = assertEx(await this.getPayloadHashes(), 'Missing payload_hashes')\n    const payload_schemas = assertEx(this._payload_schemas, 'Missing payload_schemas')\n    const result: TBoundWitness = {\n      addresses: assertEx(addresses, 'Missing addresses'),\n      payload_hashes,\n      payload_schemas,\n      previous_hashes,\n      schema: BoundWitnessSchema,\n    } as TBoundWitness\n\n    assertEx(result.payload_hashes?.length === result.payload_schemas?.length, 'Payload hash/schema mismatch')\n\n    assertEx(!result.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n\n    assertEx(!result.payload_schemas.some((schema) => !schema), 'nulls found in schemas')\n\n    if (this.config.timestamp ?? true) {\n      result.timestamp = this._timestamp\n    }\n\n    if (this._sourceQuery) {\n      result.sourceQuery = this._sourceQuery\n    }\n\n    return result\n  }\n\n  hashes(hashes: string[], schema: string[]) {\n    assertEx(this.payloads.length === 0, 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    const unwrappedPayload = PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      for (const payload of payloads) {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      }\n    return this\n  }\n\n  sourceQuery(hash?: string) {\n    this._sourceQuery = hash\n    return this\n  }\n\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async signatures(_hash: string, previousHashes: (string | ArrayBuffer | undefined)[]): Promise<string[]> {\n    const hash = toArrayBuffer(_hash)\n    const previousHashesBytes = previousHashes.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(this._accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hash, previousHashesBytes[index]))))\n  }\n\n  private async getPayloadHashes(): Promise<string[]> {\n    return this._payloadHashes ?? (await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload))))\n  }\n\n  private inlinePayloads() {\n    console.log('BoundWitnessBuilder: Using inlinePayloads will soon be disallowed')\n\n    return this._payloads.map<TPayload>((payload, index) => {\n      return {\n        ...payload,\n        schema: this._payload_schemas[index],\n      }\n    })\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { BoundWitnessBuilder } from '../Builder'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: PayloadWrapper<TQuery> | undefined\n\n  override async hashableFields(): Promise<TBoundWitness> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),\n      schema: QueryBoundWitnessSchema,\n    }\n  }\n\n  query<T extends TQuery>(query: T) {\n    this._query = PayloadWrapper.wrap(query)\n    this.payload(this._query.payload())\n    return this\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload, PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {\n  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined\n  private _query: T | undefined\n  private _resultSet: PayloadSetPayload | undefined\n\n  private isQueryBoundWitnessWrapper = true\n\n  static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {\n    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')\n    switch (typeof obj) {\n      case 'object': {\n        const castWrapper = obj as QueryBoundWitnessWrapper<T>\n        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)\n        /*if (!wrapper.valid) {\n          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)\n        }*/\n        return wrapper\n      }\n    }\n    throw new Error(`Unable to parse [${typeof obj}]`)\n  }\n\n  async getQuery(): Promise<T> {\n    const payloadMap = await this.allPayloadMap()\n    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)\n    return assertEx(this._query, `Missing Query [${this.boundwitness}]`)\n  }\n\n  override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {\n    this._payloadsWithoutQuery =\n      this._payloadsWithoutQuery ??\n      compact(\n        (\n          await PayloadHasher.filterExclude(\n            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),\n            this.payload().query,\n          )\n        ).map((payload) => PayloadWrapper.wrap(payload)),\n      )\n    return this._payloadsWithoutQuery\n  }\n}\n"],"mappings":";AAAA,SAAS,eAAe,oBAAoB;AAC5C,SAAS,gBAAgB;AACzB,SAAS,0BAA0B;AAGnC,SAAuB,0BAA0B;AACjD,SAAS,2BAA2B;AACpC,SAAS,eAAe,kBAAkB;AAC1C,SAAS,sBAAsB;AAE/B,SAAS,aAAa;AAYf,IAAM,sBAAN,MAAM,qBAA+H;AAAA,EAW1I,YACW,SAAoC,EAAE,gBAAgB,MAAM,GAClD,QACnB;AAFS;AACU;AAAA,EAClB;AAAA,EAbH,OAAwB,cAAc,IAAI,MAAM;AAAA,EACxC,YAA+B,CAAC;AAAA,EAChC;AAAA,EACA,UAAyB,CAAC;AAAA,EAC1B;AAAA,EACA;AAAA,EACA,YAAwB,CAAC;AAAA,EACzB;AAAA,EACA,aAAa,KAAK,IAAI;AAAA,EAO9B,IAAY,mBAA6B;AACvC,WACE,KAAK,mBACL,KAAK,UAAU,IAAI,CAAC,YAAY;AAC9B,aAAO,SAAS,QAAQ,QAAQ,MAAM,KAAK,qBAAqB,OAAO,CAAC;AAAA,IAC1E,CAAC;AAAA,EAEL;AAAA,EAEA,MAAM,MAAM,OAAO,OAA4D;AAC7E,QAAI,MAAM;AACR,cAAQ,IAAI,2EAA2E;AAAA,IACzF;AACA,WAAO,MAAM,qBAAoB,YAAY,aAAa,YAAY;AAnD1E;AAoDM,YAAM,iBAAiB,MAAM,KAAK,eAAe;AACjD,YAAM,QAAQ,MAAM,oBAAoB,UAAU,cAAc;AAGhE,YAAM,iBAAiB,KAAK,UAAU,IAAI,CAAC,YAAY,QAAQ,YAAY;AAE3E,YAAM,MAAqB;AAAA,QACzB,GAAG;AAAA,QACH,aAAa,MAAM,KAAK,WAAW,OAAO,cAAc;AAAA,MAC1D;AACA,UAAI,UAAQ,UAAK,WAAL,mBAAa,OAAM;AAE7B,cAAM,aAAa;AACnB,mBAAW,UAAU;AACrB,mBAAW,QAAQ;AACnB,mBAAW,aAAa,KAAK;AAAA,MAC/B;AACA,UAAI,KAAK,OAAO,gBAAgB;AAE9B,cAAM,SAAS;AAEf,eAAO,YAAY,KAAK,eAAe;AAAA,MACzC;AACA,aAAO,CAAC,KAAK,KAAK,WAAW,KAAK,OAAO;AAAA,IAC3C,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,SAAuB;AAC3B,UAAM,mBAAmB,eAAe,OAAO,OAAO;AACtD,aAAS,KAAK,iBAAiB,QAAW,4CAA4C;AACtF,QAAI,kBAAkB;AACpB,WAAK,QAAQ,KAAK,SAAS,WAAW,gBAAgB,CAAC,CAAC;AAAA,IAC1D;AACA,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,QAAiC;AACtC,eAAW,SAAS,UAAU,CAAC,GAAG;AAChC,UAAI,UAAU,MAAM;AAClB,aAAK,MAAM,KAAK;AAAA,MAClB;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,iBAAyC;AAjGjD;AAkGI,UAAM,YAAY,KAAK,UAAU;AAAA,MAAI,CAAC,YACpC,QAAQ,eAAe,mBAAmB,QAAQ,cAAc,EAAE,QAAQ,MAAM,CAAC,IAAI;AAAA,IACvF;AACA,UAAM,kBAAkB,KAAK,UAAU,IAAI,CAAC,YAAY,QAAQ,gBAAgB,IAAI;AACpF,UAAM,iBAAiB,SAAS,MAAM,KAAK,iBAAiB,GAAG,wBAAwB;AACvF,UAAM,kBAAkB,SAAS,KAAK,kBAAkB,yBAAyB;AACjF,UAAM,SAAwB;AAAA,MAC5B,WAAW,SAAS,WAAW,mBAAmB;AAAA,MAClD;AAAA,MACA;AAAA,MACA;AAAA,MACA,QAAQ;AAAA,IACV;AAEA,eAAS,YAAO,mBAAP,mBAAuB,cAAW,YAAO,oBAAP,mBAAwB,SAAQ,8BAA8B;AAEzG,aAAS,CAAC,OAAO,eAAe,KAAK,CAAC,SAAS,CAAC,IAAI,GAAG,MAAM,uBAAuB;AAEpF,aAAS,CAAC,OAAO,gBAAgB,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,wBAAwB;AAEpF,QAAI,KAAK,OAAO,aAAa,MAAM;AACjC,aAAO,YAAY,KAAK;AAAA,IAC1B;AAEA,QAAI,KAAK,cAAc;AACrB,aAAO,cAAc,KAAK;AAAA,IAC5B;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,QAAkB,QAAkB;AACzC,aAAS,KAAK,SAAS,WAAW,GAAG,8CAA8C;AACnF,SAAK,iBAAiB;AACtB,SAAK,kBAAkB;AACvB,WAAO;AAAA,EACT;AAAA,EAEA,QAAQ,SAAoB;AAC1B,UAAM,mBAAmB,eAAe,OAAiB,OAAO;AAChE,aAAS,KAAK,mBAAmB,QAAW,8CAA8C;AAC1F,QAAI,kBAAkB;AACpB,WAAK,UAAU,KAAK,SAAS,WAAqB,gBAAgB,CAAC,CAAC;AAAA,IACtE;AACA,WAAO;AAAA,EACT;AAAA,EAEA,SAAS,UAAgC;AACvC,QAAI;AACF,iBAAW,WAAW,UAAU;AAC9B,YAAI,YAAY,MAAM;AACpB,eAAK,QAAQ,OAAO;AAAA,QACtB;AAAA,MACF;AACF,WAAO;AAAA,EACT;AAAA,EAEA,YAAY,MAAe;AACzB,SAAK,eAAe;AACpB,WAAO;AAAA,EACT;AAAA,EAEA,QAAQ,SAA0B;AAhKpC;AAiKI,eAAK,cAAL,mBAAgB,KAAK;AACrB,WAAO;AAAA,EACT;AAAA,EAEA,UAAU,UAA6B;AArKzC;AAsKI,eAAK,cAAL,mBAAgB,KAAK,GAAG;AACxB,WAAO;AAAA,EACT;AAAA,EAEA,MAAgB,WAAW,OAAe,gBAAyE;AACjH,UAAM,OAAO,cAAc,KAAK;AAChC,UAAM,sBAAsB,eAAe,IAAI,CAAC,OAAQ,KAAK,aAAa,EAAE,IAAI,MAAU;AAC1F,WAAO,MAAM,QAAQ,IAAI,KAAK,UAAU,IAAI,OAAO,SAAS,UAAU,mBAAmB,MAAM,QAAQ,KAAK,MAAM,oBAAoB,KAAK,CAAC,CAAC,CAAC,CAAC;AAAA,EACjJ;AAAA,EAEA,MAAc,mBAAsC;AAClD,WAAO,KAAK,kBAAmB,MAAM,QAAQ,IAAI,KAAK,UAAU,IAAI,CAAC,YAAY,cAAc,UAAU,OAAO,CAAC,CAAC;AAAA,EACpH;AAAA,EAEQ,iBAAiB;AACvB,YAAQ,IAAI,mEAAmE;AAE/E,WAAO,KAAK,UAAU,IAAc,CAAC,SAAS,UAAU;AACtD,aAAO;AAAA,QACL,GAAG;AAAA,QACH,QAAQ,KAAK,iBAAiB,KAAK;AAAA,MACrC;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,qBAAqB,SAAkB;AAC7C,WAAO;AAAA,EAA4B,KAAK,UAAU,SAAS,MAAM,CAAC,CAAC;AAAA,EACrE;AACF;;;AClMA,SAAS,YAAAA,iBAAgB;AACzB,SAA4B,+BAA+B;AAE3D,SAAS,kBAAAC,uBAAsB;AAIxB,IAAM,2BAAN,cAGG,oBAAmC;AAAA,EACnC;AAAA,EAER,MAAe,iBAAyC;AAb1D;AAcI,WAAO;AAAA,MACL,GAAI,MAAM,MAAM,eAAe;AAAA,MAC/B,OAAOC,UAAS,QAAM,UAAK,WAAL,mBAAa,cAAa,oBAAoB;AAAA,MACpE,QAAQ;AAAA,IACV;AAAA,EACF;AAAA,EAEA,MAAwB,OAAU;AAChC,SAAK,SAASC,gBAAe,KAAK,KAAK;AACvC,SAAK,QAAQ,KAAK,OAAO,QAAQ,CAAC;AAClC,WAAO;AAAA,EACT;AACF;;;AC1BA,SAAS,YAAAC,iBAAgB;AACzB,SAAS,eAAe;AAExB,SAAS,uBAAAC,4BAA2B;AACpC,SAAS,iBAAAC,sBAAqB;AAE9B,SAAS,kBAAAC,uBAAsB;AAExB,IAAM,2BAAN,MAAM,kCAA0DF,qBAAuC;AAAA,EACpG;AAAA,EACA;AAAA,EACA;AAAA,EAEA,6BAA6B;AAAA,EAErC,OAAO,WAAoC,KAAc,UAAmD;AAC1G,IAAAD,UAAS,CAAC,MAAM,QAAQ,GAAG,GAAG,wDAAwD;AACtF,YAAQ,OAAO,KAAK;AAAA,MAClB,KAAK,UAAU;AACb,cAAM,cAAc;AACpB,cAAM,WAAU,2CAAa,8BAA6B,cAAc,IAAI,0BAA4B,KAA0B,QAAQ;AAI1I,eAAO;AAAA,MACT;AAAA,IACF;AACA,UAAM,IAAI,MAAM,oBAAoB,OAAO,GAAG,GAAG;AAAA,EACnD;AAAA,EAEA,MAAM,WAAuB;AAC3B,UAAM,aAAa,MAAM,KAAK,cAAc;AAC5C,SAAK,SAAS,KAAK,UAAW,WAAW,KAAK,aAAa,KAAK;AAChE,WAAOA,UAAS,KAAK,QAAQ,kBAAkB,KAAK,YAAY,GAAG;AAAA,EACrE;AAAA,EAEA,MAAe,qBAAyD;AACtE,SAAK,wBACH,KAAK,yBACL;AAAA,OAEI,MAAME,eAAc;AAAA,SACjB,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,QAAQ,QAAQ,CAAC;AAAA,QACrE,KAAK,QAAQ,EAAE;AAAA,MACjB,GACA,IAAI,CAAC,YAAYC,gBAAe,KAAK,OAAO,CAAC;AAAA,IACjD;AACF,WAAO,KAAK;AAAA,EACd;AACF;","names":["assertEx","PayloadWrapper","assertEx","PayloadWrapper","assertEx","BoundWitnessWrapper","PayloadHasher","PayloadWrapper"]}

package/package.json

@@ -16,25 +16,24 @@
     "@xylabs/hex": "^2.13.20",
     "@xylabs/lodash": "^2.13.20",
     "@xylabs/logger": "^2.13.20",
-    "@xyo-network/account-model": "~2.84.6",
-    "@xyo-network/boundwitness-model": "~2.84.6",
-    "@xyo-network/boundwitness-validator": "~2.84.6",
-    "@xyo-network/boundwitness-wrapper": "~2.84.6",
-    "@xyo-network/hash": "~2.84.6",
-    "@xyo-network/payload": "~2.84.6",
-    "@xyo-network/payload-model": "~2.84.6",
-    "@xyo-network/payload-wrapper": "~2.84.6",
+    "@xyo-network/account-model": "~2.84.8",
+    "@xyo-network/boundwitness-model": "~2.84.8",
+    "@xyo-network/boundwitness-validator": "~2.84.8",
+    "@xyo-network/boundwitness-wrapper": "~2.84.8",
+    "@xyo-network/hash": "~2.84.8",
+    "@xyo-network/payload": "~2.84.8",
+    "@xyo-network/payload-model": "~2.84.8",
+    "@xyo-network/payload-wrapper": "~2.84.8",
     "async-mutex": "^0.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^3.2.19",
-    "@xylabs/tsconfig": "^3.2.19",
-    "@xyo-network/account": "~2.84.6",
-    "@xyo-network/object": "~2.84.6",
+    "@xylabs/ts-scripts-yarn3": "^3.2.24",
+    "@xylabs/tsconfig": "^3.2.24",
+    "@xyo-network/account": "~2.84.8",
+    "@xyo-network/object": "~2.84.8",
     "typescript": "^5.3.3"
   },
-  "docs": "dist/docs.json",
   "exports": {
     ".": {
       "browser": {
@@ -49,19 +48,19 @@
       },
       "node": {
         "require": {
-          "types": "./dist/node/index.d.ts",
-          "default": "./dist/node/index.js"
+          "types": "./dist/node/index.d.cts",
+          "default": "./dist/node/index.cjs"
         },
         "import": {
           "types": "./dist/node/index.d.mts",
-          "default": "./dist/node/index.mjs"
+          "default": "./dist/node/index.js"
         }
       }
     },
     "./package.json": "./package.json"
   },
-  "main": "dist/node/index.js",
-  "module": "dist/node/index.mjs",
+  "main": "dist/node/index.cjs",
+  "module": "dist/node/index.js",
   "homepage": "https://xyo.network",
   "license": "LGPL-3.0-only",
   "publishConfig": {
@@ -73,5 +72,6 @@
   },
   "sideEffects": false,
   "types": "dist/node/index.d.ts",
-  "version": "2.84.6"
+  "version": "2.84.8",
+  "type": "module"
 }

package/src/Builder.ts

@@ -87,11 +87,11 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: st
   }
 
   errors(errors?: (ModuleError | null)[]) {
-    errors?.forEach((error) => {
+    for (const error of errors ?? []) {
       if (error !== null) {
         this.error(error)
       }
-    })
+    }
     return this
   }
 
@@ -112,9 +112,9 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: st
 
     assertEx(result.payload_hashes?.length === result.payload_schemas?.length, 'Payload hash/schema mismatch')
 
-    assertEx(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), 'nulls found in hashes')
+    assertEx(!result.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')
 
-    assertEx(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), 'nulls found in schemas')
+    assertEx(!result.payload_schemas.some((schema) => !schema), 'nulls found in schemas')
 
     if (this.config.timestamp ?? true) {
       result.timestamp = this._timestamp
@@ -144,11 +144,12 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: st
   }
 
   payloads(payloads?: (TPayload | null)[]) {
-    payloads?.forEach((payload) => {
-      if (payload !== null) {
-        this.payload(payload)
+    if (payloads)
+      for (const payload of payloads) {
+        if (payload !== null) {
+          this.payload(payload)
+        }
       }
-    })
     return this
   }
 

package/src/Query/QueryBoundWitnessValidator.ts

@@ -32,14 +32,14 @@ export class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWi
       const resultSet = PayloadWrapper.wrap<PayloadSetPayload>((await wrapper.payloadMap())[resultSetHash] as PayloadSetPayload)
       const required = resultSet?.payload().required
       if (required) {
-        Object.entries(required).forEach(([key, value]) => {
+        for (const [key, value] of Object.entries(required)) {
           const found = wrapper.payloadSchemas.reduce((count, schema) => {
             return count + (schema === key ? 1 : 0)
           }, 0)
           if (found !== value) {
             errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`))
           }
-        })
+        }
       }
     } catch (ex) {
       handleError(ex, (error) => {

package/src/Query/QueryBoundWitnessWrapper.ts

@@ -25,7 +25,7 @@ export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitn
         return wrapper
       }
     }
-    throw Error(`Unable to parse [${typeof obj}]`)
+    throw new Error(`Unable to parse [${typeof obj}]`)
   }
 
   async getQuery(): Promise<T> {