@ztimson/utils 0.25.2 → 0.25.4

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export * from './aset';
 export * from './cache';
 export * from './color';
 export * from './csv';
-export * from './collection';
+export * from './database';
 export * from './files';
 export * from './emitter';
 export * from './errors';

package/dist/index.mjs

@@ -392,28 +392,52 @@ function makeUnique(arr) {
 function makeArray(value) {
   return Array.isArray(value) ? value : [value];
 }
-class Collection {
-  constructor(db, collection, version, setup) {
-    __publicField(this, "database");
-    this.db = db;
-    this.collection = collection;
+class Database {
+  constructor(database, tables, version) {
+    __publicField(this, "connection");
+    this.database = database;
+    this.tables = tables;
     this.version = version;
-    this.setup = setup;
-    this.database = new Promise((resolve, reject) => {
-      const req = indexedDB.open(this.db, this.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 = () => resolve(req.result);
-      req.onupgradeneeded = (event) => {
-        const db2 = req.result;
-        if (!db2.objectStoreNames.contains(collection)) db2.createObjectStore(collection, { keyPath: void 0 });
-        if (this.setup) this.setup(db2, event);
+      req.onsuccess = () => {
+        const db = req.result;
+        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 {
+          this.version = db.version;
+          resolve(db);
+        }
+      };
+      req.onupgradeneeded = () => {
+        const db = req.result;
+        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));
       };
     });
   }
-  async tx(collection, fn2, readonly) {
-    const db = await this.database;
-    const tx = db.transaction(collection, readonly ? "readonly" : "readwrite");
-    const store = tx.objectStore(collection);
+  includes(name) {
+    return this.tables.some((t) => typeof t === "string" ? name === t : name === t.name);
+  }
+  table(name) {
+    return new Table(this, name.toString());
+  }
+}
+class Table {
+  constructor(database, name) {
+    this.database = database;
+    this.name = name;
+  }
+  async tx(table, fn2, readonly = false) {
+    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);
       request.onsuccess = () => resolve(request.result);
@@ -421,28 +445,28 @@ class Collection {
     });
   }
   add(value, key) {
-    return this.tx(this.collection, (store) => store.add(value, key));
+    return this.tx(this.name, (store) => store.add(value, key));
   }
   count() {
-    return this.tx(this.collection, (store) => store.count(), true);
+    return this.tx(this.name, (store) => store.count(), true);
   }
   put(key, value) {
-    return this.tx(this.collection, (store) => store.put(value, key));
+    return this.tx(this.name, (store) => store.put(value, key));
   }
   getAll() {
-    return this.tx(this.collection, (store) => store.getAll(), true);
+    return this.tx(this.name, (store) => store.getAll(), true);
   }
   getAllKeys() {
-    return this.tx(this.collection, (store) => store.getAllKeys(), true);
+    return this.tx(this.name, (store) => store.getAllKeys(), true);
   }
   get(key) {
-    return this.tx(this.collection, (store) => store.get(key), true);
+    return this.tx(this.name, (store) => store.get(key), true);
   }
   delete(key) {
-    return this.tx(this.collection, (store) => store.delete(key));
+    return this.tx(this.name, (store) => store.delete(key));
   }
   clear() {
-    return this.tx(this.collection, (store) => store.clear());
+    return this.tx(this.name, (store) => store.clear());
   }
 }
 class Cache {
@@ -465,10 +489,13 @@ class Cache {
     this.options = options;
     if (options.storageKey && !options.storage && typeof Storage !== "undefined") options.storage = localStorage;
     if (options.storage) {
-      if (options.storage instanceof Collection) {
+      if (options.storage instanceof Table) {
         (async () => {
           var _a2;
-          (await ((_a2 = options.storage) == null ? void 0 : _a2.getAll())).forEach((v) => this.add(v));
+          return (await ((_a2 = options.storage) == null ? void 0 : _a2.getAll())).forEach((v) => {
+            console.log(v);
+            this.add(v);
+          });
         })();
       } else if (options.storageKey) {
         const stored = (_a = options.storage) == null ? void 0 : _a.getItem(options.storageKey);
@@ -496,7 +523,7 @@ class Cache {
   }
   save(key) {
     if (this.options.storage) {
-      if (this.options.storage instanceof Collection) {
+      if (this.options.storage instanceof Table) {
         this.options.storage.put(key, this.store[key]);
       } else if (this.options.storageKey) {
         this.options.storage.setItem(this.options.storageKey, JSONSanitize(this.store));
@@ -563,13 +590,16 @@ class Cache {
    */
   expire(key) {
     this.complete = false;
-    if (this.options.expiryPolicy == "keep") this.store[key]._expired = true;
-    else this.delete(key);
+    if (this.options.expiryPolicy == "keep") {
+      this.store[key]._expired = true;
+      this.save(key);
+    } else this.delete(key);
     return this;
   }
   /**
    * Get item from the cache
    * @param {K} key Key to lookup
+   * @param expired Include expired items
    * @return {T} Cached item
    */
   get(key, expired) {
@@ -1998,8 +2028,8 @@ export {
   CliBackground,
   CliEffects,
   CliForeground,
-  Collection,
   CustomError,
+  Database,
   ForbiddenError,
   GatewayTimeoutError,
   Http,
@@ -2024,6 +2054,7 @@ export {
   PromiseProgress,
   SYMBOL_LIST,
   ServiceUnavailableError,
+  Table,
   TypedEmitter,
   UnauthorizedError,
   addUnique,