Fixing nested router urls handling (#23)

* updating dependencies
* adding github actions
* fixing nested router urls handling

Author: jkyberneees

.github/workflows/tests.yaml

@@ -0,0 +1,21 @@
+name: tests
+on: [push, pull_request]
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Environment (Using NodeJS 16.x)
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Linting
+        run: npx standard
+
+      - name: Run tests
+        run: npm run test

lib/next.js

@@ -25,6 +25,9 @@ function next (middlewares, req, res, index, routers = {}, defaultRoute, errorHa
         req.preRouterPath = req.path
 
         req.url = req.url.replace(pattern, '')
+        if (!req.url.startsWith('/')) {
+          req.url = '/' + req.url
+        }
       }
 
       return middleware.lookup(req, res, step)

lib/router/sequential.js

@@ -1,7 +1,7 @@
 const Trouter = require('trouter')
 const next = require('./../next')
 const LRU = require('lru-cache')
-const parse = require('regexparam')
+const { parse } = require('regexparam')
 const queryparams = require('../utils/queryparams')
 
 module.exports = (config = {}) => {

package.json

@@ -28,12 +28,12 @@
   },
   "homepage": "https://github.com/jkyberneees/0http#readme",
   "devDependencies": {
-    "body-parser": "^1.19.0",
-    "chai": "^4.3.4",
-    "find-my-way": "^4.3.3",
-    "mocha": "^9.1.3",
+    "body-parser": "^1.19.1",
+    "chai": "^4.3.6",
+    "find-my-way": "^5.2.0",
+    "mocha": "^9.2.0",
     "nyc": "^15.1.0",
-    "supertest": "^6.1.6"
+    "supertest": "^6.2.2"
   },
   "files": [
     "LICENSE",
@@ -43,6 +43,7 @@
   ],
   "dependencies": {
     "lru-cache": "^6.0.0",
+    "regexparam": "^2.0.0",
     "trouter": "^3.2.0"
   }
 }

tests/nested-routers.test.js

@@ -15,6 +15,10 @@ describe('0http Web Framework - Nested Routers', () => {
       req.body = req.url
       next()
     })
+    router1.get('/', (req, res, next) => {
+      req.body = req.url
+      next()
+    })
 
     router.use(async (req, res, next) => {
       try {
@@ -63,6 +67,24 @@ describe('0http Web Framework - Nested Routers', () => {
       })
   })
 
+  it('should hit GET /url?format=json on nested router /r1', async () => {
+    await request(baseUrl)
+      .get('/r1/url?format=json')
+      .expect(200)
+      .then((response) => {
+        expect(response.text).to.equal('/r1/url?format=json:/url?format=json')
+      })
+  })
+
+  it('should hit GET /?format=json on nested router /r1', async () => {
+    await request(baseUrl)
+      .get('/r1/?format=json')
+      .expect(200)
+      .then((response) => {
+        expect(response.text).to.equal('/r1/?format=json:/?format=json')
+      })
+  })
+
   it('should hit GET /url/:age on nested router /r2/:name', async () => {
     await request(baseUrl)
       .get('/r2/rolando/url/33?var=value')