@xyo-network/boundwitness-builder 2.100.1 → 2.100.2

package/dist/browser/Query/QueryBoundWitnessBuilder.d.cts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/browser/Query/QueryBoundWitnessBuilder.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/browser/Query/QueryBoundWitnessBuilder.d.mts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/browser/Query/QueryBoundWitnessBuilder.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/browser/Query/QueryBoundWitnessBuilder.d.ts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/browser/Query/QueryBoundWitnessBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/browser/index.cjs

@@ -236,13 +236,22 @@ var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   static {
     __name(this, "QueryBoundWitnessBuilder");
   }
+  _additional;
   _query;
+  async additional(additional) {
+    this._additional = await import_payload.PayloadBuilder.dataHashes(additional);
+    return this;
+  }
   async dataHashableFields() {
-    return {
+    const fields = {
       ...await super.dataHashableFields(),
       query: (0, import_assert2.assertEx)(this._query, () => "No Query Specified").$hash,
       schema: import_boundwitness_model2.QueryBoundWitnessSchema
     };
+    if (this._additional) {
+      fields.additional = this._additional;
+    }
+    return fields;
   }
   async query(query) {
     this._query = await import_payload.PayloadBuilder.build(query);

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { PayloadBuilder } from '@xyo-network/payload'\nimport { Query, WithMeta } from '@xyo-network/payload-model'\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: WithMeta<TQuery> | undefined\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    return {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;ACAA,yBAA4C;AAC5C,oBAAyB;AACzB,iBAAkD;AAGlD,gCAAiD;AACjD,kBAA8C;AAC9C,6BAAsG;AAEtG,yBAAsB;AAef,IAAMA,sBAAN,MAAMA,6BAAmHC,0CAAAA;EAxBhI,OAwBgIA;;;EAI9H,OAAwBC,cAAc,IAAIC,yBAAAA;EAClCC;EACAC;EACAC;EACAC,UAAyB,CAAA;EACzBC;EACAC;EACAC;EACAC;EACAC;EAERC,YAAYC,SAA+D;AACzE,UAAM;MAAE,GAAGA;MAASC,QAAQC;IAAmB,CAAA;AAC/C,UAAM,EAAEC,UAAUC,eAAeC,gBAAgBC,UAAUC,aAAaC,WAAWC,YAAW,IAAKT,WAAW,CAAC;AAC/G,SAAKV,YAAYa,YAAY,CAAA;AAC7B,SAAKT,iBAAiBU;AACtB,SAAKT,kBAAkBU;AACvB,SAAKT,YAAYU,YAAY,CAAA;AAC7B,SAAKT,eAAeU;AACpB,SAAKhB,eAAekB;AACpB,SAAKX,aAAaU,aAAa;EACjC;EAEA,IAAcE,YAAuB;AACnC,WAAO,KAAKpB,UAAUqB,IAAI,CAACC,YAAYA,QAAQC,QAAQC,YAAW,CAAA;EACpE;EAEA,IAAcT,iBAA2B;AACvC,WACE,KAAKV,mBACL,KAAKC,UAAUe,IAAI,CAACI,YAAAA;AAClB,iBAAOC,wBAASD,QAAQd,QAAQ,MAAM,KAAKgB,qBAAqBF,OAAAA,CAAAA;IAClE,CAAA;EAEJ;EAEA,IAAcG,sBAA8C;AAC1D,WAAO,KAAK5B,UAAUqB,IAAI,CAACC,YAAYA,QAAQO,qBAAqB,IAAA;EACtE;EAEA,IAAcC,iBAAkC;AAC9C,WAAO,KAAK9B,UAAUqB,IAAI,CAACC,YAAYA,QAAQS,gBAAgB,IAAA;EACjE;EAEA,IAAcb,YAAoB;AAChC,WAAQ,KAAKV,aAAa,OAAO,KAAKA,eAAe,WAAW,KAAKA,aAAawB,KAAKC,IAAG;EAC5F;EAEA,OAAOC,aAAqCT,SAAYF,SAAkB;AACxE,UAAMY,QAAQV,QAAQL,UAAUgB,QAAQb,OAAAA;AACxC,QAAIY,UAAU,IAAI;AAChB,YAAM,IAAIE,MAAM,iBAAA;IAClB;AACA,WAAOF;EACT;EAEA,aAAaG,MAA0C5B,SAAoD;AACzG,WAAO,MAAM,IAAId,qBAAoBc,OAAAA,EAAS4B,MAAK;EACrD;EAEA,aAAsBC,mBACpB5B,QACA6B,QACyB;AACzB,WAAO,MAAM3C,0CAAmB0C,mBAAmB5B,QAAQ6B,aAASC,+BAAkBD,MAAAA,IAAUE,MAAAA;EAClG;EAEA,OAAOX,aAAqCY,cAAiBpB,SAAkB;AAC7E,WAAOoB,aAAaC,gBAAgB,KAAKV,aAAaS,cAAcpB,OAAAA,CAAAA,GAAWC,YAAAA;EACjF;EAEA,aAAuBqB,cACrBhC,UACAG,UACAE,YAAYc,KAAKC,IAAG,GACpB;AACA,UAAMb,YAAYP,SAASQ,IAAI,CAACC,gBAAYwB,+BAAmBxB,QAAQyB,cAAc;MAAEC,QAAQ;IAAM,CAAA,CAAA;AACrG,UAAMJ,kBAAkB/B,SAASQ,IAAI,CAACC,YAAYA,QAAQS,gBAAgB,IAAA;AAC1E,UAAMkB,iBAAiBjC,WAAW,MAAMkC,sCAAeC,WAAWnC,QAAAA,IAAY,CAAA;AAC9E,UAAMoC,kBAAkBpC,UAAUK,IAAI,CAAC,EAAEV,OAAM,MAAOA,MAAAA;AACtD,WAAO;MAAES;MAAW6B;MAAgBG;MAAiBR;MAAiB1B;IAAU;EAClF;EAEA,aAAgCmC,WAC9BC,UACAC,WACAC,QAAQ,MACR3C,UACAiB,gBACAX,aACAF,aACqB;AACrB,UAAMwC,OAAO,MAAM,MAAMJ,WAAWC,UAAUC,WAAWC,KAAAA;AAEzD,QAAI3C,UAAU6C,UAAU5B,gBAAgB4B,QAAQ;AAC9ChC,kCAASb,SAAS6C,WAAW5B,eAAe4B,QAAQ,MAAM,mDAAA;AAC1DD,WAAKE,aAAa,MAAM,KAAKA,WAAW9C,UAAUyC,UAAUxB,cAAAA;IAC9D;AAEA,QAAIb,aAAa;AACfwC,WAAKxC,cAAcA;IACrB;AAEA,QAAIE,aAAa;AACfsC,WAAKtC,cAAcA;IACrB;AAEA,WAAOsC;EACT;EAEA,OAAiBG,UAAkCnC,SAAYF,SAAkB;AAC/E,WAAOE,QAAQoC,MAAMF,WAAW,KAAKzB,aAAaT,SAASF,OAAAA,CAAAA;EAC7D;EAEA,aAAuBoC,WAAW9C,UAA6BiD,MAAYhC,gBAAkE;AAC3I,UAAMiC,gBAAYC,kCAAcF,IAAAA;AAChC,UAAMG,sBAAsBnC,gBAAgBT,IAAI,CAAC6C,OAAQA,SAAKC,iCAAaD,EAAAA,IAAMxB,MAAAA;AACjF,WAAO,MAAM0B,QAAQC,IAAIxD,SAASQ,IAAI,OAAOC,SAASa,cAAUW,+BAAmB,MAAMxB,QAAQgD,KAAKP,WAAWE,oBAAoB9B,KAAAA,CAAM,CAAA,CAAA,CAAA;EAC7I;EAEA,OAAeoC,sBAAsBC,IAA8D;AACjG9C,gCAAS8C,GAAGvB,gBAAgBS,WAAWc,GAAGpB,iBAAiBM,QAAQ,MAAM,8BAAA;AACzEhC,gCAAS,CAAC8C,GAAGvB,eAAewB,KAAK,CAACX,SAAS,CAACA,IAAAA,GAAO,MAAM,uBAAA;AACzDpC,gCAAS,CAAC8C,GAAGpB,gBAAgBqB,KAAK,CAAC9D,WAAW,CAACA,MAAAA,GAAS,MAAM,wBAAA;EAChE;EAEA,MAAM2B,QAA2F;AAC/F,WAAO,MAAM1C,qBAAoBE,YAAY4E,aAAa,YAAA;AACxD,YAAMnC,qBAAsB,MAAM,KAAKA,mBAAkB;AACzD,YAAMoC,SAAS,MAAMzB,sCAAeZ,MAAMC,kBAAAA,GAAqBoC;AAC/D,YAAMd,QAAQ,MAAM,KAAKR,WAAWsB,KAAAA;AAEpC,YAAMC,MAAM;QACV,GAAGrC;QACHoC;QACAd;MACF;AACA,aAAO;QACLe;QACA,MAAMR,QAAQC,IAAI,KAAK/D,WAAWe,IAAI,CAACI,YAAYyB,sCAAeZ,MAAMb,OAAAA,CAAAA,CAAAA;QACxE,MAAM2C,QAAQC,IAAI,KAAKlE,SAASkB,IAAI,CAACwD,UAAU3B,sCAAeZ,MAAMuC,KAAAA,CAAAA,CAAAA;;IAExE,CAAA;EACF;EAEA,MAAetC,qBAA0D;AACvE,UAAMC,SAAS,MAAM,KAAKK,cAAa;AACvC,UAAMiC,SAAS,MAAMlF,qBAAoB2C,mBAAkC,KAAKwC,SAASvC,MAAAA;AAEzF5C,yBAAoB2E,sBAAsBO,MAAAA;AAE1C,WAAOA;EACT;EAEAD,MAAMpD,SAAuB;AAC3BC,gCAAS,KAAKxB,iBAAiBwC,QAAW,MAAM,4CAAA;AAChD,QAAIjB,SAAS;AACX,WAAKtB,QAAQ6E,SAAKtD,4BAASuD,wBAAWxD,OAAAA,CAAAA,CAAAA;IACxC;AACA,WAAO;EACT;EAEAyD,OAAOA,QAAiC;AACtC,QAAIA,QAAQ;AACVA,aAAO7D,IAAI,CAACwD,UAAAA;AACV,YAAIA,UAAU,MAAM;AAClB,eAAKA,MAAMA,KAAAA;QACb;MACF,CAAA;IACF;AACA,WAAO;EACT;EAEAM,OAAOA,QAAgBxE,QAAkB;AACvCe,gCAAS,KAAKV,SAAS0C,WAAW,GAAG,MAAM,8CAAA;AAC3C,SAAKtD,iBAAiB+E;AACtB,SAAK9E,kBAAkBM;AACvB,WAAO;EACT;EAEAc,QAAQA,SAAoB;AAC1BC,gCAAS,KAAKtB,mBAAmBsC,QAAW,MAAM,8CAAA;AAClD,QAAIjB,SAAS;AACX,WAAKnB,UAAU0E,SAAKtD,4BAASuD,wBAAqBxD,OAAAA,CAAAA,CAAAA;IACpD;AACA,WAAO;EACT;EAEAT,SAASA,UAAgC;AACvC,QAAIA;AACFA,eAASK,IAAI,CAACI,YAAAA;AACZ,YAAIA,YAAY,MAAM;AACpB,eAAKA,QAAQA,OAAAA;QACf;MACF,CAAA;AACF,WAAO;EACT;EAEAR,YAAYmE,OAAc;AACxB,SAAK7E,eAAe6E,OAAO5D,YAAAA;AAC3B,WAAO;EACT;EAEA6D,QAAQ/D,SAA0B;AAChC,SAAKtB,WAAWgF,KAAK1D,OAAAA;AACrB,WAAO;EACT;EAEAgE,UAAUzE,UAA6B;AACrC,SAAKb,WAAWgF,KAAAA,GAAQnE,QAAAA;AACxB,WAAO;EACT;EAEA,MAAyBwC,WAAWC,UAAgBE,QAAQ,MAA2B;AACrF,WAAO,MAAM5D,qBAAoByD,WAC/BC,UACA,KAAKiC,QACL/B,OACA,KAAKxD,WACL,KAAK8B,gBACL,KAAK7B,cACL,KAAKM,YAAY;EAErB;EAEA,MAAgBoD,WAAW6B,OAAa1D,gBAAkE;AACxG,UAAMgC,WAAOE,kCAAcwB,KAAAA;AAC3B,UAAMvB,sBAAsBnC,eAAeT,IAAI,CAAC6C,OAAQA,SAAKC,iCAAaD,EAAAA,IAAMxB,MAAAA;AAChF,WAAO,MAAM0B,QAAQC,IAAI,KAAKrE,UAAUqB,IAAI,OAAOC,SAASa,cAAUW,+BAAmB,MAAMxB,QAAQgD,KAAKR,MAAMG,oBAAoB9B,KAAAA,CAAM,CAAA,CAAA,CAAA;EAC9I;EAEA,MAAcU,gBAAgB;AAC5B,WAAO,MAAMjD,qBAAoBiD,cAA6B,KAAK7C,WAAW,KAAKM,WAAW,KAAKY,SAAS;EAC9G;EAEQS,qBAAqBF,SAAkB;AAC7C,WAAO;EAA4BgE,KAAKC,UAAUjE,SAAS,MAAM,CAAA,CAAA;EACnE;AACF;;;AC1QA,IAAAkE,iBAAyB;AACzB,IAAAC,6BAA2D;AAC3D,qBAA+B;AAKxB,IAAMC,2BAAN,cAGGC,oBAAAA;EAVV,OAUUA;;;EACAC;EAER,MAAeC,qBAAsE;AACnF,WAAO;MACL,GAAI,MAAM,MAAMA,mBAAAA;MAChBC,WAAOC,yBAAS,KAAKH,QAAQ,MAAM,oBAAA,EAAsBI;MACzDC,QAAQC;IACV;EACF;EAEA,MAAMJ,MAAwBA,OAAU;AACtC,SAAKF,SAAS,MAAMO,8BAAeC,MAAMN,KAAAA;AACzC,SAAKO,QAAQ,KAAKT,MAAM;AACxB,WAAO;EACT;AACF;","names":["BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","import_assert","import_boundwitness_model","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","PayloadBuilder","build","payload"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { Hash } from '@xylabs/hex'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { Payload, Query, WithMeta } from '@xyo-network/payload-model'\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 _additional?: Hash[]\n  private _query: WithMeta<TQuery> | undefined\n\n  async additional(additional: Payload[]) {\n    this._additional = await PayloadBuilder.dataHashes(additional)\n    return this\n  }\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n    if (this._additional) {\n      fields.additional = this._additional\n    }\n    return fields\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","import_assert","import_boundwitness_model","QueryBoundWitnessBuilder","BoundWitnessBuilder","_additional","_query","additional","PayloadBuilder","dataHashes","dataHashableFields","fields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","build","payload"]}

package/dist/browser/index.js

@@ -211,13 +211,22 @@ var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   static {
     __name(this, "QueryBoundWitnessBuilder");
   }
+  _additional;
   _query;
+  async additional(additional) {
+    this._additional = await PayloadBuilder2.dataHashes(additional);
+    return this;
+  }
   async dataHashableFields() {
-    return {
+    const fields = {
       ...await super.dataHashableFields(),
       query: assertEx2(this._query, () => "No Query Specified").$hash,
       schema: QueryBoundWitnessSchema
     };
+    if (this._additional) {
+      fields.additional = this._additional;
+    }
+    return fields;
   }
   async query(query) {
     this._query = await PayloadBuilder2.build(query);

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { PayloadBuilder } from '@xyo-network/payload'\nimport { Query, WithMeta } from '@xyo-network/payload-model'\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: WithMeta<TQuery> | undefined\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    return {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","removeEmptyFields","sortFields","PayloadBuilder","PayloadBuilderBase","Mutex","BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","PayloadBuilder","build","payload"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { Hash } from '@xylabs/hex'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { Payload, Query, WithMeta } from '@xyo-network/payload-model'\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 _additional?: Hash[]\n  private _query: WithMeta<TQuery> | undefined\n\n  async additional(additional: Payload[]) {\n    this._additional = await PayloadBuilder.dataHashes(additional)\n    return this\n  }\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n    if (this._additional) {\n      fields.additional = this._additional\n    }\n    return fields\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":";;;;AAAA,SAASA,eAAeC,oBAAoB;AAC5C,SAASC,gBAAgB;AACzB,SAAwBC,0BAA0B;AAGlD,SAAuBC,0BAA0B;AACjD,SAASC,mBAAmBC,kBAAkB;AAC9C,SAASC,gBAAgBC,0BAA6E;AAEtG,SAASC,aAAa;AAef,IAAMC,sBAAN,MAAMA,6BAAmHC,mBAAAA;EAxBhI,OAwBgIA;;;EAI9H,OAAwBC,cAAc,IAAIC,MAAAA;EAClCC;EACAC;EACAC;EACAC,UAAyB,CAAA;EACzBC;EACAC;EACAC;EACAC;EACAC;EAERC,YAAYC,SAA+D;AACzE,UAAM;MAAE,GAAGA;MAASC,QAAQC;IAAmB,CAAA;AAC/C,UAAM,EAAEC,UAAUC,eAAeC,gBAAgBC,UAAUC,aAAaC,WAAWC,YAAW,IAAKT,WAAW,CAAC;AAC/G,SAAKV,YAAYa,YAAY,CAAA;AAC7B,SAAKT,iBAAiBU;AACtB,SAAKT,kBAAkBU;AACvB,SAAKT,YAAYU,YAAY,CAAA;AAC7B,SAAKT,eAAeU;AACpB,SAAKhB,eAAekB;AACpB,SAAKX,aAAaU,aAAa;EACjC;EAEA,IAAcE,YAAuB;AACnC,WAAO,KAAKpB,UAAUqB,IAAI,CAACC,YAAYA,QAAQC,QAAQC,YAAW,CAAA;EACpE;EAEA,IAAcT,iBAA2B;AACvC,WACE,KAAKV,mBACL,KAAKC,UAAUe,IAAI,CAACI,YAAAA;AAClB,aAAOC,SAASD,QAAQd,QAAQ,MAAM,KAAKgB,qBAAqBF,OAAAA,CAAAA;IAClE,CAAA;EAEJ;EAEA,IAAcG,sBAA8C;AAC1D,WAAO,KAAK5B,UAAUqB,IAAI,CAACC,YAAYA,QAAQO,qBAAqB,IAAA;EACtE;EAEA,IAAcC,iBAAkC;AAC9C,WAAO,KAAK9B,UAAUqB,IAAI,CAACC,YAAYA,QAAQS,gBAAgB,IAAA;EACjE;EAEA,IAAcb,YAAoB;AAChC,WAAQ,KAAKV,aAAa,OAAO,KAAKA,eAAe,WAAW,KAAKA,aAAawB,KAAKC,IAAG;EAC5F;EAEA,OAAOC,aAAqCT,SAAYF,SAAkB;AACxE,UAAMY,QAAQV,QAAQL,UAAUgB,QAAQb,OAAAA;AACxC,QAAIY,UAAU,IAAI;AAChB,YAAM,IAAIE,MAAM,iBAAA;IAClB;AACA,WAAOF;EACT;EAEA,aAAaG,MAA0C5B,SAAoD;AACzG,WAAO,MAAM,IAAId,qBAAoBc,OAAAA,EAAS4B,MAAK;EACrD;EAEA,aAAsBC,mBACpB5B,QACA6B,QACyB;AACzB,WAAO,MAAM3C,mBAAmB0C,mBAAmB5B,QAAQ6B,SAASC,kBAAkBD,MAAAA,IAAUE,MAAAA;EAClG;EAEA,OAAOX,aAAqCY,cAAiBpB,SAAkB;AAC7E,WAAOoB,aAAaC,gBAAgB,KAAKV,aAAaS,cAAcpB,OAAAA,CAAAA,GAAWC,YAAAA;EACjF;EAEA,aAAuBqB,cACrBhC,UACAG,UACAE,YAAYc,KAAKC,IAAG,GACpB;AACA,UAAMb,YAAYP,SAASQ,IAAI,CAACC,YAAYwB,mBAAmBxB,QAAQyB,cAAc;MAAEC,QAAQ;IAAM,CAAA,CAAA;AACrG,UAAMJ,kBAAkB/B,SAASQ,IAAI,CAACC,YAAYA,QAAQS,gBAAgB,IAAA;AAC1E,UAAMkB,iBAAiBjC,WAAW,MAAMkC,eAAeC,WAAWnC,QAAAA,IAAY,CAAA;AAC9E,UAAMoC,kBAAkBpC,UAAUK,IAAI,CAAC,EAAEV,OAAM,MAAOA,MAAAA;AACtD,WAAO;MAAES;MAAW6B;MAAgBG;MAAiBR;MAAiB1B;IAAU;EAClF;EAEA,aAAgCmC,WAC9BC,UACAC,WACAC,QAAQ,MACR3C,UACAiB,gBACAX,aACAF,aACqB;AACrB,UAAMwC,OAAO,MAAM,MAAMJ,WAAWC,UAAUC,WAAWC,KAAAA;AAEzD,QAAI3C,UAAU6C,UAAU5B,gBAAgB4B,QAAQ;AAC9ChC,eAASb,SAAS6C,WAAW5B,eAAe4B,QAAQ,MAAM,mDAAA;AAC1DD,WAAKE,aAAa,MAAM,KAAKA,WAAW9C,UAAUyC,UAAUxB,cAAAA;IAC9D;AAEA,QAAIb,aAAa;AACfwC,WAAKxC,cAAcA;IACrB;AAEA,QAAIE,aAAa;AACfsC,WAAKtC,cAAcA;IACrB;AAEA,WAAOsC;EACT;EAEA,OAAiBG,UAAkCnC,SAAYF,SAAkB;AAC/E,WAAOE,QAAQoC,MAAMF,WAAW,KAAKzB,aAAaT,SAASF,OAAAA,CAAAA;EAC7D;EAEA,aAAuBoC,WAAW9C,UAA6BiD,MAAYhC,gBAAkE;AAC3I,UAAMiC,YAAYC,cAAcF,IAAAA;AAChC,UAAMG,sBAAsBnC,gBAAgBT,IAAI,CAAC6C,OAAQA,KAAKC,aAAaD,EAAAA,IAAMxB,MAAAA;AACjF,WAAO,MAAM0B,QAAQC,IAAIxD,SAASQ,IAAI,OAAOC,SAASa,UAAUW,mBAAmB,MAAMxB,QAAQgD,KAAKP,WAAWE,oBAAoB9B,KAAAA,CAAM,CAAA,CAAA,CAAA;EAC7I;EAEA,OAAeoC,sBAAsBC,IAA8D;AACjG9C,aAAS8C,GAAGvB,gBAAgBS,WAAWc,GAAGpB,iBAAiBM,QAAQ,MAAM,8BAAA;AACzEhC,aAAS,CAAC8C,GAAGvB,eAAewB,KAAK,CAACX,SAAS,CAACA,IAAAA,GAAO,MAAM,uBAAA;AACzDpC,aAAS,CAAC8C,GAAGpB,gBAAgBqB,KAAK,CAAC9D,WAAW,CAACA,MAAAA,GAAS,MAAM,wBAAA;EAChE;EAEA,MAAM2B,QAA2F;AAC/F,WAAO,MAAM1C,qBAAoBE,YAAY4E,aAAa,YAAA;AACxD,YAAMnC,qBAAsB,MAAM,KAAKA,mBAAkB;AACzD,YAAMoC,SAAS,MAAMzB,eAAeZ,MAAMC,kBAAAA,GAAqBoC;AAC/D,YAAMd,QAAQ,MAAM,KAAKR,WAAWsB,KAAAA;AAEpC,YAAMC,MAAM;QACV,GAAGrC;QACHoC;QACAd;MACF;AACA,aAAO;QACLe;QACA,MAAMR,QAAQC,IAAI,KAAK/D,WAAWe,IAAI,CAACI,YAAYyB,eAAeZ,MAAMb,OAAAA,CAAAA,CAAAA;QACxE,MAAM2C,QAAQC,IAAI,KAAKlE,SAASkB,IAAI,CAACwD,UAAU3B,eAAeZ,MAAMuC,KAAAA,CAAAA,CAAAA;;IAExE,CAAA;EACF;EAEA,MAAetC,qBAA0D;AACvE,UAAMC,SAAS,MAAM,KAAKK,cAAa;AACvC,UAAMiC,SAAS,MAAMlF,qBAAoB2C,mBAAkC,KAAKwC,SAASvC,MAAAA;AAEzF5C,yBAAoB2E,sBAAsBO,MAAAA;AAE1C,WAAOA;EACT;EAEAD,MAAMpD,SAAuB;AAC3BC,aAAS,KAAKxB,iBAAiBwC,QAAW,MAAM,4CAAA;AAChD,QAAIjB,SAAS;AACX,WAAKtB,QAAQ6E,KAAKtD,SAASuD,WAAWxD,OAAAA,CAAAA,CAAAA;IACxC;AACA,WAAO;EACT;EAEAyD,OAAOA,QAAiC;AACtC,QAAIA,QAAQ;AACVA,aAAO7D,IAAI,CAACwD,UAAAA;AACV,YAAIA,UAAU,MAAM;AAClB,eAAKA,MAAMA,KAAAA;QACb;MACF,CAAA;IACF;AACA,WAAO;EACT;EAEAM,OAAOA,QAAgBxE,QAAkB;AACvCe,aAAS,KAAKV,SAAS0C,WAAW,GAAG,MAAM,8CAAA;AAC3C,SAAKtD,iBAAiB+E;AACtB,SAAK9E,kBAAkBM;AACvB,WAAO;EACT;EAEAc,QAAQA,SAAoB;AAC1BC,aAAS,KAAKtB,mBAAmBsC,QAAW,MAAM,8CAAA;AAClD,QAAIjB,SAAS;AACX,WAAKnB,UAAU0E,KAAKtD,SAASuD,WAAqBxD,OAAAA,CAAAA,CAAAA;IACpD;AACA,WAAO;EACT;EAEAT,SAASA,UAAgC;AACvC,QAAIA;AACFA,eAASK,IAAI,CAACI,YAAAA;AACZ,YAAIA,YAAY,MAAM;AACpB,eAAKA,QAAQA,OAAAA;QACf;MACF,CAAA;AACF,WAAO;EACT;EAEAR,YAAYmE,OAAc;AACxB,SAAK7E,eAAe6E,OAAO5D,YAAAA;AAC3B,WAAO;EACT;EAEA6D,QAAQ/D,SAA0B;AAChC,SAAKtB,WAAWgF,KAAK1D,OAAAA;AACrB,WAAO;EACT;EAEAgE,UAAUzE,UAA6B;AACrC,SAAKb,WAAWgF,KAAAA,GAAQnE,QAAAA;AACxB,WAAO;EACT;EAEA,MAAyBwC,WAAWC,UAAgBE,QAAQ,MAA2B;AACrF,WAAO,MAAM5D,qBAAoByD,WAC/BC,UACA,KAAKiC,QACL/B,OACA,KAAKxD,WACL,KAAK8B,gBACL,KAAK7B,cACL,KAAKM,YAAY;EAErB;EAEA,MAAgBoD,WAAW6B,OAAa1D,gBAAkE;AACxG,UAAMgC,OAAOE,cAAcwB,KAAAA;AAC3B,UAAMvB,sBAAsBnC,eAAeT,IAAI,CAAC6C,OAAQA,KAAKC,aAAaD,EAAAA,IAAMxB,MAAAA;AAChF,WAAO,MAAM0B,QAAQC,IAAI,KAAKrE,UAAUqB,IAAI,OAAOC,SAASa,UAAUW,mBAAmB,MAAMxB,QAAQgD,KAAKR,MAAMG,oBAAoB9B,KAAAA,CAAM,CAAA,CAAA,CAAA;EAC9I;EAEA,MAAcU,gBAAgB;AAC5B,WAAO,MAAMjD,qBAAoBiD,cAA6B,KAAK7C,WAAW,KAAKM,WAAW,KAAKY,SAAS;EAC9G;EAEQS,qBAAqBF,SAAkB;AAC7C,WAAO;EAA4BgE,KAAKC,UAAUjE,SAAS,MAAM,CAAA,CAAA;EACnE;AACF;;;AC1QA,SAASkE,YAAAA,iBAAgB;AAEzB,SAA4BC,+BAA+B;AAC3D,SAASC,kBAAAA,uBAAsB;AAKxB,IAAMC,2BAAN,cAGGC,oBAAAA;EAXV,OAWUA;;;EACAC;EACAC;EAER,MAAMC,WAAWA,YAAuB;AACtC,SAAKF,cAAc,MAAMG,gBAAeC,WAAWF,UAAAA;AACnD,WAAO;EACT;EAEA,MAAeG,qBAAsE;AACnF,UAAMC,SAAS;MACb,GAAI,MAAM,MAAMD,mBAAAA;MAChBE,OAAOC,UAAS,KAAKP,QAAQ,MAAM,oBAAA,EAAsBQ;MACzDC,QAAQC;IACV;AACA,QAAI,KAAKX,aAAa;AACpBM,aAAOJ,aAAa,KAAKF;IAC3B;AACA,WAAOM;EACT;EAEA,MAAMC,MAAwBA,OAAU;AACtC,SAAKN,SAAS,MAAME,gBAAeS,MAAML,KAAAA;AACzC,SAAKM,QAAQ,KAAKZ,MAAM;AACxB,WAAO;EACT;AACF;","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","removeEmptyFields","sortFields","PayloadBuilder","PayloadBuilderBase","Mutex","BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_additional","_query","additional","PayloadBuilder","dataHashes","dataHashableFields","fields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","build","payload"]}

package/dist/neutral/Query/QueryBoundWitnessBuilder.d.cts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/neutral/Query/QueryBoundWitnessBuilder.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/neutral/Query/QueryBoundWitnessBuilder.d.mts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/neutral/Query/QueryBoundWitnessBuilder.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/neutral/Query/QueryBoundWitnessBuilder.d.ts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/neutral/Query/QueryBoundWitnessBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/neutral/index.cjs

@@ -236,13 +236,22 @@ var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   static {
     __name(this, "QueryBoundWitnessBuilder");
   }
+  _additional;
   _query;
+  async additional(additional) {
+    this._additional = await import_payload.PayloadBuilder.dataHashes(additional);
+    return this;
+  }
   async dataHashableFields() {
-    return {
+    const fields = {
       ...await super.dataHashableFields(),
       query: (0, import_assert2.assertEx)(this._query, () => "No Query Specified").$hash,
       schema: import_boundwitness_model2.QueryBoundWitnessSchema
     };
+    if (this._additional) {
+      fields.additional = this._additional;
+    }
+    return fields;
   }
   async query(query) {
     this._query = await import_payload.PayloadBuilder.build(query);

package/dist/neutral/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { PayloadBuilder } from '@xyo-network/payload'\nimport { Query, WithMeta } from '@xyo-network/payload-model'\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: WithMeta<TQuery> | undefined\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    return {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","import_assert","import_boundwitness_model","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","PayloadBuilder","build","payload"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { Hash } from '@xylabs/hex'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { Payload, Query, WithMeta } from '@xyo-network/payload-model'\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 _additional?: Hash[]\n  private _query: WithMeta<TQuery> | undefined\n\n  async additional(additional: Payload[]) {\n    this._additional = await PayloadBuilder.dataHashes(additional)\n    return this\n  }\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n    if (this._additional) {\n      fields.additional = this._additional\n    }\n    return fields\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","import_assert","import_boundwitness_model","QueryBoundWitnessBuilder","BoundWitnessBuilder","_additional","_query","additional","PayloadBuilder","dataHashes","dataHashableFields","fields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","build","payload"]}

package/dist/neutral/index.js

@@ -211,13 +211,22 @@ var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   static {
     __name(this, "QueryBoundWitnessBuilder");
   }
+  _additional;
   _query;
+  async additional(additional) {
+    this._additional = await PayloadBuilder2.dataHashes(additional);
+    return this;
+  }
   async dataHashableFields() {
-    return {
+    const fields = {
       ...await super.dataHashableFields(),
       query: assertEx2(this._query, () => "No Query Specified").$hash,
       schema: QueryBoundWitnessSchema
     };
+    if (this._additional) {
+      fields.additional = this._additional;
+    }
+    return fields;
   }
   async query(query) {
     this._query = await PayloadBuilder2.build(query);

package/dist/neutral/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { PayloadBuilder } from '@xyo-network/payload'\nimport { Query, WithMeta } from '@xyo-network/payload-model'\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: WithMeta<TQuery> | undefined\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    return {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","removeEmptyFields","sortFields","PayloadBuilder","PayloadBuilderBase","Mutex","BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","PayloadBuilder","build","payload"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { Hash } from '@xylabs/hex'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { Payload, Query, WithMeta } from '@xyo-network/payload-model'\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 _additional?: Hash[]\n  private _query: WithMeta<TQuery> | undefined\n\n  async additional(additional: Payload[]) {\n    this._additional = await PayloadBuilder.dataHashes(additional)\n    return this\n  }\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n    if (this._additional) {\n      fields.additional = this._additional\n    }\n    return fields\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","removeEmptyFields","sortFields","PayloadBuilder","PayloadBuilderBase","Mutex","BoundWitnessBuilder","PayloadBuilderBase","_buildMutex","Mutex","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_additional","_query","additional","PayloadBuilder","dataHashes","dataHashableFields","fields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","build","payload"]}

package/dist/node/Query/QueryBoundWitnessBuilder.d.cts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/node/Query/QueryBoundWitnessBuilder.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/node/Query/QueryBoundWitnessBuilder.d.mts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/node/Query/QueryBoundWitnessBuilder.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/node/Query/QueryBoundWitnessBuilder.d.ts

@@ -1,8 +1,10 @@
 import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { Query } from '@xyo-network/payload-model';
+import { Payload, Query } from '@xyo-network/payload-model';
 import { BoundWitnessBuilder } from '../Builder';
 export declare class QueryBoundWitnessBuilder<TBoundWitness extends QueryBoundWitness = QueryBoundWitness, TQuery extends Query = Query> extends BoundWitnessBuilder<TBoundWitness> {
+    private _additional?;
     private _query;
+    additional(additional: Payload[]): Promise<this>;
     dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>>;
     query<T extends TQuery>(query: T): Promise<this>;
 }

package/dist/node/Query/QueryBoundWitnessBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,MAAM,CAA8B;IAE7B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAQ9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}
+{"version":3,"file":"QueryBoundWitnessBuilder.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAE5F,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,4BAA4B,CAAA;AAErE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,qBAAa,wBAAwB,CACnC,aAAa,SAAS,iBAAiB,GAAG,iBAAiB,EAC3D,MAAM,SAAS,KAAK,GAAG,KAAK,CAC5B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;IAC1C,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAA8B;IAEtC,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE;IAKvB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC;IAY9E,KAAK,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC;CAKvC"}

package/dist/node/index.cjs

@@ -242,13 +242,22 @@ var import_assert2 = require("@xylabs/assert");
 var import_boundwitness_model2 = require("@xyo-network/boundwitness-model");
 var import_payload = require("@xyo-network/payload");
 var _QueryBoundWitnessBuilder = class _QueryBoundWitnessBuilder extends BoundWitnessBuilder {
+  _additional;
   _query;
+  async additional(additional) {
+    this._additional = await import_payload.PayloadBuilder.dataHashes(additional);
+    return this;
+  }
   async dataHashableFields() {
-    return {
+    const fields = {
       ...await super.dataHashableFields(),
       query: (0, import_assert2.assertEx)(this._query, () => "No Query Specified").$hash,
       schema: import_boundwitness_model2.QueryBoundWitnessSchema
     };
+    if (this._additional) {
+      fields.additional = this._additional;
+    }
+    return fields;
   }
   async query(query) {
     this._query = await import_payload.PayloadBuilder.build(query);

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { PayloadBuilder } from '@xyo-network/payload'\nimport { Query, WithMeta } from '@xyo-network/payload-model'\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: WithMeta<TQuery> | undefined\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    return {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["BoundWitnessBuilder","PayloadBuilderBase","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","_buildMutex","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","Mutex","import_assert","import_boundwitness_model","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","PayloadBuilder","build","payload"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { Hash } from '@xylabs/hex'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { Payload, Query, WithMeta } from '@xyo-network/payload-model'\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 _additional?: Hash[]\n  private _query: WithMeta<TQuery> | undefined\n\n  async additional(additional: Payload[]) {\n    this._additional = await PayloadBuilder.dataHashes(additional)\n    return this\n  }\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n    if (this._additional) {\n      fields.additional = this._additional\n    }\n    return fields\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["BoundWitnessBuilder","PayloadBuilderBase","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","_buildMutex","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","Mutex","import_assert","import_boundwitness_model","QueryBoundWitnessBuilder","BoundWitnessBuilder","_additional","_query","additional","PayloadBuilder","dataHashes","dataHashableFields","fields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","build","payload"]}

package/dist/node/index.js

@@ -217,13 +217,22 @@ import { assertEx as assertEx2 } from "@xylabs/assert";
 import { QueryBoundWitnessSchema } from "@xyo-network/boundwitness-model";
 import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload";
 var _QueryBoundWitnessBuilder = class _QueryBoundWitnessBuilder extends BoundWitnessBuilder {
+  _additional;
   _query;
+  async additional(additional) {
+    this._additional = await PayloadBuilder2.dataHashes(additional);
+    return this;
+  }
   async dataHashableFields() {
-    return {
+    const fields = {
       ...await super.dataHashableFields(),
       query: assertEx2(this._query, () => "No Query Specified").$hash,
       schema: QueryBoundWitnessSchema
     };
+    if (this._additional) {
+      fields.additional = this._additional;
+    }
+    return fields;
   }
   async query(query) {
     this._query = await PayloadBuilder2.build(query);

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { PayloadBuilder } from '@xyo-network/payload'\nimport { Query, WithMeta } from '@xyo-network/payload-model'\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: WithMeta<TQuery> | undefined\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    return {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","removeEmptyFields","sortFields","PayloadBuilder","PayloadBuilderBase","Mutex","BoundWitnessBuilder","PayloadBuilderBase","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","_buildMutex","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","Mutex","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","PayloadBuilder","build","payload"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { Address, Hash, hexFromArrayBuffer } from '@xylabs/hex'\nimport { AnyObject, JsonObject } from '@xylabs/object'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { removeEmptyFields, sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, WithoutMeta, WithoutSchema } from '@xyo-network/payload-builder'\nimport { ModuleError, Payload, Schema, WithMeta } from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nexport type GeneratedBoundWitnessFields = 'addresses' | 'payload_hashes' | 'payload_schemas' | 'previous_hashes'\n\nexport interface BoundWitnessBuilderOptions<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload>\n  extends Omit<PayloadBuilderOptions<Omit<TBoundWitness, GeneratedBoundWitnessFields>>, 'schema'> {\n  readonly accounts?: AccountInstance[]\n  readonly destination?: Hash[]\n  readonly payloadHashes?: TBoundWitness['payload_hashes']\n  readonly payloadSchemas?: TBoundWitness['payload_schemas']\n  readonly payloads?: TPayload[]\n  readonly sourceQuery?: Hash\n  readonly timestamp?: number\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitness, TPayload extends Payload = Payload> extends PayloadBuilderBase<\n  Omit<TBoundWitness, GeneratedBoundWitnessFields>,\n  BoundWitnessBuilderOptions<TBoundWitness> & { schema: BoundWitnessSchema }\n> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[]\n  private _destination?: Hash[]\n  private _errorHashes?: Hash[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: Hash[]\n  private _payloadSchemas?: Schema[]\n  private _payloads: TPayload[]\n  private _sourceQuery?: Hash\n  private _timestamp: boolean | number\n\n  constructor(options?: BoundWitnessBuilderOptions<TBoundWitness, TPayload>) {\n    super({ ...options, schema: BoundWitnessSchema })\n    const { accounts, payloadHashes, payloadSchemas, payloads, sourceQuery, timestamp, destination } = options ?? {}\n    this._accounts = accounts ?? []\n    this._payloadHashes = payloadHashes\n    this._payloadSchemas = payloadSchemas\n    this._payloads = payloads ?? []\n    this._sourceQuery = sourceQuery\n    this._destination = destination\n    this._timestamp = timestamp ?? true\n  }\n\n  protected get addresses(): Address[] {\n    return this._accounts.map((account) => account.address.toLowerCase()) as Address[]\n  }\n\n  protected get payloadSchemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  protected get previousHashBuffers(): (ArrayBuffer | null)[] {\n    return this._accounts.map((account) => account.previousHashBytes ?? null)\n  }\n\n  protected get previousHashes(): (Hash | null)[] {\n    return this._accounts.map((account) => account.previousHash ?? null)\n  }\n\n  protected get timestamp(): number {\n    return (this._timestamp = typeof this._timestamp === 'number' ? this._timestamp : Date.now())\n  }\n\n  static addressIndex<T extends BoundWitness>(payload: T, address: Address) {\n    const index = payload.addresses.indexOf(address)\n    if (index === -1) {\n      throw new Error('Invalid address')\n    }\n    return index\n  }\n\n  static async build<TBoundWitness extends BoundWitness>(options: BoundWitnessBuilderOptions<TBoundWitness>) {\n    return await new BoundWitnessBuilder(options).build()\n  }\n\n  static override async dataHashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: WithoutSchema<WithoutMeta<T>>,\n  ): Promise<WithoutMeta<T>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields ? removeEmptyFields(fields) : undefined)\n  }\n\n  static previousHash<T extends BoundWitness>(boundWitness: T, address: Address) {\n    return boundWitness.previous_hashes[this.addressIndex(boundWitness, address)]?.toLowerCase()\n  }\n\n  protected static async linkingFields<T extends BoundWitness = BoundWitness>(\n    accounts: AccountInstance[],\n    payloads?: Payload[],\n    timestamp = Date.now(),\n  ) {\n    const addresses = accounts.map((account) => hexFromArrayBuffer(account.addressBytes, { prefix: false }))\n    const previous_hashes = accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = payloads ? await PayloadBuilder.dataHashes(payloads) : []\n    const payload_schemas = payloads?.map(({ schema }) => schema)\n    return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as WithoutSchema<WithoutMeta<T>>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    stamp = true,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta = await super.metaFields(dataHash, otherMeta, stamp)\n\n    if (accounts?.length && previousHashes?.length) {\n      assertEx(accounts.length === previousHashes.length, () => 'accounts and previousHashes must have same length')\n      meta.signatures = await this.signatures(accounts, dataHash, previousHashes)\n    }\n\n    if (sourceQuery) {\n      meta.sourceQuery = sourceQuery\n    }\n\n    if (destination) {\n      meta.destination = destination\n    }\n\n    return meta\n  }\n\n  protected static signature<T extends BoundWitness>(payload: T, address: Address) {\n    return payload.$meta.signatures[this.addressIndex(payload, address)]\n  }\n\n  protected static async signatures(accounts: AccountInstance[], hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {\n    const hashBytes = toArrayBuffer(hash)\n    const previousHashesBytes = previousHashes?.map((ph) => (ph ? toUint8Array(ph) : undefined))\n    return await Promise.all(accounts.map(async (account, index) => hexFromArrayBuffer(await account.sign(hashBytes, previousHashesBytes[index]))))\n  }\n\n  private static validateLinkingFields(bw: Pick<BoundWitness, 'payload_hashes' | 'payload_schemas'>) {\n    assertEx(bw.payload_hashes?.length === bw.payload_schemas?.length, () => 'Payload hash/schema mismatch')\n    assertEx(!bw.payload_hashes.some((hash) => !hash), () => 'nulls found in hashes')\n    assertEx(!bw.payload_schemas.some((schema) => !schema), () => 'nulls found in schemas')\n  }\n\n  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness\n      const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash\n      const $meta = await this.metaFields($hash)\n\n      const ret = {\n        ...dataHashableFields,\n        $hash,\n        $meta,\n      } as WithMeta<TBoundWitness>\n      return [\n        ret,\n        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),\n        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),\n      ]\n    })\n  }\n\n  override async dataHashableFields(): Promise<WithoutMeta<TBoundWitness>> {\n    const fields = await this.linkingFields()\n    const result = await BoundWitnessBuilder.dataHashableFields<TBoundWitness>(this._schema, fields)\n\n    BoundWitnessBuilder.validateLinkingFields(result)\n\n    return result as Omit<TBoundWitness, '$meta' | '$hash'>\n  }\n\n  error(payload?: ModuleError) {\n    assertEx(this._errorHashes === undefined, () => 'Can not set errors when hashes already set')\n    if (payload) {\n      this._errors.push(assertEx(sortFields(payload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      errors.map((error) => {\n        if (error !== null) {\n          this.error(error)\n        }\n      })\n    }\n    return this\n  }\n\n  hashes(hashes: Hash[], schema: Schema[]) {\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    assertEx(this._payloadHashes === undefined, () => 'Can not set payloads when hashes already set')\n    if (payload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(payload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      payloads.map((payload) => {\n        if (payload !== null) {\n          this.payload(payload)\n        }\n      })\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase() as 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 override async metaFields(dataHash: Hash, stamp = true): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(\n      dataHash,\n      this._$meta,\n      stamp,\n      this._accounts,\n      this.previousHashes,\n      this._destination,\n      this._sourceQuery,\n    )\n  }\n\n  protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): 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 linkingFields() {\n    return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)\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 { Hash } from '@xylabs/hex'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { Payload, Query, WithMeta } from '@xyo-network/payload-model'\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 _additional?: Hash[]\n  private _query: WithMeta<TQuery> | undefined\n\n  async additional(additional: Payload[]) {\n    this._additional = await PayloadBuilder.dataHashes(additional)\n    return this\n  }\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {\n    const fields = {\n      ...(await super.dataHashableFields()),\n      query: assertEx(this._query, () => 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as Omit<TBoundWitness, '$hash' | '$meta'>\n    if (this._additional) {\n      fields.additional = this._additional\n    }\n    return fields\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","removeEmptyFields","sortFields","PayloadBuilder","PayloadBuilderBase","Mutex","BoundWitnessBuilder","PayloadBuilderBase","_accounts","_destination","_errorHashes","_errors","_payloadHashes","_payloadSchemas","_payloads","_sourceQuery","_timestamp","constructor","options","schema","BoundWitnessSchema","accounts","payloadHashes","payloadSchemas","payloads","sourceQuery","timestamp","destination","addresses","map","account","address","toLowerCase","payload","assertEx","missingSchemaMessage","previousHashBuffers","previousHashBytes","previousHashes","previousHash","Date","now","addressIndex","index","indexOf","Error","build","dataHashableFields","fields","removeEmptyFields","undefined","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","stamp","meta","length","signatures","signature","$meta","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","Promise","all","sign","validateLinkingFields","bw","some","_buildMutex","runExclusive","$hash","ret","error","result","_schema","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","Mutex","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_additional","_query","additional","PayloadBuilder","dataHashes","dataHashableFields","fields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","build","payload"]}

package/package.json

@@ -14,12 +14,12 @@
     "@xylabs/assert": "^3.3.2",
     "@xylabs/hex": "^3.3.2",
     "@xylabs/object": "^3.3.2",
-    "@xyo-network/account-model": "~2.100.1",
-    "@xyo-network/boundwitness-model": "~2.100.1",
-    "@xyo-network/hash": "~2.100.1",
-    "@xyo-network/payload": "~2.100.1",
-    "@xyo-network/payload-builder": "~2.100.1",
-    "@xyo-network/payload-model": "~2.100.1",
+    "@xyo-network/account-model": "~2.100.2",
+    "@xyo-network/boundwitness-model": "~2.100.2",
+    "@xyo-network/hash": "~2.100.2",
+    "@xyo-network/payload": "~2.100.2",
+    "@xyo-network/payload-builder": "~2.100.2",
+    "@xyo-network/payload-model": "~2.100.2",
     "async-mutex": "^0.5.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -27,7 +27,7 @@
     "@xylabs/object": "^3.3.2",
     "@xylabs/ts-scripts-yarn3": "^3.10.0",
     "@xylabs/tsconfig": "^3.10.0",
-    "@xyo-network/account": "~2.100.1",
+    "@xyo-network/account": "~2.100.2",
     "typescript": "^5.4.5"
   },
   "exports": {
@@ -68,6 +68,6 @@
   },
   "sideEffects": false,
   "types": "dist/node/index.d.ts",
-  "version": "2.100.1",
+  "version": "2.100.2",
   "type": "module"
 }

package/src/Query/QueryBoundWitnessBuilder.ts

@@ -1,7 +1,8 @@
 import { assertEx } from '@xylabs/assert'
+import { Hash } from '@xylabs/hex'
 import { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import { PayloadBuilder } from '@xyo-network/payload'
-import { Query, WithMeta } from '@xyo-network/payload-model'
+import { Payload, Query, WithMeta } from '@xyo-network/payload-model'
 
 import { BoundWitnessBuilder } from '../Builder'
 
@@ -9,14 +10,24 @@ export class QueryBoundWitnessBuilder<
   TBoundWitness extends QueryBoundWitness = QueryBoundWitness,
   TQuery extends Query = Query,
 > extends BoundWitnessBuilder<TBoundWitness> {
+  private _additional?: Hash[]
   private _query: WithMeta<TQuery> | undefined
 
+  async additional(additional: Payload[]) {
+    this._additional = await PayloadBuilder.dataHashes(additional)
+    return this
+  }
+
   override async dataHashableFields(): Promise<Omit<TBoundWitness, '$hash' | '$meta'>> {
-    return {
+    const fields = {
       ...(await super.dataHashableFields()),
       query: assertEx(this._query, () => 'No Query Specified').$hash,
       schema: QueryBoundWitnessSchema,
     } as Omit<TBoundWitness, '$hash' | '$meta'>
+    if (this._additional) {
+      fields.additional = this._additional
+    }
+    return fields
   }
 
   async query<T extends TQuery>(query: T) {