@ztimson/utils 0.25.14 → 0.25.16

package/dist/index.mjs

@@ -1173,7 +1173,7 @@ function fileText(file) {
 }
 function timestampFilename(name, date = /* @__PURE__ */ new Date()) {
   if (typeof date == "number" || typeof date == "string") date = new Date(date);
-  const timestamp = formatDate("YYYY-MM-DD_HH:mm:ss", date);
+  const timestamp = formatDate("YYYY-MM-DD_HH-mm", date);
   return name ? name.replace("{{TIMESTAMP}}", timestamp) : timestamp;
 }
 function uploadWithProgress(options) {
@@ -1686,7 +1686,6 @@ class PathEvent {
     __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 || "*";
@@ -1695,7 +1694,7 @@ class PathEvent {
       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() || "";
@@ -1775,11 +1774,8 @@ class PathEvent {
    */
   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
@@ -1789,15 +1785,11 @@ class PathEvent {
    * @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
@@ -1872,7 +1864,7 @@ class PathEventEmitter {
   }
   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);