Made the objectStore, index and cursors generic

lib/idb.d.ts

@@ -65,7 +65,7 @@ export interface UpgradeDB {
      * @param name The name of the new object store to be created. Note that it is possible to create an object store with an empty name.
      * @param optionalParameters Optional. An options object whose attributes are optional parameters to the method.
      * @returns The new object store. */
-    createObjectStore(name: string, optionalParameters?: IDBObjectStoreParameters): ObjectStore;
+    createObjectStore<TValue=any, TKey=any>(name: string, optionalParameters?: IDBObjectStoreParameters): ObjectStore<TValue, TKey>;
 
     /** Destroys the object store with the given name in the connected database, along with any indexes that reference it.
      * @param name The name of the object store to be removed. */
@@ -89,40 +89,40 @@ export interface Transaction {
     /** Returns an ObjectStore object representing an object store that is part of the scope of this transaction.
      * @param name The name of the requested object store.
      * @returns The object store in the context of the transaction. */
-    objectStore(name: string): ObjectStore;
+    objectStore<TValue=any, TKey=any>(name: string): ObjectStore<TValue, TKey>;
 }
 
 /** Common interface for ObjectStore and Index, since bothe provide these cursor methods */
-export interface HasCursor {
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves a new cursor object. 
+export interface HasCursor<TValue, TKey> {
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves a new cursor object.
      * Used for iterating through an object store by primary key with a cursor.
      * @param range Optional. A key or IDBKeyRange to be queried. If a single valid key is passed, this will default to a range containing only that key. If nothing is passed, this will default to a key range that selects all the records in this object store.
      * @param direction Optional. An IDBCursorDirection telling the cursor what direction to travel. Defaults to "next".
      * @returns A promise that resolves with the cursor once it has been opened. */
-    openCursor(range?: IDBKeyRange | IDBValidKey | null, direction?: 'next' | 'nextunique' | 'prev' | 'prevunique'): Promise<Cursor>;
+    openCursor(range?: IDBKeyRange | IDBValidKey | null, direction?: 'next' | 'nextunique' | 'prev' | 'prevunique'): Promise<Cursor<TValue, TKey>>;
 
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves a new cursor object. 
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves a new cursor object.
      * Used for iterating through an object store with a key.
      * @param range Optional. A key or IDBKeyRange to be queried. If a single valid key is passed, this will default to a range containing only that key. If nothing is passed, this will default to a key range that selects all the records in this object store.
      * @param direction Optional. An IDBCursorDirection telling the cursor what direction to travel. Defaults to "next".
      * @returns A promise that resolves with the cursor once it has been opened. */
-    openKeyCursor(range?: IDBKeyRange | IDBValidKey | null, direction?: 'next' | 'nextunique' | 'prev' | 'prevunique'): Promise<Cursor>;
+    openKeyCursor(range?: IDBKeyRange | IDBValidKey | null, direction?: 'next' | 'nextunique' | 'prev' | 'prevunique'): Promise<Cursor<TValue, TKey>>;
 
     /** Due to the microtask issues in some browsers, iterating over a cursor using promises doesn't always work.
      * So in the mean time, iterateCursor maps to openCursor, takes identical arguments, plus an additional callback that receives an IDBCursor */
-    iterateCursor(callback: (c: Cursor) => void): void;
-    iterateCursor(range: IDBKeyRange | IDBValidKey | null, callback: (c: Cursor) => void): void;
-    iterateCursor(range: IDBKeyRange | IDBValidKey | null, direction: 'next' | 'nextunique' | 'prev' | 'prevunique', callback: (c: Cursor) => void): void;
+    iterateCursor(callback: (c: Cursor<TValue, TKey>) => void): void;
+    iterateCursor(range: IDBKeyRange | IDBValidKey | null, callback: (c: Cursor<TValue, TKey>) => void): void;
+    iterateCursor(range: IDBKeyRange | IDBValidKey | null, direction: 'next' | 'nextunique' | 'prev' | 'prevunique', callback: (c: Cursor<TValue, TKey>) => void): void;
 
     /** Due to the microtask issues in some browsers, iterating over a cursor using promises doesn't always work.
      * So in the mean time, iterateKeyCursor maps to openKeyCursor, takes identical arguments, plus an additional callback that receives an IDBCursor */
-    iterateKeyCursor(callback: (c: Cursor) => void): void;
-    iterateKeyCursor(range: IDBKeyRange | IDBValidKey | null, callback: (c: Cursor) => void): void;
-    iterateKeyCursor(range: IDBKeyRange | IDBValidKey | null, direction: 'next' | 'nextunique' | 'prev' | 'prevunique', callback: (c: Cursor) => void): void;
+    iterateKeyCursor(callback: (c: Cursor<TValue, TKey>) => void): void;
+    iterateKeyCursor(range: IDBKeyRange | IDBValidKey | null, callback: (c: Cursor<TValue, TKey>) => void): void;
+    iterateKeyCursor(range: IDBKeyRange | IDBValidKey | null, direction: 'next' | 'nextunique' | 'prev' | 'prevunique', callback: (c: Cursor<TValue, TKey>) => void): void;
 }
 
 /** Wrapper of IDBObjectStore that presents the asynchronous operations as Promises. */
-export interface ObjectStore extends HasCursor {
+export interface ObjectStore<TValue, TKey> extends HasCursor<TValue, TKey> {
     /** The name of this object store. Settable only during upgrades. */
     name: string;
 
@@ -135,19 +135,19 @@ export interface ObjectStore extends HasCursor {
     /** The value of the auto increment flag for this object store. */
     readonly autoIncrement: boolean;
 
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) creates a structured clone of the value, and updates the cloned value in the object store. 
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) creates a structured clone of the value, and updates the cloned value in the object store.
      * This is for updating existing records in an object store when the transaction's mode is readwrite.
      * @param value The value to be stored.
      * @param key Optional. The key to use to identify the record. If unspecified, it results to null.
      * @returns A promise that resolves with the new key when the underlying put IDBRequest is successful. */
-    put(value: any, key?: IDBKeyRange | IDBValidKey): Promise<IDBValidKey>;
+    put(value: TValue, key?: IDBKeyRange | IDBValidKey): Promise<IDBValidKey>;
 
     /** Returns a Promise of an IDBRequest object that (in a separate thread) creates a structured clone of the value, and stores the cloned value in the object store.
      * This is for adding new records to an object store.
      * @param value The value to be stored.
      * @param key Optional. The key to use to identify the record. If unspecified, it results to null.
      * @returns A promise that resolves with the new key when the underlying add IDBRequest is successful. */
-    add(value: any, key?: IDBKeyRange | IDBValidKey): Promise<IDBValidKey>;
+    add(value: TValue, key?: IDBKeyRange | IDBValidKey): Promise<IDBValidKey>;
 
     /** Returns a Promise of an IDBRequest object that (in a separate thread) deletes the store object specified.
      * This is for deleting individual records out of an object store.
@@ -160,28 +160,28 @@ export interface ObjectStore extends HasCursor {
      * @returns A promise that resolves when the underlying clear IDBRequest is successful.  */
     clear(): Promise<void>;
 
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the store object store selected by the specified key. 
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the store object store selected by the specified key.
      * This is for retrieving specific records from an object store.
      * @param key The key or key range that identifies the record to be retrieved.
      * @returns A promise that resolves with the item when the underlying get IDBRequest is successful. */
-    get(key: any): Promise<any>;
+    get(key: TKey): Promise<TValue>;
 
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the objects in the object store matching the specified parameter or all objects in the store if no parameters are given. 
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the objects in the object store matching the specified parameter or all objects in the store if no parameters are given.
      * @param query Optional. A key or IDBKeyRange to be queried. If nothing is passed, this will default to a key range that selects all the records in this object store.
      * @param count Optional. Specifies the number of values to return if more than one is found. If it is lower than 0 or greater than 232-1 a TypeError exception will be thrown.
      * @returns A promise that resolves with the items when the underlying getAll IDBRequest is successful. */
-    getAll(query?: IDBKeyRange | IDBValidKey, count?: number): Promise<any[]>;
+    getAll(query?: IDBKeyRange | IDBValidKey, count?: number): Promise<TValue[]>;
 
     /** Returns a Promise of an IDBRequest object that (in a separate thread) finds either the given key or the primary key, if key is an IDBKeyRange.
      * @param key The key or key range that identifies the record to be retrieved.
      * @returns A promise that resolves with the item when the underlying get IDBRequest is successful. */
-    getKey(key: IDBKeyRange | IDBValidKey): Promise<any>;
+    getKey(key: IDBKeyRange | IDBValidKey): Promise<TKey>;
 
     /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with record keys for all the objects matching the specified parameter or all record keys in the store if no parameters are given.
      * @param query Optional. A key or IDBKeyRange to be queried. If nothing is passed, this will default to a key range that selects all the records in this object store.
      * @param count Optional. Specifies the number of values to return if more than one is found. If it is lower than 0 or greater than 232-1 a TypeError exception will be thrown.
      * @returns A promise that resolves with the record keys when the underlying getAllKeys IDBRequest is successful. */
-    getAllKeys(query?: IDBKeyRange, count?: number): Promise<any[]>;
+    getAllKeys(query?: IDBKeyRange, count?: number): Promise<TKey[]>;
 
     /** Returns a Promise of an IDBRequest object that (in a separate thread) counts the matching records.
      * If no arguments are provided, it returns the total number of records in the store.
@@ -194,7 +194,7 @@ export interface ObjectStore extends HasCursor {
      * @param keyPath The key path for the index to use. It is possible to create an index with an empty keyPath, and also to pass in an array as a keyPath.
      * @param optionalParameters Additional options: unique and multiEntry.
      * @returns The newly created index. */
-    createIndex(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): Index;
+    createIndex<TKey=any>(name: string, keyPath: string | string[], optionalParameters?: IDBIndexParameters): Index<TValue, TKey>;
 
     /** Destroys the specified index in the connected database, used during a version upgrade.
      * @param indexName The name of the existing index to remove. */
@@ -203,18 +203,18 @@ export interface ObjectStore extends HasCursor {
     /** Opens an index from this object store after which it can, for example, be used to return a sequence of records sorted by that index using a cursor.
      * @param name The name of the existing index to get.
      * @returns The specified index. */
-    index(name: string): Index;
+    index<TKey=any>(name: string): Index<TValue, TKey>;
 }
 
 /** Wrapper of IDBIndex that presents the asynchronous operations as Promises. */
-export interface Index extends HasCursor {
+export interface Index<TValue, TKey> extends HasCursor<TValue, TKey> {
     /** The name of this index. */
     readonly name: string;
 
     /** The key path of this index. If null, this index is not auto-populated. */
     readonly keyPath: string | string[];
 
-    /** Affects how the index behaves when the result of evaluating the index's key path yields an array. 
+    /** Affects how the index behaves when the result of evaluating the index's key path yields an array.
      * If true, there is one record in the index for each item in an array of keys.
      * If false, then there is one record for each key that is an array. */
     readonly multiEntry: boolean;
@@ -228,45 +228,45 @@ export interface Index extends HasCursor {
      * @returns A promise that resolves with the total when the underlying count IDBRequest is successful. */
     count(key?: IDBKeyRange | IDBValidKey): Promise<number>;
 
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the store object store selected by the specified key. 
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the store object store selected by the specified key.
      * This is for retrieving specific records from an object store.
      * @param key The key or key range that identifies the record to be retrieved.
      * @returns A promise that resolves with the item when the underlying get IDBRequest is successful. */
-    get(key: IDBKeyRange | IDBValidKey): Promise<any>;
+    get(key: IDBKeyRange | IDBValidKey): Promise<TValue>;
 
     /** Returns a Promise of an IDBRequest object that (in a separate thread) finds either the given key or the primary key, if key is an IDBKeyRange.
      * @param key The key or key range that identifies the record to be retrieved.
      * @returns A promise that resolves with the item when the underlying get IDBRequest is successful. */
-    getKey(key: IDBKeyRange | IDBValidKey): Promise<any>;
+    getKey(key: IDBKeyRange | IDBValidKey): Promise<TValue>;
 
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the objects in the object store matching the specified parameter or all objects in the store if no parameters are given. 
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with the objects in the object store matching the specified parameter or all objects in the store if no parameters are given.
      * @param query Optional. A key or IDBKeyRange to be queried. If nothing is passed, this will default to a key range that selects all the records in this object store.
      * @param count Optional. Specifies the number of values to return if more than one is found. If it is lower than 0 or greater than 232-1 a TypeError exception will be thrown.
      * @returns A promise that resolves with the items when the underlying getAll IDBRequest is successful. */
-    getAll(query?: IDBKeyRange | IDBValidKey, count?: number): Promise<any[]>;
+    getAll(query?: IDBKeyRange | IDBValidKey, count?: number): Promise<TValue[]>;
 
     /** Returns a Promise of an IDBRequest object that (in a separate thread) resolves with record keys for all the objects matching the specified parameter or all record keys in the store if no parameters are given.
      * @param query Optional. A key or IDBKeyRange to be queried. If nothing is passed, this will default to a key range that selects all the records in this object store.
      * @param count Optional. Specifies the number of values to return if more than one is found. If it is lower than 0 or greater than 232-1 a TypeError exception will be thrown.
      * @returns A promise that resolves with the record keys when the underlying getAllKeys IDBRequest is successful. */
-    getAllKeys(query?: IDBKeyRange, count?: number): Promise<any[]>;
+    getAllKeys(query?: IDBKeyRange, count?: number): Promise<TKey[]>;
 }
 
 /** Wrapper of IDBCursor that presents the asynchronous operations as Promises. */
-export interface Cursor {
+export interface Cursor<TValue, TKey> {
     /** The key for the record at the cursor's position. If the cursor is outside its range, this is set to undefined. The cursor's key can be any data type. */
     readonly key: IDBKeyRange | IDBValidKey;
 
     /** The cursor's current effective primary key. If the cursor is currently being iterated or has iterated outside its range, this is set to undefined. The cursor's primary key can be any data type. */
-    readonly primaryKey: any;
+    readonly primaryKey: TKey | undefined;
 
     /** The direction of traversal of the cursor. */
     readonly direction: 'next' | 'nextunique' | 'prev' | 'prevunique';
 
     /** The current value under the cursor. */
-    readonly value: any;
+    readonly value: TValue;
 
-    /** Returns a Promise of an IDBRequest object that (in a separate thread) deletes the record at the cursor's position, without changing the cursor's position. 
+    /** Returns a Promise of an IDBRequest object that (in a separate thread) deletes the record at the cursor's position, without changing the cursor's position.
      * This can be used to delete specific records.
      * @returns A promise that resolves when the underlying delete IDBRequest is successful. */
     delete(): Promise<void>;
@@ -275,21 +275,21 @@ export interface Cursor {
      * This can be used to update specific records.
      * @param value The value to write over the current cursor location.
      * @returns A promise that resolves when the underlying update IDBRequest is successful. */
-    update(value: any): Promise<void>;
+    update(value: TValue): Promise<void>;
 
     /** Sets the number times a cursor should move its position forward.
      * @param count The number of times to move the cursor forward.
      * @returns The cursor after having been moved forward the specified number of times. */
-    advance(count: number): Promise<Cursor>;
+    advance(count: number): Promise<Cursor<TValue, TKey>>;
 
     /** Advances the cursor to the next position along its direction, to the item whose key matches the optional key parameter.
      * @param key Optional. The key to position the cursor at. If no key is specified, the cursor advances to the immediate next position, based on the its direction.
      * @returns The cursor after having been continued to the next or specified record. */
-    continue(key?: IDBKeyRange | IDBValidKey): Promise<Cursor>;
+    continue(key?: IDBKeyRange | IDBValidKey): Promise<Cursor<TValue, TKey>>;
 
     /** Sets the cursor to the given index key and primary key given as arguments.
      * @param key The key to position the cursor at.
      * @param primaryKey The primary key to position the cursor at.
      * @returns The cursor after having been continued to the next or specified record. */
-    continuePrimaryKey(key?: IDBKeyRange | IDBValidKey, primaryKey?: any): Promise<Cursor>;
+    continuePrimaryKey(key?: IDBKeyRange | IDBValidKey, primaryKey?: TKey): Promise<Cursor<TValue, TKey>>;
 }