Fixed http no decode

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'));
 		</script>
 	</body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.23.10",
+	"version": "0.23.12",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/http.ts

@@ -22,6 +22,22 @@ export type HttpDefaults = {
 	url?: string;
 }
 
+class HttpResponse<T = any> extends Response {
+	data?: T
+	ok!: boolean;
+	redirected!: boolean;
+	type!: ResponseType;
+	url!: string;
+
+	constructor(resp: Response, stream: ReadableStream) {
+		super(stream, {headers: resp.headers, status: resp.status, statusText: resp.statusText});
+		this.ok = resp.ok;
+		this.redirected = resp.redirected;
+		this.type = resp.type;
+		this.url = resp.url;
+	}
+}
+
 export class Http {
 	private static interceptors: {[key: string]: HttpInterceptor} = {};
 
@@ -101,18 +117,17 @@ export class Http {
 									push();
 								}).catch((error: any) => controller.error(error));
 							}
-
 							push();
 						}
 					});
 
-					resp.data = new Response(stream);
+					resp = new HttpResponse<T>(resp, stream);
-					if(opts.decode == null || opts.decode) {
+					if(opts.decode !== false) {
 						const content = resp.headers.get('Content-Type')?.toLowerCase();
-						if(content?.includes('form')) resp.data = <T>await resp.data.formData();
+						if(content?.includes('form')) resp.data = <T>await resp.formData();
-						else if(content?.includes('json')) resp.data = <T>await resp.data.json();
+						else if(content?.includes('json')) resp.data = <T>await resp.json();
-						else if(content?.includes('text')) resp.data = <T>await resp.data.text();
+						else if(content?.includes('text')) resp.data = <T>await resp.text();
-						else if(content?.includes('application')) resp.data = <T>await resp.data.blob();
+						else if(content?.includes('application')) resp.data = <T>await resp.blob();
 					}
 
 					if(resp.ok) res(resp);

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)
+			return !!parsedFind.find(f =>
-				&& (f.all || t.all || t.methods.intersection(f.methods).length));
+				(t.fullPath.startsWith(f.fullPath) || f.fullPath.startsWith(t.fullPath)) &&
+				(f.all || t.all || t.methods.intersection(f.methods).length));
 		});
 	}