@xyo-network/diviner-payload-indexeddb 3.5.1 → 3.6.0-rc.1

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

@@ -1 +1 @@
-{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAGpF,OAAO,KAAK,EACV,OAAO,EAAE,MAAM,EAChB,MAAM,4BAA4B,CAAA;AAKnC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AA4BhE,qBAAa,uBAAuB,CAClC,OAAO,SAAS,6BAA6B,GAAG,6BAA6B,EAC7E,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,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,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAgE;IAChH,gBAAyB,mBAAmB,EAAE,MAAM,CAAsC;IAE1F,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAsEhD,YAAY;IAKrC,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,eAAe;IAoBvB;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}
+{"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../src/Diviner.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAEpF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAKjE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAA;AA4BhE,qBAAa,uBAAuB,CAClC,OAAO,SAAS,6BAA6B,GAAG,6BAA6B,EAC7E,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,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,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAgE;IAChH,gBAAyB,mBAAmB,EAAE,MAAM,CAAsC;IAE1F,OAAO,CAAC,GAAG,CAAwC;IAEnD;;;;;;OAMG;IACH,IAAI,MAAM,WAET;IAED;;OAEG;IACH,IAAI,SAAS,WAEZ;IAED;;;OAGG;IACH,IAAI,SAAS,WAEZ;cAEwB,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;cAoEhD,YAAY;IAKrC,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,eAAe;IAoBvB;;;OAGG;YACW,mBAAmB;IAwBjC;;;;OAIG;YACW,QAAQ;CAcvB"}

package/dist/browser/index.mjs

@@ -17,7 +17,6 @@ import { IndexedDbArchivist } from "@xyo-network/archivist-indexeddb";
 import { IndexSeparator } from "@xyo-network/archivist-model";
 import { PayloadDiviner } from "@xyo-network/diviner-payload-abstract";
 import { isPayloadDivinerQueryPayload } from "@xyo-network/diviner-payload-model";
-import { PayloadBuilder } from "@xyo-network/payload-builder";
 import { openDB } from "idb";
 var payloadValueFilter = /* @__PURE__ */ __name((key, value) => {
   if (!value) return void 0;
@@ -70,9 +69,7 @@ var IndexedDbPayloadDiviner = class extends PayloadDiviner {
     const result = await this.tryUseDb(async (db) => {
       const { schemas, limit, offset, order, ...props } = removeFields(query, [
         "hash",
-        "schema",
-        "$meta",
-        "$hash"
+        "schema"
       ]);
       const tx = db.transaction(this.storeName, "readonly");
       const store = tx.objectStore(this.storeName);
@@ -114,7 +111,7 @@ var IndexedDbPayloadDiviner = class extends PayloadDiviner {
         }
       }
       await tx.done;
-      return await Promise.all(results.map((payload) => PayloadBuilder.build(payload)));
+      return results;
     });
     return result ?? [];
   }

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["import { PayloadDivinerSchema } from '@xyo-network/diviner-payload-model'\n\nexport const IndexedDbPayloadDivinerSchema = `${PayloadDivinerSchema}.indexeddb` as const\nexport type IndexedDbPayloadDivinerSchema = typeof IndexedDbPayloadDivinerSchema\n","import type { IndexDescription } from '@xyo-network/archivist-model'\nimport type { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbPayloadDivinerSchema } from './Schema.ts'\n\nexport const IndexedDbPayloadDivinerConfigSchema = `${IndexedDbPayloadDivinerSchema}.config` as const\nexport type IndexedDbPayloadDivinerConfigSchema = typeof IndexedDbPayloadDivinerConfigSchema\n\nexport type IndexedDbPayloadDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbPayloadDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { removeFields } from '@xylabs/object'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { IndexSeparator } from '@xyo-network/archivist-model'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type {\n  Payload, Schema, WithMeta,\n} from '@xyo-network/payload-model'\nimport type { IDBPDatabase, IDBPObjectStore } from 'idb'\nimport { openDB } from 'idb'\n\nimport { IndexedDbPayloadDivinerConfigSchema } from './Config.ts'\nimport type { IndexedDbPayloadDivinerParams } from './Params.ts'\n\ninterface PayloadStore {\n  [s: string]: Payload\n}\n\ntype AnyPayload = Payload<Record<string, unknown>>\n\ntype ValueFilter = (payload?: AnyPayload | null) => boolean\n\nconst payloadValueFilter = (key: keyof AnyPayload, value?: unknown | unknown[]): ValueFilter | undefined => {\n  if (!value) return undefined\n  return (payload) => {\n    if (!payload) return false\n    const sourceValue = payload?.[key]\n    if (sourceValue === undefined) return false\n    return Array.isArray(sourceValue) && Array.isArray(value) ? containsAll(sourceValue, value) : sourceValue == value\n  }\n}\n\n// Function to extract fields from an index name\nconst extractFields = (indexName: string): string[] => {\n  return indexName\n    .slice(3)\n    .split(IndexSeparator)\n    .map(field => field.toLowerCase())\n}\n\nexport class IndexedDbPayloadDiviner<\n  TParams extends IndexedDbPayloadDivinerParams = IndexedDbPayloadDivinerParams,\n  TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\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 PayloadDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexedDbPayloadDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexedDbPayloadDivinerConfigSchema\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to the archivist default version.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const query = payloads?.find(isPayloadDivinerQueryPayload) as TIn\n    if (!query) return []\n    const result = await this.tryUseDb(async (db) => {\n      const {\n        schemas, limit, offset, order, ...props\n      } = removeFields(query as unknown as WithMeta<TIn> & { sources?: Hash[] }, [\n        'hash',\n        'schema',\n        '$meta',\n        '$hash',\n      ])\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: TOut[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      assertEx((schemas?.length ?? 1) === 1, () => 'IndexedDbPayloadDiviner: Only one filter schema supported')\n      const filterSchema = schemas?.[0]\n      const filter = filterSchema ? { schema: filterSchema, ...props } : { ...props }\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const suggestedIndex = this.selectBestIndex(filter, store)\n      const keyRangeValue = this.getKeyRangeValue(suggestedIndex, filter)\n      const valueFilters: ValueFilter[]\n        = props\n          ? Object.entries(props)\n            .map(([key, value]) => payloadValueFilter(key, value))\n            .filter(exists)\n          : []\n      let cursor\n        = suggestedIndex\n          // Conditionally filter on schemas\n          ? await store.index(suggestedIndex).openCursor(IDBKeyRange.only(keyRangeValue), direction)\n          // Just iterate all records\n          : await store.openCursor(suggestedIndex, direction)\n\n      // Skip records until the offset is reached\n      while (cursor && parsedOffset > 0) {\n        cursor = await cursor.advance(parsedOffset)\n        parsedOffset = 0 // Reset offset after skipping\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every(filter => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        try {\n          cursor = await cursor.continue()\n        } catch {\n          break\n        }\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return await Promise.all(results.map(payload => PayloadBuilder.build(payload)))\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    return true\n  }\n\n  private getKeyRangeValue(indexName: string | null, query: AnyObject): unknown | unknown[] {\n    if (!indexName) return []\n\n    // Extracting the relevant fields from the index name\n    const indexFields = extractFields(indexName)\n\n    // Collecting the values for these fields from the query object\n    const keyRangeValue = indexFields.map(field => query[field as keyof AnyObject])\n    return keyRangeValue.length === 1 ? keyRangeValue[0] : keyRangeValue\n  }\n\n  private selectBestIndex(query: AnyObject, store: IDBPObjectStore<PayloadStore>): string | null {\n    // List of available indexes\n    const { indexNames } = store\n\n    // Convert query object keys to a set for easier comparison\n    const queryKeys = new Set(Object.keys(query).map(key => key.toLowerCase()))\n\n    // Find the best matching index\n    let bestMatch: { indexName: string; matchCount: number } = { indexName: '', matchCount: 0 }\n\n    for (const indexName of indexNames) {\n      const indexFields = extractFields(indexName)\n      const matchCount = indexFields.filter(field => queryKeys.has(field)).length\n      if (matchCount > bestMatch.matchCount) {\n        bestMatch = { indexName, matchCount }\n      }\n    }\n    return bestMatch.matchCount > 0 ? bestMatch.indexName : null\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<PayloadStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<PayloadStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<PayloadStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["PayloadDivinerSchema","IndexedDbPayloadDivinerSchema","IndexedDbPayloadDivinerConfigSchema","IndexedDbPayloadDivinerSchema","containsAll","assertEx","exists","removeFields","IndexedDbArchivist","IndexSeparator","PayloadDiviner","isPayloadDivinerQueryPayload","PayloadBuilder","openDB","payloadValueFilter","key","value","undefined","payload","sourceValue","Array","isArray","containsAll","extractFields","indexName","slice","split","IndexSeparator","map","field","toLowerCase","IndexedDbPayloadDiviner","PayloadDiviner","configSchemas","IndexedDbPayloadDivinerConfigSchema","defaultConfigSchema","_db","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","find","isPayloadDivinerQueryPayload","result","tryUseDb","db","schemas","limit","offset","order","props","removeFields","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","assertEx","length","filterSchema","filter","schema","direction","suggestedIndex","selectBestIndex","keyRangeValue","getKeyRangeValue","valueFilters","Object","entries","exists","cursor","index","openCursor","IDBKeyRange","only","advance","every","push","continue","done","Promise","all","PayloadBuilder","build","startHandler","indexFields","indexNames","queryKeys","Set","keys","bestMatch","matchCount","has","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback"]}
+{"version":3,"sources":["../../src/Schema.ts","../../src/Config.ts","../../src/Diviner.ts"],"sourcesContent":["import { PayloadDivinerSchema } from '@xyo-network/diviner-payload-model'\n\nexport const IndexedDbPayloadDivinerSchema = `${PayloadDivinerSchema}.indexeddb` as const\nexport type IndexedDbPayloadDivinerSchema = typeof IndexedDbPayloadDivinerSchema\n","import type { IndexDescription } from '@xyo-network/archivist-model'\nimport type { DivinerConfig } from '@xyo-network/diviner-model'\n\nimport { IndexedDbPayloadDivinerSchema } from './Schema.ts'\n\nexport const IndexedDbPayloadDivinerConfigSchema = `${IndexedDbPayloadDivinerSchema}.config` as const\nexport type IndexedDbPayloadDivinerConfigSchema = typeof IndexedDbPayloadDivinerConfigSchema\n\nexport type IndexedDbPayloadDivinerConfig = DivinerConfig<{\n  /**\n   * The database name\n   */\n  dbName?: string\n  /**\n   * The version of the DB, defaults to 1\n   */\n  dbVersion?: number\n  schema: IndexedDbPayloadDivinerConfigSchema\n  /**\n   * The storage configuration\n   * // TODO: Hoist to main diviner config\n   */\n  storage?: {\n    /**\n     * The indexes to create on the object store\n     */\n    indexes?: IndexDescription[]\n  }\n  /**\n   * The name of the object store\n   */\n  storeName?: string\n}>\n","import { containsAll } from '@xylabs/array'\nimport { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Hash } from '@xylabs/hex'\nimport type { AnyObject } from '@xylabs/object'\nimport { removeFields } from '@xylabs/object'\nimport { IndexedDbArchivist } from '@xyo-network/archivist-indexeddb'\nimport { IndexSeparator } from '@xyo-network/archivist-model'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport type { IDBPDatabase, IDBPObjectStore } from 'idb'\nimport { openDB } from 'idb'\n\nimport { IndexedDbPayloadDivinerConfigSchema } from './Config.ts'\nimport type { IndexedDbPayloadDivinerParams } from './Params.ts'\n\ninterface PayloadStore {\n  [s: string]: Payload\n}\n\ntype AnyPayload = Payload<Record<string, unknown>>\n\ntype ValueFilter = (payload?: AnyPayload | null) => boolean\n\nconst payloadValueFilter = (key: keyof AnyPayload, value?: unknown | unknown[]): ValueFilter | undefined => {\n  if (!value) return undefined\n  return (payload) => {\n    if (!payload) return false\n    const sourceValue = payload?.[key]\n    if (sourceValue === undefined) return false\n    return Array.isArray(sourceValue) && Array.isArray(value) ? containsAll(sourceValue, value) : sourceValue == value\n  }\n}\n\n// Function to extract fields from an index name\nconst extractFields = (indexName: string): string[] => {\n  return indexName\n    .slice(3)\n    .split(IndexSeparator)\n    .map(field => field.toLowerCase())\n}\n\nexport class IndexedDbPayloadDiviner<\n  TParams extends IndexedDbPayloadDivinerParams = IndexedDbPayloadDivinerParams,\n  TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\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 PayloadDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, IndexedDbPayloadDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = IndexedDbPayloadDivinerConfigSchema\n\n  private _db: IDBPDatabase<PayloadStore> | undefined\n\n  /**\n   * The database name. If not supplied via config, it defaults\n   * to the archivist's name and if archivist's name is not supplied,\n   * it defaults to `archivist`. This behavior\n   * biases towards a single, isolated DB per archivist which seems to\n   * make the most sense for 99% of use cases.\n   */\n  get dbName() {\n    return this.config?.dbName ?? this.config?.archivist ?? IndexedDbArchivist.defaultDbName\n  }\n\n  /**\n   * The database version. If not supplied via config, it defaults to the archivist default version.\n   */\n  get dbVersion() {\n    return this.config?.dbVersion ?? IndexedDbArchivist.defaultDbVersion\n  }\n\n  /**\n   * The name of the object store. If not supplied via config, it defaults\n   * to `payloads`.\n   */\n  get storeName() {\n    return this.config?.storeName ?? IndexedDbArchivist.defaultStoreName\n  }\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const query = payloads?.find(isPayloadDivinerQueryPayload) as TIn\n    if (!query) return []\n    const result = await this.tryUseDb(async (db) => {\n      const {\n        schemas, limit, offset, order, ...props\n      } = removeFields(query as unknown as TIn & { sources?: Hash[] }, [\n        'hash',\n        'schema',\n      ])\n      const tx = db.transaction(this.storeName, 'readonly')\n      const store = tx.objectStore(this.storeName)\n      const results: TOut[] = []\n      let parsedOffset = offset ?? 0\n      const parsedLimit = limit ?? 10\n      assertEx((schemas?.length ?? 1) === 1, () => 'IndexedDbPayloadDiviner: Only one filter schema supported')\n      const filterSchema = schemas?.[0]\n      const filter = filterSchema ? { schema: filterSchema, ...props } : { ...props }\n      const direction: IDBCursorDirection = order === 'desc' ? 'prev' : 'next'\n      const suggestedIndex = this.selectBestIndex(filter, store)\n      const keyRangeValue = this.getKeyRangeValue(suggestedIndex, filter)\n      const valueFilters: ValueFilter[]\n        = props\n          ? Object.entries(props)\n              .map(([key, value]) => payloadValueFilter(key, value))\n              .filter(exists)\n          : []\n      let cursor\n        = suggestedIndex\n          // Conditionally filter on schemas\n          ? await store.index(suggestedIndex).openCursor(IDBKeyRange.only(keyRangeValue), direction)\n          // Just iterate all records\n          : await store.openCursor(suggestedIndex, direction)\n\n      // Skip records until the offset is reached\n      while (cursor && parsedOffset > 0) {\n        cursor = await cursor.advance(parsedOffset)\n        parsedOffset = 0 // Reset offset after skipping\n      }\n      // Collect results up to the limit\n      while (cursor && results.length < parsedLimit) {\n        const value = cursor.value\n        if (value) {\n          // If we're filtering on more than just the schema\n          if (valueFilters.length > 0) {\n            // Ensure all filters pass\n            if (valueFilters.every(filter => filter(value))) {\n              // Then save the value\n              results.push(value)\n            }\n          } else {\n            // Otherwise just save the value\n            results.push(value)\n          }\n        }\n        try {\n          cursor = await cursor.continue()\n        } catch {\n          break\n        }\n      }\n      await tx.done\n      // Remove any metadata before returning to the client\n      return results\n    })\n    return result ?? []\n  }\n\n  protected override async startHandler() {\n    await super.startHandler()\n    return true\n  }\n\n  private getKeyRangeValue(indexName: string | null, query: AnyObject): unknown | unknown[] {\n    if (!indexName) return []\n\n    // Extracting the relevant fields from the index name\n    const indexFields = extractFields(indexName)\n\n    // Collecting the values for these fields from the query object\n    const keyRangeValue = indexFields.map(field => query[field as keyof AnyObject])\n    return keyRangeValue.length === 1 ? keyRangeValue[0] : keyRangeValue\n  }\n\n  private selectBestIndex(query: AnyObject, store: IDBPObjectStore<PayloadStore>): string | null {\n    // List of available indexes\n    const { indexNames } = store\n\n    // Convert query object keys to a set for easier comparison\n    const queryKeys = new Set(Object.keys(query).map(key => key.toLowerCase()))\n\n    // Find the best matching index\n    let bestMatch: { indexName: string; matchCount: number } = { indexName: '', matchCount: 0 }\n\n    for (const indexName of indexNames) {\n      const indexFields = extractFields(indexName)\n      const matchCount = indexFields.filter(field => queryKeys.has(field)).length\n      if (matchCount > bestMatch.matchCount) {\n        bestMatch = { indexName, matchCount }\n      }\n    }\n    return bestMatch.matchCount > 0 ? bestMatch.indexName : null\n  }\n\n  /**\n   * Checks that the desired DB/objectStore exists and is initialized to the correct version\n   * @returns The initialized DB or undefined if it does not exist in the desired state\n   */\n  private async tryGetInitializedDb(): Promise<IDBPDatabase<PayloadStore> | undefined> {\n    // Enumerate the DBs\n    const dbs = await indexedDB.databases()\n    // Check that the DB exists at the desired version\n    const dbExists = dbs.some((db) => {\n      return db.name === this.dbName && db.version === this.dbVersion\n    })\n    // If the DB exists at the desired version\n    if (dbExists) {\n      // If the db does exist, open it\n      const db = await openDB<PayloadStore>(this.dbName, this.dbVersion)\n      // Check that the desired objectStore exists\n      const storeExists = db.objectStoreNames.contains(this.storeName)\n      // If the correct db/version/objectStore exists\n      if (storeExists) {\n        return db\n      } else {\n        // Otherwise close the db so the process that is going to update the\n        // db can open it\n        db.close()\n      }\n    }\n  }\n\n  /**\n   * Executes a callback with the initialized DB and then closes the db\n   * @param callback The method to execute with the initialized DB\n   * @returns\n   */\n  private async tryUseDb<T>(callback: (db: IDBPDatabase<PayloadStore>) => Promise<T> | T): Promise<T | undefined> {\n    // Get the initialized DB\n    const db = await this.tryGetInitializedDb()\n    if (db) {\n      try {\n        // Perform the callback\n        return await callback(db)\n      } finally {\n        // Close the DB\n        db.close()\n      }\n    }\n    return undefined\n  }\n}\n"],"mappings":"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","names":["PayloadDivinerSchema","IndexedDbPayloadDivinerSchema","IndexedDbPayloadDivinerConfigSchema","IndexedDbPayloadDivinerSchema","containsAll","assertEx","exists","removeFields","IndexedDbArchivist","IndexSeparator","PayloadDiviner","isPayloadDivinerQueryPayload","openDB","payloadValueFilter","key","value","undefined","payload","sourceValue","Array","isArray","containsAll","extractFields","indexName","slice","split","IndexSeparator","map","field","toLowerCase","IndexedDbPayloadDiviner","PayloadDiviner","configSchemas","IndexedDbPayloadDivinerConfigSchema","defaultConfigSchema","_db","dbName","config","archivist","IndexedDbArchivist","defaultDbName","dbVersion","defaultDbVersion","storeName","defaultStoreName","divineHandler","payloads","query","find","isPayloadDivinerQueryPayload","result","tryUseDb","db","schemas","limit","offset","order","props","removeFields","tx","transaction","store","objectStore","results","parsedOffset","parsedLimit","assertEx","length","filterSchema","filter","schema","direction","suggestedIndex","selectBestIndex","keyRangeValue","getKeyRangeValue","valueFilters","Object","entries","exists","cursor","index","openCursor","IDBKeyRange","only","advance","every","push","continue","done","startHandler","indexFields","indexNames","queryKeys","Set","keys","bestMatch","matchCount","has","tryGetInitializedDb","dbs","indexedDB","databases","dbExists","some","name","version","openDB","storeExists","objectStoreNames","contains","close","callback"]}

package/package.json

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

package/src/Diviner.ts

@@ -10,10 +10,7 @@ import type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/divin
 import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'
 import type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
 import { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type {
-  Payload, Schema, WithMeta,
-} from '@xyo-network/payload-model'
+import type { Payload, Schema } from '@xyo-network/payload-model'
 import type { IDBPDatabase, IDBPObjectStore } from 'idb'
 import { openDB } from 'idb'
 
@@ -93,11 +90,9 @@ export class IndexedDbPayloadDiviner<
     const result = await this.tryUseDb(async (db) => {
       const {
         schemas, limit, offset, order, ...props
-      } = removeFields(query as unknown as WithMeta<TIn> & { sources?: Hash[] }, [
+      } = removeFields(query as unknown as TIn & { sources?: Hash[] }, [
         'hash',
         'schema',
-        '$meta',
-        '$hash',
       ])
       const tx = db.transaction(this.storeName, 'readonly')
       const store = tx.objectStore(this.storeName)
@@ -113,8 +108,8 @@ export class IndexedDbPayloadDiviner<
       const valueFilters: ValueFilter[]
         = props
           ? Object.entries(props)
-            .map(([key, value]) => payloadValueFilter(key, value))
-            .filter(exists)
+              .map(([key, value]) => payloadValueFilter(key, value))
+              .filter(exists)
           : []
       let cursor
         = suggestedIndex
@@ -152,7 +147,7 @@ export class IndexedDbPayloadDiviner<
       }
       await tx.done
       // Remove any metadata before returning to the client
-      return await Promise.all(results.map(payload => PayloadBuilder.build(payload)))
+      return results
     })
     return result ?? []
   }