@xyo-network/boundwitness-builder 2.75.17 → 2.76.0

package/dist/node/index.js

@@ -22,10 +22,7 @@ var src_exports = {};
 __export(src_exports, {
   BoundWitnessBuilder: () => BoundWitnessBuilder,
   QueryBoundWitnessBuilder: () => QueryBoundWitnessBuilder,
-  QueryBoundWitnessSchema: () => QueryBoundWitnessSchema,
-  QueryBoundWitnessValidator: () => QueryBoundWitnessValidator,
-  QueryBoundWitnessWrapper: () => QueryBoundWitnessWrapper,
-  isQueryBoundWitness: () => isQueryBoundWitness
+  QueryBoundWitnessWrapper: () => QueryBoundWitnessWrapper
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -49,6 +46,7 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
   _payloadHashes;
   _payloadSchemas;
   _payloads = [];
+  _sourceQuery;
   _timestamp = Date.now();
   get _payload_schemas() {
     return this._payloadSchemas ?? this._payloads.map((payload) => {
@@ -113,6 +111,9 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     if (this.config.timestamp ?? true) {
       result.timestamp = this._timestamp;
     }
+    if (this._sourceQuery) {
+      result.sourceQuery = this._sourceQuery;
+    }
     return result;
   }
   hashes(hashes, schema) {
@@ -137,6 +138,10 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     });
     return this;
   }
+  sourceQuery(hash) {
+    this._sourceQuery = hash;
+    return this;
+  }
   witness(account) {
     var _a;
     (_a = this._accounts) == null ? void 0 : _a.push(account);
@@ -170,23 +175,18 @@ ${JSON.stringify(payload, null, 2)}`;
   }
 };
 
-// src/Query/QueryBoundWitness.ts
-var import_boundwitness_model2 = require("@xyo-network/boundwitness-model");
-var QueryBoundWitnessSchema = import_boundwitness_model2.BoundWitnessSchema;
-var isQueryBoundWitness = (x) => (0, import_boundwitness_model2.isBoundWitness)(x) && (x == null ? void 0 : x.query) !== void 0;
-
 // src/Query/QueryBoundWitnessBuilder.ts
 var import_assert2 = require("@xylabs/assert");
+var import_boundwitness_model2 = require("@xyo-network/boundwitness-model");
 var import_payload_wrapper = require("@xyo-network/payload-wrapper");
 var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   _query;
-  _resultSet;
   async hashableFields() {
     var _a;
     return {
       ...await super.hashableFields(),
       query: (0, import_assert2.assertEx)(await ((_a = this._query) == null ? void 0 : _a.hashAsync()), "No Query Specified"),
-      schema: QueryBoundWitnessSchema
+      schema: import_boundwitness_model2.QueryBoundWitnessSchema
     };
   }
   query(query) {
@@ -194,72 +194,21 @@ var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
     this.payload(this._query.payload());
     return this;
   }
-  resultSet(payloadSet) {
-    this._resultSet = import_payload_wrapper.PayloadWrapper.wrap(payloadSet);
-    this.payload(this._resultSet.payload());
-    return this;
-  }
-};
-
-// src/Query/QueryBoundWitnessValidator.ts
-var import_assert3 = require("@xylabs/assert");
-var import_boundwitness_validator = require("@xyo-network/boundwitness-validator");
-var import_boundwitness_wrapper2 = require("@xyo-network/boundwitness-wrapper");
-var import_error = require("@xyo-network/error");
-var import_payload_wrapper2 = require("@xyo-network/payload-wrapper");
-var QueryBoundWitnessValidator = class _QueryBoundWitnessValidator extends import_boundwitness_validator.BoundWitnessValidator {
-  _query;
-  get expectedSchema() {
-    return QueryBoundWitnessSchema;
-  }
-  static isQueryBoundWitnessValidator(obj) {
-    return (obj == null ? void 0 : obj.constructor) === _QueryBoundWitnessValidator;
-  }
-  async validate() {
-    return [
-      ...await super.validate()
-      // ...this.validateResultSet()
-    ];
-  }
-  async validateResultSet() {
-    const errors = [];
-    try {
-      const resultSetHash = (0, import_assert3.assertEx)(this.obj.resultSet, "Missing ResultSet");
-      const wrapper = import_boundwitness_wrapper2.BoundWitnessWrapper.parse(this.obj);
-      const resultSet = import_payload_wrapper2.PayloadWrapper.wrap((await wrapper.payloadMap())[resultSetHash]);
-      const required = resultSet == null ? void 0 : resultSet.payload().required;
-      if (required) {
-        Object.entries(required).forEach(([key, value]) => {
-          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) {
-      (0, import_error.handleError)(ex, (error) => {
-        errors.push(error);
-      });
-    }
-    return errors;
-  }
 };
 
 // src/Query/QueryBoundWitnessWrapper.ts
-var import_assert4 = require("@xylabs/assert");
+var import_assert3 = require("@xylabs/assert");
 var import_lodash = require("@xylabs/lodash");
-var import_boundwitness_wrapper3 = require("@xyo-network/boundwitness-wrapper");
+var import_boundwitness_wrapper2 = require("@xyo-network/boundwitness-wrapper");
 var import_core2 = require("@xyo-network/core");
-var import_payload_wrapper3 = require("@xyo-network/payload-wrapper");
-var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends import_boundwitness_wrapper3.BoundWitnessWrapper {
+var import_payload_wrapper2 = require("@xyo-network/payload-wrapper");
+var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends import_boundwitness_wrapper2.BoundWitnessWrapper {
   _payloadsWithoutQuery;
   _query;
   _resultSet;
   isQueryBoundWitnessWrapper = true;
   static parseQuery(obj, payloads) {
-    (0, import_assert4.assertEx)(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
+    (0, import_assert3.assertEx)(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
     switch (typeof obj) {
       case "object": {
         const castWrapper = obj;
@@ -269,28 +218,17 @@ var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends import_bo
     }
     throw Error(`Unable to parse [${typeof obj}]`);
   }
-  getErrors() {
-    return new QueryBoundWitnessValidator(this.boundwitness).validate();
-  }
   async getQuery() {
     const payloadMap = await this.allPayloadMap();
     this._query = this._query ?? payloadMap[this.boundwitness.query];
-    return (0, import_assert4.assertEx)(this._query, `Missing Query [${this.boundwitness}]`);
-  }
-  async getResultSet() {
-    const resultSetHash = this.boundwitness.resultSet;
-    const payloadMap = await this.payloadMap();
-    return (0, import_assert4.assertEx)(
-      this._resultSet = this._resultSet ?? (resultSetHash ? payloadMap[resultSetHash] : void 0),
-      `Missing resultSet [${resultSetHash}]`
-    );
+    return (0, import_assert3.assertEx)(this._query, `Missing Query [${this.boundwitness}]`);
   }
   async getWrappedPayloads() {
     this._payloadsWithoutQuery = this._payloadsWithoutQuery ?? (0, import_lodash.compact)(
       (await import_core2.PayloadHasher.filterExclude(
         (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),
         this.payload().query
-      )).map((payload) => import_payload_wrapper3.PayloadWrapper.wrap(payload))
+      )).map((payload) => import_payload_wrapper2.PayloadWrapper.wrap(payload))
     );
     return this._payloadsWithoutQuery;
   }
@@ -299,9 +237,6 @@ var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends import_bo
 0 && (module.exports = {
   BoundWitnessBuilder,
   QueryBoundWitnessBuilder,
-  QueryBoundWitnessSchema,
-  QueryBoundWitnessValidator,
-  QueryBoundWitnessWrapper,
-  isQueryBoundWitness
+  QueryBoundWitnessWrapper
 });
 //# sourceMappingURL=index.js.map

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitness.ts","../../src/Query/QueryBoundWitnessBuilder.ts","../../src/Query/QueryBoundWitnessValidator.ts","../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { assertEx } from '@xylabs/assert'\nimport { Buffer } from '@xylabs/buffer'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Data, PayloadHasher, sortFields } from '@xyo-network/core'\nimport { PayloadWrapper } from '@xyo-network/payload'\nimport { ModuleError, Payload } from '@xyo-network/payload-model'\nimport { Logger } from '@xyo-network/shared'\nimport { Mutex } from 'async-mutex'\n\nexport interface BoundWitnessBuilderConfig {\n  /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */\n  readonly inlinePayloads?: boolean\n  readonly meta?: boolean\n  readonly timestamp?: boolean\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: string }> = BoundWitness, TPayload extends Payload = Payload> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[] = []\n  private _errorHashes: string[] | undefined\n  private _errors: ModuleError[] = []\n  private _payloadHashes: string[] | undefined\n  private _payloadSchemas: string[] | undefined\n  private _payloads: TPayload[] = []\n  private _timestamp = Date.now()\n\n  constructor(\n    readonly config: BoundWitnessBuilderConfig = { inlinePayloads: false },\n    protected readonly logger?: Logger,\n  ) {}\n\n  private get _payload_schemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  async build(meta = false): Promise<[TBoundWitness, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const hashableFields = await this.hashableFields()\n      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields)\n\n      /* get all the previousHashes to verify atomic signing */\n      const previousHashes = this._accounts.map((account) => account.previousHash)\n\n      const ret: TBoundWitness = {\n        ...hashableFields,\n        _signatures: await this.signatures(_hash, previousHashes),\n      }\n      if (meta ?? this.config?.meta) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const bwWithMeta = ret as any\n        bwWithMeta._client = 'js'\n        bwWithMeta._hash = _hash\n        bwWithMeta._timestamp = this._timestamp\n      }\n      if (this.config.inlinePayloads) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const anyRet = ret as any\n        //leaving this in here to prevent breaking code (for now)\n        anyRet._payloads = this.inlinePayloads()\n      }\n      return [ret, this._payloads, this._errors]\n    })\n  }\n\n  error(payload?: ModuleError) {\n    const unwrappedPayload = PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    errors?.forEach((error) => {\n      if (error !== null) {\n        this.error(error)\n      }\n    })\n    return this\n  }\n\n  async hashableFields(): Promise<TBoundWitness> {\n    const addresses = this._accounts.map((account) => account.address)\n    const previous_hashes = this._accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = assertEx(await this.getPayloadHashes(), 'Missing payload_hashes')\n    const payload_schemas = assertEx(this._payload_schemas, 'Missing payload_schemas')\n    const result: TBoundWitness = {\n      addresses: assertEx(addresses, 'Missing addresses'),\n      payload_hashes,\n      payload_schemas,\n      previous_hashes,\n      schema: BoundWitnessSchema,\n    } as TBoundWitness\n\n    assertEx(result.payload_hashes?.length === result.payload_schemas?.length, 'Payload hash/schema mismatch')\n\n    assertEx(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), 'nulls found in hashes')\n\n    assertEx(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), 'nulls found in schemas')\n\n    if (this.config.timestamp ?? true) {\n      result.timestamp = this._timestamp\n    }\n\n    return result\n  }\n\n  hashes(hashes: string[], schema: string[]) {\n    assertEx(this.payloads.length === 0, 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    const unwrappedPayload = PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    payloads?.forEach((payload) => {\n      if (payload !== null) {\n        this.payload(payload)\n      }\n    })\n    return this\n  }\n\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async signatures(_hash: string, previousHashes: (string | Data | undefined)[]) {\n    const hash = Buffer.from(_hash, 'hex')\n    return await Promise.all(\n      this._accounts.map(async (account, index) => Buffer.from(await account.sign(hash, previousHashes[index])).toString('hex')),\n    )\n  }\n\n  private async getPayloadHashes(): Promise<string[]> {\n    return this._payloadHashes ?? (await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload))))\n  }\n\n  private inlinePayloads() {\n    return this._payloads.map<TPayload>((payload, index) => {\n      return {\n        ...payload,\n        schema: this._payload_schemas[index],\n      }\n    })\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type QueryBoundWitnessSchema = BoundWitnessSchema\nexport const QueryBoundWitnessSchema: QueryBoundWitnessSchema = BoundWitnessSchema\n\nexport type QueryBoundWitness = BoundWitness<{\n  query: string\n  resultSet?: string\n  schema: BoundWitnessSchema\n}>\n\nexport const isQueryBoundWitness = (x?: Payload | null): x is QueryBoundWitness => isBoundWitness(x) && (x as QueryBoundWitness)?.query !== undefined\n","import { assertEx } from '@xylabs/assert'\nimport { PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { BoundWitnessBuilder } from '../Builder'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: PayloadWrapper<TQuery> | undefined\n  private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined\n\n  override async hashableFields(): Promise<TBoundWitness> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),\n      schema: QueryBoundWitnessSchema,\n    }\n  }\n\n  query<T extends TQuery>(query: T) {\n    this._query = PayloadWrapper.wrap(query)\n    this.payload(this._query.payload())\n    return this\n  }\n\n  resultSet<T extends PayloadSetPayload>(payloadSet: T) {\n    this._resultSet = PayloadWrapper.wrap(payloadSet)\n    this.payload(this._resultSet.payload())\n    return this\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { handleError } from '@xyo-network/error'\nimport { PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'\nexport class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {\n  private _query: PayloadWrapper<T> | undefined\n\n  protected override get expectedSchema(): string {\n    return QueryBoundWitnessSchema\n  }\n\n  static isQueryBoundWitnessValidator(obj: unknown) {\n    return (obj as QueryBoundWitnessValidator)?.constructor === QueryBoundWitnessValidator\n  }\n\n  override async validate() {\n    return [\n      ...(await super.validate()),\n      // ...this.validateResultSet()\n    ]\n  }\n\n  async validateResultSet() {\n    const errors: Error[] = []\n    try {\n      const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet')\n      const wrapper = BoundWitnessWrapper.parse(this.obj)\n      const resultSet = PayloadWrapper.wrap<PayloadSetPayload>((await wrapper.payloadMap())[resultSetHash] as PayloadSetPayload)\n      const required = resultSet?.payload().required\n      if (required) {\n        Object.entries(required).forEach(([key, value]) => {\n          const found = wrapper.payloadSchemas.reduce((count, schema) => {\n            return count + (schema === key ? 1 : 0)\n          }, 0)\n          if (found !== value) {\n            errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`))\n          }\n        })\n      }\n    } catch (ex) {\n      handleError(ex, (error) => {\n        errors.push(error)\n      })\n    }\n    return errors\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { Payload, PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { QueryBoundWitness } from './QueryBoundWitness'\nimport { QueryBoundWitnessValidator } from './QueryBoundWitnessValidator'\n\nexport class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {\n  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined\n  private _query: T | undefined\n  private _resultSet: PayloadSetPayload | undefined\n\n  private isQueryBoundWitnessWrapper = true\n\n  static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {\n    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')\n    switch (typeof obj) {\n      case 'object': {\n        const castWrapper = obj as QueryBoundWitnessWrapper<T>\n        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)\n        /*if (!wrapper.valid) {\n          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)\n        }*/\n        return wrapper\n      }\n    }\n    throw Error(`Unable to parse [${typeof obj}]`)\n  }\n\n  override getErrors() {\n    return new QueryBoundWitnessValidator(this.boundwitness).validate()\n  }\n\n  async getQuery(): Promise<T> {\n    const payloadMap = await this.allPayloadMap()\n    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)\n    return assertEx(this._query, `Missing Query [${this.boundwitness}]`)\n  }\n\n  async getResultSet() {\n    const resultSetHash = this.boundwitness.resultSet\n    const payloadMap = await this.payloadMap()\n    return assertEx(\n      (this._resultSet = this._resultSet ?? (resultSetHash ? (payloadMap[resultSetHash] as PayloadSetPayload | undefined) : undefined)),\n      `Missing resultSet [${resultSetHash}]`,\n    )\n  }\n\n  override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {\n    this._payloadsWithoutQuery =\n      this._payloadsWithoutQuery ??\n      compact(\n        (\n          await PayloadHasher.filterExclude(\n            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),\n            this.payload().query,\n          )\n        ).map((payload) => PayloadWrapper.wrap(payload)),\n      )\n    return this._payloadsWithoutQuery\n  }\n}\n"],"mappings":"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","names":["import_boundwitness_model","import_assert","import_assert","import_boundwitness_wrapper","import_payload_wrapper","import_assert","import_boundwitness_wrapper","import_core","import_payload_wrapper"]}
+{"version":3,"sources":["../../src/index.ts","../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts","../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["export * from './Builder'\nexport * from './Query'\n","import { assertEx } from '@xylabs/assert'\nimport { Buffer } from '@xylabs/buffer'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Data, PayloadHasher, sortFields } from '@xyo-network/core'\nimport { PayloadWrapper } from '@xyo-network/payload'\nimport { ModuleError, Payload } from '@xyo-network/payload-model'\nimport { Logger } from '@xyo-network/shared'\nimport { Mutex } from 'async-mutex'\n\nexport interface BoundWitnessBuilderConfig {\n  /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */\n  readonly inlinePayloads?: boolean\n  readonly meta?: boolean\n  readonly timestamp?: boolean\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: string }> = BoundWitness, TPayload extends Payload = Payload> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[] = []\n  private _errorHashes: string[] | undefined\n  private _errors: ModuleError[] = []\n  private _payloadHashes: string[] | undefined\n  private _payloadSchemas: string[] | undefined\n  private _payloads: TPayload[] = []\n  private _sourceQuery: string | undefined\n  private _timestamp = Date.now()\n\n  constructor(\n    readonly config: BoundWitnessBuilderConfig = { inlinePayloads: false },\n    protected readonly logger?: Logger,\n  ) {}\n\n  private get _payload_schemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  async build(meta = false): Promise<[TBoundWitness, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const hashableFields = await this.hashableFields()\n      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields)\n\n      /* get all the previousHashes to verify atomic signing */\n      const previousHashes = this._accounts.map((account) => account.previousHash)\n\n      const ret: TBoundWitness = {\n        ...hashableFields,\n        _signatures: await this.signatures(_hash, previousHashes),\n      }\n      if (meta ?? this.config?.meta) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const bwWithMeta = ret as any\n        bwWithMeta._client = 'js'\n        bwWithMeta._hash = _hash\n        bwWithMeta._timestamp = this._timestamp\n      }\n      if (this.config.inlinePayloads) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const anyRet = ret as any\n        //leaving this in here to prevent breaking code (for now)\n        anyRet._payloads = this.inlinePayloads()\n      }\n      return [ret, this._payloads, this._errors]\n    })\n  }\n\n  error(payload?: ModuleError) {\n    const unwrappedPayload = PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    errors?.forEach((error) => {\n      if (error !== null) {\n        this.error(error)\n      }\n    })\n    return this\n  }\n\n  async hashableFields(): Promise<TBoundWitness> {\n    const addresses = this._accounts.map((account) => account.address)\n    const previous_hashes = this._accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = assertEx(await this.getPayloadHashes(), 'Missing payload_hashes')\n    const payload_schemas = assertEx(this._payload_schemas, 'Missing payload_schemas')\n    const result: TBoundWitness = {\n      addresses: assertEx(addresses, 'Missing addresses'),\n      payload_hashes,\n      payload_schemas,\n      previous_hashes,\n      schema: BoundWitnessSchema,\n    } as TBoundWitness\n\n    assertEx(result.payload_hashes?.length === result.payload_schemas?.length, 'Payload hash/schema mismatch')\n\n    assertEx(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), 'nulls found in hashes')\n\n    assertEx(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), 'nulls found in schemas')\n\n    if (this.config.timestamp ?? true) {\n      result.timestamp = this._timestamp\n    }\n\n    if (this._sourceQuery) {\n      result.sourceQuery = this._sourceQuery\n    }\n\n    return result\n  }\n\n  hashes(hashes: string[], schema: string[]) {\n    assertEx(this.payloads.length === 0, 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    const unwrappedPayload = PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    payloads?.forEach((payload) => {\n      if (payload !== null) {\n        this.payload(payload)\n      }\n    })\n    return this\n  }\n\n  sourceQuery(hash?: string) {\n    this._sourceQuery = hash\n    return this\n  }\n\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async signatures(_hash: string, previousHashes: (string | Data | undefined)[]) {\n    const hash = Buffer.from(_hash, 'hex')\n    return await Promise.all(\n      this._accounts.map(async (account, index) => Buffer.from(await account.sign(hash, previousHashes[index])).toString('hex')),\n    )\n  }\n\n  private async getPayloadHashes(): Promise<string[]> {\n    return this._payloadHashes ?? (await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload))))\n  }\n\n  private inlinePayloads() {\n    return this._payloads.map<TPayload>((payload, index) => {\n      return {\n        ...payload,\n        schema: this._payload_schemas[index],\n      }\n    })\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { BoundWitnessBuilder } from '../Builder'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: PayloadWrapper<TQuery> | undefined\n\n  override async hashableFields(): Promise<TBoundWitness> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),\n      schema: QueryBoundWitnessSchema,\n    }\n  }\n\n  query<T extends TQuery>(query: T) {\n    this._query = PayloadWrapper.wrap(query)\n    this.payload(this._query.payload())\n    return this\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { Payload, PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {\n  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined\n  private _query: T | undefined\n  private _resultSet: PayloadSetPayload | undefined\n\n  private isQueryBoundWitnessWrapper = true\n\n  static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {\n    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')\n    switch (typeof obj) {\n      case 'object': {\n        const castWrapper = obj as QueryBoundWitnessWrapper<T>\n        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)\n        /*if (!wrapper.valid) {\n          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)\n        }*/\n        return wrapper\n      }\n    }\n    throw Error(`Unable to parse [${typeof obj}]`)\n  }\n\n  async getQuery(): Promise<T> {\n    const payloadMap = await this.allPayloadMap()\n    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)\n    return assertEx(this._query, `Missing Query [${this.boundwitness}]`)\n  }\n\n  override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {\n    this._payloadsWithoutQuery =\n      this._payloadsWithoutQuery ??\n      compact(\n        (\n          await PayloadHasher.filterExclude(\n            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),\n            this.payload().query,\n          )\n        ).map((payload) => PayloadWrapper.wrap(payload)),\n      )\n    return this._payloadsWithoutQuery\n  }\n}\n"],"mappings":"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","names":["import_assert","import_boundwitness_model","import_assert","import_boundwitness_wrapper","import_core","import_payload_wrapper"]}

package/dist/node/index.mjs

@@ -18,6 +18,7 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
   _payloadHashes;
   _payloadSchemas;
   _payloads = [];
+  _sourceQuery;
   _timestamp = Date.now();
   get _payload_schemas() {
     return this._payloadSchemas ?? this._payloads.map((payload) => {
@@ -82,6 +83,9 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     if (this.config.timestamp ?? true) {
       result.timestamp = this._timestamp;
     }
+    if (this._sourceQuery) {
+      result.sourceQuery = this._sourceQuery;
+    }
     return result;
   }
   hashes(hashes, schema) {
@@ -106,6 +110,10 @@ var BoundWitnessBuilder = class _BoundWitnessBuilder {
     });
     return this;
   }
+  sourceQuery(hash) {
+    this._sourceQuery = hash;
+    return this;
+  }
   witness(account) {
     var _a;
     (_a = this._accounts) == null ? void 0 : _a.push(account);
@@ -139,17 +147,12 @@ ${JSON.stringify(payload, null, 2)}`;
   }
 };
 
-// src/Query/QueryBoundWitness.ts
-import { BoundWitnessSchema as BoundWitnessSchema2, isBoundWitness } from "@xyo-network/boundwitness-model";
-var QueryBoundWitnessSchema = BoundWitnessSchema2;
-var isQueryBoundWitness = (x) => isBoundWitness(x) && (x == null ? void 0 : x.query) !== void 0;
-
 // src/Query/QueryBoundWitnessBuilder.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
+import { QueryBoundWitnessSchema } from "@xyo-network/boundwitness-model";
 import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
 var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   _query;
-  _resultSet;
   async hashableFields() {
     var _a;
     return {
@@ -163,72 +166,21 @@ var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
     this.payload(this._query.payload());
     return this;
   }
-  resultSet(payloadSet) {
-    this._resultSet = PayloadWrapper2.wrap(payloadSet);
-    this.payload(this._resultSet.payload());
-    return this;
-  }
-};
-
-// src/Query/QueryBoundWitnessValidator.ts
-import { assertEx as assertEx3 } from "@xylabs/assert";
-import { BoundWitnessValidator } from "@xyo-network/boundwitness-validator";
-import { BoundWitnessWrapper as BoundWitnessWrapper2 } from "@xyo-network/boundwitness-wrapper";
-import { handleError } from "@xyo-network/error";
-import { PayloadWrapper as PayloadWrapper3 } from "@xyo-network/payload-wrapper";
-var QueryBoundWitnessValidator = class _QueryBoundWitnessValidator extends BoundWitnessValidator {
-  _query;
-  get expectedSchema() {
-    return QueryBoundWitnessSchema;
-  }
-  static isQueryBoundWitnessValidator(obj) {
-    return (obj == null ? void 0 : obj.constructor) === _QueryBoundWitnessValidator;
-  }
-  async validate() {
-    return [
-      ...await super.validate()
-      // ...this.validateResultSet()
-    ];
-  }
-  async validateResultSet() {
-    const errors = [];
-    try {
-      const resultSetHash = assertEx3(this.obj.resultSet, "Missing ResultSet");
-      const wrapper = BoundWitnessWrapper2.parse(this.obj);
-      const resultSet = PayloadWrapper3.wrap((await wrapper.payloadMap())[resultSetHash]);
-      const required = resultSet == null ? void 0 : resultSet.payload().required;
-      if (required) {
-        Object.entries(required).forEach(([key, value]) => {
-          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;
-  }
 };
 
 // src/Query/QueryBoundWitnessWrapper.ts
-import { assertEx as assertEx4 } from "@xylabs/assert";
+import { assertEx as assertEx3 } from "@xylabs/assert";
 import { compact } from "@xylabs/lodash";
-import { BoundWitnessWrapper as BoundWitnessWrapper3 } from "@xyo-network/boundwitness-wrapper";
+import { BoundWitnessWrapper as BoundWitnessWrapper2 } from "@xyo-network/boundwitness-wrapper";
 import { PayloadHasher as PayloadHasher2 } from "@xyo-network/core";
-import { PayloadWrapper as PayloadWrapper4 } from "@xyo-network/payload-wrapper";
-var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends BoundWitnessWrapper3 {
+import { PayloadWrapper as PayloadWrapper3 } from "@xyo-network/payload-wrapper";
+var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends BoundWitnessWrapper2 {
   _payloadsWithoutQuery;
   _query;
   _resultSet;
   isQueryBoundWitnessWrapper = true;
   static parseQuery(obj, payloads) {
-    assertEx4(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
+    assertEx3(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
     switch (typeof obj) {
       case "object": {
         const castWrapper = obj;
@@ -238,28 +190,17 @@ var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends BoundWitn
     }
     throw Error(`Unable to parse [${typeof obj}]`);
   }
-  getErrors() {
-    return new QueryBoundWitnessValidator(this.boundwitness).validate();
-  }
   async getQuery() {
     const payloadMap = await this.allPayloadMap();
     this._query = this._query ?? payloadMap[this.boundwitness.query];
-    return assertEx4(this._query, `Missing Query [${this.boundwitness}]`);
-  }
-  async getResultSet() {
-    const resultSetHash = this.boundwitness.resultSet;
-    const payloadMap = await this.payloadMap();
-    return assertEx4(
-      this._resultSet = this._resultSet ?? (resultSetHash ? payloadMap[resultSetHash] : void 0),
-      `Missing resultSet [${resultSetHash}]`
-    );
+    return assertEx3(this._query, `Missing Query [${this.boundwitness}]`);
   }
   async getWrappedPayloads() {
     this._payloadsWithoutQuery = this._payloadsWithoutQuery ?? compact(
       (await PayloadHasher2.filterExclude(
         (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),
         this.payload().query
-      )).map((payload) => PayloadWrapper4.wrap(payload))
+      )).map((payload) => PayloadWrapper3.wrap(payload))
     );
     return this._payloadsWithoutQuery;
   }
@@ -267,9 +208,6 @@ var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends BoundWitn
 export {
   BoundWitnessBuilder,
   QueryBoundWitnessBuilder,
-  QueryBoundWitnessSchema,
-  QueryBoundWitnessValidator,
-  QueryBoundWitnessWrapper,
-  isQueryBoundWitness
+  QueryBoundWitnessWrapper
 };
 //# sourceMappingURL=index.mjs.map

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitness.ts","../../src/Query/QueryBoundWitnessBuilder.ts","../../src/Query/QueryBoundWitnessValidator.ts","../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Buffer } from '@xylabs/buffer'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Data, PayloadHasher, sortFields } from '@xyo-network/core'\nimport { PayloadWrapper } from '@xyo-network/payload'\nimport { ModuleError, Payload } from '@xyo-network/payload-model'\nimport { Logger } from '@xyo-network/shared'\nimport { Mutex } from 'async-mutex'\n\nexport interface BoundWitnessBuilderConfig {\n  /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */\n  readonly inlinePayloads?: boolean\n  readonly meta?: boolean\n  readonly timestamp?: boolean\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: string }> = BoundWitness, TPayload extends Payload = Payload> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[] = []\n  private _errorHashes: string[] | undefined\n  private _errors: ModuleError[] = []\n  private _payloadHashes: string[] | undefined\n  private _payloadSchemas: string[] | undefined\n  private _payloads: TPayload[] = []\n  private _timestamp = Date.now()\n\n  constructor(\n    readonly config: BoundWitnessBuilderConfig = { inlinePayloads: false },\n    protected readonly logger?: Logger,\n  ) {}\n\n  private get _payload_schemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  async build(meta = false): Promise<[TBoundWitness, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const hashableFields = await this.hashableFields()\n      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields)\n\n      /* get all the previousHashes to verify atomic signing */\n      const previousHashes = this._accounts.map((account) => account.previousHash)\n\n      const ret: TBoundWitness = {\n        ...hashableFields,\n        _signatures: await this.signatures(_hash, previousHashes),\n      }\n      if (meta ?? this.config?.meta) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const bwWithMeta = ret as any\n        bwWithMeta._client = 'js'\n        bwWithMeta._hash = _hash\n        bwWithMeta._timestamp = this._timestamp\n      }\n      if (this.config.inlinePayloads) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const anyRet = ret as any\n        //leaving this in here to prevent breaking code (for now)\n        anyRet._payloads = this.inlinePayloads()\n      }\n      return [ret, this._payloads, this._errors]\n    })\n  }\n\n  error(payload?: ModuleError) {\n    const unwrappedPayload = PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    errors?.forEach((error) => {\n      if (error !== null) {\n        this.error(error)\n      }\n    })\n    return this\n  }\n\n  async hashableFields(): Promise<TBoundWitness> {\n    const addresses = this._accounts.map((account) => account.address)\n    const previous_hashes = this._accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = assertEx(await this.getPayloadHashes(), 'Missing payload_hashes')\n    const payload_schemas = assertEx(this._payload_schemas, 'Missing payload_schemas')\n    const result: TBoundWitness = {\n      addresses: assertEx(addresses, 'Missing addresses'),\n      payload_hashes,\n      payload_schemas,\n      previous_hashes,\n      schema: BoundWitnessSchema,\n    } as TBoundWitness\n\n    assertEx(result.payload_hashes?.length === result.payload_schemas?.length, 'Payload hash/schema mismatch')\n\n    assertEx(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), 'nulls found in hashes')\n\n    assertEx(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), 'nulls found in schemas')\n\n    if (this.config.timestamp ?? true) {\n      result.timestamp = this._timestamp\n    }\n\n    return result\n  }\n\n  hashes(hashes: string[], schema: string[]) {\n    assertEx(this.payloads.length === 0, 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    const unwrappedPayload = PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    payloads?.forEach((payload) => {\n      if (payload !== null) {\n        this.payload(payload)\n      }\n    })\n    return this\n  }\n\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async signatures(_hash: string, previousHashes: (string | Data | undefined)[]) {\n    const hash = Buffer.from(_hash, 'hex')\n    return await Promise.all(\n      this._accounts.map(async (account, index) => Buffer.from(await account.sign(hash, previousHashes[index])).toString('hex')),\n    )\n  }\n\n  private async getPayloadHashes(): Promise<string[]> {\n    return this._payloadHashes ?? (await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload))))\n  }\n\n  private inlinePayloads() {\n    return this._payloads.map<TPayload>((payload, index) => {\n      return {\n        ...payload,\n        schema: this._payload_schemas[index],\n      }\n    })\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport type QueryBoundWitnessSchema = BoundWitnessSchema\nexport const QueryBoundWitnessSchema: QueryBoundWitnessSchema = BoundWitnessSchema\n\nexport type QueryBoundWitness = BoundWitness<{\n  query: string\n  resultSet?: string\n  schema: BoundWitnessSchema\n}>\n\nexport const isQueryBoundWitness = (x?: Payload | null): x is QueryBoundWitness => isBoundWitness(x) && (x as QueryBoundWitness)?.query !== undefined\n","import { assertEx } from '@xylabs/assert'\nimport { PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { BoundWitnessBuilder } from '../Builder'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: PayloadWrapper<TQuery> | undefined\n  private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined\n\n  override async hashableFields(): Promise<TBoundWitness> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),\n      schema: QueryBoundWitnessSchema,\n    }\n  }\n\n  query<T extends TQuery>(query: T) {\n    this._query = PayloadWrapper.wrap(query)\n    this.payload(this._query.payload())\n    return this\n  }\n\n  resultSet<T extends PayloadSetPayload>(payloadSet: T) {\n    this._resultSet = PayloadWrapper.wrap(payloadSet)\n    this.payload(this._resultSet.payload())\n    return this\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { handleError } from '@xyo-network/error'\nimport { PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'\nexport class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {\n  private _query: PayloadWrapper<T> | undefined\n\n  protected override get expectedSchema(): string {\n    return QueryBoundWitnessSchema\n  }\n\n  static isQueryBoundWitnessValidator(obj: unknown) {\n    return (obj as QueryBoundWitnessValidator)?.constructor === QueryBoundWitnessValidator\n  }\n\n  override async validate() {\n    return [\n      ...(await super.validate()),\n      // ...this.validateResultSet()\n    ]\n  }\n\n  async validateResultSet() {\n    const errors: Error[] = []\n    try {\n      const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet')\n      const wrapper = BoundWitnessWrapper.parse(this.obj)\n      const resultSet = PayloadWrapper.wrap<PayloadSetPayload>((await wrapper.payloadMap())[resultSetHash] as PayloadSetPayload)\n      const required = resultSet?.payload().required\n      if (required) {\n        Object.entries(required).forEach(([key, value]) => {\n          const found = wrapper.payloadSchemas.reduce((count, schema) => {\n            return count + (schema === key ? 1 : 0)\n          }, 0)\n          if (found !== value) {\n            errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`))\n          }\n        })\n      }\n    } catch (ex) {\n      handleError(ex, (error) => {\n        errors.push(error)\n      })\n    }\n    return errors\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { Payload, PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { QueryBoundWitness } from './QueryBoundWitness'\nimport { QueryBoundWitnessValidator } from './QueryBoundWitnessValidator'\n\nexport class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {\n  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined\n  private _query: T | undefined\n  private _resultSet: PayloadSetPayload | undefined\n\n  private isQueryBoundWitnessWrapper = true\n\n  static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {\n    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')\n    switch (typeof obj) {\n      case 'object': {\n        const castWrapper = obj as QueryBoundWitnessWrapper<T>\n        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)\n        /*if (!wrapper.valid) {\n          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)\n        }*/\n        return wrapper\n      }\n    }\n    throw Error(`Unable to parse [${typeof obj}]`)\n  }\n\n  override getErrors() {\n    return new QueryBoundWitnessValidator(this.boundwitness).validate()\n  }\n\n  async getQuery(): Promise<T> {\n    const payloadMap = await this.allPayloadMap()\n    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)\n    return assertEx(this._query, `Missing Query [${this.boundwitness}]`)\n  }\n\n  async getResultSet() {\n    const resultSetHash = this.boundwitness.resultSet\n    const payloadMap = await this.payloadMap()\n    return assertEx(\n      (this._resultSet = this._resultSet ?? (resultSetHash ? (payloadMap[resultSetHash] as PayloadSetPayload | undefined) : undefined)),\n      `Missing resultSet [${resultSetHash}]`,\n    )\n  }\n\n  override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {\n    this._payloadsWithoutQuery =\n      this._payloadsWithoutQuery ??\n      compact(\n        (\n          await PayloadHasher.filterExclude(\n            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),\n            this.payload().query,\n          )\n        ).map((payload) => PayloadWrapper.wrap(payload)),\n      )\n    return this._payloadsWithoutQuery\n  }\n}\n"],"mappings":"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","names":["BoundWitnessSchema","assertEx","PayloadWrapper","assertEx","PayloadWrapper","assertEx","BoundWitnessWrapper","PayloadWrapper","assertEx","BoundWitnessWrapper","PayloadWrapper","assertEx","BoundWitnessWrapper","PayloadHasher","PayloadWrapper","BoundWitnessWrapper","assertEx","PayloadHasher","PayloadWrapper"]}
+{"version":3,"sources":["../../src/Builder.ts","../../src/Query/QueryBoundWitnessBuilder.ts","../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Buffer } from '@xylabs/buffer'\nimport { AccountInstance } from '@xyo-network/account-model'\nimport { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { Data, PayloadHasher, sortFields } from '@xyo-network/core'\nimport { PayloadWrapper } from '@xyo-network/payload'\nimport { ModuleError, Payload } from '@xyo-network/payload-model'\nimport { Logger } from '@xyo-network/shared'\nimport { Mutex } from 'async-mutex'\n\nexport interface BoundWitnessBuilderConfig {\n  /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */\n  readonly inlinePayloads?: boolean\n  readonly meta?: boolean\n  readonly timestamp?: boolean\n}\n\nexport class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: string }> = BoundWitness, TPayload extends Payload = Payload> {\n  private static readonly _buildMutex = new Mutex()\n  private _accounts: AccountInstance[] = []\n  private _errorHashes: string[] | undefined\n  private _errors: ModuleError[] = []\n  private _payloadHashes: string[] | undefined\n  private _payloadSchemas: string[] | undefined\n  private _payloads: TPayload[] = []\n  private _sourceQuery: string | undefined\n  private _timestamp = Date.now()\n\n  constructor(\n    readonly config: BoundWitnessBuilderConfig = { inlinePayloads: false },\n    protected readonly logger?: Logger,\n  ) {}\n\n  private get _payload_schemas(): string[] {\n    return (\n      this._payloadSchemas ??\n      this._payloads.map((payload) => {\n        return assertEx(payload.schema, () => this.missingSchemaMessage(payload))\n      })\n    )\n  }\n\n  async build(meta = false): Promise<[TBoundWitness, TPayload[], ModuleError[]]> {\n    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {\n      const hashableFields = await this.hashableFields()\n      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields)\n\n      /* get all the previousHashes to verify atomic signing */\n      const previousHashes = this._accounts.map((account) => account.previousHash)\n\n      const ret: TBoundWitness = {\n        ...hashableFields,\n        _signatures: await this.signatures(_hash, previousHashes),\n      }\n      if (meta ?? this.config?.meta) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const bwWithMeta = ret as any\n        bwWithMeta._client = 'js'\n        bwWithMeta._hash = _hash\n        bwWithMeta._timestamp = this._timestamp\n      }\n      if (this.config.inlinePayloads) {\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        const anyRet = ret as any\n        //leaving this in here to prevent breaking code (for now)\n        anyRet._payloads = this.inlinePayloads()\n      }\n      return [ret, this._payloads, this._errors]\n    })\n  }\n\n  error(payload?: ModuleError) {\n    const unwrappedPayload = PayloadWrapper.unwrap(payload)\n    assertEx(this._errorHashes === undefined, 'Can not set errors when hashes already set')\n    if (unwrappedPayload) {\n      this._errors.push(assertEx(sortFields(unwrappedPayload)))\n    }\n    return this\n  }\n\n  errors(errors?: (ModuleError | null)[]) {\n    errors?.forEach((error) => {\n      if (error !== null) {\n        this.error(error)\n      }\n    })\n    return this\n  }\n\n  async hashableFields(): Promise<TBoundWitness> {\n    const addresses = this._accounts.map((account) => account.address)\n    const previous_hashes = this._accounts.map((account) => account.previousHash ?? null)\n    const payload_hashes = assertEx(await this.getPayloadHashes(), 'Missing payload_hashes')\n    const payload_schemas = assertEx(this._payload_schemas, 'Missing payload_schemas')\n    const result: TBoundWitness = {\n      addresses: assertEx(addresses, 'Missing addresses'),\n      payload_hashes,\n      payload_schemas,\n      previous_hashes,\n      schema: BoundWitnessSchema,\n    } as TBoundWitness\n\n    assertEx(result.payload_hashes?.length === result.payload_schemas?.length, 'Payload hash/schema mismatch')\n\n    assertEx(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), 'nulls found in hashes')\n\n    assertEx(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), 'nulls found in schemas')\n\n    if (this.config.timestamp ?? true) {\n      result.timestamp = this._timestamp\n    }\n\n    if (this._sourceQuery) {\n      result.sourceQuery = this._sourceQuery\n    }\n\n    return result\n  }\n\n  hashes(hashes: string[], schema: string[]) {\n    assertEx(this.payloads.length === 0, 'Can not set hashes when payloads already set')\n    this._payloadHashes = hashes\n    this._payloadSchemas = schema\n    return this\n  }\n\n  payload(payload?: TPayload) {\n    const unwrappedPayload = PayloadWrapper.unwrap<TPayload>(payload)\n    assertEx(this._payloadHashes === undefined, 'Can not set payloads when hashes already set')\n    if (unwrappedPayload) {\n      this._payloads.push(assertEx(sortFields<TPayload>(unwrappedPayload)))\n    }\n    return this\n  }\n\n  payloads(payloads?: (TPayload | null)[]) {\n    payloads?.forEach((payload) => {\n      if (payload !== null) {\n        this.payload(payload)\n      }\n    })\n    return this\n  }\n\n  sourceQuery(hash?: string) {\n    this._sourceQuery = hash\n    return this\n  }\n\n  witness(account: AccountInstance) {\n    this._accounts?.push(account)\n    return this\n  }\n\n  witnesses(accounts: AccountInstance[]) {\n    this._accounts?.push(...accounts)\n    return this\n  }\n\n  protected async signatures(_hash: string, previousHashes: (string | Data | undefined)[]) {\n    const hash = Buffer.from(_hash, 'hex')\n    return await Promise.all(\n      this._accounts.map(async (account, index) => Buffer.from(await account.sign(hash, previousHashes[index])).toString('hex')),\n    )\n  }\n\n  private async getPayloadHashes(): Promise<string[]> {\n    return this._payloadHashes ?? (await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload))))\n  }\n\n  private inlinePayloads() {\n    return this._payloads.map<TPayload>((payload, index) => {\n      return {\n        ...payload,\n        schema: this._payload_schemas[index],\n      }\n    })\n  }\n\n  private missingSchemaMessage(payload: Payload) {\n    return `Builder: Missing Schema\\n${JSON.stringify(payload, null, 2)}`\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'\nimport { Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { BoundWitnessBuilder } from '../Builder'\n\nexport class QueryBoundWitnessBuilder<\n  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,\n  TQuery extends Query = Query,\n> extends BoundWitnessBuilder<TBoundWitness> {\n  private _query: PayloadWrapper<TQuery> | undefined\n\n  override async hashableFields(): Promise<TBoundWitness> {\n    return {\n      ...(await super.hashableFields()),\n      query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),\n      schema: QueryBoundWitnessSchema,\n    }\n  }\n\n  query<T extends TQuery>(query: T) {\n    this._query = PayloadWrapper.wrap(query)\n    this.payload(this._query.payload())\n    return this\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { compact } from '@xylabs/lodash'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { Payload, PayloadSetPayload, Query } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nexport class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {\n  private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined\n  private _query: T | undefined\n  private _resultSet: PayloadSetPayload | undefined\n\n  private isQueryBoundWitnessWrapper = true\n\n  static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {\n    assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')\n    switch (typeof obj) {\n      case 'object': {\n        const castWrapper = obj as QueryBoundWitnessWrapper<T>\n        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)\n        /*if (!wrapper.valid) {\n          console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)\n        }*/\n        return wrapper\n      }\n    }\n    throw Error(`Unable to parse [${typeof obj}]`)\n  }\n\n  async getQuery(): Promise<T> {\n    const payloadMap = await this.allPayloadMap()\n    this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)\n    return assertEx(this._query, `Missing Query [${this.boundwitness}]`)\n  }\n\n  override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {\n    this._payloadsWithoutQuery =\n      this._payloadsWithoutQuery ??\n      compact(\n        (\n          await PayloadHasher.filterExclude(\n            (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),\n            this.payload().query,\n          )\n        ).map((payload) => PayloadWrapper.wrap(payload)),\n      )\n    return this._payloadsWithoutQuery\n  }\n}\n"],"mappings":";AAAA,SAAS,gBAAgB;AACzB,SAAS,cAAc;AAEvB,SAAuB,0BAA0B;AACjD,SAAS,2BAA2B;AACpC,SAAe,eAAe,kBAAkB;AAChD,SAAS,sBAAsB;AAG/B,SAAS,aAAa;AASf,IAAM,sBAAN,MAAM,qBAA+H;AAAA,EAW1I,YACW,SAAoC,EAAE,gBAAgB,MAAM,GAClD,QACnB;AAFS;AACU;AAAA,EAClB;AAAA,EAbH,OAAwB,cAAc,IAAI,MAAM;AAAA,EACxC,YAA+B,CAAC;AAAA,EAChC;AAAA,EACA,UAAyB,CAAC;AAAA,EAC1B;AAAA,EACA;AAAA,EACA,YAAwB,CAAC;AAAA,EACzB;AAAA,EACA,aAAa,KAAK,IAAI;AAAA,EAO9B,IAAY,mBAA6B;AACvC,WACE,KAAK,mBACL,KAAK,UAAU,IAAI,CAAC,YAAY;AAC9B,aAAO,SAAS,QAAQ,QAAQ,MAAM,KAAK,qBAAqB,OAAO,CAAC;AAAA,IAC1E,CAAC;AAAA,EAEL;AAAA,EAEA,MAAM,MAAM,OAAO,OAA4D;AAC7E,WAAO,MAAM,qBAAoB,YAAY,aAAa,YAAY;AA5C1E;AA6CM,YAAM,iBAAiB,MAAM,KAAK,eAAe;AACjD,YAAM,QAAQ,MAAM,oBAAoB,UAAU,cAAc;AAGhE,YAAM,iBAAiB,KAAK,UAAU,IAAI,CAAC,YAAY,QAAQ,YAAY;AAE3E,YAAM,MAAqB;AAAA,QACzB,GAAG;AAAA,QACH,aAAa,MAAM,KAAK,WAAW,OAAO,cAAc;AAAA,MAC1D;AACA,UAAI,UAAQ,UAAK,WAAL,mBAAa,OAAM;AAE7B,cAAM,aAAa;AACnB,mBAAW,UAAU;AACrB,mBAAW,QAAQ;AACnB,mBAAW,aAAa,KAAK;AAAA,MAC/B;AACA,UAAI,KAAK,OAAO,gBAAgB;AAE9B,cAAM,SAAS;AAEf,eAAO,YAAY,KAAK,eAAe;AAAA,MACzC;AACA,aAAO,CAAC,KAAK,KAAK,WAAW,KAAK,OAAO;AAAA,IAC3C,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,SAAuB;AAC3B,UAAM,mBAAmB,eAAe,OAAO,OAAO;AACtD,aAAS,KAAK,iBAAiB,QAAW,4CAA4C;AACtF,QAAI,kBAAkB;AACpB,WAAK,QAAQ,KAAK,SAAS,WAAW,gBAAgB,CAAC,CAAC;AAAA,IAC1D;AACA,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,QAAiC;AACtC,qCAAQ,QAAQ,CAAC,UAAU;AACzB,UAAI,UAAU,MAAM;AAClB,aAAK,MAAM,KAAK;AAAA,MAClB;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,iBAAyC;AA1FjD;AA2FI,UAAM,YAAY,KAAK,UAAU,IAAI,CAAC,YAAY,QAAQ,OAAO;AACjE,UAAM,kBAAkB,KAAK,UAAU,IAAI,CAAC,YAAY,QAAQ,gBAAgB,IAAI;AACpF,UAAM,iBAAiB,SAAS,MAAM,KAAK,iBAAiB,GAAG,wBAAwB;AACvF,UAAM,kBAAkB,SAAS,KAAK,kBAAkB,yBAAyB;AACjF,UAAM,SAAwB;AAAA,MAC5B,WAAW,SAAS,WAAW,mBAAmB;AAAA,MAClD;AAAA,MACA;AAAA,MACA;AAAA,MACA,QAAQ;AAAA,IACV;AAEA,eAAS,YAAO,mBAAP,mBAAuB,cAAW,YAAO,oBAAP,mBAAwB,SAAQ,8BAA8B;AAEzG,aAAS,CAAC,OAAO,eAAe,OAAO,CAAC,SAAS,SAAS,WAAW,CAAC,MAAM,KAAK,GAAG,uBAAuB;AAE3G,aAAS,CAAC,OAAO,gBAAgB,OAAO,CAAC,SAAS,WAAW,WAAW,CAAC,QAAQ,KAAK,GAAG,wBAAwB;AAEjH,QAAI,KAAK,OAAO,aAAa,MAAM;AACjC,aAAO,YAAY,KAAK;AAAA,IAC1B;AAEA,QAAI,KAAK,cAAc;AACrB,aAAO,cAAc,KAAK;AAAA,IAC5B;AAEA,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,QAAkB,QAAkB;AACzC,aAAS,KAAK,SAAS,WAAW,GAAG,8CAA8C;AACnF,SAAK,iBAAiB;AACtB,SAAK,kBAAkB;AACvB,WAAO;AAAA,EACT;AAAA,EAEA,QAAQ,SAAoB;AAC1B,UAAM,mBAAmB,eAAe,OAAiB,OAAO;AAChE,aAAS,KAAK,mBAAmB,QAAW,8CAA8C;AAC1F,QAAI,kBAAkB;AACpB,WAAK,UAAU,KAAK,SAAS,WAAqB,gBAAgB,CAAC,CAAC;AAAA,IACtE;AACA,WAAO;AAAA,EACT;AAAA,EAEA,SAAS,UAAgC;AACvC,yCAAU,QAAQ,CAAC,YAAY;AAC7B,UAAI,YAAY,MAAM;AACpB,aAAK,QAAQ,OAAO;AAAA,MACtB;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAAA,EAEA,YAAY,MAAe;AACzB,SAAK,eAAe;AACpB,WAAO;AAAA,EACT;AAAA,EAEA,QAAQ,SAA0B;AAtJpC;AAuJI,eAAK,cAAL,mBAAgB,KAAK;AACrB,WAAO;AAAA,EACT;AAAA,EAEA,UAAU,UAA6B;AA3JzC;AA4JI,eAAK,cAAL,mBAAgB,KAAK,GAAG;AACxB,WAAO;AAAA,EACT;AAAA,EAEA,MAAgB,WAAW,OAAe,gBAA+C;AACvF,UAAM,OAAO,OAAO,KAAK,OAAO,KAAK;AACrC,WAAO,MAAM,QAAQ;AAAA,MACnB,KAAK,UAAU,IAAI,OAAO,SAAS,UAAU,OAAO,KAAK,MAAM,QAAQ,KAAK,MAAM,eAAe,KAAK,CAAC,CAAC,EAAE,SAAS,KAAK,CAAC;AAAA,IAC3H;AAAA,EACF;AAAA,EAEA,MAAc,mBAAsC;AAClD,WAAO,KAAK,kBAAmB,MAAM,QAAQ,IAAI,KAAK,UAAU,IAAI,CAAC,YAAY,cAAc,UAAU,OAAO,CAAC,CAAC;AAAA,EACpH;AAAA,EAEQ,iBAAiB;AACvB,WAAO,KAAK,UAAU,IAAc,CAAC,SAAS,UAAU;AACtD,aAAO;AAAA,QACL,GAAG;AAAA,QACH,QAAQ,KAAK,iBAAiB,KAAK;AAAA,MACrC;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,qBAAqB,SAAkB;AAC7C,WAAO;AAAA,EAA4B,KAAK,UAAU,SAAS,MAAM,CAAC,CAAC;AAAA,EACrE;AACF;;;ACvLA,SAAS,YAAAA,iBAAgB;AACzB,SAA4B,+BAA+B;AAE3D,SAAS,kBAAAC,uBAAsB;AAIxB,IAAM,2BAAN,cAGG,oBAAmC;AAAA,EACnC;AAAA,EAER,MAAe,iBAAyC;AAb1D;AAcI,WAAO;AAAA,MACL,GAAI,MAAM,MAAM,eAAe;AAAA,MAC/B,OAAOC,UAAS,QAAM,UAAK,WAAL,mBAAa,cAAa,oBAAoB;AAAA,MACpE,QAAQ;AAAA,IACV;AAAA,EACF;AAAA,EAEA,MAAwB,OAAU;AAChC,SAAK,SAASC,gBAAe,KAAK,KAAK;AACvC,SAAK,QAAQ,KAAK,OAAO,QAAQ,CAAC;AAClC,WAAO;AAAA,EACT;AACF;;;AC1BA,SAAS,YAAAC,iBAAgB;AACzB,SAAS,eAAe;AAExB,SAAS,uBAAAC,4BAA2B;AACpC,SAAS,iBAAAC,sBAAqB;AAE9B,SAAS,kBAAAC,uBAAsB;AAExB,IAAM,2BAAN,MAAM,kCAA0DF,qBAAuC;AAAA,EACpG;AAAA,EACA;AAAA,EACA;AAAA,EAEA,6BAA6B;AAAA,EAErC,OAAO,WAAoC,KAAc,UAAmD;AAC1G,IAAAD,UAAS,CAAC,MAAM,QAAQ,GAAG,GAAG,wDAAwD;AACtF,YAAQ,OAAO,KAAK;AAAA,MAClB,KAAK,UAAU;AACb,cAAM,cAAc;AACpB,cAAM,WAAU,2CAAa,8BAA6B,cAAc,IAAI,0BAA4B,KAA0B,QAAQ;AAI1I,eAAO;AAAA,MACT;AAAA,IACF;AACA,UAAM,MAAM,oBAAoB,OAAO,GAAG,GAAG;AAAA,EAC/C;AAAA,EAEA,MAAM,WAAuB;AAC3B,UAAM,aAAa,MAAM,KAAK,cAAc;AAC5C,SAAK,SAAS,KAAK,UAAW,WAAW,KAAK,aAAa,KAAK;AAChE,WAAOA,UAAS,KAAK,QAAQ,kBAAkB,KAAK,YAAY,GAAG;AAAA,EACrE;AAAA,EAEA,MAAe,qBAAyD;AACtE,SAAK,wBACH,KAAK,yBACL;AAAA,OAEI,MAAME,eAAc;AAAA,SACjB,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,QAAQ,QAAQ,CAAC;AAAA,QACrE,KAAK,QAAQ,EAAE;AAAA,MACjB,GACA,IAAI,CAAC,YAAYC,gBAAe,KAAK,OAAO,CAAC;AAAA,IACjD;AACF,WAAO,KAAK;AAAA,EACd;AACF;","names":["assertEx","PayloadWrapper","assertEx","PayloadWrapper","assertEx","BoundWitnessWrapper","PayloadHasher","PayloadWrapper"]}

package/package.json

@@ -13,23 +13,23 @@
     "@xylabs/assert": "^2.12.24",
     "@xylabs/buffer": "^2.12.24",
     "@xylabs/lodash": "^2.12.24",
-    "@xyo-network/account-model": "~2.75.17",
-    "@xyo-network/boundwitness-model": "~2.75.17",
-    "@xyo-network/boundwitness-validator": "~2.75.17",
-    "@xyo-network/boundwitness-wrapper": "~2.75.17",
-    "@xyo-network/core": "~2.75.17",
-    "@xyo-network/error": "~2.75.17",
-    "@xyo-network/payload": "~2.75.17",
-    "@xyo-network/payload-model": "~2.75.17",
-    "@xyo-network/payload-wrapper": "~2.75.17",
-    "@xyo-network/shared": "~2.75.17",
+    "@xyo-network/account-model": "~2.76.0",
+    "@xyo-network/boundwitness-model": "~2.76.0",
+    "@xyo-network/boundwitness-validator": "~2.76.0",
+    "@xyo-network/boundwitness-wrapper": "~2.76.0",
+    "@xyo-network/core": "~2.76.0",
+    "@xyo-network/error": "~2.76.0",
+    "@xyo-network/payload": "~2.76.0",
+    "@xyo-network/payload-model": "~2.76.0",
+    "@xyo-network/payload-wrapper": "~2.76.0",
+    "@xyo-network/shared": "~2.76.0",
     "async-mutex": "^0.4.0"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.1.9",
     "@xylabs/tsconfig": "^3.1.9",
-    "@xyo-network/account": "~2.75.17",
+    "@xyo-network/account": "~2.76.0",
     "typescript": "^5.2.2"
   },
   "docs": "dist/docs.json",
@@ -74,5 +74,5 @@
   },
   "sideEffects": false,
   "types": "dist/node/index.d.ts",
-  "version": "2.75.17"
+  "version": "2.76.0"
 }

package/src/Builder.ts

@@ -24,6 +24,7 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: st
   private _payloadHashes: string[] | undefined
   private _payloadSchemas: string[] | undefined
   private _payloads: TPayload[] = []
+  private _sourceQuery: string | undefined
   private _timestamp = Date.now()
 
   constructor(
@@ -110,6 +111,10 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: st
       result.timestamp = this._timestamp
     }
 
+    if (this._sourceQuery) {
+      result.sourceQuery = this._sourceQuery
+    }
+
     return result
   }
 
@@ -138,6 +143,11 @@ export class BoundWitnessBuilder<TBoundWitness extends BoundWitness<{ schema: st
     return this
   }
 
+  sourceQuery(hash?: string) {
+    this._sourceQuery = hash
+    return this
+  }
+
   witness(account: AccountInstance) {
     this._accounts?.push(account)
     return this

package/src/Query/QueryBoundWitnessBuilder.ts

@@ -1,16 +1,15 @@
 import { assertEx } from '@xylabs/assert'
-import { PayloadSetPayload, Query } from '@xyo-network/payload-model'
+import { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'
+import { Query } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 import { BoundWitnessBuilder } from '../Builder'
-import { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'
 
 export class QueryBoundWitnessBuilder<
   TBoundWitness extends QueryBoundWitness = QueryBoundWitness,
   TQuery extends Query = Query,
 > extends BoundWitnessBuilder<TBoundWitness> {
   private _query: PayloadWrapper<TQuery> | undefined
-  private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined
 
   override async hashableFields(): Promise<TBoundWitness> {
     return {
@@ -25,10 +24,4 @@ export class QueryBoundWitnessBuilder<
     this.payload(this._query.payload())
     return this
   }
-
-  resultSet<T extends PayloadSetPayload>(payloadSet: T) {
-    this._resultSet = PayloadWrapper.wrap(payloadSet)
-    this.payload(this._resultSet.payload())
-    return this
-  }
 }

package/src/Query/QueryBoundWitnessValidator.ts

@@ -1,11 +1,11 @@
 import { assertEx } from '@xylabs/assert'
+import { QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import { handleError } from '@xyo-network/error'
 import { PayloadSetPayload, Query } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
-import { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'
 export class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
   private _query: PayloadWrapper<T> | undefined