xdriver 1.0.7 → 1.0.11

package/lib/Database.d.ts

@@ -3,11 +3,13 @@ export default class Database {
     private name;
     private version;
     connect: any;
+    private initialized;
     readonly events: any;
     constructor(name: string, version?: number);
+    initialize(initialized: Function): this;
     on(event: any, fn?: Function): this;
     isOpen(): boolean;
-    open(name?: string | undefined, version?: number | undefined): Promise<unknown>;
+    open(name?: string | undefined, version?: any): Promise<unknown>;
     drop(): Promise<unknown>;
     close(): void;
     createTable(tab: string | object, options?: object): Table;

package/lib/Database.js

@@ -22,6 +22,14 @@ export default class Database {
         this.name = name;
         this.version = version;
         this.connect = null;
+        this.initialized = () => { };
+    }
+    initialize(initialized) {
+        if (this.isOpen()) {
+            throw new Error('You must be call this method before open');
+        }
+        this.initialized = initialized;
+        return this;
     }
     on(event, fn) {
         if (!_instance(event, Object)) {
@@ -39,6 +47,9 @@ export default class Database {
         return this.connect != null;
     }
     open(name, version) {
+        if (!name && !version && this.isOpen()) {
+            return Promise.resolve(this);
+        }
         this.name = name || this.name;
         this.version = version || this.version;
         const request = innerDB.open(this.name, version);
@@ -52,7 +63,7 @@ export default class Database {
             this.events.process(IndexdbStatus.CONNECT_CLOSE);
             this.events.close.call(this, e.target.result);
         };
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             request.onsuccess = (e) => {
                 this.connect = e.target.result;
                 this.events.process(IndexdbStatus.CONNECT_SUCCESS);
@@ -68,7 +79,7 @@ export default class Database {
                 this.events.process(IndexdbStatus.CONNECT_SUCCESS);
                 this.connect = e.target.result;
                 this.events.change.call(this, this.connect);
-                resolve(this);
+                this.initialized();
             };
         });
     }

package/lib/Driver.d.ts

@@ -2,11 +2,12 @@ import { KeyRange } from "./Const";
 import Database from "./Database";
 declare class Driver extends Database {
     insert(table: string, data: Array<any>): Promise<unknown>;
-    select(table: string, keyRange?: KeyRange, limit?: number): any;
+    query(table: string, keyRange?: KeyRange, limit?: number): any;
+    select(table: string, where: any, options?: any): any;
     selectByKey(table: string, key: any): any;
     count(table: string, keyRange?: KeyRange): any;
     update(table: string, modify: any, where: any): Promise<unknown> | undefined;
-    delete(table: string, key: any): void;
-    truncate(table: string): void;
+    delete(table: string, key: any): any;
+    truncate(table: string): any;
 }
 export default Driver;

package/lib/Driver.js

@@ -3,9 +3,12 @@ class Driver extends Database {
     insert(table, data) {
         return this.table(table).insert(data);
     }
-    select(table, keyRange, limit) {
+    query(table, keyRange, limit) {
         return this.table(table).query(keyRange, limit);
     }
+    select(table, where, options) {
+        return this.table(table).select(where, options);
+    }
     selectByKey(table, key) {
         return this.table(table).queryByKey(key);
     }

package/lib/Table.d.ts

@@ -17,9 +17,9 @@ export default class Table {
     insert(data: Array<any>): Promise<unknown>;
     update(modify: any, where?: any): Promise<unknown> | undefined;
     merge(row: any): Promise<unknown> | undefined;
-    delete(key: any): void;
-    clear(): void;
-    dropIndex(name: string): void;
+    delete(key: any): any;
+    clear(): any;
+    dropIndex(name: string): any;
     keys(keyRange?: KeyRange, limit?: number): any;
     count(keyRange?: KeyRange): any;
     query(keyRange?: KeyRange, limit?: number): any;

package/lib/Table.js

@@ -82,13 +82,13 @@ export default class Table {
         }
     }
     delete(key) {
-        _request(_getObjectStore(this, TransactionMode.READ_WRITE).delete(key));
+        return _request(_getObjectStore(this, TransactionMode.READ_WRITE).delete(key));
     }
     clear() {
-        _request(_getObjectStore(this, TransactionMode.READ_WRITE).clear());
+        return _request(_getObjectStore(this, TransactionMode.READ_WRITE).clear());
     }
     dropIndex(name) {
-        _getObjectStore(this, TransactionMode.READ_WRITE).deleteIndex(name);
+        return _getObjectStore(this, TransactionMode.READ_WRITE).deleteIndex(name);
     }
     keys(keyRange, limit) {
         const store = _getObjectStore(this);
@@ -107,7 +107,7 @@ export default class Table {
         if (!where) {
             return this.query();
         }
-        let { index = '', limit = void 0, useIndex = false } = options;
+        let { index = '', limit = void 0, useIndex = false } = options || {};
         if (useIndex && index) {
             return this.queryByIndex(index, where, limit);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xdriver",
-  "version": "1.0.07",
+  "version": "1.0.11",
   "description": "A simple driver for IndexDB",
   "main": "./lib/index",
   "files": [