@aztec/kv-store 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/indexeddb/store.js

@@ -1,22 +1,25 @@
+import { SerialQueue } from '@aztec/foundation/queue';
 import { deleteDB, openDB } from 'idb';
 import { IndexedDBAztecArray } from './array.js';
 import { IndexedDBAztecMap } from './map.js';
+import { IndexedDBAztecMultiMap } from './multi_map.js';
 import { IndexedDBAztecSet } from './set.js';
 import { IndexedDBAztecSingleton } from './singleton.js';
 /**
  * A key-value store backed by IndexedDB.
  */ export class AztecIndexedDBStore {
     isEphemeral;
-    #log;
     #rootDB;
     #name;
+    #txQueue;
     #containers;
-    constructor(rootDB, isEphemeral, log, name){
+    constructor(rootDB, isEphemeral, name){
         this.isEphemeral = isEphemeral;
         this.#containers = new Set();
         this.#rootDB = rootDB;
-        this.#log = log;
         this.#name = name;
+        this.#txQueue = new SerialQueue();
+        this.#txQueue.start();
     }
     /**
    * Creates a new AztecKVStore backed by IndexedDB. The path to the database is optional. If not provided,
@@ -28,7 +31,7 @@ import { IndexedDBAztecSingleton } from './singleton.js';
    * @param log - A logger to use. Optional
    * @returns The store
    */ static async open(log, name, ephemeral = false) {
-        name = name && !ephemeral ? name : self.crypto.getRandomValues(new Uint8Array(16)).join('');
+        name = name && !ephemeral ? name : globalThis.crypto.getRandomValues(new Uint8Array(16)).join('');
         log.debug(`Opening IndexedDB ${ephemeral ? 'temp ' : ''}database with name ${name}`);
         const rootDB = await openDB(name, 1, {
             upgrade (db) {
@@ -41,38 +44,30 @@ import { IndexedDBAztecSingleton } from './singleton.js';
                 ], {
                     unique: false
                 });
+                // Keep count of the maximum number of keys ever inserted in the container
+                // This allows unique slots for repeated keys, which is useful for multi-maps
                 objectStore.createIndex('keyCount', [
                     'container',
                     'key',
                     'keyCount'
                 ], {
-                    unique: false
+                    unique: true
+                });
+                // Keep an index on the pair key-hash for a given container, allowing us to efficiently
+                // delete unique values from multi-maps
+                objectStore.createIndex('hash', [
+                    'container',
+                    'key',
+                    'hash'
+                ], {
+                    unique: true
                 });
             }
         });
-        const kvStore = new AztecIndexedDBStore(rootDB, ephemeral, log, name);
+        const kvStore = new AztecIndexedDBStore(rootDB, ephemeral, name);
         return kvStore;
     }
     /**
-   * Forks the current DB into a new DB by backing it up to a temporary location and opening a new indexedb.
-   * @returns A new AztecIndexedDBStore.
-   */ async fork() {
-        const forkedStore = await AztecIndexedDBStore.open(this.#log, undefined, true);
-        this.#log.verbose(`Forking store to ${forkedStore.#name}`);
-        // Copy old data to new store
-        const oldData = this.#rootDB.transaction('data').store;
-        const dataToWrite = [];
-        for await (const cursor of oldData.iterate()){
-            dataToWrite.push(cursor.value);
-        }
-        const tx = forkedStore.#rootDB.transaction('data', 'readwrite').store;
-        for (const data of dataToWrite){
-            await tx.add(data);
-        }
-        this.#log.debug(`Forked store at ${forkedStore.#name} opened successfully`);
-        return forkedStore;
-    }
-    /**
    * Creates a new AztecMap in the store.
    * @param name - Name of the map
    * @returns A new AztecMap
@@ -95,7 +90,7 @@ import { IndexedDBAztecSingleton } from './singleton.js';
    * @param name - Name of the map
    * @returns A new AztecMultiMap
    */ openMultiMap(name) {
-        const multimap = new IndexedDBAztecMap(this.#rootDB, name);
+        const multimap = new IndexedDBAztecMultiMap(this.#rootDB, name);
         this.#containers.add(multimap);
         return multimap;
     }
@@ -124,22 +119,26 @@ import { IndexedDBAztecSingleton } from './singleton.js';
    * Runs a callback in a transaction.
    * @param callback - Function to execute in a transaction
    * @returns A promise that resolves to the return value of the callback
-   */ async transactionAsync(callback) {
-        const tx = this.#rootDB.transaction('data', 'readwrite');
-        for (const container of this.#containers){
-            container.db = tx.store;
-        }
-        // Avoid awaiting this promise so it doesn't get scheduled in the next microtask
-        // By then, the tx would be closed
-        const runningPromise = callback();
-        // Wait for the transaction to finish
-        await tx.done;
-        for (const container of this.#containers){
-            container.db = undefined;
-        }
-        // Return the result of the callback.
-        // Tx is guaranteed to already be closed, so the await doesn't hurt anything here
-        return await runningPromise;
+   */ transactionAsync(callback) {
+        // We can only have one transaction at a time for the same store
+        // So we need to wait for the current one to finish
+        return this.#txQueue.put(async ()=>{
+            const tx = this.#rootDB.transaction('data', 'readwrite');
+            for (const container of this.#containers){
+                container.db = tx.store;
+            }
+            // Avoid awaiting this promise so it doesn't get scheduled in the next microtask
+            // By then, the tx would be closed
+            const runningPromise = callback();
+            // Wait for the transaction to finish
+            await tx.done;
+            for (const container of this.#containers){
+                container.db = undefined;
+            }
+            // Return the result of the callback.
+            // Tx is guaranteed to already be closed, so the await doesn't hurt anything here
+            return await runningPromise;
+        });
     }
     /**
    * Clears all entries in the store & sub DBs.
@@ -154,6 +153,7 @@ import { IndexedDBAztecSingleton } from './singleton.js';
     estimateSize() {
         return Promise.resolve({
             mappingSize: 0,
+            physicalFileSize: 0,
             actualSize: 0,
             numItems: 0
         });
@@ -161,4 +161,7 @@ import { IndexedDBAztecSingleton } from './singleton.js';
     close() {
         return Promise.resolve();
     }
+    backupTo(_dstPath, _compact) {
+        throw new Error('Method not implemented.');
+    }
 }

package/dest/interfaces/array.d.ts

@@ -1,7 +1,8 @@
+import type { Value } from './common.js';
 /**
  * An array backed by a persistent store. Can not have any holes in it.
  */
-interface BaseAztecArray<T> {
+interface BaseAztecArray<T extends Value> {
     /**
      * Pushes values to the end of the array
      * @param vals - The values to push to the end of the array
@@ -24,7 +25,7 @@ interface BaseAztecArray<T> {
 /**
  * An array backed by a persistent store. Can not have any holes in it.
  */
-export interface AztecAsyncArray<T> extends BaseAztecArray<T> {
+export interface AztecAsyncArray<T extends Value> extends BaseAztecArray<T> {
     /**
      * The size of the array
      */
@@ -50,7 +51,7 @@ export interface AztecAsyncArray<T> extends BaseAztecArray<T> {
      */
     [Symbol.asyncIterator](): AsyncIterableIterator<T>;
 }
-export interface AztecArray<T> extends BaseAztecArray<T> {
+export interface AztecArray<T extends Value> extends BaseAztecArray<T> {
     /**
      * The size of the array
      */

package/dest/interfaces/array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../src/interfaces/array.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,UAAU,cAAc,CAAC,CAAC;IACxB;;;;OAIG;IACH,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpC;;;OAGG;IACH,GAAG,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC3D;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAE/C;;OAEG;IACH,YAAY,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAEnD;;OAEG;IACH,WAAW,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAExC;;OAEG;IACH,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IACtD;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IAEjC;;OAEG;IACH,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAEzC;;OAEG;IACH,MAAM,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE9B;;OAEG;IACH,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../src/interfaces/array.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC;;GAEG;AACH,UAAU,cAAc,CAAC,CAAC,SAAS,KAAK;IACtC;;;;OAIG;IACH,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpC;;;OAGG;IACH,GAAG,IAAI,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,KAAK,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzE;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/B;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAE/C;;OAEG;IACH,YAAY,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAEnD;;OAEG;IACH,WAAW,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAExC;;OAEG;IACH,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,KAAK,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IACpE;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;OAMG;IACH,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IAEjC;;OAEG;IACH,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAEzC;;OAEG;IACH,MAAM,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE9B;;OAEG;IACH,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;CAC1C"}

package/dest/interfaces/array.js

@@ -1,3 +1 @@
-/**
- * An array backed by a persistent store. Can not have any holes in it.
- */ export { };
+export { };

package/dest/interfaces/common.d.ts

@@ -1,11 +1,8 @@
-/**
- * The key type for use with the kv-store
- */
-export type Key = string | number | Array<string | number>;
-/**
- * A range of keys to iterate over.
- */
-export type Range<K extends Key = Key> = {
+/** The key type for use with the kv-store */
+export type Key = string | number | Uint8Array | Array<string | number>;
+export type Value = NonNullable<any>;
+/** A range of keys of arbitrary type. */
+export type CustomRange<K> = {
     /** The key of the first item to include */
     start?: K;
     /** The key of the last item to include */
@@ -15,8 +12,13 @@ export type Range<K extends Key = Key> = {
     /** The maximum number of items to iterate over */
     limit?: number;
 };
+/** Maps a custom range into a range of valid key types to iterate over. */
+export declare function mapRange<CK, K extends Key = Key>(range: CustomRange<CK>, mapFn: (key: CK) => K): Range<K>;
+/** A range of keys to iterate over. */
+export type Range<K extends Key = Key> = CustomRange<K>;
 export type StoreSize = {
     mappingSize: number;
+    physicalFileSize: number;
     actualSize: number;
     numItems: number;
 };

package/dest/interfaces/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/interfaces/common.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI;IACvC,2CAA2C;IAC3C,KAAK,CAAC,EAAE,CAAC,CAAC;IACV,0CAA0C;IAC1C,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/interfaces/common.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;AAExE,MAAM,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;AAErC,yCAAyC;AACzC,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,2CAA2C;IAC3C,KAAK,CAAC,EAAE,CAAC,CAAC;IACV,0CAA0C;IAC1C,GAAG,CAAC,EAAE,CAAC,CAAC;IACR,oCAAoC;IACpC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,kDAAkD;IAClD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,2EAA2E;AAC3E,wBAAgB,QAAQ,CAAC,EAAE,EAAE,CAAC,SAAS,GAAG,GAAG,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAOzG;AAED,uCAAuC;AACvC,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;AAExD,MAAM,MAAM,SAAS,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dest/interfaces/common.js

@@ -1,3 +1,8 @@
-/**
- * The key type for use with the kv-store
- */ export { };
+/** The key type for use with the kv-store */ /** Maps a custom range into a range of valid key types to iterate over. */ export function mapRange(range, mapFn) {
+    return {
+        start: range.start ? mapFn(range.start) : undefined,
+        end: range.end ? mapFn(range.end) : undefined,
+        reverse: range.reverse,
+        limit: range.limit
+    };
+}

package/dest/interfaces/index.d.ts

@@ -4,5 +4,7 @@ export * from './counter.js';
 export * from './singleton.js';
 export * from './store.js';
 export * from './set.js';
-export type { Range, StoreSize } from './common.js';
+export * from './multi_map.js';
+export { mapRange } from './common.js';
+export type { CustomRange, Range, StoreSize } from './common.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/interfaces/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}

package/dest/interfaces/index.js

@@ -4,3 +4,5 @@ export * from './counter.js';
 export * from './singleton.js';
 export * from './store.js';
 export * from './set.js';
+export * from './multi_map.js';
+export { mapRange } from './common.js';

package/dest/interfaces/map.d.ts

@@ -1,14 +1,22 @@
-import type { Key, Range } from './common.js';
+import type { Key, Range, Value } from './common.js';
 /**
  * A map backed by a persistent store.
  */
-interface AztecBaseMap<K extends Key, V> {
+interface AztecBaseMap<K extends Key, V extends Value> {
     /**
      * Sets the value at the given key.
      * @param key - The key to set the value at
      * @param val - The value to set
      */
     set(key: K, val: V): Promise<void>;
+    /**
+     * Sets the values at the given keys.
+     * @param entries - The entries to set
+     */
+    setMany(entries: {
+        key: K;
+        value: V;
+    }[]): Promise<void>;
     /**
      * Sets the value at the given key if it does not already exist.
      * @param key - The key to set the value at
@@ -21,12 +29,17 @@ interface AztecBaseMap<K extends Key, V> {
      */
     delete(key: K): Promise<void>;
 }
-export interface AztecMap<K extends Key, V> extends AztecBaseMap<K, V> {
+export interface AztecMap<K extends Key, V extends Value> extends AztecBaseMap<K, V> {
     /**
      * Gets the value at the given key.
      * @param key - The key to get the value from
      */
     get(key: K): V | undefined;
+    /**
+     * Gets the current size of the map.
+     * @returns The size of the map
+     */
+    size(): number;
     /**
      * Checks if a key exists in the map.
      * @param key - The key to check
@@ -53,40 +66,10 @@ export interface AztecMap<K extends Key, V> extends AztecBaseMap<K, V> {
      */
     clear(): Promise<void>;
 }
-export interface AztecMapWithSize<K extends Key, V> extends AztecMap<K, V> {
-    /**
-     * Gets the size of the map.
-     * @returns The size of the map
-     */
-    size(): number;
-}
-/**
- * A map backed by a persistent store that can have multiple values for a single key.
- */
-export interface AztecMultiMap<K extends Key, V> extends AztecMap<K, V> {
-    /**
-     * Gets all the values at the given key.
-     * @param key - The key to get the values from
-     */
-    getValues(key: K): IterableIterator<V>;
-    /**
-     * Deletes a specific value at the given key.
-     * @param key - The key to delete the value at
-     * @param val - The value to delete
-     */
-    deleteValue(key: K, val: V): Promise<void>;
-}
-export interface AztecMultiMapWithSize<K extends Key, V> extends AztecMultiMap<K, V> {
-    /**
-     * Gets the size of the map.
-     * @returns The size of the map
-     */
-    size(): number;
-}
 /**
  * A map backed by a persistent store.
  */
-export interface AztecAsyncMap<K extends Key, V> extends AztecBaseMap<K, V> {
+export interface AztecAsyncMap<K extends Key, V extends Value> extends AztecBaseMap<K, V> {
     /**
      * Gets the value at the given key.
      * @param key - The key to get the value from
@@ -113,22 +96,11 @@ export interface AztecAsyncMap<K extends Key, V> extends AztecBaseMap<K, V> {
      * @param range - The range of keys to iterate over
      */
     keysAsync(range?: Range<K>): AsyncIterableIterator<K>;
-}
-/**
- * A map backed by a persistent store that can have multiple values for a single key.
- */
-export interface AztecAsyncMultiMap<K extends Key, V> extends AztecAsyncMap<K, V> {
     /**
-     * Gets all the values at the given key.
-     * @param key - The key to get the values from
-     */
-    getValuesAsync(key: K): AsyncIterableIterator<V>;
-    /**
-     * Deletes a specific value at the given key.
-     * @param key - The key to delete the value at
-     * @param val - The value to delete
+     * Gets the current size of the map.
+     * @returns The size of the map
      */
-    deleteValue(key: K, val: V): Promise<void>;
+    sizeAsync(): Promise<number>;
 }
 export {};
 //# sourceMappingURL=map.d.ts.map

package/dest/interfaces/map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/interfaces/map.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/interfaces/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAErD;;GAEG;AACH,UAAU,YAAY,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,KAAK;IACnD;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE;QAAE,GAAG,EAAE,CAAC,CAAC;QAAC,KAAK,EAAE,CAAC,CAAA;KAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;OAIG;IACH,cAAc,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjD;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AACD,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,KAAK,CAAE,SAAQ,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IAClF;;;OAGG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IAE3B;;;OAGG;IACH,IAAI,IAAI,MAAM,CAAC;IAEf;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC;IAErB;;;OAGG;IACH,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpD;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE9C;;;OAGG;IACH,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE5C;;OAEG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,KAAK,CAAE,SAAQ,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IACvF;;;OAGG;IACH,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAEzC;;;;OAIG;IACH,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnC;;;OAGG;IACH,YAAY,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE9D;;;OAGG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAExD;;;OAGG;IACH,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAEtD;;;OAGG;IACH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9B"}

package/dest/interfaces/map.js

@@ -1,3 +1,3 @@
 /**
- * A map backed by a persistent store that can have multiple values for a single key.
+ * A map backed by a persistent store.
  */ export { };

package/dest/interfaces/map_test_suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map_test_suite.d.ts","sourceRoot":"","sources":["../../src/interfaces/map_test_suite.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAGlE,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,EACzD,UAAU,GAAE,OAAe,QAkI5B"}
+{"version":3,"file":"map_test_suite.d.ts","sourceRoot":"","sources":["../../src/interfaces/map_test_suite.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAGlE,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,EACzD,UAAU,GAAE,OAAe,QA+J5B"}

package/dest/interfaces/map_test_suite.js

@@ -7,7 +7,7 @@ export function describeAztecMap(testName, getStore, forceAsync = false) {
         let map;
         beforeEach(async ()=>{
             store = await getStore();
-            map = store.openMultiMap('test');
+            map = store.openMap('test');
         });
         afterEach(async ()=>{
             await store.delete();
@@ -15,6 +15,9 @@ export function describeAztecMap(testName, getStore, forceAsync = false) {
         async function get(key, sut = map) {
             return isSyncStore(store) && !forceAsync ? sut.get(key) : await sut.getAsync(key);
         }
+        async function size(sut = map) {
+            return isSyncStore(store) && !forceAsync ? sut.size() : await sut.sizeAsync();
+        }
         async function entries() {
             return isSyncStore(store) && !forceAsync ? await toArray(map.entries()) : await toArray(map.entriesAsync());
         }
@@ -24,9 +27,6 @@ export function describeAztecMap(testName, getStore, forceAsync = false) {
         async function keys(range, sut = map) {
             return isSyncStore(store) && !forceAsync ? await toArray(sut.keys(range)) : await toArray(sut.keysAsync(range));
         }
-        async function getValues(key) {
-            return isSyncStore(store) && !forceAsync ? await toArray(map.getValues(key)) : await toArray(map.getValuesAsync(key));
-        }
         it('should be able to set and get values', async ()=>{
             await map.set('foo', 'bar');
             await map.set('baz', 'qux');
@@ -34,6 +34,23 @@ export function describeAztecMap(testName, getStore, forceAsync = false) {
             expect(await get('baz')).to.equal('qux');
             expect(await get('quux')).to.equal(undefined);
         });
+        it('should be able to set many values', async ()=>{
+            const pairs = Array.from({
+                length: 100
+            }, (_, i)=>({
+                    key: `key${i}`,
+                    value: `value${i}`
+                }));
+            await map.setMany(pairs);
+            for (const { key, value } of pairs){
+                expect(await get(key)).to.equal(value);
+            }
+        });
+        it('should be able to overwrite values', async ()=>{
+            await map.set('foo', 'bar');
+            await map.set('foo', 'baz');
+            expect(await get('foo')).to.equal('baz');
+        });
         it('should be able to set values if they do not exist', async ()=>{
             expect(await map.setIfNotExists('foo', 'bar')).to.equal(true);
             expect(await map.setIfNotExists('foo', 'baz')).to.equal(false);
@@ -46,6 +63,14 @@ export function describeAztecMap(testName, getStore, forceAsync = false) {
             expect(await get('foo')).to.equal(undefined);
             expect(await get('baz')).to.equal('qux');
         });
+        it('should be able to return size of the map', async ()=>{
+            await map.set('foo', 'bar');
+            expect(await size()).to.equal(1);
+            await map.set('baz', 'qux');
+            expect(await size()).to.equal(2);
+            await map.delete('foo');
+            expect(await size()).to.equal(1);
+        });
         it('should be able to iterate over entries when there are no keys', async ()=>{
             expect(await entries()).to.deep.equal([]);
         });
@@ -79,73 +104,113 @@ export function describeAztecMap(testName, getStore, forceAsync = false) {
                 'foo'
             ]);
         });
-        it('should be able to get multiple values for a single key', async ()=>{
-            await map.set('foo', 'bar');
-            await map.set('foo', 'baz');
-            expect(await getValues('foo')).to.deep.equal([
-                'bar',
-                'baz'
-            ]);
-        });
-        it('should be able to delete individual values for a single key', async ()=>{
-            await map.set('foo', 'bar');
-            await map.set('foo', 'baz');
-            await map.deleteValue('foo', 'bar');
-            expect(await getValues('foo')).to.deep.equal([
-                'baz'
-            ]);
-        });
-        it('supports range queries', async ()=>{
-            await map.set('a', 'a');
-            await map.set('b', 'b');
-            await map.set('c', 'c');
-            await map.set('d', 'd');
-            expect(await keys({
-                start: 'b',
-                end: 'c'
-            })).to.deep.equal([
-                'b'
-            ]);
-            expect(await keys({
-                start: 'b'
-            })).to.deep.equal([
-                'b',
-                'c',
-                'd'
-            ]);
-            expect(await keys({
-                end: 'c'
-            })).to.deep.equal([
-                'a',
-                'b'
-            ]);
-            expect(await keys({
-                start: 'b',
-                end: 'c',
-                reverse: true
-            })).to.deep.equal([
-                'c'
-            ]);
-            expect(await keys({
-                start: 'b',
-                limit: 1
-            })).to.deep.equal([
-                'b'
-            ]);
-            expect(await keys({
-                start: 'b',
-                reverse: true
-            })).to.deep.equal([
-                'd',
-                'c'
-            ]);
-            expect(await keys({
-                end: 'b',
-                reverse: true
-            })).to.deep.equal([
-                'b',
-                'a'
+        it('should be able to iterate over string keys that represent numbers', async ()=>{
+            await map.set('0x22', 'bar');
+            await map.set('0x31', 'qux');
+            expect(await keys()).to.deep.equal([
+                '0x22',
+                '0x31'
             ]);
         });
+        for (const [name, data] of [
+            [
+                'chars',
+                [
+                    'a',
+                    'b',
+                    'c',
+                    'd'
+                ]
+            ],
+            [
+                'numbers',
+                [
+                    1,
+                    2,
+                    3,
+                    4
+                ]
+            ],
+            // disabled because indexeddb sorts lexigographically
+            // ['negative numbers', [-4, -3, -2, -1]],
+            [
+                'strings',
+                [
+                    'aaa',
+                    'bbb',
+                    'ccc',
+                    'ddd'
+                ]
+            ],
+            [
+                'zero-based numbers',
+                [
+                    0,
+                    1,
+                    2,
+                    3
+                ]
+            ]
+        ]){
+            it(`supports range queries over ${name} keys`, async ()=>{
+                const [a, b, c, d] = data;
+                await map.set(a, 'a');
+                await map.set(b, 'b');
+                await map.set(c, 'c');
+                await map.set(d, 'd');
+                expect(await keys()).to.deep.equal([
+                    a,
+                    b,
+                    c,
+                    d
+                ]);
+                expect(await keys({
+                    start: b,
+                    end: c
+                })).to.deep.equal([
+                    b
+                ]);
+                expect(await keys({
+                    start: b
+                })).to.deep.equal([
+                    b,
+                    c,
+                    d
+                ]);
+                expect(await keys({
+                    end: c
+                })).to.deep.equal([
+                    a,
+                    b
+                ]);
+                expect(await keys({
+                    start: b,
+                    end: c,
+                    reverse: true
+                })).to.deep.equal([
+                    c
+                ]);
+                expect(await keys({
+                    start: b,
+                    limit: 1
+                })).to.deep.equal([
+                    b
+                ]);
+                expect(await keys({
+                    start: b,
+                    reverse: true
+                })).to.deep.equal([
+                    d,
+                    c
+                ]);
+                expect(await keys({
+                    end: b,
+                    reverse: true
+                })).to.deep.equal([
+                    b,
+                    a
+                ]);
+            });
+        }
     });
 }