router-http 0.1.0 → 0.1.2

package/README.md

@@ -13,10 +13,7 @@ An HTTP router focused in only that, similar to [express@router](https://github.
 
 Don't get me wrong: The original Express router is a piece of art. I used it for years and I just considered create this library after experienced a bug that never was addressed in the stable version due to the [lack of maintenance](https://github.com/pillarjs/router/pull/60).
 
-While I was evaluating the market for finding an alternative I found [polka](https://github.com/lukeed/polka/tree/master/packages/polka) was a good starting point for creating a replacement. This module is different than polka in some aspects:
-
-- This module doesn't take care about the http.Server.
-- This module doesn't use any of the Node.js built-in module, so it can be used in Vercel Edge Functions, Deno or CF Workers.
+While I was evaluating the market for finding an alternative, I found [polka](https://github.com/lukeed/polka/tree/master/packages/polka) was a good starting point for creating a replacement. This module is different from polka in it isn't taking care about http.Server, it just acts as an isolated module.
 
 ## Install
 
@@ -31,8 +28,8 @@ First, you should to create a router:
 ```js
 const createRouter = require('router-http')
 
-const router = createRouter((err, req, res) => {
-  const hasError = err !== undefined
+const router = createRouter((error, req, res) => {
+  const hasError = error !== undefined
   res.statusCode = hasError ? 500 : 404
   res.end(hasError ? err.message : 'Not Found')
 })

package/package.json

@@ -2,7 +2,7 @@
   "name": "router-http",
   "description": "Simple HTTP router compatible with Express",
   "homepage": "https://nicedoc.io/Kikobeats/router-http",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "main": "src/index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",

package/src/index.js

@@ -28,8 +28,8 @@ const parse = ({ url }) => {
 }
 
 const mutate = (str, req) => {
-  req.url = req.url.substring(str.length) || '/'
-  req.path = req.path.substring(str.length) || '/'
+  req.url = req.url.substring(str.length) ?? '/'
+  req.path = req.path.substring(str.length) ?? '/'
 }
 
 class Router extends Trouter {
@@ -63,7 +63,7 @@ class Router extends Trouter {
     } else {
       base = lead(base)
       fns.forEach(fn => {
-        const array = this.#middlewaresBy[base] || []
+        const array = this.#middlewaresBy[base] ?? []
         // eslint-disable-next-line no-sequences
         array.length > 0 || array.push((r, _, nxt) => (mutate(base, r), nxt()))
         this.#middlewaresBy[base] = array.concat(fn)
@@ -73,7 +73,7 @@ class Router extends Trouter {
   }
 
   handler = (req, res, info) => {
-    info = info || parse(req)
+    info = info ?? parse(req)
     let fns = []
     let middlewares = this.#middlewares
     const route = this.find(req.method, info.pathname)
@@ -86,29 +86,33 @@ class Router extends Trouter {
       req.params = { ...req.params, ...route.params }
     }
     fns.push(this.unhandler)
-    req.search = info.search
-    req.query = info.query
+    req.search = req.query ?? info.search
+    req.query = req.query ?? info.query
     // Exit if only a single function
-    let i = 0
-    let len = middlewares.length
+    let index = 0
+    let size = middlewares.length
     const num = fns.length
-    if (len === i && num === 1) return fns[0](undefined, req, res)
+    if (size === index && num === 1) return fns[0](undefined, req, res)
 
     // Otherwise loop thru all middlware
     const next = err => (err ? this.unhandler(err, req, res, next) : loop())
 
-    const loop = () => {
-      if (res.writableEnded) return
-      if (i >= len) return
-      try {
-        return middlewares[i++](req, res, next)
-      } catch (err) {
-        return next(err)
-      }
-    }
+    const loop = () =>
+      res.writableEnded ||
+      (index < size &&
+        (() => {
+          try {
+            const mware = middlewares[index++]
+            return index === size
+              ? mware(undefined, req, res, next)
+              : mware(req, res, next)
+          } catch (err) {
+            return this.unhandler(err, req, res, next)
+          }
+        })())
 
     middlewares = middlewares.concat(fns)
-    len += num
+    size += num
     loop() // init
   }
 }