@ztimson/utils 0.25.18 → 0.25.20

package/dist/index.mjs

@@ -543,14 +543,7 @@ class Cache {
       if (options.storage instanceof Table) {
         (async () => {
           var _a2;
-          return (await ((_a2 = options.storage) == null ? void 0 : _a2.getAll())).forEach((v) => {
-            if (v) {
-              try {
-                this.add(v);
-              } catch {
-              }
-            }
-          });
+          return this.addAll(await ((_a2 = options.storage) == null ? void 0 : _a2.getAll()));
         })();
       } else if (options.storageKey) {
         const stored = (_a = options.storage) == null ? void 0 : _a.getItem(options.storageKey);
@@ -1781,7 +1774,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
@@ -1793,9 +1792,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
@@ -1838,6 +1841,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
    *