@ztimson/utils 0.26.18 → 0.26.20

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) => {
@@ -642,16 +643,16 @@ ${opts.message || this.desc}`;
     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);