@xyo-network/boundwitness-builder 2.75.3 → 2.75.5

package/dist/browser/Builder.js

@@ -1,3 +1,4 @@
+// src/Builder.ts
 import { assertEx } from "@xylabs/assert";
 import { Buffer } from "@xylabs/buffer";
 import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
@@ -5,7 +6,7 @@ import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
 import { PayloadHasher, sortFields } from "@xyo-network/core";
 import { PayloadWrapper } from "@xyo-network/payload";
 import { Mutex } from "async-mutex";
-class BoundWitnessBuilder {
+var BoundWitnessBuilder = class _BoundWitnessBuilder {
   constructor(config = { inlinePayloads: false }, logger) {
     this.config = config;
     this.logger = logger;
@@ -24,7 +25,7 @@ class BoundWitnessBuilder {
     });
   }
   async build(meta = false) {
-    return await BoundWitnessBuilder._buildMutex.runExclusive(async () => {
+    return await _BoundWitnessBuilder._buildMutex.runExclusive(async () => {
       const hashableFields = await this.hashableFields();
       const _hash = await BoundWitnessWrapper.hashAsync(hashableFields);
       const previousHashes = this._accounts.map((account) => account.previousHash);
@@ -132,7 +133,7 @@ class BoundWitnessBuilder {
     return `Builder: Missing Schema
 ${JSON.stringify(payload, null, 2)}`;
   }
-}
+};
 export {
   BoundWitnessBuilder
 };

package/dist/browser/Builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Builder.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"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/Builder.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"],"mappings":"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","names":[]}

package/dist/browser/Query/QueryBoundWitness.js

@@ -1,6 +1,7 @@
+// src/Query/QueryBoundWitness.ts
 import { BoundWitnessSchema, isBoundWitness } from "@xyo-network/boundwitness-model";
-const QueryBoundWitnessSchema = BoundWitnessSchema;
-const isQueryBoundWitness = (x) => isBoundWitness(x) && x?.query !== void 0;
+var QueryBoundWitnessSchema = BoundWitnessSchema;
+var isQueryBoundWitness = (x) => isBoundWitness(x) && x?.query !== void 0;
 export {
   QueryBoundWitnessSchema,
   isQueryBoundWitness

package/dist/browser/Query/QueryBoundWitness.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Query/QueryBoundWitness.ts"],"sourcesContent":["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"],"mappings":"AAAA,SAAuB,oBAAoB,sBAAsB;AAI1D,MAAM,0BAAmD;AAQzD,MAAM,sBAAsB,CAAC,MAA+C,eAAe,CAAC,KAAM,GAAyB,UAAU;","names":[]}
+{"version":3,"sources":["../../../src/Query/QueryBoundWitness.ts"],"sourcesContent":["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"],"mappings":";AAAA,SAAuB,oBAAoB,sBAAsB;AAI1D,IAAM,0BAAmD;AAQzD,IAAM,sBAAsB,CAAC,MAA+C,eAAe,CAAC,KAAM,GAAyB,UAAU;","names":[]}

package/dist/browser/Query/QueryBoundWitnessBuilder.js

@@ -1,28 +1,170 @@
+// src/Query/QueryBoundWitnessBuilder.ts
+import { assertEx as assertEx2 } from "@xylabs/assert";
+import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
+
+// src/Builder.ts
 import { assertEx } from "@xylabs/assert";
-import { PayloadWrapper } from "@xyo-network/payload-wrapper";
-import { BoundWitnessBuilder } from "../Builder";
-import { QueryBoundWitnessSchema } from "./QueryBoundWitness";
-class QueryBoundWitnessBuilder extends BoundWitnessBuilder {
+import { Buffer } from "@xylabs/buffer";
+import { BoundWitnessSchema } from "@xyo-network/boundwitness-model";
+import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
+import { PayloadHasher, sortFields } from "@xyo-network/core";
+import { PayloadWrapper } from "@xyo-network/payload";
+import { Mutex } from "async-mutex";
+var BoundWitnessBuilder = class _BoundWitnessBuilder {
+  constructor(config = { inlinePayloads: false }, logger) {
+    this.config = config;
+    this.logger = logger;
+  }
+  static _buildMutex = new Mutex();
+  _accounts = [];
+  _errorHashes;
+  _errors = [];
+  _payloadHashes;
+  _payloadSchemas;
+  _payloads = [];
+  _timestamp = Date.now();
+  get _payload_schemas() {
+    return this._payloadSchemas ?? this._payloads.map((payload) => {
+      return assertEx(payload.schema, () => this.missingSchemaMessage(payload));
+    });
+  }
+  async build(meta = false) {
+    return await _BoundWitnessBuilder._buildMutex.runExclusive(async () => {
+      const hashableFields = await this.hashableFields();
+      const _hash = await BoundWitnessWrapper.hashAsync(hashableFields);
+      const previousHashes = this._accounts.map((account) => account.previousHash);
+      const ret = {
+        ...hashableFields,
+        _signatures: await this.signatures(_hash, previousHashes)
+      };
+      if (meta ?? this.config?.meta) {
+        const bwWithMeta = ret;
+        bwWithMeta._client = "js";
+        bwWithMeta._hash = _hash;
+        bwWithMeta._timestamp = this._timestamp;
+      }
+      if (this.config.inlinePayloads) {
+        const anyRet = ret;
+        anyRet._payloads = this.inlinePayloads();
+      }
+      return [ret, this._payloads, this._errors];
+    });
+  }
+  error(payload) {
+    const unwrappedPayload = PayloadWrapper.unwrap(payload);
+    assertEx(this._errorHashes === void 0, "Can not set errors when hashes already set");
+    if (unwrappedPayload) {
+      this._errors.push(assertEx(sortFields(unwrappedPayload)));
+    }
+    return this;
+  }
+  errors(errors) {
+    errors?.forEach((error) => {
+      if (error !== null) {
+        this.error(error);
+      }
+    });
+    return this;
+  }
+  async hashableFields() {
+    const addresses = this._accounts.map((account) => account.address);
+    const previous_hashes = this._accounts.map((account) => account.previousHash ?? null);
+    const payload_hashes = assertEx(await this.getPayloadHashes(), "Missing payload_hashes");
+    const payload_schemas = assertEx(this._payload_schemas, "Missing payload_schemas");
+    const result = {
+      addresses: assertEx(addresses, "Missing addresses"),
+      payload_hashes,
+      payload_schemas,
+      previous_hashes,
+      schema: BoundWitnessSchema
+    };
+    assertEx(result.payload_hashes?.length === result.payload_schemas?.length, "Payload hash/schema mismatch");
+    assertEx(!result.payload_hashes.reduce((inValid, hash) => inValid || !hash, false), "nulls found in hashes");
+    assertEx(!result.payload_schemas.reduce((inValid, schema) => inValid || !schema, false), "nulls found in schemas");
+    if (this.config.timestamp ?? true) {
+      result.timestamp = this._timestamp;
+    }
+    return result;
+  }
+  hashes(hashes, schema) {
+    assertEx(this.payloads.length === 0, "Can not set hashes when payloads already set");
+    this._payloadHashes = hashes;
+    this._payloadSchemas = schema;
+    return this;
+  }
+  payload(payload) {
+    const unwrappedPayload = PayloadWrapper.unwrap(payload);
+    assertEx(this._payloadHashes === void 0, "Can not set payloads when hashes already set");
+    if (unwrappedPayload) {
+      this._payloads.push(assertEx(sortFields(unwrappedPayload)));
+    }
+    return this;
+  }
+  payloads(payloads) {
+    payloads?.forEach((payload) => {
+      if (payload !== null) {
+        this.payload(payload);
+      }
+    });
+    return this;
+  }
+  witness(account) {
+    this._accounts?.push(account);
+    return this;
+  }
+  witnesses(accounts) {
+    this._accounts?.push(...accounts);
+    return this;
+  }
+  async signatures(_hash, previousHashes) {
+    const hash = Buffer.from(_hash, "hex");
+    return await Promise.all(
+      this._accounts.map(async (account, index) => Buffer.from(await account.sign(hash, previousHashes[index])).toString("hex"))
+    );
+  }
+  async getPayloadHashes() {
+    return this._payloadHashes ?? await Promise.all(this._payloads.map((payload) => PayloadHasher.hashAsync(payload)));
+  }
+  inlinePayloads() {
+    return this._payloads.map((payload, index) => {
+      return {
+        ...payload,
+        schema: this._payload_schemas[index]
+      };
+    });
+  }
+  missingSchemaMessage(payload) {
+    return `Builder: Missing Schema
+${JSON.stringify(payload, null, 2)}`;
+  }
+};
+
+// src/Query/QueryBoundWitness.ts
+import { BoundWitnessSchema as BoundWitnessSchema2, isBoundWitness } from "@xyo-network/boundwitness-model";
+var QueryBoundWitnessSchema = BoundWitnessSchema2;
+
+// src/Query/QueryBoundWitnessBuilder.ts
+var QueryBoundWitnessBuilder = class extends BoundWitnessBuilder {
   _query;
   _resultSet;
   async hashableFields() {
     return {
       ...await super.hashableFields(),
-      query: assertEx(await this._query?.hashAsync(), "No Query Specified"),
+      query: assertEx2(await this._query?.hashAsync(), "No Query Specified"),
       schema: QueryBoundWitnessSchema
     };
   }
   query(query) {
-    this._query = PayloadWrapper.wrap(query);
+    this._query = PayloadWrapper2.wrap(query);
     this.payload(this._query.payload());
     return this;
   }
   resultSet(payloadSet) {
-    this._resultSet = PayloadWrapper.wrap(payloadSet);
+    this._resultSet = PayloadWrapper2.wrap(payloadSet);
     this.payload(this._resultSet.payload());
     return this;
   }
-}
+};
 export {
   QueryBoundWitnessBuilder
 };

package/dist/browser/Query/QueryBoundWitnessBuilder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Query/QueryBoundWitnessBuilder.ts"],"sourcesContent":["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"],"mappings":"AAAA,SAAS,gBAAgB;AAEzB,SAAS,sBAAsB;AAE/B,SAAS,2BAA2B;AACpC,SAA4B,+BAA+B;AAEpD,MAAM,iCAGH,oBAAmC;AAAA,EACnC;AAAA,EACA;AAAA,EAER,MAAe,iBAAyC;AACtD,WAAO;AAAA,MACL,GAAI,MAAM,MAAM,eAAe;AAAA,MAC/B,OAAO,SAAS,MAAM,KAAK,QAAQ,UAAU,GAAG,oBAAoB;AAAA,MACpE,QAAQ;AAAA,IACV;AAAA,EACF;AAAA,EAEA,MAAwB,OAAU;AAChC,SAAK,SAAS,eAAe,KAAK,KAAK;AACvC,SAAK,QAAQ,KAAK,OAAO,QAAQ,CAAC;AAClC,WAAO;AAAA,EACT;AAAA,EAEA,UAAuC,YAAe;AACpD,SAAK,aAAa,eAAe,KAAK,UAAU;AAChD,SAAK,QAAQ,KAAK,WAAW,QAAQ,CAAC;AACtC,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../../../src/Query/QueryBoundWitnessBuilder.ts","../../../src/Builder.ts","../../../src/Query/QueryBoundWitness.ts"],"sourcesContent":["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 { 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"],"mappings":"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","names":["assertEx","PayloadWrapper","BoundWitnessSchema","assertEx","PayloadWrapper"]}

package/dist/browser/Query/QueryBoundWitnessValidator.js

@@ -1,16 +1,22 @@
+// src/Query/QueryBoundWitnessValidator.ts
 import { assertEx } from "@xylabs/assert";
 import { BoundWitnessValidator } from "@xyo-network/boundwitness-validator";
 import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
 import { handleError } from "@xyo-network/error";
 import { PayloadWrapper } from "@xyo-network/payload-wrapper";
-import { QueryBoundWitnessSchema } from "./QueryBoundWitness";
-class QueryBoundWitnessValidator extends BoundWitnessValidator {
+
+// src/Query/QueryBoundWitness.ts
+import { BoundWitnessSchema, isBoundWitness } from "@xyo-network/boundwitness-model";
+var QueryBoundWitnessSchema = BoundWitnessSchema;
+
+// src/Query/QueryBoundWitnessValidator.ts
+var QueryBoundWitnessValidator = class _QueryBoundWitnessValidator extends BoundWitnessValidator {
   _query;
   get expectedSchema() {
     return QueryBoundWitnessSchema;
   }
   static isQueryBoundWitnessValidator(obj) {
-    return obj?.constructor === QueryBoundWitnessValidator;
+    return obj?.constructor === _QueryBoundWitnessValidator;
   }
   async validate() {
     return [
@@ -42,7 +48,7 @@ class QueryBoundWitnessValidator extends BoundWitnessValidator {
     }
     return errors;
   }
-}
+};
 export {
   QueryBoundWitnessValidator
 };

package/dist/browser/Query/QueryBoundWitnessValidator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Query/QueryBoundWitnessValidator.ts"],"sourcesContent":["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"],"mappings":"AAAA,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,mBAAmB;AAE5B,SAAS,sBAAsB;AAE/B,SAA4B,+BAA+B;AACpD,MAAM,mCAA4D,sBAAyC;AAAA,EACxG;AAAA,EAER,IAAuB,iBAAyB;AAC9C,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,6BAA6B,KAAc;AAChD,WAAQ,KAAoC,gBAAgB;AAAA,EAC9D;AAAA,EAEA,MAAe,WAAW;AACxB,WAAO;AAAA,MACL,GAAI,MAAM,MAAM,SAAS;AAAA;AAAA,IAE3B;AAAA,EACF;AAAA,EAEA,MAAM,oBAAoB;AACxB,UAAM,SAAkB,CAAC;AACzB,QAAI;AACF,YAAM,gBAAgB,SAAS,KAAK,IAAI,WAAW,mBAAmB;AACtE,YAAM,UAAU,oBAAoB,MAAM,KAAK,GAAG;AAClD,YAAM,YAAY,eAAe,MAAyB,MAAM,QAAQ,WAAW,GAAG,aAAa,CAAsB;AACzH,YAAM,WAAW,WAAW,QAAQ,EAAE;AACtC,UAAI,UAAU;AACZ,eAAO,QAAQ,QAAQ,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AACjD,gBAAM,QAAQ,QAAQ,eAAe,OAAO,CAAC,OAAO,WAAW;AAC7D,mBAAO,SAAS,WAAW,MAAM,IAAI;AAAA,UACvC,GAAG,CAAC;AACJ,cAAI,UAAU,OAAO;AACnB,mBAAO,KAAK,MAAM,sCAAsC,GAAG,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC;AAAA,UACnF;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF,SAAS,IAAI;AACX,kBAAY,IAAI,CAAC,UAAU;AACzB,eAAO,KAAK,KAAK;AAAA,MACnB,CAAC;AAAA,IACH;AACA,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../../../src/Query/QueryBoundWitnessValidator.ts","../../../src/Query/QueryBoundWitness.ts"],"sourcesContent":["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 { 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"],"mappings":";AAAA,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,mBAAmB;AAE5B,SAAS,sBAAsB;;;ACL/B,SAAuB,oBAAoB,sBAAsB;AAI1D,IAAM,0BAAmD;;;ADIzD,IAAM,6BAAN,MAAM,oCAA4D,sBAAyC;AAAA,EACxG;AAAA,EAER,IAAuB,iBAAyB;AAC9C,WAAO;AAAA,EACT;AAAA,EAEA,OAAO,6BAA6B,KAAc;AAChD,WAAQ,KAAoC,gBAAgB;AAAA,EAC9D;AAAA,EAEA,MAAe,WAAW;AACxB,WAAO;AAAA,MACL,GAAI,MAAM,MAAM,SAAS;AAAA;AAAA,IAE3B;AAAA,EACF;AAAA,EAEA,MAAM,oBAAoB;AACxB,UAAM,SAAkB,CAAC;AACzB,QAAI;AACF,YAAM,gBAAgB,SAAS,KAAK,IAAI,WAAW,mBAAmB;AACtE,YAAM,UAAU,oBAAoB,MAAM,KAAK,GAAG;AAClD,YAAM,YAAY,eAAe,MAAyB,MAAM,QAAQ,WAAW,GAAG,aAAa,CAAsB;AACzH,YAAM,WAAW,WAAW,QAAQ,EAAE;AACtC,UAAI,UAAU;AACZ,eAAO,QAAQ,QAAQ,EAAE,QAAQ,CAAC,CAAC,KAAK,KAAK,MAAM;AACjD,gBAAM,QAAQ,QAAQ,eAAe,OAAO,CAAC,OAAO,WAAW;AAC7D,mBAAO,SAAS,WAAW,MAAM,IAAI;AAAA,UACvC,GAAG,CAAC;AACJ,cAAI,UAAU,OAAO;AACnB,mBAAO,KAAK,MAAM,sCAAsC,GAAG,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC;AAAA,UACnF;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF,SAAS,IAAI;AACX,kBAAY,IAAI,CAAC,UAAU;AACzB,eAAO,KAAK,KAAK;AAAA,MACnB,CAAC;AAAA,IACH;AACA,WAAO;AAAA,EACT;AACF;","names":[]}

package/dist/browser/Query/QueryBoundWitnessWrapper.js

@@ -1,20 +1,74 @@
-import { assertEx } from "@xylabs/assert";
+// src/Query/QueryBoundWitnessWrapper.ts
+import { assertEx as assertEx2 } from "@xylabs/assert";
 import { compact } from "@xylabs/lodash";
-import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
+import { BoundWitnessWrapper as BoundWitnessWrapper2 } from "@xyo-network/boundwitness-wrapper";
 import { PayloadHasher } from "@xyo-network/core";
+import { PayloadWrapper as PayloadWrapper2 } from "@xyo-network/payload-wrapper";
+
+// src/Query/QueryBoundWitnessValidator.ts
+import { assertEx } from "@xylabs/assert";
+import { BoundWitnessValidator } from "@xyo-network/boundwitness-validator";
+import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
+import { handleError } from "@xyo-network/error";
 import { PayloadWrapper } from "@xyo-network/payload-wrapper";
-import { QueryBoundWitnessValidator } from "./QueryBoundWitnessValidator";
-class QueryBoundWitnessWrapper extends BoundWitnessWrapper {
+
+// src/Query/QueryBoundWitness.ts
+import { BoundWitnessSchema, isBoundWitness } from "@xyo-network/boundwitness-model";
+var QueryBoundWitnessSchema = BoundWitnessSchema;
+
+// src/Query/QueryBoundWitnessValidator.ts
+var QueryBoundWitnessValidator = class _QueryBoundWitnessValidator extends BoundWitnessValidator {
+  _query;
+  get expectedSchema() {
+    return QueryBoundWitnessSchema;
+  }
+  static isQueryBoundWitnessValidator(obj) {
+    return obj?.constructor === _QueryBoundWitnessValidator;
+  }
+  async validate() {
+    return [
+      ...await super.validate()
+      // ...this.validateResultSet()
+    ];
+  }
+  async validateResultSet() {
+    const errors = [];
+    try {
+      const resultSetHash = assertEx(this.obj.resultSet, "Missing ResultSet");
+      const wrapper = BoundWitnessWrapper.parse(this.obj);
+      const resultSet = PayloadWrapper.wrap((await wrapper.payloadMap())[resultSetHash]);
+      const required = 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
+var QueryBoundWitnessWrapper = class _QueryBoundWitnessWrapper extends BoundWitnessWrapper2 {
   _payloadsWithoutQuery;
   _query;
   _resultSet;
   isQueryBoundWitnessWrapper = true;
   static parseQuery(obj, payloads) {
-    assertEx(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
+    assertEx2(!Array.isArray(obj), "Array can not be converted to QueryBoundWitnessWrapper");
     switch (typeof obj) {
       case "object": {
         const castWrapper = obj;
-        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper(obj, payloads);
+        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new _QueryBoundWitnessWrapper(obj, payloads);
         return wrapper;
       }
     }
@@ -26,12 +80,12 @@ class QueryBoundWitnessWrapper extends BoundWitnessWrapper {
   async getQuery() {
     const payloadMap = await this.allPayloadMap();
     this._query = this._query ?? payloadMap[this.boundwitness.query];
-    return assertEx(this._query, `Missing Query [${this.boundwitness}]`);
+    return assertEx2(this._query, `Missing Query [${this.boundwitness}]`);
   }
   async getResultSet() {
     const resultSetHash = this.boundwitness.resultSet;
     const payloadMap = await this.payloadMap();
-    return assertEx(
+    return assertEx2(
       this._resultSet = this._resultSet ?? (resultSetHash ? payloadMap[resultSetHash] : void 0),
       `Missing resultSet [${resultSetHash}]`
     );
@@ -41,11 +95,11 @@ class QueryBoundWitnessWrapper extends BoundWitnessWrapper {
       (await PayloadHasher.filterExclude(
         (await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),
         this.payload().query
-      )).map((payload) => PayloadWrapper.wrap(payload))
+      )).map((payload) => PayloadWrapper2.wrap(payload))
     );
     return this._payloadsWithoutQuery;
   }
-}
+};
 export {
   QueryBoundWitnessWrapper
 };

package/dist/browser/Query/QueryBoundWitnessWrapper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/Query/QueryBoundWitnessWrapper.ts"],"sourcesContent":["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":"AAAA,SAAS,gBAAgB;AACzB,SAAS,eAAe;AACxB,SAAS,2BAA2B;AACpC,SAAS,qBAAqB;AAE9B,SAAS,sBAAsB;AAG/B,SAAS,kCAAkC;AAEpC,MAAM,iCAA0D,oBAAuC;AAAA,EACpG;AAAA,EACA;AAAA,EACA;AAAA,EAEA,6BAA6B;AAAA,EAErC,OAAO,WAAoC,KAAc,UAAmD;AAC1G,aAAS,CAAC,MAAM,QAAQ,GAAG,GAAG,wDAAwD;AACtF,YAAQ,OAAO,KAAK;AAAA,MAClB,KAAK,UAAU;AACb,cAAM,cAAc;AACpB,cAAM,UAAU,aAAa,6BAA6B,cAAc,IAAI,yBAA4B,KAA0B,QAAQ;AAI1I,eAAO;AAAA,MACT;AAAA,IACF;AACA,UAAM,MAAM,oBAAoB,OAAO,GAAG,GAAG;AAAA,EAC/C;AAAA,EAES,YAAY;AACnB,WAAO,IAAI,2BAA2B,KAAK,YAAY,EAAE,SAAS;AAAA,EACpE;AAAA,EAEA,MAAM,WAAuB;AAC3B,UAAM,aAAa,MAAM,KAAK,cAAc;AAC5C,SAAK,SAAS,KAAK,UAAW,WAAW,KAAK,aAAa,KAAK;AAChE,WAAO,SAAS,KAAK,QAAQ,kBAAkB,KAAK,YAAY,GAAG;AAAA,EACrE;AAAA,EAEA,MAAM,eAAe;AACnB,UAAM,gBAAgB,KAAK,aAAa;AACxC,UAAM,aAAa,MAAM,KAAK,WAAW;AACzC,WAAO;AAAA,MACJ,KAAK,aAAa,KAAK,eAAe,gBAAiB,WAAW,aAAa,IAAsC;AAAA,MACtH,sBAAsB,aAAa;AAAA,IACrC;AAAA,EACF;AAAA,EAEA,MAAe,qBAAyD;AACtE,SAAK,wBACH,KAAK,yBACL;AAAA,OAEI,MAAM,cAAc;AAAA,SACjB,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,QAAQ,QAAQ,CAAC;AAAA,QACrE,KAAK,QAAQ,EAAE;AAAA,MACjB,GACA,IAAI,CAAC,YAAY,eAAe,KAAK,OAAO,CAAC;AAAA,IACjD;AACF,WAAO,KAAK;AAAA,EACd;AACF;","names":[]}
+{"version":3,"sources":["../../../src/Query/QueryBoundWitnessWrapper.ts","../../../src/Query/QueryBoundWitnessValidator.ts","../../../src/Query/QueryBoundWitness.ts"],"sourcesContent":["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","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 { 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"],"mappings":"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","names":["assertEx","BoundWitnessWrapper","PayloadWrapper","BoundWitnessWrapper","assertEx","PayloadWrapper"]}