hono 0.0.5 → 0.0.6

package/README.md

@@ -24,7 +24,7 @@ app.fire()
 ```
 hono x 813,001 ops/sec ±2.96% (75 runs sampled)
 itty-router x 160,415 ops/sec ±3.31% (85 runs sampled)
-sundar x 307,438 ops/sec ±4.77% (73 runs sampled)
+sunder x 307,438 ops/sec ±4.77% (73 runs sampled)
 Fastest is hono
 ✨  Done in 37.03s.
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Minimal web framework for Cloudflare Workers",
   "main": "src/hono.js",
   "scripts": {
@@ -17,4 +17,4 @@
     "jest": "^27.4.5",
     "node-fetch": "^2.6.6"
   }
-}
+}

package/src/hono.js

@@ -4,6 +4,8 @@ const Node = require('./node')
 const compose = require('./compose')
 const defaultFilter = require('./middleware/defaultFilter')
 
+const METHOD_NAME_OF_ALL = 'ALL'
+
 class Router {
   constructor() {
     this.node = new Node()
@@ -25,6 +27,18 @@ const getPathFromURL = (url) => {
   return match[5]
 }
 
+const proxyHandler = {
+  get:
+    (target, prop) =>
+    (...args) => {
+      if (target.constructor.prototype.hasOwnProperty(prop)) {
+        return target[prop](...args)
+      } else {
+        return target.addRoute(prop, ...args)
+      }
+    },
+}
+
 class Hono {
   constructor() {
     this.router = new Router()
@@ -32,20 +46,8 @@ class Hono {
     this.middlewareRouters = []
   }
 
-  get(...args) {
-    return this.addRoute('GET', ...args)
-  }
-  post(...args) {
-    return this.addRoute('POST', ...args)
-  }
-  put(...args) {
-    return this.addRoute('PUT', ...args)
-  }
-  delete(...args) {
-    return this.addRoute('DELETE', ...args)
-  }
-  patch(...args) {
-    return this.addRoute('PATCH', ...args)
+  getRouter() {
+    return this.router
   }
 
   addRoute(method, ...args) {
@@ -55,27 +57,22 @@ class Hono {
     } else {
       this.router.add(method, ...args)
     }
-    return this
-  }
-
-  getRouter() {
-    return this.router
+    return WrappedApp(this)
   }
 
   route(path) {
     this.router.tempPath = path
-    return this
+    return WrappedApp(this)
   }
 
   use(path, middleware) {
     const router = new Router()
-    router.add('all', path, middleware)
+    router.add(METHOD_NAME_OF_ALL, path, middleware)
     this.middlewareRouters.push(router)
   }
 
   async matchRoute(method, path) {
-    const res = this.router.match(method, path)
-    return res
+    return this.router.match(method, path)
   }
 
   // XXX
@@ -102,7 +99,7 @@ class Hono {
     const middleware = [defaultFilter] // add defaultFilter later
 
     for (const mr of this.middlewareRouters) {
-      const mwResult = mr.match('all', path)
+      const mwResult = mr.match(METHOD_NAME_OF_ALL, path)
       if (mwResult) {
         middleware.push(...mwResult.handler)
       }
@@ -137,8 +134,8 @@ class Hono {
   }
 }
 
-const CreateApp = () => {
-  return new Hono()
+const WrappedApp = (hono = new Hono()) => {
+  return new Proxy(hono, proxyHandler)
 }
 
-module.exports = CreateApp
+module.exports = WrappedApp

package/src/hono.test.js

@@ -62,27 +62,53 @@ describe('params and query', () => {
 describe('Middleware', () => {
   const app = Hono()
 
-  const logger = (c, next) => {
+  const logger = async (c, next) => {
     console.log(`${c.req.method} : ${c.req.url}`)
     next()
   }
 
-  const customHeader = (c, next) => {
+  const rootHeader = async (c, next) => {
     next()
-    c.res.headers.append('x-message', 'custom-header')
+    await c.res.headers.append('x-custom', 'root')
+  }
+
+  const customHeader = async (c, next) => {
+    next()
+    await c.res.headers.append('x-message', 'custom-header')
+  }
+  const customHeader2 = async (c, next) => {
+    next()
+    await c.res.headers.append('x-message-2', 'custom-header-2')
   }
 
   app.use('*', logger)
+  app.use('*', rootHeader)
   app.use('/hello', customHeader)
+  app.use('/hello/*', customHeader2)
   app.get('/hello', () => {
     return new fetch.Response('hello')
   })
+  app.get('/hello/:message', (c) => {
+    const message = c.req.params('message')
+    return new fetch.Response(`${message}`)
+  })
 
   it('logging and custom header', async () => {
     let req = new fetch.Request('https://example.com/hello')
     let res = await app.dispatch(req)
     expect(res.status).toBe(200)
     expect(await res.text()).toBe('hello')
+    expect(await res.headers.get('x-custom')).toBe('root')
     expect(await res.headers.get('x-message')).toBe('custom-header')
+    expect(await res.headers.get('x-message-2')).toBe('custom-header-2')
+  })
+
+  it('logging and custom header with named params', async () => {
+    let req = new fetch.Request('https://example.com/hello/message')
+    let res = await app.dispatch(req)
+    expect(res.status).toBe(200)
+    expect(await res.text()).toBe('message')
+    expect(await res.headers.get('x-custom')).toBe('root')
+    expect(await res.headers.get('x-message-2')).toBe('custom-header-2')
   })
 })

package/src/node.js

@@ -2,7 +2,7 @@
 
 const { splitPath, getPattern } = require('./util')
 
-const METHOD_NAME_OF_ALL = 'all'
+const METHOD_NAME_OF_ALL = 'ALL'
 
 const createResult = (handler, params) => {
   return { handler: handler, params: params }
@@ -18,6 +18,7 @@ function Node(method, handler, children) {
   if (method && handler) {
     this.method[method] = handler
   }
+  this.middlewares = []
 }
 
 Node.prototype.insert = function (method, path, handler) {
@@ -50,6 +51,7 @@ Node.prototype.search = function (method, path) {
       continue
     }
 
+    let isWildcard = false
     let isParamMatch = false
     const keys = Object.keys(curNode.children)
     for (let j = 0; j < keys.length; j++) {
@@ -57,7 +59,7 @@ Node.prototype.search = function (method, path) {
       // Wildcard
       if (key === '*') {
         curNode = curNode.children['*']
-        isParamMatch = true
+        isWildcard = true
         break
       }
       const pattern = getPattern(key)
@@ -74,6 +76,10 @@ Node.prototype.search = function (method, path) {
       }
     }
 
+    if (isWildcard) {
+      break
+    }
+
     if (isParamMatch === false) {
       return noRoute()
     }

package/src/node.test.js

@@ -123,7 +123,7 @@ describe('Regexp', () => {
 
 describe('All', () => {
   const node = new Node()
-  node.insert('all', '/all-methods', 'all methods')
+  node.insert('ALL', '/all-methods', 'all methods') // ALL
   it('/all-methods', () => {
     res = node.search('get', '/all-methods')
     expect(res).not.toBeNull()

package/src/util.test.js

@@ -1,4 +1,4 @@
-const { splitPath, getPattern, getParamName } = require('./util')
+const { splitPath, getPattern } = require('./util')
 
 describe('Utility methods', () => {
   it('splitPath', () => {