@ztimson/utils 0.27.10 → 0.27.12

package/dist/index.cjs

@@ -1,10 +1,7 @@
-(function(global2, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2.utils = {}));
-})(this, function(exports2) {
-  "use strict";var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-
+(function(global, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.utils = {}));
+})(this, (function(exports2) {
+  "use strict";
   class ArgParser {
     /**
      * Create a unix-like argument parser to extract flags from the argument list. Can also create help messages.
@@ -15,19 +12,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @param {string[]} examples Additional examples to display
      */
     constructor(name, desc, argList = [], examples = []) {
-      __publicField(this, "commands", []);
-      __publicField(this, "args", []);
-      __publicField(this, "flags", []);
-      __publicField(this, "defaults");
       this.name = name;
       this.desc = desc;
       this.argList = argList;
       this.examples = examples;
       this.commands = argList.filter((arg) => arg instanceof ArgParser);
-      this.args = argList.filter((arg) => {
-        var _a;
-        return !(arg instanceof ArgParser) && !((_a = arg.flags) == null ? void 0 : _a.length);
-      });
+      this.args = argList.filter((arg) => !(arg instanceof ArgParser) && !arg.flags?.length);
       this.flags = [
         ...argList.filter((arg) => !(arg instanceof ArgParser) && arg.flags && arg.flags.length),
         { name: "help", desc: "Display command's help message", flags: ["-h", "--help"], default: false }
@@ -40,6 +30,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         `--help ${this.commands.length ? "[COMMAND]" : ""}`
       ].filter((e) => !!e);
     }
+    commands = [];
+    args = [];
+    flags = [];
+    defaults;
     /**
      * Parse an array into an arguments dictionary using the configuration.
      *
@@ -47,7 +41,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @returns {object} Dictionary of arguments with defaults applied
      */
     parse(args) {
-      var _a;
       let extras = [], parsed = { ...this.defaults, "_error": [] }, queue = [...args];
       while (queue.length) {
         let arg = queue.splice(0, 1)[0];
@@ -57,10 +50,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
             arg = `-${arg[1]}`;
           }
           const combined = arg.split("=");
-          const argDef = this.flags.find((flag) => {
-            var _a2;
-            return (_a2 = flag.flags) == null ? void 0 : _a2.includes(combined[0] || arg);
-          });
+          const argDef = this.flags.find((flag) => flag.flags?.includes(combined[0] || arg));
           if (argDef == null) {
             extras.push(arg);
             continue;
@@ -88,7 +78,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         if (!arg.optional && !extras.length) parsed["_error"].push(`Argument missing: ${arg.name.toUpperCase()}`);
         if (extras.length) parsed[arg.name] = extras.splice(0, 1)[0];
       });
-      const extraKey = ((_a = this.args.find((arg) => arg.extras)) == null ? void 0 : _a.name) || "_extra";
+      const extraKey = this.args.find((arg) => arg.extras)?.name || "_extra";
       parsed[extraKey] = extras;
       return parsed;
     }
@@ -111,8 +101,7 @@ ${opts.message || this.desc}`;
       msg += "\n\nUsage:	" + this.examples.map((ex) => `${this.name} ${ex}`).join("\n	");
       if (this.args.length) msg += "\n\n	" + this.args.map((arg) => `${arg.name.toUpperCase()}${spacer(arg.name)}${arg.desc}`).join("\n	");
       msg += "\n\nOptions:\n	" + this.flags.map((flag) => {
-        var _a;
-        const flags = ((_a = flag.flags) == null ? void 0 : _a.join(", ")) || "";
+        const flags = flag.flags?.join(", ") || "";
         return `${flags}${spacer(flags)}${flag.desc}`;
       }).join("\n	");
       if (this.commands.length) msg += "\n\nCommands:\n	" + this.commands.map((command) => `${command.name}${spacer(command.name)}${command.desc}`).join("\n	");
@@ -155,7 +144,7 @@ ${opts.message || this.desc}`;
       }
       return result;
     }
-    for (const d of deltas.flat()) base = applyDelta(base, (d == null ? void 0 : d.delta) ?? d);
+    for (const d of deltas.flat()) base = applyDelta(base, d?.delta ?? d);
     return base;
   }
   function calcDelta(old, updated) {
@@ -163,8 +152,8 @@ ${opts.message || this.desc}`;
     const delta = {};
     const isObj = (v) => v && typeof v === "object" && !Array.isArray(v);
     for (const key of /* @__PURE__ */ new Set([...old ? Object.keys(old) : [], ...updated ? Object.keys(updated) : []])) {
-      const oldVal = old == null ? void 0 : old[key];
-      const newVal = updated == null ? void 0 : updated[key];
+      const oldVal = old?.[key];
+      const newVal = updated?.[key];
       if (isObj(oldVal) && isObj(newVal)) {
         const nested = calcDelta(oldVal, newVal);
         if (nested !== null && Object.keys(nested).length > 0) delta[key] = nested;
@@ -212,7 +201,7 @@ ${opts.message || this.desc}`;
     if (obj == null || !prop) return void 0;
     return prop.split(/[.[\]]/g).filter((prop2) => prop2.length).reduce((obj2, prop2, i, arr) => {
       if (prop2[0] == '"' || prop2[0] == "'") prop2 = prop2.slice(1, -1);
-      if (!(obj2 == null ? void 0 : obj2.hasOwnProperty(prop2))) {
+      if (!obj2?.hasOwnProperty(prop2)) {
         if (set == void 0) return void 0;
         obj2[prop2] = {};
       }
@@ -309,7 +298,7 @@ ${opts.message || this.desc}`;
      */
     constructor(elements = []) {
       super();
-      if (!!(elements == null ? void 0 : elements["forEach"]))
+      if (!!elements?.["forEach"])
         elements.forEach((el) => this.add(el));
     }
     /**
@@ -462,23 +451,12 @@ ${opts.message || this.desc}`;
      * @param options
      */
     constructor(key, options = {}) {
-      __publicField(this, "_loading");
-      __publicField(this, "store", /* @__PURE__ */ new Map());
-      __publicField(this, "timers", /* @__PURE__ */ new Map());
-      __publicField(this, "lruOrder", []);
-      /** Whether cache is complete */
-      __publicField(this, "complete", false);
-      /** Await initial loading */
-      __publicField(this, "loading", new Promise((r) => this._loading = r));
-      /** Get all cached items */
-      __publicField(this, "values", this.all);
-      var _a, _b, _c, _d;
       this.key = key;
       this.options = options;
       if (this.options.persistentStorage != null) {
         if (typeof this.options.persistentStorage == "string")
           this.options.persistentStorage = { storage: localStorage, key: this.options.persistentStorage };
-        if (((_b = (_a = this.options.persistentStorage) == null ? void 0 : _a.storage) == null ? void 0 : _b.database) != void 0) {
+        if (this.options.persistentStorage?.storage?.database != void 0) {
           (async () => {
             const persists = this.options.persistentStorage;
             const table = await persists.storage.createTable({ name: persists.key, key: this.key });
@@ -486,7 +464,7 @@ ${opts.message || this.desc}`;
             for (const row of rows) this.store.set(this.getKey(row), row);
             this._loading();
           })();
-        } else if (((_d = (_c = this.options.persistentStorage) == null ? void 0 : _c.storage) == null ? void 0 : _d.getItem) != void 0) {
+        } else if (this.options.persistentStorage?.storage?.getItem != void 0) {
           const { storage, key: key2 } = this.options.persistentStorage;
           const stored = storage.getItem(key2);
           if (stored != null) {
@@ -513,6 +491,14 @@ ${opts.message || this.desc}`;
         }
       });
     }
+    _loading;
+    store = /* @__PURE__ */ new Map();
+    timers = /* @__PURE__ */ new Map();
+    lruOrder = [];
+    /** Whether cache is complete */
+    complete = false;
+    /** Await initial loading */
+    loading = new Promise((r) => this._loading = r);
     getKey(value) {
       if (!this.key) throw new Error("No key defined");
       if (value[this.key] === void 0) throw new Error(`${this.key.toString()} Doesn't exist on ${JSON.stringify(value, null, 2)}`);
@@ -520,10 +506,9 @@ ${opts.message || this.desc}`;
     }
     /** Save item to storage */
     save(key) {
-      var _a, _b;
       const persists = this.options.persistentStorage;
-      if (!!(persists == null ? void 0 : persists.storage)) {
-        if (((_a = persists.storage) == null ? void 0 : _a.database) != void 0) {
+      if (!!persists?.storage) {
+        if (persists.storage?.database != void 0) {
           persists.storage.createTable({ name: persists.key, key: this.key }).then((table) => {
             if (key !== void 0) {
               const value = this.get(key, true);
@@ -534,7 +519,7 @@ ${opts.message || this.desc}`;
               this.all(true).forEach((row) => table.add(row));
             }
           });
-        } else if (((_b = persists.storage) == null ? void 0 : _b.setItem) != void 0) {
+        } else if (persists.storage?.setItem != void 0) {
           const obj = {};
           for (const [k, v] of this.store.entries()) obj[k] = v;
           persists.storage.setItem(persists.key, JSONSanitize(obj));
@@ -566,7 +551,7 @@ ${opts.message || this.desc}`;
       const out = [];
       for (const v of this.store.values()) {
         const val = v;
-        if (expired || !(val == null ? void 0 : val._expired)) out.push(deepCopy(val));
+        if (expired || !val?._expired) out.push(deepCopy(val));
       }
       return out;
     }
@@ -611,7 +596,7 @@ ${opts.message || this.desc}`;
       const out = [];
       for (const [k, v] of this.store.entries()) {
         const val = v;
-        if (expired || !(val == null ? void 0 : val._expired)) out.push([k, deepCopy(val)]);
+        if (expired || !val?._expired) out.push([k, deepCopy(val)]);
       }
       return out;
     }
@@ -641,7 +626,7 @@ ${opts.message || this.desc}`;
       const raw = this.store.get(key);
       if (raw == null) return null;
       this.touchLRU(key);
-      const isExpired = raw == null ? void 0 : raw._expired;
+      const isExpired = raw?._expired;
       if (expired || !isExpired) return deepCopy(raw);
       return null;
     }
@@ -650,7 +635,7 @@ ${opts.message || this.desc}`;
       const out = [];
       for (const [k, v] of this.store.entries()) {
         const val = v;
-        if (expired || !(val == null ? void 0 : val._expired)) out.push(k);
+        if (expired || !val?._expired) out.push(k);
       }
       return out;
     }
@@ -659,7 +644,7 @@ ${opts.message || this.desc}`;
       const copy = {};
       for (const [k, v] of this.store.entries()) {
         const val = v;
-        if (expired || !(val == null ? void 0 : val._expired)) copy[k] = deepCopy(val);
+        if (expired || !val?._expired) copy[k] = deepCopy(val);
       }
       return copy;
     }
@@ -679,10 +664,12 @@ ${opts.message || this.desc}`;
       }
       return this;
     }
+    /** Get all cached items */
+    values = this.all;
   }
   function contrast(background) {
-    const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /[0-9a-fA-F]{2}/g : /[0-9a-fA-F]/g);
-    if (!exploded || (exploded == null ? void 0 : exploded.length) < 3) return "black";
+    const exploded = background?.match(background.length >= 6 ? /[0-9a-fA-F]{2}/g : /[0-9a-fA-F]/g);
+    if (!exploded || exploded?.length < 3) return "black";
     const [r, g, b] = exploded.map((hex) => parseInt(hex.length == 1 ? `${hex}${hex}` : hex, 16));
     const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
     return luminance > 0.5 ? "black" : "white";
@@ -788,7 +775,7 @@ ${opts.message || this.desc}`;
       "(?:(?<protocol>[\\w\\d]+)\\:\\/\\/)?(?:(?<user>.+)\\@)?(?<host>(?<domain>[^:\\/\\?#@\\n]+)(?:\\:(?<port>\\d*))?)(?<path>\\/.*?)?(?:\\?(?<query>.*?))?(?:#(?<fragment>.*?))?$",
       "gm"
     ).exec(url);
-    const groups = (processed == null ? void 0 : processed.groups) ?? {};
+    const groups = processed?.groups ?? {};
     const domains = groups.domain.split(".");
     if (groups["port"] != null) groups.port = Number(groups.port);
     if (domains.length > 2) {
@@ -860,7 +847,6 @@ ${opts.message || this.desc}`;
     return /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(email);
   }
   function fromCsv(csv, hasHeaders = true) {
-    var _a;
     function parseLine(line) {
       const columns = [];
       let current = "", inQuotes2 = false;
@@ -891,7 +877,7 @@ ${opts.message || this.desc}`;
     }
     if (currentRow) rows.push(currentRow.trim());
     let headers = hasHeaders ? rows.splice(0, 1)[0] : null;
-    if (headers) headers = (_a = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)) == null ? void 0 : _a.map((h) => h.trim());
+    if (headers) headers = headers.match(/(?:[^,"']+|"(?:[^"]|"")*"|'(?:[^']|'')*')+/g)?.map((h) => h.trim());
     return rows.map((r) => {
       const props = parseLine(r);
       const h = headers || Array(props.length).fill(null).map((_, i) => {
@@ -944,11 +930,10 @@ ${opts.message || this.desc}`;
     return Math.ceil((date.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24));
   }
   function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz = "local") {
-    var _a;
     if (typeof date === "number" || typeof date === "string") date = new Date(date);
     if (isNaN(date.getTime())) throw new Error("Invalid date input");
     const numericTz = typeof tz === "number";
-    const localTz = tz === "local" || !numericTz && ((_a = tz.toLowerCase) == null ? void 0 : _a.call(tz)) === "local";
+    const localTz = tz === "local" || !numericTz && tz.toLowerCase?.() === "local";
     const tzName = localTz ? Intl.DateTimeFormat().resolvedOptions().timeZone : numericTz ? "UTC" : tz;
     if (!numericTz && tzName !== "UTC") {
       try {
@@ -1009,7 +994,6 @@ ${opts.message || this.desc}`;
       return n + (s[(v - 20) % 10] || s[v] || s[0]);
     }
     function getTZOffset() {
-      var _a2, _b;
       if (numericTz) {
         const total = tz * 60;
         const hours = Math.floor(Math.abs(total) / 60);
@@ -1017,17 +1001,16 @@ ${opts.message || this.desc}`;
         return `${tz >= 0 ? "+" : "-"}${String(hours).padStart(2, "0")}:${String(mins).padStart(2, "0")}`;
       }
       try {
-        const offset = (_b = (_a2 = new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "longOffset", hour: "2-digit", minute: "2-digit" }).formatToParts(date).find((p) => p.type === "timeZoneName")) == null ? void 0 : _a2.value.match(/([+-]\d{2}:\d{2})/)) == null ? void 0 : _b[1];
+        const offset = new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "longOffset", hour: "2-digit", minute: "2-digit" }).formatToParts(date).find((p) => p.type === "timeZoneName")?.value.match(/([+-]\d{2}:\d{2})/)?.[1];
         if (offset) return offset;
       } catch {
       }
       return "+00:00";
     }
     function getTZAbbr() {
-      var _a2;
       if (numericTz && tz === 0) return "UTC";
       try {
-        return ((_a2 = new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "short" }).formatToParts(date).find((p) => p.type === "timeZoneName")) == null ? void 0 : _a2.value) || "";
+        return new Intl.DateTimeFormat("en-US", { timeZone: tzName, timeZoneName: "short" }).formatToParts(date).find((p) => p.type === "timeZoneName")?.value || "";
       } catch {
         return tzName;
       }
@@ -1090,10 +1073,7 @@ ${opts.message || this.desc}`;
       second: "2-digit"
     });
     const parts = dtf.formatToParts(date);
-    const get = (type) => {
-      var _a;
-      return Number((_a = parts.find((v) => v.type === type)) == null ? void 0 : _a.value);
-    };
+    const get = (type) => Number(parts.find((v) => v.type === type)?.value);
     const y = get("year");
     const mo = get("month");
     const d = get("day");
@@ -1105,9 +1085,7 @@ ${opts.message || this.desc}`;
     return Math.round((asLocal - asUTC) / 6e4);
   }
   class AsyncLock {
-    constructor() {
-      __publicField(this, "p", Promise.resolve());
-    }
+    p = Promise.resolve();
     run(fn2) {
       const res = this.p.then(fn2, fn2);
       this.p = res.then(() => {
@@ -1118,11 +1096,6 @@ ${opts.message || this.desc}`;
   }
   class Database {
     constructor(database, tables, version) {
-      __publicField(this, "schemaLock", new AsyncLock());
-      __publicField(this, "upgrading", false);
-      __publicField(this, "connection");
-      __publicField(this, "tables");
-      __publicField(this, "waitForUpgrade", () => sleepWhile(() => this.upgrading));
       this.database = database;
       this.version = version;
       this.connection = new Promise((resolve, reject) => {
@@ -1183,8 +1156,8 @@ ${opts.message || this.desc}`;
               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)
+                  keyPath: t?.key,
+                  autoIncrement: t?.autoIncrement || !t?.key
                 });
               });
             }
@@ -1193,9 +1166,14 @@ ${opts.message || this.desc}`;
         };
       });
     }
+    schemaLock = new AsyncLock();
+    upgrading = false;
+    connection;
+    tables;
     get ready() {
       return !this.upgrading;
     }
+    waitForUpgrade = () => sleepWhile(() => this.upgrading);
     async createTable(table) {
       return this.schemaLock.run(async () => {
         if (typeof table == "string") table = { name: table };
@@ -1231,9 +1209,6 @@ ${opts.message || this.desc}`;
   }
   class Table {
     constructor(database, name, key = "id") {
-      __publicField(this, "all", this.getAll);
-      __publicField(this, "create", this.add);
-      __publicField(this, "update", this.set);
       this.database = database;
       this.name = name;
       this.key = key;
@@ -1255,12 +1230,14 @@ ${opts.message || this.desc}`;
     add(value, key) {
       return this.tx(this.name, (store) => store.add(value, key));
     }
+    all = this.getAll;
     clear() {
       return this.tx(this.name, (store) => store.clear());
     }
     count() {
       return this.tx(this.name, (store) => store.count(), true);
     }
+    create = this.add;
     delete(key) {
       return this.tx(this.name, (store) => store.delete(key));
     }
@@ -1287,17 +1264,11 @@ ${opts.message || this.desc}`;
       if (!value[this.key]) return this.add(value);
       return this.put(value);
     }
+    update = this.set;
   }
   class PromiseProgress extends Promise {
-    constructor(executor) {
-      super((resolve, reject) => executor(
-        (value) => resolve(value),
-        (reason) => reject(reason),
-        (progress) => this.progress = progress
-      ));
-      __publicField(this, "listeners", []);
-      __publicField(this, "_progress", 0);
-    }
+    listeners = [];
+    _progress = 0;
     get progress() {
       return this._progress;
     }
@@ -1306,6 +1277,13 @@ ${opts.message || this.desc}`;
       this._progress = p;
       this.listeners.forEach((l) => l(p));
     }
+    constructor(executor) {
+      super((resolve, reject) => executor(
+        (value) => resolve(value),
+        (reason) => reject(reason),
+        (progress) => this.progress = progress
+      ));
+    }
     static from(promise) {
       if (promise instanceof PromiseProgress) return promise;
       return new PromiseProgress((res, rej) => promise.then((...args) => res(...args)).catch((...args) => rej(...args)));
@@ -1388,9 +1366,8 @@ ${opts.message || this.desc}`;
     });
   }
   class TypedEmitter {
-    constructor() {
-      __publicField(this, "listeners", {});
-    }
+    static listeners = {};
+    listeners = {};
     static emit(event, ...args) {
       (this.listeners["*"] || []).forEach((l) => l(event, ...args));
       (this.listeners[event.toString()] || []).forEach((l) => l(...args));
@@ -1400,19 +1377,18 @@ ${opts.message || this.desc}`;
       this.listeners[e] = (this.listeners[e] || []).filter((l) => l != listener);
     }
     static on(event, listener) {
-      var _a;
       const e = event.toString();
       if (!this.listeners[e]) this.listeners[e] = [];
-      (_a = this.listeners[e]) == null ? void 0 : _a.push(listener);
+      this.listeners[e]?.push(listener);
       return () => this.off(event, listener);
     }
     static once(event, listener) {
       return new Promise((res) => {
-        const unsubscribe = this.on(event, (...args) => {
+        const unsubscribe = this.on(event, ((...args) => {
           res(args.length == 1 ? args[0] : args);
           if (listener) listener(...args);
           unsubscribe();
-        });
+        }));
       });
     }
     emit(event, ...args) {
@@ -1423,34 +1399,33 @@ ${opts.message || this.desc}`;
       this.listeners[event] = (this.listeners[event] || []).filter((l) => l != listener);
     }
     on(event, listener) {
-      var _a;
       if (!this.listeners[event]) this.listeners[event] = [];
-      (_a = this.listeners[event]) == null ? void 0 : _a.push(listener);
+      this.listeners[event]?.push(listener);
       return () => this.off(event, listener);
     }
     once(event, listener) {
       return new Promise((res) => {
-        const unsubscribe = this.on(event, (...args) => {
+        const unsubscribe = this.on(event, ((...args) => {
           res(args.length == 1 ? args[0] : args);
           if (listener) listener(...args);
           unsubscribe();
-        });
+        }));
       });
     }
   }
-  __publicField(TypedEmitter, "listeners", {});
   class CustomError extends Error {
-    constructor(message, code) {
-      super(message);
-      __publicField(this, "_code");
-      if (code != null) this._code = code;
-    }
+    static code = 500;
+    _code;
     get code() {
       return this._code || this.constructor.code;
     }
     set code(c) {
       this._code = c;
     }
+    constructor(message, code) {
+      super(message);
+      if (code != null) this._code = code;
+    }
     static from(err) {
       const code = Number(err.statusCode) ?? Number(err.code);
       const newErr = new this(err.message || err.toString());
@@ -1467,8 +1442,8 @@ ${opts.message || this.desc}`;
       return this.message || super.toString();
     }
   }
-  __publicField(CustomError, "code", 500);
   class BadRequestError extends CustomError {
+    static code = 400;
     constructor(message = "Bad Request") {
       super(message);
     }
@@ -1476,8 +1451,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(BadRequestError, "code", 400);
   class UnauthorizedError extends CustomError {
+    static code = 401;
     constructor(message = "Unauthorized") {
       super(message);
     }
@@ -1485,8 +1460,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(UnauthorizedError, "code", 401);
   class PaymentRequiredError extends CustomError {
+    static code = 402;
     constructor(message = "Payment Required") {
       super(message);
     }
@@ -1494,8 +1469,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(PaymentRequiredError, "code", 402);
   class ForbiddenError extends CustomError {
+    static code = 403;
     constructor(message = "Forbidden") {
       super(message);
     }
@@ -1503,8 +1478,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(ForbiddenError, "code", 403);
   class NotFoundError extends CustomError {
+    static code = 404;
     constructor(message = "Not Found") {
       super(message);
     }
@@ -1512,8 +1487,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(NotFoundError, "code", 404);
   class MethodNotAllowedError extends CustomError {
+    static code = 405;
     constructor(message = "Method Not Allowed") {
       super(message);
     }
@@ -1521,8 +1496,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(MethodNotAllowedError, "code", 405);
   class NotAcceptableError extends CustomError {
+    static code = 406;
     constructor(message = "Not Acceptable") {
       super(message);
     }
@@ -1530,8 +1505,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(NotAcceptableError, "code", 406);
   class InternalServerError extends CustomError {
+    static code = 500;
     constructor(message = "Internal Server Error") {
       super(message);
     }
@@ -1539,8 +1514,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(InternalServerError, "code", 500);
   class NotImplementedError extends CustomError {
+    static code = 501;
     constructor(message = "Not Implemented") {
       super(message);
     }
@@ -1548,8 +1523,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(NotImplementedError, "code", 501);
   class BadGatewayError extends CustomError {
+    static code = 502;
     constructor(message = "Bad Gateway") {
       super(message);
     }
@@ -1557,8 +1532,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(BadGatewayError, "code", 502);
   class ServiceUnavailableError extends CustomError {
+    static code = 503;
     constructor(message = "Service Unavailable") {
       super(message);
     }
@@ -1566,8 +1541,8 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(ServiceUnavailableError, "code", 503);
   class GatewayTimeoutError extends CustomError {
+    static code = 504;
     constructor(message = "Gateway Timeout") {
       super(message);
     }
@@ -1575,7 +1550,6 @@ ${opts.message || this.desc}`;
       return err.constructor.code == this.code;
     }
   }
-  __publicField(GatewayTimeoutError, "code", 504);
   function errorFromCode(code, message) {
     switch (code) {
       case 400:
@@ -1607,6 +1581,11 @@ ${opts.message || this.desc}`;
     }
   }
   class HttpResponse extends Response {
+    data;
+    ok;
+    redirected;
+    type;
+    url;
     constructor(resp, stream) {
       const body = [204, 205, 304].includes(resp.status) ? null : stream;
       super(body, {
@@ -1614,33 +1593,30 @@ ${opts.message || this.desc}`;
         status: resp.status,
         statusText: resp.statusText
       });
-      __publicField(this, "data");
-      __publicField(this, "ok");
-      __publicField(this, "redirected");
-      __publicField(this, "type");
-      __publicField(this, "url");
       this.ok = resp.ok;
       this.redirected = resp.redirected;
       this.type = resp.type;
       this.url = resp.url;
     }
   }
-  const _Http = class _Http {
+  class Http {
+    static interceptors = {};
+    static headers = {};
+    interceptors = {};
+    headers = {};
+    url;
     constructor(defaults = {}) {
-      __publicField(this, "interceptors", {});
-      __publicField(this, "headers", {});
-      __publicField(this, "url");
       this.url = defaults.url ?? null;
       this.headers = defaults.headers || {};
       if (defaults.interceptors) {
-        defaults.interceptors.forEach((i) => _Http.addInterceptor(i));
+        defaults.interceptors.forEach((i) => Http.addInterceptor(i));
       }
     }
     static addInterceptor(fn2) {
-      const key = Object.keys(_Http.interceptors).length.toString();
-      _Http.interceptors[key] = fn2;
+      const key = Object.keys(Http.interceptors).length.toString();
+      Http.interceptors[key] = fn2;
       return () => {
-        _Http.interceptors[key] = null;
+        Http.interceptors[key] = null;
       };
     }
     addInterceptor(fn2) {
@@ -1651,9 +1627,8 @@ ${opts.message || this.desc}`;
       };
     }
     request(opts = {}) {
-      var _a;
       if (!this.url && !opts.url) throw new Error("URL needs to be set");
-      let url = ((_a = opts.url) == null ? void 0 : _a.startsWith("http")) ? opts.url : (this.url || "") + (opts.url || "");
+      let url = opts.url?.startsWith("http") ? opts.url : (this.url || "") + (opts.url || "");
       url = url.replaceAll(/([^:]\/)\/+/g, "$1");
       if (opts.fragment) url.includes("#") ? url.replace(/#.*([?\n])/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
       if (opts.query) {
@@ -1662,7 +1637,7 @@ ${opts.message || this.desc}`;
       }
       const headers = clean({
         "Content-Type": !opts.body ? void 0 : opts.body instanceof FormData ? "multipart/form-data" : "application/json",
-        ..._Http.headers,
+        ...Http.headers,
         ...this.headers,
         ...opts.headers
       });
@@ -1675,18 +1650,17 @@ ${opts.message || this.desc}`;
             method: opts.method || (opts.body ? "POST" : "GET"),
             body: opts.body
           }).then(async (resp) => {
-            var _a2, _b;
-            for (let fn2 of [...Object.values(_Http.interceptors), ...Object.values(this.interceptors)]) {
+            for (let fn2 of [...Object.values(Http.interceptors), ...Object.values(this.interceptors)]) {
               await new Promise((res2) => fn2(resp, () => res2()));
             }
             const contentLength = resp.headers.get("Content-Length");
             const total = contentLength ? parseInt(contentLength, 10) : 0;
             let loaded = 0;
-            const reader = (_a2 = resp.body) == null ? void 0 : _a2.getReader();
+            const reader = resp.body?.getReader();
             const stream = new ReadableStream({
               start(controller) {
                 function push() {
-                  reader == null ? void 0 : reader.read().then((event) => {
+                  reader?.read().then((event) => {
                     if (event.done) return controller.close();
                     loaded += event.value.byteLength;
                     prog(loaded / total);
@@ -1699,11 +1673,11 @@ ${opts.message || this.desc}`;
             });
             resp = new HttpResponse(resp, stream);
             if (opts.decode !== false) {
-              const content = (_b = resp.headers.get("Content-Type")) == null ? void 0 : _b.toLowerCase();
-              if (content == null ? void 0 : content.includes("form")) resp.data = await resp.formData();
-              else if (content == null ? void 0 : content.includes("json")) resp.data = await resp.json();
-              else if (content == null ? void 0 : content.includes("text")) resp.data = await resp.text();
-              else if (content == null ? void 0 : content.includes("application")) resp.data = await resp.blob();
+              const content = resp.headers.get("Content-Type")?.toLowerCase();
+              if (content?.includes("form")) resp.data = await resp.formData();
+              else if (content?.includes("json")) resp.data = await resp.json();
+              else if (content?.includes("text")) resp.data = await resp.text();
+              else if (content?.includes("application")) resp.data = await resp.blob();
             }
             if (resp.ok) res(resp);
             else rej(resp);
@@ -1713,10 +1687,7 @@ ${opts.message || this.desc}`;
         }
       });
     }
-  };
-  __publicField(_Http, "interceptors", {});
-  __publicField(_Http, "headers", {});
-  let Http = _Http;
+  }
   function createJwt(payload, signature = "unsigned") {
     const header = Buffer.from(JSON.stringify({ alg: "HS256", typ: "JWT" })).toString("base64url");
     const body = Buffer.from(JSON.stringify(payload)).toString("base64url");
@@ -1774,49 +1745,48 @@ ${opts.message || this.desc}`;
     LOG_LEVEL2[LOG_LEVEL2["DEBUG"] = 4] = "DEBUG";
     return LOG_LEVEL2;
   })(LOG_LEVEL || {});
-  const _Logger = class _Logger extends TypedEmitter {
+  class Logger extends TypedEmitter {
     constructor(namespace) {
       super();
       this.namespace = namespace;
     }
+    static LOG_LEVEL = 4;
     format(...text) {
       const now = /* @__PURE__ */ new Date();
       const timestamp = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()} ${now.getHours().toString().padStart(2, "0")}:${now.getMinutes().toString().padStart(2, "0")}:${now.getSeconds().toString().padStart(2, "0")}.${now.getMilliseconds().toString().padEnd(3, "0")}`;
       return `${timestamp}${this.namespace ? ` [${this.namespace}]` : ""} ${text.map((t) => typeof t == "string" ? t : JSONSanitize(t, 2)).join(" ")}`;
     }
     debug(...args) {
-      if (_Logger.LOG_LEVEL < 4) return;
+      if (Logger.LOG_LEVEL < 4) return;
       const str = this.format(...args);
-      _Logger.emit(4, str);
+      Logger.emit(4, str);
       console.debug(CliForeground.LIGHT_GREY + str + CliEffects.CLEAR);
     }
     log(...args) {
-      if (_Logger.LOG_LEVEL < 3) return;
+      if (Logger.LOG_LEVEL < 3) return;
       const str = this.format(...args);
-      _Logger.emit(3, str);
+      Logger.emit(3, str);
       console.log(CliEffects.CLEAR + str);
     }
     info(...args) {
-      if (_Logger.LOG_LEVEL < 2) return;
+      if (Logger.LOG_LEVEL < 2) return;
       const str = this.format(...args);
-      _Logger.emit(2, str);
+      Logger.emit(2, str);
       console.info(CliForeground.BLUE + str + CliEffects.CLEAR);
     }
     warn(...args) {
-      if (_Logger.LOG_LEVEL < 1) return;
+      if (Logger.LOG_LEVEL < 1) return;
       const str = this.format(...args);
-      _Logger.emit(1, str);
+      Logger.emit(1, str);
       console.warn(CliForeground.YELLOW + str + CliEffects.CLEAR);
     }
     error(...args) {
-      if (_Logger.LOG_LEVEL < 0) return;
+      if (Logger.LOG_LEVEL < 0) return;
       const str = this.format(...args);
-      _Logger.emit(0, str);
+      Logger.emit(0, str);
       console.error(CliForeground.RED + str + CliEffects.CLEAR);
     }
-  };
-  __publicField(_Logger, "LOG_LEVEL", 4);
-  let Logger = _Logger;
+  }
   function dec2Frac(num, maxDen = 1e3) {
     let sign = Math.sign(num);
     num = Math.abs(num);
@@ -1851,22 +1821,22 @@ ${opts.message || this.desc}`;
   }
   function consoleInterceptor(out = console, map) {
     const logs = { debug: [], log: [], info: [], warn: [], error: [], stderr: [], stdout: [] };
-    const cWrapper = (type) => (...args) => {
+    const cWrapper = (type) => ((...args) => {
       if (out) out[type](...args);
       logs[type].push(...args);
       if (type == "error") logs.stderr.push(...args);
       else logs.stdout.push(...args);
-    };
+    });
     return {
-      debug: (map == null ? void 0 : map.debug) != "none" ? cWrapper((map == null ? void 0 : map.debug) || "debug") : () => {
+      debug: map?.debug != "none" ? cWrapper(map?.debug || "debug") : () => {
       },
-      log: (map == null ? void 0 : map.log) != "none" ? cWrapper((map == null ? void 0 : map.log) || "log") : () => {
+      log: map?.log != "none" ? cWrapper(map?.log || "log") : () => {
       },
-      info: (map == null ? void 0 : map.info) != "none" ? cWrapper((map == null ? void 0 : map.info) || "info") : () => {
+      info: map?.info != "none" ? cWrapper(map?.info || "info") : () => {
       },
-      warn: (map == null ? void 0 : map.warn) != "none" ? cWrapper((map == null ? void 0 : map.warn) || "warn") : () => {
+      warn: map?.warn != "none" ? cWrapper(map?.warn || "warn") : () => {
       },
-      error: (map == null ? void 0 : map.error) != "none" ? cWrapper((map == null ? void 0 : map.error) || "error") : () => {
+      error: map?.error != "none" ? cWrapper(map?.error || "error") : () => {
       },
       output: logs
     };
@@ -1907,44 +1877,29 @@ ${opts.message || this.desc}`;
       if (args[i]) combined.push(args[i]);
     }
     const [paths, methods] = combined.join("/").split(":");
-    return PathEvent.toString(paths, methods == null ? void 0 : methods.split(""));
+    return PathEvent.toString(paths, methods?.split(""));
   }
   class PathError extends Error {
   }
-  const _PathEvent = class _PathEvent {
-    constructor(e) {
-      /** First directory in path */
-      __publicField(this, "module");
-      /** Entire path, including the module & name */
-      __publicField(this, "fullPath");
-      /** Path including the name, excluding the module */
-      __publicField(this, "path");
-      /** Last sagment of path */
-      __publicField(this, "name");
-      /** List of methods */
-      __publicField(this, "methods");
-      if (typeof e == "object") {
-        Object.assign(this, e);
-        return;
-      }
-      if (_PathEvent.pathEventCache.has(e)) {
-        Object.assign(this, _PathEvent.pathEventCache.get(e));
-        return;
-      }
-      let [p, scope, method] = e.replaceAll(/\/{2,}/g, "/").split(":");
-      if (!method) method = scope || "*";
-      if (p == "*" || !p && method == "*") {
-        p = "";
-        method = "*";
-      }
-      let temp = p.split("/").filter((p2) => !!p2);
-      this.module = temp.splice(0, 1)[0] || "";
-      this.path = temp.join("/");
-      this.fullPath = `${this.module}${this.module && this.path ? "/" : ""}${this.path}`;
-      this.name = temp.pop() || "";
-      this.methods = new ASet(method.split(""));
-      _PathEvent.pathEventCache.set(e, this);
-    }
+  class PathEvent {
+    /** First directory in path */
+    module;
+    /** Entire path, including the module & name */
+    fullPath;
+    /** Path including the name, excluding the module */
+    path;
+    /** Last segment of path */
+    name;
+    /** List of methods */
+    methods;
+    /** Whether this path contains glob patterns */
+    hasGlob;
+    /** Internal cache for PathEvent instances to avoid redundant parsing */
+    static pathEventCache = /* @__PURE__ */ new Map();
+    /** Cache for compiled permissions (path + required permissions → result) */
+    static permissionCache = /* @__PURE__ */ new Map();
+    /** Max size for permission cache before LRU eviction */
+    static MAX_PERMISSION_CACHE_SIZE = 1e3;
     /** All/Wildcard specified */
     get all() {
       return this.methods.has("*");
@@ -1966,6 +1921,13 @@ ${opts.message || this.desc}`;
     set create(v) {
       v ? this.methods.delete("n").delete("*").add("c") : this.methods.delete("c");
     }
+    /** Execute method specified */
+    get execute() {
+      return !this.methods.has("n") && (this.methods.has("*") || this.methods.has("x"));
+    }
+    set execute(v) {
+      v ? this.methods.delete("n").delete("*").add("x") : this.methods.delete("x");
+    }
     /** Read method specified */
     get read() {
       return !this.methods.has("n") && (this.methods.has("*") || this.methods.has("r"));
@@ -1987,9 +1949,107 @@ ${opts.message || this.desc}`;
     set delete(v) {
       v ? this.methods.delete("n").delete("*").add("d") : this.methods.delete("d");
     }
+    constructor(e) {
+      if (typeof e == "object") {
+        Object.assign(this, e);
+        return;
+      }
+      if (PathEvent.pathEventCache.has(e)) {
+        Object.assign(this, PathEvent.pathEventCache.get(e));
+        return;
+      }
+      let [p, method] = e.replaceAll(/\/{2,}/g, "/").split(":");
+      if (!method) method = "*";
+      if (p === "" || p === void 0) {
+        this.module = "";
+        this.path = "";
+        this.fullPath = "";
+        this.name = "";
+        this.methods = new ASet(["n"]);
+        this.hasGlob = false;
+        PathEvent.pathEventCache.set(e, this);
+        return;
+      }
+      if (p === "*") {
+        this.module = "";
+        this.path = "";
+        this.fullPath = "**";
+        this.name = "";
+        this.methods = new ASet(["*"]);
+        this.hasGlob = true;
+        PathEvent.pathEventCache.set(e, this);
+        return;
+      }
+      let temp = p.split("/").filter((p2) => !!p2);
+      this.module = temp.splice(0, 1)[0] || "";
+      this.path = temp.join("/");
+      this.fullPath = `${this.module}${this.module && this.path ? "/" : ""}${this.path}`;
+      this.name = temp.pop() || "";
+      this.hasGlob = this.fullPath.includes("*");
+      this.methods = new ASet(method.split(""));
+      PathEvent.pathEventCache.set(e, this);
+    }
     /** Clear the cache of all PathEvents */
     static clearCache() {
-      _PathEvent.pathEventCache.clear();
+      PathEvent.pathEventCache.clear();
+    }
+    /** Clear the permission cache */
+    static clearPermissionCache() {
+      PathEvent.permissionCache.clear();
+    }
+    /**
+     * Score a path for specificity ranking (lower = more specific = higher priority)
+     * @private
+     */
+    static scoreSpecificity(path) {
+      if (path === "**" || path === "") return Number.MAX_SAFE_INTEGER;
+      const segments = path.split("/").filter((p) => !!p);
+      let score = -segments.length;
+      segments.forEach((seg) => {
+        if (seg === "**") score += 0.5;
+        else if (seg === "*") score += 0.25;
+      });
+      return score;
+    }
+    /**
+     * Check if a path matches a glob pattern
+     * @private
+     */
+    static pathMatchesGlob(path, pattern) {
+      if (pattern === path) return true;
+      const pathParts = path.split("/").filter((p) => !!p);
+      const patternParts = pattern.split("/").filter((p) => !!p);
+      let pathIdx = 0;
+      let patternIdx = 0;
+      while (patternIdx < patternParts.length && pathIdx < pathParts.length) {
+        const patternPart = patternParts[patternIdx];
+        if (patternPart === "**") {
+          if (patternIdx === patternParts.length - 1) {
+            return true;
+          }
+          patternParts[patternIdx + 1];
+          while (pathIdx < pathParts.length) {
+            if (PathEvent.pathMatchesGlob(pathParts.slice(pathIdx).join("/"), patternParts.slice(patternIdx + 1).join("/"))) {
+              return true;
+            }
+            pathIdx++;
+          }
+          return false;
+        } else if (patternPart === "*") {
+          pathIdx++;
+          patternIdx++;
+        } else {
+          if (patternPart !== pathParts[pathIdx]) {
+            return false;
+          }
+          pathIdx++;
+          patternIdx++;
+        }
+      }
+      if (patternIdx < patternParts.length) {
+        return patternParts.slice(patternIdx).every((p) => p === "**");
+      }
+      return pathIdx === pathParts.length;
     }
     /**
      * Combine multiple events into one parsed object. Longest path takes precedent, but all subsequent methods are
@@ -1999,38 +2059,58 @@ ${opts.message || this.desc}`;
      * @return {PathEvent} Final combined permission
      */
     static combine(...paths) {
-      let hitNone = false;
-      const combined = paths.map((p) => p instanceof _PathEvent ? p : new _PathEvent(p)).toSorted((p1, p2) => {
-        const l1 = p1.fullPath.length, l2 = p2.fullPath.length;
-        return l1 < l2 ? 1 : l1 > l2 ? -1 : 0;
-      }).reduce((acc, p) => {
-        if (acc && !acc.fullPath.startsWith(p.fullPath)) return acc;
-        if (p.none) hitNone = true;
-        if (!acc) return p;
-        if (hitNone) return acc;
-        acc.methods = new ASet([...acc.methods, ...p.methods]);
-        return acc;
-      }, null);
-      return combined;
+      const parsed = paths.map((p) => p instanceof PathEvent ? p : new PathEvent(p));
+      const sorted = parsed.toSorted((p1, p2) => {
+        const score1 = PathEvent.scoreSpecificity(p1.fullPath);
+        const score2 = PathEvent.scoreSpecificity(p2.fullPath);
+        return score1 - score2;
+      });
+      let result = null;
+      for (const p of sorted) {
+        if (!result) {
+          result = p;
+        } else {
+          if (result.fullPath.startsWith(p.fullPath)) {
+            if (p.none) {
+              break;
+            }
+            result.methods = new ASet([...result.methods, ...p.methods]);
+          }
+        }
+      }
+      return result || new PathEvent("");
     }
     /**
      * Filter a set of paths based on the target
      *
      * @param {string | PathEvent | (string | PathEvent)[]} target Array of events that will filtered
-     * @param filter {...PathEvent} Must container one of
-     * @return {boolean} Whether there is any overlap
+     * @param filter {...PathEvent} Must contain one of
+     * @return {PathEvent[]} Filtered results
      */
     static filter(target, ...filter) {
-      const parsedTarget = makeArray(target).map((pe) => pe instanceof _PathEvent ? pe : new _PathEvent(pe));
-      const parsedFilter = makeArray(filter).map((pe) => pe instanceof _PathEvent ? pe : new _PathEvent(pe));
-      return parsedTarget.filter((t) => !!parsedFilter.find((r) => {
-        const wildcard = r.fullPath == "*" || t.fullPath == "*";
-        const p1 = r.fullPath.includes("*") ? r.fullPath.slice(0, r.fullPath.indexOf("*")) : r.fullPath;
-        const p2 = t.fullPath.includes("*") ? t.fullPath.slice(0, t.fullPath.indexOf("*")) : t.fullPath;
-        const scope = p1.startsWith(p2) || p2.startsWith(p1);
-        const methods = r.all || t.all || r.methods.intersection(t.methods).length;
-        return (wildcard || scope) && methods;
-      }));
+      const parsedTarget = makeArray(target).map((pe) => pe instanceof PathEvent ? pe : new PathEvent(pe));
+      const parsedFilter = makeArray(filter).map((pe) => pe instanceof PathEvent ? pe : new PathEvent(pe));
+      return parsedTarget.filter((t) => {
+        const combined = PathEvent.combine(t);
+        return !!parsedFilter.find((r) => PathEvent.matches(r, combined));
+      });
+    }
+    /**
+     * Check if a filter pattern matches a target path
+     * @private
+     */
+    static matches(pattern, target) {
+      if (pattern.fullPath === "" || target.fullPath === "") return false;
+      if (pattern.fullPath === "*" || target.fullPath === "*") return pattern.methods.has("*") || target.methods.has("*") || pattern.methods.intersection(target.methods).length > 0;
+      const methodsMatch = pattern.all || target.all || pattern.methods.intersection(target.methods).length > 0;
+      if (!methodsMatch) return false;
+      if (!pattern.hasGlob && !target.hasGlob) {
+        return pattern.fullPath === target.fullPath;
+      }
+      if (pattern.hasGlob) {
+        return this.pathMatchesGlob(target.fullPath, pattern.fullPath);
+      }
+      return this.pathMatchesGlob(pattern.fullPath, target.fullPath);
     }
     /**
      * Squash 2 sets of paths & return true if any overlap is found
@@ -2040,44 +2120,38 @@ ${opts.message || this.desc}`;
      * @return {boolean} Whether there is any overlap
      */
     static has(target, ...has) {
-      const parsedTarget = makeArray(target).map((pe) => pe instanceof _PathEvent ? pe : new _PathEvent(pe));
-      const parsedRequired = makeArray(has).map((pe) => pe instanceof _PathEvent ? pe : new _PathEvent(pe));
-      return !!parsedRequired.find((r) => !!parsedTarget.find((t) => {
-        const wildcard = r.fullPath == "*" || t.fullPath == "*";
-        const p1 = r.fullPath.includes("*") ? r.fullPath.slice(0, r.fullPath.indexOf("*")) : r.fullPath;
-        const p2 = t.fullPath.includes("*") ? t.fullPath.slice(0, t.fullPath.indexOf("*")) : t.fullPath;
-        const scope = p1.startsWith(p2);
-        const methods = r.all || t.all || r.methods.intersection(t.methods).length;
-        return (wildcard || scope) && methods;
-      }));
+      const parsedTarget = makeArray(target).map((pe) => pe instanceof PathEvent ? pe : new PathEvent(pe));
+      const parsedRequired = makeArray(has).map((pe) => pe instanceof PathEvent ? pe : new PathEvent(pe));
+      const effectiveTarget = parsedTarget.length === 1 ? parsedTarget[0] : PathEvent.combine(...parsedTarget);
+      return !!parsedRequired.find((r) => PathEvent.matches(r, effectiveTarget));
     }
     /**
      * Squash 2 sets of paths & return true if the target has all paths
      *
      * @param {string | PathEvent | (string | PathEvent)[]} target Array of Events as strings or pre-parsed
      * @param has Target must have all these paths
-     * @return {boolean} Whether there is any overlap
+     * @return {boolean} Whether all are present
      */
     static hasAll(target, ...has) {
-      return has.filter((h) => _PathEvent.has(target, h)).length == has.length;
+      return has.filter((h) => PathEvent.has(target, h)).length == has.length;
     }
     /**
      * Same as `has` but raises an error if there is no overlap
      *
-     * @param {string | string[]} target Array of Events as strings or pre-parsed
+     * @param {string | PathEvent | (string | PathEvent)[]} target Array of Events as strings or pre-parsed
      * @param has Target must have at least one of these path
      */
     static hasFatal(target, ...has) {
-      if (!_PathEvent.has(target, ...has)) throw new PathError(`Requires one of: ${makeArray(has).join(", ")}`);
+      if (!PathEvent.has(target, ...has)) throw new PathError(`Requires one of: ${makeArray(has).join(", ")}`);
     }
     /**
      * Same as `hasAll` but raises an error if the target is missing any paths
      *
-     * @param {string | string[]} target Array of Events as strings or pre-parsed
+     * @param {string | PathEvent | (string | PathEvent)[]} target Array of Events as strings or pre-parsed
      * @param has Target must have all these paths
      */
     static hasAllFatal(target, ...has) {
-      if (!_PathEvent.hasAll(target, ...has)) throw new PathError(`Requires all: ${makeArray(has).join(", ")}`);
+      if (!PathEvent.hasAll(target, ...has)) throw new PathError(`Requires all: ${makeArray(has).join(", ")}`);
     }
     /**
      * Create event string from its components
@@ -2088,8 +2162,8 @@ ${opts.message || this.desc}`;
      */
     static toString(path, methods) {
       let p = makeArray(path).filter((p2) => !!p2).join("/");
-      p = p == null ? void 0 : p.trim().replaceAll(/\/{2,}/g, "/").replaceAll(/(^\/|\/$)/g, "");
-      if (methods == null ? void 0 : methods.length) p += `:${makeArray(methods).map((m) => m.toLowerCase()).join("")}`;
+      p = p?.trim().replaceAll(/\/{2,}/g, "/").replaceAll(/(^\/|\/$)/g, "");
+      if (methods?.length) p += `:${makeArray(methods).map((m) => m.toLowerCase()).join("")}`;
       return p;
     }
     /**
@@ -2099,16 +2173,16 @@ ${opts.message || this.desc}`;
      * @return {boolean} Whether there is any overlap
      */
     has(...has) {
-      return _PathEvent.has(this, ...has);
+      return PathEvent.has(this, ...has);
     }
     /**
      * Squash 2 sets of paths & return true if the target has all paths
      *
      * @param has Target must have all these paths
-     * @return {boolean} Whether there is any overlap
+     * @return {boolean} Whether all are present
      */
     hasAll(...has) {
-      return _PathEvent.hasAll(this, ...has);
+      return PathEvent.hasAll(this, ...has);
     }
     /**
      * Same as `has` but raises an error if there is no overlap
@@ -2116,7 +2190,7 @@ ${opts.message || this.desc}`;
      * @param has Target must have at least one of these path
      */
     hasFatal(...has) {
-      return _PathEvent.hasFatal(this, ...has);
+      return PathEvent.hasFatal(this, ...has);
     }
     /**
      * Same as `hasAll` but raises an error if the target is missing any paths
@@ -2124,16 +2198,16 @@ ${opts.message || this.desc}`;
      * @param has Target must have all these paths
      */
     hasAllFatal(...has) {
-      return _PathEvent.hasAllFatal(this, ...has);
+      return PathEvent.hasAllFatal(this, ...has);
     }
     /**
      * Filter a set of paths based on this event
      *
      * @param {string | PathEvent | (string | PathEvent)[]} target Array of events that will filtered
-     * @return {boolean} Whether there is any overlap
+     * @return {PathEvent[]} Filtered results
      */
     filter(target) {
-      return _PathEvent.filter(target, this);
+      return PathEvent.filter(target, this);
     }
     /**
      * Create event string from its components
@@ -2141,29 +2215,37 @@ ${opts.message || this.desc}`;
      * @return {string} String representation of Event
      */
     toString() {
-      return _PathEvent.toString(this.fullPath, this.methods);
+      return PathEvent.toString(this.fullPath, this.methods);
     }
-  };
-  /** Internal cache for PathEvent instances to avoid redundant parsing */
-  __publicField(_PathEvent, "pathEventCache", /* @__PURE__ */ new Map());
-  let PathEvent = _PathEvent;
+  }
   class PathEventEmitter {
     constructor(prefix = "") {
-      __publicField(this, "listeners", []);
       this.prefix = prefix;
     }
+    listeners = [];
     emit(event, ...args) {
       const parsed = event instanceof PathEvent ? event : new PathEvent(`${this.prefix}/${event}`);
-      this.listeners.filter((l) => PathEvent.has(l[0], parsed)).forEach(async (l) => l[1](parsed, ...args));
+      this.listeners.filter((l) => PathEvent.has(l[0], parsed)).forEach((l) => l[1](parsed, ...args));
     }
     off(listener) {
       this.listeners = this.listeners.filter((l) => l[1] != listener);
     }
     on(event, listener) {
       makeArray(event).forEach((e) => {
-        if (typeof e == "string" && e[0] == "*" && this.prefix) e = e.slice(1);
+        let fullEvent;
+        if (typeof e === "string") {
+          if (e[0] === ":" && this.prefix) {
+            fullEvent = `${this.prefix}${e}`;
+          } else if (this.prefix) {
+            fullEvent = `${this.prefix}/${e}`;
+          } else {
+            fullEvent = e;
+          }
+        } else {
+          fullEvent = e instanceof PathEvent ? PathEvent.toString(e.fullPath, e.methods) : e;
+        }
         this.listeners.push([
-          e instanceof PathEvent ? e : new PathEvent(`${this.prefix}/${e}`),
+          new PathEvent(fullEvent),
           listener
         ]);
       });
@@ -2179,7 +2261,7 @@ ${opts.message || this.desc}`;
       });
     }
     relayEvents(emitter) {
-      emitter.on("*", (event, ...args) => this.emit(event, ...args));
+      emitter.on("**", (event, ...args) => this.emit(event, ...args));
     }
   }
   function search(rows, search2, regex, transform = (r) => r) {
@@ -2209,9 +2291,9 @@ ${opts.message || this.desc}`;
         case "!=":
           return a != b;
         case "+=":
-          return a == null ? void 0 : a.toString().includes(b);
+          return a?.toString().includes(b);
         case "-=":
-          return !(a == null ? void 0 : a.toString().includes(b));
+          return !a?.toString().includes(b);
         case ">":
           return a > b;
         case ">=":
@@ -2239,176 +2321,193 @@ ${opts.message || this.desc}`;
       }).length == and.length;
     });
   }
-  var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
   var dist = {};
-  var persist$1 = {};
-  Object.defineProperty(persist$1, "__esModule", { value: true });
-  persist$1.persist = persist$1.Persist = void 0;
-  class Persist {
-    /**
-     * @param {string} key Primary key value will be stored under
-     * @param {PersistOptions<T>} options Configure using {@link PersistOptions}
-     */
-    constructor(key, options = {}) {
-      __publicField(this, "key");
-      __publicField(this, "options");
+  var persist = {};
+  var hasRequiredPersist;
+  function requirePersist() {
+    if (hasRequiredPersist) return persist;
+    hasRequiredPersist = 1;
+    Object.defineProperty(persist, "__esModule", { value: true });
+    persist.persist = persist.Persist = void 0;
+    class Persist {
+      key;
+      options;
       /** Backend service to store data, must implement `Storage` interface */
-      __publicField(this, "storage");
+      storage;
       /** Listeners which should be notified on changes */
-      __publicField(this, "watches", {});
+      watches = {};
       /** Private value field */
-      __publicField(this, "_value");
-      this.key = key;
-      this.options = options;
-      this.storage = options.storage || localStorage;
-      this.load();
-    }
-    /** Current value or default if undefined */
-    get value() {
-      var _a;
-      return this._value !== void 0 ? this._value : (_a = this.options) == null ? void 0 : _a.default;
-    }
-    /** Set value with proxy object wrapper to sync future changes */
-    set value(v) {
-      if (v == null || typeof v != "object")
-        this._value = v;
-      else
-        this._value = new Proxy(v, {
-          get: (target, p) => {
-            const f = typeof target[p] == "function";
-            if (!f)
-              return target[p];
-            return (...args) => {
-              const value = target[p](...args);
+      _value;
+      /** Current value or default if undefined */
+      get value() {
+        return this._value !== void 0 ? this._value : this.options?.default;
+      }
+      /** Set value with proxy object wrapper to sync future changes */
+      set value(v) {
+        if (v == null || typeof v != "object")
+          this._value = v;
+        else
+          this._value = new Proxy(v, {
+            get: (target, p) => {
+              const f = typeof target[p] == "function";
+              if (!f)
+                return target[p];
+              return (...args) => {
+                const value = target[p](...args);
+                this.save();
+                return value;
+              };
+            },
+            set: (target, p, newValue) => {
+              target[p] = newValue;
               this.save();
-              return value;
-            };
+              return true;
+            }
+          });
+        this.save();
+      }
+      /**
+       * @param {string} key Primary key value will be stored under
+       * @param {PersistOptions<T>} options Configure using {@link PersistOptions}
+       */
+      constructor(key, options = {}) {
+        this.key = key;
+        this.options = options;
+        this.storage = options.storage || localStorage;
+        this.load();
+      }
+      /** Notify listeners of change */
+      notify(value) {
+        Object.values(this.watches).forEach((watch) => watch(value));
+      }
+      /** Delete value from storage */
+      clear() {
+        this.storage.removeItem(this.key);
+      }
+      /** Save current value to storage */
+      save() {
+        if (this._value === void 0)
+          this.clear();
+        else
+          this.storage.setItem(this.key, JSON.stringify(this._value));
+        this.notify(this.value);
+      }
+      /** Load value from storage */
+      load() {
+        if (this.storage[this.key] != void 0) {
+          let value = JSON.parse(this.storage.getItem(this.key));
+          if (value != null && typeof value == "object" && this.options.type)
+            value.__proto__ = this.options.type.prototype;
+          this.value = value;
+        } else
+          this.value = this.options.default || void 0;
+      }
+      /**
+       * Callback function which is run when there are changes
+       *
+       * @param {(value: T) => any} fn Callback will run on each change; it's passed the next value & it's return is ignored
+       * @returns {() => void} Function which will unsubscribe the watch/callback when called
+       */
+      watch(fn2) {
+        const index = Object.keys(this.watches).length;
+        this.watches[index] = fn2;
+        return () => {
+          delete this.watches[index];
+        };
+      }
+      /**
+       * Return value as JSON string
+       *
+       * @returns {string} Stringified object as JSON
+       */
+      toString() {
+        return JSON.stringify(this.value);
+      }
+      /**
+       * Return current value
+       *
+       * @returns {T} Current value
+       */
+      valueOf() {
+        return this.value;
+      }
+    }
+    persist.Persist = Persist;
+    function persist$1(options) {
+      return (target, prop) => {
+        const key = options?.key || `${target.constructor.name}.${prop.toString()}`;
+        const wrapper = new Persist(key, options);
+        Object.defineProperty(target, prop, {
+          get: function() {
+            return wrapper.value;
           },
-          set: (target, p, newValue) => {
-            target[p] = newValue;
-            this.save();
-            return true;
+          set: function(v) {
+            wrapper.value = v;
           }
         });
-      this.save();
-    }
-    /** Notify listeners of change */
-    notify(value) {
-      Object.values(this.watches).forEach((watch) => watch(value));
-    }
-    /** Delete value from storage */
-    clear() {
-      this.storage.removeItem(this.key);
-    }
-    /** Save current value to storage */
-    save() {
-      if (this._value === void 0)
-        this.clear();
-      else
-        this.storage.setItem(this.key, JSON.stringify(this._value));
-      this.notify(this.value);
-    }
-    /** Load value from storage */
-    load() {
-      if (this.storage[this.key] != void 0) {
-        let value = JSON.parse(this.storage.getItem(this.key));
-        if (value != null && typeof value == "object" && this.options.type)
-          value.__proto__ = this.options.type.prototype;
-        this.value = value;
-      } else
-        this.value = this.options.default || void 0;
-    }
-    /**
-     * Callback function which is run when there are changes
-     *
-     * @param {(value: T) => any} fn Callback will run on each change; it's passed the next value & it's return is ignored
-     * @returns {() => void} Function which will unsubscribe the watch/callback when called
-     */
-    watch(fn2) {
-      const index = Object.keys(this.watches).length;
-      this.watches[index] = fn2;
-      return () => {
-        delete this.watches[index];
       };
     }
-    /**
-     * Return value as JSON string
-     *
-     * @returns {string} Stringified object as JSON
-     */
-    toString() {
-      return JSON.stringify(this.value);
-    }
-    /**
-     * Return current value
-     *
-     * @returns {T} Current value
-     */
-    valueOf() {
-      return this.value;
-    }
-  }
-  persist$1.Persist = Persist;
-  function persist(options) {
-    return (target, prop) => {
-      const key = (options == null ? void 0 : options.key) || `${target.constructor.name}.${prop.toString()}`;
-      const wrapper = new Persist(key, options);
-      Object.defineProperty(target, prop, {
-        get: function() {
-          return wrapper.value;
-        },
-        set: function(v) {
-          wrapper.value = v;
-        }
-      });
-    };
+    persist.persist = persist$1;
+    return persist;
   }
-  persist$1.persist = persist;
   var memoryStorage = {};
-  Object.defineProperty(memoryStorage, "__esModule", { value: true });
-  memoryStorage.MemoryStorage = void 0;
-  class MemoryStorage {
-    get length() {
-      return Object.keys(this).length;
-    }
-    clear() {
-      Object.keys(this).forEach((k) => this.removeItem(k));
-    }
-    getItem(key) {
-      return this[key];
-    }
-    key(index) {
-      return Object.keys(this)[index];
-    }
-    removeItem(key) {
-      delete this[key];
-    }
-    setItem(key, value) {
-      this[key] = value;
+  var hasRequiredMemoryStorage;
+  function requireMemoryStorage() {
+    if (hasRequiredMemoryStorage) return memoryStorage;
+    hasRequiredMemoryStorage = 1;
+    Object.defineProperty(memoryStorage, "__esModule", { value: true });
+    memoryStorage.MemoryStorage = void 0;
+    class MemoryStorage {
+      get length() {
+        return Object.keys(this).length;
+      }
+      clear() {
+        Object.keys(this).forEach((k) => this.removeItem(k));
+      }
+      getItem(key) {
+        return this[key];
+      }
+      key(index) {
+        return Object.keys(this)[index];
+      }
+      removeItem(key) {
+        delete this[key];
+      }
+      setItem(key, value) {
+        this[key] = value;
+      }
     }
+    memoryStorage.MemoryStorage = MemoryStorage;
+    return memoryStorage;
+  }
+  var hasRequiredDist;
+  function requireDist() {
+    if (hasRequiredDist) return dist;
+    hasRequiredDist = 1;
+    (function(exports$1) {
+      var __createBinding = dist && dist.__createBinding || (Object.create ? (function(o, m, k, k2) {
+        if (k2 === void 0) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+          desc = { enumerable: true, get: function() {
+            return m[k];
+          } };
+        }
+        Object.defineProperty(o, k2, desc);
+      }) : (function(o, m, k, k2) {
+        if (k2 === void 0) k2 = k;
+        o[k2] = m[k];
+      }));
+      var __exportStar = dist && dist.__exportStar || function(m, exports$12) {
+        for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$12, p)) __createBinding(exports$12, m, p);
+      };
+      Object.defineProperty(exports$1, "__esModule", { value: true });
+      __exportStar(requirePersist(), exports$1);
+      __exportStar(requireMemoryStorage(), exports$1);
+    })(dist);
+    return dist;
   }
-  memoryStorage.MemoryStorage = MemoryStorage;
-  (function(exports$1) {
-    var __createBinding = commonjsGlobal && commonjsGlobal.__createBinding || (Object.create ? function(o, m, k, k2) {
-      if (k2 === void 0) k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
-    } : function(o, m, k, k2) {
-      if (k2 === void 0) k2 = k;
-      o[k2] = m[k];
-    });
-    var __exportStar = commonjsGlobal && commonjsGlobal.__exportStar || function(m, exports$12) {
-      for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$12, p)) __createBinding(exports$12, m, p);
-    };
-    Object.defineProperty(exports$1, "__esModule", { value: true });
-    __exportStar(persist$1, exports$1);
-    __exportStar(memoryStorage, exports$1);
-  })(dist);
+  requireDist();
   exports2.ASet = ASet;
   exports2.ArgParser = ArgParser;
   exports2.BadGatewayError = BadGatewayError;
@@ -2521,5 +2620,5 @@ ${opts.message || this.desc}`;
   exports2.validateEmail = validateEmail;
   exports2.wordSegments = wordSegments;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
-});
+}));
 //# sourceMappingURL=index.cjs.map