@ztimson/momentum 0.44.0 → 0.45.1

package/dist/index.cjs

@@ -744,94 +744,165 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     };
     Object.defineProperty(r, "__esModule", { value: true }), e(S, r), e(L, r);
   })(xt);
-  function combinePathedEvents(...paths) {
-    let hitNone = false;
-    const combined = paths.map((p2) => typeof p2 == "string" ? parsePathedEvent(p2) : p2).toSorted((p1, p2) => {
-      const l1 = p1.fullPath.length, l2 = p2.fullPath.length;
-      return l1 < l2 ? 1 : l1 > l2 ? -1 : 0;
-    }).reduce((acc, p2) => {
-      if (p2.none) hitNone = true;
-      if (!acc) return p2;
-      if (hitNone) return acc;
-      if (p2.all) acc.all = true;
-      if (p2.all || p2.create) acc.create = true;
-      if (p2.all || p2.read) acc.read = true;
-      if (p2.all || p2.update) acc.update = true;
-      if (p2.all || p2.delete) acc.delete = true;
-      if (p2.all || p2.execute) acc.execute = true;
-      acc.methods = [...acc.methods, ...p2.methods];
-      return acc;
-    }, null);
-    if (combined.all) combined.methods = ["*"];
-    if (combined.none) combined.methods = ["n"];
-    combined.methods = new B(combined.methods);
-    combined.full = pathedEvent(combined.fullPath, ...combined.methods);
-    return combined;
-  }
-  function hasPath(target, ...anyPath) {
-    const parsedRequired = anyPath.map(parsePathedEvent);
-    const parsedTarget = ft(target).map(parsePathedEvent);
-    return !!parsedRequired.find((r) => {
-      if (r.all) return true;
-      const filtered = parsedTarget.filter((p2) => r.fullPath.startsWith(p2.fullPath));
-      if (!filtered.length) return false;
-      const combined = combinePathedEvents(...filtered);
-      return !combined.none && (combined.all || new B(combined.methods).intersection(new B(r.methods)).length);
-    });
-  }
-  function hasPathFatal(target, ...paths) {
-    if (!hasPath(target, ...paths)) throw new Error(`Missing permission: ${paths.join(", ")}`);
+  function PE(str, ...args) {
+    const combined = [];
+    for (let i = 0; i < str.length || i < args.length; i++) {
+      if (str[i]) combined.push(str[i]);
+      if (args[i]) combined.push(args[i]);
+    }
+    return new PathEvent(combined.join(""));
   }
-  function pathedEvent(path, ...methods) {
-    var _a;
-    let p2 = ft(path).map((p22) => p22 == null ? void 0 : p22.toString()).filter((p22) => !!p22).map((p22) => p22 == null ? void 0 : p22.replaceAll(/(^\/|\/$)/g, "")).join("/");
-    if (methods.length) p2 += `:${methods.join("")}`;
-    return (_a = p2 == null ? void 0 : p2.replaceAll("//", "/")) == null ? void 0 : _a.trim();
+  function PES(str, ...args) {
+    let combined = [];
+    for (let i = 0; i < str.length || i < args.length; i++) {
+      if (str[i]) combined.push(str[i]);
+      if (args[i]) combined.push(args[i]);
+    }
+    const [paths, methods] = combined.join("").split(":");
+    return PathEvent.toString(paths, methods == null ? void 0 : methods.split(""));
   }
-  function parsePathedEvent(path) {
-    var _a;
-    if (typeof path == "object") return path;
-    let [p2, scope, method] = path.split(":");
-    if (!method) method = scope || "*";
-    if (p2 == "*" || !p2 && method == "*") {
-      p2 = "";
-      method = "*";
-    }
-    let temp = p2.split("/").filter((p22) => !!p22);
-    return {
-      full: path,
-      module: ((_a = temp.splice(0, 1)[0]) == null ? void 0 : _a.toLowerCase()) || "",
-      fullPath: p2,
-      path: temp.join("/"),
-      methods: method.split(""),
-      all: method == null ? void 0 : method.includes("*"),
-      none: method == null ? void 0 : method.includes("n"),
-      create: !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("w")) || (method == null ? void 0 : method.includes("c"))),
-      read: !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("r"))),
-      update: !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("w")) || (method == null ? void 0 : method.includes("u"))),
-      delete: !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("w")) || (method == null ? void 0 : method.includes("d"))),
-      execute: !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("x")))
-    };
+  class PathEvent {
+    constructor(pathedEvent) {
+      /** 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");
+      /** All/Wildcard specified */
+      __publicField(this, "all");
+      /** None specified */
+      __publicField(this, "none");
+      /** Create method specified */
+      __publicField(this, "create");
+      /** Read method specified */
+      __publicField(this, "read");
+      /** Update method specified */
+      __publicField(this, "update");
+      /** Delete method specified */
+      __publicField(this, "delete");
+      var _a;
+      if (typeof pathedEvent == "object") return Object.assign(this, pathedEvent);
+      let [p2, scope, method] = pathedEvent.split(":");
+      if (!method) method = scope || "*";
+      if (p2 == "*" || !p2 && method == "*") {
+        p2 = "";
+        method = "*";
+      }
+      let temp = p2.split("/").filter((p22) => !!p22);
+      this.module = ((_a = temp.splice(0, 1)[0]) == null ? void 0 : _a.toLowerCase()) || "";
+      this.fullPath = p2;
+      this.path = temp.join("/");
+      this.name = temp.pop() || "";
+      this.methods = method.split("");
+      this.all = method == null ? void 0 : method.includes("*");
+      this.none = method == null ? void 0 : method.includes("n");
+      this.create = !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("w")) || (method == null ? void 0 : method.includes("c")));
+      this.read = !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("r")));
+      this.update = !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("w")) || (method == null ? void 0 : method.includes("u")));
+      this.delete = !(method == null ? void 0 : method.includes("n")) && ((method == null ? void 0 : method.includes("*")) || (method == null ? void 0 : method.includes("w")) || (method == null ? void 0 : method.includes("d")));
+    }
+    /**
+     * Combine multiple pathed events into one parsed object. Longest path takes precedent, but all subsequent methods are
+     * combined until a "none" is reached
+     *
+     * @param {string | PathEvent} paths PathedEvents as strings or pre-parsed
+     * @return {PathEvent} Final combined permission
+     */
+    static combine(paths) {
+      let hitNone = false;
+      const combined = paths.map((p2) => new PathEvent(p2)).toSorted((p1, p2) => {
+        const l1 = p1.fullPath.length, l2 = p2.fullPath.length;
+        return l1 < l2 ? 1 : l1 > l2 ? -1 : 0;
+      }).reduce((acc, p2) => {
+        if (p2.none) hitNone = true;
+        if (!acc) return p2;
+        if (hitNone) return acc;
+        if (p2.all) acc.all = true;
+        if (p2.all || p2.create) acc.create = true;
+        if (p2.all || p2.read) acc.read = true;
+        if (p2.all || p2.update) acc.update = true;
+        if (p2.all || p2.delete) acc.delete = true;
+        acc.methods = [...acc.methods, ...p2.methods];
+        return acc;
+      }, null);
+      if (combined.all) combined.methods = ["*"];
+      if (combined.none) combined.methods = ["n"];
+      combined.methods = new B(combined.methods);
+      combined.raw = PES`${combined.fullPath}:${combined.methods}`;
+      return combined;
+    }
+    /**
+     * Squash 2 sets of paths & return true if any overlap is found
+     *
+     * @param {string | PathEvent | (string | PathEvent)[]} target Array of PathedEvents as strings or pre-parsed
+     * @param has
+     * @return {boolean} Whether there is any overlap
+     */
+    static has(target, ...has) {
+      const parsedRequired = ft(has).map((pe) => new PathEvent(pe));
+      const parsedTarget = ft(target).map((pe) => new PathEvent(pe));
+      return !!parsedRequired.find((r) => {
+        if (!r.fullPath && r.all) return true;
+        const filtered = parsedTarget.filter((p2) => r.fullPath.startsWith(p2.fullPath));
+        if (!filtered.length) return false;
+        const combined = PathEvent.combine(filtered);
+        return !combined.none && (combined.all || new B(combined.methods).intersection(new B(r.methods)).length);
+      });
+    }
+    /**
+     * Same as `has` but raises an error if there is no overlap
+     *
+     * @param {string | string[]} target Array of PathedEvents as strings or pre-parsed
+     * @param has
+     */
+    static hasFatal(target, ...has) {
+      if (!PathEvent.has(target, ...has)) throw new Error(`Missing permission: ${ft(has).join(", ")}`);
+    }
+    /**
+     * Create pathed event string from its components
+     *
+     * @param {string | string[]} path Event path
+     * @param {Method} methods Event method
+     * @return {string} String representation of PathedEvent
+     */
+    static toString(path, methods) {
+      let p2 = ft(path).filter((p22) => p22 != null).join("/");
+      if (methods == null ? void 0 : methods.length) p2 += `:${ft(methods).map((m) => m.toLowerCase()).join("")}`;
+      return p2 == null ? void 0 : p2.trim().replaceAll(/\/{2,}/g, "/").replaceAll(/(^\/|\/$)/g, "");
+    }
+    /**
+     * Create pathed event string from its components
+     *
+     * @return {string} String representation of PathedEvent
+     */
+    toString() {
+      return PathEvent.toString(this.fullPath, this.methods);
+    }
   }
   class PathedEventEmitter {
     constructor() {
       __publicField(this, "listeners", []);
     }
     emit(event, ...args) {
-      const parsed = parsePathedEvent(event);
-      this.listeners.filter((l) => hasPath(l[0], event)).forEach((l) => l[1](parsed, ...args));
+      const parsed = new PathEvent(event);
+      this.listeners.filter((l) => PathEvent.has(l[0], event)).forEach((l) => l[1](parsed, ...args));
     }
     off(listener) {
       this.listeners = this.listeners.filter((l) => l[1] != listener);
     }
     on(event, listener) {
-      ft(event).forEach((e) => this.listeners.push([parsePathedEvent(e), listener]));
+      ft(event).forEach((e) => this.listeners.push([new PathEvent(e), listener]));
       return () => this.off(listener);
     }
     once(event, listener) {
       return new Promise((res) => {
         const unsubscribe = this.on(event, (event2, ...args) => {
-          res(args);
+          res(args.length < 2 ? args[0] : args);
           if (listener) listener(event2, ...args);
           unsubscribe();
         });
@@ -863,11 +934,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       if (token == this._token) return;
       this._token = token;
       this.headers["Authorization"] = token ? `Bearer ${token}` : null;
-      this.emit(pathedEvent("api/token", "u"), token);
+      this.emit(PES`api/token:${token ? "u" : "d"}`, token);
     }
     healthcheck() {
       return this.request({ url: "/api/healthcheck" }).then((resp) => {
-        this.emit(pathedEvent("api/healthcheck", "r"), resp);
+        this.emit(PES`api/healthcheck:r`, resp);
         return resp;
       });
     }
@@ -875,15 +946,15 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       const key = Lt(options);
       const method = options.method == "GET" ? "r" : options.method == "POST" ? "c" : options.method == "DELETE" ? "d" : "u";
       if (this.pending[key] != null) return this.pending[key];
-      this.pending[key] = super.request(options).then((resp) => {
-        this.emit(pathedEvent("api/response", method), resp, options);
-        return resp.data;
+      this.pending[key] = super.request(options).then((response) => {
+        this.emit(PES`api/response:${method}`, { request: options, response });
+        return response.data;
       }).catch((err) => {
         const e = (err == null ? void 0 : err.data) || err;
-        this.emit(pathedEvent("api/error", method), e, options);
+        this.emit(PES`api/error:${method}`, { request: options, error: e });
         throw e;
       }).finally(() => delete this.pending[key]);
-      this.emit(pathedEvent("api/request", method), this.pending[key], options);
+      this.emit(PES`api/request:${method}`, { request: options, response: this.pending[key] });
       return this.pending[key];
     }
   }
@@ -906,15 +977,15 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     delete(id) {
       if (!id) throw new Error("Cannot delete action, missing ID");
-      return this.api.request({ url: `/api/` + pathedEvent(["actions", id]), method: "DELETE" }).then(() => {
+      return this.api.request({ url: `/api/` + PES`actions/${id}`, method: "DELETE" }).then(() => {
         this.cache.delete(id);
-        this.emit(pathedEvent(["actions", id], "d"), id);
+        this.emit(PES`actions/${id}:d`, id);
       });
     }
     all() {
-      return this.api.request({ url: `/api/actions` }).then((resp) => {
+      return this.api.request({ url: `/api/` + PES`actions` }).then((resp) => {
         this.cache.addAll(resp);
-        this.emit(pathedEvent("actions", "r"), resp || []);
+        this.emit(PES`actions:r`, resp || []);
         return resp;
       });
     }
@@ -922,35 +993,29 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       if (!id) throw new Error("Cannot read action, missing ID");
       const cached = this.cache.get(id);
       if (!reload && cached) return Promise.resolve(cached);
-      return this.api.request({ url: `/api/` + pathedEvent(["actions", id]) }).then((action) => {
+      return this.api.request({ url: `/api/` + PES`actions/${id}` }).then((action) => {
         if (action) this.cache.add(action);
-        this.emit(pathedEvent(["actions", id], "r"), action);
+        this.emit(PES`actions/${id}:r`, action);
         return action;
       });
     }
     run(path, opts = {}) {
       if (!path) throw new Error("Cannot run action, missing path");
-      return this.api.request({ url: `/api/` + pathedEvent(["actions/run", path]), ...opts }).then((resp) => {
-        this.emit(pathedEvent(["actions/run", path], "x"), resp);
-        return resp;
-      });
+      return this.api.request({ url: `/api/` + PES`actions/run/${path}`, ...opts });
     }
     runById(action, opts = {}) {
       const id = typeof action == "string" ? action : action == null ? void 0 : action._id;
       if (!id) throw new Error("Cannot run action, missing ID");
-      return this.api.request({ url: "/api/" + pathedEvent(["actions/run-by-id", id]), method: "POST", ...opts }).then((resp) => {
-        this.emit(pathedEvent(["actions/run-by-id", id], "x"), resp);
-        return resp;
-      });
+      return this.api.request({ url: "/api/" + PES`actions/run-by-id/${id}`, method: "POST", ...opts });
     }
     update(action) {
       return this.api.request({
-        url: `/api/` + pathedEvent(["actions", action._id]),
+        url: `/api/` + PES`actions/${action._id}`,
         method: "POST",
         body: action
       }).then((action2) => {
         if (action2) this.cache.add(action2);
-        this.emit(pathedEvent(["actions", action2._id], "u"), action2);
+        this.emit(PES`actions/${action2._id}:u`, action2);
         return action2;
       });
     }
@@ -963,16 +1028,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     ask(question, context) {
       if (!question) throw new Error("Cannot ask AI, missing question");
-      return this.api.request({ url: `/api/ai`, method: "POST", body: {
+      return this.api.request({ url: `/api/` + PES`ai`, method: "POST", body: {
         question,
         context
-      } }).then((resp) => {
-        this.emit(pathedEvent("ai", "c"), question, context, resp);
-        return resp;
+      } }).then((response) => {
+        this.emit(PES`ai:c`, { question, context, response });
+        return response;
       });
     }
     clear() {
-      return this.api.request({ url: "/api/ai", method: "DELETE" }).then(() => this.emit(pathedEvent("ai", "d")));
+      return this.api.request({ url: "/api/" + PES`ai`, method: "DELETE" }).then(() => this.emit(PES`ai:d`, this.api.token));
     }
   }
   class Analytics extends PathedEventEmitter {
@@ -983,8 +1048,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     ipTrace(ip) {
       if (!ip) throw new Error("Cannot trace, missing IP");
-      return this.api.request({ url: `/api/analytics/trace?ip=${ip}` }).then((resp) => {
-        this.emit(pathedEvent("analytics/trace", "r"), ip, resp);
+      return this.api.request({ url: `/api/` + PES`analytics/trace/${ip}` }).then((resp) => {
+        this.emit(PES`analytics/trace/${ip}:r`, resp);
         return resp;
       });
     }
@@ -1030,11 +1095,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           "/api/auth/totp"
         ];
         if (resp.status == 401 && !blacklist.find((url) => resp.url.includes(url)))
-          this.emit(pathedEvent("auth/session-expired", "d"));
+          this.emit(PES`auth/session-expired:d`, this.api.token);
         next();
       });
       this.api.on("api/token", (event, token) => {
         var _a;
+        console.log("loading user...");
         if ((_a = this.opts) == null ? void 0 : _a.persist) {
           if (token) localStorage.setItem(this.storageKey, token);
           else localStorage.removeItem(this.storageKey);
@@ -1057,15 +1123,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     set user(user) {
       if (!A(this.user, user)) {
         this._user = user ? user : null;
-        this.emit(pathedEvent("auth/user", "u"), this._user);
+        this.emit(PES`auth/user:u`, this._user);
       }
     }
     knownHost(host = location.origin) {
       if (host.startsWith("/")) return Promise.resolve();
-      return this.api.request({ url: `/api/auth/known-host?host=${encodeURI(new URL(host).origin)}` }).then(() => this.emit(pathedEvent("auth/known-host", "r"), host, true)).catch((err) => {
-        this.emit(pathedEvent("auth/known-host", "r"), host, false);
-        throw err;
-      });
+      return this.api.request({ url: `/api/auth/known-host?host=${encodeURI(new URL(host).origin)}` });
     }
     login(username, password, totp) {
       if (!username || !password) throw new Error("Cannot login, missing username or password");
@@ -1081,7 +1144,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       }).then(async (resp) => {
         this.api.token = (resp == null ? void 0 : resp.token) || null;
         const user = await this.once("auth/user");
-        this.emit(pathedEvent(["auth/login", username], "x"), user);
+        this.emit(PES`auth/login/${username}:u`, user);
         return user;
       });
     }
@@ -1102,16 +1165,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       });
     }
     logout() {
+      this.emit(PES`auth/logout:d`, this.user);
       this.api.token = null;
       this.user = null;
-      this.emit(pathedEvent("auth/logout", "d"));
     }
     async register(u) {
       var _a;
       if (!u.username || !u.password) throw new Error("Cannot register user, missing username or password");
       const user = await this.api.request({ url: "/api/auth/register", body: { ...u } });
       if ((_a = user == null ? void 0 : user.image) == null ? void 0 : _a.startsWith("/")) user.image = `${this.api.url}${user.image}?token=${this.api.token}`;
-      this.emit(pathedEvent("auth/register", "c"), user);
+      this.emit(PES`auth/register:c`, user);
       return user;
     }
     reset(emailOrPass, token) {
@@ -1124,7 +1187,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           password: token ? emailOrPass : void 0
         }
       }).then(() => {
-        this.emit(pathedEvent("auth/reset", token ? "u" : "c"), token || emailOrPass);
+        this.emit(PES`auth/reset:${token ? "u" : "c"}`, token || emailOrPass);
       });
     }
     async session(token, set = false) {
@@ -1133,12 +1196,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         url: "/api/auth/session",
         headers: token ? { "Authorization": `Bearer ${token}` } : void 0
       });
-      this.emit(pathedEvent("auth/session", "r"), session);
+      this.emit(PES`auth/session:r`, session);
       if (set) {
         this.api.token = token;
         if (session == null ? void 0 : session.user) session.user.image = `${this.api.url}${session.user.image}?token=${this.api.token}`;
         this.user = (session == null ? void 0 : session.user) || null;
-        if (session) this.emit(pathedEvent("auth/login", "c"), session.user);
+        if (session) this.emit(PES`auth/login:c`, session.user);
       }
       return session;
     }
@@ -1148,7 +1211,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         url: "/api/auth/password",
         body: { username, password, oldPassword }
       }).then((resp) => {
-        this.emit(pathedEvent("auth/reset", "u"), resp == null ? void 0 : resp.token);
+        this.emit(PES`auth/reset:u`, resp == null ? void 0 : resp.token);
         if (resp == null ? void 0 : resp.token) this.api.token = resp.token;
       });
     }
@@ -1254,7 +1317,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           if (!dismissed && !this.pwa && this.mobile) this.pwaPrompt();
         }, 500);
       }
-      this.emit(pathedEvent("client/inject", "c"));
+      this.emit(PES`client/inject:c`, this.platform);
     }
     pwaPrompt(platform) {
       const url = this.settings.api.url;
@@ -1371,13 +1434,13 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         setTimeout(() => {
           prompt.remove();
           backdrop.remove();
-          this.emit(pathedEvent("client/pwa", "d"), platform);
+          this.emit(PES`client/pwa:d`, platform);
         }, 500);
       };
       prompt.append(close);
       backdrop.append(prompt);
       document.body.append(backdrop);
-      this.emit(pathedEvent("client/pwa", "c"), platform);
+      this.emit(PES`client/pwa:c`, platform);
     }
   }
   class Data extends PathedEventEmitter {
@@ -1389,18 +1452,18 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     create(collection, document2) {
       if (!collection || !document2) throw new Error("Cannot create document, missing collection or document");
       return this.api.request({
-        url: `/api/` + pathedEvent(["data", collection]),
+        url: `/api/` + PES`data/${collection}`,
         method: "POST",
         body: document2
       }).then((resp) => {
-        this.emit(pathedEvent(["data", collection], "c"), collection, resp);
+        this.emit(PES`data/${collection}:c`, resp);
         return resp;
       });
     }
     read(collection, id) {
       if (!collection) throw new Error("Cannot read documents, missing collection");
-      return this.api.request({ url: `/api/` + pathedEvent(["data", collection, id]) }).then((resp) => {
-        this.emit(pathedEvent(["data", collection, id], "r"), collection, resp);
+      return this.api.request({ url: `/api/` + PES`data/${collection}/${id}` }).then((resp) => {
+        this.emit(PES`data/${collection}/${id}:r`, collection, resp);
         return resp;
       });
     }
@@ -1408,43 +1471,43 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       if (!collection || !document2) throw new Error("Cannot update document, missing collection or document");
       if (!document2._id) return this.create(collection, document2);
       return this.api.request({
-        url: `/api/` + pathedEvent(["data", collection, document2._id]),
+        url: `/api/` + PES`data/${collection}/${document2._id}`,
         method: append ? "PATCH" : "PUT",
         body: document2
       }).then((resp) => {
-        this.emit(pathedEvent(["data", collection, document2._id], "u"), collection, resp);
+        this.emit(PES`data/${collection}/${document2._id}:u`, resp);
         return resp;
       });
     }
     delete(collection, id) {
       if (!collection || !id) throw new Error("Cannot delete document, missing collection or ID");
       return this.api.request({
-        url: `/api/` + pathedEvent(["data", collection, id]),
+        url: `/api/` + PES`data/${collection}/${id}`,
         method: "DELETE"
-      }).then(() => this.emit(pathedEvent(["data", collection, id], "d"), collection, id));
+      }).then(() => this.emit(PES`data/${collection}/${id}:d`, id));
     }
     raw(collection, query) {
       if (!collection || !query) throw new Error("Cannot execute raw query, missing collection or query");
       const mode = query.operand.startsWith("find") ? "r" : query.operand == "insert" ? "c" : query.operand.startsWith("delete") ? "d" : "u";
-      return this.api.request({ url: `/api/` + pathedEvent(["data/raw", collection]) + "?raw", body: query }).then((resp) => {
-        this.emit(pathedEvent(["data", collection], mode), collection, query, resp);
+      return this.api.request({ url: `/api/` + PES`data/${collection}` + "?raw", body: query }).then((resp) => {
+        this.emit(PES`data/${collection}:${mode}`, resp);
         return resp;
       });
     }
     deleteSchema(path) {
       if (!path) throw new Error("Cannot delete schema, missing collection path");
-      return this.api.request({ url: `/api/` + pathedEvent(["schema", path]), method: "DELETE" }).then(() => this.emit(pathedEvent(["schema", path], "d"), path));
+      return this.api.request({ url: `/api/` + PES`schema/${path}`, method: "DELETE" }).then(() => this.emit(PES`schema/${path}:d`, path));
     }
     getSchema(pathOrTree) {
-      return this.api.request({ url: "/api/" + pathedEvent(["schema", typeof pathOrTree == "string" ? pathOrTree : ""]) + (pathOrTree === true ? `?tree=${pathOrTree}` : "") }).then((resp) => {
-        this.emit(pathedEvent(["schema", typeof pathOrTree == "string" ? pathOrTree : ""], "r"), resp);
+      return this.api.request({ url: "/api/" + PES`schema/${typeof pathOrTree == "string" ? pathOrTree : ""}` + (pathOrTree === true ? `?tree=${pathOrTree}` : "") }).then((resp) => {
+        this.emit(PES`schema/${typeof pathOrTree == "string" ? pathOrTree : ""}:r`, resp);
         return resp;
       });
     }
     setSchema(schema) {
       if (!schema.path) throw new Error("Cannot update schema, missing collection path");
-      return this.api.request({ url: "/api/" + pathedEvent(["schema", schema.path]), body: schema }).then((resp) => {
-        this.emit(pathedEvent(["schema", schema.path], schema._id ? "u" : "c"), resp);
+      return this.api.request({ url: "/api/" + PES`schema/${schema.path}`, body: schema }).then((resp) => {
+        this.emit(PES`schema/${schema.path}:${schema._id ? "u" : "c"}`, resp);
         return resp;
       });
     }
@@ -1458,10 +1521,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     send(email) {
       var _a;
       if (!email.to && !email.bcc || !email.body) throw new Error("Cannot send email, missing address or body");
-      return this.api.request({ url: "/api/" + pathedEvent(["email", (_a = email.body) == null ? void 0 : _a.template]), body: email }).then((resp) => {
+      return this.api.request({ url: "/api/" + PES`email/${(_a = email.body) == null ? void 0 : _a.template}`, body: email }).then((response) => {
         var _a2;
-        this.emit(pathedEvent(["email", (_a2 = email.body) == null ? void 0 : _a2.template], "c"), email, resp);
-        return resp;
+        this.emit(PES`email/${(_a2 = email.body) == null ? void 0 : _a2.template}:c`, { email, response });
+        return response;
       });
     }
   }
@@ -1469,49 +1532,59 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     constructor(api) {
       super();
       __publicField(this, "api");
+      __publicField(this, "cache", new Dt("name"));
       this.api = typeof api == "string" ? new Api(api) : api;
     }
-    all() {
-      return this.api.request({ url: `/api/groups` }).then((resp) => {
-        this.emit(pathedEvent("groups", "r"), resp || []);
+    async all(reload) {
+      if (!reload && this.cache.complete) return this.cache.all();
+      return this.api.request({ url: `/api/` + PES`groups` }).then((resp) => {
+        this.cache.addAll(resp);
+        this.emit(PES`groups:r`, resp || []);
         return resp;
       });
     }
     create(group) {
       if (!group.name) throw new Error("Cannot create group, missing name");
       return this.api.request({
-        url: `/api/groups/${group.name}`,
+        url: `/api/` + PES`groups/${group.name}`,
         method: "POST",
         body: group
       }).then((resp) => {
-        this.emit(pathedEvent(["groups", group.name], "c"), resp);
+        this.cache.add(resp);
+        this.emit(PES`groups/${group.name}:c`, resp);
         return resp;
       });
     }
-    read(name) {
+    async read(name, reload) {
       if (!name) throw new Error("Cannot read group, missing name");
-      return this.api.request({ url: `/api/` + pathedEvent(["groups", name]) }).then((resp) => {
-        this.emit(pathedEvent(["groups", name], "r"), resp);
+      if (!reload && this.cache.get(name)) return this.cache.get(name);
+      return this.api.request({ url: `/api/` + PES`groups/${name}` }).then((resp) => {
+        this.cache.add(resp);
+        this.emit(PES`groups/${name}:r`, resp);
         return resp;
       });
     }
     update(group) {
       if (!group.name) throw new Error("Cannot update group, missing name");
       return this.api.request({
-        url: `/api/` + pathedEvent(["groups", group.name]),
+        url: `/api/` + PES`groups/${group.name}`,
         method: "PATCH",
         body: group
       }).then((resp) => {
-        this.emit(pathedEvent(["groups", group.name], "u"), resp);
+        this.cache.add(resp);
+        this.emit(PES`groups/${group.name}:u`, resp);
         return resp;
       });
     }
     delete(name) {
       if (!name) throw new Error("Cannot delete group, missing name");
       return this.api.request({
-        url: `/api/` + pathedEvent(["groups", name]),
+        url: `/api/` + PES`groups/${name}`,
         method: "DELETE"
-      }).then(() => this.emit(pathedEvent(["groups", name], "d")));
+      }).then(() => {
+        this.cache.delete(name);
+        this.emit(PES`groups/${name}:d`);
+      });
     }
   }
   class Logger extends PathedEventEmitter {
@@ -1550,11 +1623,11 @@ ${log}`;
       };
     }
     createLog(log, namespace = this.namespace) {
-      return this.api.request({ url: `/api/` + pathedEvent(["logs", namespace]), body: log }).then(() => this.emit(pathedEvent(["logs", namespace], "c"), log)).catch(() => {
+      return this.api.request({ url: `/api/` + PES`logs/${namespace}`, body: log }).then(() => this.emit(PES`logs/${namespace}:c`, log)).catch(() => {
       });
     }
     clearLogs(namespace = this.namespace) {
-      return this.api.request({ url: `/api/` + pathedEvent(["logs", namespace]), method: "DELETE" }).then(() => this.emit(pathedEvent(["logs", namespace], "d")));
+      return this.api.request({ url: `/api/` + PES`logs/${namespace}`, method: "DELETE" }).then(() => this.emit(PES`logs/${namespace}:d`));
     }
     clearServerLogs() {
       return this.clearLogs("server");
@@ -1562,8 +1635,8 @@ ${log}`;
     getLogs(length, page, namespace = this.namespace) {
       if (!namespace) throw new Error("Cannot get logs, missing namespace");
       const query = [length ? `length=${length}` : void 0, page ? `page=${page}` : void 0].filter((v) => !!v).join("&");
-      return this.api.request({ url: `/api/` + pathedEvent(["logs", namespace]) + (query ? `?${query}` : "") }).then((logs) => {
-        this.emit(pathedEvent(["logs", namespace], "r"), logs);
+      return this.api.request({ url: `/api/` + PES`logs/${namespace}` + (query ? `?${query}` : "") }).then((logs) => {
+        this.emit(PES`logs/${namespace}:r`, logs);
         return logs;
       });
     }
@@ -1609,7 +1682,7 @@ ${log}`;
         amount,
         custom
       } });
-      this.emit(pathedEvent("payments", "c"), amount, custom, request.data.clientSecret);
+      this.emit(PES`payments:c`, request.data.clientSecret);
       return request.data.clientSecret;
     }
     async createForm(element, amount, custom) {
@@ -1623,8 +1696,8 @@ ${log}`;
       });
     }
     async history(username) {
-      const history = await this.api.request({ url: `/api/` + pathedEvent("payments", username) });
-      this.emit(pathedEvent(["payments", username], "r"), username, history);
+      const history = await this.api.request({ url: `/api/` + PES`payments/${username}` });
+      this.emit(PES`payments/${username}:r`, history);
       return history;
     }
   }
@@ -1635,7 +1708,7 @@ ${log}`;
       this.api = typeof api == "string" ? new Api(api) : api;
     }
     createPdf(body, options) {
-      return this.api.request({ url: `/api/pdf`, body: { ...body, options }, decode: false }).then(async (resp) => {
+      return this.api.request({ url: `/api/` + PES`pdf`, body: { ...body, options }, decode: false }).then(async (resp) => {
         const blob = await resp.blob();
         if (options == null ? void 0 : options.download) {
           let filename = (options == null ? void 0 : options.filename) || qt();
@@ -1644,7 +1717,7 @@ ${log}`;
           dt(url, filename);
           URL.revokeObjectURL(url);
         }
-        this.emit(pathedEvent("pdf", "c"), body, options, blob);
+        this.emit(PES`pdf:c`, blob);
         return blob;
       });
     }
@@ -1716,54 +1789,54 @@ ${log}`;
     }
     copy(source, destination) {
       if (!source || !destination) throw new Error("Cannot copy file or folder, missing source or destination");
-      return this.api.request({ url: "/api/" + pathedEvent(["storage", destination]), body: { from: source } }).then((resp) => {
-        this.emit(pathedEvent(["storage", destination], "c"), source, destination, resp);
-        return resp;
+      return this.api.request({ url: "/api/" + PES`storage/${destination}`, body: { from: source } }).then((response) => {
+        this.emit(PES`storage/${destination}:c`, response);
+        return response;
       });
     }
     delete(path) {
       if (!path) throw new Error("Cannot delete file or folder, missing path");
-      return this.api.request({ url: "/api/" + pathedEvent(["storage", path]), method: "DELETE" }).then(() => {
-        this.emit(pathedEvent(["storage", path], "d"), path);
+      return this.api.request({ url: "/api/" + PES`storage/${path}`, method: "DELETE" }).then(() => {
+        this.emit(PES`storage/${path}:d`, path);
       });
     }
     download(path, opts = {}) {
       if (!path) throw new Error("Cannot download file, missing path");
-      return this.api.request({ ...opts, url: "/api/" + pathedEvent(["storage", path]), decode: false }).then(async (response) => {
+      return this.api.request({ ...opts, url: "/api/" + PES`storage/${path}`, decode: false }).then(async (response) => {
         const blob = await response.blob();
         const name = opts.downloadAs || path.split("/").pop();
-        this.emit(pathedEvent(["storage", path], "r"), path, blob);
+        this.emit(PES`storage/${path}:r`, blob);
         Gt(blob, name);
         return response;
       });
     }
     list(path) {
       if (!path) path = "/";
-      return this.api.request({ url: "/api/" + pathedEvent(["storage", path]) + "?list" }).then((resp) => {
-        this.emit(pathedEvent(["storage", path], "r"), path, resp);
+      return this.api.request({ url: "/api/" + PES`storage/${path}` + "?list" }).then((resp) => {
+        this.emit(PES`storage/${path}:r`, resp);
         return resp;
       });
     }
     open(path, target = "_blank") {
       if (!path) throw new Error("Cannot download file, missing path");
-      const link = `${this.api.url}/api/${pathedEvent(["storage", path])}${this.api.token ? `?token=${this.api.token}` : ""}`;
+      const link = `${this.api.url}/api/` + PES`storage/${path}` + (this.api.token ? `?token=${this.api.token}` : "");
       if (!target) return link;
-      this.emit(pathedEvent(["storage", path], "r"), path);
+      this.emit(PES`storage/${path}:r`, path);
       return window.open(link, target);
     }
     mkdir(path) {
       if (!path) throw new Error("Cannot make directory, missing path");
-      return this.api.request({ url: "/api/" + pathedEvent(["storage", path]), body: { directory: true } }).then((resp) => {
-        this.emit(pathedEvent(["storage", path], "c"), path, resp);
+      return this.api.request({ url: "/api/" + PES`storage/${path}`, body: { directory: true } }).then((resp) => {
+        this.emit(PES`storage/${path}:c`, resp);
         return resp;
       });
     }
     move(source, destination) {
       if (!source || !destination) throw new Error("Cannot move file or folder, missing source or destination");
       if (source == destination) return this.list(destination);
-      return this.api.request({ url: "/api/" + pathedEvent(["storage", source]), method: "PATCH", body: { move: destination } }).then((resp) => {
-        this.emit(pathedEvent(["storage", source], "u"), source, destination, resp);
-        return resp;
+      return this.api.request({ url: "/api/" + PES`storage/${source}`, method: "PATCH", body: { move: destination } }).then((response) => {
+        this.emit(PES`storage/${source}:u`, response);
+        return response;
       });
     }
     upload(files, opts) {
@@ -1772,13 +1845,13 @@ ${log}`;
         if (!files || Array.isArray(files) && !files.length) return [];
         const path = (opts && typeof opts == "object" ? opts == null ? void 0 : opts.path : opts) || "/";
         return Ft({
-          url: `${this.api.url}/api/${pathedEvent(["storage", path])}`,
+          url: `${this.api.url}/api/` + PES`storage/${path}`,
           files: ft(files),
           headers: this.api.headers
         }).onProgress((p2) => {
           prog(p2);
         }).then((resp) => {
-          this.emit(pathedEvent(["storage", path], "c"), resp);
+          this.emit(PES`storage/${path}:c`, resp);
           res(resp);
         }).catch((err) => rej(err));
       });
@@ -1791,44 +1864,44 @@ ${log}`;
       __publicField(this, "cache", new Dt("username"));
       this.api = typeof api == "string" ? new Api(api) : api;
     }
-    delete(username) {
-      if (!username) throw new Error("Cannot delete user, missing username");
-      return this.api.request({
-        url: "/api/" + pathedEvent(["users", username]),
-        method: "DELETE"
-      }).then(() => {
-        this.cache.delete(username);
-        this.emit(pathedEvent(["users", username], "d"), username);
-      });
-    }
-    async all(reload = false) {
+    async all(reload) {
       if (!reload && this.cache.complete) return this.cache.all();
-      return this.api.request({ url: "/api/" + pathedEvent("users") }).then((resp) => {
+      return this.api.request({ url: "/api/" + PES`users` }).then((resp) => {
         resp == null ? void 0 : resp.forEach((r) => {
           r.image = this.api.url + r.image + `?token=${this.api.token}`;
           return r;
         });
         this.cache.addAll(resp);
-        this.emit(pathedEvent("users", "r"), resp || []);
+        this.emit(PES`users:r`, resp || []);
         return resp;
       });
     }
-    async read(username, reload = false) {
+    delete(username) {
+      if (!username) throw new Error("Cannot delete user, missing username");
+      return this.api.request({
+        url: "/api/" + PES`users/${username}`,
+        method: "DELETE"
+      }).then(() => {
+        this.cache.delete(username);
+        this.emit(PES`users/${username}:d`, username);
+      });
+    }
+    async read(username, reload) {
       if (!username) throw new Error("Cannot read user, missing username");
       if (!reload && this.cache.get(username)) return this.cache.get(username);
-      return this.api.request({ url: "/api/" + pathedEvent(["users", username]) }).then((resp) => {
+      return this.api.request({ url: "/api/" + PES`users/${username}` }).then((resp) => {
         if (resp) {
           resp.image = this.api.url + resp.image + `?token=${this.api.token}`;
           this.cache.add(resp);
         }
-        this.emit(pathedEvent(["users", username], "r"), resp);
+        this.emit(PES`users/${username}:r`, resp);
         return resp;
       });
     }
     update(user) {
       if (!user.username) throw new Error("Cannot update user, missing username");
       return this.api.request({
-        url: `/api/` + pathedEvent(["users", user.username]),
+        url: `/api/` + PES`users/${user.username}`,
         method: "PATCH",
         body: user
       }).then((resp) => {
@@ -1836,19 +1909,16 @@ ${log}`;
           resp.image = this.api.url + resp.image + `?token=${this.api.token}`;
           this.cache.add(resp);
         }
-        this.emit(pathedEvent(["users", user.username], resp._id ? "u" : "c"), resp);
+        this.emit(PES`users/${user.username}:${resp._id ? "u" : "c"}`, resp);
         return resp;
       });
     }
     uploadImage(username, file) {
       if (!username || !file) throw new Error("Cannot update user image, missing username or file");
       return Ft({
-        url: this.api.url + `/api/` + pathedEvent(["users", username, "image"]),
+        url: this.api.url + `/api/` + PES`users/${username}/image`,
         files: [file],
         headers: this.api.headers
-      }).then((resp) => {
-        this.emit(pathedEvent(["users", username, "image"], "u"), username, file);
-        return resp;
       });
     }
   }
@@ -1861,33 +1931,33 @@ ${log}`;
     }
     async all(detailed = false, reload) {
       if (!reload && !detailed && this.cache.complete) return this.cache;
-      return this.api.request({ url: `/api/settings` + (detailed ? "?detailed" : "") }).then((resp) => {
+      return this.api.request({ url: `/api/` + PES`settings` + (detailed ? "?detailed" : "") }).then((resp) => {
         if (resp) Object.keys(resp).forEach((key) => this.cache.set(key, detailed ? resp[key].value : resp[key]));
-        this.emit(pathedEvent("settings", "r"), resp || []);
+        this.emit(PES`settings:r`, resp || []);
         return resp;
       });
     }
     delete(key) {
       if (!key) throw new Error("Cannot delete setting, missing key");
-      return this.api.request({ url: `/api/` + pathedEvent(["settings", key]), method: "DELETE" }).then(() => {
+      return this.api.request({ url: `/api/` + PES`settings/${key}`, method: "DELETE" }).then(() => {
         this.cache.delete(key);
-        this.emit(pathedEvent(["settings", key], "d"), key);
+        this.emit(PES`settings/${key}:d`, key);
       });
     }
     read(key, reload = false) {
       if (!key) throw new Error("Cannot read setting, missing key");
       if (!reload && this.cache.get(key)) return this.cache.get(key);
-      return this.api.request({ url: `/api/` + pathedEvent(["settings", key]) }).then((variable) => {
+      return this.api.request({ url: `/api/` + PES`settings/${key}` }).then((variable) => {
         if (variable) this.cache.set(variable.key, variable.value);
-        this.emit(pathedEvent(["settings", key], "r"), variable);
+        this.emit(PES`settings/${key}:r`, variable);
         return variable;
       });
     }
     update(variable) {
       if (!variable.key) throw new Error("Cannot update setting, missing key");
-      return this.api.request({ url: `/api/` + pathedEvent(["settings", variable.key]), body: variable }).then((variable2) => {
+      return this.api.request({ url: `/api/` + PES`settings/${variable.key}`, body: variable }).then((variable2) => {
         if (variable2) this.cache.set(variable2.key, variable2.value);
-        this.emit(`/api/` + pathedEvent(["settings", variable2.key], variable2._id ? "u" : "c"), variable2);
+        this.emit(`/api/` + PES`settings/${variable2.key}:${variable2._id ? "u" : "c"}`, variable2);
         return variable2;
       });
     }
@@ -1900,21 +1970,21 @@ ${log}`;
     }
     delete(path) {
       if (!path) throw new Error("Cannot delete static asset, missing path");
-      return this.api.request({ url: `/api/` + pathedEvent(["static", path]), method: "DELETE" }).then(() => {
-        this.emit(pathedEvent(["static", path], "d"), path);
+      return this.api.request({ url: `/api/` + PES`static/${path}`, method: "DELETE" }).then(() => {
+        this.emit(PES`static/${path}:d`, path);
       });
     }
     upload(files, path = "/") {
       if (!files) throw new Error("Cannot upload static assets, missing file");
       return new E(async (res, rej, prog) => {
         return Ft({
-          url: this.api.url + "/api/" + pathedEvent(["static", path]),
+          url: this.api.url + "/api/" + PES`static/${path}`,
           files: ft(files),
           headers: this.api.headers
         }).onProgress((p2) => {
           prog(p2);
         }).then((resp) => {
-          this.emit(pathedEvent(["static", path], "c"), resp);
+          this.emit(PES`static/${path}:c`, resp);
           res(resp);
         }).catch((err) => rej(err));
       });
@@ -1978,7 +2048,8 @@ ${log}`;
       this.relayEvents(this.users);
       this.users.on(`*`, () => {
         if (!this.auth.user) return;
-        this.auth.user = this.users.cache.get(this.auth.user.username);
+        const cached = this.users.cache.get(this.auth.user.username);
+        if (cached) this.auth.user = cached;
       });
     }
   }
@@ -1994,6 +2065,9 @@ ${log}`;
   exports2.Groups = Groups;
   exports2.Logger = Logger;
   exports2.Momentum = Momentum;
+  exports2.PE = PE;
+  exports2.PES = PES;
+  exports2.PathEvent = PathEvent;
   exports2.PathedEventEmitter = PathedEventEmitter;
   exports2.Payments = Payments;
   exports2.Pdf = Pdf;
@@ -2003,10 +2077,5 @@ ${log}`;
   exports2.Storage = Storage;
   exports2.Totp = Totp;
   exports2.Users = Users;
-  exports2.combinePathedEvents = combinePathedEvents;
-  exports2.hasPath = hasPath;
-  exports2.hasPathFatal = hasPathFatal;
-  exports2.parsePathedEvent = parsePathedEvent;
-  exports2.pathedEvent = pathedEvent;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });