@momsfriendlydevco/cowboy 1.0.15 → 1.0.16

package/lib/cowboy.js

@@ -2,6 +2,7 @@ import debug from '#lib/debug';
 import CowboyMiddleware from '#middleware';
 import CowboyRequest from '#lib/request';
 import CowboyResponse from '#lib/response';
+import {compile as compileRoutePaths} from '@momsfriendlydevco/path-match';
 
 export class Cowboy {
 	/**
@@ -70,9 +71,10 @@ export class Cowboy {
 	route(methods, paths, ...middleware) {
 		this.routes.push({
 			methods: Array.isArray(methods) ? methods : [methods],
-			paths: Array.isArray(paths) ? paths : [paths],
+			matcher: compileRoutePaths(paths),
 			middleware,
 		})
+
 		return this;
 	}
 
@@ -96,11 +98,7 @@ export class Cowboy {
 	resolve(req) {
 		return this.routes.find(route =>
 			route.methods.includes(req.method) // Method matches
-			&& route.paths.some(path => // Path matches
-				typeof path == 'string' ? req.path == path
-				: path instanceof RegExp ? path.test(req.path)
-				: (()=> { throw new Error('Path is not a String or RegExp') })()
-			)
+			&& route.matcher.isMatch(req.path)
 		);
 	}
 

package/lib/request.js

@@ -54,6 +54,9 @@ export default class CowboyRequest {
 		this.hostname = url.hostname;
 		this.query = Object.fromEntries(url.searchParams);
 
+		this.routePath = ''; // Eventually matching routePath segment
+		this.params = {}; // Set empty object for path extraction
+
 		// Slurp the headers
 		this.headers = Object.fromEntries(cfReq.headers.entries());
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momsfriendlydevco/cowboy",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Wrapper around Cloudflare Wrangler to provide a more Express-like experience",
   "scripts": {
     "lint": "eslint ."
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@momsfriendlydevco/joyful": "^1.0.1",
+    "@momsfriendlydevco/path-match": "^1.0.0",
     "toml": "^3.0.0"
   },
   "devDependencies": {