router-http 0.1.1 → 0.1.3

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
 

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.1",
+  "version": "0.1.3",
   "main": "src/index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",

package/src/index.js

@@ -56,13 +56,13 @@ class Router extends Trouter {
    * .use('/v2', two)
    */
   use = (base = '/', ...fns) => {
-    if (typeof base === 'function') {
-      this.#middlewares = this.#middlewares.concat(base, fns)
+    if (typeof base === 'function' || typeof base === 'boolean') {
+      this.#middlewares = this.#middlewares.concat(base, fns).filter(Boolean)
     } else if (base === '/') {
-      this.#middlewares = this.#middlewares.concat(fns)
+      this.#middlewares = this.#middlewares.concat(fns).filter(Boolean)
     } else {
       base = lead(base)
-      fns.forEach(fn => {
+      fns.filter(Boolean).forEach(fn => {
         const array = this.#middlewaresBy[base] ?? []
         // eslint-disable-next-line no-sequences
         array.length > 0 || array.push((r, _, nxt) => (mutate(base, r), nxt()))
@@ -89,26 +89,30 @@ class Router extends Trouter {
     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
   }
 }