@xyo-network/diviner-payload-pointer-memory 3.9.18 → 3.9.19

package/dist/neutral/Diviner.d.ts

@@ -0,0 +1,25 @@
+import { AbstractDiviner } from '@xyo-network/diviner-abstract';
+import type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model';
+import type { PayloadPointerDivinerParams, PointerPayload } from '@xyo-network/diviner-payload-pointer-model';
+import type { Payload, Schema } from '@xyo-network/payload-model';
+export declare class PayloadPointerDiviner<TParams extends PayloadPointerDivinerParams = PayloadPointerDivinerParams, TIn extends PointerPayload = PointerPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractDiviner<TParams, TIn, TOut, TEventData> {
+    static readonly configSchemas: Schema[];
+    static readonly defaultConfigSchema: Schema;
+    protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
+    /**
+     * Returns the archivist instance for the given config
+     * @returns The archivist instance corresponding to the config
+     */
+    private getBoundWitnessDiviner;
+    /**
+     * Returns the archivist instance for the given config
+     * @returns The archivist instance corresponding to the config
+     */
+    private getConfigArchivist;
+    /**
+     * Returns the archivist instance for the given config
+     * @returns The archivist instance corresponding to the config
+     */
+    private getPayloadDiviner;
+}
+//# sourceMappingURL=Diviner.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAGzF,OAAO,KAAK,EACV,2BAA2B,EAC3B,cAAc,EACf,MAAM,4CAA4C,CAAA;AAKnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAIjE,qBAAa,qBAAqB,CAChC,OAAO,SAAS,2BAA2B,GAAG,2BAA2B,EACzE,GAAG,SAAS,cAAc,GAAG,cAAc,EAC3C,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CACD,SAAQ,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACvD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAA8D;IAC9G,gBAAyB,mBAAmB,EAAE,MAAM,CAAoC;cAE/D,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAUzE;;;OAGG;YACW,sBAAsB;IAOpC;;;OAGG;YACW,kBAAkB;IAKhC;;;OAGG;YACW,iBAAiB;CAMhC"}

package/dist/neutral/combineRules.d.ts

@@ -0,0 +1,3 @@
+import type { PayloadRule, PayloadSearchCriteria } from '@xyo-network/diviner-payload-pointer-model';
+export declare const combineRules: (rules: PayloadRule[][]) => PayloadSearchCriteria;
+//# sourceMappingURL=combineRules.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"combineRules.d.ts","sourceRoot":"","sources":["../../src/combineRules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACtB,MAAM,4CAA4C,CAAA;AAUnD,eAAO,MAAM,YAAY,GAAI,OAAO,WAAW,EAAE,EAAE,KAAG,qBA0BrD,CAAA"}

package/dist/neutral/findPayload.d.ts

@@ -0,0 +1,7 @@
+import type { ArchivistInstance } from '@xyo-network/archivist-model';
+import type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract';
+import type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
+import type { PointerPayload } from '@xyo-network/diviner-payload-pointer-model';
+import type { Payload } from '@xyo-network/payload-model';
+export declare const findPayload: (archivist: ArchivistInstance, boundWitnessDiviner: BoundWitnessDiviner, payloadDiviner: PayloadDiviner, pointer: PointerPayload) => Promise<Payload | undefined>;
+//# sourceMappingURL=findPayload.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"findPayload.d.ts","sourceRoot":"","sources":["../../src/findPayload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAErE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAA;AAGrF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAG3E,OAAO,KAAK,EAC0B,cAAc,EACnD,MAAM,4CAA4C,CAAA;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAU,MAAM,4BAA4B,CAAA;AA8BjE,eAAO,MAAM,WAAW,GACtB,WAAW,iBAAiB,EAC5B,qBAAqB,mBAAmB,EACxC,gBAAgB,cAAc,EAC9B,SAAS,cAAc,KACtB,OAAO,CAAC,OAAO,GAAG,SAAS,CA4B7B,CAAA"}

package/dist/neutral/index.d.ts

@@ -1,15 +1,2 @@
-import { AbstractDiviner } from '@xyo-network/diviner-abstract';
-import { DivinerModuleEventData, DivinerInstance } from '@xyo-network/diviner-model';
-import { PayloadPointerDivinerParams, PointerPayload } from '@xyo-network/diviner-payload-pointer-model';
-import { Payload, Schema } from '@xyo-network/payload-model';
-
-declare class PayloadPointerDiviner<TParams extends PayloadPointerDivinerParams = PayloadPointerDivinerParams, TIn extends PointerPayload = PointerPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends AbstractDiviner<TParams, TIn, TOut, TEventData> {
-    static readonly configSchemas: Schema[];
-    static readonly defaultConfigSchema: Schema;
-    protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
-    private getBoundWitnessDiviner;
-    private getConfigArchivist;
-    private getPayloadDiviner;
-}
-
-export { PayloadPointerDiviner };
+export * from './Diviner.ts';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA"}

package/dist/neutral/index.mjs

@@ -125,7 +125,7 @@ var PayloadPointerDiviner = class extends AbstractDiviner {
    */
   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`);
+    return assertEx2(await this.archivistInstance(), () => `Config.archivist module value of ${name} not resolved`);
   }
   /**
    * Returns the archivist instance for the given config

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","result","assertEx"]}
+{"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.archivistInstance(), () => `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.9.18",
+  "version": "3.9.19",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -32,37 +32,37 @@
     "@xylabs/assert": "^4.5.1",
     "@xylabs/exists": "^4.5.1",
     "@xylabs/hex": "^4.5.1",
-    "@xyo-network/archivist-model": "^3.9.18",
-    "@xyo-network/boundwitness-wrapper": "^3.9.18",
-    "@xyo-network/diviner-abstract": "^3.9.18",
-    "@xyo-network/diviner-boundwitness-abstract": "^3.9.18",
-    "@xyo-network/diviner-boundwitness-model": "^3.9.18",
-    "@xyo-network/diviner-model": "^3.9.18",
-    "@xyo-network/diviner-payload-abstract": "^3.9.18",
-    "@xyo-network/diviner-payload-model": "^3.9.18",
-    "@xyo-network/diviner-payload-pointer-model": "^3.9.18",
-    "@xyo-network/payload-model": "^3.9.18",
-    "@xyo-network/payload-wrapper": "^3.9.18"
+    "@xyo-network/archivist-model": "^3.9.19",
+    "@xyo-network/boundwitness-wrapper": "^3.9.19",
+    "@xyo-network/diviner-abstract": "^3.9.19",
+    "@xyo-network/diviner-boundwitness-abstract": "^3.9.19",
+    "@xyo-network/diviner-boundwitness-model": "^3.9.19",
+    "@xyo-network/diviner-model": "^3.9.19",
+    "@xyo-network/diviner-payload-abstract": "^3.9.19",
+    "@xyo-network/diviner-payload-model": "^3.9.19",
+    "@xyo-network/diviner-payload-pointer-model": "^3.9.19",
+    "@xyo-network/payload-model": "^3.9.19",
+    "@xyo-network/payload-wrapper": "^3.9.19"
   },
   "devDependencies": {
     "@types/uuid": "^10.0.0",
     "@xylabs/delay": "^4.5.1",
-    "@xylabs/ts-scripts-yarn3": "^5.0.25",
-    "@xylabs/tsconfig": "^5.0.25",
+    "@xylabs/ts-scripts-yarn3": "^5.0.39",
+    "@xylabs/tsconfig": "^5.0.39",
     "@xylabs/vitest-extended": "^4.5.1",
-    "@xyo-network/account": "^3.9.18",
-    "@xyo-network/account-model": "^3.9.18",
-    "@xyo-network/archivist-memory": "^3.9.18",
-    "@xyo-network/boundwitness-builder": "^3.9.18",
-    "@xyo-network/boundwitness-model": "^3.9.18",
-    "@xyo-network/diviner-boundwitness-memory": "^3.9.18",
-    "@xyo-network/diviner-payload-generic": "^3.9.18",
-    "@xyo-network/diviner-payload-memory": "^3.9.18",
-    "@xyo-network/node-memory": "^3.9.18",
-    "@xyo-network/node-model": "^3.9.18",
-    "@xyo-network/payload-builder": "^3.9.18",
-    "@xyo-network/wallet-model": "^3.9.18",
-    "typescript": "^5.7.3",
+    "@xyo-network/account": "^3.9.19",
+    "@xyo-network/account-model": "^3.9.19",
+    "@xyo-network/archivist-memory": "^3.9.19",
+    "@xyo-network/boundwitness-builder": "^3.9.19",
+    "@xyo-network/boundwitness-model": "^3.9.19",
+    "@xyo-network/diviner-boundwitness-memory": "^3.9.19",
+    "@xyo-network/diviner-payload-generic": "^3.9.19",
+    "@xyo-network/diviner-payload-memory": "^3.9.19",
+    "@xyo-network/node-memory": "^3.9.19",
+    "@xyo-network/node-model": "^3.9.19",
+    "@xyo-network/payload-builder": "^3.9.19",
+    "@xyo-network/wallet-model": "^3.9.19",
+    "typescript": "^5.8.2",
     "uuid": "^11.1.0",
     "vitest": "^3.0.7"
   },

package/src/Diviner.ts

@@ -57,7 +57,7 @@ export class PayloadPointerDiviner<
    */
   private async getConfigArchivist(): Promise<ArchivistInstance> {
     const name = assertEx(this.config?.archivist, () => 'Missing archivist in config')
-    return assertEx(await this.getArchivist(), () => `Config.archivist module value of ${name} not resolved`)
+    return assertEx(await this.archivistInstance(), () => `Config.archivist module value of ${name} not resolved`)
   }
 
   /**

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

@@ -6,7 +6,7 @@ import { unitTestSigningAccount } from '../Account/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]
+  return (await (new BoundWitnessBuilder().signer(await unitTestSigningAccount()).payloads(payloads)).build())[0]
 }
 
 /*

package/src/spec/testUtil/BoundWitness/getNewBoundWitness.ts

@@ -8,7 +8,7 @@ import { getNewPayloads } from '../Payload/index.ts'
 
 export const getNewBoundWitness = async (signers?: AccountInstance[], payloads?: Payload[]): Promise<[BoundWitness, Payload[], ModuleError[]]> => {
   return await (new BoundWitnessBuilder().payloads(payloads ?? (getNewPayloads(1))))
-    .witnesses(signers ?? [await unitTestSigningAccount()])
+    .signers(signers ?? [await unitTestSigningAccount()])
     .build()
 }