Refactor to separate itty-router from openapi logic

package.json

@@ -81,6 +81,7 @@
     "eslint-config-prettier": "^8.8.0",
     "husky": "^7.0.2",
     "isomorphic-fetch": "^3.0.0",
+    "itty-router": "^5.0.17",
     "jest": "^29.0.0",
     "jest-openapi": "^0.14.2",
     "pinst": "^2.1.6",
@@ -93,7 +94,6 @@
   },
   "dependencies": {
     "@asteasolutions/zod-to-openapi": "^6.4.0",
-    "itty-router": "4.0.26",
     "js-yaml": "^4.1.0",
     "openapi3-ts": "^4.1.2",
     "zod": "^3.21.4"

src/adapters/hono.ts

@@ -0,0 +1,44 @@
+import { RouterOptions } from '../types'
+import { OpenAPIHandler, OpenAPIRouterType } from '../openapi'
+
+export class HonoOpenAPIHandler extends OpenAPIHandler {
+  getRequest(args: any[]) {
+    return args[0].req.raw
+  }
+}
+
+export function fromHono<M>(
+  router: M,
+  options?: RouterOptions,
+): M & OpenAPIRouterType<M> & any {
+  const openapiRouter = new HonoOpenAPIHandler(router, options)
+
+  return new Proxy(router, {
+    get: (target: any, prop: string, ...args: any[]) => {
+      const _result = openapiRouter.handleCommonProxy(target, prop, ...args)
+      if (_result !== undefined) {
+        return _result
+      }
+
+      return (route: string, ...handlers: any[]) => {
+        if (prop !== 'fetch') {
+          if (handlers.length === 1 && handlers[0].registry) {
+            handlers = openapiRouter.registerNestedRouter({
+              method: prop,
+              path: route,
+              nestedRouter: handlers[0],
+            })
+          } else if (prop !== 'all') {
+            handlers = openapiRouter.registerRoute({
+              method: prop,
+              path: route,
+              handlers: handlers,
+            })
+          }
+        }
+
+        return Reflect.get(target, prop, ...args)(route, ...handlers)
+      }
+    },
+  })
+}

src/adapters/ittyRouter.ts

@@ -0,0 +1,41 @@
+import { RouterOptions } from '../types'
+import { OpenAPIHandler, OpenAPIRouterType } from '../openapi'
+
+export class IttyRouterOpenAPIHandler extends OpenAPIHandler {
+}
+
+export function fromIttyRouter<M>(
+  router: M,
+  options?: RouterOptions,
+): M & OpenAPIRouterType<M> & any {
+  const openapiRouter = new IttyRouterOpenAPIHandler(router, options)
+
+  return new Proxy(router, {
+    get: (target: any, prop: string, ...args: any[]) => {
+      const _result = openapiRouter.handleCommonProxy(target, prop, ...args)
+      if (_result !== undefined) {
+        return _result
+      }
+
+      return (route: string, ...handlers: any[]) => {
+        if (prop !== 'fetch') {
+          if (handlers.length === 1 && handlers[0].registry) {
+            handlers = openapiRouter.registerNestedRouter({
+              method: prop,
+              path: route,
+              nestedRouter: handlers[0],
+            })
+          } else if (prop !== 'all') {
+            handlers = openapiRouter.registerRoute({
+              method: prop,
+              path: route,
+              handlers: handlers,
+            })
+          }
+        }
+
+        return Reflect.get(target, prop, ...args)(route, ...handlers)
+      }
+    },
+  })
+}

src/index.ts

@@ -5,3 +5,5 @@ export * from './types'
 export * from './route'
 export * from './ui'
 export * from './utils'
+export * from './adapters/ittyRouter'
+export * from './adapters/hono'