@ditojs/router 3.0.0 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/router",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "type": "module",
   "description": "Dito.js Router – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/main/packages/router",
@@ -11,7 +11,9 @@
     ".": "./src/index.js"
   },
   "files": [
-    "src/"
+    "src/",
+    "!src/**/*.test.js",
+    "!src/**/__snapshots__/"
   ],
   "engines": {
     "node": ">= 24.0.0"
@@ -20,7 +22,7 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/utils": "^3.0.0"
+    "@ditojs/utils": "^3.1.1"
   },
   "keywords": [
     "route",
@@ -29,5 +31,5 @@
     "koa",
     "dito"
   ],
-  "gitHead": "399f683a6ca227a03cfc0978fee9055383e6b3d8"
+  "gitHead": "acce85bb38d817aab18f9d5d03b3aa9dff00c3f9"
 }

package/src/Router.test.js

@@ -1,824 +0,0 @@
-import Router from './Router.js'
-import { deindent, shuffle } from '@ditojs/utils'
-import http from 'http'
-
-describe('Router', () => {
-  const handler = () => {}
-
-  let router
-  beforeEach(() => {
-    router = new Router()
-  })
-
-  let result
-  describe('API', () => {
-    describe.each([
-      'get', 'put', 'post', 'delete', 'head', 'patch', 'options', 'trace',
-      'connect'
-    ])(
-      'supports %s() short-cut',
-      method => {
-        it('reports correct allowed methods', () => {
-          router[method]('/', () => {})
-          expect(router.getAllowedMethods()).toStrictEqual(
-            [method.toUpperCase()]
-          )
-        })
-      }
-    )
-
-    it('supports all() short-cut', () => {
-      router.all('/', () => {})
-      expect(router.getAllowedMethods()).toEqual(http.METHODS)
-    })
-
-    it('returns allowed methods', () => {
-      router.add('GET', '/', () => {})
-      expect(router.getAllowedMethods()).toStrictEqual(['GET'])
-      expect(router.getAllowedMethods('/')).toStrictEqual(['GET'])
-    })
-
-    it('does not count routes without handlers for allowed methods', () => {
-      router.add('GET', '/')
-      expect(router.getAllowedMethods('/')).toStrictEqual([])
-    })
-
-    it('allows excluding methods when getting allowed methods', () => {
-      router.add('GET', '/', () => {})
-      router.add('POST', '/', () => {})
-      expect(router.getAllowedMethods('/', 'GET')).toStrictEqual(['POST'])
-    })
-
-    it('normalizes paths', () => {
-      expect(router.normalizePath('/')).toBe('/')
-      expect(router.normalizePath('/no-trailing/')).toBe('/no-trailing')
-      expect(router.normalizePath('/no/trailing/')).toBe('/no/trailing')
-      expect(router.normalizePath('/some/trailing//')).toBe('/some/trailing/')
-      expect(router.normalizePath('/some/trailing///')).toBe('/some/trailing//')
-      expect(router.normalizePath('wacky-path')).toBe('/wacky-path')
-      expect(router.normalizePath('//like-whatever')).toBe('//like-whatever')
-    })
-  })
-
-  it('supports prefix for path normalization', () => {
-    router = new Router({ prefix: '/bla' })
-    expect(router.normalizePath('/')).toBe('/bla/')
-    expect(router.normalizePath('/no-trailing/')).toBe('/bla/no-trailing')
-    expect(router.normalizePath('wacky-path')).toBe('/bla/wacky-path')
-    expect(router.normalizePath('//like-whatever')).toBe('/bla//like-whatever')
-  })
-
-  it('does not normalize paths in strict mode', () => {
-    router = new Router({ strict: true })
-    expect(router.normalizePath('/')).toBe('/')
-    expect(router.normalizePath('/trailing/')).toBe('/trailing/')
-    expect(router.normalizePath('/more/trailing//')).toBe('/more/trailing//')
-    expect(router.normalizePath('/more/trailing///')).toBe('/more/trailing///')
-    expect(router.normalizePath('wacky-path')).toBe('wacky-path')
-    expect(router.normalizePath('//like-whatever')).toBe('//like-whatever')
-  })
-
-  it('returns empty string with no routes', () => {
-    expect(router.toString()).toStrictEqual('')
-  })
-
-  it('handles static routes', () => {
-    const getHandler = () => {}
-    const putHandler = () => {}
-    router.add('GET', '/folders/files/bolt.gif', getHandler)
-    router.add('PUT', '/folders/files/bolt.gif', putHandler)
-
-    expect(router.toString()).toBe(
-      deindent`
-        / children=1
-        └── folders/files/bolt.gif getHandler() children=0
-      `.trim()
-    )
-
-    result = router.find('GET', '/folders/files/bolt.gif')
-    expect(result.handler).toBe(getHandler)
-    expect(result.status).toBe(200)
-
-    result = router.find('GET', '/folders/files/bolt.hash.gif')
-    expect(result.handler).toBeUndefined()
-    expect(result.allowed).toStrictEqual([])
-    expect(result.status).toBe(404)
-
-    result = router.find('GET', '/folders/bolt .gif')
-    expect(result.handler).toBeUndefined()
-    expect(result.status).toBe(404)
-
-    result = router.find('PUT', '/folders/files/bolt.gif')
-    expect(result.handler).toBe(putHandler)
-    expect(result.status).toBe(200)
-
-    result = router.find('PUT', '/folders/files/bolt.hash.gif')
-    expect(result.handler).toBeUndefined()
-    expect(result.status).toBe(405)
-    expect(result.allowed).toStrictEqual([])
-
-    result = router.find('POST', '/folders/files/bolt.gif')
-    expect(result.handler).toBeUndefined()
-    expect(result.status).toBe(501)
-    expect(result.allowed).toStrictEqual(['GET', 'PUT'])
-  })
-
-  it('handles match-any nodes (catch-all)', () => {
-    router.add('GET', '/static/**', handler)
-
-    expect(router.toString()).toBe(
-      deindent`
-        / children=1
-        └── static/ children=1
-            └── ** handler() children=0
-      `.trim()
-    )
-
-    result = router.find('GET', '/static')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/static/*')
-    expect(result.handler).toBe(handler)
-
-    result = router.find('GET', '/static/js')
-    expect(result.handler).toBe(handler)
-    expect(result.params).toEqual({
-      $$: 'js'
-    })
-
-    result = router.find('GET', '/static/css')
-    expect(result.handler).toBe(handler)
-    expect(result.params).toEqual({
-      $$: 'css'
-    })
-  })
-
-  it('handles match-any nodes (wildcard)', () => {
-    router.add('GET', '/prefix/*/suffix', handler)
-
-    expect(router.toString()).toBe(
-      deindent`
-        / children=1
-        └── prefix/ children=1
-            └── * children=1
-                └── /suffix handler() children=0
-      `.trim()
-    )
-
-    result = router.find('GET', '/prefix')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/prefix/*')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/prefix/hello/there')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/prefix/hello/suffix')
-    expect(result.handler).toBe(handler)
-    expect(result.params).toEqual({
-      $: 'hello'
-    })
-
-    result = router.find('GET', '/prefix/hello/there/suffix')
-    expect(result.handler).toBeUndefined()
-  })
-
-  it('handles match-any nodes with suffixes', () => {
-    createRoutes(router, [
-      ['GET', '/static/**/suffix', 'one'],
-      ['GET', '/static/**/suffix/**/more', 'two'],
-      ['GET', '/static/**/suffix/*/1/:param/2', 'three'],
-      ['GET', '/static/**/suffix/*/1/:param/2/**/end', 'four']
-    ])
-
-    expect(router.toString()).toBe(
-      deindent`
-        / children=1
-        └── static/ children=4
-            ├── **/suffix one() children=0
-            ├── **/suffix/**/more two() children=0
-            ├── **/suffix/*/1/:param/2 three() children=0
-            └── **/suffix/*/1/:param/2/**/end four() children=0
-      `.trim()
-    )
-
-    result = router.find('GET', '/static')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/static/js')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/static/one/prefix')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/static/one/two/prefix')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/static/one/suffix')
-    expect(result.handler?.name).toBe('one')
-    expect(result.params).toEqual({
-      $$: 'one'
-    })
-
-    result = router.find('GET', '/static/one/two/suffix')
-    expect(result.handler?.name).toBe('one')
-    expect(result.params).toEqual({
-      $$: 'one/two'
-    })
-
-    result = router.find('GET', '/static/one/two/suffix/three/four')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/static/one/two/suffix/three/four/more')
-    expect(result.handler?.name).toBe('two')
-    expect(result.params).toEqual({
-      $$0: 'one/two',
-      $$1: 'three/four'
-    })
-
-    result = router.find('GET', '/static/one/two/suffix/three/1/bla/2')
-    expect(result.handler?.name).toBe('three')
-    expect(result.params).toEqual({
-      $$: 'one/two',
-      $: 'three',
-      param: 'bla'
-    })
-
-    result = router.find('GET', '/static/one/two/suffix/three/1/bla/3')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find(
-      'GET',
-      `/static/one/two/suffix/three/1/bla/2/what/ever/end`
-    )
-    expect(result.handler?.name).toBe('four')
-    expect(result.params).toEqual({
-      $: 'three',
-      param: 'bla',
-      $$0: 'one/two',
-      $$1: 'what/ever'
-    })
-  })
-
-  it('Allow match-any child-routes to coexist with other child-routes', () => {
-    createRoutes(router, [
-      ['POST', '/api/admin/pages'],
-      ['POST', '/api/admin/pages/upload/items/**/file'],
-      ['POST', '/api/admin/pages/upload/items/**/files'],
-      ['POST', '/api/admin/pages/:id/child-pages']
-    ])
-    expect(router.toString('POST')).toBe(
-      deindent`
-        / children=1
-        └── api/admin/pages ƒ() children=1
-            └── / children=2
-                ├── upload/items/ children=2
-                │   ├── **/file ƒ() children=0
-                │   └── **/files ƒ() children=0
-                └── :id children=1
-                    └── /child-pages ƒ() children=0
-      `.trim()
-    )
-
-    result = router.find('POST', '/api/admin/pages/upload/items/1/file')
-    expect(result.handler).not.toBeUndefined()
-
-    result = router.find('POST', '/api/admin/pages/upload/items/1/2/file')
-    expect(result.handler).not.toBeUndefined()
-  })
-
-  it('handles resources', () => {
-    createRoutes(router, [
-      ['GET', '/', 'root'],
-      ['GET', '/geocoder', 'geocoder'],
-      ['GET', '/geocoder/new', 'newGeocoder'],
-      ['GET', '/geocoder/notify', 'notifyGeocoder'],
-      // ['GET', '/geocoder/nnn', 'nnnGeocoder'],
-      ['GET', '/geocoder/edit', 'editGeocoder'],
-      ['GET', '/geocoder/edit/email', 'editEmailGeocoder'],
-      ['GET', '/geocoder/edit/:item', 'editItemGeocoder'],
-      ['GET', '/geocoder/exchange', 'exchangeGeocoder'],
-      ['GET', '/geocoder/exchange/email', 'exchangeEmailGeocoder'],
-      ['GET', '/geocoder/exchange/:item', 'exchangeItemGeocoder'],
-      ['GET', '/geocoder/:id/echo', 'echoGeocoder'],
-      ['GET', '/geocoder/:action', 'actionGeocoder'],
-      ['GET', '/geocoder/**', 'anyGeocoder']
-    ])
-
-    expect(router.toString()).toBe(
-      deindent`
-        / root() children=1
-        └── geocoder geocoder() children=1
-            └── / children=4
-                ├── n children=2
-                │   ├── ew newGeocoder() children=0
-                │   └── otify notifyGeocoder() children=0
-                ├── e children=2
-                │   ├── dit editGeocoder() children=1
-                │   │   └── / children=2
-                │   │       ├── email editEmailGeocoder() children=0
-                │   │       └── :item editItemGeocoder() children=0
-                │   └── xchange exchangeGeocoder() children=1
-                │       └── / children=2
-                │           ├── email exchangeEmailGeocoder() children=0
-                │           └── :item exchangeItemGeocoder() children=0
-                ├── :action actionGeocoder() children=1
-                │   └── /echo echoGeocoder() children=0
-                └── ** anyGeocoder() children=0
-      `.trim()
-    )
-    result = router.find('GET', '')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.params).toEqual({})
-
-    result = router.find('GET', '/')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('root')
-    expect(result.params).toEqual({})
-
-    result = router.find('GET', '/geocoder/delete')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('actionGeocoder')
-    expect(result.params).toEqual({ action: 'delete' })
-
-    result = router.find('GET', '/geocoder/delete/any')
-    expect(result.handler.name).toBe('anyGeocoder')
-    expect(result.params).toEqual({ $$: 'delete/any' })
-
-    result = router.find('GET', '/geocoder/any/action')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('anyGeocoder')
-    expect(result.params).toEqual({ $$: 'any/action' })
-
-    result = router.find('GET', '/geocoder/exchange/trekjs')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('exchangeItemGeocoder')
-    expect(result.params).toEqual({ item: 'trekjs' })
-
-    result = router.find('GET', '/geocoder/exchange/trekjs/any')
-    expect(result.handler.name).toBe('anyGeocoder')
-
-    result = router.find('GET', '/geocoder/exchange/email')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('exchangeEmailGeocoder')
-
-    result = router.find('GET', '/geocoder/exchange/email/any')
-    expect(result.handler.name).toBe('anyGeocoder')
-
-    result = router.find('GET', '/geocoder/exchange')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('exchangeGeocoder')
-
-    result = router.find('GET', '/geocoder/edit/trekjs')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('editItemGeocoder')
-
-    result = router.find('GET', '/geocoder/edit/email')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('editEmailGeocoder')
-
-    result = router.find('GET', '/geocoder/edit/email/any')
-    expect(result.handler.name).toBe('anyGeocoder')
-
-    result = router.find('GET', '/geocoder/edit')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('editGeocoder')
-
-    result = router.find('GET', '/geocoder/new')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('newGeocoder')
-
-    result = router.find('GET', '/geocoder/nnn')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('actionGeocoder')
-
-    result = router.find('GET', '/geocoder/new/any')
-    expect(result.handler.name).toBe('anyGeocoder')
-
-    result = router.find('GET', '/geocoder')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('geocoder')
-
-    result = router.find('GET', '/geocoder//')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/repos')
-    expect(result.handler).toBeUndefined()
-  })
-
-  it('handles nested resources', () => {
-    createRoutes(router, [
-      ['GET', '/users', 'users'],
-      ['GET', '/users/new', 'newUser'],
-      ['GET', '/users/noi', 'newUser'],
-      ['GET', '/users/nei', 'newUser'],
-      ['GET', '/users/:id', 'user'],
-      ['GET', '/users/:id/edit', 'editUser'],
-      ['GET', '/users/:id/:hello/:good/:bad/ddd', 'editUser'],
-      ['GET', '/users/:id/:action', 'actionUser'],
-      ['GET', '/users/:userId/photos/:id', 'photo'],
-      ['GET', '/users/:userId/books/:id', 'book'],
-      ['GET', '/users/**', 'anyUser']
-    ])
-
-    expect(router.toString()).toBe(
-      deindent`
-        / children=1
-        └── users users() children=1
-            └── / children=3
-                ├── n children=2
-                │   ├── e children=2
-                │   │   ├── w newUser() children=0
-                │   │   └── i newUser() children=0
-                │   └── oi newUser() children=0
-                ├── :userId user() children=1
-                │   └── / children=4
-                │       ├── edit editUser() children=0
-                │       ├── :action actionUser() children=1
-                │       │   └── / children=1
-                │       │       └── :good children=1
-                │       │           └── / children=1
-                │       │               └── :bad children=1
-                │       │                   └── /ddd editUser() children=0
-                │       ├── photos/ children=1
-                │       │   └── :id photo() children=0
-                │       └── books/ children=1
-                │           └── :id book() children=0
-                └── ** anyUser() children=0
-      `.trim()
-    )
-
-    result = router.find('GET', '/users/610/books/987/edit')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('anyUser')
-    expect(result.params).toEqual({ $$: '610/books/987/edit' })
-
-    result = router.find('GET', '/users/610/books/987')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('book')
-    expect(result.params).toEqual({ userId: '610', id: '987' })
-
-    result = router.find('GET', '/users/610/photos')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('actionUser')
-    expect(result.params).toEqual({ id: '610', action: 'photos' })
-
-    result = router.find('GET', '/users/610/photos/1024')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('photo')
-    expect(result.params).toEqual({ userId: '610', id: '1024' })
-
-    result = router.find('GET', '/users/2323/delete')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('actionUser')
-    expect(result.params).toEqual({ id: '2323', action: 'delete' })
-
-    result = router.find('GET', '/users/377/edit')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('editUser')
-    expect(result.params).toEqual({ id: '377' })
-
-    result = router.find('GET', '/users/233')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('user')
-    expect(result.params).toEqual({ id: '233' })
-
-    result = router.find('GET', '/users/new/preview')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('actionUser')
-    expect(result.params).toEqual({ id: 'new', action: 'preview' })
-
-    result = router.find('GET', '/users/news')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('user')
-    expect(result.params).toEqual({ id: 'news' })
-
-    result = router.find('GET', '/users/new')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('newUser')
-
-    result = router.find('GET', '/users')
-    expect(result.handler).not.toBeUndefined()
-    expect(result.handler.name).toBe('users')
-
-    result = router.find('GET', '/user')
-    expect(result.handler).toBeUndefined()
-
-    result = router.find('GET', '/repos')
-    expect(result.handler).toBeUndefined()
-  })
-
-  describe('handles multiple resources', () => {
-    const routes = [
-      ['GET', '/users', 'users'],
-      ['GET', '/users/new', 'newUser'],
-      ['GET', '/users/:id', 'user'],
-      ['GET', '/users/:id/:action', 'actionUser'],
-      ['GET', '/users/:id/edit', 'editUser'],
-      ['GET', '/users/:id/change', 'changeUser'],
-      ['GET', '/users/:id/event', 'eventUser'],
-      ['GET', '/photos', 'photos'],
-      ['GET', '/photos/new', 'newPhoto'],
-      ['GET', '/photos/:id', 'photo'],
-      ['GET', '/photos/:id/:action', 'actionPhoto'],
-      ['GET', '/photos/:id/edit', 'editPhoto'],
-      ['GET', '/photos/:id/change', 'changePhoto'],
-      ['GET', '/photos/:id/event', 'eventPhoto'],
-      ['GET', '/books', 'books'],
-      ['GET', '/books/new', 'newBook'],
-      ['GET', '/books/:id', 'book'],
-      ['GET', '/books/:id/:action', 'actionBook'],
-      ['GET', '/books/:id/edit', 'editBook'],
-      ['GET', '/books/:id/change', 'changeBook'],
-      ['GET', '/books/:id/event', 'eventBook']
-    ]
-
-    it('parses routes into the correct tree', () => {
-      createRoutes(router, routes)
-      expect(router.toString()).toBe(
-        deindent`
-          / children=3
-          ├── users users() children=1
-          │   └── / children=2
-          │       ├── new newUser() children=0
-          │       └── :id user() children=1
-          │           └── / children=3
-          │               ├── :action actionUser() children=0
-          │               ├── e children=2
-          │               │   ├── dit editUser() children=0
-          │               │   └── vent eventUser() children=0
-          │               └── change changeUser() children=0
-          ├── photos photos() children=1
-          │   └── / children=2
-          │       ├── new newPhoto() children=0
-          │       └── :id photo() children=1
-          │           └── / children=3
-          │               ├── :action actionPhoto() children=0
-          │               ├── e children=2
-          │               │   ├── dit editPhoto() children=0
-          │               │   └── vent eventPhoto() children=0
-          │               └── change changePhoto() children=0
-          └── books books() children=1
-              └── / children=2
-                  ├── new newBook() children=0
-                  └── :id book() children=1
-                      └── / children=3
-                          ├── :action actionBook() children=0
-                          ├── e children=2
-                          │   ├── dit editBook() children=0
-                          │   └── vent eventBook() children=0
-                          └── change changeBook() children=0
-        `.trim()
-      )
-    })
-
-    it('results in expected parameters', () => {
-      createRoutes(router, shuffle(routes))
-
-      result = router.find('GET', '/books/377/change')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('changeBook')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/books/377/event')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('eventBook')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/books/377/edit')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('editBook')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/books/233')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('book')
-      expect(result.params).toEqual({ id: '233' })
-
-      result = router.find('GET', '/books/new')
-      expect(result.handler.name).toBe('newBook')
-      expect(result.handler).not.toBeUndefined()
-
-      result = router.find('GET', '/books')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('books')
-
-      result = router.find('GET', '/users/377/change')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('changeUser')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/users/377/event')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('eventUser')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/users/377/edit')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('editUser')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/users/233')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('user')
-      expect(result.params).toEqual({ id: '233' })
-
-      result = router.find('GET', '/users/new')
-      expect(result.handler.name).toBe('newUser')
-      expect(result.handler).not.toBeUndefined()
-
-      result = router.find('GET', '/users')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('users')
-
-      result = router.find('GET', '/photos/377/event')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('eventPhoto')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/photos/377/change')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('changePhoto')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/photos/377/edit')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('editPhoto')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/photos/233')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('photo')
-      expect(result.params).toEqual({ id: '233' })
-
-      result = router.find('GET', '/photos/new')
-      expect(result.handler.name).toBe('newPhoto')
-      expect(result.handler).not.toBeUndefined()
-
-      result = router.find('GET', '/photos')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('photos')
-    })
-  })
-
-  describe('handles namespaces', () => {
-    const routes = [
-      ['GET', '/admin/articles', 'articles'],
-      ['GET', '/admin/articles/new', 'newArticle'],
-      ['GET', '/admin/articles/:id', 'article'],
-      ['GET', '/admin/articles/:id/edit', 'editArticle']
-    ]
-
-    it('parses routes into the correct tree', () => {
-      createRoutes(router, routes)
-      expect(router.toString()).toBe(
-        deindent`
-          / children=1
-          └── admin/articles articles() children=1
-              └── / children=2
-                  ├── new newArticle() children=0
-                  └── :id article() children=1
-                      └── /edit editArticle() children=0
-        `.trim()
-      )
-    })
-
-    it('results in expected parameters', () => {
-      createRoutes(router, shuffle(routes))
-
-      result = router.find('GET', '/admin/articles/377/edit')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('editArticle')
-      expect(result.params).toEqual({ id: '377' })
-
-      result = router.find('GET', '/admin/articles/233')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('article')
-      expect(result.params).toEqual({ id: '233' })
-
-      result = router.find('GET', '/admin/articles/new')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('newArticle')
-
-      result = router.find('GET', '/admin/articles')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('articles')
-    })
-  })
-
-  describe('handles multiple nested resources', () => {
-    const routes = [
-      ['GET', '/magazines/:mid/articles', 'articles'],
-      ['GET', '/magazines/:mid/articles/new', 'newArticle'],
-      ['GET', '/magazines/:mid/articles/:id', 'article'],
-      ['GET', '/magazines/:mid/articles/:id/edit', 'editArticle'],
-      ['GET', '/magazines/:m_id/photos', 'photos'],
-      ['GET', '/magazines/:m_id/photos/new', 'newPhoto'],
-      ['GET', '/magazines/:m_id/photos/:id', 'photo'],
-      ['GET', '/magazines/:m_id/photos/:id/edit', 'editPhoto']
-    ]
-
-    it('parses routes into the correct tree', () => {
-      createRoutes(router, routes)
-      expect(router.toString()).toBe(
-        deindent`
-          / children=1
-          └── magazines/ children=1
-              └── :m_id children=1
-                  └── / children=2
-                      ├── articles articles() children=1
-                      │   └── / children=2
-                      │       ├── new newArticle() children=0
-                      │       └── :id article() children=1
-                      │           └── /edit editArticle() children=0
-                      └── photos photos() children=1
-                          └── / children=2
-                              ├── new newPhoto() children=0
-                              └── :id photo() children=1
-                                  └── /edit editPhoto() children=0
-        `.trim()
-      )
-    })
-
-    it('results in expected parameters', () => {
-      createRoutes(router, shuffle(routes))
-
-      result = router.find('GET', '/magazines/233/articles/377')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('article')
-      expect(result.params).toEqual({ mid: '233', id: '377' })
-
-      result = router.find('GET', '/magazines/233/articles/377/edit')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('editArticle')
-      expect(result.params).toEqual({ mid: '233', id: '377' })
-
-      result = router.find('GET', '/magazines/233/articles/new')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('newArticle')
-      expect(result.params).toEqual({ mid: '233' })
-
-      result = router.find('GET', '/magazines/233/articles')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('articles')
-      expect(result.params).toEqual({ mid: '233' })
-
-      result = router.find('GET', '/magazines/233/photos/377/edit')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('editPhoto')
-      expect(result.params).toEqual({ m_id: '233', id: '377' })
-
-      result = router.find('GET', '/magazines/233/photos/377')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('photo')
-      expect(result.params).toEqual({ m_id: '233', id: '377' })
-
-      result = router.find('GET', '/magazines/233/photos/new')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('newPhoto')
-      expect(result.params).toEqual({ m_id: '233' })
-
-      result = router.find('GET', '/magazines/233/photos')
-      expect(result.handler).not.toBeUndefined()
-      expect(result.handler.name).toBe('photos')
-      expect(result.params).toEqual({ m_id: '233' })
-    })
-  })
-
-  it('identifies unnamed handlers', () => {
-    router.add('GET', '/function', function () {})
-    router.add('GET', '/closure', () => {})
-    expect(router.toString()).toBe(
-      deindent`
-        / children=2
-        ├── function ƒ() children=0
-        └── closure ƒ() children=0
-      `.trim()
-    )
-  })
-
-  it(`deals with paths not starting with '/'`, () => {
-    router.add('GET', '/users', () => {})
-    router.add('GET', '/wacky-path', () => {})
-    expect(router.toString()).toBe(
-      deindent`
-        / children=2
-        ├── users ƒ() children=0
-        └── wacky-path ƒ() children=0
-      `.trim()
-    )
-  })
-})
-
-function createFunc(name) {
-  return new Function(
-    `return ${name ? `function ${name}(){}` : '() => {}'}`
-  )()
-}
-
-function createRoutes(router, routes) {
-  routes.forEach(([method, path, name]) => {
-    router.add(method, path, createFunc(name))
-  })
-}