xdriver 2.0.17 → 2.0.19

package/lib/connection.d.ts

@@ -18,6 +18,7 @@ export default class Connection {
     constructor(database?: string, version?: number);
     on<T extends EventKey>(event: T, handle: EventMap[T]): this;
     get connected(): boolean;
+    get tables(): string[];
     connect(name?: string, version?: number, upgrade?: (idbDatabase: IDBDatabase, event: IDBVersionChangeEvent) => any): Promise<any>;
     drop(): Promise<Event>;
     close(): void;

package/lib/connection.js

@@ -25,6 +25,23 @@ export default class Connection {
     get connected() {
         return this.idbDatabase != void 0;
     }
+    get tables() {
+        var _a;
+        if (!this.connected) {
+            throw new Error('Please connect to the database first');
+        }
+        let tables = [];
+        let objectStoreNames = (_a = this.idbDatabase) === null || _a === void 0 ? void 0 : _a.objectStoreNames;
+        if (!objectStoreNames)
+            return tables;
+        for (let i = 0; i < objectStoreNames.length; i++) {
+            let item = objectStoreNames.item(i);
+            if (!item)
+                continue;
+            tables.push(item);
+        }
+        return tables;
+    }
     connect(name, version, upgrade) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

package/lib/index.d.ts

@@ -7,6 +7,7 @@ import Mapper from "./mapper";
 export default class Driver {
     private readonly name;
     private version;
+    private database?;
     private readonly tables;
     constructor(name: string, version?: number);
     defineTables(...tables: Array<TableMeta>): this;

package/lib/index.js

@@ -21,8 +21,16 @@ export default class Driver {
         this.version = version;
     }
     defineTables(...tables) {
-        this.tables.push(...tables);
-        logger.debug(`Define tables: ${tables.map(t => t.name).join(', ')}`);
+        for (let table of tables) {
+            let index = this.tables.findIndex(t => t.name === table.name);
+            if (index >= 0) {
+                this.tables[index] = table;
+                logger.debug(`Update table: ${table.name}`);
+                continue;
+            }
+            this.tables.push(table);
+            logger.debug(`Define table: ${table.name}`);
+        }
         return this;
     }
     hasChange(database) {
@@ -133,7 +141,7 @@ export default class Driver {
                 database.close();
                 yield database.connect(this.name, ++this.version);
             }
-            return database;
+            return this.database = database;
         });
     }
 }

package/lib/mapper.d.ts

@@ -1,6 +1,6 @@
 import Table, { Pagination, Row, RowPacket } from "./table";
 export default class Mapper<T extends Row> {
-    private _table;
+    private readonly _table;
     constructor(table: Table);
     get table(): Table;
     truncate(): Promise<void>;

package/lib/table.js

@@ -299,7 +299,7 @@ export default class Table {
             let objectStore = _getObjectStore(this);
             let rows = [];
             for (let key of keys) {
-                let row = yield _request(objectStore.get(IDBKeyRange.only(key)));
+                let row = yield _request(objectStore.get(key));
                 rows.push(row);
             }
             return new RowPacket(rows);

package/package.json

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

package/src/connection.ts

@@ -37,6 +37,21 @@ export default class Connection {
         return this.idbDatabase != void 0;
     }
 
+    get tables(): string[] {
+        if (!this.connected) {
+            throw new Error('Please connect to the database first')
+        }
+        let tables: Array<string> = [];
+        let objectStoreNames = this.idbDatabase?.objectStoreNames
+        if (!objectStoreNames) return tables;
+        for (let i = 0; i < objectStoreNames.length; i++) {
+            let item = objectStoreNames.item(i);
+            if (!item) continue;
+            tables.push(item);
+        }
+        return tables;
+    }
+
     async connect(name?: string, version?: number, upgrade?: (idbDatabase: IDBDatabase, event: IDBVersionChangeEvent) => any): Promise<any> {
         if ((!name || version == void 0) && this.connected) {
             return Promise.resolve(this);

package/src/index.ts

@@ -10,6 +10,7 @@ const logger = Logger.getLogger("Driver")
 export default class Driver {
     private readonly name: string;
     private version: number;
+    private database?: Database;
     private readonly tables: Array<TableMeta> = [];
 
     constructor(name: string, version: number = 0) {
@@ -18,8 +19,16 @@ export default class Driver {
     }
 
     defineTables(...tables: Array<TableMeta>): this {
-        this.tables.push(...tables);
-        logger.debug(`Define tables: ${tables.map(t => t.name).join(', ')}`);
+        for(let table of tables) {
+            let index = this.tables.findIndex(t => t.name === table.name);
+            if (index >= 0) {
+                this.tables[index] = table;
+                logger.debug(`Update table: ${table.name}`);
+                continue;
+            }
+            this.tables.push(table);
+            logger.debug(`Define table: ${table.name}`);
+        }
         return this;
     }
 
@@ -140,7 +149,7 @@ export default class Driver {
             await database.connect(this.name, ++this.version)
         }
 
-        return database;
+        return this.database = database;
     }
 }
 

package/src/mapper.ts

@@ -1,7 +1,7 @@
 import Table, {Pagination, Row, RowPacket} from "./table";
 
 export default class Mapper<T extends Row> {
-    private _table: Table;
+    private readonly _table: Table;
 
     constructor(table: Table) {
         this._table = table;

package/src/table.ts

@@ -462,7 +462,7 @@ export default class Table implements ITable{
         let objectStore = _getObjectStore(this);
         let rows: Array<R> = []
         for (let key of keys) {
-            let row = await _request(objectStore.get(IDBKeyRange.only(key)));
+            let row = await _request(objectStore.get(key));
             rows.push(row)
         }
         return new RowPacket(rows);