@xyo-network/diviner-payload-generic 7.0.8 → 7.0.10

package/dist/neutral/index.d.ts

@@ -1,2 +1,2 @@
-export * from './Diviner.ts';
+export * from '@xyo-network/sdk/diviner-payload-generic';
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/neutral/index.mjs

@@ -1,181 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getProtoOf = Object.getPrototypeOf;
-var __reflectGet = Reflect.get;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
-
-// src/Diviner.ts
-import {
-  assertEx,
-  filterAs,
-  forget,
-  zodAsFactory,
-  zodIsFactory,
-  zodToFactory
-} from "@ariestools/sdk";
-import { PayloadDiviner } from "@xyo-network/diviner-payload-abstract";
-import { asPayloadDivinerQueryPayload, PayloadDivinerConfigZod } from "@xyo-network/diviner-payload-model";
-import { creatableModule } from "@xyo-network/module-model";
-import { PayloadBuilder } from "@xyo-network/sdk-protocol";
-import {
-  asSchema
-} from "@xyo-network/sdk-protocol";
-import { Mutex } from "async-mutex";
-import * as z from "zod/mini";
-var DEFAULT_INDEX_BATCH_SIZE = 100;
-var DEFAULT_MAX_INDEX_SIZE = 8e3;
-var GenericPayloadDivinerConfigSchema = asSchema("network.xyo.diviner.payload.generic.config", true);
-var GenericPayloadDivinerConfigZod = z.extend(PayloadDivinerConfigZod, {
-  indexes: z.optional(z.array(z.string())),
-  schema: z.literal(GenericPayloadDivinerConfigSchema)
-});
-var isGenericPayloadDivinerConfig = zodIsFactory(GenericPayloadDivinerConfigZod);
-var asGenericPayloadDivinerConfig = zodAsFactory(GenericPayloadDivinerConfigZod, "asGenericPayloadDivinerConfig");
-var toGenericPayloadDivinerConfig = zodToFactory(GenericPayloadDivinerConfigZod, "toGenericPayloadDivinerConfig");
-var GenericPayloadDiviner = class extends PayloadDiviner {
-  indexMaps = {};
-  payloadsWithMeta = [];
-  _archivistInstance;
-  _cursor;
-  _updatePayloadPairsMutex = new Mutex();
-  get indexBatchSize() {
-    return this.config.indexBatchSize ?? DEFAULT_INDEX_BATCH_SIZE;
-  }
-  get indexes() {
-    return ["schema", ...this.config.indexes ?? []];
-  }
-  get maxIndexSize() {
-    return this.config.maxIndexSize ?? DEFAULT_MAX_INDEX_SIZE;
-  }
-  all(order = "desc", cursor) {
-    const payloads = this.payloadsWithMeta.toSorted(PayloadBuilder.compareStorageMeta);
-    if (order === "desc") payloads.reverse();
-    const startIndex = (cursor ? payloads.findIndex((payload) => payload._sequence === cursor) ?? -1 : -1) + 1;
-    return payloads.slice(startIndex);
-  }
-  async archivistInstance(required = false) {
-    if (!this._archivistInstance) {
-      const archivist = await super.archivistInstance();
-      if (required && !archivist) {
-        throw new Error("Failed to find archivist");
-      }
-      archivist?.on("inserted", this.onArchivistInserted);
-      archivist?.on("cleared", this.onArchivistCleared);
-      archivist?.on("deleted", this.onArchivistDeleted);
-      this._archivistInstance = archivist;
-    }
-    return this._archivistInstance;
-  }
-  async clearIndex() {
-    await this._updatePayloadPairsMutex.runExclusive(() => {
-      this._cursor = void 0;
-      this.payloadsWithMeta = [];
-      this.indexMaps = {};
-    });
-  }
-  async divineHandler(payloads) {
-    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();
-    const {
-      schema,
-      schemas,
-      order,
-      limit,
-      cursor,
-      ...props
-    } = filter;
-    let all = this.all(order, cursor);
-    if (all) {
-      if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema));
-      if (Object.keys(props).length > 0) {
-        const additionalFilterCriteria = Object.entries(props);
-        for (const [prop, filter2] of additionalFilterCriteria) {
-          const property = prop;
-          all = Array.isArray(filter2) ? all.filter((payload) => filter2.every((value) => {
-            const prop2 = payload?.[property];
-            return Array.isArray(prop2) && prop2.includes?.(value);
-          })) : all.filter((payload) => payload?.[property] === filter2);
-        }
-      }
-      return limit ? all.slice(0, limit) : all;
-    } else {
-      throw new Error('Archivist does not support "all"');
-    }
-  }
-  onArchivistCleared = () => {
-    forget(
-      (async () => {
-        await this.clearIndex();
-        await this.updateIndex();
-      })()
-    );
-  };
-  // we are just rebuilding the entire index at this point on delete since large archivists do not support delete
-  onArchivistDeleted = () => {
-    forget(
-      (async () => {
-        await this.clearIndex();
-        await this.updateIndex();
-      })()
-    );
-  };
-  onArchivistInserted = () => {
-    forget(this.updateIndex());
-  };
-  async stopHandler(_timeout) {
-    await super.stopHandler();
-    const archivist = await this.archivistInstance(true);
-    archivist.off("inserted", this.onArchivistInserted);
-    archivist.off("deleted", this.onArchivistDeleted);
-    archivist.off("cleared", this.onArchivistCleared);
-  }
-  // index any new payloads
-  async updateIndex() {
-    await this._updatePayloadPairsMutex.runExclusive(async () => {
-      const archivist = await this.archivistInstance(true);
-      let newPayloads = await archivist.next({ limit: 100, cursor: this._cursor });
-      while (newPayloads.length > 0) {
-        this._cursor = newPayloads.at(-1)?._sequence;
-        assertEx(this.payloadsWithMeta.length + newPayloads.length <= this.maxIndexSize, () => "maxIndexSize exceeded");
-        this.indexPayloads(newPayloads);
-        newPayloads = await archivist.next({ limit: 100, cursor: this._cursor });
-      }
-    });
-  }
-  indexPayloads(payloads) {
-    this.payloadsWithMeta.push(...payloads);
-    for (const index of this.indexes ?? []) {
-      this.indexMaps[index] = this.indexMaps[index] ?? [];
-      for (const payload of payloads) {
-        this.indexMaps[index].push(payload);
-      }
-    }
-    return assertEx(payloads.at(-1), () => "No payloads to index")._sequence;
-  }
-};
-__publicField(GenericPayloadDiviner, "configSchemas", [...__superGet(GenericPayloadDiviner, GenericPayloadDiviner, "configSchemas"), GenericPayloadDivinerConfigSchema]);
-__publicField(GenericPayloadDiviner, "defaultConfigSchema", GenericPayloadDivinerConfigSchema);
-GenericPayloadDiviner = __decorateClass([
-  creatableModule()
-], GenericPayloadDiviner);
-export {
-  GenericPayloadDiviner,
-  GenericPayloadDivinerConfigSchema,
-  GenericPayloadDivinerConfigZod,
-  asGenericPayloadDivinerConfig,
-  isGenericPayloadDivinerConfig,
-  toGenericPayloadDivinerConfig
-};
+// src/index.ts
+export * from "@xyo-network/sdk/diviner-payload-generic";
 //# sourceMappingURL=index.mjs.map

package/dist/neutral/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../src/Diviner.ts"],
-  "sourcesContent": ["import type { EventListener, Hex } from '@ariestools/sdk'\nimport {\n  assertEx, filterAs, forget,\n  zodAsFactory, zodIsFactory, zodToFactory,\n} from '@ariestools/sdk'\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 { asPayloadDivinerQueryPayload, PayloadDivinerConfigZod } from '@xyo-network/diviner-payload-model'\nimport { creatableModule } from '@xyo-network/module-model'\nimport { PayloadBuilder } from '@xyo-network/sdk-protocol'\nimport {\n  asSchema,\n  type Payload, type Schema,\n  type Sequence,\n  type WithStorageMeta,\n} from '@xyo-network/sdk-protocol'\nimport { Mutex } from 'async-mutex'\nimport * as z from 'zod/mini'\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' & {\n  readonly __schema: true\n} = asSchema('network.xyo.diviner.payload.generic.config', true)\nexport type GenericPayloadDivinerConfigSchema = typeof GenericPayloadDivinerConfigSchema\n\nexport const GenericPayloadDivinerConfigZod: z.ZodMiniObject<\n  Omit<(typeof PayloadDivinerConfigZod)['shape'], 'schema'> & {\n    indexes: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>\n    schema: z.ZodMiniLiteral<GenericPayloadDivinerConfigSchema>\n  },\n  z.core.$strip\n> = z.extend(PayloadDivinerConfigZod, {\n  indexes: z.optional(z.array(z.string())),\n  schema: z.literal(GenericPayloadDivinerConfigSchema),\n})\n\nexport type GenericPayloadDivinerConfigBase = z.infer<typeof GenericPayloadDivinerConfigZod>\n\nexport const isGenericPayloadDivinerConfig: ReturnType<typeof zodIsFactory<GenericPayloadDivinerConfigBase>> = zodIsFactory(GenericPayloadDivinerConfigZod)\nexport const asGenericPayloadDivinerConfig: ReturnType<typeof zodAsFactory<GenericPayloadDivinerConfigBase>> = zodAsFactory(GenericPayloadDivinerConfigZod, 'asGenericPayloadDivinerConfig')\nexport const toGenericPayloadDivinerConfig: ReturnType<typeof zodToFactory<GenericPayloadDivinerConfigBase>> = zodToFactory(GenericPayloadDivinerConfigZod, 'toGenericPayloadDivinerConfig')\n\nexport type GenericPayloadDivinerConfig = PayloadDivinerConfig<\n  {\n    indexes?: string[]\n  },\n  GenericPayloadDivinerConfigSchema\n>\n\n@creatableModule()\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?: Sequence\n  private _updatePayloadPairsMutex = new Mutex()\n\n  protected get indexBatchSize(): number {\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(): number {\n    return this.config.maxIndexSize ?? DEFAULT_MAX_INDEX_SIZE\n  }\n\n  protected all(order: Order = 'desc', cursor?: Hex): WithStorageMeta<TOut>[] {\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(): Promise<void> {\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')\n    await this.updateIndex()\n\n    const {\n\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): Promise<void> {\n    await super.stopHandler()\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  }\n\n  // index any new payloads\n  protected async updateIndex(): Promise<void> {\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": ["filter", "prop"]
+  "sources": ["../../src/index.ts"],
+  "sourcesContent": ["// Compatibility shim: this package re-exports from @xyo-network/sdk.\nexport * from '@xyo-network/sdk/diviner-payload-generic'\n"],
+  "mappings": ";AACA,cAAc;",
+  "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-payload-generic",
-  "version": "7.0.8",
+  "version": "7.0.10",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -34,14 +34,11 @@
     "README.md"
   ],
   "dependencies": {
-    "@xyo-network/archivist-model": "~7.0.8",
-    "@xyo-network/diviner-model": "~7.0.8",
-    "@xyo-network/diviner-payload-abstract": "~7.0.8",
-    "@xyo-network/module-model": "~7.0.8",
-    "@xyo-network/diviner-payload-model": "~7.0.8"
+    "@xyo-network/sdk": "~7.0.10"
   },
   "devDependencies": {
-    "@ariestools/sdk": "~7.0.8",
+    "@ariestools/sdk": "~8.0.2",
+    "@ariestools/threads": "~8.0.2",
     "@bitauth/libauth": "~3.0.0",
     "@metamask/providers": "~22.1.1",
     "@noble/post-quantum": "~0.6.1",
@@ -49,37 +46,26 @@
     "@opentelemetry/sdk-trace-base": "~2.9.0",
     "@scure/base": "~2.2.0",
     "@scure/bip39": "~2.2.0",
-    "@xylabs/geo": "~7.0.8",
-    "@xylabs/indexed-db": "~7.0.8",
-    "@xylabs/threads": "~7.0.8",
-    "@xylabs/toolchain": "~8.6.2",
-    "@xylabs/tsconfig": "~8.6.2",
-    "@xylabs/vitest-extended": "~7.0.8",
-    "@xyo-network/sdk-protocol": "~7.0.13",
+    "@xylabs/toolchain": "~8.6.8",
+    "@xylabs/tsconfig": "~8.6.8",
+    "@xyo-network/sdk-protocol": "~7.0.15",
     "ajv": "~8.20.0",
     "async-mutex": "~0.5.0",
-    "browserslist": "~4.28.4",
     "debug": "~4.4.3",
     "eslint": "~10.6.0",
     "eslint-import-resolver-typescript": "~4.4.5",
     "ethers": "~6.17.0",
-    "fake-indexeddb": "~6.2.5",
     "hash-wasm": "~4.12.0",
     "idb": "~8.0.3",
     "lru-cache": "~11.5.1",
     "observable-fns": "~0.6.1",
-    "tslib": "~2.8.1",
     "typescript": "~6.0.3",
-    "vite": "~8.1.3",
-    "vitest": "~4.1.9",
     "webextension-polyfill": "~0.12.0",
-    "zod": "~4.4.3",
-    "@xyo-network/archivist-indexeddb": "~7.0.8",
-    "@xyo-network/archivist-memory": "~7.0.8",
-    "@xyo-network/node-memory": "~7.0.8"
+    "zod": "~4.4.3"
   },
   "peerDependencies": {
-    "@ariestools/sdk": "^7.0.8",
+    "@ariestools/sdk": "^8.0.2",
+    "@ariestools/threads": "^8.0.2",
     "@bitauth/libauth": "^3.0.0",
     "@metamask/providers": "^22.1.1",
     "@noble/post-quantum": "^0.6.1",
@@ -87,9 +73,7 @@
     "@opentelemetry/sdk-trace-base": "^2.9.0",
     "@scure/base": "^2.2.0",
     "@scure/bip39": "^2.2.0",
-    "@xylabs/geo": "^7.0.8",
-    "@xylabs/threads": "^7.0.8",
-    "@xyo-network/sdk-protocol": "^7.0.13",
+    "@xyo-network/sdk-protocol": "^7.0.15",
     "ajv": "^8.20.0",
     "async-mutex": "^0.5.0",
     "debug": "^4.4.3",
@@ -106,5 +90,6 @@
   },
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "deprecated": "Use @xyo-network/sdk/diviner-payload-generic instead. Replace @xyo-network/diviner-payload-generic with @xyo-network/sdk/diviner-payload-generic. This package is a compatibility shim only and will not receive further updates."
 }

package/dist/neutral/Diviner.d.ts

@@ -1,48 +0,0 @@
-import type { EventListener, Hex } from '@ariestools/sdk';
-import { zodAsFactory, zodIsFactory, zodToFactory } from '@ariestools/sdk';
-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 { PayloadDivinerConfigZod } from '@xyo-network/diviner-payload-model';
-import { type Payload, type Schema, type WithStorageMeta } from '@xyo-network/sdk-protocol';
-import * as z from 'zod/mini';
-export declare const GenericPayloadDivinerConfigSchema: 'network.xyo.diviner.payload.generic.config' & {
-    readonly __schema: true;
-};
-export type GenericPayloadDivinerConfigSchema = typeof GenericPayloadDivinerConfigSchema;
-export declare const GenericPayloadDivinerConfigZod: z.ZodMiniObject<Omit<(typeof PayloadDivinerConfigZod)['shape'], 'schema'> & {
-    indexes: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
-    schema: z.ZodMiniLiteral<GenericPayloadDivinerConfigSchema>;
-}, z.core.$strip>;
-export type GenericPayloadDivinerConfigBase = z.infer<typeof GenericPayloadDivinerConfigZod>;
-export declare const isGenericPayloadDivinerConfig: ReturnType<typeof zodIsFactory<GenericPayloadDivinerConfigBase>>;
-export declare const asGenericPayloadDivinerConfig: ReturnType<typeof zodAsFactory<GenericPayloadDivinerConfigBase>>;
-export declare const toGenericPayloadDivinerConfig: ReturnType<typeof zodToFactory<GenericPayloadDivinerConfigBase>>;
-export type GenericPayloadDivinerConfig = PayloadDivinerConfig<{
-    indexes?: string[];
-}, GenericPayloadDivinerConfigSchema>;
-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>[]>;
-    protected payloadsWithMeta: WithStorageMeta<TOut>[];
-    private _archivistInstance?;
-    private _cursor?;
-    private _updatePayloadPairsMutex;
-    protected get indexBatchSize(): number;
-    protected get indexes(): string[];
-    protected get maxIndexSize(): number;
-    protected all(order?: Order, cursor?: Hex): WithStorageMeta<TOut>[];
-    protected archivistInstance(): Promise<ArchivistInstance | undefined>;
-    protected archivistInstance(required: true): Promise<ArchivistInstance>;
-    protected clearIndex(): Promise<void>;
-    protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
-    protected onArchivistCleared: EventListener<ArchivistModuleEventData['cleared']>;
-    protected onArchivistDeleted: EventListener<ArchivistModuleEventData['deleted']>;
-    protected onArchivistInserted: EventListener<ArchivistModuleEventData['inserted']>;
-    protected stopHandler(_timeout?: number): Promise<void>;
-    protected updateIndex(): Promise<void>;
-    private indexPayloads;
-}
-//# sourceMappingURL=Diviner.d.ts.map

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

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