Merge branch 'master' of https://github.com/stephenlautier/DefinitelyTyped into localforage

Conflicts:
	angular-localForage/angular-localForage.d.ts
	localForage/localForage-tests.ts
	localForage/localForage.d.ts

localForage/localForage-tests.ts

@@ -1,6 +1,10 @@
 /// <reference path="localForage.d.ts" />
 
+<<<<<<< HEAD
 import {default as localForage} from "localforage";
+=======
+declare var localForage: LocalForage;
+>>>>>>> 5f480287834a2615274eea31574b713e64decf17
 
 () => {
     localForage.clear((err: any) => {
@@ -18,7 +22,7 @@ import {default as localForage} from "localforage";
         var newNumber: number = num;
     });
 
-    localForage.key(0,(err: any, value: string) => {
+    localForage.key(0, (err: any, value: string) => {
         var newError: any = err;
         var newValue: string = value;
     });
@@ -33,12 +37,17 @@ import {default as localForage} from "localforage";
         var newStr: string = str
     });
 
+<<<<<<< HEAD
     localForage.getItem<string>("key").then((value) => {        
         var newStr: string = value
     }); 
 
     localForage.getItem<number>("keyNumber").then((value) => {        
         var newValue: number = value
+=======
+    localForage.getItem<string>("key").then((str: string) => {
+        var newStr: string = str;
+>>>>>>> 5f480287834a2615274eea31574b713e64decf17
     });
   
     localForage.setItem("key", "value",(err: any, str: string) => {
@@ -50,8 +59,13 @@ import {default as localForage} from "localforage";
         var v: string = value;
     });
 
+<<<<<<< HEAD
     localForage.setItem("keyNumber", 1337).then((value) => {
         var v: number = value;
+=======
+    localForage.setItem("key", "value").then((str: string) => {
+        var newStr: string = str;
+>>>>>>> 5f480287834a2615274eea31574b713e64decf17
     });
   
   localForage.removeItem("key",(err: any) => {
@@ -63,6 +77,7 @@ import {default as localForage} from "localforage";
             
         });
 
+<<<<<<< HEAD
     var config = localForage.config({
         name: "testyo",
         driver: localForage.LOCALSTORAGE
@@ -71,5 +86,8 @@ import {default as localForage} from "localforage";
     var store = localForage.createInstance({
         name: "da instance",
         driver: localForage.LOCALSTORAGE
+=======
+    localForage.removeItem("key").then(() => {
+>>>>>>> 5f480287834a2615274eea31574b713e64decf17
     });
 }

localForage/localForage.d.ts

@@ -5,103 +5,77 @@
 
 /// <reference path="../es6-promise/es6-promise.d.ts" />
 
-declare module lf {
-
-    interface ILocalForage extends ILocalForageStatic {
-        /**
-         * Removes every key from the database, returning it to a blank slate.
-         */
-        clear(callback: IErrorCallback): void;
-        /**
-         * Iterate over all value/key pairs in datastore.
-         */
-        iterate<T>(iterateCallback: IIterateCallback<T>): void;
-        /**
-         * Get the name of a key based on its ID.
-         */
-        key(keyIndex: number, callback: IKeyCallback): void;
-        /**
-         * Get the list of all keys in the datastore.
-         */
-        keys(callback: IKeysCallback): void;
-        /**
-         * Gets the number of keys in the offline store (i.e. its “length”).
-         */
-        length(callback: INumberCallback): void;
-        /**
-         * Gets an item from the storage library and supplies the result to a callback.
-         * If the key does not exist, getItem() will return null.
-         */
-        getItem<T>(key: string, callback: ICallback<T>): void;
-        getItem<T>(key: string): Promise<T>;
-        /**
-         * Saves data to an offline store.
-         */
-        setItem<T>(key: string, value: T, callback: ICallback<T>): void;
-        setItem<T>(key: string, value: T): Promise<T>;
-        /**
-         * Removes the value of a key from the offline store.
-         */
-        removeItem(key: string, callback: IErrorCallback): void;
-        removeItem(key: string): Promise<void>;
-    }
-
-    interface ILocalForageStatic {
-        INDEXEDDB: string;
-        LOCALSTORAGE: string;
-        WEBSQL: string;
-
-        /**
-         * Set and persist localForage options. This must be called before any other calls to localForage are made, but can be called after localForage is loaded. 
-         * If you set any config values with this method they will persist after driver changes, so you can call config() then setDriver()
-         * @param {ILocalForageConfig} options?
-         */
-        config(options?: ILocalForageConfig): boolean;
-        createInstance(options?: ILocalForageConfig): ILocalForage;
-        defineDriver(driverObject?: any): void;
-        /**
-         * Force usage of a particular driver or drivers, if available.
-         * @param {string} driver
-         */
-        setDriver(driver: string): void;
-        supports(driverName: string): boolean;
-    }
-
-    interface ILocalForageConfig {
-        description?: string;
-        driver?: string;
-        name?: string;
-        size?: number;
-        storeName?: string;
-        version?: number;
-    }
-
-    interface ICallback<T> {
-        (err: any, value: T): void
-    }
-
-    interface IIterateCallback<T> {
-        (value: T, key: string, iterationNumber: number): void
-    }
-
-    interface IErrorCallback {
-        (err: any): void
-    }
-
-    interface IKeyCallback {
-        (err: any, keyName: string): void
-    }
-
-    interface IKeysCallback {
-        (err: any, keys: Array<string>): void
-    }
-
-    interface INumberCallback {
-        (err: any, numberOfKeys: number): void
-    }
+interface LocalForageOptions {
+    driver?: LocalForageDriver | LocalForageDriver[];
+    
+    name?: string;
+    
+    size?: number;
+    
+    storeName?: string;
+    
+    version?: string;
+    
+    description?: string;
 }
 
-declare module "localforage" {
-    var localforage: lf.ILocalForage;
-    export default localforage;
-}
+interface LocalForageDriver {
+    _driver: string;
+    
+    _initStorage(options: LocalForageOptions): void;
+    
+    _support: boolean | Promise<boolean>;
+    
+    clear(callback: (err: any) => void): void;
+    
+    getItem(key: string, callback: (err: any, value: any) => void): void;
+    
+    key(keyIndex: number, callback: (err: any, key: string) => void): void;
+    
+    keys(callback: (err: any, keys: string[]) => void): void;
+    
+    length(callback: (err: any, numberOfKeys: number) => void): void;
+    
+    removeItem(key: string, callback: (err: any) => void): void;
+    
+    setItem(key: string, value: any, callback: (err: any, value: any) => void): void;
+}
+
+interface LocalForage {
+    LOCALSTORAGE: string;
+    WEBSQL: string;
+    INDEXEDDB: string;
+    
+    config(options: LocalForageOptions): void;
+    
+    driver(): LocalForageDriver;
+    setDriver(driver: string | string[]): Promise<void>;
+    setDriver(driver: string | string[], callback: () => void, errorCallback: (error: any) => void): void;
+    defineDriver(driver: LocalForageDriver): Promise<void>;
+    defineDriver(driver: LocalForageDriver, callback: () => void, errorCallback: (error: any) => void): void;
+    
+    getItem<T>(key: string): Promise<T>;
+    getItem<T>(key: string, callback: (err: any, value: T) => void): void;
+    
+    setItem<T>(key: string, value: T): Promise<T>;
+    setItem<T>(key: string, value: T, callback: (err: any, value: T) => void): void;
+    
+    removeItem(key: string): Promise<void>;
+    removeItem(key: string, callback: (err: any) => void): void;
+    
+    clear(): Promise<void>;
+    clear(callback: (err: any) => void): void;
+    
+    length(): Promise<number>;
+    length(callback: (err: any, numberOfKeys: number) => void): void;
+    
+    key(keyIndex: number): Promise<string>;
+    key(keyIndex: number, callback: (err: any, key: string) => void): void;
+    
+    keys(): Promise<string[]>;
+    keys(callback: (err: any, keys: string[]) => void): void;
+    
+    iterate(iteratee: (value: any, key: string, iterationNumber: number) => any): Promise<any>;
+    iterate(iteratee: (value: any, key: string, iterationNumber: number) => any,
+            callback: (err: any, result: any) => void): void;
+}