@ztimson/utils 0.25.3 → 0.25.4

package/dist/database.d.ts

@@ -9,13 +9,13 @@ export declare class Database {
     connection: Promise<IDBDatabase>;
     constructor(database: string, tables: (string | TableOptions)[], version?: number | undefined);
     includes(name: string): boolean;
-    table<K extends IDBValidKey = any, T = any>(name: string): Table<K, T>;
+    table<K extends IDBValidKey = any, T = any>(name: any): Table<K, T>;
 }
 export declare class Table<K extends IDBValidKey = any, T = any> {
     private readonly database;
     readonly name: string;
     constructor(database: Database, name: string);
-    tx<R>(schema: string, fn: (store: IDBObjectStore) => IDBRequest, readonly?: boolean): Promise<R>;
+    tx<R>(table: string, fn: (store: IDBObjectStore) => IDBRequest, readonly?: boolean): Promise<R>;
     add(value: T, key?: K): Promise<void>;
     count(): Promise<number>;
     put(key: K, value: T): Promise<void>;

package/dist/index.cjs

@@ -404,10 +404,11 @@ ${opts.message || this.desc}`;
       this.version = version;
       this.connection = new Promise((resolve, reject) => {
         const req = indexedDB.open(this.database, this.version);
+        const tableNames = new ASet(tables.map((t) => (typeof t == "object" ? t.name : t).toString()));
         req.onerror = () => reject(req.error);
         req.onsuccess = () => {
           const db = req.result;
-          if (tables.find((s) => !db.objectStoreNames.contains(typeof s === "string" ? s : s.name))) {
+          if (tableNames.symmetricDifference(new ASet(Array.from(db.objectStoreNames))).length) {
             db.close();
             Object.assign(this, new Database(this.database, this.tables, db.version + 1));
           } else {
@@ -417,12 +418,11 @@ ${opts.message || this.desc}`;
         };
         req.onupgradeneeded = () => {
           const db = req.result;
-          Array.from(db.objectStoreNames).filter((s) => !this.tables.find((t) => typeof t === "string" ? t : t.name == s)).forEach((name) => db.deleteObjectStore(name));
-          tables.filter((t) => !db.objectStoreNames.contains(typeof t === "string" ? t : t.name)).forEach((t) => {
-            db.createObjectStore(typeof t === "string" ? t : t.name, {
-              keyPath: typeof t === "string" ? void 0 : t.key
-            });
-          });
+          const existingTables = new ASet(Array.from(db.objectStoreNames));
+          console.log("delete", existingTables.difference(tableNames));
+          existingTables.difference(tableNames).forEach((name) => db.deleteObjectStore(name));
+          console.log("create", tableNames.difference(existingTables));
+          tableNames.difference(existingTables).forEach((name) => db.createObjectStore(name));
         };
       });
     }
@@ -430,7 +430,7 @@ ${opts.message || this.desc}`;
       return this.tables.some((t) => typeof t === "string" ? name === t : name === t.name);
     }
     table(name) {
-      return new Table(this, name);
+      return new Table(this, name.toString());
     }
   }
   class Table {
@@ -438,10 +438,10 @@ ${opts.message || this.desc}`;
       this.database = database;
       this.name = name;
     }
-    async tx(schema, fn2, readonly = false) {
+    async tx(table, fn2, readonly = false) {
       const db = await this.database.connection;
-      const tx = db.transaction(schema, readonly ? "readonly" : "readwrite");
-      const store = tx.objectStore(schema);
+      const tx = db.transaction(table, readonly ? "readonly" : "readwrite");
+      const store = tx.objectStore(table);
       return new Promise((resolve, reject) => {
         const request = fn2(store);
         request.onsuccess = () => resolve(request.result);