@ztimson/utils 0.25.15 → 0.25.16

package/dist/index.cjs

@@ -1690,7 +1690,6 @@ ${opts.message || this.desc}`;
       __publicField(this, "name");
       /** List of methods */
       __publicField(this, "methods");
-      var _a;
       if (typeof e == "object") return Object.assign(this, e);
       let [p, scope, method] = e.replaceAll(/\/{2,}/g, "/").split(":");
       if (!method) method = scope || "*";
@@ -1699,7 +1698,7 @@ ${opts.message || this.desc}`;
         method = "*";
       }
       let temp = p.split("/").filter((p2) => !!p2);
-      this.module = ((_a = temp.splice(0, 1)[0]) == null ? void 0 : _a.toLowerCase()) || "";
+      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() || "";
@@ -1779,11 +1778,8 @@ ${opts.message || this.desc}`;
      */
     static filter(target, ...filter) {
       const parsedTarget = makeArray(target).map((pe) => new PathEvent(pe));
-      const parsedFind = makeArray(filter).map((pe) => new PathEvent(pe));
-      return parsedTarget.filter((t) => {
-        if (!t.fullPath && t.all) return true;
-        return !!parsedFind.find((f) => (t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) && (f.all || t.all || t.methods.intersection(f.methods).length));
-      });
+      const parsedFilter = makeArray(filter).map((pe) => new PathEvent(pe));
+      return parsedTarget.filter((t) => !!parsedFilter.find((f) => (t.fullPath == "*" || f.fullPath == "*" || t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) && (f.all || t.all || t.methods.intersection(f.methods).length)));
     }
     /**
      * Squash 2 sets of paths & return true if any overlap is found
@@ -1793,15 +1789,11 @@ ${opts.message || this.desc}`;
      * @return {boolean} Whether there is any overlap
      */
     static has(target, ...has) {
-      const parsedRequired = makeArray(has).map((pe) => new PathEvent(pe));
       const parsedTarget = makeArray(target).map((pe) => new PathEvent(pe));
-      return !!parsedRequired.find((r) => {
-        if (!r.fullPath && r.all) return true;
-        const filtered = parsedTarget.filter((p) => r.fullPath.startsWith(p.fullPath));
-        if (!filtered.length) return false;
-        const combined = PathEvent.combine(...filtered);
-        return !combined.none && (combined.all || r.all) || combined.methods.intersection(r.methods).length;
-      });
+      const parsedRequired = makeArray(has).map((pe) => new PathEvent(pe));
+      return !!parsedRequired.find((r) => !!parsedTarget.find(
+        (t) => (r.fullPath == "*" || t.fullPath == "*" || r.fullPath.startsWith(t.fullPath) || t.fullPath.startsWith(r.fullPath)) && (r.all || t.all || r.methods.intersection(t.methods).length)
+      ));
     }
     /**
      * Squash 2 sets of paths & return true if the target has all paths
@@ -1876,7 +1868,7 @@ ${opts.message || this.desc}`;
     }
     on(event, listener) {
       makeArray(event).forEach((e) => this.listeners.push([
-        new PathEvent(`${this.prefix}/${new PathEvent(e).toString()}`),
+        new PathEvent(`${this.prefix}/${e}`),
         listener
       ]));
       return () => this.off(listener);