@ztimson/utils 0.27.12 → 0.27.14

package/dist/index.cjs

@@ -1960,22 +1960,12 @@ ${opts.message || this.desc}`;
       }
       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 === "*") {
+      if (p === "" || p === void 0 || p === "*") {
         this.module = "";
         this.path = "";
         this.fullPath = "**";
         this.name = "";
-        this.methods = new ASet(["*"]);
+        this.methods = new ASet(p === "*" ? ["*"] : method.split(""));
         this.hasGlob = true;
         PathEvent.pathEventCache.set(e, this);
         return;
@@ -2090,10 +2080,7 @@ ${opts.message || this.desc}`;
     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) => {
-        const combined = PathEvent.combine(t);
-        return !!parsedFilter.find((r) => PathEvent.matches(r, combined));
-      });
+      return parsedTarget.filter((t) => !!parsedFilter.find((r) => PathEvent.matches(r, t)));
     }
     /**
      * Check if a filter pattern matches a target path
@@ -2101,7 +2088,8 @@ ${opts.message || this.desc}`;
      */
     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;
+      if (pattern.fullPath === "**") return pattern.methods.has("*") || pattern.methods.intersection(target.methods).length > 0;
+      if (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) {
@@ -2122,8 +2110,7 @@ ${opts.message || this.desc}`;
     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));
-      const effectiveTarget = parsedTarget.length === 1 ? parsedTarget[0] : PathEvent.combine(...parsedTarget);
-      return !!parsedRequired.find((r) => PathEvent.matches(r, effectiveTarget));
+      return !!parsedRequired.find((r) => !!parsedTarget.find((t) => PathEvent.matches(r, t)));
     }
     /**
      * Squash 2 sets of paths & return true if the target has all paths