@xyo-network/diviner-payload-generic 3.6.0-rc.8 → 3.6.0

package/dist/neutral/Diviner.d.ts

@@ -1,9 +1,8 @@
-import { type Hash, type Hex } from '@xylabs/hex';
-import { type EmptyObject } from '@xylabs/object';
+import { type Hex } from '@xylabs/hex';
 import type { ArchivistInstance, ArchivistModuleEventData } from '@xyo-network/archivist-model';
 import type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model';
 import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
-import type { Order, PayloadDivinerConfig, PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
+import { type Order, type PayloadDivinerConfig, type PayloadDivinerParams, type PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
 import type { EventListener } from '@xyo-network/module-events';
 import { type Payload, type Schema, type WithStorageMeta } from '@xyo-network/payload-model';
 export declare const GenericPayloadDivinerConfigSchema: "network.xyo.diviner.payload.generic.config";
@@ -11,7 +10,7 @@ export type GenericPayloadDivinerConfigSchema = typeof GenericPayloadDivinerConf
 export type GenericPayloadDivinerConfig = PayloadDivinerConfig<{
     indexes?: string[];
 }, GenericPayloadDivinerConfigSchema>;
-export declare class GenericPayloadDiviner<TParams extends PayloadDivinerParams<GenericPayloadDivinerConfig> = PayloadDivinerParams<GenericPayloadDivinerConfig>, TIn extends PayloadDivinerQueryPayload<EmptyObject, Hash> = PayloadDivinerQueryPayload<EmptyObject, Hash>, TOut extends WithStorageMeta<Payload> = WithStorageMeta<Payload>, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
+export declare class GenericPayloadDiviner<TParams extends PayloadDivinerParams<GenericPayloadDivinerConfig> = PayloadDivinerParams<GenericPayloadDivinerConfig>, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends WithStorageMeta<Payload> = WithStorageMeta<Payload>, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
     static readonly configSchemas: Schema[];
     static readonly defaultConfigSchema: Schema;
     protected indexMaps: Record<string, WithStorageMeta<TOut>[]>;

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

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

package/dist/neutral/index.mjs

@@ -2,10 +2,11 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/Diviner.ts
+import { filterAs } from "@xylabs/array";
 import { assertEx } from "@xylabs/assert";
 import { forget } from "@xylabs/forget";
 import { PayloadDiviner } from "@xyo-network/diviner-payload-abstract";
-import { isPayloadDivinerQueryPayload } from "@xyo-network/diviner-payload-model";
+import { asPayloadDivinerQueryPayload } from "@xyo-network/diviner-payload-model";
 import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { Mutex } from "async-mutex";
 var DEFAULT_INDEX_BATCH_SIZE = 100;
@@ -64,7 +65,7 @@ var GenericPayloadDiviner = class extends PayloadDiviner {
     });
   }
   async divineHandler(payloads) {
-    const filters = payloads?.filter(isPayloadDivinerQueryPayload) ?? [];
+    const filters = filterAs(payloads ?? [], asPayloadDivinerQueryPayload);
     assertEx(filters.length < 2, () => "Multiple PayloadDivinerQuery payloads may not be specified");
     const filter = assertEx(filters.shift(), () => "No PayloadDivinerQuery specified");
     await this.updateIndex();

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Diviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { forget } from '@xylabs/forget'\nimport { type Hash, type Hex } from '@xylabs/hex'\nimport { type EmptyObject } from '@xylabs/object'\nimport type { ArchivistInstance, ArchivistModuleEventData } from '@xyo-network/archivist-model'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type {\n  Order,\n  PayloadDivinerConfig,\n  PayloadDivinerParams,\n  PayloadDivinerQueryPayload,\n} from '@xyo-network/diviner-payload-model'\nimport { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport type { EventListener } from '@xyo-network/module-events'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport {\n  type Payload, type Schema,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nconst DEFAULT_INDEX_BATCH_SIZE = 100 as const\nconst DEFAULT_MAX_INDEX_SIZE = 8000 as const\n\nexport const GenericPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.generic.config' as const\nexport type GenericPayloadDivinerConfigSchema = typeof GenericPayloadDivinerConfigSchema\n\nexport type GenericPayloadDivinerConfig = PayloadDivinerConfig<\n  {\n    indexes?: string[]\n  },\n  GenericPayloadDivinerConfigSchema\n>\n\nexport class GenericPayloadDiviner<\n  TParams extends PayloadDivinerParams<GenericPayloadDivinerConfig> = PayloadDivinerParams<GenericPayloadDivinerConfig>,\n  TIn extends PayloadDivinerQueryPayload<EmptyObject, Hash> = PayloadDivinerQueryPayload<EmptyObject, Hash>,\n  TOut extends WithStorageMeta<Payload> = WithStorageMeta<Payload>,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, GenericPayloadDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = GenericPayloadDivinerConfigSchema\n\n  protected indexMaps: Record<string, WithStorageMeta<TOut>[]> = {}\n  protected payloadsWithMeta: WithStorageMeta<TOut>[] = []\n\n  private _archivistInstance?: ArchivistInstance\n  private _cursor?: Hex\n  private _updatePayloadPairsMutex = new Mutex()\n\n  protected get indexBatchSize() {\n    return this.config.indexBatchSize ?? DEFAULT_INDEX_BATCH_SIZE\n  }\n\n  protected get indexes(): string[] {\n    return ['schema', ...(this.config.indexes ?? [])]\n  }\n\n  protected get maxIndexSize() {\n    return this.config.maxIndexSize ?? DEFAULT_MAX_INDEX_SIZE\n  }\n\n  protected all(order: Order = 'desc', cursor?: Hex) {\n    const payloads = this.payloadsWithMeta.toSorted(PayloadBuilder.compareStorageMeta)\n    if (order === 'desc') payloads.reverse()\n    const startIndex = (cursor ? (payloads.findIndex(payload => payload._sequence === cursor) ?? -1) : -1) + 1\n    return payloads.slice(startIndex)\n  }\n\n  protected override async archivistInstance(): Promise<ArchivistInstance | undefined>\n  protected override async archivistInstance(required: true): Promise<ArchivistInstance>\n  protected override async archivistInstance(required = false): Promise<ArchivistInstance | undefined> {\n    if (!this._archivistInstance) {\n      const archivist = await super.archivistInstance()\n      if (required && !archivist) {\n        throw new Error('Failed to find archivist')\n      }\n      archivist?.on('inserted', this.onArchivistInserted)\n      archivist?.on('cleared', this.onArchivistCleared)\n      archivist?.on('deleted', this.onArchivistDeleted)\n      this._archivistInstance = archivist\n    }\n    return this._archivistInstance\n  }\n\n  protected async clearIndex() {\n    await this._updatePayloadPairsMutex.runExclusive(() => {\n      this._cursor = undefined\n      this.payloadsWithMeta = []\n      this.indexMaps = {}\n    })\n  }\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const filters = payloads?.filter(isPayloadDivinerQueryPayload) ?? []\n    assertEx(filters.length < 2, () => 'Multiple PayloadDivinerQuery payloads may not be specified')\n    const filter = assertEx(filters.shift(), () => 'No PayloadDivinerQuery specified') as unknown as\n      PayloadDivinerQueryPayload<EmptyObject, Hash>\n\n    await this.updateIndex()\n\n    const {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      schema, schemas, order, limit, cursor, ...props\n    } = filter\n    let all: TOut[] = this.all(order, cursor)\n    if (all) {\n      if (schemas?.length) all = all.filter(payload => schemas.includes(payload.schema))\n      if (Object.keys(props).length > 0) {\n        const additionalFilterCriteria = Object.entries(props)\n        for (const [prop, filter] of additionalFilterCriteria) {\n          const property = prop as keyof TOut\n          all\n            = Array.isArray(filter)\n              ? all.filter(payload =>\n                  filter.every((value) => {\n                    const prop = payload?.[property]\n                    // TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?\n                    return Array.isArray(prop) && prop.includes?.(value)\n                  }))\n              : all.filter(payload => payload?.[property] === filter)\n        }\n      }\n      return limit ? all.slice(0, limit) : all\n    } else {\n      throw new Error('Archivist does not support \"all\"')\n    }\n  }\n\n  protected onArchivistCleared: EventListener<ArchivistModuleEventData['cleared']> = () => {\n    forget(\n      (async () => {\n        await this.clearIndex()\n        await this.updateIndex()\n      })(),\n    )\n  }\n\n  // we are just rebuilding the entire index at this point on delete since large archivists do not support delete\n  protected onArchivistDeleted: EventListener<ArchivistModuleEventData['deleted']> = () => {\n    forget(\n      (async () => {\n        await this.clearIndex()\n        await this.updateIndex()\n      })(),\n    )\n  }\n\n  protected onArchivistInserted: EventListener<ArchivistModuleEventData['inserted']> = () => {\n    forget(this.updateIndex())\n  }\n\n  protected override async stopHandler(_timeout?: number | undefined): Promise<boolean> {\n    const archivist = await this.archivistInstance(true)\n    archivist.off('inserted', this.onArchivistInserted)\n    archivist.off('deleted', this.onArchivistDeleted)\n    archivist.off('cleared', this.onArchivistCleared)\n    return await super.stopHandler()\n  }\n\n  // index any new payloads\n  protected async updateIndex() {\n    await this._updatePayloadPairsMutex.runExclusive(async () => {\n      const archivist = await this.archivistInstance(true)\n      let newPayloads = await archivist.next({ limit: 100, cursor: this._cursor }) as TOut[]\n      while (newPayloads.length > 0) {\n        this._cursor = newPayloads.at(-1)?._sequence\n        assertEx(this.payloadsWithMeta.length + newPayloads.length <= this.maxIndexSize, () => 'maxIndexSize exceeded')\n        this.indexPayloads(newPayloads)\n        newPayloads = await archivist.next({ limit: 100, cursor: this._cursor }) as TOut[]\n      }\n    })\n  }\n\n  private indexPayloads(payloads: WithStorageMeta<TOut>[]): Hex {\n    this.payloadsWithMeta.push(...payloads)\n\n    // update the custom indexes\n    for (const index of this.indexes ?? []) {\n      this.indexMaps[index] = this.indexMaps[index] ?? []\n      for (const payload of payloads) {\n        this.indexMaps[index].push(payload)\n      }\n    }\n    return assertEx(payloads.at(-1), () => 'No payloads to index')._sequence\n  }\n}\n"],"mappings":"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","names":["assertEx","forget","PayloadDiviner","isPayloadDivinerQueryPayload","PayloadBuilder","Mutex","DEFAULT_INDEX_BATCH_SIZE","DEFAULT_MAX_INDEX_SIZE","GenericPayloadDivinerConfigSchema","GenericPayloadDiviner","PayloadDiviner","configSchemas","defaultConfigSchema","indexMaps","payloadsWithMeta","_archivistInstance","_cursor","_updatePayloadPairsMutex","Mutex","indexBatchSize","config","indexes","maxIndexSize","all","order","cursor","payloads","toSorted","PayloadBuilder","compareStorageMeta","reverse","startIndex","findIndex","payload","_sequence","slice","archivistInstance","required","archivist","Error","on","onArchivistInserted","onArchivistCleared","onArchivistDeleted","clearIndex","runExclusive","undefined","divineHandler","filters","filter","isPayloadDivinerQueryPayload","assertEx","length","shift","updateIndex","schema","schemas","limit","props","includes","Object","keys","additionalFilterCriteria","entries","prop","property","Array","isArray","every","value","forget","stopHandler","_timeout","off","newPayloads","next","at","indexPayloads","push","index"]}
+{"version":3,"sources":["../../src/Diviner.ts"],"sourcesContent":["import { filterAs } from '@xylabs/array'\nimport { assertEx } from '@xylabs/assert'\nimport { forget } from '@xylabs/forget'\nimport { type Hex } from '@xylabs/hex'\nimport type { ArchivistInstance, ArchivistModuleEventData } from '@xyo-network/archivist-model'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport {\n  asPayloadDivinerQueryPayload,\n  type Order,\n  type PayloadDivinerConfig,\n  type PayloadDivinerParams,\n  type PayloadDivinerQueryPayload,\n} from '@xyo-network/diviner-payload-model'\nimport type { EventListener } from '@xyo-network/module-events'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport {\n  type Payload, type Schema,\n  type WithStorageMeta,\n} from '@xyo-network/payload-model'\nimport { Mutex } from 'async-mutex'\n\nconst DEFAULT_INDEX_BATCH_SIZE = 100 as const\nconst DEFAULT_MAX_INDEX_SIZE = 8000 as const\n\nexport const GenericPayloadDivinerConfigSchema = 'network.xyo.diviner.payload.generic.config' as const\nexport type GenericPayloadDivinerConfigSchema = typeof GenericPayloadDivinerConfigSchema\n\nexport type GenericPayloadDivinerConfig = PayloadDivinerConfig<\n  {\n    indexes?: string[]\n  },\n  GenericPayloadDivinerConfigSchema\n>\n\nexport class GenericPayloadDiviner<\n  TParams extends PayloadDivinerParams<GenericPayloadDivinerConfig> = PayloadDivinerParams<GenericPayloadDivinerConfig>,\n  TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n  TOut extends WithStorageMeta<Payload> = WithStorageMeta<Payload>,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, GenericPayloadDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = GenericPayloadDivinerConfigSchema\n\n  protected indexMaps: Record<string, WithStorageMeta<TOut>[]> = {}\n  protected payloadsWithMeta: WithStorageMeta<TOut>[] = []\n\n  private _archivistInstance?: ArchivistInstance\n  private _cursor?: Hex\n  private _updatePayloadPairsMutex = new Mutex()\n\n  protected get indexBatchSize() {\n    return this.config.indexBatchSize ?? DEFAULT_INDEX_BATCH_SIZE\n  }\n\n  protected get indexes(): string[] {\n    return ['schema', ...(this.config.indexes ?? [])]\n  }\n\n  protected get maxIndexSize() {\n    return this.config.maxIndexSize ?? DEFAULT_MAX_INDEX_SIZE\n  }\n\n  protected all(order: Order = 'desc', cursor?: Hex) {\n    const payloads = this.payloadsWithMeta.toSorted(PayloadBuilder.compareStorageMeta)\n    if (order === 'desc') payloads.reverse()\n    const startIndex = (cursor ? (payloads.findIndex(payload => payload._sequence === cursor) ?? -1) : -1) + 1\n    return payloads.slice(startIndex)\n  }\n\n  protected override async archivistInstance(): Promise<ArchivistInstance | undefined>\n  protected override async archivistInstance(required: true): Promise<ArchivistInstance>\n  protected override async archivistInstance(required = false): Promise<ArchivistInstance | undefined> {\n    if (!this._archivistInstance) {\n      const archivist = await super.archivistInstance()\n      if (required && !archivist) {\n        throw new Error('Failed to find archivist')\n      }\n      archivist?.on('inserted', this.onArchivistInserted)\n      archivist?.on('cleared', this.onArchivistCleared)\n      archivist?.on('deleted', this.onArchivistDeleted)\n      this._archivistInstance = archivist\n    }\n    return this._archivistInstance\n  }\n\n  protected async clearIndex() {\n    await this._updatePayloadPairsMutex.runExclusive(() => {\n      this._cursor = undefined\n      this.payloadsWithMeta = []\n      this.indexMaps = {}\n    })\n  }\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const filters = filterAs(payloads ?? [], asPayloadDivinerQueryPayload)\n    assertEx(filters.length < 2, () => 'Multiple PayloadDivinerQuery payloads may not be specified')\n    const filter = assertEx(filters.shift(), () => 'No PayloadDivinerQuery specified') as PayloadDivinerQueryPayload\n    await this.updateIndex()\n\n    const {\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n      schema, schemas, order, limit, cursor, ...props\n    } = filter\n    let all: TOut[] = this.all(order, cursor)\n    if (all) {\n      if (schemas?.length) all = all.filter(payload => schemas.includes(payload.schema))\n      if (Object.keys(props).length > 0) {\n        const additionalFilterCriteria = Object.entries(props)\n        for (const [prop, filter] of additionalFilterCriteria) {\n          const property = prop as keyof TOut\n          all\n            = Array.isArray(filter)\n              ? all.filter(payload =>\n                  filter.every((value) => {\n                    const prop = payload?.[property]\n                    // TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?\n                    return Array.isArray(prop) && prop.includes?.(value)\n                  }))\n              : all.filter(payload => payload?.[property] === filter)\n        }\n      }\n      return limit ? all.slice(0, limit) : all\n    } else {\n      throw new Error('Archivist does not support \"all\"')\n    }\n  }\n\n  protected onArchivistCleared: EventListener<ArchivistModuleEventData['cleared']> = () => {\n    forget(\n      (async () => {\n        await this.clearIndex()\n        await this.updateIndex()\n      })(),\n    )\n  }\n\n  // we are just rebuilding the entire index at this point on delete since large archivists do not support delete\n  protected onArchivistDeleted: EventListener<ArchivistModuleEventData['deleted']> = () => {\n    forget(\n      (async () => {\n        await this.clearIndex()\n        await this.updateIndex()\n      })(),\n    )\n  }\n\n  protected onArchivistInserted: EventListener<ArchivistModuleEventData['inserted']> = () => {\n    forget(this.updateIndex())\n  }\n\n  protected override async stopHandler(_timeout?: number | undefined): Promise<boolean> {\n    const archivist = await this.archivistInstance(true)\n    archivist.off('inserted', this.onArchivistInserted)\n    archivist.off('deleted', this.onArchivistDeleted)\n    archivist.off('cleared', this.onArchivistCleared)\n    return await super.stopHandler()\n  }\n\n  // index any new payloads\n  protected async updateIndex() {\n    await this._updatePayloadPairsMutex.runExclusive(async () => {\n      const archivist = await this.archivistInstance(true)\n      let newPayloads = await archivist.next({ limit: 100, cursor: this._cursor }) as TOut[]\n      while (newPayloads.length > 0) {\n        this._cursor = newPayloads.at(-1)?._sequence\n        assertEx(this.payloadsWithMeta.length + newPayloads.length <= this.maxIndexSize, () => 'maxIndexSize exceeded')\n        this.indexPayloads(newPayloads)\n        newPayloads = await archivist.next({ limit: 100, cursor: this._cursor }) as TOut[]\n      }\n    })\n  }\n\n  private indexPayloads(payloads: WithStorageMeta<TOut>[]): Hex {\n    this.payloadsWithMeta.push(...payloads)\n\n    // update the custom indexes\n    for (const index of this.indexes ?? []) {\n      this.indexMaps[index] = this.indexMaps[index] ?? []\n      for (const payload of payloads) {\n        this.indexMaps[index].push(payload)\n      }\n    }\n    return assertEx(payloads.at(-1), () => 'No payloads to index')._sequence\n  }\n}\n"],"mappings":"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","names":["filterAs","assertEx","forget","PayloadDiviner","asPayloadDivinerQueryPayload","PayloadBuilder","Mutex","DEFAULT_INDEX_BATCH_SIZE","DEFAULT_MAX_INDEX_SIZE","GenericPayloadDivinerConfigSchema","GenericPayloadDiviner","PayloadDiviner","configSchemas","defaultConfigSchema","indexMaps","payloadsWithMeta","_archivistInstance","_cursor","_updatePayloadPairsMutex","Mutex","indexBatchSize","config","indexes","maxIndexSize","all","order","cursor","payloads","toSorted","PayloadBuilder","compareStorageMeta","reverse","startIndex","findIndex","payload","_sequence","slice","archivistInstance","required","archivist","Error","on","onArchivistInserted","onArchivistCleared","onArchivistDeleted","clearIndex","runExclusive","undefined","divineHandler","filters","filterAs","asPayloadDivinerQueryPayload","assertEx","length","filter","shift","updateIndex","schema","schemas","limit","props","includes","Object","keys","additionalFilterCriteria","entries","prop","property","Array","isArray","every","value","forget","stopHandler","_timeout","off","newPayloads","next","at","indexPayloads","push","index"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-payload-generic",
-  "version": "3.6.0-rc.8",
+  "version": "3.6.0",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,34 +29,33 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/assert": "^4.4.16",
-    "@xylabs/forget": "^4.4.16",
-    "@xylabs/hex": "^4.4.16",
-    "@xylabs/object": "^4.4.16",
-    "@xyo-network/archivist-model": "^3.6.0-rc.8",
-    "@xyo-network/diviner-model": "^3.6.0-rc.8",
-    "@xyo-network/diviner-payload-abstract": "^3.6.0-rc.8",
-    "@xyo-network/diviner-payload-model": "^3.6.0-rc.8",
-    "@xyo-network/module-events": "^3.6.0-rc.8",
-    "@xyo-network/payload-builder": "^3.6.0-rc.8",
-    "@xyo-network/payload-model": "^3.6.0-rc.8",
+    "@xylabs/array": "^4.4.26",
+    "@xylabs/assert": "^4.4.26",
+    "@xylabs/forget": "^4.4.26",
+    "@xylabs/hex": "^4.4.26",
+    "@xyo-network/archivist-model": "^3.6.0",
+    "@xyo-network/diviner-model": "^3.6.0",
+    "@xyo-network/diviner-payload-abstract": "^3.6.0",
+    "@xyo-network/diviner-payload-model": "^3.6.0",
+    "@xyo-network/module-events": "^3.6.0",
+    "@xyo-network/payload-builder": "^3.6.0",
+    "@xyo-network/payload-model": "^3.6.0",
     "async-mutex": "^0.5.0"
   },
   "devDependencies": {
-    "@xylabs/delay": "^4.4.16",
-    "@xylabs/ts-scripts-yarn3": "^4.2.4",
-    "@xylabs/tsconfig": "^4.2.4",
-    "@xylabs/vitest-extended": "^4.4.16",
-    "@xyo-network/archivist-indexeddb": "^3.6.0-rc.8",
-    "@xyo-network/archivist-memory": "^3.6.0-rc.8",
-    "@xyo-network/node-memory": "^3.6.0-rc.8",
-    "@xyo-network/payload-builder": "^3.6.0-rc.8",
+    "@xylabs/delay": "^4.4.26",
+    "@xylabs/ts-scripts-yarn3": "^4.2.6",
+    "@xylabs/tsconfig": "^4.2.6",
+    "@xylabs/vitest-extended": "^4.4.26",
+    "@xyo-network/archivist-indexeddb": "^3.6.0",
+    "@xyo-network/archivist-memory": "^3.6.0",
+    "@xyo-network/node-memory": "^3.6.0",
+    "@xyo-network/payload-builder": "^3.6.0",
     "fake-indexeddb": "^6.0.0",
     "typescript": "^5.7.2",
     "vitest": "^2.1.8"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "stableVersion": "3.5.2"
+  }
 }

package/src/Diviner.ts

@@ -1,17 +1,17 @@
+import { filterAs } from '@xylabs/array'
 import { assertEx } from '@xylabs/assert'
 import { forget } from '@xylabs/forget'
-import { type Hash, type Hex } from '@xylabs/hex'
-import { type EmptyObject } from '@xylabs/object'
+import { type Hex } from '@xylabs/hex'
 import type { ArchivistInstance, ArchivistModuleEventData } from '@xyo-network/archivist-model'
 import type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'
 import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'
-import type {
-  Order,
-  PayloadDivinerConfig,
-  PayloadDivinerParams,
-  PayloadDivinerQueryPayload,
+import {
+  asPayloadDivinerQueryPayload,
+  type Order,
+  type PayloadDivinerConfig,
+  type PayloadDivinerParams,
+  type PayloadDivinerQueryPayload,
 } from '@xyo-network/diviner-payload-model'
-import { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
 import type { EventListener } from '@xyo-network/module-events'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import {
@@ -35,7 +35,7 @@ export type GenericPayloadDivinerConfig = PayloadDivinerConfig<
 
 export class GenericPayloadDiviner<
   TParams extends PayloadDivinerParams<GenericPayloadDivinerConfig> = PayloadDivinerParams<GenericPayloadDivinerConfig>,
-  TIn extends PayloadDivinerQueryPayload<EmptyObject, Hash> = PayloadDivinerQueryPayload<EmptyObject, Hash>,
+  TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,
   TOut extends WithStorageMeta<Payload> = WithStorageMeta<Payload>,
   TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<
     DivinerInstance<TParams, TIn, TOut>,
@@ -97,11 +97,9 @@ export class GenericPayloadDiviner<
   }
 
   protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {
-    const filters = payloads?.filter(isPayloadDivinerQueryPayload) ?? []
+    const filters = filterAs(payloads ?? [], asPayloadDivinerQueryPayload)
     assertEx(filters.length < 2, () => 'Multiple PayloadDivinerQuery payloads may not be specified')
-    const filter = assertEx(filters.shift(), () => 'No PayloadDivinerQuery specified') as unknown as
-      PayloadDivinerQueryPayload<EmptyObject, Hash>
-
+    const filter = assertEx(filters.shift(), () => 'No PayloadDivinerQuery specified') as PayloadDivinerQueryPayload
     await this.updateIndex()
 
     const {