xdriver 2.0.5 → 2.0.7

package/lib/index.d.ts

@@ -2,7 +2,7 @@ import { IndexdbStatus, KeyRange } from "./const";
 import Database from "./database";
 import Connection from "./connection";
 import Table, { TableMeta } from "./table";
-export { IndexdbStatus, KeyRange, Connection, Table };
+import { Logger } from "./com";
 declare class Driver {
     private readonly name;
     private version;
@@ -12,4 +12,5 @@ declare class Driver {
     private hasChange;
     connect(version?: number): Promise<Database>;
 }
+export { IndexdbStatus, KeyRange, Connection, Table, Logger, Driver };
 export default Driver;

package/lib/index.js

@@ -12,7 +12,6 @@ import Database from "./database";
 import Connection from "./connection";
 import Table from "./table";
 import { Logger } from "./com";
-export { IndexdbStatus, KeyRange, Connection, Table };
 const logger = Logger.getLogger("Driver");
 class Driver {
     constructor(name, version = 0) {
@@ -137,4 +136,5 @@ class Driver {
         });
     }
 }
+export { IndexdbStatus, KeyRange, Connection, Table, Logger, Driver };
 export default Driver;

package/lib/table.d.ts

@@ -46,8 +46,6 @@ export declare class Pagination<T extends Row> {
     get hasNext(): boolean;
     get hasPrev(): boolean;
     get data(): Array<any>;
-    prev(): boolean;
-    next(): boolean;
 }
 export default class Table implements ITable {
     readonly name: string;

package/lib/table.js

@@ -152,30 +152,24 @@ export class Pagination {
         return this._pageSize;
     }
     get hasNext() {
-        return this._pageIndex * this._pageSize < this._total;
-    }
-    get hasPrev() {
-        return this._pageIndex > 1;
-    }
-    get data() {
-        let start = (this._pageIndex - 1) * this._pageSize;
-        let end = start + this._pageSize;
-        return this._data.slice(start, end);
-    }
-    prev() {
-        if (this.hasPrev) {
-            this._pageIndex--;
+        if (this._pageIndex * this._pageSize < this._total) {
+            this._pageIndex++;
             return true;
         }
         return false;
     }
-    next() {
-        if (this.hasNext) {
-            this._pageIndex++;
+    get hasPrev() {
+        if (this._pageIndex > 1) {
+            this._pageIndex--;
             return true;
         }
         return false;
     }
+    get data() {
+        let start = (this._pageIndex - 1) * this._pageSize;
+        let end = start + this._pageSize;
+        return this._data.slice(start, end);
+    }
 }
 export default class Table {
     constructor(table, database) {

package/package.json

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

package/src/index.ts

@@ -4,7 +4,6 @@ import Connection from "./connection";
 import Table, {TableMeta} from "./table";
 import {Logger} from "./com";
 
-export { IndexdbStatus, KeyRange, Connection, Table};
 
 const logger = Logger.getLogger("Driver")
 
@@ -17,6 +16,7 @@ class Driver {
         this.name = name;
         this.version = version;
     }
+
     defineTables(...tables: Array<TableMeta>): this {
         this.tables.push(...tables);
         logger.debug(`Define tables: ${tables.map(t => t.name).join(', ')}`);
@@ -144,4 +144,7 @@ class Driver {
     }
 }
 
+export {IndexdbStatus, KeyRange, Connection, Table, Logger, Driver};
+
+
 export default Driver;

package/src/table.ts

@@ -251,14 +251,22 @@ export class Pagination<T extends Row> {
      * 是否有下一页
      */
     get hasNext(): boolean {
-        return this._pageIndex * this._pageSize < this._total;
+        if (this._pageIndex * this._pageSize < this._total) {
+            this._pageIndex++;
+            return true;
+        }
+        return false;
     }
 
     /**
      * 是否有上一页
      */
     get hasPrev(): boolean {
-        return this._pageIndex > 1;
+        if (this._pageIndex > 1) {
+            this._pageIndex--;
+            return true;
+        }
+        return false;
     }
 
     /**
@@ -269,26 +277,6 @@ export class Pagination<T extends Row> {
         let end = start + this._pageSize;
         return this._data.slice(start, end);
     }
-    /**
-     * 上一页
-     */
-    prev(): boolean {
-        if (this.hasPrev) {
-            this._pageIndex--;
-            return true;
-        }
-        return false;
-    }
-    /**
-     * 下一页
-     */
-    next(): boolean {
-        if (this.hasNext) {
-            this._pageIndex++;
-            return true;
-        }
-        return false;
-    }
 }
 
 export default class Table implements ITable{