@xylabs/indexed-db 4.5.8 → 4.5.10

package/dist/browser/index.mjs

@@ -47,8 +47,7 @@ function createStoreDuringUpgrade(db, storeName, indexes, logger) {
 var dbMutexes = {};
 async function withDb(dbName, callback, expectedIndexes, logger, lock = true) {
   dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex();
-  const nolockRun = (callback2) => callback2();
-  const db = await (lock ? dbMutexes[dbName].runExclusive : nolockRun)(async () => {
+  const handler = async () => {
     const versionToOpen = expectedIndexes === void 0 ? void 0 : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger);
     const db2 = await openDB(dbName, versionToOpen, {
       blocked(currentVersion, blockedVersion, event) {
@@ -77,7 +76,8 @@ async function withDb(dbName, callback, expectedIndexes, logger, lock = true) {
       }
     });
     return db2;
-  });
+  };
+  const db = lock ? await dbMutexes[dbName].runExclusive(handler) : await handler();
   try {
     return await callback(db);
   } finally {
@@ -168,7 +168,7 @@ async function checkDbNeedsUpgrade(dbName, stores, logger) {
       }
     }
     return db.version;
-  }, {}, logger, false);
+  }, void 0, logger, false);
 }
 
 // src/IndexedDbKeyValueStore.ts

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/checkDbNeedsUpgrade.ts","../../src/withDb.ts","../../src/IndexDescription.ts","../../src/createStoreDuringUpgrade.ts","../../src/withStore.ts","../../src/withReadOnlyStore.ts","../../src/getExistingIndexes.ts","../../src/IndexedDbKeyValueStore.ts","../../src/withReadWriteStore.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Logger } from '@xylabs/logger'\nimport type { IDBPDatabase } from 'idb'\n\nimport { getExistingIndexes } from './getExistingIndexes.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\n\nexport async function checkStoreNeedsUpgrade(db: IDBPDatabase<ObjectStore<object>>, storeName: string, indexes: IndexDescription[], logger?: Logger) {\n  logger?.log('checkStoreNeedsUpgrade', storeName, indexes)\n  const existingIndexes = await getExistingIndexes(db, storeName, logger)\n  if (existingIndexes === null) {\n    // the store does not exist, so we need to trigger upgrade (no existing indexes)\n    return true\n  }\n  const existingIndexNames = new Set(existingIndexes.map(({ key, unique }) => buildStandardIndexName({ key, unique })).filter(exists))\n  for (const { key, unique } of indexes) {\n    const indexName = buildStandardIndexName({ key, unique })\n    if (!existingIndexNames.has(indexName)) {\n      return true\n    }\n  }\n  return false\n}\n\nexport async function checkDbNeedsUpgrade(dbName: string, stores: Record<string, IndexDescription[]>, logger?: Logger) {\n  logger?.log('checkDbNeedsUpgrade', dbName, stores)\n  return await withDb<ObjectStore, number>(dbName, async (db) => {\n    for (const [storeName, indexes] of Object.entries(stores)) {\n      if (await checkStoreNeedsUpgrade(db, storeName, indexes, logger)) {\n        return db.version + 1\n      }\n    }\n    return db.version\n  }, {}, logger, false)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { MutexInterface } from 'async-mutex'\nimport { Mutex } from 'async-mutex'\nimport type {\n  DBSchema, IDBPDatabase, StoreNames,\n} from 'idb'\nimport { openDB } from 'idb'\n\nimport { checkDbNeedsUpgrade } from './checkDbNeedsUpgrade.ts'\nimport { createStoreDuringUpgrade } from './createStoreDuringUpgrade.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\n\nconst dbMutexes: Record<string, Mutex> = {}\n\nexport async function withDb<DBTypes extends DBSchema | unknown = unknown, R = EmptyObject>(\n  dbName: string,\n  callback: (db: IDBPDatabase<DBTypes>) => Promise<R> | R,\n  expectedIndexes?: Record<string, IndexDescription[]>,\n  logger?: Logger,\n  lock = true,\n): Promise<R> {\n  dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex()\n  const nolockRun = <T>(callback: MutexInterface.Worker<T>) => callback()\n  const db = await (lock ? dbMutexes[dbName].runExclusive : nolockRun) (async () => {\n    const versionToOpen = expectedIndexes === undefined ? undefined : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger)\n    const db = await openDB<DBTypes>(dbName, versionToOpen, {\n      blocked(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocked from upgrading from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      blocking(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocking upgrade from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      terminated() {\n        logger?.log('IndexedDb: Terminated')\n      },\n      upgrade(db, oldVersion, newVersion, transaction) {\n      /* if (oldVersion !== newVersion) {\n        logger?.log(`IndexedDb: Upgrading from ${oldVersion} to ${newVersion}`)\n        const objectStores = transaction.objectStoreNames\n        for (const name of objectStores) {\n          try {\n            db.deleteObjectStore(name)\n          } catch {\n            console.log(`IndexedDb: Failed to delete existing object store ${name}`)\n          }\n        }\n      } */\n        if (expectedIndexes) {\n          for (const [storeName, indexes] of Object.entries(expectedIndexes)) {\n            if (db.objectStoreNames.contains(storeName as StoreNames<DBTypes>)) {\n              continue\n            }\n            const indexesToCreate = indexes.map(idx => ({\n              ...idx,\n              name: buildStandardIndexName(idx),\n            // eslint-disable-next-line unicorn/no-array-reduce\n            })).reduce((acc, idx) => acc.set(idx.name, idx), new Map<string, IndexDescription>()).values()\n            createStoreDuringUpgrade(db, storeName as StoreNames<DBTypes>, [...indexesToCreate], logger)\n          }\n        }\n      },\n    })\n    return db\n  })\n  try {\n    return await callback(db)\n  } finally {\n    db.close()\n  }\n}\n","/**\n * The index direction (1 for ascending, -1 for descending)\n */\nexport type IndexDirection = -1 | 1\n\n/**\n * Description of index(es) to be created on a store\n */\nexport type IndexDescription = {\n  /**\n   * The key(s) to index\n   */\n  key: Record<string, IndexDirection>\n  /**\n   * Is the indexed value an array\n   */\n  multiEntry?: boolean\n  /**\n   * If true, the index must enforce uniqueness on the key\n   */\n  unique?: boolean\n}\n\nexport const IndexSeparator = '-'\n\n/**\n * Given an index description, this will build the index\n * name in standard form\n * @param index The index description\n * @returns The index name in standard form\n */\nexport const buildStandardIndexName = (index: IndexDescription) => {\n  const { key, unique } = index\n  const prefix = unique ? 'UX' : 'IX'\n  const indexKeys = Object.keys(key)\n  return `${prefix}_${indexKeys.join(IndexSeparator)}`\n}\n","import type { Logger } from '@xylabs/logger'\nimport type {\n  DBSchema,\n  IDBPDatabase, IDBPObjectStore, IndexNames, StoreNames,\n} from 'idb'\n\nimport {\n  buildStandardIndexName,\n  type IndexDescription,\n} from './IndexDescription.ts'\n\nexport function createStoreDuringUpgrade<DBTypes extends DBSchema | unknown = unknown>(\n  db: IDBPDatabase<DBTypes>,\n  storeName: StoreNames<DBTypes>,\n  indexes: IndexDescription[],\n  logger?: Logger,\n) {\n  logger?.log(`Creating store ${storeName}`)\n  // Create the store\n  let store: IDBPObjectStore<DBTypes, ArrayLike<StoreNames<DBTypes>>, StoreNames<DBTypes>, 'versionchange'> | undefined\n  try {\n    store = db.createObjectStore(storeName, {\n    // If it isn't explicitly set, create a value by auto incrementing.\n      autoIncrement: true,\n    })\n  } catch {\n    logger?.warn(`Failed to create store: ${storeName} already exists`)\n    return\n  }\n  logger?.log(`Creating store: created ${storeName}`)\n  // Name the store\n  store.name = storeName\n  // Create an index on the hash\n  for (const {\n    key, multiEntry, unique,\n  } of indexes) {\n    logger?.log(`Creating store: index ${key}`)\n    const indexKeys = Object.keys(key)\n    const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n    const indexName = buildStandardIndexName({ key, unique }) as IndexNames<DBTypes, StoreNames<DBTypes>>\n    console.log('createIndex', indexName, keys, { multiEntry, unique })\n    store.createIndex(indexName, keys, { multiEntry, unique })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, IDBPTransaction, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\n\nexport async function withStore<T extends EmptyObject = EmptyObject, R = T, M extends 'readonly' | 'readwrite' = 'readonly'>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>,\n    [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, M> | null) => Promise<R> | R,\n  mode: M,\n  logger?: Logger,\n): Promise<R> {\n  logger?.log('withStore', storeName, mode)\n  let transaction: IDBPTransaction<ObjectStore<T>, [StoreNames<ObjectStore<T>>], M> | undefined = undefined\n  logger?.log('withStore:transaction')\n  let store = null\n  try {\n    transaction = db.transaction(storeName, mode)\n    // we do this in a try/catch because the store might not exist\n    store = transaction.objectStore(storeName)\n  } catch (ex) {\n    logger?.log('withStore:catch', ex)\n  }\n  try {\n    return await callback(store)\n  } finally {\n    logger?.log('withStore:finally')\n    await transaction?.done\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadOnlyStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readonly'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readonly', logger)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { IDBPDatabase, StoreNames } from 'idb'\n\nimport {\n  type IndexDescription,\n  type IndexDirection,\n} from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\nimport { withReadOnlyStore } from './withReadOnlyStore.ts'\n\nasync function getExistingIndexesInternal<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexesInternal', storeName)\n  return await withReadOnlyStore(db, storeName, (store) => {\n    return store\n      ? [...store.indexNames].map((indexName) => {\n          const index = store.index(indexName)\n          const key: Record<string, IndexDirection> = {}\n          if (Array.isArray(index.keyPath)) {\n            for (const keyPath of index.keyPath) {\n              key[keyPath] = 1\n            }\n          } else {\n            key[index.keyPath] = 1\n          }\n          const desc: IndexDescription = {\n            key,\n            unique: index.unique,\n            multiEntry: index.multiEntry,\n          }\n          return desc\n        })\n      : null\n  }, logger)\n}\n\nexport async function getExistingIndexes<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>> | string,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexes', storeName)\n  if (typeof db === 'string') {\n    return await withDb<ObjectStore<T>, IndexDescription[] | null>(db, async (db) => {\n      return await getExistingIndexesInternal(db, storeName, logger)\n    })\n  }\n  return await getExistingIndexesInternal(db, storeName, logger)\n}\n","import type { KeyValueStore } from '@xylabs/storage'\nimport type {\n  DBSchema,\n  IDBPDatabase, StoreKey, StoreNames, StoreValue,\n} from 'idb'\n\nimport { withDb } from './withDb.ts'\n\n/**\n * An IndexedDB key/value store.\n */\nexport class IndexedDbKeyValueStore<T extends DBSchema, S extends StoreNames<T>> implements KeyValueStore<StoreValue<T, S>, StoreKey<T, S>> {\n  constructor(readonly dbName: string, readonly storeName: S) {}\n\n  async clear?(): Promise<void> {\n    return await this.withDb((db) => {\n      return db.clear(this.storeName)\n    })\n  }\n\n  async delete(key: StoreKey<T, S>): Promise<void> {\n    return await this.withDb((db) => {\n      return db.delete(this.storeName, key)\n    })\n  }\n\n  async get(key: StoreKey<T, S>) {\n    return await this.withDb((db) => {\n      return db.get(this.storeName, key) ?? undefined\n    })\n  }\n\n  async keys?(): Promise<StoreKey<T, S>[]> {\n    return await this.withDb((db) => {\n      return db.getAllKeys(this.storeName)\n    })\n  }\n\n  async set(key: StoreKey<T, S>, value: StoreValue<T, S>): Promise<void> {\n    return await this.withDb(async (db) => {\n      await db.put(this.storeName, value, key)\n    })\n  }\n\n  async withDb<R = StoreValue<T, S>>(\n    callback: (db: IDBPDatabase<T>) =>\n      Promise<R> | R,\n  ) {\n    return await withDb<T, R>(this.dbName, (db) => {\n      return callback(db)\n    })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadWriteStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readwrite'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readwrite', logger)\n}\n"],"mappings":"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","names":["callback","db","db"]}
+{"version":3,"sources":["../../src/checkDbNeedsUpgrade.ts","../../src/withDb.ts","../../src/IndexDescription.ts","../../src/createStoreDuringUpgrade.ts","../../src/withStore.ts","../../src/withReadOnlyStore.ts","../../src/getExistingIndexes.ts","../../src/IndexedDbKeyValueStore.ts","../../src/withReadWriteStore.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Logger } from '@xylabs/logger'\nimport type { IDBPDatabase } from 'idb'\n\nimport { getExistingIndexes } from './getExistingIndexes.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\n\nexport async function checkStoreNeedsUpgrade(db: IDBPDatabase<ObjectStore<object>>, storeName: string, indexes: IndexDescription[], logger?: Logger) {\n  logger?.log('checkStoreNeedsUpgrade', storeName, indexes)\n  const existingIndexes = await getExistingIndexes(db, storeName, logger)\n  if (existingIndexes === null) {\n    // the store does not exist, so we need to trigger upgrade (no existing indexes)\n    return true\n  }\n  const existingIndexNames = new Set(existingIndexes.map(({ key, unique }) => buildStandardIndexName({ key, unique })).filter(exists))\n  for (const { key, unique } of indexes) {\n    const indexName = buildStandardIndexName({ key, unique })\n    if (!existingIndexNames.has(indexName)) {\n      return true\n    }\n  }\n  return false\n}\n\nexport async function checkDbNeedsUpgrade(dbName: string, stores: Record<string, IndexDescription[]>, logger?: Logger) {\n  logger?.log('checkDbNeedsUpgrade', dbName, stores)\n  return await withDb<ObjectStore, number>(dbName, async (db) => {\n    for (const [storeName, indexes] of Object.entries(stores)) {\n      if (await checkStoreNeedsUpgrade(db, storeName, indexes, logger)) {\n        return db.version + 1\n      }\n    }\n    return db.version\n  }, undefined, logger, false)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { MutexInterface } from 'async-mutex'\nimport { Mutex } from 'async-mutex'\nimport type {\n  DBSchema, IDBPDatabase, StoreNames,\n} from 'idb'\nimport { openDB } from 'idb'\n\nimport { checkDbNeedsUpgrade } from './checkDbNeedsUpgrade.ts'\nimport { createStoreDuringUpgrade } from './createStoreDuringUpgrade.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\n\nconst dbMutexes: Record<string, Mutex> = {}\n\nexport async function withDb<DBTypes extends DBSchema | unknown = unknown, R = EmptyObject>(\n  dbName: string,\n  callback: (db: IDBPDatabase<DBTypes>) => Promise<R> | R,\n  expectedIndexes?: Record<string, IndexDescription[]>,\n  logger?: Logger,\n  lock = true,\n): Promise<R> {\n  dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex()\n  const handler = async () => {\n    const versionToOpen = expectedIndexes === undefined ? undefined : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger)\n    const db = await openDB<DBTypes>(dbName, versionToOpen, {\n      blocked(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocked from upgrading from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      blocking(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocking upgrade from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      terminated() {\n        logger?.log('IndexedDb: Terminated')\n      },\n      upgrade(db, oldVersion, newVersion, transaction) {\n      /* if (oldVersion !== newVersion) {\n        logger?.log(`IndexedDb: Upgrading from ${oldVersion} to ${newVersion}`)\n        const objectStores = transaction.objectStoreNames\n        for (const name of objectStores) {\n          try {\n            db.deleteObjectStore(name)\n          } catch {\n            console.log(`IndexedDb: Failed to delete existing object store ${name}`)\n          }\n        }\n      } */\n        if (expectedIndexes) {\n          for (const [storeName, indexes] of Object.entries(expectedIndexes)) {\n            if (db.objectStoreNames.contains(storeName as StoreNames<DBTypes>)) {\n              continue\n            }\n            const indexesToCreate = indexes.map(idx => ({\n              ...idx,\n              name: buildStandardIndexName(idx),\n            // eslint-disable-next-line unicorn/no-array-reduce\n            })).reduce((acc, idx) => acc.set(idx.name, idx), new Map<string, IndexDescription>()).values()\n            createStoreDuringUpgrade(db, storeName as StoreNames<DBTypes>, [...indexesToCreate], logger)\n          }\n        }\n      },\n    })\n    return db\n  }\n  const db = lock ? await dbMutexes[dbName].runExclusive(handler) : await handler()\n  try {\n    return await callback(db)\n  } finally {\n    db.close()\n  }\n}\n","/**\n * The index direction (1 for ascending, -1 for descending)\n */\nexport type IndexDirection = -1 | 1\n\n/**\n * Description of index(es) to be created on a store\n */\nexport type IndexDescription = {\n  /**\n   * The key(s) to index\n   */\n  key: Record<string, IndexDirection>\n  /**\n   * Is the indexed value an array\n   */\n  multiEntry?: boolean\n  /**\n   * If true, the index must enforce uniqueness on the key\n   */\n  unique?: boolean\n}\n\nexport const IndexSeparator = '-'\n\n/**\n * Given an index description, this will build the index\n * name in standard form\n * @param index The index description\n * @returns The index name in standard form\n */\nexport const buildStandardIndexName = (index: IndexDescription) => {\n  const { key, unique } = index\n  const prefix = unique ? 'UX' : 'IX'\n  const indexKeys = Object.keys(key)\n  return `${prefix}_${indexKeys.join(IndexSeparator)}`\n}\n","import type { Logger } from '@xylabs/logger'\nimport type {\n  DBSchema,\n  IDBPDatabase, IDBPObjectStore, IndexNames, StoreNames,\n} from 'idb'\n\nimport {\n  buildStandardIndexName,\n  type IndexDescription,\n} from './IndexDescription.ts'\n\nexport function createStoreDuringUpgrade<DBTypes extends DBSchema | unknown = unknown>(\n  db: IDBPDatabase<DBTypes>,\n  storeName: StoreNames<DBTypes>,\n  indexes: IndexDescription[],\n  logger?: Logger,\n) {\n  logger?.log(`Creating store ${storeName}`)\n  // Create the store\n  let store: IDBPObjectStore<DBTypes, ArrayLike<StoreNames<DBTypes>>, StoreNames<DBTypes>, 'versionchange'> | undefined\n  try {\n    store = db.createObjectStore(storeName, {\n    // If it isn't explicitly set, create a value by auto incrementing.\n      autoIncrement: true,\n    })\n  } catch {\n    logger?.warn(`Failed to create store: ${storeName} already exists`)\n    return\n  }\n  logger?.log(`Creating store: created ${storeName}`)\n  // Name the store\n  store.name = storeName\n  // Create an index on the hash\n  for (const {\n    key, multiEntry, unique,\n  } of indexes) {\n    logger?.log(`Creating store: index ${key}`)\n    const indexKeys = Object.keys(key)\n    const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n    const indexName = buildStandardIndexName({ key, unique }) as IndexNames<DBTypes, StoreNames<DBTypes>>\n    console.log('createIndex', indexName, keys, { multiEntry, unique })\n    store.createIndex(indexName, keys, { multiEntry, unique })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, IDBPTransaction, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\n\nexport async function withStore<T extends EmptyObject = EmptyObject, R = T, M extends 'readonly' | 'readwrite' = 'readonly'>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>,\n    [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, M> | null) => Promise<R> | R,\n  mode: M,\n  logger?: Logger,\n): Promise<R> {\n  logger?.log('withStore', storeName, mode)\n  let transaction: IDBPTransaction<ObjectStore<T>, [StoreNames<ObjectStore<T>>], M> | undefined = undefined\n  logger?.log('withStore:transaction')\n  let store = null\n  try {\n    transaction = db.transaction(storeName, mode)\n    // we do this in a try/catch because the store might not exist\n    store = transaction.objectStore(storeName)\n  } catch (ex) {\n    logger?.log('withStore:catch', ex)\n  }\n  try {\n    return await callback(store)\n  } finally {\n    logger?.log('withStore:finally')\n    await transaction?.done\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadOnlyStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readonly'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readonly', logger)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { IDBPDatabase, StoreNames } from 'idb'\n\nimport {\n  type IndexDescription,\n  type IndexDirection,\n} from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\nimport { withReadOnlyStore } from './withReadOnlyStore.ts'\n\nasync function getExistingIndexesInternal<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexesInternal', storeName)\n  return await withReadOnlyStore(db, storeName, (store) => {\n    return store\n      ? [...store.indexNames].map((indexName) => {\n          const index = store.index(indexName)\n          const key: Record<string, IndexDirection> = {}\n          if (Array.isArray(index.keyPath)) {\n            for (const keyPath of index.keyPath) {\n              key[keyPath] = 1\n            }\n          } else {\n            key[index.keyPath] = 1\n          }\n          const desc: IndexDescription = {\n            key,\n            unique: index.unique,\n            multiEntry: index.multiEntry,\n          }\n          return desc\n        })\n      : null\n  }, logger)\n}\n\nexport async function getExistingIndexes<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>> | string,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexes', storeName)\n  if (typeof db === 'string') {\n    return await withDb<ObjectStore<T>, IndexDescription[] | null>(db, async (db) => {\n      return await getExistingIndexesInternal(db, storeName, logger)\n    })\n  }\n  return await getExistingIndexesInternal(db, storeName, logger)\n}\n","import type { KeyValueStore } from '@xylabs/storage'\nimport type {\n  DBSchema,\n  IDBPDatabase, StoreKey, StoreNames, StoreValue,\n} from 'idb'\n\nimport { withDb } from './withDb.ts'\n\n/**\n * An IndexedDB key/value store.\n */\nexport class IndexedDbKeyValueStore<T extends DBSchema, S extends StoreNames<T>> implements KeyValueStore<StoreValue<T, S>, StoreKey<T, S>> {\n  constructor(readonly dbName: string, readonly storeName: S) {}\n\n  async clear?(): Promise<void> {\n    return await this.withDb((db) => {\n      return db.clear(this.storeName)\n    })\n  }\n\n  async delete(key: StoreKey<T, S>): Promise<void> {\n    return await this.withDb((db) => {\n      return db.delete(this.storeName, key)\n    })\n  }\n\n  async get(key: StoreKey<T, S>) {\n    return await this.withDb((db) => {\n      return db.get(this.storeName, key) ?? undefined\n    })\n  }\n\n  async keys?(): Promise<StoreKey<T, S>[]> {\n    return await this.withDb((db) => {\n      return db.getAllKeys(this.storeName)\n    })\n  }\n\n  async set(key: StoreKey<T, S>, value: StoreValue<T, S>): Promise<void> {\n    return await this.withDb(async (db) => {\n      await db.put(this.storeName, value, key)\n    })\n  }\n\n  async withDb<R = StoreValue<T, S>>(\n    callback: (db: IDBPDatabase<T>) =>\n      Promise<R> | R,\n  ) {\n    return await withDb<T, R>(this.dbName, (db) => {\n      return callback(db)\n    })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadWriteStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readwrite'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readwrite', logger)\n}\n"],"mappings":"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","names":["db","db"]}

package/dist/neutral/index.mjs

@@ -47,8 +47,7 @@ function createStoreDuringUpgrade(db, storeName, indexes, logger) {
 var dbMutexes = {};
 async function withDb(dbName, callback, expectedIndexes, logger, lock = true) {
   dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex();
-  const nolockRun = (callback2) => callback2();
-  const db = await (lock ? dbMutexes[dbName].runExclusive : nolockRun)(async () => {
+  const handler = async () => {
     const versionToOpen = expectedIndexes === void 0 ? void 0 : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger);
     const db2 = await openDB(dbName, versionToOpen, {
       blocked(currentVersion, blockedVersion, event) {
@@ -77,7 +76,8 @@ async function withDb(dbName, callback, expectedIndexes, logger, lock = true) {
       }
     });
     return db2;
-  });
+  };
+  const db = lock ? await dbMutexes[dbName].runExclusive(handler) : await handler();
   try {
     return await callback(db);
   } finally {
@@ -168,7 +168,7 @@ async function checkDbNeedsUpgrade(dbName, stores, logger) {
       }
     }
     return db.version;
-  }, {}, logger, false);
+  }, void 0, logger, false);
 }
 
 // src/IndexedDbKeyValueStore.ts

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/checkDbNeedsUpgrade.ts","../../src/withDb.ts","../../src/IndexDescription.ts","../../src/createStoreDuringUpgrade.ts","../../src/withStore.ts","../../src/withReadOnlyStore.ts","../../src/getExistingIndexes.ts","../../src/IndexedDbKeyValueStore.ts","../../src/withReadWriteStore.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Logger } from '@xylabs/logger'\nimport type { IDBPDatabase } from 'idb'\n\nimport { getExistingIndexes } from './getExistingIndexes.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\n\nexport async function checkStoreNeedsUpgrade(db: IDBPDatabase<ObjectStore<object>>, storeName: string, indexes: IndexDescription[], logger?: Logger) {\n  logger?.log('checkStoreNeedsUpgrade', storeName, indexes)\n  const existingIndexes = await getExistingIndexes(db, storeName, logger)\n  if (existingIndexes === null) {\n    // the store does not exist, so we need to trigger upgrade (no existing indexes)\n    return true\n  }\n  const existingIndexNames = new Set(existingIndexes.map(({ key, unique }) => buildStandardIndexName({ key, unique })).filter(exists))\n  for (const { key, unique } of indexes) {\n    const indexName = buildStandardIndexName({ key, unique })\n    if (!existingIndexNames.has(indexName)) {\n      return true\n    }\n  }\n  return false\n}\n\nexport async function checkDbNeedsUpgrade(dbName: string, stores: Record<string, IndexDescription[]>, logger?: Logger) {\n  logger?.log('checkDbNeedsUpgrade', dbName, stores)\n  return await withDb<ObjectStore, number>(dbName, async (db) => {\n    for (const [storeName, indexes] of Object.entries(stores)) {\n      if (await checkStoreNeedsUpgrade(db, storeName, indexes, logger)) {\n        return db.version + 1\n      }\n    }\n    return db.version\n  }, {}, logger, false)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { MutexInterface } from 'async-mutex'\nimport { Mutex } from 'async-mutex'\nimport type {\n  DBSchema, IDBPDatabase, StoreNames,\n} from 'idb'\nimport { openDB } from 'idb'\n\nimport { checkDbNeedsUpgrade } from './checkDbNeedsUpgrade.ts'\nimport { createStoreDuringUpgrade } from './createStoreDuringUpgrade.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\n\nconst dbMutexes: Record<string, Mutex> = {}\n\nexport async function withDb<DBTypes extends DBSchema | unknown = unknown, R = EmptyObject>(\n  dbName: string,\n  callback: (db: IDBPDatabase<DBTypes>) => Promise<R> | R,\n  expectedIndexes?: Record<string, IndexDescription[]>,\n  logger?: Logger,\n  lock = true,\n): Promise<R> {\n  dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex()\n  const nolockRun = <T>(callback: MutexInterface.Worker<T>) => callback()\n  const db = await (lock ? dbMutexes[dbName].runExclusive : nolockRun) (async () => {\n    const versionToOpen = expectedIndexes === undefined ? undefined : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger)\n    const db = await openDB<DBTypes>(dbName, versionToOpen, {\n      blocked(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocked from upgrading from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      blocking(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocking upgrade from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      terminated() {\n        logger?.log('IndexedDb: Terminated')\n      },\n      upgrade(db, oldVersion, newVersion, transaction) {\n      /* if (oldVersion !== newVersion) {\n        logger?.log(`IndexedDb: Upgrading from ${oldVersion} to ${newVersion}`)\n        const objectStores = transaction.objectStoreNames\n        for (const name of objectStores) {\n          try {\n            db.deleteObjectStore(name)\n          } catch {\n            console.log(`IndexedDb: Failed to delete existing object store ${name}`)\n          }\n        }\n      } */\n        if (expectedIndexes) {\n          for (const [storeName, indexes] of Object.entries(expectedIndexes)) {\n            if (db.objectStoreNames.contains(storeName as StoreNames<DBTypes>)) {\n              continue\n            }\n            const indexesToCreate = indexes.map(idx => ({\n              ...idx,\n              name: buildStandardIndexName(idx),\n            // eslint-disable-next-line unicorn/no-array-reduce\n            })).reduce((acc, idx) => acc.set(idx.name, idx), new Map<string, IndexDescription>()).values()\n            createStoreDuringUpgrade(db, storeName as StoreNames<DBTypes>, [...indexesToCreate], logger)\n          }\n        }\n      },\n    })\n    return db\n  })\n  try {\n    return await callback(db)\n  } finally {\n    db.close()\n  }\n}\n","/**\n * The index direction (1 for ascending, -1 for descending)\n */\nexport type IndexDirection = -1 | 1\n\n/**\n * Description of index(es) to be created on a store\n */\nexport type IndexDescription = {\n  /**\n   * The key(s) to index\n   */\n  key: Record<string, IndexDirection>\n  /**\n   * Is the indexed value an array\n   */\n  multiEntry?: boolean\n  /**\n   * If true, the index must enforce uniqueness on the key\n   */\n  unique?: boolean\n}\n\nexport const IndexSeparator = '-'\n\n/**\n * Given an index description, this will build the index\n * name in standard form\n * @param index The index description\n * @returns The index name in standard form\n */\nexport const buildStandardIndexName = (index: IndexDescription) => {\n  const { key, unique } = index\n  const prefix = unique ? 'UX' : 'IX'\n  const indexKeys = Object.keys(key)\n  return `${prefix}_${indexKeys.join(IndexSeparator)}`\n}\n","import type { Logger } from '@xylabs/logger'\nimport type {\n  DBSchema,\n  IDBPDatabase, IDBPObjectStore, IndexNames, StoreNames,\n} from 'idb'\n\nimport {\n  buildStandardIndexName,\n  type IndexDescription,\n} from './IndexDescription.ts'\n\nexport function createStoreDuringUpgrade<DBTypes extends DBSchema | unknown = unknown>(\n  db: IDBPDatabase<DBTypes>,\n  storeName: StoreNames<DBTypes>,\n  indexes: IndexDescription[],\n  logger?: Logger,\n) {\n  logger?.log(`Creating store ${storeName}`)\n  // Create the store\n  let store: IDBPObjectStore<DBTypes, ArrayLike<StoreNames<DBTypes>>, StoreNames<DBTypes>, 'versionchange'> | undefined\n  try {\n    store = db.createObjectStore(storeName, {\n    // If it isn't explicitly set, create a value by auto incrementing.\n      autoIncrement: true,\n    })\n  } catch {\n    logger?.warn(`Failed to create store: ${storeName} already exists`)\n    return\n  }\n  logger?.log(`Creating store: created ${storeName}`)\n  // Name the store\n  store.name = storeName\n  // Create an index on the hash\n  for (const {\n    key, multiEntry, unique,\n  } of indexes) {\n    logger?.log(`Creating store: index ${key}`)\n    const indexKeys = Object.keys(key)\n    const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n    const indexName = buildStandardIndexName({ key, unique }) as IndexNames<DBTypes, StoreNames<DBTypes>>\n    console.log('createIndex', indexName, keys, { multiEntry, unique })\n    store.createIndex(indexName, keys, { multiEntry, unique })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, IDBPTransaction, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\n\nexport async function withStore<T extends EmptyObject = EmptyObject, R = T, M extends 'readonly' | 'readwrite' = 'readonly'>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>,\n    [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, M> | null) => Promise<R> | R,\n  mode: M,\n  logger?: Logger,\n): Promise<R> {\n  logger?.log('withStore', storeName, mode)\n  let transaction: IDBPTransaction<ObjectStore<T>, [StoreNames<ObjectStore<T>>], M> | undefined = undefined\n  logger?.log('withStore:transaction')\n  let store = null\n  try {\n    transaction = db.transaction(storeName, mode)\n    // we do this in a try/catch because the store might not exist\n    store = transaction.objectStore(storeName)\n  } catch (ex) {\n    logger?.log('withStore:catch', ex)\n  }\n  try {\n    return await callback(store)\n  } finally {\n    logger?.log('withStore:finally')\n    await transaction?.done\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadOnlyStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readonly'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readonly', logger)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { IDBPDatabase, StoreNames } from 'idb'\n\nimport {\n  type IndexDescription,\n  type IndexDirection,\n} from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\nimport { withReadOnlyStore } from './withReadOnlyStore.ts'\n\nasync function getExistingIndexesInternal<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexesInternal', storeName)\n  return await withReadOnlyStore(db, storeName, (store) => {\n    return store\n      ? [...store.indexNames].map((indexName) => {\n          const index = store.index(indexName)\n          const key: Record<string, IndexDirection> = {}\n          if (Array.isArray(index.keyPath)) {\n            for (const keyPath of index.keyPath) {\n              key[keyPath] = 1\n            }\n          } else {\n            key[index.keyPath] = 1\n          }\n          const desc: IndexDescription = {\n            key,\n            unique: index.unique,\n            multiEntry: index.multiEntry,\n          }\n          return desc\n        })\n      : null\n  }, logger)\n}\n\nexport async function getExistingIndexes<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>> | string,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexes', storeName)\n  if (typeof db === 'string') {\n    return await withDb<ObjectStore<T>, IndexDescription[] | null>(db, async (db) => {\n      return await getExistingIndexesInternal(db, storeName, logger)\n    })\n  }\n  return await getExistingIndexesInternal(db, storeName, logger)\n}\n","import type { KeyValueStore } from '@xylabs/storage'\nimport type {\n  DBSchema,\n  IDBPDatabase, StoreKey, StoreNames, StoreValue,\n} from 'idb'\n\nimport { withDb } from './withDb.ts'\n\n/**\n * An IndexedDB key/value store.\n */\nexport class IndexedDbKeyValueStore<T extends DBSchema, S extends StoreNames<T>> implements KeyValueStore<StoreValue<T, S>, StoreKey<T, S>> {\n  constructor(readonly dbName: string, readonly storeName: S) {}\n\n  async clear?(): Promise<void> {\n    return await this.withDb((db) => {\n      return db.clear(this.storeName)\n    })\n  }\n\n  async delete(key: StoreKey<T, S>): Promise<void> {\n    return await this.withDb((db) => {\n      return db.delete(this.storeName, key)\n    })\n  }\n\n  async get(key: StoreKey<T, S>) {\n    return await this.withDb((db) => {\n      return db.get(this.storeName, key) ?? undefined\n    })\n  }\n\n  async keys?(): Promise<StoreKey<T, S>[]> {\n    return await this.withDb((db) => {\n      return db.getAllKeys(this.storeName)\n    })\n  }\n\n  async set(key: StoreKey<T, S>, value: StoreValue<T, S>): Promise<void> {\n    return await this.withDb(async (db) => {\n      await db.put(this.storeName, value, key)\n    })\n  }\n\n  async withDb<R = StoreValue<T, S>>(\n    callback: (db: IDBPDatabase<T>) =>\n      Promise<R> | R,\n  ) {\n    return await withDb<T, R>(this.dbName, (db) => {\n      return callback(db)\n    })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadWriteStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readwrite'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readwrite', logger)\n}\n"],"mappings":"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","names":["callback","db","db"]}
+{"version":3,"sources":["../../src/checkDbNeedsUpgrade.ts","../../src/withDb.ts","../../src/IndexDescription.ts","../../src/createStoreDuringUpgrade.ts","../../src/withStore.ts","../../src/withReadOnlyStore.ts","../../src/getExistingIndexes.ts","../../src/IndexedDbKeyValueStore.ts","../../src/withReadWriteStore.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Logger } from '@xylabs/logger'\nimport type { IDBPDatabase } from 'idb'\n\nimport { getExistingIndexes } from './getExistingIndexes.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\n\nexport async function checkStoreNeedsUpgrade(db: IDBPDatabase<ObjectStore<object>>, storeName: string, indexes: IndexDescription[], logger?: Logger) {\n  logger?.log('checkStoreNeedsUpgrade', storeName, indexes)\n  const existingIndexes = await getExistingIndexes(db, storeName, logger)\n  if (existingIndexes === null) {\n    // the store does not exist, so we need to trigger upgrade (no existing indexes)\n    return true\n  }\n  const existingIndexNames = new Set(existingIndexes.map(({ key, unique }) => buildStandardIndexName({ key, unique })).filter(exists))\n  for (const { key, unique } of indexes) {\n    const indexName = buildStandardIndexName({ key, unique })\n    if (!existingIndexNames.has(indexName)) {\n      return true\n    }\n  }\n  return false\n}\n\nexport async function checkDbNeedsUpgrade(dbName: string, stores: Record<string, IndexDescription[]>, logger?: Logger) {\n  logger?.log('checkDbNeedsUpgrade', dbName, stores)\n  return await withDb<ObjectStore, number>(dbName, async (db) => {\n    for (const [storeName, indexes] of Object.entries(stores)) {\n      if (await checkStoreNeedsUpgrade(db, storeName, indexes, logger)) {\n        return db.version + 1\n      }\n    }\n    return db.version\n  }, undefined, logger, false)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { MutexInterface } from 'async-mutex'\nimport { Mutex } from 'async-mutex'\nimport type {\n  DBSchema, IDBPDatabase, StoreNames,\n} from 'idb'\nimport { openDB } from 'idb'\n\nimport { checkDbNeedsUpgrade } from './checkDbNeedsUpgrade.ts'\nimport { createStoreDuringUpgrade } from './createStoreDuringUpgrade.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\n\nconst dbMutexes: Record<string, Mutex> = {}\n\nexport async function withDb<DBTypes extends DBSchema | unknown = unknown, R = EmptyObject>(\n  dbName: string,\n  callback: (db: IDBPDatabase<DBTypes>) => Promise<R> | R,\n  expectedIndexes?: Record<string, IndexDescription[]>,\n  logger?: Logger,\n  lock = true,\n): Promise<R> {\n  dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex()\n  const handler = async () => {\n    const versionToOpen = expectedIndexes === undefined ? undefined : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger)\n    const db = await openDB<DBTypes>(dbName, versionToOpen, {\n      blocked(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocked from upgrading from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      blocking(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocking upgrade from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      terminated() {\n        logger?.log('IndexedDb: Terminated')\n      },\n      upgrade(db, oldVersion, newVersion, transaction) {\n      /* if (oldVersion !== newVersion) {\n        logger?.log(`IndexedDb: Upgrading from ${oldVersion} to ${newVersion}`)\n        const objectStores = transaction.objectStoreNames\n        for (const name of objectStores) {\n          try {\n            db.deleteObjectStore(name)\n          } catch {\n            console.log(`IndexedDb: Failed to delete existing object store ${name}`)\n          }\n        }\n      } */\n        if (expectedIndexes) {\n          for (const [storeName, indexes] of Object.entries(expectedIndexes)) {\n            if (db.objectStoreNames.contains(storeName as StoreNames<DBTypes>)) {\n              continue\n            }\n            const indexesToCreate = indexes.map(idx => ({\n              ...idx,\n              name: buildStandardIndexName(idx),\n            // eslint-disable-next-line unicorn/no-array-reduce\n            })).reduce((acc, idx) => acc.set(idx.name, idx), new Map<string, IndexDescription>()).values()\n            createStoreDuringUpgrade(db, storeName as StoreNames<DBTypes>, [...indexesToCreate], logger)\n          }\n        }\n      },\n    })\n    return db\n  }\n  const db = lock ? await dbMutexes[dbName].runExclusive(handler) : await handler()\n  try {\n    return await callback(db)\n  } finally {\n    db.close()\n  }\n}\n","/**\n * The index direction (1 for ascending, -1 for descending)\n */\nexport type IndexDirection = -1 | 1\n\n/**\n * Description of index(es) to be created on a store\n */\nexport type IndexDescription = {\n  /**\n   * The key(s) to index\n   */\n  key: Record<string, IndexDirection>\n  /**\n   * Is the indexed value an array\n   */\n  multiEntry?: boolean\n  /**\n   * If true, the index must enforce uniqueness on the key\n   */\n  unique?: boolean\n}\n\nexport const IndexSeparator = '-'\n\n/**\n * Given an index description, this will build the index\n * name in standard form\n * @param index The index description\n * @returns The index name in standard form\n */\nexport const buildStandardIndexName = (index: IndexDescription) => {\n  const { key, unique } = index\n  const prefix = unique ? 'UX' : 'IX'\n  const indexKeys = Object.keys(key)\n  return `${prefix}_${indexKeys.join(IndexSeparator)}`\n}\n","import type { Logger } from '@xylabs/logger'\nimport type {\n  DBSchema,\n  IDBPDatabase, IDBPObjectStore, IndexNames, StoreNames,\n} from 'idb'\n\nimport {\n  buildStandardIndexName,\n  type IndexDescription,\n} from './IndexDescription.ts'\n\nexport function createStoreDuringUpgrade<DBTypes extends DBSchema | unknown = unknown>(\n  db: IDBPDatabase<DBTypes>,\n  storeName: StoreNames<DBTypes>,\n  indexes: IndexDescription[],\n  logger?: Logger,\n) {\n  logger?.log(`Creating store ${storeName}`)\n  // Create the store\n  let store: IDBPObjectStore<DBTypes, ArrayLike<StoreNames<DBTypes>>, StoreNames<DBTypes>, 'versionchange'> | undefined\n  try {\n    store = db.createObjectStore(storeName, {\n    // If it isn't explicitly set, create a value by auto incrementing.\n      autoIncrement: true,\n    })\n  } catch {\n    logger?.warn(`Failed to create store: ${storeName} already exists`)\n    return\n  }\n  logger?.log(`Creating store: created ${storeName}`)\n  // Name the store\n  store.name = storeName\n  // Create an index on the hash\n  for (const {\n    key, multiEntry, unique,\n  } of indexes) {\n    logger?.log(`Creating store: index ${key}`)\n    const indexKeys = Object.keys(key)\n    const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n    const indexName = buildStandardIndexName({ key, unique }) as IndexNames<DBTypes, StoreNames<DBTypes>>\n    console.log('createIndex', indexName, keys, { multiEntry, unique })\n    store.createIndex(indexName, keys, { multiEntry, unique })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, IDBPTransaction, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\n\nexport async function withStore<T extends EmptyObject = EmptyObject, R = T, M extends 'readonly' | 'readwrite' = 'readonly'>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>,\n    [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, M> | null) => Promise<R> | R,\n  mode: M,\n  logger?: Logger,\n): Promise<R> {\n  logger?.log('withStore', storeName, mode)\n  let transaction: IDBPTransaction<ObjectStore<T>, [StoreNames<ObjectStore<T>>], M> | undefined = undefined\n  logger?.log('withStore:transaction')\n  let store = null\n  try {\n    transaction = db.transaction(storeName, mode)\n    // we do this in a try/catch because the store might not exist\n    store = transaction.objectStore(storeName)\n  } catch (ex) {\n    logger?.log('withStore:catch', ex)\n  }\n  try {\n    return await callback(store)\n  } finally {\n    logger?.log('withStore:finally')\n    await transaction?.done\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadOnlyStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readonly'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readonly', logger)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { IDBPDatabase, StoreNames } from 'idb'\n\nimport {\n  type IndexDescription,\n  type IndexDirection,\n} from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\nimport { withReadOnlyStore } from './withReadOnlyStore.ts'\n\nasync function getExistingIndexesInternal<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexesInternal', storeName)\n  return await withReadOnlyStore(db, storeName, (store) => {\n    return store\n      ? [...store.indexNames].map((indexName) => {\n          const index = store.index(indexName)\n          const key: Record<string, IndexDirection> = {}\n          if (Array.isArray(index.keyPath)) {\n            for (const keyPath of index.keyPath) {\n              key[keyPath] = 1\n            }\n          } else {\n            key[index.keyPath] = 1\n          }\n          const desc: IndexDescription = {\n            key,\n            unique: index.unique,\n            multiEntry: index.multiEntry,\n          }\n          return desc\n        })\n      : null\n  }, logger)\n}\n\nexport async function getExistingIndexes<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>> | string,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexes', storeName)\n  if (typeof db === 'string') {\n    return await withDb<ObjectStore<T>, IndexDescription[] | null>(db, async (db) => {\n      return await getExistingIndexesInternal(db, storeName, logger)\n    })\n  }\n  return await getExistingIndexesInternal(db, storeName, logger)\n}\n","import type { KeyValueStore } from '@xylabs/storage'\nimport type {\n  DBSchema,\n  IDBPDatabase, StoreKey, StoreNames, StoreValue,\n} from 'idb'\n\nimport { withDb } from './withDb.ts'\n\n/**\n * An IndexedDB key/value store.\n */\nexport class IndexedDbKeyValueStore<T extends DBSchema, S extends StoreNames<T>> implements KeyValueStore<StoreValue<T, S>, StoreKey<T, S>> {\n  constructor(readonly dbName: string, readonly storeName: S) {}\n\n  async clear?(): Promise<void> {\n    return await this.withDb((db) => {\n      return db.clear(this.storeName)\n    })\n  }\n\n  async delete(key: StoreKey<T, S>): Promise<void> {\n    return await this.withDb((db) => {\n      return db.delete(this.storeName, key)\n    })\n  }\n\n  async get(key: StoreKey<T, S>) {\n    return await this.withDb((db) => {\n      return db.get(this.storeName, key) ?? undefined\n    })\n  }\n\n  async keys?(): Promise<StoreKey<T, S>[]> {\n    return await this.withDb((db) => {\n      return db.getAllKeys(this.storeName)\n    })\n  }\n\n  async set(key: StoreKey<T, S>, value: StoreValue<T, S>): Promise<void> {\n    return await this.withDb(async (db) => {\n      await db.put(this.storeName, value, key)\n    })\n  }\n\n  async withDb<R = StoreValue<T, S>>(\n    callback: (db: IDBPDatabase<T>) =>\n      Promise<R> | R,\n  ) {\n    return await withDb<T, R>(this.dbName, (db) => {\n      return callback(db)\n    })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadWriteStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readwrite'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readwrite', logger)\n}\n"],"mappings":"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","names":["db","db"]}

package/dist/node/index.mjs

@@ -47,8 +47,7 @@ function createStoreDuringUpgrade(db, storeName, indexes, logger) {
 var dbMutexes = {};
 async function withDb(dbName, callback, expectedIndexes, logger, lock = true) {
   dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex();
-  const nolockRun = (callback2) => callback2();
-  const db = await (lock ? dbMutexes[dbName].runExclusive : nolockRun)(async () => {
+  const handler = async () => {
     const versionToOpen = expectedIndexes === void 0 ? void 0 : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger);
     const db2 = await openDB(dbName, versionToOpen, {
       blocked(currentVersion, blockedVersion, event) {
@@ -77,7 +76,8 @@ async function withDb(dbName, callback, expectedIndexes, logger, lock = true) {
       }
     });
     return db2;
-  });
+  };
+  const db = lock ? await dbMutexes[dbName].runExclusive(handler) : await handler();
   try {
     return await callback(db);
   } finally {
@@ -168,7 +168,7 @@ async function checkDbNeedsUpgrade(dbName, stores, logger) {
       }
     }
     return db.version;
-  }, {}, logger, false);
+  }, void 0, logger, false);
 }
 
 // src/IndexedDbKeyValueStore.ts

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/checkDbNeedsUpgrade.ts","../../src/withDb.ts","../../src/IndexDescription.ts","../../src/createStoreDuringUpgrade.ts","../../src/withStore.ts","../../src/withReadOnlyStore.ts","../../src/getExistingIndexes.ts","../../src/IndexedDbKeyValueStore.ts","../../src/withReadWriteStore.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Logger } from '@xylabs/logger'\nimport type { IDBPDatabase } from 'idb'\n\nimport { getExistingIndexes } from './getExistingIndexes.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\n\nexport async function checkStoreNeedsUpgrade(db: IDBPDatabase<ObjectStore<object>>, storeName: string, indexes: IndexDescription[], logger?: Logger) {\n  logger?.log('checkStoreNeedsUpgrade', storeName, indexes)\n  const existingIndexes = await getExistingIndexes(db, storeName, logger)\n  if (existingIndexes === null) {\n    // the store does not exist, so we need to trigger upgrade (no existing indexes)\n    return true\n  }\n  const existingIndexNames = new Set(existingIndexes.map(({ key, unique }) => buildStandardIndexName({ key, unique })).filter(exists))\n  for (const { key, unique } of indexes) {\n    const indexName = buildStandardIndexName({ key, unique })\n    if (!existingIndexNames.has(indexName)) {\n      return true\n    }\n  }\n  return false\n}\n\nexport async function checkDbNeedsUpgrade(dbName: string, stores: Record<string, IndexDescription[]>, logger?: Logger) {\n  logger?.log('checkDbNeedsUpgrade', dbName, stores)\n  return await withDb<ObjectStore, number>(dbName, async (db) => {\n    for (const [storeName, indexes] of Object.entries(stores)) {\n      if (await checkStoreNeedsUpgrade(db, storeName, indexes, logger)) {\n        return db.version + 1\n      }\n    }\n    return db.version\n  }, {}, logger, false)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { MutexInterface } from 'async-mutex'\nimport { Mutex } from 'async-mutex'\nimport type {\n  DBSchema, IDBPDatabase, StoreNames,\n} from 'idb'\nimport { openDB } from 'idb'\n\nimport { checkDbNeedsUpgrade } from './checkDbNeedsUpgrade.ts'\nimport { createStoreDuringUpgrade } from './createStoreDuringUpgrade.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\n\nconst dbMutexes: Record<string, Mutex> = {}\n\nexport async function withDb<DBTypes extends DBSchema | unknown = unknown, R = EmptyObject>(\n  dbName: string,\n  callback: (db: IDBPDatabase<DBTypes>) => Promise<R> | R,\n  expectedIndexes?: Record<string, IndexDescription[]>,\n  logger?: Logger,\n  lock = true,\n): Promise<R> {\n  dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex()\n  const nolockRun = <T>(callback: MutexInterface.Worker<T>) => callback()\n  const db = await (lock ? dbMutexes[dbName].runExclusive : nolockRun) (async () => {\n    const versionToOpen = expectedIndexes === undefined ? undefined : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger)\n    const db = await openDB<DBTypes>(dbName, versionToOpen, {\n      blocked(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocked from upgrading from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      blocking(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocking upgrade from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      terminated() {\n        logger?.log('IndexedDb: Terminated')\n      },\n      upgrade(db, oldVersion, newVersion, transaction) {\n      /* if (oldVersion !== newVersion) {\n        logger?.log(`IndexedDb: Upgrading from ${oldVersion} to ${newVersion}`)\n        const objectStores = transaction.objectStoreNames\n        for (const name of objectStores) {\n          try {\n            db.deleteObjectStore(name)\n          } catch {\n            console.log(`IndexedDb: Failed to delete existing object store ${name}`)\n          }\n        }\n      } */\n        if (expectedIndexes) {\n          for (const [storeName, indexes] of Object.entries(expectedIndexes)) {\n            if (db.objectStoreNames.contains(storeName as StoreNames<DBTypes>)) {\n              continue\n            }\n            const indexesToCreate = indexes.map(idx => ({\n              ...idx,\n              name: buildStandardIndexName(idx),\n            // eslint-disable-next-line unicorn/no-array-reduce\n            })).reduce((acc, idx) => acc.set(idx.name, idx), new Map<string, IndexDescription>()).values()\n            createStoreDuringUpgrade(db, storeName as StoreNames<DBTypes>, [...indexesToCreate], logger)\n          }\n        }\n      },\n    })\n    return db\n  })\n  try {\n    return await callback(db)\n  } finally {\n    db.close()\n  }\n}\n","/**\n * The index direction (1 for ascending, -1 for descending)\n */\nexport type IndexDirection = -1 | 1\n\n/**\n * Description of index(es) to be created on a store\n */\nexport type IndexDescription = {\n  /**\n   * The key(s) to index\n   */\n  key: Record<string, IndexDirection>\n  /**\n   * Is the indexed value an array\n   */\n  multiEntry?: boolean\n  /**\n   * If true, the index must enforce uniqueness on the key\n   */\n  unique?: boolean\n}\n\nexport const IndexSeparator = '-'\n\n/**\n * Given an index description, this will build the index\n * name in standard form\n * @param index The index description\n * @returns The index name in standard form\n */\nexport const buildStandardIndexName = (index: IndexDescription) => {\n  const { key, unique } = index\n  const prefix = unique ? 'UX' : 'IX'\n  const indexKeys = Object.keys(key)\n  return `${prefix}_${indexKeys.join(IndexSeparator)}`\n}\n","import type { Logger } from '@xylabs/logger'\nimport type {\n  DBSchema,\n  IDBPDatabase, IDBPObjectStore, IndexNames, StoreNames,\n} from 'idb'\n\nimport {\n  buildStandardIndexName,\n  type IndexDescription,\n} from './IndexDescription.ts'\n\nexport function createStoreDuringUpgrade<DBTypes extends DBSchema | unknown = unknown>(\n  db: IDBPDatabase<DBTypes>,\n  storeName: StoreNames<DBTypes>,\n  indexes: IndexDescription[],\n  logger?: Logger,\n) {\n  logger?.log(`Creating store ${storeName}`)\n  // Create the store\n  let store: IDBPObjectStore<DBTypes, ArrayLike<StoreNames<DBTypes>>, StoreNames<DBTypes>, 'versionchange'> | undefined\n  try {\n    store = db.createObjectStore(storeName, {\n    // If it isn't explicitly set, create a value by auto incrementing.\n      autoIncrement: true,\n    })\n  } catch {\n    logger?.warn(`Failed to create store: ${storeName} already exists`)\n    return\n  }\n  logger?.log(`Creating store: created ${storeName}`)\n  // Name the store\n  store.name = storeName\n  // Create an index on the hash\n  for (const {\n    key, multiEntry, unique,\n  } of indexes) {\n    logger?.log(`Creating store: index ${key}`)\n    const indexKeys = Object.keys(key)\n    const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n    const indexName = buildStandardIndexName({ key, unique }) as IndexNames<DBTypes, StoreNames<DBTypes>>\n    console.log('createIndex', indexName, keys, { multiEntry, unique })\n    store.createIndex(indexName, keys, { multiEntry, unique })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, IDBPTransaction, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\n\nexport async function withStore<T extends EmptyObject = EmptyObject, R = T, M extends 'readonly' | 'readwrite' = 'readonly'>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>,\n    [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, M> | null) => Promise<R> | R,\n  mode: M,\n  logger?: Logger,\n): Promise<R> {\n  logger?.log('withStore', storeName, mode)\n  let transaction: IDBPTransaction<ObjectStore<T>, [StoreNames<ObjectStore<T>>], M> | undefined = undefined\n  logger?.log('withStore:transaction')\n  let store = null\n  try {\n    transaction = db.transaction(storeName, mode)\n    // we do this in a try/catch because the store might not exist\n    store = transaction.objectStore(storeName)\n  } catch (ex) {\n    logger?.log('withStore:catch', ex)\n  }\n  try {\n    return await callback(store)\n  } finally {\n    logger?.log('withStore:finally')\n    await transaction?.done\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadOnlyStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readonly'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readonly', logger)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { IDBPDatabase, StoreNames } from 'idb'\n\nimport {\n  type IndexDescription,\n  type IndexDirection,\n} from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\nimport { withReadOnlyStore } from './withReadOnlyStore.ts'\n\nasync function getExistingIndexesInternal<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexesInternal', storeName)\n  return await withReadOnlyStore(db, storeName, (store) => {\n    return store\n      ? [...store.indexNames].map((indexName) => {\n          const index = store.index(indexName)\n          const key: Record<string, IndexDirection> = {}\n          if (Array.isArray(index.keyPath)) {\n            for (const keyPath of index.keyPath) {\n              key[keyPath] = 1\n            }\n          } else {\n            key[index.keyPath] = 1\n          }\n          const desc: IndexDescription = {\n            key,\n            unique: index.unique,\n            multiEntry: index.multiEntry,\n          }\n          return desc\n        })\n      : null\n  }, logger)\n}\n\nexport async function getExistingIndexes<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>> | string,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexes', storeName)\n  if (typeof db === 'string') {\n    return await withDb<ObjectStore<T>, IndexDescription[] | null>(db, async (db) => {\n      return await getExistingIndexesInternal(db, storeName, logger)\n    })\n  }\n  return await getExistingIndexesInternal(db, storeName, logger)\n}\n","import type { KeyValueStore } from '@xylabs/storage'\nimport type {\n  DBSchema,\n  IDBPDatabase, StoreKey, StoreNames, StoreValue,\n} from 'idb'\n\nimport { withDb } from './withDb.ts'\n\n/**\n * An IndexedDB key/value store.\n */\nexport class IndexedDbKeyValueStore<T extends DBSchema, S extends StoreNames<T>> implements KeyValueStore<StoreValue<T, S>, StoreKey<T, S>> {\n  constructor(readonly dbName: string, readonly storeName: S) {}\n\n  async clear?(): Promise<void> {\n    return await this.withDb((db) => {\n      return db.clear(this.storeName)\n    })\n  }\n\n  async delete(key: StoreKey<T, S>): Promise<void> {\n    return await this.withDb((db) => {\n      return db.delete(this.storeName, key)\n    })\n  }\n\n  async get(key: StoreKey<T, S>) {\n    return await this.withDb((db) => {\n      return db.get(this.storeName, key) ?? undefined\n    })\n  }\n\n  async keys?(): Promise<StoreKey<T, S>[]> {\n    return await this.withDb((db) => {\n      return db.getAllKeys(this.storeName)\n    })\n  }\n\n  async set(key: StoreKey<T, S>, value: StoreValue<T, S>): Promise<void> {\n    return await this.withDb(async (db) => {\n      await db.put(this.storeName, value, key)\n    })\n  }\n\n  async withDb<R = StoreValue<T, S>>(\n    callback: (db: IDBPDatabase<T>) =>\n      Promise<R> | R,\n  ) {\n    return await withDb<T, R>(this.dbName, (db) => {\n      return callback(db)\n    })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadWriteStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readwrite'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readwrite', logger)\n}\n"],"mappings":"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","names":["callback","db","db"]}
+{"version":3,"sources":["../../src/checkDbNeedsUpgrade.ts","../../src/withDb.ts","../../src/IndexDescription.ts","../../src/createStoreDuringUpgrade.ts","../../src/withStore.ts","../../src/withReadOnlyStore.ts","../../src/getExistingIndexes.ts","../../src/IndexedDbKeyValueStore.ts","../../src/withReadWriteStore.ts"],"sourcesContent":["import { exists } from '@xylabs/exists'\nimport type { Logger } from '@xylabs/logger'\nimport type { IDBPDatabase } from 'idb'\n\nimport { getExistingIndexes } from './getExistingIndexes.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\n\nexport async function checkStoreNeedsUpgrade(db: IDBPDatabase<ObjectStore<object>>, storeName: string, indexes: IndexDescription[], logger?: Logger) {\n  logger?.log('checkStoreNeedsUpgrade', storeName, indexes)\n  const existingIndexes = await getExistingIndexes(db, storeName, logger)\n  if (existingIndexes === null) {\n    // the store does not exist, so we need to trigger upgrade (no existing indexes)\n    return true\n  }\n  const existingIndexNames = new Set(existingIndexes.map(({ key, unique }) => buildStandardIndexName({ key, unique })).filter(exists))\n  for (const { key, unique } of indexes) {\n    const indexName = buildStandardIndexName({ key, unique })\n    if (!existingIndexNames.has(indexName)) {\n      return true\n    }\n  }\n  return false\n}\n\nexport async function checkDbNeedsUpgrade(dbName: string, stores: Record<string, IndexDescription[]>, logger?: Logger) {\n  logger?.log('checkDbNeedsUpgrade', dbName, stores)\n  return await withDb<ObjectStore, number>(dbName, async (db) => {\n    for (const [storeName, indexes] of Object.entries(stores)) {\n      if (await checkStoreNeedsUpgrade(db, storeName, indexes, logger)) {\n        return db.version + 1\n      }\n    }\n    return db.version\n  }, undefined, logger, false)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { MutexInterface } from 'async-mutex'\nimport { Mutex } from 'async-mutex'\nimport type {\n  DBSchema, IDBPDatabase, StoreNames,\n} from 'idb'\nimport { openDB } from 'idb'\n\nimport { checkDbNeedsUpgrade } from './checkDbNeedsUpgrade.ts'\nimport { createStoreDuringUpgrade } from './createStoreDuringUpgrade.ts'\nimport { buildStandardIndexName, type IndexDescription } from './IndexDescription.ts'\n\nconst dbMutexes: Record<string, Mutex> = {}\n\nexport async function withDb<DBTypes extends DBSchema | unknown = unknown, R = EmptyObject>(\n  dbName: string,\n  callback: (db: IDBPDatabase<DBTypes>) => Promise<R> | R,\n  expectedIndexes?: Record<string, IndexDescription[]>,\n  logger?: Logger,\n  lock = true,\n): Promise<R> {\n  dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex()\n  const handler = async () => {\n    const versionToOpen = expectedIndexes === undefined ? undefined : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger)\n    const db = await openDB<DBTypes>(dbName, versionToOpen, {\n      blocked(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocked from upgrading from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      blocking(currentVersion, blockedVersion, event) {\n        logger?.warn(`IndexedDb: Blocking upgrade from ${currentVersion} to ${blockedVersion}`, event)\n      },\n      terminated() {\n        logger?.log('IndexedDb: Terminated')\n      },\n      upgrade(db, oldVersion, newVersion, transaction) {\n      /* if (oldVersion !== newVersion) {\n        logger?.log(`IndexedDb: Upgrading from ${oldVersion} to ${newVersion}`)\n        const objectStores = transaction.objectStoreNames\n        for (const name of objectStores) {\n          try {\n            db.deleteObjectStore(name)\n          } catch {\n            console.log(`IndexedDb: Failed to delete existing object store ${name}`)\n          }\n        }\n      } */\n        if (expectedIndexes) {\n          for (const [storeName, indexes] of Object.entries(expectedIndexes)) {\n            if (db.objectStoreNames.contains(storeName as StoreNames<DBTypes>)) {\n              continue\n            }\n            const indexesToCreate = indexes.map(idx => ({\n              ...idx,\n              name: buildStandardIndexName(idx),\n            // eslint-disable-next-line unicorn/no-array-reduce\n            })).reduce((acc, idx) => acc.set(idx.name, idx), new Map<string, IndexDescription>()).values()\n            createStoreDuringUpgrade(db, storeName as StoreNames<DBTypes>, [...indexesToCreate], logger)\n          }\n        }\n      },\n    })\n    return db\n  }\n  const db = lock ? await dbMutexes[dbName].runExclusive(handler) : await handler()\n  try {\n    return await callback(db)\n  } finally {\n    db.close()\n  }\n}\n","/**\n * The index direction (1 for ascending, -1 for descending)\n */\nexport type IndexDirection = -1 | 1\n\n/**\n * Description of index(es) to be created on a store\n */\nexport type IndexDescription = {\n  /**\n   * The key(s) to index\n   */\n  key: Record<string, IndexDirection>\n  /**\n   * Is the indexed value an array\n   */\n  multiEntry?: boolean\n  /**\n   * If true, the index must enforce uniqueness on the key\n   */\n  unique?: boolean\n}\n\nexport const IndexSeparator = '-'\n\n/**\n * Given an index description, this will build the index\n * name in standard form\n * @param index The index description\n * @returns The index name in standard form\n */\nexport const buildStandardIndexName = (index: IndexDescription) => {\n  const { key, unique } = index\n  const prefix = unique ? 'UX' : 'IX'\n  const indexKeys = Object.keys(key)\n  return `${prefix}_${indexKeys.join(IndexSeparator)}`\n}\n","import type { Logger } from '@xylabs/logger'\nimport type {\n  DBSchema,\n  IDBPDatabase, IDBPObjectStore, IndexNames, StoreNames,\n} from 'idb'\n\nimport {\n  buildStandardIndexName,\n  type IndexDescription,\n} from './IndexDescription.ts'\n\nexport function createStoreDuringUpgrade<DBTypes extends DBSchema | unknown = unknown>(\n  db: IDBPDatabase<DBTypes>,\n  storeName: StoreNames<DBTypes>,\n  indexes: IndexDescription[],\n  logger?: Logger,\n) {\n  logger?.log(`Creating store ${storeName}`)\n  // Create the store\n  let store: IDBPObjectStore<DBTypes, ArrayLike<StoreNames<DBTypes>>, StoreNames<DBTypes>, 'versionchange'> | undefined\n  try {\n    store = db.createObjectStore(storeName, {\n    // If it isn't explicitly set, create a value by auto incrementing.\n      autoIncrement: true,\n    })\n  } catch {\n    logger?.warn(`Failed to create store: ${storeName} already exists`)\n    return\n  }\n  logger?.log(`Creating store: created ${storeName}`)\n  // Name the store\n  store.name = storeName\n  // Create an index on the hash\n  for (const {\n    key, multiEntry, unique,\n  } of indexes) {\n    logger?.log(`Creating store: index ${key}`)\n    const indexKeys = Object.keys(key)\n    const keys = indexKeys.length === 1 ? indexKeys[0] : indexKeys\n    const indexName = buildStandardIndexName({ key, unique }) as IndexNames<DBTypes, StoreNames<DBTypes>>\n    console.log('createIndex', indexName, keys, { multiEntry, unique })\n    store.createIndex(indexName, keys, { multiEntry, unique })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, IDBPTransaction, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\n\nexport async function withStore<T extends EmptyObject = EmptyObject, R = T, M extends 'readonly' | 'readwrite' = 'readonly'>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>,\n    [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, M> | null) => Promise<R> | R,\n  mode: M,\n  logger?: Logger,\n): Promise<R> {\n  logger?.log('withStore', storeName, mode)\n  let transaction: IDBPTransaction<ObjectStore<T>, [StoreNames<ObjectStore<T>>], M> | undefined = undefined\n  logger?.log('withStore:transaction')\n  let store = null\n  try {\n    transaction = db.transaction(storeName, mode)\n    // we do this in a try/catch because the store might not exist\n    store = transaction.objectStore(storeName)\n  } catch (ex) {\n    logger?.log('withStore:catch', ex)\n  }\n  try {\n    return await callback(store)\n  } finally {\n    logger?.log('withStore:finally')\n    await transaction?.done\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadOnlyStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readonly'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readonly', logger)\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type { IDBPDatabase, StoreNames } from 'idb'\n\nimport {\n  type IndexDescription,\n  type IndexDirection,\n} from './IndexDescription.ts'\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withDb } from './withDb.ts'\nimport { withReadOnlyStore } from './withReadOnlyStore.ts'\n\nasync function getExistingIndexesInternal<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexesInternal', storeName)\n  return await withReadOnlyStore(db, storeName, (store) => {\n    return store\n      ? [...store.indexNames].map((indexName) => {\n          const index = store.index(indexName)\n          const key: Record<string, IndexDirection> = {}\n          if (Array.isArray(index.keyPath)) {\n            for (const keyPath of index.keyPath) {\n              key[keyPath] = 1\n            }\n          } else {\n            key[index.keyPath] = 1\n          }\n          const desc: IndexDescription = {\n            key,\n            unique: index.unique,\n            multiEntry: index.multiEntry,\n          }\n          return desc\n        })\n      : null\n  }, logger)\n}\n\nexport async function getExistingIndexes<T extends EmptyObject = EmptyObject>(\n  db: IDBPDatabase<ObjectStore<T>> | string,\n  storeName: StoreNames<ObjectStore<T>>,\n  logger?: Logger,\n): Promise<IndexDescription[] | null> {\n  logger?.log('getExistingIndexes', storeName)\n  if (typeof db === 'string') {\n    return await withDb<ObjectStore<T>, IndexDescription[] | null>(db, async (db) => {\n      return await getExistingIndexesInternal(db, storeName, logger)\n    })\n  }\n  return await getExistingIndexesInternal(db, storeName, logger)\n}\n","import type { KeyValueStore } from '@xylabs/storage'\nimport type {\n  DBSchema,\n  IDBPDatabase, StoreKey, StoreNames, StoreValue,\n} from 'idb'\n\nimport { withDb } from './withDb.ts'\n\n/**\n * An IndexedDB key/value store.\n */\nexport class IndexedDbKeyValueStore<T extends DBSchema, S extends StoreNames<T>> implements KeyValueStore<StoreValue<T, S>, StoreKey<T, S>> {\n  constructor(readonly dbName: string, readonly storeName: S) {}\n\n  async clear?(): Promise<void> {\n    return await this.withDb((db) => {\n      return db.clear(this.storeName)\n    })\n  }\n\n  async delete(key: StoreKey<T, S>): Promise<void> {\n    return await this.withDb((db) => {\n      return db.delete(this.storeName, key)\n    })\n  }\n\n  async get(key: StoreKey<T, S>) {\n    return await this.withDb((db) => {\n      return db.get(this.storeName, key) ?? undefined\n    })\n  }\n\n  async keys?(): Promise<StoreKey<T, S>[]> {\n    return await this.withDb((db) => {\n      return db.getAllKeys(this.storeName)\n    })\n  }\n\n  async set(key: StoreKey<T, S>, value: StoreValue<T, S>): Promise<void> {\n    return await this.withDb(async (db) => {\n      await db.put(this.storeName, value, key)\n    })\n  }\n\n  async withDb<R = StoreValue<T, S>>(\n    callback: (db: IDBPDatabase<T>) =>\n      Promise<R> | R,\n  ) {\n    return await withDb<T, R>(this.dbName, (db) => {\n      return callback(db)\n    })\n  }\n}\n","import type { Logger } from '@xylabs/logger'\nimport type { EmptyObject } from '@xylabs/object'\nimport type {\n  IDBPDatabase, IDBPObjectStore, StoreNames,\n} from 'idb'\n\nimport type { ObjectStore } from './ObjectStore.ts'\nimport { withStore } from './withStore.ts'\n\nexport async function withReadWriteStore<T extends EmptyObject = EmptyObject, R = T>(\n  db: IDBPDatabase<ObjectStore<T>>,\n  storeName: StoreNames<ObjectStore<T>>,\n  callback: (store: IDBPObjectStore<ObjectStore<T>, [StoreNames<ObjectStore<T>>], StoreNames<ObjectStore<T>>, 'readwrite'> | null) => Promise<R> | R,\n  logger?: Logger,\n): Promise<R> {\n  return await withStore(db, storeName, callback, 'readwrite', logger)\n}\n"],"mappings":"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","names":["db","db"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/indexed-db",
-  "version": "4.5.8",
+  "version": "4.5.10",
   "description": "Base functionality used throughout XY Labs TypeScript/JavaScript libraries",
   "keywords": [
     "hex",
@@ -49,10 +49,10 @@
     "packages/**/*"
   ],
   "dependencies": {
-    "@xylabs/exists": "^4.5.8",
-    "@xylabs/logger": "^4.5.8",
-    "@xylabs/object": "^4.5.8",
-    "@xylabs/storage": "^4.5.8",
+    "@xylabs/exists": "^4.5.10",
+    "@xylabs/logger": "^4.5.10",
+    "@xylabs/object": "^4.5.10",
+    "@xylabs/storage": "^4.5.10",
     "async-mutex": "^0.5.0",
     "idb": "^8.0.2"
   },

package/src/checkDbNeedsUpgrade.ts

@@ -33,5 +33,5 @@ export async function checkDbNeedsUpgrade(dbName: string, stores: Record<string,
       }
     }
     return db.version
-  }, {}, logger, false)
+  }, undefined, logger, false)
 }

package/src/withDb.ts

@@ -21,8 +21,7 @@ export async function withDb<DBTypes extends DBSchema | unknown = unknown, R = E
   lock = true,
 ): Promise<R> {
   dbMutexes[dbName] = dbMutexes[dbName] ?? new Mutex()
-  const nolockRun = <T>(callback: MutexInterface.Worker<T>) => callback()
-  const db = await (lock ? dbMutexes[dbName].runExclusive : nolockRun) (async () => {
+  const handler = async () => {
     const versionToOpen = expectedIndexes === undefined ? undefined : await checkDbNeedsUpgrade(dbName, expectedIndexes, logger)
     const db = await openDB<DBTypes>(dbName, versionToOpen, {
       blocked(currentVersion, blockedVersion, event) {
@@ -62,7 +61,8 @@ export async function withDb<DBTypes extends DBSchema | unknown = unknown, R = E
       },
     })
     return db
-  })
+  }
+  const db = lock ? await dbMutexes[dbName].runExclusive(handler) : await handler()
   try {
     return await callback(db)
   } finally {