@xyo-network/diviner-payload-pointer-memory 3.6.9 → 3.6.11

package/dist/neutral/index.mjs

@@ -1,11 +1,11 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-
 // src/Diviner.ts
 import { assertEx as assertEx2 } from "@xylabs/assert";
 import { AbstractDiviner } from "@xyo-network/diviner-abstract";
 import { asDivinerInstance } from "@xyo-network/diviner-model";
-import { isPointerPayload, PayloadPointerDivinerConfigSchema } from "@xyo-network/diviner-payload-pointer-model";
+import {
+  isPointerPayload,
+  PayloadPointerDivinerConfigSchema
+} from "@xyo-network/diviner-payload-pointer-model";
 
 // src/findPayload.ts
 import { BoundWitnessWrapper } from "@xyo-network/boundwitness-wrapper";
@@ -17,8 +17,12 @@ import { PayloadWrapper } from "@xyo-network/payload-wrapper";
 // src/combineRules.ts
 import { assertEx } from "@xylabs/assert";
 import { exists } from "@xylabs/exists";
-import { isPayloadAddressRule, isPayloadSchemaRule, isPayloadSequenceOrderRule } from "@xyo-network/diviner-payload-pointer-model";
-var combineRules = /* @__PURE__ */ __name((rules) => {
+import {
+  isPayloadAddressRule,
+  isPayloadSchemaRule,
+  isPayloadSequenceOrderRule
+} from "@xyo-network/diviner-payload-pointer-model";
+var combineRules = (rules) => {
   const addresses = rules.flat().filter(isPayloadAddressRule).map((r) => r.address).filter(exists);
   const schemas = rules.flat().filter(isPayloadSchemaRule).map((r) => r.schema).filter(exists);
   assertEx(schemas.length, () => "At least one schema must be supplied");
@@ -32,12 +36,17 @@ var combineRules = /* @__PURE__ */ __name((rules) => {
     order,
     schemas
   };
-}, "combineRules");
+};
 
 // src/findPayload.ts
 var limit = 1;
-var createBoundWitnessFilterFromSearchCriteria = /* @__PURE__ */ __name((searchCriteria) => {
-  const { addresses, order = "desc", schemas, cursor } = searchCriteria;
+var createBoundWitnessFilterFromSearchCriteria = (searchCriteria) => {
+  const {
+    addresses,
+    order = "desc",
+    schemas,
+    cursor
+  } = searchCriteria;
   const query = {
     addresses,
     limit,
@@ -46,11 +55,9 @@ var createBoundWitnessFilterFromSearchCriteria = /* @__PURE__ */ __name((searchC
     schema: BoundWitnessDivinerQuerySchema
   };
   if (cursor) query.cursor = cursor;
-  return [
-    query
-  ];
-}, "createBoundWitnessFilterFromSearchCriteria");
-var createPayloadFilterFromSearchCriteria = /* @__PURE__ */ __name((searchCriteria) => {
+  return [query];
+};
+var createPayloadFilterFromSearchCriteria = (searchCriteria) => {
   const { order = "desc", schemas } = searchCriteria;
   const query = {
     limit,
@@ -58,11 +65,9 @@ var createPayloadFilterFromSearchCriteria = /* @__PURE__ */ __name((searchCriter
     schema: PayloadDivinerQuerySchema,
     schemas
   };
-  return [
-    query
-  ];
-}, "createPayloadFilterFromSearchCriteria");
-var findPayload = /* @__PURE__ */ __name(async (archivist, boundWitnessDiviner, payloadDiviner, pointer) => {
+  return [query];
+};
+var findPayload = async (archivist, boundWitnessDiviner, payloadDiviner, pointer) => {
   const reference = pointer.reference;
   const searchCriteria = combineRules(reference);
   const { addresses } = searchCriteria;
@@ -77,13 +82,11 @@ var findPayload = /* @__PURE__ */ __name(async (archivist, boundWitnessDiviner,
       const { schemas, order = "desc" } = searchCriteria;
       let payloadIndex = order === "asc" ? 0 : bw.payloadHashes.length - 1;
       if (schemas) {
-        const schemaInSearchCriteria = /* @__PURE__ */ __name((schema) => schemas.includes(schema), "schemaInSearchCriteria");
+        const schemaInSearchCriteria = (schema) => schemas.includes(schema);
         payloadIndex = order === "asc" ? bw.payloadSchemas.findIndex(schemaInSearchCriteria) : bw.payloadSchemas.findLastIndex(schemaInSearchCriteria);
       }
       const hash = bw.payloadHashes[payloadIndex];
-      const result2 = await archivist.get([
-        hash
-      ]);
+      const result2 = await archivist.get([hash]);
       return result2?.[0] ? PayloadWrapper.wrap(result2?.[0]).payload : void 0;
     }
   } else {
@@ -91,17 +94,11 @@ var findPayload = /* @__PURE__ */ __name(async (archivist, boundWitnessDiviner,
     const result = await payloadDiviner.divine(filter);
     return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : void 0;
   }
-}, "findPayload");
+};
 
 // src/Diviner.ts
 var PayloadPointerDiviner = class extends AbstractDiviner {
-  static {
-    __name(this, "PayloadPointerDiviner");
-  }
-  static configSchemas = [
-    ...super.configSchemas,
-    PayloadPointerDivinerConfigSchema
-  ];
+  static configSchemas = [...super.configSchemas, PayloadPointerDivinerConfigSchema];
   static defaultConfigSchema = PayloadPointerDivinerConfigSchema;
   async divineHandler(payloads) {
     const pointer = payloads?.find(isPointerPayload);
@@ -110,14 +107,12 @@ var PayloadPointerDiviner = class extends AbstractDiviner {
     const boundWitnessDiviner = await this.getBoundWitnessDiviner();
     const payloadDiviner = await this.getPayloadDiviner();
     const result = await findPayload(archivist, boundWitnessDiviner, payloadDiviner, pointer);
-    return result ? [
-      result
-    ] : [];
+    return result ? [result] : [];
   }
   /**
-  * Returns the archivist instance for the given config
-  * @returns The archivist instance corresponding to the config
-  */
+   * Returns the archivist instance for the given config
+   * @returns The archivist instance corresponding to the config
+   */
   async getBoundWitnessDiviner() {
     const name = assertEx2(this.config?.boundWitnessDiviner, () => "Missing archivist in config");
     const mod = assertEx2(await this.resolve(name), () => `Config.boundWitnessDiviner module value of ${name} not resolved`);
@@ -125,17 +120,17 @@ var PayloadPointerDiviner = class extends AbstractDiviner {
     return diviner;
   }
   /**
-  * Returns the archivist instance for the given config
-  * @returns The archivist instance corresponding to the config
-  */
+   * Returns the archivist instance for the given config
+   * @returns The archivist instance corresponding to the config
+   */
   async getConfigArchivist() {
     const name = assertEx2(this.config?.archivist, () => "Missing archivist in config");
     return assertEx2(await this.getArchivist(), () => `Config.archivist module value of ${name} not resolved`);
   }
   /**
-  * Returns the archivist instance for the given config
-  * @returns The archivist instance corresponding to the config
-  */
+   * Returns the archivist instance for the given config
+   * @returns The archivist instance corresponding to the config
+   */
   async getPayloadDiviner() {
     const name = assertEx2(this.config?.payloadDiviner, () => "Missing payloadDiviner in config");
     const mod = assertEx2(await this.resolve(name), () => `Config.payloadDiviner module value of ${name} not resolved`);

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Diviner.ts","../../src/findPayload.ts","../../src/combineRules.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { asDivinerInstance } from '@xyo-network/diviner-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type {\n  PayloadPointerDivinerParams,\n  PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPointerPayload,\n  PayloadPointerDivinerConfigSchema,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nimport { findPayload } from './findPayload.ts'\n\nexport class PayloadPointerDiviner<\n  TParams extends PayloadPointerDivinerParams = PayloadPointerDivinerParams,\n  TIn extends PointerPayload = PointerPayload,\n  TOut extends Payload = Payload,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends AbstractDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, PayloadPointerDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = PayloadPointerDivinerConfigSchema\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const pointer = payloads?.find(isPointerPayload)\n    if (!pointer) return []\n    const archivist = await this.getConfigArchivist()\n    const boundWitnessDiviner = await this.getBoundWitnessDiviner()\n    const payloadDiviner = await this.getPayloadDiviner()\n    const result = (await findPayload(archivist, boundWitnessDiviner, payloadDiviner, pointer)) as TOut | undefined\n    return result ? [result] : []\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getBoundWitnessDiviner(): Promise<BoundWitnessDiviner> {\n    const name = assertEx(this.config?.boundWitnessDiviner, () => 'Missing archivist in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.boundWitnessDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an BoundWitnessDiviner`)\n    return diviner as BoundWitnessDiviner\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getConfigArchivist(): Promise<ArchivistInstance> {\n    const name = assertEx(this.config?.archivist, () => 'Missing archivist in config')\n    return assertEx(await this.getArchivist(), () => `Config.archivist module value of ${name} not resolved`)\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getPayloadDiviner(): Promise<PayloadDiviner> {\n    const name = assertEx(this.config?.payloadDiviner, () => 'Missing payloadDiviner in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.payloadDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an PayloadDiviner`)\n    return diviner as PayloadDiviner\n  }\n}\n","import type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule, PayloadSearchCriteria, PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport { isBoundWitnessPointer } from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { combineRules } from './combineRules.ts'\n\nconst limit = 1\n\nconst createBoundWitnessFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): BoundWitnessDivinerQueryPayload[] => {\n  const {\n    addresses, order = 'desc', schemas, cursor,\n  } = searchCriteria\n  const query: BoundWitnessDivinerQueryPayload = {\n    addresses,\n    limit,\n    order,\n    payload_schemas: schemas,\n    schema: BoundWitnessDivinerQuerySchema,\n  }\n  if (cursor) query.cursor = cursor\n  return [query]\n}\n\nconst createPayloadFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): Payload[] => {\n  const { order = 'desc', schemas } = searchCriteria\n  const query: PayloadDivinerQueryPayload = {\n    limit, order, schema: PayloadDivinerQuerySchema, schemas,\n  }\n  return [query]\n}\n\nexport const findPayload = async (\n  archivist: ArchivistInstance,\n  boundWitnessDiviner: BoundWitnessDiviner,\n  payloadDiviner: PayloadDiviner,\n  pointer: PointerPayload,\n): Promise<Payload | undefined> => {\n  const reference = pointer.reference as PayloadRule[][]\n  const searchCriteria = combineRules(reference)\n  const { addresses } = searchCriteria\n  const findWitnessedPayload = addresses?.length\n  const returnBoundWitness = isBoundWitnessPointer(pointer)\n  if (returnBoundWitness || findWitnessedPayload) {\n    const filter = createBoundWitnessFilterFromSearchCriteria(searchCriteria)\n    const result = await boundWitnessDiviner.divine(filter)\n    const bw = result?.[0] ? BoundWitnessWrapper.parse(result[0]) : undefined\n    if (bw) {\n      if (returnBoundWitness) return bw.payload\n      const { schemas, order = 'desc' } = searchCriteria\n      let payloadIndex = order === 'asc' ? 0 : bw.payloadHashes.length - 1\n      if (schemas) {\n        const schemaInSearchCriteria = (schema: Schema) => schemas.includes(schema)\n        payloadIndex = order === 'asc' ? bw.payloadSchemas.findIndex(schemaInSearchCriteria) : bw.payloadSchemas.findLastIndex(schemaInSearchCriteria)\n      }\n      const hash = bw.payloadHashes[payloadIndex]\n      const result = await archivist.get([hash])\n      return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n    }\n  } else {\n    // Find payload\n    const filter = createPayloadFilterFromSearchCriteria(searchCriteria)\n    const result = await payloadDiviner.divine(filter)\n    return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Address } from '@xylabs/hex'\nimport type { Order } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule,\n  PayloadSearchCriteria,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPayloadAddressRule,\n  isPayloadSchemaRule,\n  isPayloadSequenceOrderRule,\n} from '@xyo-network/diviner-payload-pointer-model'\n\n// TODO: Could make it so that composability is such that we:\n// • AND first dimension of array\n// • OR 2nd dimension of array\nexport const combineRules = (rules: PayloadRule[][]): PayloadSearchCriteria => {\n  const addresses = rules\n    .flat()\n    .filter(isPayloadAddressRule)\n    .map(r => r.address)\n    .filter(exists) as Address[]\n\n  const schemas = rules\n    .flat()\n    .filter(isPayloadSchemaRule)\n    .map(r => r.schema)\n    .filter(exists)\n  assertEx(schemas.length, () => 'At least one schema must be supplied')\n\n  const sequenceOrderRule = rules.flat().filter(isPayloadSequenceOrderRule).filter(exists)\n  assertEx(sequenceOrderRule.length < 2, () => 'Must not supply more than 1 direction/timestamp rule')\n\n  const order: Order = sequenceOrderRule[0]?.order || 'desc'\n  const cursor = sequenceOrderRule[0]?.sequence\n\n  return {\n    addresses,\n    cursor,\n    order,\n    schemas,\n  }\n}\n"],"mappings":"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","names":["assertEx","AbstractDiviner","asDivinerInstance","isPointerPayload","PayloadPointerDivinerConfigSchema","BoundWitnessWrapper","BoundWitnessDivinerQuerySchema","PayloadDivinerQuerySchema","isBoundWitnessPointer","PayloadWrapper","assertEx","exists","isPayloadAddressRule","isPayloadSchemaRule","isPayloadSequenceOrderRule","combineRules","rules","addresses","flat","filter","isPayloadAddressRule","map","r","address","exists","schemas","isPayloadSchemaRule","schema","assertEx","length","sequenceOrderRule","isPayloadSequenceOrderRule","order","cursor","sequence","limit","createBoundWitnessFilterFromSearchCriteria","searchCriteria","addresses","order","schemas","cursor","query","payload_schemas","schema","BoundWitnessDivinerQuerySchema","createPayloadFilterFromSearchCriteria","PayloadDivinerQuerySchema","findPayload","archivist","boundWitnessDiviner","payloadDiviner","pointer","reference","combineRules","findWitnessedPayload","length","returnBoundWitness","isBoundWitnessPointer","filter","result","divine","bw","BoundWitnessWrapper","parse","undefined","payload","payloadIndex","payloadHashes","schemaInSearchCriteria","includes","payloadSchemas","findIndex","findLastIndex","hash","get","PayloadWrapper","wrap","PayloadPointerDiviner","AbstractDiviner","configSchemas","PayloadPointerDivinerConfigSchema","defaultConfigSchema","divineHandler","payloads","pointer","find","isPointerPayload","archivist","getConfigArchivist","boundWitnessDiviner","getBoundWitnessDiviner","payloadDiviner","getPayloadDiviner","result","findPayload","name","assertEx","config","mod","resolve","diviner","asDivinerInstance","getArchivist"]}
+{"version":3,"sources":["../../src/Diviner.ts","../../src/findPayload.ts","../../src/combineRules.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { asDivinerInstance } from '@xyo-network/diviner-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type {\n  PayloadPointerDivinerParams,\n  PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPointerPayload,\n  PayloadPointerDivinerConfigSchema,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nimport { findPayload } from './findPayload.ts'\n\nexport class PayloadPointerDiviner<\n  TParams extends PayloadPointerDivinerParams = PayloadPointerDivinerParams,\n  TIn extends PointerPayload = PointerPayload,\n  TOut extends Payload = Payload,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends AbstractDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, PayloadPointerDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = PayloadPointerDivinerConfigSchema\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const pointer = payloads?.find(isPointerPayload)\n    if (!pointer) return []\n    const archivist = await this.getConfigArchivist()\n    const boundWitnessDiviner = await this.getBoundWitnessDiviner()\n    const payloadDiviner = await this.getPayloadDiviner()\n    const result = (await findPayload(archivist, boundWitnessDiviner, payloadDiviner, pointer)) as TOut | undefined\n    return result ? [result] : []\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getBoundWitnessDiviner(): Promise<BoundWitnessDiviner> {\n    const name = assertEx(this.config?.boundWitnessDiviner, () => 'Missing archivist in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.boundWitnessDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an BoundWitnessDiviner`)\n    return diviner as BoundWitnessDiviner\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getConfigArchivist(): Promise<ArchivistInstance> {\n    const name = assertEx(this.config?.archivist, () => 'Missing archivist in config')\n    return assertEx(await this.getArchivist(), () => `Config.archivist module value of ${name} not resolved`)\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getPayloadDiviner(): Promise<PayloadDiviner> {\n    const name = assertEx(this.config?.payloadDiviner, () => 'Missing payloadDiviner in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.payloadDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an PayloadDiviner`)\n    return diviner as PayloadDiviner\n  }\n}\n","import type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule, PayloadSearchCriteria, PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport { isBoundWitnessPointer } from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { combineRules } from './combineRules.ts'\n\nconst limit = 1\n\nconst createBoundWitnessFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): BoundWitnessDivinerQueryPayload[] => {\n  const {\n    addresses, order = 'desc', schemas, cursor,\n  } = searchCriteria\n  const query: BoundWitnessDivinerQueryPayload = {\n    addresses,\n    limit,\n    order,\n    payload_schemas: schemas,\n    schema: BoundWitnessDivinerQuerySchema,\n  }\n  if (cursor) query.cursor = cursor\n  return [query]\n}\n\nconst createPayloadFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): Payload[] => {\n  const { order = 'desc', schemas } = searchCriteria\n  const query: PayloadDivinerQueryPayload = {\n    limit, order, schema: PayloadDivinerQuerySchema, schemas,\n  }\n  return [query]\n}\n\nexport const findPayload = async (\n  archivist: ArchivistInstance,\n  boundWitnessDiviner: BoundWitnessDiviner,\n  payloadDiviner: PayloadDiviner,\n  pointer: PointerPayload,\n): Promise<Payload | undefined> => {\n  const reference = pointer.reference as PayloadRule[][]\n  const searchCriteria = combineRules(reference)\n  const { addresses } = searchCriteria\n  const findWitnessedPayload = addresses?.length\n  const returnBoundWitness = isBoundWitnessPointer(pointer)\n  if (returnBoundWitness || findWitnessedPayload) {\n    const filter = createBoundWitnessFilterFromSearchCriteria(searchCriteria)\n    const result = await boundWitnessDiviner.divine(filter)\n    const bw = result?.[0] ? BoundWitnessWrapper.parse(result[0]) : undefined\n    if (bw) {\n      if (returnBoundWitness) return bw.payload\n      const { schemas, order = 'desc' } = searchCriteria\n      let payloadIndex = order === 'asc' ? 0 : bw.payloadHashes.length - 1\n      if (schemas) {\n        const schemaInSearchCriteria = (schema: Schema) => schemas.includes(schema)\n        payloadIndex = order === 'asc' ? bw.payloadSchemas.findIndex(schemaInSearchCriteria) : bw.payloadSchemas.findLastIndex(schemaInSearchCriteria)\n      }\n      const hash = bw.payloadHashes[payloadIndex]\n      const result = await archivist.get([hash])\n      return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n    }\n  } else {\n    // Find payload\n    const filter = createPayloadFilterFromSearchCriteria(searchCriteria)\n    const result = await payloadDiviner.divine(filter)\n    return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Address } from '@xylabs/hex'\nimport type { Order } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule,\n  PayloadSearchCriteria,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPayloadAddressRule,\n  isPayloadSchemaRule,\n  isPayloadSequenceOrderRule,\n} from '@xyo-network/diviner-payload-pointer-model'\n\n// TODO: Could make it so that composability is such that we:\n// • AND first dimension of array\n// • OR 2nd dimension of array\nexport const combineRules = (rules: PayloadRule[][]): PayloadSearchCriteria => {\n  const addresses = rules\n    .flat()\n    .filter(isPayloadAddressRule)\n    .map(r => r.address)\n    .filter(exists) as Address[]\n\n  const schemas = rules\n    .flat()\n    .filter(isPayloadSchemaRule)\n    .map(r => r.schema)\n    .filter(exists)\n  assertEx(schemas.length, () => 'At least one schema must be supplied')\n\n  const sequenceOrderRule = rules.flat().filter(isPayloadSequenceOrderRule).filter(exists)\n  assertEx(sequenceOrderRule.length < 2, () => 'Must not supply more than 1 direction/timestamp rule')\n\n  const order: Order = sequenceOrderRule[0]?.order || 'desc'\n  const cursor = sequenceOrderRule[0]?.sequence\n\n  return {\n    addresses,\n    cursor,\n    order,\n    schemas,\n  }\n}\n"],"mappings":"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","names":["assertEx","result","assertEx"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-payload-pointer-memory",
-  "version": "3.6.9",
+  "version": "3.6.11",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,42 +29,42 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/assert": "^4.4.34",
-    "@xylabs/exists": "^4.4.34",
-    "@xylabs/hex": "^4.4.34",
-    "@xyo-network/archivist-model": "^3.6.9",
-    "@xyo-network/boundwitness-wrapper": "^3.6.9",
-    "@xyo-network/diviner-abstract": "^3.6.9",
-    "@xyo-network/diviner-boundwitness-abstract": "^3.6.9",
-    "@xyo-network/diviner-boundwitness-model": "^3.6.9",
-    "@xyo-network/diviner-model": "^3.6.9",
-    "@xyo-network/diviner-payload-abstract": "^3.6.9",
-    "@xyo-network/diviner-payload-model": "^3.6.9",
-    "@xyo-network/diviner-payload-pointer-model": "^3.6.9",
-    "@xyo-network/payload-model": "^3.6.9",
-    "@xyo-network/payload-wrapper": "^3.6.9"
+    "@xylabs/assert": "^4.5.1",
+    "@xylabs/exists": "^4.5.1",
+    "@xylabs/hex": "^4.5.1",
+    "@xyo-network/archivist-model": "^3.6.11",
+    "@xyo-network/boundwitness-wrapper": "^3.6.11",
+    "@xyo-network/diviner-abstract": "^3.6.11",
+    "@xyo-network/diviner-boundwitness-abstract": "^3.6.11",
+    "@xyo-network/diviner-boundwitness-model": "^3.6.11",
+    "@xyo-network/diviner-model": "^3.6.11",
+    "@xyo-network/diviner-payload-abstract": "^3.6.11",
+    "@xyo-network/diviner-payload-model": "^3.6.11",
+    "@xyo-network/diviner-payload-pointer-model": "^3.6.11",
+    "@xyo-network/payload-model": "^3.6.11",
+    "@xyo-network/payload-wrapper": "^3.6.11"
   },
   "devDependencies": {
     "@types/uuid": "^10.0.0",
-    "@xylabs/delay": "^4.4.34",
+    "@xylabs/delay": "^4.5.1",
     "@xylabs/ts-scripts-yarn3": "^4.2.6",
     "@xylabs/tsconfig": "^4.2.6",
-    "@xylabs/vitest-extended": "^4.4.34",
-    "@xyo-network/account": "^3.6.9",
-    "@xyo-network/account-model": "^3.6.9",
-    "@xyo-network/archivist-memory": "^3.6.9",
-    "@xyo-network/boundwitness-builder": "^3.6.9",
-    "@xyo-network/boundwitness-model": "^3.6.9",
-    "@xyo-network/diviner-boundwitness-memory": "^3.6.9",
-    "@xyo-network/diviner-payload-generic": "^3.6.9",
-    "@xyo-network/diviner-payload-memory": "^3.6.9",
-    "@xyo-network/node-memory": "^3.6.9",
-    "@xyo-network/node-model": "^3.6.9",
-    "@xyo-network/payload-builder": "^3.6.9",
-    "@xyo-network/wallet-model": "^3.6.9",
-    "typescript": "^5.7.2",
-    "uuid": "^11.0.3",
-    "vitest": "^2.1.8"
+    "@xylabs/vitest-extended": "^4.5.1",
+    "@xyo-network/account": "^3.6.11",
+    "@xyo-network/account-model": "^3.6.11",
+    "@xyo-network/archivist-memory": "^3.6.11",
+    "@xyo-network/boundwitness-builder": "^3.6.11",
+    "@xyo-network/boundwitness-model": "^3.6.11",
+    "@xyo-network/diviner-boundwitness-memory": "^3.6.11",
+    "@xyo-network/diviner-payload-generic": "^3.6.11",
+    "@xyo-network/diviner-payload-memory": "^3.6.11",
+    "@xyo-network/node-memory": "^3.6.11",
+    "@xyo-network/node-model": "^3.6.11",
+    "@xyo-network/payload-builder": "^3.6.11",
+    "@xyo-network/wallet-model": "^3.6.11",
+    "typescript": "^5.7.3",
+    "uuid": "^11.0.5",
+    "vitest": "^3.0.4"
   },
   "publishConfig": {
     "access": "public"

package/src/spec/testUtil/Account/index.ts

@@ -2,11 +2,13 @@ import { Account } from '@xyo-network/account'
 import type { AccountInstance } from '@xyo-network/account-model'
 
 let _unitTestSigningAccount: Promise<AccountInstance> | undefined
-let _otherUnitTestSigningAccount: Promise<AccountInstance> | undefined
+// let _otherUnitTestSigningAccount: Promise<AccountInstance> | undefined
 
 export const unitTestSigningAccount = () =>
   (_unitTestSigningAccount
     = _unitTestSigningAccount ?? Account.create({ phrase: 'draw seven setup planet bitter return old bronze neither nephew panel pelican' }))
+/*
 export const otherUnitTestSigningAccount = () =>
   (_otherUnitTestSigningAccount
     = _otherUnitTestSigningAccount ?? Account.create({ phrase: 'pitch rich dentist meadow few club place dirt push sustain innocent fix' }))
+*/

package/src/spec/testUtil/Block/getNewBlock.ts

@@ -3,14 +3,15 @@ import type { BoundWitness } from '@xyo-network/boundwitness-model'
 import type { Payload } from '@xyo-network/payload-model'
 
 import { unitTestSigningAccount } from '../Account/index.ts'
-import { getNewPayloads } from '../Payload/index.ts'
+// import { getNewPayloads } from '../Payload/index.ts'
 
 export const getNewBlock = async (...payloads: Payload[]): Promise<BoundWitness> => {
   return (await (new BoundWitnessBuilder().witness(await unitTestSigningAccount()).payloads(payloads)).build())[0]
 }
 
+/*
 export const getNewBlockWithPayloads = async (numPayloads = 1) => {
-  return getNewBlock(...(await getNewPayloads(numPayloads)))
+  return getNewBlock(...(getNewPayloads(numPayloads)))
 }
 
 export const getNewBlocks = async (numBoundWitnesses = 1): Promise<Array<BoundWitness>> => {
@@ -28,8 +29,10 @@ export const getNewBlocksWithPayloads = async (numBoundWitnesses = 1, numPayload
       .fill(0)
       .map(async () => {
         return (
-          await (new BoundWitnessBuilder().witness(await unitTestSigningAccount()).payloads(await getNewPayloads(numPayloads))).build()
+          await (new BoundWitnessBuilder().witness(await unitTestSigningAccount()).payloads(getNewPayloads(numPayloads))).build()
         )[0]
       }),
   )
 }
+
+*/