itty-router 5.0.6 → 5.0.7

package/AutoRouter.js

@@ -1,2 +1,116 @@
-"use strict";const r=((r="text/plain; charset=utf-8",e)=>(t,{...o}={})=>{if(void 0===t||t instanceof Response)return t;const a=new Response(e?.(t)??t,o);return a.headers.set("content-type",r),a})("application/json; charset=utf-8",JSON.stringify),e=r=>({400:"Bad Request",401:"Unauthorized",403:"Forbidden",404:"Not Found",500:"Internal Server Error"}[r]||"Unknown Error"),t=(t=500,o)=>{if(t instanceof Error){const{message:r,...a}=t;t=t.status||500,o={error:r||e(t),...a}}return o={status:t,..."object"==typeof o?o:{error:o||e(t)}},r(o,{status:t})},o=r=>{r.proxy=new Proxy(r.proxy||r,{get:(e,t)=>void 0!==e[t]?e[t].bind?.(r)||e[t]:e?.params?.[t]})};exports.AutoRouter=({format:e=r,missing:a=(()=>t(404)),finally:n=[],before:s=[],...c}={})=>(({base:r="",routes:e=[],...t}={})=>({__proto__:new Proxy({},{get:(t,o,a,n)=>(t,...s)=>e.push([o.toUpperCase?.(),RegExp(`^${(n=(r+t).replace(/\/+(\/|$)/g,"$1")).replace(/(\/?\.?):(\w+)\+/g,"($1(?<$2>*))").replace(/(\/?\.?):(\w+)/g,"($1(?<$2>[^$1/]+?))").replace(/\./g,"\\.").replace(/(\/?)\*/g,"($1.*)?")}/*$`),s,n])&&a}),routes:e,...t,async fetch(r,...o){let a,n,s=new URL(r.url),c=r.query={__proto__:null};for(let[r,e]of s.searchParams)c[r]=c[r]?[].concat(c[r],e):e;r:try{for(let e of t.before||[])if(null!=(a=await e(r.proxy??r,...o)))break r;e:for(let[t,c,f,i]of e)if((t==r.method||"ALL"==t)&&(n=s.pathname.match(c))){r.params=n.groups||{},r.route=i;for(let e of f)if(null!=(a=await e(r.proxy??r,...o)))break e}}catch(e){if(!t.catch)throw e;a=await t.catch(e,r.proxy??r,...o)}try{for(let e of t.finally||[])a=await e(a,r.proxy??r,...o)??a}catch(e){if(!t.catch)throw e;a=await t.catch(e,r.proxy??r,...o)}return a}}))({before:[o,...s],catch:t,finally:[(r,...e)=>r??a(r,...e),e,...n],...c});
+'use strict';
+
+const Router = ({ base = '', routes = [], ...other } = {}) => ({
+    __proto__: new Proxy({}, {
+        // @ts-expect-error (we're adding an expected prop "path" to the get)
+        get: (target, prop, receiver, path) => (route, ...handlers) => routes.push([
+            prop.toUpperCase?.(),
+            RegExp(`^${(path = (base + route)
+                .replace(/\/+(\/|$)/g, '$1')) // strip double & trailing splash
+                .replace(/(\/?\.?):(\w+)\+/g, '($1(?<$2>*))') // greedy params
+                .replace(/(\/?\.?):(\w+)/g, '($1(?<$2>[^$1/]+?))') // named params and image format
+                .replace(/\./g, '\\.') // dot in path
+                .replace(/(\/?)\*/g, '($1.*)?') // wildcard
+            }/*$`),
+            // @ts-ignore
+            handlers, // embed handlers
+            path, // embed clean route path
+        ]) && receiver
+    }),
+    routes,
+    ...other,
+    async fetch(request, ...args) {
+        let response, match, url = new URL(request.url), query = request.query = { __proto__: null };
+        // 1. parse query params
+        for (let [k, v] of url.searchParams)
+            query[k] = query[k] ? [].concat(query[k], v) : v;
+        t: try {
+            for (let handler of other.before || [])
+                if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                    break t;
+            // 2. then test routes
+            outer: for (let [method, regex, handlers, path] of routes)
+                if ((method == request.method || method == 'ALL') && (match = url.pathname.match(regex))) {
+                    request.params = match.groups || {}; // embed params in request
+                    request.route = path; // embed route path in request
+                    for (let handler of handlers)
+                        if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                            break outer;
+                }
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        try {
+            for (let handler of other.finally || [])
+                response = await handler(response, request.proxy ?? request, ...args) ?? response;
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        return response;
+    },
+});
+
+const createResponse = (format = 'text/plain; charset=utf-8', transform) => (body, { ...options } = {}) => {
+    if (body === undefined || body instanceof Response)
+        return body;
+    const response = new Response(transform?.(body) ?? body, options);
+    response.headers.set('content-type', format);
+    return response;
+};
+
+const json = createResponse('application/json; charset=utf-8', JSON.stringify);
+
+const getMessage = (code) => ({
+    400: 'Bad Request',
+    401: 'Unauthorized',
+    403: 'Forbidden',
+    404: 'Not Found',
+    500: 'Internal Server Error',
+})[code] || 'Unknown Error';
+const error = (a = 500, b) => {
+    // handle passing an Error | StatusError directly in
+    if (a instanceof Error) {
+        const { message, ...err } = a;
+        a = a.status || 500;
+        b = {
+            error: message || getMessage(a),
+            ...err,
+        };
+    }
+    b = {
+        status: a,
+        ...(typeof b === 'object' ? b : { error: b || getMessage(a) }),
+    };
+    return json(b, { status: a });
+};
+
+const withParams = (request) => {
+    request.proxy = new Proxy(request.proxy || request, {
+        get: (obj, prop) => obj[prop] !== undefined
+            ? obj[prop]?.bind?.(request) || obj[prop]
+            : obj?.params?.[prop]
+    });
+};
+
+const AutoRouter = ({ format = json, missing = () => error(404), finally: f = [], before = [], ...options } = {}) => Router({
+    before: [
+        withParams,
+        ...before
+    ],
+    catch: error,
+    finally: [
+        (r, ...args) => r ?? missing(r, ...args),
+        format,
+        ...f,
+    ],
+    ...options,
+});
+
+exports.AutoRouter = AutoRouter;
 //# sourceMappingURL=AutoRouter.js.map

package/AutoRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"AutoRouter.js","sources":["../src/src/Router.ts","../src/src/json.ts","../src/src/createResponse.ts","../src/src/error.ts","../src/src/withParams.ts","../src/src/AutoRouter.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["json","format","transform","body","options","undefined","Response","response","headers","set","createResponse","JSON","stringify","getMessage","code","error","a","b","Error","message","err","status","withParams","request","proxy","Proxy","get","obj","prop","bind","params","missing","finally","f","before","base","routes","other","__proto__","target","receiver","path","route","handlers","push","toUpperCase","RegExp","replace","fetch","args","match","url","URL","query","k","v","searchParams","concat","t","handler","outer","method","regex","pathname","groups","catch","Router","r"],"mappings":"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"}
+{"version":3,"file":"AutoRouter.js","sources":["../src/src/Router.ts","../src/src/createResponse.ts","../src/src/json.ts","../src/src/error.ts","../src/src/withParams.ts","../src/src/AutoRouter.ts"],"sourcesContent":[null,null,null,null,null,null],"names":[],"mappings":"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"}

package/AutoRouter.mjs

@@ -1,2 +1,114 @@
-const r=((r="text/plain; charset=utf-8",e)=>(t,{...o}={})=>{if(void 0===t||t instanceof Response)return t;const a=new Response(e?.(t)??t,o);return a.headers.set("content-type",r),a})("application/json; charset=utf-8",JSON.stringify),e=r=>({400:"Bad Request",401:"Unauthorized",403:"Forbidden",404:"Not Found",500:"Internal Server Error"}[r]||"Unknown Error"),t=(t=500,o)=>{if(t instanceof Error){const{message:r,...a}=t;t=t.status||500,o={error:r||e(t),...a}}return o={status:t,..."object"==typeof o?o:{error:o||e(t)}},r(o,{status:t})},o=r=>{r.proxy=new Proxy(r.proxy||r,{get:(e,t)=>void 0!==e[t]?e[t].bind?.(r)||e[t]:e?.params?.[t]})},a=({format:e=r,missing:a=(()=>t(404)),finally:n=[],before:s=[],...c}={})=>(({base:r="",routes:e=[],...t}={})=>({__proto__:new Proxy({},{get:(t,o,a,n)=>(t,...s)=>e.push([o.toUpperCase?.(),RegExp(`^${(n=(r+t).replace(/\/+(\/|$)/g,"$1")).replace(/(\/?\.?):(\w+)\+/g,"($1(?<$2>*))").replace(/(\/?\.?):(\w+)/g,"($1(?<$2>[^$1/]+?))").replace(/\./g,"\\.").replace(/(\/?)\*/g,"($1.*)?")}/*$`),s,n])&&a}),routes:e,...t,async fetch(r,...o){let a,n,s=new URL(r.url),c=r.query={__proto__:null};for(let[r,e]of s.searchParams)c[r]=c[r]?[].concat(c[r],e):e;r:try{for(let e of t.before||[])if(null!=(a=await e(r.proxy??r,...o)))break r;e:for(let[t,c,f,p]of e)if((t==r.method||"ALL"==t)&&(n=s.pathname.match(c))){r.params=n.groups||{},r.route=p;for(let e of f)if(null!=(a=await e(r.proxy??r,...o)))break e}}catch(e){if(!t.catch)throw e;a=await t.catch(e,r.proxy??r,...o)}try{for(let e of t.finally||[])a=await e(a,r.proxy??r,...o)??a}catch(e){if(!t.catch)throw e;a=await t.catch(e,r.proxy??r,...o)}return a}}))({before:[o,...s],catch:t,finally:[(r,...e)=>r??a(r,...e),e,...n],...c});export{a as AutoRouter};
+const Router = ({ base = '', routes = [], ...other } = {}) => ({
+    __proto__: new Proxy({}, {
+        // @ts-expect-error (we're adding an expected prop "path" to the get)
+        get: (target, prop, receiver, path) => (route, ...handlers) => routes.push([
+            prop.toUpperCase?.(),
+            RegExp(`^${(path = (base + route)
+                .replace(/\/+(\/|$)/g, '$1')) // strip double & trailing splash
+                .replace(/(\/?\.?):(\w+)\+/g, '($1(?<$2>*))') // greedy params
+                .replace(/(\/?\.?):(\w+)/g, '($1(?<$2>[^$1/]+?))') // named params and image format
+                .replace(/\./g, '\\.') // dot in path
+                .replace(/(\/?)\*/g, '($1.*)?') // wildcard
+            }/*$`),
+            // @ts-ignore
+            handlers, // embed handlers
+            path, // embed clean route path
+        ]) && receiver
+    }),
+    routes,
+    ...other,
+    async fetch(request, ...args) {
+        let response, match, url = new URL(request.url), query = request.query = { __proto__: null };
+        // 1. parse query params
+        for (let [k, v] of url.searchParams)
+            query[k] = query[k] ? [].concat(query[k], v) : v;
+        t: try {
+            for (let handler of other.before || [])
+                if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                    break t;
+            // 2. then test routes
+            outer: for (let [method, regex, handlers, path] of routes)
+                if ((method == request.method || method == 'ALL') && (match = url.pathname.match(regex))) {
+                    request.params = match.groups || {}; // embed params in request
+                    request.route = path; // embed route path in request
+                    for (let handler of handlers)
+                        if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                            break outer;
+                }
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        try {
+            for (let handler of other.finally || [])
+                response = await handler(response, request.proxy ?? request, ...args) ?? response;
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        return response;
+    },
+});
+
+const createResponse = (format = 'text/plain; charset=utf-8', transform) => (body, { ...options } = {}) => {
+    if (body === undefined || body instanceof Response)
+        return body;
+    const response = new Response(transform?.(body) ?? body, options);
+    response.headers.set('content-type', format);
+    return response;
+};
+
+const json = createResponse('application/json; charset=utf-8', JSON.stringify);
+
+const getMessage = (code) => ({
+    400: 'Bad Request',
+    401: 'Unauthorized',
+    403: 'Forbidden',
+    404: 'Not Found',
+    500: 'Internal Server Error',
+})[code] || 'Unknown Error';
+const error = (a = 500, b) => {
+    // handle passing an Error | StatusError directly in
+    if (a instanceof Error) {
+        const { message, ...err } = a;
+        a = a.status || 500;
+        b = {
+            error: message || getMessage(a),
+            ...err,
+        };
+    }
+    b = {
+        status: a,
+        ...(typeof b === 'object' ? b : { error: b || getMessage(a) }),
+    };
+    return json(b, { status: a });
+};
+
+const withParams = (request) => {
+    request.proxy = new Proxy(request.proxy || request, {
+        get: (obj, prop) => obj[prop] !== undefined
+            ? obj[prop]?.bind?.(request) || obj[prop]
+            : obj?.params?.[prop]
+    });
+};
+
+const AutoRouter = ({ format = json, missing = () => error(404), finally: f = [], before = [], ...options } = {}) => Router({
+    before: [
+        withParams,
+        ...before
+    ],
+    catch: error,
+    finally: [
+        (r, ...args) => r ?? missing(r, ...args),
+        format,
+        ...f,
+    ],
+    ...options,
+});
+
+export { AutoRouter };
 //# sourceMappingURL=AutoRouter.mjs.map

package/AutoRouter.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"AutoRouter.mjs","sources":["../src/src/Router.ts","../src/src/json.ts","../src/src/createResponse.ts","../src/src/error.ts","../src/src/withParams.ts","../src/src/AutoRouter.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["json","format","transform","body","options","undefined","Response","response","headers","set","createResponse","JSON","stringify","getMessage","code","error","a","b","Error","message","err","status","withParams","request","proxy","Proxy","get","obj","prop","bind","params","AutoRouter","missing","finally","f","before","base","routes","other","__proto__","target","receiver","path","route","handlers","push","toUpperCase","RegExp","replace","fetch","args","match","url","URL","query","k","v","searchParams","concat","t","handler","outer","method","regex","pathname","groups","catch","Router","r"],"mappings":"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"}
+{"version":3,"file":"AutoRouter.mjs","sources":["../src/src/Router.ts","../src/src/createResponse.ts","../src/src/json.ts","../src/src/error.ts","../src/src/withParams.ts","../src/src/AutoRouter.ts"],"sourcesContent":[null,null,null,null,null,null],"names":[],"mappings":"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"}

package/IttyRouter.js

@@ -1,2 +1,42 @@
-"use strict";exports.IttyRouter=({base:e="",routes:r=[],...t}={})=>({__proto__:new Proxy({},{get:(t,o,a,p)=>(t,...l)=>r.push([o.toUpperCase(),RegExp(`^${(p=(e+t).replace(/\/+(\/|$)/g,"$1")).replace(/(\/?\.?):(\w+)\+/g,"($1(?<$2>*))").replace(/(\/?\.?):(\w+)/g,"($1(?<$2>[^$1/]+?))").replace(/\./g,"\\.").replace(/(\/?)\*/g,"($1.*)?")}/*$`),l,p])&&a}),routes:r,...t,async fetch(e,...t){let o,a,p=new URL(e.url),l=e.query={__proto__:null};for(let[e,r]of p.searchParams)l[e]=l[e]?[].concat(l[e],r):r;for(let[l,s,c,u]of r)if((l==e.method||"ALL"==l)&&(a=p.pathname.match(s))){e.params=a.groups||{},e.route=u;for(let r of c)if(null!=(o=await r(e.proxy??e,...t)))return o}}});
+'use strict';
+
+const IttyRouter = ({ base = '', routes = [], ...other } = {}) => 
+// @ts-ignore
+({
+    __proto__: new Proxy({}, {
+        // @ts-expect-error (we're adding an expected prop "path" to the get)
+        get: (target, prop, receiver, path) => (route, ...handlers) => routes.push([
+            prop.toUpperCase(),
+            RegExp(`^${(path = (base + route)
+                .replace(/\/+(\/|$)/g, '$1')) // strip double & trailing splash
+                .replace(/(\/?\.?):(\w+)\+/g, '($1(?<$2>*))') // greedy params
+                .replace(/(\/?\.?):(\w+)/g, '($1(?<$2>[^$1/]+?))') // named params and image format
+                .replace(/\./g, '\\.') // dot in path
+                .replace(/(\/?)\*/g, '($1.*)?') // wildcard
+            }/*$`),
+            // @ts-ignore
+            handlers, // embed handlers
+            path, // embed clean route path
+        ]) && receiver
+    }),
+    routes,
+    ...other,
+    async fetch(request, ...args) {
+        let response, match, url = new URL(request.url), query = request.query = { __proto__: null };
+        // 1. parse query params
+        for (let [k, v] of url.searchParams)
+            query[k] = query[k] ? [].concat(query[k], v) : v;
+        // 2. then test routes
+        for (let [method, regex, handlers, path] of routes)
+            if ((method == request.method || method == 'ALL') && (match = url.pathname.match(regex))) {
+                request.params = match.groups || {}; // embed params in request
+                request.route = path; // embed route path in request
+                for (let handler of handlers)
+                    if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                        return response;
+            }
+    },
+});
+
+exports.IttyRouter = IttyRouter;
 //# sourceMappingURL=IttyRouter.js.map

package/IttyRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"IttyRouter.js","sources":["../src/src/IttyRouter.ts"],"sourcesContent":[null],"names":["base","routes","other","__proto__","Proxy","get","target","prop","receiver","path","route","handlers","push","toUpperCase","RegExp","replace","fetch","request","args","response","match","url","URL","query","k","v","searchParams","concat","method","regex","pathname","params","groups","handler","proxy"],"mappings":"gCAQ0B,EAKtBA,OAAO,GAAIC,SAAS,MAAOC,GAA6B,CAAE,KAE5D,CACEC,UAAW,IAAIC,MAAM,GAAI,CAEvBC,IAAK,CAACC,EAAaC,EAAcC,EAAkBC,IACjD,CAACC,KAAkBC,IACjBV,EAAOW,KACL,CACEL,EAAKM,cACLC,OAAO,KAAKL,GAAQT,EAAOU,GACxBK,QAAQ,aAAc,OACtBA,QAAQ,oBAAqB,gBAC7BA,QAAQ,kBAAmB,uBAC3BA,QAAQ,MAAO,OACfA,QAAQ,WAAY,iBAGvBJ,EACAF,KAECD,IAEXP,YACGC,EACH,WAAMc,CAAOC,KAAyBC,GACpC,IAAIC,EACAC,EACAC,EAAM,IAAIC,IAAIL,EAAQI,KACtBE,EAA6BN,EAAQM,MAAQ,CAAEpB,UAAW,MAG9D,IAAK,IAAKqB,EAAGC,KAAMJ,EAAIK,aACrBH,EAAMC,GAAKD,EAAMC,GAAM,GAAgBG,OAAOJ,EAAMC,GAAIC,GAAKA,EAG/D,IAAK,IAAKG,EAAQC,EAAOlB,EAAUF,KAASR,EAC1C,IAAK2B,GAAUX,EAAQW,QAAoB,OAAVA,KAAqBR,EAAQC,EAAIS,SAASV,MAAMS,IAAS,CACxFZ,EAAQc,OAASX,EAAMY,QAAU,CAAA,EACjCf,EAAQP,MAAQD,EAChB,IAAK,IAAIwB,KAAWtB,EAClB,GAAqE,OAAhEQ,QAAiBc,EAAQhB,EAAQiB,OAASjB,KAAYC,IAAgB,OAAOC,CACrF,CACJ"}
+{"version":3,"file":"IttyRouter.js","sources":["../src/src/IttyRouter.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAQa,MAAA,UAAU,GAAG,CAKxB,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,KAAK,EAAwB,GAAA,EAAE;AAC9D;AACE,CAAC;AACC,IAAA,SAAS,EAAE,IAAI,KAAK,CAAC,EAAE,EAAE;;QAEvB,GAAG,EAAE,CAAC,MAAW,EAAE,IAAY,EAAE,QAAgB,EAAE,IAAY,KAC7D,CAAC,KAAa,EAAE,GAAG,QAAmD,KACpE,MAAM,CAAC,IAAI,CACT;YACE,IAAI,CAAC,WAAW,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,KAAK;AAC7B,iBAAA,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC;AAC3B,iBAAA,OAAO,CAAC,mBAAmB,EAAE,cAAc,CAAC;AAC5C,iBAAA,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;AACjD,iBAAA,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;AACrB,iBAAA,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC;AACjC,aAAA,GAAA,CAAK,CAAC;;AAEN,YAAA,QAAQ;AACR,YAAA,IAAI;AACL,SAAA,CACF,IAAI,QAAQ;KAClB,CAAC;IACF,MAAM;AACN,IAAA,GAAG,KAAK;AACR,IAAA,MAAM,KAAK,CAAE,OAAoB,EAAE,GAAG,IAAI,EAAA;QACxC,IAAI,QAAQ,EACR,KAAK,EACL,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAC1B,KAAK,GAAwB,OAAO,CAAC,KAAK,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;;QAGpE,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY;YACjC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAI,EAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;;QAGhE,KAAK,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM;YAChD,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM,IAAI,KAAK,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;gBACxF,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAA;AACnC,gBAAA,OAAO,CAAC,KAAK,GAAG,IAAI,CAAA;gBACpB,KAAK,IAAI,OAAO,IAAI,QAAQ;AAC1B,oBAAA,IAAI,CAAC,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI;AAAE,wBAAA,OAAO,QAAQ,CAAA;aAC7F;KACJ;AACF,CAAA;;;;"}

package/IttyRouter.mjs

@@ -1,2 +1,40 @@
-const e=({base:e="",routes:r=[],...o}={})=>({__proto__:new Proxy({},{get:(o,t,a,p)=>(o,...l)=>r.push([t.toUpperCase(),RegExp(`^${(p=(e+o).replace(/\/+(\/|$)/g,"$1")).replace(/(\/?\.?):(\w+)\+/g,"($1(?<$2>*))").replace(/(\/?\.?):(\w+)/g,"($1(?<$2>[^$1/]+?))").replace(/\./g,"\\.").replace(/(\/?)\*/g,"($1.*)?")}/*$`),l,p])&&a}),routes:r,...o,async fetch(e,...o){let t,a,p=new URL(e.url),l=e.query={__proto__:null};for(let[e,r]of p.searchParams)l[e]=l[e]?[].concat(l[e],r):r;for(let[l,c,s,u]of r)if((l==e.method||"ALL"==l)&&(a=p.pathname.match(c))){e.params=a.groups||{},e.route=u;for(let r of s)if(null!=(t=await r(e.proxy??e,...o)))return t}}});export{e as IttyRouter};
+const IttyRouter = ({ base = '', routes = [], ...other } = {}) => 
+// @ts-ignore
+({
+    __proto__: new Proxy({}, {
+        // @ts-expect-error (we're adding an expected prop "path" to the get)
+        get: (target, prop, receiver, path) => (route, ...handlers) => routes.push([
+            prop.toUpperCase(),
+            RegExp(`^${(path = (base + route)
+                .replace(/\/+(\/|$)/g, '$1')) // strip double & trailing splash
+                .replace(/(\/?\.?):(\w+)\+/g, '($1(?<$2>*))') // greedy params
+                .replace(/(\/?\.?):(\w+)/g, '($1(?<$2>[^$1/]+?))') // named params and image format
+                .replace(/\./g, '\\.') // dot in path
+                .replace(/(\/?)\*/g, '($1.*)?') // wildcard
+            }/*$`),
+            // @ts-ignore
+            handlers, // embed handlers
+            path, // embed clean route path
+        ]) && receiver
+    }),
+    routes,
+    ...other,
+    async fetch(request, ...args) {
+        let response, match, url = new URL(request.url), query = request.query = { __proto__: null };
+        // 1. parse query params
+        for (let [k, v] of url.searchParams)
+            query[k] = query[k] ? [].concat(query[k], v) : v;
+        // 2. then test routes
+        for (let [method, regex, handlers, path] of routes)
+            if ((method == request.method || method == 'ALL') && (match = url.pathname.match(regex))) {
+                request.params = match.groups || {}; // embed params in request
+                request.route = path; // embed route path in request
+                for (let handler of handlers)
+                    if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                        return response;
+            }
+    },
+});
+
+export { IttyRouter };
 //# sourceMappingURL=IttyRouter.mjs.map

package/IttyRouter.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"IttyRouter.mjs","sources":["../src/src/IttyRouter.ts"],"sourcesContent":[null],"names":["IttyRouter","base","routes","other","__proto__","Proxy","get","target","prop","receiver","path","route","handlers","push","toUpperCase","RegExp","replace","fetch","request","args","response","match","url","URL","query","k","v","searchParams","concat","method","regex","pathname","params","groups","handler","proxy"],"mappings":"AAQa,MAAAA,EAAa,EAKtBC,OAAO,GAAIC,SAAS,MAAOC,GAA6B,CAAE,KAE5D,CACEC,UAAW,IAAIC,MAAM,GAAI,CAEvBC,IAAK,CAACC,EAAaC,EAAcC,EAAkBC,IACjD,CAACC,KAAkBC,IACjBV,EAAOW,KACL,CACEL,EAAKM,cACLC,OAAO,KAAKL,GAAQT,EAAOU,GACxBK,QAAQ,aAAc,OACtBA,QAAQ,oBAAqB,gBAC7BA,QAAQ,kBAAmB,uBAC3BA,QAAQ,MAAO,OACfA,QAAQ,WAAY,iBAGvBJ,EACAF,KAECD,IAEXP,YACGC,EACH,WAAMc,CAAOC,KAAyBC,GACpC,IAAIC,EACAC,EACAC,EAAM,IAAIC,IAAIL,EAAQI,KACtBE,EAA6BN,EAAQM,MAAQ,CAAEpB,UAAW,MAG9D,IAAK,IAAKqB,EAAGC,KAAMJ,EAAIK,aACrBH,EAAMC,GAAKD,EAAMC,GAAM,GAAgBG,OAAOJ,EAAMC,GAAIC,GAAKA,EAG/D,IAAK,IAAKG,EAAQC,EAAOlB,EAAUF,KAASR,EAC1C,IAAK2B,GAAUX,EAAQW,QAAoB,OAAVA,KAAqBR,EAAQC,EAAIS,SAASV,MAAMS,IAAS,CACxFZ,EAAQc,OAASX,EAAMY,QAAU,CAAA,EACjCf,EAAQP,MAAQD,EAChB,IAAK,IAAIwB,KAAWtB,EAClB,GAAqE,OAAhEQ,QAAiBc,EAAQhB,EAAQiB,OAASjB,KAAYC,IAAgB,OAAOC,CACrF,CACJ"}
+{"version":3,"file":"IttyRouter.mjs","sources":["../src/src/IttyRouter.ts"],"sourcesContent":[null],"names":[],"mappings":"AAQa,MAAA,UAAU,GAAG,CAKxB,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,KAAK,EAAwB,GAAA,EAAE;AAC9D;AACE,CAAC;AACC,IAAA,SAAS,EAAE,IAAI,KAAK,CAAC,EAAE,EAAE;;QAEvB,GAAG,EAAE,CAAC,MAAW,EAAE,IAAY,EAAE,QAAgB,EAAE,IAAY,KAC7D,CAAC,KAAa,EAAE,GAAG,QAAmD,KACpE,MAAM,CAAC,IAAI,CACT;YACE,IAAI,CAAC,WAAW,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,KAAK;AAC7B,iBAAA,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC;AAC3B,iBAAA,OAAO,CAAC,mBAAmB,EAAE,cAAc,CAAC;AAC5C,iBAAA,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;AACjD,iBAAA,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;AACrB,iBAAA,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC;AACjC,aAAA,GAAA,CAAK,CAAC;;AAEN,YAAA,QAAQ;AACR,YAAA,IAAI;AACL,SAAA,CACF,IAAI,QAAQ;KAClB,CAAC;IACF,MAAM;AACN,IAAA,GAAG,KAAK;AACR,IAAA,MAAM,KAAK,CAAE,OAAoB,EAAE,GAAG,IAAI,EAAA;QACxC,IAAI,QAAQ,EACR,KAAK,EACL,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAC1B,KAAK,GAAwB,OAAO,CAAC,KAAK,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;;QAGpE,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY;YACjC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAI,EAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;;QAGhE,KAAK,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM;YAChD,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM,IAAI,KAAK,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;gBACxF,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAA;AACnC,gBAAA,OAAO,CAAC,KAAK,GAAG,IAAI,CAAA;gBACpB,KAAK,IAAI,OAAO,IAAI,QAAQ;AAC1B,oBAAA,IAAI,CAAC,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI;AAAE,wBAAA,OAAO,QAAQ,CAAA;aAC7F;KACJ;AACF,CAAA;;;;"}

package/Router.js

@@ -1,2 +1,60 @@
-"use strict";exports.Router=({base:r="",routes:e=[],...t}={})=>({__proto__:new Proxy({},{get:(t,a,o,c)=>(t,...l)=>e.push([a.toUpperCase?.(),RegExp(`^${(c=(r+t).replace(/\/+(\/|$)/g,"$1")).replace(/(\/?\.?):(\w+)\+/g,"($1(?<$2>*))").replace(/(\/?\.?):(\w+)/g,"($1(?<$2>[^$1/]+?))").replace(/\./g,"\\.").replace(/(\/?)\*/g,"($1.*)?")}/*$`),l,c])&&o}),routes:e,...t,async fetch(r,...a){let o,c,l=new URL(r.url),p=r.query={__proto__:null};for(let[r,e]of l.searchParams)p[r]=p[r]?[].concat(p[r],e):e;r:try{for(let e of t.before||[])if(null!=(o=await e(r.proxy??r,...a)))break r;e:for(let[t,p,f,h]of e)if((t==r.method||"ALL"==t)&&(c=l.pathname.match(p))){r.params=c.groups||{},r.route=h;for(let e of f)if(null!=(o=await e(r.proxy??r,...a)))break e}}catch(e){if(!t.catch)throw e;o=await t.catch(e,r.proxy??r,...a)}try{for(let e of t.finally||[])o=await e(o,r.proxy??r,...a)??o}catch(e){if(!t.catch)throw e;o=await t.catch(e,r.proxy??r,...a)}return o}});
+'use strict';
+
+const Router = ({ base = '', routes = [], ...other } = {}) => ({
+    __proto__: new Proxy({}, {
+        // @ts-expect-error (we're adding an expected prop "path" to the get)
+        get: (target, prop, receiver, path) => (route, ...handlers) => routes.push([
+            prop.toUpperCase?.(),
+            RegExp(`^${(path = (base + route)
+                .replace(/\/+(\/|$)/g, '$1')) // strip double & trailing splash
+                .replace(/(\/?\.?):(\w+)\+/g, '($1(?<$2>*))') // greedy params
+                .replace(/(\/?\.?):(\w+)/g, '($1(?<$2>[^$1/]+?))') // named params and image format
+                .replace(/\./g, '\\.') // dot in path
+                .replace(/(\/?)\*/g, '($1.*)?') // wildcard
+            }/*$`),
+            // @ts-ignore
+            handlers, // embed handlers
+            path, // embed clean route path
+        ]) && receiver
+    }),
+    routes,
+    ...other,
+    async fetch(request, ...args) {
+        let response, match, url = new URL(request.url), query = request.query = { __proto__: null };
+        // 1. parse query params
+        for (let [k, v] of url.searchParams)
+            query[k] = query[k] ? [].concat(query[k], v) : v;
+        t: try {
+            for (let handler of other.before || [])
+                if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                    break t;
+            // 2. then test routes
+            outer: for (let [method, regex, handlers, path] of routes)
+                if ((method == request.method || method == 'ALL') && (match = url.pathname.match(regex))) {
+                    request.params = match.groups || {}; // embed params in request
+                    request.route = path; // embed route path in request
+                    for (let handler of handlers)
+                        if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                            break outer;
+                }
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        try {
+            for (let handler of other.finally || [])
+                response = await handler(response, request.proxy ?? request, ...args) ?? response;
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        return response;
+    },
+});
+
+exports.Router = Router;
 //# sourceMappingURL=Router.js.map

package/Router.js.map

@@ -1 +1 @@
-{"version":3,"file":"Router.js","sources":["../src/src/Router.ts"],"sourcesContent":[null],"names":["base","routes","other","__proto__","Proxy","get","target","prop","receiver","path","route","handlers","push","toUpperCase","RegExp","replace","fetch","request","args","response","match","url","URL","query","k","v","searchParams","concat","t","handler","before","proxy","outer","method","regex","pathname","params","groups","err","catch","finally"],"mappings":"4BAQsB,EAIlBA,OAAO,GAAIC,SAAS,MAAOC,GAAyB,MACrD,CACCC,UAAW,IAAIC,MAAM,GAAI,CAEvBC,IAAK,CAACC,EAAaC,EAAcC,EAAkBC,IACjD,CAACC,KAAkBC,IACjBV,EAAOW,KACL,CACEL,EAAKM,gBACLC,OAAO,KAAKL,GAAQT,EAAOU,GACxBK,QAAQ,aAAc,OACtBA,QAAQ,oBAAqB,gBAC7BA,QAAQ,kBAAmB,uBAC3BA,QAAQ,MAAO,OACfA,QAAQ,WAAY,iBAGvBJ,EACAF,KAECD,IAEXP,YACGC,EACH,WAAMc,CAAOC,KAAyBC,GACpC,IAAIC,EACAC,EACAC,EAAM,IAAIC,IAAIL,EAAQI,KACtBE,EAA6BN,EAAQM,MAAQ,CAAEpB,UAAW,MAG9D,IAAK,IAAKqB,EAAGC,KAAMJ,EAAIK,aACrBH,EAAMC,GAAKD,EAAMC,GAAM,GAAgBG,OAAOJ,EAAMC,GAAIC,GAAKA,EAE/DG,EAAG,IACD,IAAK,IAAIC,KAAW3B,EAAM4B,QAAU,GAClC,GAAqE,OAAhEX,QAAiBU,EAAQZ,EAAQc,OAASd,KAAYC,IAAgB,MAAMU,EAGnFI,EAAO,IAAK,IAAKC,EAAQC,EAAOvB,EAAUF,KAASR,EACjD,IAAKgC,GAAUhB,EAAQgB,QAAoB,OAAVA,KAAqBb,EAAQC,EAAIc,SAASf,MAAMc,IAAS,CACxFjB,EAAQmB,OAAShB,EAAMiB,QAAU,CAAA,EACjCpB,EAAQP,MAAQD,EAEhB,IAAK,IAAIoB,KAAWlB,EAClB,GAAqE,OAAhEQ,QAAiBU,EAAQZ,EAAQc,OAASd,KAAYC,IAAgB,MAAMc,CACpF,CACJ,CAAC,MAAOM,GACP,IAAKpC,EAAMqC,MAAO,MAAMD,EACxBnB,QAAiBjB,EAAMqC,MAAMD,EAAKrB,EAAQc,OAASd,KAAYC,EAChE,CAED,IACE,IAAK,IAAIW,KAAW3B,EAAMsC,SAAW,GACnCrB,QAAiBU,EAAQV,EAAUF,EAAQc,OAASd,KAAYC,IAASC,CAC5E,CAAC,MAAMmB,GACN,IAAKpC,EAAMqC,MAAO,MAAMD,EACtBnB,QAAiBjB,EAAMqC,MAAMD,EAAKrB,EAAQc,OAASd,KAAYC,EAClE,CAED,OAAOC,CACR"}
+{"version":3,"file":"Router.js","sources":["../src/src/Router.ts"],"sourcesContent":[null],"names":[],"mappings":";;MAQa,MAAM,GAAG,CAIpB,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,KAAK,KAAoB,EAAE,MACvD;AACC,IAAA,SAAS,EAAE,IAAI,KAAK,CAAC,EAAE,EAAE;;QAEvB,GAAG,EAAE,CAAC,MAAW,EAAE,IAAY,EAAE,QAAgB,EAAE,IAAY,KAC7D,CAAC,KAAa,EAAE,GAAG,QAA6C,KAC9D,MAAM,CAAC,IAAI,CACT;YACE,IAAI,CAAC,WAAW,IAAI;YACpB,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,KAAK;AAC7B,iBAAA,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC;AAC3B,iBAAA,OAAO,CAAC,mBAAmB,EAAE,cAAc,CAAC;AAC5C,iBAAA,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;AACjD,iBAAA,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;AACrB,iBAAA,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC;AACjC,aAAA,GAAA,CAAK,CAAC;;AAEN,YAAA,QAAQ;AACR,YAAA,IAAI;AACL,SAAA,CACF,IAAI,QAAQ;KAClB,CAAC;IACF,MAAM;AACN,IAAA,GAAG,KAAK;AACR,IAAA,MAAM,KAAK,CAAE,OAAoB,EAAE,GAAG,IAAS,EAAA;QAC7C,IAAI,QAAQ,EACR,KAAK,EACL,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAC1B,KAAK,GAAwB,OAAO,CAAC,KAAK,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAA;;QAGpE,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY;YACjC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAI,EAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;QAEhE,CAAC,EAAE,IAAI;AACL,YAAA,KAAK,IAAI,OAAO,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE;AACpC,gBAAA,IAAI,CAAC,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI;AAAE,oBAAA,MAAM,CAAC,CAAA;;AAGpF,YAAA,KAAK,EAAE,KAAK,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,MAAM;gBACvD,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM,IAAI,KAAK,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;oBACxF,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAA;AACnC,oBAAA,OAAO,CAAC,KAAK,GAAG,IAAI,CAAA;oBAEpB,KAAK,IAAI,OAAO,IAAI,QAAQ;AAC1B,wBAAA,IAAI,CAAC,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI;AAAE,4BAAA,MAAM,KAAK,CAAA;iBACzF;SACJ;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,KAAK;AAAE,gBAAA,MAAM,GAAG,CAAA;AAC3B,YAAA,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;SACrE;AAED,QAAA,IAAI;AACF,YAAA,KAAK,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,EAAE;AACrC,gBAAA,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,QAAQ,CAAA;SACpF;QAAC,OAAM,GAAQ,EAAE;YAChB,IAAI,CAAC,KAAK,CAAC,KAAK;AAAE,gBAAA,MAAM,GAAG,CAAA;AACzB,YAAA,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,IAAI,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;SACvE;AAED,QAAA,OAAO,QAAQ,CAAA;KAChB;AACgC,CAAA;;;;"}

package/Router.mjs

@@ -1,2 +1,58 @@
-const r=({base:r="",routes:e=[],...a}={})=>({__proto__:new Proxy({},{get:(a,t,o,c)=>(a,...l)=>e.push([t.toUpperCase?.(),RegExp(`^${(c=(r+a).replace(/\/+(\/|$)/g,"$1")).replace(/(\/?\.?):(\w+)\+/g,"($1(?<$2>*))").replace(/(\/?\.?):(\w+)/g,"($1(?<$2>[^$1/]+?))").replace(/\./g,"\\.").replace(/(\/?)\*/g,"($1.*)?")}/*$`),l,c])&&o}),routes:e,...a,async fetch(r,...t){let o,c,l=new URL(r.url),p=r.query={__proto__:null};for(let[r,e]of l.searchParams)p[r]=p[r]?[].concat(p[r],e):e;r:try{for(let e of a.before||[])if(null!=(o=await e(r.proxy??r,...t)))break r;e:for(let[a,p,f,h]of e)if((a==r.method||"ALL"==a)&&(c=l.pathname.match(p))){r.params=c.groups||{},r.route=h;for(let e of f)if(null!=(o=await e(r.proxy??r,...t)))break e}}catch(e){if(!a.catch)throw e;o=await a.catch(e,r.proxy??r,...t)}try{for(let e of a.finally||[])o=await e(o,r.proxy??r,...t)??o}catch(e){if(!a.catch)throw e;o=await a.catch(e,r.proxy??r,...t)}return o}});export{r as Router};
+const Router = ({ base = '', routes = [], ...other } = {}) => ({
+    __proto__: new Proxy({}, {
+        // @ts-expect-error (we're adding an expected prop "path" to the get)
+        get: (target, prop, receiver, path) => (route, ...handlers) => routes.push([
+            prop.toUpperCase?.(),
+            RegExp(`^${(path = (base + route)
+                .replace(/\/+(\/|$)/g, '$1')) // strip double & trailing splash
+                .replace(/(\/?\.?):(\w+)\+/g, '($1(?<$2>*))') // greedy params
+                .replace(/(\/?\.?):(\w+)/g, '($1(?<$2>[^$1/]+?))') // named params and image format
+                .replace(/\./g, '\\.') // dot in path
+                .replace(/(\/?)\*/g, '($1.*)?') // wildcard
+            }/*$`),
+            // @ts-ignore
+            handlers, // embed handlers
+            path, // embed clean route path
+        ]) && receiver
+    }),
+    routes,
+    ...other,
+    async fetch(request, ...args) {
+        let response, match, url = new URL(request.url), query = request.query = { __proto__: null };
+        // 1. parse query params
+        for (let [k, v] of url.searchParams)
+            query[k] = query[k] ? [].concat(query[k], v) : v;
+        t: try {
+            for (let handler of other.before || [])
+                if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                    break t;
+            // 2. then test routes
+            outer: for (let [method, regex, handlers, path] of routes)
+                if ((method == request.method || method == 'ALL') && (match = url.pathname.match(regex))) {
+                    request.params = match.groups || {}; // embed params in request
+                    request.route = path; // embed route path in request
+                    for (let handler of handlers)
+                        if ((response = await handler(request.proxy ?? request, ...args)) != null)
+                            break outer;
+                }
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        try {
+            for (let handler of other.finally || [])
+                response = await handler(response, request.proxy ?? request, ...args) ?? response;
+        }
+        catch (err) {
+            if (!other.catch)
+                throw err;
+            response = await other.catch(err, request.proxy ?? request, ...args);
+        }
+        return response;
+    },
+});
+
+export { Router };
 //# sourceMappingURL=Router.mjs.map

package/Router.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Router.mjs","sources":["../src/src/Router.ts"],"sourcesContent":[null],"names":["Router","base","routes","other","__proto__","Proxy","get","target","prop","receiver","path","route","handlers","push","toUpperCase","RegExp","replace","fetch","request","args","response","match","url","URL","query","k","v","searchParams","concat","t","handler","before","proxy","outer","method","regex","pathname","params","groups","err","catch","finally"],"mappings":"MAQaA,EAAS,EAIlBC,OAAO,GAAIC,SAAS,MAAOC,GAAyB,MACrD,CACCC,UAAW,IAAIC,MAAM,GAAI,CAEvBC,IAAK,CAACC,EAAaC,EAAcC,EAAkBC,IACjD,CAACC,KAAkBC,IACjBV,EAAOW,KACL,CACEL,EAAKM,gBACLC,OAAO,KAAKL,GAAQT,EAAOU,GACxBK,QAAQ,aAAc,OACtBA,QAAQ,oBAAqB,gBAC7BA,QAAQ,kBAAmB,uBAC3BA,QAAQ,MAAO,OACfA,QAAQ,WAAY,iBAGvBJ,EACAF,KAECD,IAEXP,YACGC,EACH,WAAMc,CAAOC,KAAyBC,GACpC,IAAIC,EACAC,EACAC,EAAM,IAAIC,IAAIL,EAAQI,KACtBE,EAA6BN,EAAQM,MAAQ,CAAEpB,UAAW,MAG9D,IAAK,IAAKqB,EAAGC,KAAMJ,EAAIK,aACrBH,EAAMC,GAAKD,EAAMC,GAAM,GAAgBG,OAAOJ,EAAMC,GAAIC,GAAKA,EAE/DG,EAAG,IACD,IAAK,IAAIC,KAAW3B,EAAM4B,QAAU,GAClC,GAAqE,OAAhEX,QAAiBU,EAAQZ,EAAQc,OAASd,KAAYC,IAAgB,MAAMU,EAGnFI,EAAO,IAAK,IAAKC,EAAQC,EAAOvB,EAAUF,KAASR,EACjD,IAAKgC,GAAUhB,EAAQgB,QAAoB,OAAVA,KAAqBb,EAAQC,EAAIc,SAASf,MAAMc,IAAS,CACxFjB,EAAQmB,OAAShB,EAAMiB,QAAU,CAAA,EACjCpB,EAAQP,MAAQD,EAEhB,IAAK,IAAIoB,KAAWlB,EAClB,GAAqE,OAAhEQ,QAAiBU,EAAQZ,EAAQc,OAASd,KAAYC,IAAgB,MAAMc,CACpF,CACJ,CAAC,MAAOM,GACP,IAAKpC,EAAMqC,MAAO,MAAMD,EACxBnB,QAAiBjB,EAAMqC,MAAMD,EAAKrB,EAAQc,OAASd,KAAYC,EAChE,CAED,IACE,IAAK,IAAIW,KAAW3B,EAAMsC,SAAW,GACnCrB,QAAiBU,EAAQV,EAAUF,EAAQc,OAASd,KAAYC,IAASC,CAC5E,CAAC,MAAMmB,GACN,IAAKpC,EAAMqC,MAAO,MAAMD,EACtBnB,QAAiBjB,EAAMqC,MAAMD,EAAKrB,EAAQc,OAASd,KAAYC,EAClE,CAED,OAAOC,CACR"}
+{"version":3,"file":"Router.mjs","sources":["../src/src/Router.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}