@xyo-network/boundwitness-builder 2.90.2 → 2.90.4

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts","../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["import { toArrayBuffer, toUint8Array } from '@xylabs/arraybuffer'\nimport { assertEx } from '@xylabs/assert'\nimport { 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 { sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, PayloadWrapper } from '@xyo-network/payload'\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?: string[]\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?: string[]\n  private _errorHashes?: string[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: string[]\n  private _payloadSchemas?: string[]\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())\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?: Omit<T, 'schema' | '$hash' | '$meta'>,\n  ): Promise<Omit<T, '$hash' | '$meta'>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields)\n  }\n\n  static override async hashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: Omit<T, 'schema' | '$hash' | '$meta'>,\n    $meta?: JsonObject,\n    $hash?: Hash,\n    timestamp?: number,\n  ): Promise<WithMeta<T>> {\n    return await PayloadBuilderBase.hashableFields(schema, fields, $meta, $hash, timestamp)\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 Omit<T, '$meta' | '$hash' | 'schema'>\n  }\n\n  protected static async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta: JsonObject = { ...otherMeta }\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>, TPayload[], 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 [ret, this._payloads, this._errors]\n    })\n  }\n\n  override async dataHashableFields(): Promise<Omit<TBoundWitness, '$meta' | '$hash'>> {\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  async error(payload?: ModuleError) {\n    const unwrappedPayload = await PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  async errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      await Promise.all(\n        errors.map(async (error) => {\n          if (error !== null) {\n            await this.error(error)\n          }\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  async payload(payload?: TPayload) {\n    const unwrappedPayload = await PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  async payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      await Promise.all(\n        payloads.map(async (payload) => {\n          if (payload !== null) {\n            await this.payload(payload)\n          }\n        }),\n      )\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase()\n    return this\n  }\n\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async signatures(_hash: 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 async metaFields(dataHash: Hash): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(dataHash, this._$meta, this._accounts, this.previousHashes, this._destination, this._sourceQuery)\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  override async hashableFields(): Promise<WithMeta<TBoundWitness>> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(this._query, 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as WithMeta<TBoundWitness>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    await this.payload(this._query)\n    return this\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadBuilder } from '@xyo-network/payload'\nimport { Payload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {\n  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined\n  private _query: T | undefined\n\n  static async parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>> {\n    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')\n    switch (typeof obj) {\n      case 'object': {\n        const castWrapper = obj as QueryBoundWitnessWrapper<T>\n        const wrapper =\n          castWrapper instanceof QueryBoundWitnessWrapper\n            ? castWrapper\n            : new QueryBoundWitnessWrapper<T>(\n                await PayloadBuilder.build(obj as QueryBoundWitness),\n                payloads ? await Promise.all(payloads.map((payload) => PayloadBuilder.build(payload))) : undefined,\n              )\n        /*if (!wrapper.valid) {\n          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)\n        }*/\n        return wrapper\n      }\n    }\n    throw new Error(`Unable to parse [${typeof obj}]`)\n  }\n\n  async getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]> {\n    this._payloadsWithoutQuery =\n      this._payloadsWithoutQuery ??\n      (await Promise.all(\n        compact((await PayloadBuilder.filterExclude(this.payloads, this.jsonPayload().query)).map((payload) => PayloadWrapper.wrap(payload))),\n      ))\n    return this._payloadsWithoutQuery\n  }\n\n  async getQuery(): Promise<T> {\n    const payloadMap = await this.payloadsDataHashMap()\n    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)\n    return assertEx(this._query, () => `Missing Query [${this.boundwitness}]`)\n  }\n}\n"],"mappings":"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","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","sortFields","PayloadBuilder","PayloadBuilderBase","PayloadWrapper","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","hashableFields","$meta","$hash","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","meta","length","signatures","signature","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","undefined","Promise","all","sign","validateLinkingFields","bw","some","_buildMutex","runExclusive","ret","result","_schema","error","unwrappedPayload","PayloadWrapper","unwrap","push","sortFields","errors","hashes","query","witness","witnesses","_hash","_$meta","JSON","stringify","Mutex","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","hashableFields","PayloadBuilder","build","payload","assertEx","compact","BoundWitnessWrapper","PayloadBuilder","PayloadWrapper","QueryBoundWitnessWrapper","BoundWitnessWrapper","_payloadsWithoutQuery","_query","parseQuery","obj","payloads","assertEx","Array","isArray","castWrapper","wrapper","PayloadBuilder","build","Promise","all","map","payload","undefined","Error","getPayloadsWithoutQuery","compact","filterExclude","jsonPayload","query","PayloadWrapper","wrap","getQuery","payloadMap","payloadsDataHashMap","boundwitness"]}
+{"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 { sortFields } from '@xyo-network/hash'\nimport { PayloadBuilder, PayloadBuilderBase, PayloadBuilderOptions, PayloadWrapper } from '@xyo-network/payload'\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?: string[]\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?: string[]\n  private _errorHashes?: string[]\n  private _errors: ModuleError[] = []\n  private _payloadHashes?: string[]\n  private _payloadSchemas?: string[]\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())\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?: Omit<T, 'schema' | '$hash' | '$meta'>,\n  ): Promise<Omit<T, '$hash' | '$meta'>> {\n    return await PayloadBuilderBase.dataHashableFields(schema, fields)\n  }\n\n  static override async hashableFields<T extends Payload = Payload<AnyObject>>(\n    schema: string,\n    fields?: Omit<T, 'schema' | '$hash' | '$meta'>,\n    $meta?: JsonObject,\n    $hash?: Hash,\n    timestamp?: number,\n  ): Promise<WithMeta<T>> {\n    return await PayloadBuilderBase.hashableFields(schema, fields, $meta, $hash, timestamp)\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 Omit<T, '$meta' | '$hash' | 'schema'>\n  }\n\n  protected static override async metaFields(\n    dataHash: Hash,\n    otherMeta?: JsonObject,\n    accounts?: AccountInstance[],\n    previousHashes?: (Hash | null)[],\n    destination?: Address[],\n    sourceQuery?: Hash,\n  ): Promise<JsonObject> {\n    const meta: JsonObject = { ...(await PayloadBuilderBase.metaFields(dataHash, otherMeta)) }\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<Omit<TBoundWitness, '$meta' | '$hash'>> {\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  async error(payload?: ModuleError) {\n    const unwrappedPayload = await PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  async errors(errors?: (ModuleError | null)[]) {\n    if (errors) {\n      await Promise.all(\n        errors.map(async (error) => {\n          if (error !== null) {\n            await this.error(error)\n          }\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  async payload(payload?: TPayload) {\n    const unwrappedPayload = await PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  async payloads(payloads?: (TPayload | null)[]) {\n    if (payloads)\n      await Promise.all(\n        payloads.map(async (payload) => {\n          if (payload !== null) {\n            await this.payload(payload)\n          }\n        }),\n      )\n    return this\n  }\n\n  sourceQuery(query?: Hash) {\n    this._sourceQuery = query?.toLowerCase()\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): Promise<JsonObject> {\n    return await BoundWitnessBuilder.metaFields(dataHash, this._$meta, this._accounts, this.previousHashes, this._destination, this._sourceQuery)\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  override async hashableFields(): Promise<WithMeta<TBoundWitness>> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(this._query, 'No Query Specified').$hash,\n      schema: QueryBoundWitnessSchema,\n    } as WithMeta<TBoundWitness>\n  }\n\n  async query<T extends TQuery>(query: T) {\n    this._query = await PayloadBuilder.build(query)\n    await this.payload(this._query)\n    return this\n  }\n}\n"],"mappings":"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","names":["toArrayBuffer","toUint8Array","assertEx","hexFromArrayBuffer","BoundWitnessSchema","sortFields","PayloadBuilder","PayloadBuilderBase","PayloadWrapper","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","hashableFields","$meta","$hash","boundWitness","previous_hashes","linkingFields","hexFromArrayBuffer","addressBytes","prefix","payload_hashes","PayloadBuilder","dataHashes","payload_schemas","metaFields","dataHash","otherMeta","meta","length","signatures","signature","hash","hashBytes","toArrayBuffer","previousHashesBytes","ph","toUint8Array","undefined","Promise","all","sign","validateLinkingFields","bw","some","_buildMutex","runExclusive","ret","error","result","_schema","unwrappedPayload","PayloadWrapper","unwrap","push","sortFields","errors","hashes","query","witness","witnesses","_$meta","_hash","JSON","stringify","Mutex","assertEx","QueryBoundWitnessSchema","PayloadBuilder","QueryBoundWitnessBuilder","BoundWitnessBuilder","_query","dataHashableFields","query","assertEx","$hash","schema","QueryBoundWitnessSchema","hashableFields","PayloadBuilder","build","payload"]}

package/package.json

@@ -10,28 +10,23 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/arraybuffer": "^2.14.0",
-    "@xylabs/assert": "^2.14.0",
-    "@xylabs/error": "^2.14.0",
-    "@xylabs/hex": "^2.14.0",
-    "@xylabs/lodash": "^2.14.0",
-    "@xylabs/object": "^2.89.0",
-    "@xyo-network/account-model": "~2.90.2",
-    "@xyo-network/boundwitness-model": "~2.90.2",
-    "@xyo-network/boundwitness-validator": "~2.90.2",
-    "@xyo-network/boundwitness-wrapper": "~2.90.2",
-    "@xyo-network/hash": "~2.90.2",
-    "@xyo-network/payload": "~2.90.2",
-    "@xyo-network/payload-model": "~2.90.2",
-    "@xyo-network/payload-wrapper": "~2.90.2",
+    "@xylabs/arraybuffer": "^2.14.1",
+    "@xylabs/assert": "^2.14.1",
+    "@xylabs/hex": "^2.14.1",
+    "@xylabs/object": "^2.89.1",
+    "@xyo-network/account-model": "~2.90.4",
+    "@xyo-network/boundwitness-model": "~2.90.4",
+    "@xyo-network/hash": "~2.90.4",
+    "@xyo-network/payload": "~2.90.4",
+    "@xyo-network/payload-model": "~2.90.4",
     "async-mutex": "^0.4.1"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
-    "@xylabs/object": "^2.89.0",
+    "@xylabs/object": "^2.89.1",
     "@xylabs/ts-scripts-yarn3": "^3.2.42",
     "@xylabs/tsconfig": "^3.2.42",
-    "@xyo-network/account": "~2.90.2",
+    "@xyo-network/account": "~2.90.4",
     "typescript": "^5.3.3"
   },
   "exports": {
@@ -72,6 +67,6 @@
   },
   "sideEffects": false,
   "types": "dist/node/index.d.ts",
-  "version": "2.90.2",
+  "version": "2.90.4",
   "type": "module"
 }

package/src/Builder.ts

@@ -119,7 +119,7 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitne
     return { addresses, payload_hashes, payload_schemas, previous_hashes, timestamp } as Omit<T, '$meta' | '$hash' | 'schema'>
   }
 
-  protected static async metaFields(
+  protected static override async metaFields(
     dataHash: Hash,
     otherMeta?: JsonObject,
     accounts?: AccountInstance[],
@@ -127,7 +127,7 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitne
     destination?: Address[],
     sourceQuery?: Hash,
   ): Promise<JsonObject> {
-    const meta: JsonObject = { ...otherMeta }
+    const meta: JsonObject = { ...(await PayloadBuilderBase.metaFields(dataHash, otherMeta)) }
 
     if (accounts?.length && previousHashes?.length) {
       assertEx(accounts.length === previousHashes.length, 'accounts and previousHashes must have same length')
@@ -161,7 +161,7 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitne
     assertEx(!bw.payload_schemas.some((schema) => !schema), 'nulls found in schemas')
   }
 
-  async build(): Promise<[WithMeta<TBoundWitness>, TPayload[], ModuleError[]]> {
+  async build(): Promise<[WithMeta<TBoundWitness>, WithMeta<TPayload>[], WithMeta<ModuleError>[]]> {
     return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {
       const dataHashableFields = (await this.dataHashableFields()) as TBoundWitness
       const $hash = (await PayloadBuilder.build(dataHashableFields)).$hash
@@ -172,7 +172,11 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitne
         $hash,
         $meta,
       } as WithMeta<TBoundWitness>
-      return [ret, this._payloads, this._errors]
+      return [
+        ret,
+        await Promise.all(this._payloads?.map((payload) => PayloadBuilder.build(payload))),
+        await Promise.all(this._errors?.map((error) => PayloadBuilder.build(error))),
+      ]
     })
   }
 
@@ -250,6 +254,10 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitne
     return this
   }
 
+  protected override async metaFields(dataHash: Hash): Promise<JsonObject> {
+    return await BoundWitnessBuilder.metaFields(dataHash, this._$meta, this._accounts, this.previousHashes, this._destination, this._sourceQuery)
+  }
+
   protected async signatures(_hash: Hash, previousHashes: (Hash | ArrayBuffer | null)[]): Promise<string[]> {
     const hash = toArrayBuffer(_hash)
     const previousHashesBytes = previousHashes.map((ph) => (ph ? toUint8Array(ph) : undefined))
@@ -260,10 +268,6 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness = BoundWitne
     return await BoundWitnessBuilder.linkingFields<TBoundWitness>(this._accounts, this._payloads, this.timestamp)
   }
 
-  private async metaFields(dataHash: Hash): Promise<JsonObject> {
-    return await BoundWitnessBuilder.metaFields(dataHash, this._$meta, this._accounts, this.previousHashes, this._destination, this._sourceQuery)
-  }
-
   private missingSchemaMessage(payload: Payload) {
     return `Builder: Missing Schema\n${JSON.stringify(payload, null, 2)}`
   }

package/src/Query/index.ts

@@ -1,2 +1 @@
 export * from './QueryBoundWitnessBuilder'
-export * from './QueryBoundWitnessWrapper'

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

@@ -1,11 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
-import { Query } from '@xyo-network/payload-model';
-export declare class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
-    private _query;
-    protected get expectedSchema(): string;
-    static isQueryBoundWitnessValidator(obj: unknown): boolean;
-    validate(): Promise<Error[]>;
-    validateResultSet(): Promise<Error[]>;
-}
-//# sourceMappingURL=QueryBoundWitnessValidator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,OAAO,EAAqB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGrE,qBAAa,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;IAC/G,OAAO,CAAC,MAAM,CAA+B;IAE7C,cAAuB,cAAc,IAAI,MAAM,CAE9C;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO;IAIjC,QAAQ;IAOjB,iBAAiB;CAwBxB"}

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

@@ -1,11 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
-import { Query } from '@xyo-network/payload-model';
-export declare class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
-    private _query;
-    protected get expectedSchema(): string;
-    static isQueryBoundWitnessValidator(obj: unknown): boolean;
-    validate(): Promise<Error[]>;
-    validateResultSet(): Promise<Error[]>;
-}
-//# sourceMappingURL=QueryBoundWitnessValidator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,OAAO,EAAqB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGrE,qBAAa,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;IAC/G,OAAO,CAAC,MAAM,CAA+B;IAE7C,cAAuB,cAAc,IAAI,MAAM,CAE9C;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO;IAIjC,QAAQ;IAOjB,iBAAiB;CAwBxB"}

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

@@ -1,11 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
-import { Query } from '@xyo-network/payload-model';
-export declare class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
-    private _query;
-    protected get expectedSchema(): string;
-    static isQueryBoundWitnessValidator(obj: unknown): boolean;
-    validate(): Promise<Error[]>;
-    validateResultSet(): Promise<Error[]>;
-}
-//# sourceMappingURL=QueryBoundWitnessValidator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,OAAO,EAAqB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGrE,qBAAa,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;IAC/G,OAAO,CAAC,MAAM,CAA+B;IAE7C,cAAuB,cAAc,IAAI,MAAM,CAE9C;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO;IAIjC,QAAQ;IAOjB,iBAAiB;CAwBxB"}

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

@@ -1,12 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
-import { Payload, Query } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-    private _payloadsWithoutQuery;
-    private _query;
-    static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>>;
-    getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]>;
-    getQuery(): Promise<T>;
-}
-//# sourceMappingURL=QueryBoundWitnessWrapper.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,qBAAa,wBAAwB,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC3G,OAAO,CAAC,qBAAqB,CAAuC;IACpE,OAAO,CAAC,MAAM,CAAe;WAEhB,UAAU,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAqBpH,uBAAuB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;IAS7D,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;CAK7B"}

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

@@ -1,12 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
-import { Payload, Query } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-    private _payloadsWithoutQuery;
-    private _query;
-    static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>>;
-    getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]>;
-    getQuery(): Promise<T>;
-}
-//# sourceMappingURL=QueryBoundWitnessWrapper.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,qBAAa,wBAAwB,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC3G,OAAO,CAAC,qBAAqB,CAAuC;IACpE,OAAO,CAAC,MAAM,CAAe;WAEhB,UAAU,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAqBpH,uBAAuB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;IAS7D,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;CAK7B"}

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

@@ -1,12 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
-import { Payload, Query } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-    private _payloadsWithoutQuery;
-    private _query;
-    static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>>;
-    getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]>;
-    getQuery(): Promise<T>;
-}
-//# sourceMappingURL=QueryBoundWitnessWrapper.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,qBAAa,wBAAwB,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC3G,OAAO,CAAC,qBAAqB,CAAuC;IACpE,OAAO,CAAC,MAAM,CAAe;WAEhB,UAAU,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAqBpH,uBAAuB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;IAS7D,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;CAK7B"}

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

@@ -1,11 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
-import { Query } from '@xyo-network/payload-model';
-export declare class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
-    private _query;
-    protected get expectedSchema(): string;
-    static isQueryBoundWitnessValidator(obj: unknown): boolean;
-    validate(): Promise<Error[]>;
-    validateResultSet(): Promise<Error[]>;
-}
-//# sourceMappingURL=QueryBoundWitnessValidator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,OAAO,EAAqB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGrE,qBAAa,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;IAC/G,OAAO,CAAC,MAAM,CAA+B;IAE7C,cAAuB,cAAc,IAAI,MAAM,CAE9C;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO;IAIjC,QAAQ;IAOjB,iBAAiB;CAwBxB"}

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

@@ -1,11 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
-import { Query } from '@xyo-network/payload-model';
-export declare class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
-    private _query;
-    protected get expectedSchema(): string;
-    static isQueryBoundWitnessValidator(obj: unknown): boolean;
-    validate(): Promise<Error[]>;
-    validateResultSet(): Promise<Error[]>;
-}
-//# sourceMappingURL=QueryBoundWitnessValidator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,OAAO,EAAqB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGrE,qBAAa,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;IAC/G,OAAO,CAAC,MAAM,CAA+B;IAE7C,cAAuB,cAAc,IAAI,MAAM,CAE9C;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO;IAIjC,QAAQ;IAOjB,iBAAiB;CAwBxB"}

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

@@ -1,11 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator';
-import { Query } from '@xyo-network/payload-model';
-export declare class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
-    private _query;
-    protected get expectedSchema(): string;
-    static isQueryBoundWitnessValidator(obj: unknown): boolean;
-    validate(): Promise<Error[]>;
-    validateResultSet(): Promise<Error[]>;
-}
-//# sourceMappingURL=QueryBoundWitnessValidator.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessValidator.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA2B,MAAM,iCAAiC,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAE3E,OAAO,EAAqB,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAGrE,qBAAa,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,qBAAqB,CAAC,iBAAiB,CAAC;IAC/G,OAAO,CAAC,MAAM,CAA+B;IAE7C,cAAuB,cAAc,IAAI,MAAM,CAE9C;IAED,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO;IAIjC,QAAQ;IAOjB,iBAAiB;CAwBxB"}

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

@@ -1,12 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
-import { Payload, Query } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-    private _payloadsWithoutQuery;
-    private _query;
-    static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>>;
-    getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]>;
-    getQuery(): Promise<T>;
-}
-//# sourceMappingURL=QueryBoundWitnessWrapper.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,qBAAa,wBAAwB,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC3G,OAAO,CAAC,qBAAqB,CAAuC;IACpE,OAAO,CAAC,MAAM,CAAe;WAEhB,UAAU,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAqBpH,uBAAuB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;IAS7D,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;CAK7B"}

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

@@ -1,12 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
-import { Payload, Query } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-    private _payloadsWithoutQuery;
-    private _query;
-    static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>>;
-    getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]>;
-    getQuery(): Promise<T>;
-}
-//# sourceMappingURL=QueryBoundWitnessWrapper.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,qBAAa,wBAAwB,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC3G,OAAO,CAAC,qBAAqB,CAAuC;IACpE,OAAO,CAAC,MAAM,CAAe;WAEhB,UAAU,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAqBpH,uBAAuB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;IAS7D,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;CAK7B"}

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

@@ -1,12 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model';
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
-import { Payload, Query } from '@xyo-network/payload-model';
-import { PayloadWrapper } from '@xyo-network/payload-wrapper';
-export declare class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-    private _payloadsWithoutQuery;
-    private _query;
-    static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>>;
-    getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]>;
-    getQuery(): Promise<T>;
-}
-//# sourceMappingURL=QueryBoundWitnessWrapper.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitnessWrapper.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAEvE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,qBAAa,wBAAwB,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,CAAE,SAAQ,mBAAmB,CAAC,iBAAiB,CAAC;IAC3G,OAAO,CAAC,qBAAqB,CAAuC;IACpE,OAAO,CAAC,MAAM,CAAe;WAEhB,UAAU,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;IAqBpH,uBAAuB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;IAS7D,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC;CAK7B"}

package/src/Query/QueryBoundWitnessValidator.ts

@@ -1,51 +0,0 @@
-import { assertEx } from '@xylabs/assert'
-import { handleError } from '@xylabs/error'
-import { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'
-import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { PayloadSetPayload, Query } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-
-export class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
-  private _query: PayloadWrapper<T> | undefined
-
-  protected override get expectedSchema(): string {
-    return QueryBoundWitnessSchema
-  }
-
-  static isQueryBoundWitnessValidator(obj: unknown) {
-    return (obj as QueryBoundWitnessValidator)?.constructor === QueryBoundWitnessValidator
-  }
-
-  override async validate() {
-    return [
-      ...(await super.validate()),
-      // ...this.validateResultSet()
-    ]
-  }
-
-  async validateResultSet() {
-    const errors: Error[] = []
-    try {
-      const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet')
-      const wrapper = await BoundWitnessWrapper.parse(this.obj)
-      const resultSet = await PayloadWrapper.wrap<PayloadSetPayload>((await wrapper.payloadsDataHashMap())[resultSetHash] as PayloadSetPayload)
-      const required = resultSet?.jsonPayload().required
-      if (required) {
-        for (const [key, value] of Object.entries(required)) {
-          const found = wrapper.payloadSchemas.reduce((count, schema) => {
-            return count + (schema === key ? 1 : 0)
-          }, 0)
-          if (found !== value) {
-            errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`))
-          }
-        }
-      }
-    } catch (ex) {
-      handleError(ex, (error) => {
-        errors.push(error)
-      })
-    }
-    return errors
-  }
-}

package/src/Query/QueryBoundWitnessWrapper.ts

@@ -1,48 +0,0 @@
-import { assertEx } from '@xylabs/assert'
-import { compact } from '@xylabs/lodash'
-import { QueryBoundWitness } from '@xyo-network/boundwitness-model'
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { PayloadBuilder } from '@xyo-network/payload'
-import { Payload, Query } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
-
-export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
-  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined
-  private _query: T | undefined
-
-  static async parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): Promise<QueryBoundWitnessWrapper<T>> {
-    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')
-    switch (typeof obj) {
-      case 'object': {
-        const castWrapper = obj as QueryBoundWitnessWrapper<T>
-        const wrapper =
-          castWrapper instanceof QueryBoundWitnessWrapper
-            ? castWrapper
-            : new QueryBoundWitnessWrapper<T>(
-                await PayloadBuilder.build(obj as QueryBoundWitness),
-                payloads ? await Promise.all(payloads.map((payload) => PayloadBuilder.build(payload))) : undefined,
-              )
-        /*if (!wrapper.valid) {
-          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)
-        }*/
-        return wrapper
-      }
-    }
-    throw new Error(`Unable to parse [${typeof obj}]`)
-  }
-
-  async getPayloadsWithoutQuery(): Promise<PayloadWrapper<Payload>[]> {
-    this._payloadsWithoutQuery =
-      this._payloadsWithoutQuery ??
-      (await Promise.all(
-        compact((await PayloadBuilder.filterExclude(this.payloads, this.jsonPayload().query)).map((payload) => PayloadWrapper.wrap(payload))),
-      ))
-    return this._payloadsWithoutQuery
-  }
-
-  async getQuery(): Promise<T> {
-    const payloadMap = await this.payloadsDataHashMap()
-    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)
-    return assertEx(this._query, () => `Missing Query [${this.boundwitness}]`)
-  }
-}