router-http 0.0.0 → 0.1.0

package/README.md

@@ -1,15 +1,15 @@
-# http-router
+# router-http
 
-![Last version](https://img.shields.io/github/tag/Kikobeats/http-router.svg?style=flat-square)
-[![Coverage Status](https://img.shields.io/coveralls/Kikobeats/http-router.svg?style=flat-square)](https://coveralls.io/github/Kikobeats/http-router)
-[![NPM Status](https://img.shields.io/npm/dm/http-router.svg?style=flat-square)](https://www.npmjs.org/package/http-router)
+![Last version](https://img.shields.io/github/tag/Kikobeats/router-http.svg?style=flat-square)
+[![Coverage Status](https://img.shields.io/coveralls/Kikobeats/router-http.svg?style=flat-square)](https://coveralls.io/github/Kikobeats/router-http)
+[![NPM Status](https://img.shields.io/npm/dm/router-http.svg?style=flat-square)](https://www.npmjs.org/package/router-http)
 
 An HTTP router focused in only that, similar to [express@router](https://github.com/pillarjs/router), but:
 
 - Focused in just one thing.
 - Maintained and well tested.
-- Most of the API is supported.
-- Smaller and portable (less 50kbs).
+- Smaller and portable (1.4 kB).
+- Most of router API is supported.
 
 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).
 
@@ -17,14 +17,11 @@ While I was evaluating the market for finding an alternative I found [polka](htt
 
 - 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.
-- This module doesn't adds `req.query` nor `req.search` (check [to-query](https://github.com/Kikobeats/to-query) for that).
-
-In resume: this module does nothing beyond finding the correct path and matching the associated code.
 
 ## Install
 
 ```bash
-$ npm install http-router --save
+$ npm install router-http --save
 ```
 
 ## Usage
@@ -32,7 +29,7 @@ $ npm install http-router --save
 First, you should to create a router:
 
 ```js
-const createRouter = require('http-router')
+const createRouter = require('router-http')
 
 const router = createRouter((err, req, res) => {
   const hasError = err !== undefined
@@ -142,7 +139,7 @@ See [benchmark](/benchmark) sections.
 
 ## License
 
-**http-router** © [Kiko Beats](https://kikobeats.com), released under the [MIT](https://github.com/Kikobeats/http-router/blob/master/LICENSE.md) License.<br>
-Authored and maintained by [Kiko Beats](https://kikobeats.com) with help from [contributors](https://github.com/Kikobeats/http-router/contributors).
+**router-http** © [Kiko Beats](https://kikobeats.com), released under the [MIT](https://github.com/Kikobeats/router-http/blob/master/LICENSE.md) License.<br>
+Authored and maintained by [Kiko Beats](https://kikobeats.com) with help from [contributors](https://github.com/Kikobeats/router-http/contributors).
 
 > [kikobeats.com](https://kikobeats.com) · GitHub [Kiko Beats](https://github.com/Kikobeats) · Twitter [@Kikobeats](https://twitter.com/Kikobeats)

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "router-http",
   "description": "Simple HTTP router compatible with Express",
-  "homepage": "https://nicedoc.io/Kikobeats/http-router",
-  "version": "0.0.0",
+  "homepage": "https://nicedoc.io/Kikobeats/router-http",
+  "version": "0.1.0",
   "main": "src/index.js",
   "author": {
     "email": "josefrancisco.verdu@gmail.com",
@@ -11,10 +11,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Kikobeats/http-router.git"
+    "url": "git+https://github.com/Kikobeats/router-http.git"
   },
   "bugs": {
-    "url": "https://github.com/Kikobeats/http-router/issues"
+    "url": "https://github.com/Kikobeats/router-http/issues"
   },
   "keywords": [
     "app",

package/src/index.js

@@ -16,6 +16,17 @@ const value = x => {
   return y > 1 ? x.substring(0, y) : x
 }
 
+const parse = ({ url }) => {
+  const index = url.indexOf('?', 1)
+  const obj = { pathname: url, query: null, search: null }
+  if (index !== -1) {
+    obj.search = url.substring(index)
+    obj.query = obj.search.substring(1)
+    obj.pathname = url.substring(0, index)
+  }
+  return obj
+}
+
 const mutate = (str, req) => {
   req.url = req.url.substring(str.length) || '/'
   req.path = req.path.substring(str.length) || '/'
@@ -53,6 +64,7 @@ class Router extends Trouter {
       base = lead(base)
       fns.forEach(fn => {
         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)
       })
@@ -60,12 +72,12 @@ class Router extends Trouter {
     return this
   }
 
-  handler = (req, res, pathname) => {
-    pathname = pathname || req.url
+  handler = (req, res, info) => {
+    info = info || parse(req)
     let fns = []
     let middlewares = this.#middlewares
-    const route = this.find(req.method, pathname)
-    const base = value((req.path = pathname))
+    const route = this.find(req.method, info.pathname)
+    const base = value((req.path = info.pathname))
     if (this.#middlewaresBy[base] !== undefined) {
       middlewares = middlewares.concat(this.#middlewaresBy[base])
     }
@@ -74,6 +86,8 @@ class Router extends Trouter {
       req.params = { ...req.params, ...route.params }
     }
     fns.push(this.unhandler)
+    req.search = info.search
+    req.query = info.query
     // Exit if only a single function
     let i = 0
     let len = middlewares.length