@ztimson/utils 0.25.17 → 0.25.19

package/dist/index.mjs

@@ -1644,6 +1644,9 @@ function fracToDec(frac) {
   split = split.pop().split("/");
   return whole + Number(split[0]) / Number(split[1]);
 }
+function escapeRegex(value) {
+  return value.replace(/[.*+?^${}()|\[\]\\]/g, "\\$&");
+}
 function fn(args, fn2, async = false) {
   const keys = Object.keys(args);
   return new Function(...keys, `return (${async ? "async " : ""}(${keys.join(",")}) => { ${fn2} })(${keys.join(",")})`)(...keys.map((k) => args[k]));
@@ -1652,8 +1655,11 @@ function gravatar(email, def = "mp") {
   if (!email) return "";
   return `https://www.gravatar.com/avatar/${md5(email)}?d=${def}`;
 }
-function escapeRegex(value) {
-  return value.replace(/[.*+?^${}()|\[\]\\]/g, "\\$&");
+function ipV6ToV4(ip) {
+  if (!ip) return null;
+  const ipv4 = ip.split(":").splice(-1)[0];
+  if (ipv4 == "1") return "127.0.0.1";
+  return ipv4;
 }
 function PE(str, ...args) {
   const combined = [];
@@ -1775,7 +1781,13 @@ class PathEvent {
   static filter(target, ...filter) {
     const parsedTarget = makeArray(target).map((pe) => new PathEvent(pe));
     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)));
+    return parsedTarget.filter((t) => !!parsedFilter.find((r) => {
+      const wildcard = r.fullPath == "*" || t.fullPath == "*";
+      const p1 = r.fullPath.slice(0, r.fullPath.indexOf("*")), p2 = t.fullPath.slice(0, t.fullPath.indexOf("*"));
+      const scope = p1.startsWith(p2) || p2.startsWith(p1);
+      const methods = r.all || t.all || r.methods.intersection(t.methods).length;
+      return (wildcard || scope) && methods;
+    }));
   }
   /**
    * Squash 2 sets of paths & return true if any overlap is found
@@ -1787,9 +1799,13 @@ class PathEvent {
   static has(target, ...has) {
     const parsedTarget = makeArray(target).map((pe) => new PathEvent(pe));
     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)) && (r.all || t.all || r.methods.intersection(t.methods).length)
-    ));
+    return !!parsedRequired.find((r) => !!parsedTarget.find((t) => {
+      const wildcard = r.fullPath == "*" || t.fullPath == "*";
+      const p1 = r.fullPath.slice(0, r.fullPath.indexOf("*")), p2 = t.fullPath.slice(0, t.fullPath.indexOf("*"));
+      const scope = p1.startsWith(p2);
+      const methods = r.all || t.all || r.methods.intersection(t.methods).length;
+      return (wildcard || scope) && methods;
+    }));
   }
   /**
    * Squash 2 sets of paths & return true if the target has all paths
@@ -1832,6 +1848,40 @@ class PathEvent {
     if (methods == null ? void 0 : methods.length) p += `:${makeArray(methods).map((m) => m.toLowerCase()).join("")}`;
     return p;
   }
+  /**
+   * Squash 2 sets of paths & return true if any overlap is found
+   *
+   * @param has Target must have at least one of these path
+   * @return {boolean} Whether there is any overlap
+   */
+  has(...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
+   */
+  hasAll(...has) {
+    return PathEvent.hasAll(this, ...has);
+  }
+  /**
+   * Same as `has` but raises an error if there is no overlap
+   *
+   * @param has Target must have at least one of these path
+   */
+  hasFatal(...has) {
+    return PathEvent.hasFatal(this, ...has);
+  }
+  /**
+   * Same as `hasAll` but raises an error if the target is missing any paths
+   *
+   * @param has Target must have all these paths
+   */
+  hasAllFatal(...has) {
+    return PathEvent.hasAllFatal(this, ...has);
+  }
   /**
    * Filter a set of paths based on this event
    *
@@ -2178,6 +2228,7 @@ export {
   includes,
   insertAt,
   instantInterval,
+  ipV6ToV4,
   isEqual,
   kebabCase,
   logicTest,