@xyo-network/diviner-boundwitness-memory 3.5.2 → 3.6.0-rc.2

package/dist/neutral/MemoryBoundWitnessDiviner.d.ts

@@ -1,7 +1,6 @@
 import type { BoundWitness } from '@xyo-network/boundwitness-model';
 import { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract';
 import type { BoundWitnessDivinerParams, BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model';
-import type { WithMeta } from '@xyo-network/payload-model';
 export interface EqualityComparisonOperators {
     /**
      * 'Not Equal To' comparison operator.
@@ -47,6 +46,6 @@ export interface EqualityComparisonOperators {
     '>=': string;
 }
 export declare class MemoryBoundWitnessDiviner<TParams extends BoundWitnessDivinerParams = BoundWitnessDivinerParams, TIn extends BoundWitnessDivinerQueryPayload = BoundWitnessDivinerQueryPayload, TOut extends BoundWitness = BoundWitness> extends BoundWitnessDiviner<TParams, TIn, TOut> {
-    protected divineHandler(payloads?: TIn[]): Promise<WithMeta<TOut>[]>;
+    protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
 }
 //# sourceMappingURL=MemoryBoundWitnessDiviner.d.ts.map

package/dist/neutral/MemoryBoundWitnessDiviner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryBoundWitnessDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryBoundWitnessDiviner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAChF,OAAO,KAAK,EACV,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,yCAAyC,CAAA;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAI1D,MAAM,WAAW,2BAA2B;IAC1C;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAA;IAEX;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAA;IAEX;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAA;IAEX;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAA;CACb;AAED,qBAAa,yBAAyB,CACpC,OAAO,SAAS,yBAAyB,GAAG,yBAAyB,EACrE,GAAG,SAAS,+BAA+B,GAAG,+BAA+B,EAC7E,IAAI,SAAS,YAAY,GAAG,YAAY,CACxC,SAAQ,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC;cACtB,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE;CAOxD"}
+{"version":3,"file":"MemoryBoundWitnessDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryBoundWitnessDiviner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAEnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAChF,OAAO,KAAK,EACV,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,yCAAyC,CAAA;AAKhD,MAAM,WAAW,2BAA2B;IAC1C;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAA;IAEX;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAA;IAEZ;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAA;IAEX;;;;;OAKG;IACH,GAAG,EAAE,MAAM,CAAA;IAEX;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAA;CACb;AAED,qBAAa,yBAAyB,CACpC,OAAO,SAAS,yBAAyB,GAAG,yBAAyB,EACrE,GAAG,SAAS,+BAA+B,GAAG,+BAA+B,EAC7E,IAAI,SAAS,YAAY,GAAG,YAAY,CACxC,SAAQ,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC;cACtB,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE;CAOxD"}

package/dist/neutral/applyBoundWitnessDivinerQueryPayload.d.ts

@@ -1,6 +1,5 @@
+import type { BoundWitness } from '@xyo-network/boundwitness-model';
 import type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model';
-import type { Payload, WithMeta } from '@xyo-network/payload-model';
-export declare const applyBoundWitnessDivinerQueryPayload: (filter?: BoundWitnessDivinerQueryPayload, payloads?: Payload[]) => WithMeta<import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
-    schema: "network.xyo.boundwitness";
-}>[];
+import type { Payload } from '@xyo-network/payload-model';
+export declare const applyBoundWitnessDivinerQueryPayload: (filter?: BoundWitnessDivinerQueryPayload, payloads?: Payload[]) => BoundWitness[];
 //# sourceMappingURL=applyBoundWitnessDivinerQueryPayload.d.ts.map

package/dist/neutral/applyBoundWitnessDivinerQueryPayload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyBoundWitnessDivinerQueryPayload.d.ts","sourceRoot":"","sources":["../../src/applyBoundWitnessDivinerQueryPayload.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAA;AAC9F,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AAMnE,eAAO,MAAM,oCAAoC,YAAa,+BAA+B,aAAY,OAAO,EAAE;;IAoCjH,CAAA"}
+{"version":3,"file":"applyBoundWitnessDivinerQueryPayload.d.ts","sourceRoot":"","sources":["../../src/applyBoundWitnessDivinerQueryPayload.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAInE,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAA;AAC9F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAGzD,eAAO,MAAM,oCAAoC,YAAa,+BAA+B,aAAY,OAAO,EAAE,mBA0CjH,CAAA"}

package/dist/neutral/index.mjs

@@ -6,27 +6,29 @@ import { containsAll } from "@xylabs/array";
 import { assertEx } from "@xylabs/assert";
 import { exists } from "@xylabs/exists";
 import { hexFromHexString } from "@xylabs/hex";
-import { isBoundWitness } from "@xyo-network/boundwitness-model";
-var hasTimestamp = /* @__PURE__ */ __name((bw) => bw.timestamp !== void 0, "hasTimestamp");
+import { hasBlock, hasMetaTimestamp, isBoundWitness } from "@xyo-network/boundwitness-model";
 var applyBoundWitnessDivinerQueryPayload = /* @__PURE__ */ __name((filter, payloads = []) => {
   if (!filter) return [];
-  const { addresses, payload_hashes, payload_schemas, limit, offset, order = "desc", sourceQuery, destination, timestamp } = filter;
+  const { addresses, payload_hashes, payload_schemas, block, limit, offset, order = "desc", sourceQuery, destination, timestamp } = filter;
   let bws = payloads.filter(isBoundWitness);
   if (order === "desc") bws = bws.reverse();
   const allAddresses = addresses?.map((address) => hexFromHexString(address)).filter(exists);
   if (allAddresses?.length) bws = bws.filter((bw) => containsAll(bw.addresses, allAddresses));
   if (payload_hashes?.length) bws = bws.filter((bw) => containsAll(bw.payload_hashes, payload_hashes));
   if (payload_schemas?.length) bws = bws.filter((bw) => containsAll(bw.payload_schemas, payload_schemas));
-  if (sourceQuery) bws = bws.filter((bw) => bw?.$meta?.sourceQuery === sourceQuery);
+  if (sourceQuery) bws = bws.filter((bw) => bw?.$sourceQuery === sourceQuery);
   if (destination && Array.isArray(destination) && destination?.length > 0) {
     const targetFilter = assertEx(destination, () => "Missing destination");
     bws = bws.filter((bw) => {
-      const targetDestinationField = bw?.$meta?.destination;
+      const targetDestinationField = bw?.$destination;
       return targetDestinationField !== void 0 && Array.isArray(targetDestinationField) && targetDestinationField.length > 0 ? containsAll(targetFilter, targetDestinationField ?? []) : false;
     });
   }
+  if (block !== void 0) {
+    bws = order === "desc" ? bws.filter(hasBlock).filter((bw) => bw.block <= block) : bws.filter(hasBlock).filter((bw) => bw.block >= block);
+  }
   if (timestamp !== void 0) {
-    bws = order === "desc" ? bws.filter(hasTimestamp).filter((bw) => bw.timestamp <= timestamp) : bws.filter(hasTimestamp).filter((bw) => bw.timestamp >= timestamp);
+    bws = order === "desc" ? bws.filter(hasMetaTimestamp).filter((bw) => bw.$timestamp <= timestamp) : bws.filter(hasMetaTimestamp).filter((bw) => bw.$timestamp >= timestamp);
   }
   const parsedLimit = limit ?? bws.length;
   const parsedOffset = offset ?? 0;

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/applyBoundWitnessDivinerQueryPayload.ts","../../src/MemoryBoundWitnessDiviner.ts"],"sourcesContent":["import { containsAll } from '@xylabs/array'\nimport { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { hexFromHexString } from '@xylabs/hex'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { isBoundWitness } from '@xyo-network/boundwitness-model'\nimport type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport type { Payload, WithMeta } from '@xyo-network/payload-model'\n\ntype WithTimestamp = BoundWitness & { timestamp: number }\nconst hasTimestamp = (bw: BoundWitness): bw is WithTimestamp => bw.timestamp !== undefined\n\n// eslint-disable-next-line complexity\nexport const applyBoundWitnessDivinerQueryPayload = (filter?: BoundWitnessDivinerQueryPayload, payloads: Payload[] = []) => {\n  if (!filter) return []\n  const {\n    addresses, payload_hashes, payload_schemas, limit, offset, order = 'desc', sourceQuery, destination, timestamp,\n  } = filter\n\n  let bws = payloads.filter(isBoundWitness) as WithMeta<BoundWitness>[]\n  if (order === 'desc') bws = bws.reverse()\n  const allAddresses = addresses?.map(address => hexFromHexString(address)).filter(exists)\n  if (allAddresses?.length) bws = bws.filter(bw => containsAll(bw.addresses, allAddresses))\n  if (payload_hashes?.length) bws = bws.filter(bw => containsAll(bw.payload_hashes, payload_hashes))\n  if (payload_schemas?.length) bws = bws.filter(bw => containsAll(bw.payload_schemas, payload_schemas))\n  if (sourceQuery) bws = bws.filter(bw => (bw?.$meta as { sourceQuery?: string })?.sourceQuery === sourceQuery)\n  // If there's a destination filter of the right kind\n  if (destination && Array.isArray(destination) && destination?.length > 0) {\n    const targetFilter = assertEx(destination, () => 'Missing destination')\n    // Find all BWs that satisfy the destination constraint\n    bws = bws.filter((bw) => {\n      const targetDestinationField = (bw?.$meta as { destination?: string[] })?.destination\n      // If the destination field is an array and contains at least one element\n      return targetDestinationField !== undefined && Array.isArray(targetDestinationField) && targetDestinationField.length > 0\n      // Check that the targetDestinationField contains all the elements in the targetFilter\n        ? containsAll(targetFilter, targetDestinationField ?? [])\n      // Otherwise, filter it out\n        : false\n    })\n  }\n  if (timestamp !== undefined) {\n    bws\n      = order === 'desc'\n        ? bws.filter(hasTimestamp).filter(bw => bw.timestamp <= timestamp)\n        : bws.filter(hasTimestamp).filter(bw => bw.timestamp >= timestamp)\n  }\n  const parsedLimit = limit ?? bws.length\n  const parsedOffset = offset ?? 0\n  return bws.slice(parsedOffset, parsedLimit)\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type {\n  BoundWitnessDivinerParams,\n  BoundWitnessDivinerQueryPayload,\n} from '@xyo-network/diviner-boundwitness-model'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport type { WithMeta } from '@xyo-network/payload-model'\n\nimport { applyBoundWitnessDivinerQueryPayload } from './applyBoundWitnessDivinerQueryPayload.ts'\n\nexport interface EqualityComparisonOperators {\n  /**\n   * 'Not Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value does not match the provided string.\n   * Example: field != 'value'\n   */\n  '!=': string\n\n  /**\n   * 'Less Than' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically less than the provided string.\n   * Example: field < 'value'\n   */\n  '<': string\n\n  /**\n   * 'Less Than or Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically less than or equal to the provided string.\n   * Example: field <= 'value'\n   */\n  '<=': string\n\n  /**\n   * 'Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value matches the provided string exactly.\n   * Example: field = 'value'\n   */\n  '=': string\n\n  /**\n   * 'Greater Than' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically greater than the provided string.\n   * Example: field > 'value'\n   */\n  '>': string\n\n  /**\n   * 'Greater Than or Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically greater than or equal to the provided string.\n   * Example: field >= 'value'\n   */\n  '>=': string\n}\n\nexport class MemoryBoundWitnessDiviner<\n  TParams extends BoundWitnessDivinerParams = BoundWitnessDivinerParams,\n  TIn extends BoundWitnessDivinerQueryPayload = BoundWitnessDivinerQueryPayload,\n  TOut extends BoundWitness = BoundWitness,\n> extends BoundWitnessDiviner<TParams, TIn, TOut> {\n  protected override async divineHandler(payloads?: TIn[]) {\n    const filter = assertEx(payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop(), () => 'Missing query payload')\n    if (!filter) return []\n    const archivist = assertEx(await this.archivistInstance(), () => 'Unable to resolve archivist')\n    let bws = ((await archivist?.all?.()) ?? []).filter(isBoundWitness) as WithMeta<BoundWitness>[]\n    return applyBoundWitnessDivinerQueryPayload(filter, bws) as WithMeta<TOut>[]\n  }\n}\n"],"mappings":";;;;AAAA,SAASA,mBAAmB;AAC5B,SAASC,gBAAgB;AACzB,SAASC,cAAc;AACvB,SAASC,wBAAwB;AAEjC,SAASC,sBAAsB;AAK/B,IAAMC,eAAe,wBAACC,OAA0CA,GAAGC,cAAcC,QAA5D;AAGd,IAAMC,uCAAuC,wBAACC,QAA0CC,WAAsB,CAAA,MAAE;AACrH,MAAI,CAACD,OAAQ,QAAO,CAAA;AACpB,QAAM,EACJE,WAAWC,gBAAgBC,iBAAiBC,OAAOC,QAAQC,QAAQ,QAAQC,aAAaC,aAAaZ,UAAS,IAC5GG;AAEJ,MAAIU,MAAMT,SAASD,OAAOW,cAAAA;AAC1B,MAAIJ,UAAU,OAAQG,OAAMA,IAAIE,QAAO;AACvC,QAAMC,eAAeX,WAAWY,IAAIC,CAAAA,YAAWC,iBAAiBD,OAAAA,CAAAA,EAAUf,OAAOiB,MAAAA;AACjF,MAAIJ,cAAcK,OAAQR,OAAMA,IAAIV,OAAOJ,CAAAA,OAAMuB,YAAYvB,GAAGM,WAAWW,YAAAA,CAAAA;AAC3E,MAAIV,gBAAgBe,OAAQR,OAAMA,IAAIV,OAAOJ,CAAAA,OAAMuB,YAAYvB,GAAGO,gBAAgBA,cAAAA,CAAAA;AAClF,MAAIC,iBAAiBc,OAAQR,OAAMA,IAAIV,OAAOJ,CAAAA,OAAMuB,YAAYvB,GAAGQ,iBAAiBA,eAAAA,CAAAA;AACpF,MAAII,YAAaE,OAAMA,IAAIV,OAAOJ,CAAAA,OAAOA,IAAIwB,OAAoCZ,gBAAgBA,WAAAA;AAEjG,MAAIC,eAAeY,MAAMC,QAAQb,WAAAA,KAAgBA,aAAaS,SAAS,GAAG;AACxE,UAAMK,eAAeC,SAASf,aAAa,MAAM,qBAAA;AAEjDC,UAAMA,IAAIV,OAAO,CAACJ,OAAAA;AAChB,YAAM6B,yBAA0B7B,IAAIwB,OAAsCX;AAE1E,aAAOgB,2BAA2B3B,UAAauB,MAAMC,QAAQG,sBAAAA,KAA2BA,uBAAuBP,SAAS,IAEpHC,YAAYI,cAAcE,0BAA0B,CAAA,CAAE,IAEtD;IACN,CAAA;EACF;AACA,MAAI5B,cAAcC,QAAW;AAC3BY,UACIH,UAAU,SACRG,IAAIV,OAAOL,YAAAA,EAAcK,OAAOJ,CAAAA,OAAMA,GAAGC,aAAaA,SAAAA,IACtDa,IAAIV,OAAOL,YAAAA,EAAcK,OAAOJ,CAAAA,OAAMA,GAAGC,aAAaA,SAAAA;EAC9D;AACA,QAAM6B,cAAcrB,SAASK,IAAIQ;AACjC,QAAMS,eAAerB,UAAU;AAC/B,SAAOI,IAAIkB,MAAMD,cAAcD,WAAAA;AACjC,GApCoD;;;ACbpD,SAASG,YAAAA,iBAAgB;AAEzB,SAASC,kBAAAA,uBAAsB;AAC/B,SAASC,2BAA2B;AAKpC,SAASC,yCAAyC;AAuD3C,IAAMC,4BAAN,cAIGC,oBAAAA;EAnEV,OAmEUA;;;EACR,MAAyBC,cAAcC,UAAkB;AACvD,UAAMC,SAASC,UAASF,UAAUC,OAAOE,iCAAAA,GAAoCC,IAAAA,GAAO,MAAM,uBAAA;AAC1F,QAAI,CAACH,OAAQ,QAAO,CAAA;AACpB,UAAMI,YAAYH,UAAS,MAAM,KAAKI,kBAAiB,GAAI,MAAM,6BAAA;AACjE,QAAIC,OAAQ,MAAMF,WAAWG,MAAAA,KAAY,CAAA,GAAIP,OAAOQ,eAAAA;AACpD,WAAOC,qCAAqCT,QAAQM,GAAAA;EACtD;AACF;","names":["containsAll","assertEx","exists","hexFromHexString","isBoundWitness","hasTimestamp","bw","timestamp","undefined","applyBoundWitnessDivinerQueryPayload","filter","payloads","addresses","payload_hashes","payload_schemas","limit","offset","order","sourceQuery","destination","bws","isBoundWitness","reverse","allAddresses","map","address","hexFromHexString","exists","length","containsAll","$meta","Array","isArray","targetFilter","assertEx","targetDestinationField","parsedLimit","parsedOffset","slice","assertEx","isBoundWitness","BoundWitnessDiviner","isBoundWitnessDivinerQueryPayload","MemoryBoundWitnessDiviner","BoundWitnessDiviner","divineHandler","payloads","filter","assertEx","isBoundWitnessDivinerQueryPayload","pop","archivist","archivistInstance","bws","all","isBoundWitness","applyBoundWitnessDivinerQueryPayload"]}
+{"version":3,"sources":["../../src/applyBoundWitnessDivinerQueryPayload.ts","../../src/MemoryBoundWitnessDiviner.ts"],"sourcesContent":["import { containsAll } from '@xylabs/array'\nimport { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport { hexFromHexString } from '@xylabs/hex'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport {\n  hasBlock, hasMetaTimestamp, isBoundWitness,\n} from '@xyo-network/boundwitness-model'\nimport type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport type { Payload } from '@xyo-network/payload-model'\n\n// eslint-disable-next-line complexity\nexport const applyBoundWitnessDivinerQueryPayload = (filter?: BoundWitnessDivinerQueryPayload, payloads: Payload[] = []) => {\n  if (!filter) return []\n  const {\n    addresses, payload_hashes, payload_schemas, block, limit, offset, order = 'desc', sourceQuery, destination, timestamp,\n  } = filter\n\n  let bws = payloads.filter(isBoundWitness) as BoundWitness[]\n  if (order === 'desc') bws = bws.reverse()\n  const allAddresses = addresses?.map(address => hexFromHexString(address)).filter(exists)\n  if (allAddresses?.length) bws = bws.filter(bw => containsAll(bw.addresses, allAddresses))\n  if (payload_hashes?.length) bws = bws.filter(bw => containsAll(bw.payload_hashes, payload_hashes))\n  if (payload_schemas?.length) bws = bws.filter(bw => containsAll(bw.payload_schemas, payload_schemas))\n  if (sourceQuery) bws = bws.filter(bw => ((bw as { $sourceQuery?: string })?.$sourceQuery) === sourceQuery)\n  // If there's a destination filter of the right kind\n  if (destination && Array.isArray(destination) && destination?.length > 0) {\n    const targetFilter = assertEx(destination, () => 'Missing destination')\n    // Find all BWs that satisfy the destination constraint\n    bws = bws.filter((bw) => {\n      const targetDestinationField = (bw as { $destination?: string[] })?.$destination\n      // If the destination field is an array and contains at least one element\n      return targetDestinationField !== undefined && Array.isArray(targetDestinationField) && targetDestinationField.length > 0\n      // Check that the targetDestinationField contains all the elements in the targetFilter\n        ? containsAll(targetFilter, targetDestinationField ?? [])\n      // Otherwise, filter it out\n        : false\n    })\n  }\n  if (block !== undefined) {\n    bws\n      = order === 'desc'\n        ? bws.filter(hasBlock).filter(bw => bw.block <= block)\n        : bws.filter(hasBlock).filter(bw => bw.block >= block)\n  }\n  if (timestamp !== undefined) {\n    bws\n      = order === 'desc'\n        ? bws.filter(hasMetaTimestamp).filter(bw => bw.$timestamp <= timestamp)\n        : bws.filter(hasMetaTimestamp).filter(bw => bw.$timestamp >= timestamp)\n  }\n  const parsedLimit = limit ?? bws.length\n  const parsedOffset = offset ?? 0\n  return bws.slice(parsedOffset, parsedLimit)\n}\n","import { assertEx } from '@xylabs/assert'\nimport type { BoundWitness } from '@xyo-network/boundwitness-model'\nimport { isBoundWitness } from '@xyo-network/boundwitness-model'\nimport { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type {\n  BoundWitnessDivinerParams,\n  BoundWitnessDivinerQueryPayload,\n} from '@xyo-network/diviner-boundwitness-model'\nimport { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\n\nimport { applyBoundWitnessDivinerQueryPayload } from './applyBoundWitnessDivinerQueryPayload.ts'\n\nexport interface EqualityComparisonOperators {\n  /**\n   * 'Not Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value does not match the provided string.\n   * Example: field != 'value'\n   */\n  '!=': string\n\n  /**\n   * 'Less Than' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically less than the provided string.\n   * Example: field < 'value'\n   */\n  '<': string\n\n  /**\n   * 'Less Than or Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically less than or equal to the provided string.\n   * Example: field <= 'value'\n   */\n  '<=': string\n\n  /**\n   * 'Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value matches the provided string exactly.\n   * Example: field = 'value'\n   */\n  '=': string\n\n  /**\n   * 'Greater Than' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically greater than the provided string.\n   * Example: field > 'value'\n   */\n  '>': string\n\n  /**\n   * 'Greater Than or Equal To' comparison operator.\n   * Compares the field with the specified string value,\n   * selecting records where the field value is lexicographically greater than or equal to the provided string.\n   * Example: field >= 'value'\n   */\n  '>=': string\n}\n\nexport class MemoryBoundWitnessDiviner<\n  TParams extends BoundWitnessDivinerParams = BoundWitnessDivinerParams,\n  TIn extends BoundWitnessDivinerQueryPayload = BoundWitnessDivinerQueryPayload,\n  TOut extends BoundWitness = BoundWitness,\n> extends BoundWitnessDiviner<TParams, TIn, TOut> {\n  protected override async divineHandler(payloads?: TIn[]) {\n    const filter = assertEx(payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop(), () => 'Missing query payload')\n    if (!filter) return []\n    const archivist = assertEx(await this.archivistInstance(), () => 'Unable to resolve archivist')\n    let bws = ((await archivist?.all?.()) ?? []).filter(isBoundWitness) as BoundWitness[]\n    return applyBoundWitnessDivinerQueryPayload(filter, bws) as TOut[]\n  }\n}\n"],"mappings":";;;;AAAA,SAASA,mBAAmB;AAC5B,SAASC,gBAAgB;AACzB,SAASC,cAAc;AACvB,SAASC,wBAAwB;AAEjC,SACEC,UAAUC,kBAAkBC,sBACvB;AAKA,IAAMC,uCAAuC,wBAACC,QAA0CC,WAAsB,CAAA,MAAE;AACrH,MAAI,CAACD,OAAQ,QAAO,CAAA;AACpB,QAAM,EACJE,WAAWC,gBAAgBC,iBAAiBC,OAAOC,OAAOC,QAAQC,QAAQ,QAAQC,aAAaC,aAAaC,UAAS,IACnHX;AAEJ,MAAIY,MAAMX,SAASD,OAAOa,cAAAA;AAC1B,MAAIL,UAAU,OAAQI,OAAMA,IAAIE,QAAO;AACvC,QAAMC,eAAeb,WAAWc,IAAIC,CAAAA,YAAWC,iBAAiBD,OAAAA,CAAAA,EAAUjB,OAAOmB,MAAAA;AACjF,MAAIJ,cAAcK,OAAQR,OAAMA,IAAIZ,OAAOqB,CAAAA,OAAMC,YAAYD,GAAGnB,WAAWa,YAAAA,CAAAA;AAC3E,MAAIZ,gBAAgBiB,OAAQR,OAAMA,IAAIZ,OAAOqB,CAAAA,OAAMC,YAAYD,GAAGlB,gBAAgBA,cAAAA,CAAAA;AAClF,MAAIC,iBAAiBgB,OAAQR,OAAMA,IAAIZ,OAAOqB,CAAAA,OAAMC,YAAYD,GAAGjB,iBAAiBA,eAAAA,CAAAA;AACpF,MAAIK,YAAaG,OAAMA,IAAIZ,OAAOqB,CAAAA,OAAQA,IAAkCE,iBAAkBd,WAAAA;AAE9F,MAAIC,eAAec,MAAMC,QAAQf,WAAAA,KAAgBA,aAAaU,SAAS,GAAG;AACxE,UAAMM,eAAeC,SAASjB,aAAa,MAAM,qBAAA;AAEjDE,UAAMA,IAAIZ,OAAO,CAACqB,OAAAA;AAChB,YAAMO,yBAA0BP,IAAoCQ;AAEpE,aAAOD,2BAA2BE,UAAaN,MAAMC,QAAQG,sBAAAA,KAA2BA,uBAAuBR,SAAS,IAEpHE,YAAYI,cAAcE,0BAA0B,CAAA,CAAE,IAEtD;IACN,CAAA;EACF;AACA,MAAIvB,UAAUyB,QAAW;AACvBlB,UACIJ,UAAU,SACRI,IAAIZ,OAAO+B,QAAAA,EAAU/B,OAAOqB,CAAAA,OAAMA,GAAGhB,SAASA,KAAAA,IAC9CO,IAAIZ,OAAO+B,QAAAA,EAAU/B,OAAOqB,CAAAA,OAAMA,GAAGhB,SAASA,KAAAA;EACtD;AACA,MAAIM,cAAcmB,QAAW;AAC3BlB,UACIJ,UAAU,SACRI,IAAIZ,OAAOgC,gBAAAA,EAAkBhC,OAAOqB,CAAAA,OAAMA,GAAGY,cAActB,SAAAA,IAC3DC,IAAIZ,OAAOgC,gBAAAA,EAAkBhC,OAAOqB,CAAAA,OAAMA,GAAGY,cAActB,SAAAA;EACnE;AACA,QAAMuB,cAAc5B,SAASM,IAAIQ;AACjC,QAAMe,eAAe5B,UAAU;AAC/B,SAAOK,IAAIwB,MAAMD,cAAcD,WAAAA;AACjC,GA1CoD;;;ACZpD,SAASG,YAAAA,iBAAgB;AAEzB,SAASC,kBAAAA,uBAAsB;AAC/B,SAASC,2BAA2B;AAKpC,SAASC,yCAAyC;AAsD3C,IAAMC,4BAAN,cAIGC,oBAAAA;EAlEV,OAkEUA;;;EACR,MAAyBC,cAAcC,UAAkB;AACvD,UAAMC,SAASC,UAASF,UAAUC,OAAOE,iCAAAA,GAAoCC,IAAAA,GAAO,MAAM,uBAAA;AAC1F,QAAI,CAACH,OAAQ,QAAO,CAAA;AACpB,UAAMI,YAAYH,UAAS,MAAM,KAAKI,kBAAiB,GAAI,MAAM,6BAAA;AACjE,QAAIC,OAAQ,MAAMF,WAAWG,MAAAA,KAAY,CAAA,GAAIP,OAAOQ,eAAAA;AACpD,WAAOC,qCAAqCT,QAAQM,GAAAA;EACtD;AACF;","names":["containsAll","assertEx","exists","hexFromHexString","hasBlock","hasMetaTimestamp","isBoundWitness","applyBoundWitnessDivinerQueryPayload","filter","payloads","addresses","payload_hashes","payload_schemas","block","limit","offset","order","sourceQuery","destination","timestamp","bws","isBoundWitness","reverse","allAddresses","map","address","hexFromHexString","exists","length","bw","containsAll","$sourceQuery","Array","isArray","targetFilter","assertEx","targetDestinationField","$destination","undefined","hasBlock","hasMetaTimestamp","$timestamp","parsedLimit","parsedOffset","slice","assertEx","isBoundWitness","BoundWitnessDiviner","isBoundWitnessDivinerQueryPayload","MemoryBoundWitnessDiviner","BoundWitnessDiviner","divineHandler","payloads","filter","assertEx","isBoundWitnessDivinerQueryPayload","pop","archivist","archivistInstance","bws","all","isBoundWitness","applyBoundWitnessDivinerQueryPayload"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-boundwitness-memory",
-  "version": "3.5.2",
+  "version": "3.6.0-rc.2",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,28 +29,29 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/array": "^4.4.9",
-    "@xylabs/assert": "^4.4.9",
-    "@xylabs/exists": "^4.4.9",
-    "@xylabs/hex": "^4.4.9",
-    "@xyo-network/boundwitness-model": "^3.5.2",
-    "@xyo-network/diviner-boundwitness-abstract": "^3.5.2",
-    "@xyo-network/diviner-boundwitness-model": "^3.5.2",
-    "@xyo-network/payload-model": "^3.5.2"
+    "@xylabs/array": "^4.4.12",
+    "@xylabs/assert": "^4.4.12",
+    "@xylabs/exists": "^4.4.12",
+    "@xylabs/hex": "^4.4.12",
+    "@xyo-network/boundwitness-model": "^3.6.0-rc.2",
+    "@xyo-network/diviner-boundwitness-abstract": "^3.6.0-rc.2",
+    "@xyo-network/diviner-boundwitness-model": "^3.6.0-rc.2",
+    "@xyo-network/payload-model": "^3.6.0-rc.2"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^4.2.4",
     "@xylabs/tsconfig": "^4.2.4",
-    "@xylabs/vitest-extended": "^4.4.9",
-    "@xyo-network/account": "^3.5.2",
-    "@xyo-network/archivist-memory": "^3.5.2",
-    "@xyo-network/boundwitness-builder": "^3.5.2",
-    "@xyo-network/node-memory": "^3.5.2",
-    "@xyo-network/payload-builder": "^3.5.2",
+    "@xylabs/vitest-extended": "^4.4.12",
+    "@xyo-network/account": "^3.6.0-rc.2",
+    "@xyo-network/archivist-memory": "^3.6.0-rc.2",
+    "@xyo-network/boundwitness-builder": "^3.6.0-rc.2",
+    "@xyo-network/node-memory": "^3.6.0-rc.2",
+    "@xyo-network/payload-builder": "^3.6.0-rc.2",
     "typescript": "^5.7.2",
-    "vitest": "^2.1.5"
+    "vitest": "^2.1.8"
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "stableVersion": "3.5.2"
 }

package/src/MemoryBoundWitnessDiviner.ts

@@ -7,7 +7,6 @@ import type {
   BoundWitnessDivinerQueryPayload,
 } from '@xyo-network/diviner-boundwitness-model'
 import { isBoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'
-import type { WithMeta } from '@xyo-network/payload-model'
 
 import { applyBoundWitnessDivinerQueryPayload } from './applyBoundWitnessDivinerQueryPayload.ts'
 
@@ -70,7 +69,7 @@ export class MemoryBoundWitnessDiviner<
     const filter = assertEx(payloads?.filter(isBoundWitnessDivinerQueryPayload)?.pop(), () => 'Missing query payload')
     if (!filter) return []
     const archivist = assertEx(await this.archivistInstance(), () => 'Unable to resolve archivist')
-    let bws = ((await archivist?.all?.()) ?? []).filter(isBoundWitness) as WithMeta<BoundWitness>[]
-    return applyBoundWitnessDivinerQueryPayload(filter, bws) as WithMeta<TOut>[]
+    let bws = ((await archivist?.all?.()) ?? []).filter(isBoundWitness) as BoundWitness[]
+    return applyBoundWitnessDivinerQueryPayload(filter, bws) as TOut[]
   }
 }

package/src/applyBoundWitnessDivinerQueryPayload.ts

@@ -3,33 +3,32 @@ import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
 import { hexFromHexString } from '@xylabs/hex'
 import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { isBoundWitness } from '@xyo-network/boundwitness-model'
+import {
+  hasBlock, hasMetaTimestamp, isBoundWitness,
+} from '@xyo-network/boundwitness-model'
 import type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'
-import type { Payload, WithMeta } from '@xyo-network/payload-model'
-
-type WithTimestamp = BoundWitness & { timestamp: number }
-const hasTimestamp = (bw: BoundWitness): bw is WithTimestamp => bw.timestamp !== undefined
+import type { Payload } from '@xyo-network/payload-model'
 
 // eslint-disable-next-line complexity
 export const applyBoundWitnessDivinerQueryPayload = (filter?: BoundWitnessDivinerQueryPayload, payloads: Payload[] = []) => {
   if (!filter) return []
   const {
-    addresses, payload_hashes, payload_schemas, limit, offset, order = 'desc', sourceQuery, destination, timestamp,
+    addresses, payload_hashes, payload_schemas, block, limit, offset, order = 'desc', sourceQuery, destination, timestamp,
   } = filter
 
-  let bws = payloads.filter(isBoundWitness) as WithMeta<BoundWitness>[]
+  let bws = payloads.filter(isBoundWitness) as BoundWitness[]
   if (order === 'desc') bws = bws.reverse()
   const allAddresses = addresses?.map(address => hexFromHexString(address)).filter(exists)
   if (allAddresses?.length) bws = bws.filter(bw => containsAll(bw.addresses, allAddresses))
   if (payload_hashes?.length) bws = bws.filter(bw => containsAll(bw.payload_hashes, payload_hashes))
   if (payload_schemas?.length) bws = bws.filter(bw => containsAll(bw.payload_schemas, payload_schemas))
-  if (sourceQuery) bws = bws.filter(bw => (bw?.$meta as { sourceQuery?: string })?.sourceQuery === sourceQuery)
+  if (sourceQuery) bws = bws.filter(bw => ((bw as { $sourceQuery?: string })?.$sourceQuery) === sourceQuery)
   // If there's a destination filter of the right kind
   if (destination && Array.isArray(destination) && destination?.length > 0) {
     const targetFilter = assertEx(destination, () => 'Missing destination')
     // Find all BWs that satisfy the destination constraint
     bws = bws.filter((bw) => {
-      const targetDestinationField = (bw?.$meta as { destination?: string[] })?.destination
+      const targetDestinationField = (bw as { $destination?: string[] })?.$destination
       // If the destination field is an array and contains at least one element
       return targetDestinationField !== undefined && Array.isArray(targetDestinationField) && targetDestinationField.length > 0
       // Check that the targetDestinationField contains all the elements in the targetFilter
@@ -38,11 +37,17 @@ export const applyBoundWitnessDivinerQueryPayload = (filter?: BoundWitnessDivine
         : false
     })
   }
+  if (block !== undefined) {
+    bws
+      = order === 'desc'
+        ? bws.filter(hasBlock).filter(bw => bw.block <= block)
+        : bws.filter(hasBlock).filter(bw => bw.block >= block)
+  }
   if (timestamp !== undefined) {
     bws
       = order === 'desc'
-        ? bws.filter(hasTimestamp).filter(bw => bw.timestamp <= timestamp)
-        : bws.filter(hasTimestamp).filter(bw => bw.timestamp >= timestamp)
+        ? bws.filter(hasMetaTimestamp).filter(bw => bw.$timestamp <= timestamp)
+        : bws.filter(hasMetaTimestamp).filter(bw => bw.$timestamp >= timestamp)
   }
   const parsedLimit = limit ?? bws.length
   const parsedOffset = offset ?? 0