itty-router 2.5.1 → 2.5.2

package/CHANGELOG.md

@@ -3,6 +3,7 @@ Until this library makes it to a production release of v1.x, **minor versions ma
 
 [@SupremeTechnopriest)(https://github.com/SupremeTechnopriest) - improved TypeScript support and documentation! :D\
 
+- **v2.5.2** - fixes issue with arrow functions in CommonJS named exports (rare issue)
 - **v2.5.1** - added context to Cloudflare ES module syntax example (credit [@jcapogna](https://github.com/jcapogna))
 - **v2.5.0** - improved TypeScript docs/types (thanks [@SupremeTechnopriest](https://github.com/SupremeTechnopriest)!)
 - **v2.4.9** - fixed the cursed "optional" file format capturing bug - RIP all the bytes lost

package/README.md

@@ -301,7 +301,7 @@ export default {
 export default {
   fetch: (...args) => router
                         .handle(...args)
-                        .then(response => 
+                        .then(response =>
                           // can modify response here before final return, e.g. CORS headers
 
                           return response
@@ -452,7 +452,7 @@ const router = Router<Request, IMethods>() // Valid
 const router = Router<void, IMethods>() // Valid
 ```
 
-The router will also accept any string as a method, not just those provided on the `TMethods` type. 
+The router will also accept any string as a method, not just those provided on the `TMethods` type.
 
 ```ts
 import { Router, Route } from 'itty-router'
@@ -507,36 +507,38 @@ router.puppy('/', request => {}) // Strongly typed
 
 ### The Entire Code (for more legibility, [see src on GitHub](https://github.com/kwhitley/itty-router/blob/v2.x/src/itty-router.js))
 ```js
-const Router = ({ base = '', routes = [] } = {}) => ({
-  __proto__: new Proxy({}, {
-    get: (t, k, c) => (p, ...H) =>
-      routes.push([
-        k.toUpperCase(),
-        RegExp(`^${(base + p)
-          .replace(/(\/?)\*/g, '($1.*)?')
-          .replace(/\/$/, '')
-          .replace(/:(\w+)(\?)?(\.)?/g, '$2(?<$1>[^/]+)$2$3')
-          .replace(/\.(?=[\w(])/, '\\.')
-          .replace(/\)\.\?\(([^\[]+)\[\^/g, '?)\\.?($1(?<=\\.)[^\\.')
-        }/*$`),
-        H,
-      ]) && c
-  }),
-  routes,
-  async handle (q, ...a) {
-    let s, m,
-        u = new URL(q.url)
-    q.query = Object.fromEntries(u.searchParams)
-    for (let [M, p, H] of routes) {
-      if ((M === q.method || M === 'ALL') && (m = u.pathname.match(p))) {
-        q.params = m.groups
-        for (let h of H) {
-          if ((s = await h(q.proxy || q, ...a)) !== undefined) return s
+function Router({ base = '', routes = [] } = {}) {
+  return {
+    __proto__: new Proxy({}, {
+      get: (t, k, c) => (p, ...H) =>
+        routes.push([
+          k.toUpperCase(),
+          RegExp(`^${(base + p)
+            .replace(/(\/?)\*/g, '($1.*)?')
+            .replace(/\/$/, '')
+            .replace(/:(\w+)(\?)?(\.)?/g, '$2(?<$1>[^/]+)$2$3')
+            .replace(/\.(?=[\w(])/, '\\.')
+            .replace(/\)\.\?\(([^\[]+)\[\^/g, '?)\\.?($1(?<=\\.)[^\\.') // RIP all the bytes lost :'(
+          }/*$`),
+          H,
+        ]) && c
+    }),
+    routes,
+    async handle (q, ...a) {
+      let s, m,
+          u = new URL(q.url)
+      q.query = Object.fromEntries(u.searchParams)
+      for (let [M, p, H] of routes) {
+        if ((M === q.method || M === 'ALL') && (m = u.pathname.match(p))) {
+          q.params = m.groups
+          for (let h of H) {
+            if ((s = await h(q.proxy || q, ...a)) !== undefined) return s
+          }
         }
       }
     }
   }
-})
+}
 ```
 
 ## Special Thanks
@@ -575,8 +577,8 @@ These folks are the real heroes, making open source the powerhouse that it is!
 - [@technoyes](https://github.com/technoyes) - three kind-of-a-big-deal errors fixed.  Imagine the look on my face... thanks man!! :)
 - [@roojay520](https://github.com/roojay520) - TS interface fixes
 #### Documentation
-- [@arunsathiya](https://github.com/arunsathiya), 
-  [@poacher2k](https://github.com/poacher2k), 
-  [@ddarkr](https://github.com/ddarkr), 
+- [@arunsathiya](https://github.com/arunsathiya),
+  [@poacher2k](https://github.com/poacher2k),
+  [@ddarkr](https://github.com/ddarkr),
   [@kclauson](https://github.com/kclauson),
   [@jcapogna](https://github.com/jcapogna)

package/dist/itty-router.min.js

@@ -1 +1 @@
-module.exports={Router:({base:p="",routes:u=[]}={})=>({__proto__:new Proxy({},{get:(e,a,o)=>(e,...r)=>u.push([a.toUpperCase(),RegExp(`^${(p+e).replace(/(\/?)\*/g,"($1.*)?").replace(/\/$/,"").replace(/:(\w+)(\?)?(\.)?/g,"$2(?<$1>[^/]+)$2$3").replace(/\.(?=[\w(])/,"\\.").replace(/\)\.\?\(([^\[]+)\[\^/g,"?)\\.?($1(?<=\\.)[^\\.")}/*$`),r])&&o}),routes:u,async handle(e,...r){let a,o,p=new URL(e.url);e.query=Object.fromEntries(p.searchParams);for(var[t,s,c]of u)if((t===e.method||"ALL"===t)&&(o=p.pathname.match(s))){e.params=o.groups;for(var l of c)if(void 0!==(a=await l(e.proxy||e,...r)))return a}}})};
+module.exports={Router:function({base:t="",routes:n=[]}={}){return{__proto__:new Proxy({},{get:(e,a,o)=>(e,...r)=>n.push([a.toUpperCase(),RegExp(`^${(t+e).replace(/(\/?)\*/g,"($1.*)?").replace(/\/$/,"").replace(/:(\w+)(\?)?(\.)?/g,"$2(?<$1>[^/]+)$2$3").replace(/\.(?=[\w(])/,"\\.").replace(/\)\.\?\(([^\[]+)\[\^/g,"?)\\.?($1(?<=\\.)[^\\.")}/*$`),r])&&o}),routes:n,async handle(e,...r){let a,o,t=new URL(e.url);e.query=Object.fromEntries(t.searchParams);for(var[p,s,u]of n)if((p===e.method||"ALL"===p)&&(o=t.pathname.match(s))){e.params=o.groups;for(var c of u)if(void 0!==(a=await c(e.proxy||e,...r)))return a}}}}};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itty-router",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Tiny, zero-dependency router with route param and query parsing - built for Cloudflare Workers, but works everywhere!",
   "main": "./dist/itty-router.min.js",
   "types": "./dist/itty-router.d.ts",