@ztimson/utils 0.25.25 → 0.25.26

package/dist/cache.d.ts

@@ -1,11 +1,12 @@
-import { Table } from './database.ts';
+import { Database } from './database.ts';
 export type CacheOptions = {
     /** Delete keys automatically after x amount of seconds */
     ttl?: number;
     /** Storage to persist cache */
-    storage?: Storage | Table<any, any>;
-    /** Key cache will be stored under */
-    storageKey?: string;
+    persistentStorage?: {
+        storage: Storage | Database;
+        key: string;
+    } | string;
     /** Keep or delete cached items once expired, defaults to delete */
     expiryPolicy?: 'delete' | 'keep';
 };

package/dist/index.cjs

@@ -623,8 +623,9 @@ ${opts.message || this.desc}`;
         if (typeof table == "string") table = { name: table };
         const conn = await this.connection;
         if (!this.includes(table.name)) {
+          const newDb = new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1);
           conn.close();
-          Object.assign(this, new Database(this.database, [...this.tables, table], (this.version ?? 0) + 1));
+          Object.assign(this, newDb);
           await this.connection;
         }
         return this.table(table.name);
@@ -635,8 +636,9 @@ ${opts.message || this.desc}`;
         if (typeof table == "string") table = { name: table };
         if (!this.includes(table.name)) return;
         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();
-        Object.assign(this, new Database(this.database, this.tables.filter((t) => t.name != table.name), (this.version ?? 0) + 1));
+        Object.assign(this, newDb);
         await this.connection;
       });
     }
@@ -723,25 +725,28 @@ ${opts.message || this.desc}`;
       var _a;
       this.key = key;
       this.options = options;
-      let resolve;
-      this.loading = new Promise((r) => resolve = r);
-      if (options.storageKey && !options.storage && typeof Storage !== "undefined") options.storage = localStorage;
-      if (options.storage) {
-        if (options.storage instanceof Table) {
+      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 };
+        if (((_a = this.options.persistentStorage) == null ? void 0 : _a.storage) instanceof Database) {
           (async () => {
-            var _a2;
-            this.addAll(await ((_a2 = options.storage) == null ? void 0 : _a2.getAll()), false);
-            resolve();
+            const persists = this.options.persistentStorage;
+            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();
           })();
-        } else if (options.storageKey) {
-          const stored = (_a = options.storage) == null ? void 0 : _a.getItem(options.storageKey);
+        } else {
+          const stored = this.options.persistentStorage.storage.getItem(this.options.persistentStorage.key);
           if (stored != null) try {
             Object.assign(this.store, JSON.parse(stored));
           } catch {
           }
-          resolve();
+          done();
         }
-      } else resolve();
+      }
       return new Proxy(this, {
         get: (target, prop) => {
           if (prop in target) return target[prop];
@@ -760,23 +765,19 @@ ${opts.message || this.desc}`;
       return value[this.key];
     }
     save(key) {
-      if (this.options.storage) {
-        if (this.options.storage instanceof Table) {
-          if (key == null) {
-            let rows = this.entries();
-            rows.forEach(([k, v]) => {
-              var _a;
-              return (_a = this.options.storage) == null ? void 0 : _a.put(k, v);
-            });
-            rows = rows.map(([k]) => k);
-            this.options.storage.getAllKeys().then((keys) => keys.filter((k) => !rows.includes(k)).forEach((k) => {
-              var _a;
-              return (_a = this.options.storage) == null ? void 0 : _a.delete(k);
-            }));
-          } else if (this.store[key] === void 0) this.options.storage.delete(key);
-          else this.options.storage.put(key, this.store[key]);
-        } else if (this.options.storageKey) {
-          this.options.storage.setItem(this.options.storageKey, JSONSanitize(this.store));
+      const persists = this.options.persistentStorage;
+      if (!!(persists == null ? void 0 : persists.storage)) {
+        if (persists.storage instanceof Database) {
+          persists.storage.createTable({ name: persists.storage.key, key: this.key }).then((table) => {
+            if (key) {
+              table.set(key, this.get(key));
+            } else {
+              table.clear();
+              this.all().forEach((row) => table.add(row));
+            }
+          });
+        } else {
+          persists.storage.setItem(persists.storage.key, JSONSanitize(this.all(true)));
         }
       }
     }