@ztimson/utils 0.26.19 → 0.26.21

package/dist/cache.d.ts

@@ -24,6 +24,7 @@ export declare class Cache<K extends string | number | symbol, T> {
     [key: string | number | symbol]: CachedValue<T> | any;
     /** Whether cache is complete */
     complete: boolean;
+    private _loading;
     /** Await initial loading */
     loading: Promise<void>;
     /**

package/dist/index.cjs

@@ -427,8 +427,9 @@ ${opts.message || this.desc}`;
       __publicField(this, "store", {});
       /** Whether cache is complete */
       __publicField(this, "complete", false);
+      __publicField(this, "_loading");
       /** Await initial loading */
-      __publicField(this, "loading");
+      __publicField(this, "loading", new Promise((r) => this._loading = r));
       /**
        * Get all cached items
        * @return {T[]} Array of items
@@ -437,8 +438,6 @@ ${opts.message || this.desc}`;
       var _a, _b, _c, _d;
       this.key = key;
       this.options = options;
-      let done;
-      this.loading = new Promise((r) => done = r);
       if (this.options.persistentStorage != null) {
         if (typeof this.options.persistentStorage == "string")
           this.options.persistentStorage = { storage: localStorage, key: this.options.persistentStorage };
@@ -448,7 +447,7 @@ ${opts.message || this.desc}`;
             const table = await persists.storage.createTable({ name: persists.key, key: this.key });
             const rows = await table.getAll();
             Object.assign(this.store, rows.reduce((acc, row) => ({ ...acc, [this.getKey(row)]: row }), {}));
-            done();
+            this._loading();
           })();
         } else if (((_d = (_c = this.options.persistentStorage) == null ? void 0 : _c.storage) == null ? void 0 : _d.getItem) != void 0) {
           const stored = this.options.persistentStorage.storage.getItem(this.options.persistentStorage.key);
@@ -456,8 +455,10 @@ ${opts.message || this.desc}`;
             Object.assign(this.store, JSON.parse(stored));
           } catch {
           }
-          done();
+          this._loading();
         }
+      } else {
+        this._loading();
       }
       return new Proxy(this, {
         get: (target, prop) => {
@@ -1036,20 +1037,36 @@ ${opts.message || this.desc}`;
       this.database = database;
       this.version = version;
       this.connection = new Promise((resolve, reject) => {
-        const req = indexedDB.open(this.database, this.version);
+        let req;
+        try {
+          req = indexedDB.open(this.database, this.version);
+        } catch (err) {
+          return reject(err);
+        }
         this.tables = !tables ? [] : tables.map((t) => {
           t = typeof t == "object" ? t : { name: t };
           return { ...t, name: t.name.toString() };
         });
         req.onerror = () => reject(req.error);
         req.onsuccess = () => {
-          const db = req.result;
+          let db;
+          try {
+            db = req.result;
+          } catch (err) {
+            return reject(err);
+          }
           const existing = Array.from(db.objectStoreNames);
-          if (!tables) this.tables = existing.map((t) => {
-            const tx = db.transaction(t, "readonly");
-            const store = tx.objectStore(t);
-            return { name: t, key: store.keyPath };
-          });
+          if (!tables) {
+            this.tables = existing.map((t) => {
+              try {
+                const tx = db.transaction(t, "readonly");
+                const store = tx.objectStore(t);
+                return { name: t, key: store.keyPath };
+              } catch {
+                return { name: t };
+              }
+            });
+          }
           const desired = new ASet((tables || []).map((t) => typeof t == "string" ? t : t.name));
           if (tables && desired.symmetricDifference(new ASet(existing)).length) {
             db.close();
@@ -1063,18 +1080,26 @@ ${opts.message || this.desc}`;
         };
         req.onupgradeneeded = () => {
           this.upgrading = true;
-          const db = req.result;
-          const existingTables = new ASet(Array.from(db.objectStoreNames));
-          if (tables) {
-            const desired = new ASet((tables || []).map((t) => typeof t == "string" ? t : t.name));
-            existingTables.difference(desired).forEach((name) => db.deleteObjectStore(name));
-            desired.difference(existingTables).forEach((name) => {
-              const t = this.tables.find(findByProp("name", name));
-              db.createObjectStore(name, {
-                keyPath: t == null ? void 0 : t.key,
-                autoIncrement: (t == null ? void 0 : t.autoIncrement) || !(t == null ? void 0 : t.key)
+          let db;
+          try {
+            db = req.result;
+          } catch {
+            return;
+          }
+          try {
+            const existingTables = new ASet(Array.from(db.objectStoreNames));
+            if (tables) {
+              const desired = new ASet((tables || []).map((t) => typeof t == "string" ? t : t.name));
+              existingTables.difference(desired).forEach((name) => db.deleteObjectStore(name));
+              desired.difference(existingTables).forEach((name) => {
+                const t = this.tables.find(findByProp("name", name));
+                db.createObjectStore(name, {
+                  keyPath: t == null ? void 0 : t.key,
+                  autoIncrement: (t == null ? void 0 : t.autoIncrement) || !(t == null ? void 0 : t.key)
+                });
               });
-            });
+            }
+          } catch {
           }
         };
       });
@@ -1089,6 +1114,7 @@ ${opts.message || this.desc}`;
         if (!this.includes(table.name)) {
           const newDb = new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1);
           conn.close();
+          await newDb.connection;
           Object.assign(this, newDb);
           await this.connection;
         }
@@ -1102,6 +1128,7 @@ ${opts.message || this.desc}`;
         const conn = await this.connection;
         const newDb = new Database(this.database, this.tables.filter((t) => t.name != table.name), (this.version ?? 0) + 1);
         conn.close();
+        await newDb.connection;
         Object.assign(this, newDb);
         await this.connection;
       });
@@ -1130,9 +1157,8 @@ ${opts.message || this.desc}`;
       await this.database.waitForUpgrade();
       const db = await this.database.connection;
       const tx = db.transaction(table, readonly ? "readonly" : "readwrite");
-      const store = tx.objectStore(table);
       return new Promise((resolve, reject) => {
-        const request = fn2(store);
+        const request = fn2(tx.objectStore(table));
         request.onsuccess = () => resolve(request.result);
         request.onerror = () => reject(request.error);
       });