From f755d8f5b86d417c40a0c7c8781d47455307f6ef Mon Sep 17 00:00:00 2001 From: ztimson Date: Tue, 4 Feb 2025 22:17:31 -0500 Subject: [PATCH] Fixed PathEvents filter --- index.html | 1 + package.json | 2 +- src/path-events.ts | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 293a437..571c05b 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,7 @@ import {PathEvent} from './dist/index.mjs'; console.log(PathEvent.filter(['payments/ztimson:cr', 'logs/momentum:c', 'data/Testing:r'], 'data')); + console.log(PathEvent.filter(['data/Submissions/Test:r'], 'data/Submissions/Test/test.html')); diff --git a/package.json b/package.json index 20eac76..39b7db3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ztimson/utils", - "version": "0.23.10", + "version": "0.23.11", "description": "Utility library", "author": "Zak Timson", "license": "MIT", diff --git a/src/path-events.ts b/src/path-events.ts index fa2219b..2e08873 100644 --- a/src/path-events.ts +++ b/src/path-events.ts @@ -142,8 +142,9 @@ export class PathEvent { 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.all || t.all || t.methods.intersection(f.methods).length)); + return !!parsedFind.find(f => + (t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) && + (f.all || t.all || t.methods.intersection(f.methods).length)); }); }