@ztimson/utils 0.26.18 → 0.26.20

package/dist/index.mjs

@@ -423,8 +423,9 @@ class Cache {
     __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
@@ -433,8 +434,6 @@ class Cache {
     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 };
@@ -444,7 +443,7 @@ class Cache {
           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);
@@ -452,8 +451,10 @@ class Cache {
           Object.assign(this.store, JSON.parse(stored));
         } catch {
         }
-        done();
+        this._loading();
       }
+    } else {
+      this._loading();
     }
     return new Proxy(this, {
       get: (target, prop) => {
@@ -638,16 +639,16 @@ function formatBytes(bytes, decimals = 2) {
   const i = Math.floor(Math.log(bytes) / Math.log(k));
   return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + " " + sizes[i];
 }
-function formatMs(ms) {
+function formatMs(ms, short = false) {
   if (isNaN(ms) || ms < 0) return "Invalid input";
   const seconds = ms / 1e3;
   const minutes = seconds / 60;
   const hours = minutes / 60;
   const days = hours / 24;
-  if (days >= 1) return `${days.toFixed(1)} days`;
-  else if (hours >= 1) return `${hours.toFixed(1)} hours`;
-  else if (minutes >= 1) return `${minutes.toFixed(1)} minutes`;
-  else return `${seconds.toFixed(1)} seconds`;
+  if (days >= 1) return `${days.toFixed(1)} ${short ? "d" : "days"}`;
+  else if (hours >= 1) return `${hours.toFixed(1)} ${short ? "h" : "hours"}`;
+  else if (minutes >= 1) return `${minutes.toFixed(1)} ${short ? "m" : "minutes"}`;
+  else return `${seconds.toFixed(1)} ${short ? "s" : "seconds"}`;
 }
 function formatPhoneNumber(number) {
   const parts = /(\+?1)?.*?(\d{3}).*?(\d{3}).*?(\d{4})/g.exec(number);