xdriver 2.0.16 → 2.0.18

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

@@ -13,7 +13,7 @@ export default class Mapper<T extends Row> {
     delete(key: IDBValidKey | IDBKeyRange): Promise<void>;
     queryByIndex(indexName: string, key?: IDBValidKey | IDBKeyRange, count?: number): Promise<RowPacket<T>>;
     queryByKey(key: IDBValidKey | IDBKeyRange): Promise<RowPacket<T>>;
-    queryByKeys(keys: IDBValidKey[]): Promise<RowPacket<T>>;
+    queryByKeys(keys: (IDBValidKey | IDBKeyRange)[]): Promise<RowPacket<T>>;
     scan(key?: IDBValidKey | IDBKeyRange, direction?: IDBCursorDirection, indexName?: string): Promise<RowPacket<T>>;
     select(key?: IDBValidKey | IDBKeyRange, count?: number, indexName?: string): Promise<RowPacket<T>>;
     paginate(pageNo?: number, pageSize?: number, key?: IDBValidKey | IDBKeyRange, indexName?: string): Promise<RowPacket<T>>;

package/lib/table.d.ts

@@ -76,7 +76,7 @@ export default class Table implements ITable {
     keys(key?: IDBValidKey | IDBKeyRange | null, count?: number): Promise<IDBValidKey[]>;
     count(key?: IDBValidKey | IDBKeyRange): Promise<number>;
     query<R extends Row>(key?: IDBValidKey | IDBKeyRange, count?: number): Promise<RowPacket<R>>;
-    queryByKeys<R extends Row>(keys: IDBValidKey[]): Promise<RowPacket<R>>;
+    queryByKeys<R extends Row>(keys: (IDBValidKey | IDBKeyRange)[]): Promise<RowPacket<R>>;
     queryByIndex<R extends Row>(indexName: string, key?: IDBValidKey | IDBKeyRange, count?: number): Promise<RowPacket<R>>;
     select<R extends Row>(key?: IDBValidKey | IDBKeyRange, count?: number, indexName?: string): Promise<RowPacket<R>>;
     queryByKey<R extends Row>(key: IDBValidKey | IDBKeyRange): Promise<RowPacket<R>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xdriver",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "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

@@ -51,7 +51,7 @@ export default class Mapper<T extends Row> {
         return this._table.queryByKey(key);
     }
 
-    async queryByKeys(keys: IDBValidKey[]): Promise<RowPacket<T>> {
+    async queryByKeys(keys: (IDBValidKey | IDBKeyRange)[]): Promise<RowPacket<T>> {
         return this._table.queryByKeys(keys);
     }
 

package/src/table.ts

@@ -455,7 +455,7 @@ export default class Table implements ITable{
         return new RowPacket<R>(rows);
     }
 
-    async queryByKeys<R extends Row>(keys: IDBValidKey[]): Promise<RowPacket<R>> {
+    async queryByKeys<R extends Row>(keys: (IDBValidKey | IDBKeyRange)[]): Promise<RowPacket<R>> {
         if (!keys.length) {
             return Promise.reject('keys is required');
         }