rajt 0.0.98 → 0.0.99

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.98",
+  "version": "0.0.99",
   "type": "module",
   "main": "./src/index.ts",
   "files": ["bin", "src"],
@@ -37,27 +37,28 @@
   "dependencies": {
     "@hono/node-server": "^1.19.9",
     "@hono/standard-validator": "^0.2.2",
+    "@hono/zod-validator": "^0.7.6",
     "@scalar/hono-api-reference": "^0.9.40",
     "chokidar": "^3.5.2",
     "citty": "^0.1.6",
     "consola": "^3.4.2",
-    "cripta": "~0.1.10",
+    "cripta": "^0.1.10",
     "dotenv": "^16.5.0",
     "esbuild": "^0.25.2",
-    "forj": "~0.1.8",
+    "forj": "^0.1.8",
     "hono": "^4.11.7",
-    "hono-openapi": "^1.2.0",
+    "hono-openapi": "^1.3.0",
     "localflare-api": "^0.4.2",
     "localflare-core": "^0.4.2",
     "miniflare": "^4.20260301.1",
     "pathe": "^2.0",
     "quansync": "^0.2.11",
-    "t0n": "~0.1.11",
+    "t0n": "^0.1.12",
     "tiny-glob": "^0.2",
     "tsx": "^4.19.4",
     "wrangler": "^4.61.0",
     "zod": "^4.3.6",
-    "zod-openapi": "4"
+    "zod-openapi": "^5.4.6"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20260113.0",
@@ -70,7 +71,8 @@
     "node": ">=18.0.0"
   },
   "resolutions": {
-    "@smithy/types": "^4.3.0"
+    "@smithy/types": "^4.3.0",
+    "zod": "^4.3.6"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/create-app.ts

@@ -1,19 +1,19 @@
 import { Hono } from 'hono'
 import { logger } from 'hono/logger'
 import { matchedRoutes } from 'hono/route'
-import { describeRoute } from 'hono-openapi'
 import { Envir, Datte } from 't0n'
 import type {
   Env, Context, Next,
   HTTPResponseError,
   ServerOptions,
 } from './types'
-import { resolve, resolveMiddleware } from './utils/resolve'
+import { resolve, resolveMiddleware, mw } from './utils/resolve'
 import { getMiddlewares, getHandler } from './register'
 import request, { GET_REQUEST } from './request'
 import response from './response'
 import { isDev } from './utils/environment'
 import { gray } from 't0n/color'
+import { Route } from './types'
 
 const NFHandler = () => response.notFound()
 const EHandler = async (e: Error | HTTPResponseError) => {
@@ -108,24 +108,19 @@ export const createApp = <E extends Env>(options?: ServerOptions<E>) => {
 
   if (options?.init) options.init(app)
 
-  const routes = options?.routes || []
-  for (const route of routes) {
+  const routes = options?.routes || [] // @ts-ignore
+  const routeRegister = options?.routeRegister ? options.routeRegister : (_: Hono, route: Route) => { // @ts0ignore
     if (Array.isArray(route)) { // @ts-ignore
-      app[route[0]](route[1], ...mw(route[2], route[3]), ...resolve(getHandler(route[3]), route[3]))
+      _[route[0]](route[1], ...mw(route[2], route[3]), ...resolve(getHandler(route[3]), route[3]))
     } else { // @ts-ignore
-      app[route.method](route.path, describeRoute(route.desc), ...mw(route.middlewares, route.name), ...resolve(route.handle, route.name))
+      _[route.method](route.path, ...mw(route.middlewares, route.name), ...resolve(route.handle, route.name))
     }
   }
 
-  return app
-}
+  for (const route of routes)
+    routeRegister(app, route)
 
-function mw(...objs: string[]): Function[] {
-  return objs.flatMap(obj => {
-    if (typeof obj != 'string') return null
-    // @ts-ignore
-    return getHandler(obj)?.mw || null
-  }).flat().filter(Boolean)
+  return app
 }
 
 export default createApp

package/src/dev.ts

@@ -3,7 +3,7 @@ import { config } from 'dotenv'
 import { getRoutes, getMiddlewares, getConfigs } from './routes'
 import { registerHandler, registerMiddleware } from './register'
 import Config from './config'
-import { registerOpenAPI } from './oas'
+import { registerOpenAPI } from './open-api/register'
 import createApp from './create-app'
 import { Ability } from 'rajt/auth'
 import { setEnv, detectEnvironment } from 'rajt/env'

package/src/{oas.ts → open-api/register.ts}

@@ -1,12 +1,9 @@
-import { STATUS_CODES } from 'node:http'
 import { basicAuth } from 'hono/basic-auth'
 import { Scalar } from '@scalar/hono-api-reference'
-import { generateSpecs, resolver } from 'hono-openapi'
 import { Envir } from 't0n'
-import z from 'zod'
-import response from './response'
-import { getHandler } from './register'
-import type { Hono } from './types'
+import response from '../response'
+import { getHandler } from '../register'
+import type { Hono } from '../types'
 
 export function config(opts: any) {
   const docs = opts?.docs ?? {}
@@ -68,38 +65,3 @@ export function registerOpenAPI(app: Hono, conf: any) {
     })
   )
 }
-
-export async function generateOpenAPI(app: Hono, conf: any) {
-  const opts = config(conf)
-  if (opts.disable) return {}
-
-  return await generateSpecs(app, {
-    documentation: {
-      info: {
-        title: opts.appName,
-        version: opts.appVersion,
-        description: Envir.get('APP_DESCRIPTION', ''),
-      },
-      components: {
-        securitySchemes: {
-          JWT: {
-            type: 'http',
-            scheme: 'bearer',
-            bearerFormat: 'JWT',
-          },
-        },
-        responses: {
-          500: {
-            description: STATUS_CODES[500],
-            content: { // @ts-ignore
-              'application/json': await resolver(z.object({
-                m: z.array(z.string()),
-              })).toOpenAPISchema(),
-            },
-          },
-          ...opts?.responses,
-        },
-      },
-    },
-  })
-}

package/src/open-api/spec.ts

@@ -0,0 +1,41 @@
+import { STATUS_CODES } from 'node:http'
+import { generateSpecs, resolver } from 'hono-openapi'
+import { array, object, string } from 'zod/mini'
+import { Envir } from 't0n'
+import type { Hono } from '../types'
+import { config } from './register'
+
+export async function generateOpenAPI(app: Hono, conf: any) {
+  const opts = config(conf)
+  if (opts.disable) return {}
+
+  return await generateSpecs(app, {
+    documentation: {
+      info: {
+        title: opts.appName,
+        version: opts.appVersion,
+        description: Envir.get('APP_DESCRIPTION', ''),
+      },
+      components: {
+        securitySchemes: {
+          JWT: {
+            type: 'http',
+            scheme: 'bearer',
+            bearerFormat: 'JWT',
+          },
+        },
+        responses: {
+          500: {
+            description: STATUS_CODES[500],
+            content: { // @ts-ignore
+              'application/json': await resolver(object({
+                m: array(string()),
+              })).toOpenAPISchema(),
+            },
+          },
+          ...opts?.responses,
+        },
+      },
+    },
+  })
+}

package/src/prod.ts

@@ -1,5 +1,5 @@
 import Config from './config'
-import { registerOpenAPI } from './oas'
+import { registerOpenAPI } from './open-api/register'
 import { Ability } from './auth'
 import createApp from './create-app'
 

package/src/routes.ts

@@ -13,12 +13,12 @@ import versionSHA from './utils/version-sha'
 import type { Routes, StandardSchemaV1 } from './types'
 import { rn, substep, warn } from './utils/log'
 import { _root } from './utils/paths'
-
-import { generateOpenAPI } from './oas'
-import z from 'zod'
-import { resolver } from 'hono-openapi'
+import { generateOpenAPI } from './open-api/spec'
+import type * as z from 'zod'
+import { describeRoute, resolver } from 'hono-openapi'
 import { mimes } from 'hono/utils/mime'
 import { STATUS_CODES } from 'node:http'
+import { mw, resolve as _resolve } from './utils/resolve'
 
 import { highlightedMethod, highlightedURI } from './cli/utils'
 
@@ -344,7 +344,9 @@ export async function cacheRoutes() {
   middlewares.forEach(mw => registerMiddleware(mw.handle))
 
   // @ts-ignore
-  const openApi = await generateOpenAPI(createApp({ routes }), configs?.rajt || {})
+  const openApi = await generateOpenAPI(createApp({ routes, routeRegister: (app: Hono, route: Route) => {
+    app[route.method](route.path, describeRoute(route.desc), ...mw(route.middlewares, route.name), ..._resolve(route.handle, route.name))
+  } }), configs?.rajt || {})
 
   const iPath = join(_root, '.rajt/imports.mjs')
   ensureDir(iPath)

package/src/types.ts

@@ -10,7 +10,7 @@ import { mimes, type BaseMime } from 'hono/utils/mime'
 import type { OpenAPIV3_1, OpenAPIV3 } from 'openapi-types'
 import type { StandardSchemaV1 } from '@standard-schema/spec'
 import type { DescribeRouteOptions as RawDescribeRouteOptions, ResolverReturnType } from 'hono-openapi'
-import z from 'zod'
+import type * as z from 'zod'
 import Action from './action'
 import request from './request'
 import response from './response'

package/src/utils/resolve.ts

@@ -1,3 +1,5 @@
+import { getHandler } from '../register'
+
 export function resolve(obj: any, id: string) {
   if (typeof obj == 'function' && obj?.length == 2)
     return [obj]
@@ -33,3 +35,11 @@ export function resolveMiddleware(obj: any) {
 
   throw new Error('Invalid middleware provided. Must be a Hono middleware function or MiddlewareClass instance/constructor')
 }
+
+export function mw(...objs: string[]): Function[] {
+  return objs.flatMap(obj => {
+    if (typeof obj != 'string') return null
+    // @ts-ignore
+    return getHandler(obj)?.mw || null
+  }).flat().filter(Boolean)
+}

package/src/validator.ts

@@ -1,5 +1,5 @@
-import type { ZodObject } from 'zod'
-import { validator } from 'hono-openapi'
+import type * as z from 'zod'
+import { zValidator } from '@hono/zod-validator'
 import response from './response'
 import type {
   Rule, Rules,
@@ -7,11 +7,11 @@ import type {
 } from './types'
 
 export default class $Validator {
-  private static cache = new Map<string, (schema: ZodObject<any>) => Rule>()
+  private static cache = new Map<string, (schema: z.ZodObject<any>) => Rule>()
 
   private static createRule<T extends keyof ValidationTargets>(
     target: T,
-    schema: ZodObject<any>
+    schema: z.ZodObject<any>
   ): Rule {
     return {
       target,
@@ -24,7 +24,7 @@ export default class $Validator {
     if (this.cache.has(target))
       return this.cache.get(target)
 
-    const fn = (schema: ZodObject<any>) => this.createRule(target, schema)
+    const fn = (schema: z.ZodObject<any>) => this.createRule(target, schema)
     this.cache.set(target, fn)
     return fn
   }
@@ -38,9 +38,9 @@ export default class $Validator {
 
   static parse(rules: Rules): Function[] {
     return (Array.isArray(rules) ? rules : [rules]) // @ts-ignore
-      .flatMap(rule => validator(rule.target, rule.schema, (result, c) => {
+      .flatMap(rule => zValidator(rule.target, rule.schema, (result, c) => {
         if (!result.success) // @ts-ignore
-          return response.badRequest(result.error)
+          return response.badRequest({ ...result.error.flatten()[rule.eTarget] })
       }))
   }
 }