rajt 0.0.100 → 0.0.102

package/bin/rajt.js

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
 import { spawn } from 'node:child_process';
-import { join, dirname } from 'node:path';
+import { join, dirname, resolve } from 'node:path';
 import { existsSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
 
-const __dirname = dirname(new URL(import.meta.url).pathname);
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 const ERR_NODE_VERSION = '18.0.0';
 const MIN_NODE_VERSION = '18.0.0';
 
-let rajtProcess;
-
 function runRajt() {
   if (process?.versions?.node && semiver(process.versions.node, ERR_NODE_VERSION) < 0) {
     console.error(
@@ -21,58 +20,70 @@ Consider using a Node.js version manager such as https://volta.sh or https://git
     return;
   }
 
-  const isBun = process?.isBun || typeof Bun != 'undefined';
-  let tsxPath;
-
-  if (!isBun) {
-    const _tsxPath = 'node_modules/.bin/tsx'
-    const tsxPaths = [
-      // join(__dirname, '../node_modules/.bin/tsx'),
-      // join(__dirname, '../../.bin/tsx'),
-      join(__dirname, '../'+ _tsxPath),
-      join(__dirname, '../../'+ _tsxPath),
-      join(process.cwd(), _tsxPath),
-      'tsx',
-    ];
-
-    for (const pathOption of tsxPaths) {
-      if (pathOption == 'tsx' || existsSync(pathOption)) {
-        tsxPath = pathOption;
-        break;
-      }
-    }
+  const isBun = process?.isBun || typeof Bun !== 'undefined';
+  const targetScript = resolve(__dirname, '../src/cli/index.ts');
+
+  let executor = process.execPath;
+  let args = [];
+
+  if (isBun) {
+    args = [targetScript, ...process.argv.slice(2)];
+  } else {
+    const tsxBin = findTsx();
 
-    if (!tsxPath) {
-      console.error('TypeScript file found but tsx is not available. Please install tsx:');
+    if (!tsxBin) {
+      console.error('Error: "tsx" is not available. Please install tsx:');
       console.error('  npm i -D tsx');
       console.error('  or');
       console.error('  bun i -D tsx');
       process.exit(1);
-      return;
     }
-  }
 
-  return spawn(
-    process.execPath,
-    [
+    args = [
       '--no-warnings',
-      ...process.execArgv,
-      tsxPath,
-      join(__dirname, '../src/cli/index.ts').replace(/^\\/, ''),
-      ...process.argv.slice(2),
-    ].filter(arg => arg && !arg.includes('experimental-vm-modules') && !arg.includes('loader')),
-    {
-      stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-      env: {
-        ...process.env,
-        NODE_ENV: process.env.NODE_ENV || 'development',
-        TSX_DISABLE_CACHE: process.env.TSX_DISABLE_CACHE || '1',
-      }
+      tsxBin,
+      targetScript,
+      ...process.argv.slice(2)
+    ].filter(arg => !arg.includes('experimental-vm-modules') && !arg.includes('loader'));
+  }
+
+  return execute(executor, args)
+}
+
+function findTsx() {
+  const relativePaths = [
+    join(__dirname, '../node_modules/tsx/dist/cli.mjs'),
+    join(process.cwd(), 'node_modules/tsx/dist/cli.mjs'),
+    join(__dirname, '../node_modules/.bin/tsx'),
+    join(process.cwd(), 'node_modules/.bin/tsx'),
+  ];
+
+  for (const p of relativePaths) {
+    if (existsSync(p)) return p;
+    if (existsSync(`${p}.exe`)) return `${p}.exe`;
+    if (existsSync(`${p}.cmd`)) return `${p}.cmd`;
+  }
+
+  return null
+}
+
+function execute(command, args) {
+  const child = spawn(command, args, {
+    stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
+    env: {
+      ...process.env,
+      NODE_ENV: process.env.NODE_ENV || 'development',
+      TSX_DISABLE_CACHE: '1',
     }
-  )
-  .on('exit', code => process.exit(code == null ? 0 : code))
-  .on('message', message => process.send && process.send(message))
-  .on('disconnect', () => process.disconnect && process.disconnect());
+  });
+
+  process.on('SIGINT', () => child.kill('SIGINT'))
+    .on('SIGTERM', () => child.kill('SIGTERM'));
+
+  return child
+    .on('exit', code => process.exit(code ?? 0))
+    .on('message', msg => process.send?.(msg))
+    .on('disconnect', () => process.disconnect?.())
 }
 
 var fn = new Intl.Collator(0, { numeric: 1 }).compare;
@@ -101,7 +112,5 @@ function directly() {
 }
 
 if (directly()) {
-  rajtProcess = runRajt();
-  process.on('SIGINT', () => rajtProcess && rajtProcess.kill())
-    .on('SIGTERM', () => rajtProcess && rajtProcess.kill());
+  runRajt()
 }

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.100",
+  "version": "0.0.102",
   "type": "module",
   "main": "./src/index.ts",
   "files": ["bin", "src"],
@@ -35,25 +35,25 @@
     "zip": "zip -j ../../lambda.zip ../../.rajt/dist/index.js"
   },
   "dependencies": {
-    "@hono/node-server": "^1.19.9",
+    "@hono/node-server": "^1.19.11",
     "@hono/standard-validator": "^0.2.2",
     "@hono/zod-validator": "^0.7.6",
-    "@scalar/hono-api-reference": "^0.9.40",
+    "@scalar/hono-api-reference": "^0.10.3",
     "chokidar": "^3.5.2",
     "citty": "^0.1.6",
     "consola": "^3.4.2",
-    "cripta": "^0.1.11",
+    "cripta": "^0.1.12",
     "dotenv": "^16.5.0",
     "esbuild": "^0.25.2",
-    "forj": "^0.1.8",
-    "hono": "^4.11.7",
+    "forj": "^0.1.10",
+    "hono": "^4.12.8",
     "hono-openapi": "^1.3.0",
-    "localflare-api": "^0.4.2",
-    "localflare-core": "^0.4.2",
-    "miniflare": "^4.20260301.1",
+    "localflare-api": "^0.5.0",
+    "localflare-core": "^0.5.0",
+    "miniflare": "^4.20260312.0",
     "pathe": "^2.0",
     "quansync": "^0.2.11",
-    "t0n": "^0.1.12",
+    "t0n": "^0.1.13",
     "tiny-glob": "^0.2",
     "tsx": "^4.19.4",
     "wrangler": "^4.61.0",

package/src/auth/ability.ts

@@ -19,11 +19,11 @@ export class Ability {
   }
 
   static fromAction(target: any): string {
-    return !target ? '' : this.format(typeof target == 'string' ? target : (target.name.length > 3 ? target.name : (target?.p || '')))
+    return !target ? '' : this.format(typeof target === 'string' ? target : (target.name.length > 3 ? target.name : (target?.p || '')))
   }
 
   static format(path: string) {
-    return path == '/'
+    return path === '/'
       ? 'index'
       : path.normalize('NFD')
          .replace(/[\u0300-\u036f]/g, '')

package/src/cli/commands/deploy.ts

@@ -28,7 +28,7 @@ export default defineCommand({
 
 		// @ts-ignore
 		await build.run({ args: { platform } })
-		const isBun = getRuntime() == 'bun'
+		const isBun = getRuntime() === 'bun'
 
 		switch (platform) {
 			case 'aws':

package/src/cli/commands/dev.ts

@@ -54,7 +54,7 @@ export default defineCommand({
 				event('Building..')
 			}
 			const fn = async () => {
-				building && await build(platform)
+				building && await build(platform, 'dev')
 				await start()
 			}
 
@@ -109,7 +109,7 @@ export default defineCommand({
 
 		const started = (port: number) => {
 			log(`Starting API on http://${host}:${port}`)
-			if (platform == 'cf')
+			if (platform === 'cf')
 				log(`Localflare on https://studio.localflare.dev`)
 			rn()
 		}
@@ -136,7 +136,7 @@ export default defineCommand({
 							{
 								stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
 								// stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
-								shell: process.platform == 'win32',
+								shell: process.platform === 'win32',
 								env: {...process.env, DOCKER_HOST: getDockerHost()},
 							}
 						)
@@ -202,8 +202,8 @@ export default defineCommand({
 			case 'node':
 				return withPort(desiredPort, async (port) => {
 					started(port)
-					const isBun = getRuntime() == 'bun'
-					const isWin32 = process.platform == 'win32'
+					const isBun = getRuntime() === 'bun'
+					const isWin32 = process.platform === 'win32'
 					const params = isBun
 						? ['run', '--port=' + port, '--hot', '--silent', '--no-clear-screen', '--no-summary', join(_root, 'node_modules/rajt/src/dev.ts')]
 						: [join(_root, 'node_modules/.bin/tsx' + (isWin32 ? '.exe' : '')), 'watch', join(_root, 'node_modules/rajt/src/dev-node.ts')]

package/src/cli/commands/migrate.ts

@@ -19,13 +19,13 @@ export default defineCommand({
 		},
 	},
 	async run({ args }) {
-		if (args._.length != 2) {
+		if (args._.length !== 2) {
 			error('Invalid args: '+ gray('[ACTION] [DATABASE]'))
 			return rn()
 		}
 
 		const [action, database] = args._
-		const isBun = getRuntime() == 'bun'
+		const isBun = getRuntime() === 'bun'
 		const isRemote = !!args?.remote
 
 		try {

package/src/cli/commands/routes.ts

@@ -46,15 +46,15 @@ export default defineCommand({
 				keys.add(key)
 
 				let mLength = method.length
-				if (method == 'GET') mLength += 5
+				if (method === 'GET') mLength += 5
 
 				maxMethodLength = Math.max(maxMethodLength, mLength)
 				maxPathLength = Math.max(maxPathLength, path.length)
 
 				return [
-					isMiddleware && method != 'ALL' || !isMiddleware,
+					isMiddleware && method !== 'ALL' || !isMiddleware,
 					opts.path ? path.startsWith(opts.path) : true,
-					opts.method ? method == opts.method : true,
+					opts.method ? method === opts.method : true,
 				].every(Boolean)
 			})
 
@@ -68,7 +68,7 @@ export default defineCommand({
 			let mLength = method.length
 			let str = highlightedMethod(method, null, true)
 
-			if (method == 'GET')
+			if (method === 'GET')
 				mLength += 5
 
 			console.log(str + ' '.repeat(maxMethodLength - mLength) +'  '+ highlightedURI(path, method))

package/src/cli/index.ts

@@ -19,8 +19,8 @@ import make from './commands/make'
 const directly = () => {
   try {
     // @ts-ignore
-    return typeof vitest == 'undefined'
-      && import.meta.url == `file://${process.argv[1].replace(/\\/g, '/')}`
+    return typeof vitest === 'undefined'
+      && import.meta.url?.endsWith(process.argv[1].replace(/\\/g, '/'))
 	} catch {
 		return false
 	}
@@ -32,7 +32,7 @@ const version = [name, isColorSupported ? gray('v'+rajtVersion) : rajtVersion].j
 if (directly()) {
   const _args = process.argv.slice(2)
   const length = _args.length
-  if (!length || (length == 1 && ['-v', '--version', '--v', '-version'].includes(_args[0]))) {
+  if (!length || (length === 1 && ['-v', '--version', '--v', '-version'].includes(_args[0]))) {
     console.log(version)
     process.exit(0)
   }

package/src/cli/stubs.ts

@@ -1,11 +1,11 @@
 export const replace = (str: string, map: Record<string, string>) => {
-  if (!str || typeof str != 'string' || !map || typeof map != 'object') return str
+  if (!str || typeof str !== 'string' || !map || typeof map !== 'object') return str
   const entries = Object.entries(map)
   const length = entries?.length || 0
   if (!length) return str
 
   str = str.trimStart()
-  if (length == 1)
+  if (length === 1)
     return str.replaceAll(entries[0][0], entries[0][1])
 
   return entries.reduce(

package/src/cli/utils.ts

@@ -44,7 +44,7 @@ export const platformError = () => error(`Provide a valid platform: ${formatArgs
 
 export function getRuntime() {
   try {
-    return process?.isBun || typeof Bun != 'undefined' ? 'bun' : 'node'
+    return process?.isBun || typeof Bun !== 'undefined' ? 'bun' : 'node'
   } catch {
     return 'node'
   }
@@ -117,10 +117,10 @@ function stripDecorators(source: string) {
 }
 
 const dist = '.rajt/dist'
-export const build = async (platform: Platform) => {
+export const build = async (platform: Platform, env: string = 'prd') => {
   const startTime = Date.now()
 
-  const isCF = platform == 'cf'
+  const isCF = platform === 'cf'
   cleanDir(join(_root, dist))
 
   if (isCF) {
@@ -138,7 +138,7 @@ export const build = async (platform: Platform) => {
   const encoder = new TextEncoder()
 
   // @ts-ignore
-  platform = platform != 'node' ? '-'+ platform : ''
+  platform = platform !== 'node' ? '-'+ platform : ''
   const opts = {
     entryPoints: [join(_rajt, `prod${platform}.ts`)],
     bundle: true,
@@ -160,9 +160,10 @@ export const build = async (platform: Platform) => {
     ],
     metafile: true,
     write: false,
-    // define: {
-    //   'process.env.NODE_ENV': '"development"'
-    // },
+    define: {
+      'process.env.RAJT_ENV': env,
+      //  'process.env.NODE_ENV': '"development"',
+    },
     // tsconfig: join(_root, 'tsconfig.json'),
     // sourcemap: true,
     // logLevel: 'info',
@@ -257,7 +258,7 @@ export function cleanDB(key: string, config?: WranglerConfig) {
   config ??= wranglerConfig()
   if (!config?.d1_databases) return
   for (const db of config.d1_databases) {
-    if (key == db.database_name || key == db.binding) {
+    if (key === db.database_name || key === db.binding) {
       const ns = 'miniflare-D1DatabaseObject'
       const fileName = join(ns, durableObjectNamespace(db.preview_database_id || db.database_id || db.binding, ns) +'.sqlite')
 
@@ -462,7 +463,7 @@ export async function wait(ms: number) {
 export function getDockerHost() {
 	const platform = process.platform
 
-	if (platform == 'darwin') {
+	if (platform === 'darwin') {
 		for (const socket of [
 			'/Users/'+ process.env.USER +'/.docker/run/docker.sock',
 			'/var/run/docker.sock',
@@ -475,7 +476,7 @@ export function getDockerHost() {
 		return 'tcp://localhost:2375'
 	}
 
-	return process.env.DOCKER_HOST || (platform == 'win32' ? 'tcp://localhost:2375' : 'unix:///var/run/docker.sock')
+	return process.env.DOCKER_HOST || (platform === 'win32' ? 'tcp://localhost:2375' : 'unix:///var/run/docker.sock')
 }
 
 export function makeFile(path: string, content: string) {

package/src/create-app.ts

@@ -21,10 +21,10 @@ const EHandler = async (e: Error | HTTPResponseError) => {
   console.error(e)
 
   switch (true) {
-    case 'status' in e && e.status == 401:
+    case 'status' in e && e.status === 401:
       return response.unauthorized()
 
-    case 'status' in e && e.status == 400: // @ts-ignore
+    case 'status' in e && e.status === 400: // @ts-ignore
       return response.badRequest(null, e?.message)
 
     default:
@@ -69,13 +69,13 @@ export const createApp = <E extends Env>(options?: ServerOptions<E>) => {
   if (isDev()) {
     app.use('*', async function (c: Context, next: Next) {
       const method = c.req.method
-      const route = matchedRoutes(c).find(route => route.method == method)?.path
+      const route = matchedRoutes(c).find(route => route.method === method)?.path
       const logWithRoute = (args: string[]) => {
         if (!route || !args.length) return args
         return args.map(arg => {
           if (!arg) return arg
           const split = arg?.split(' ')
-          if (split.length < 3 || split[2] == route)
+          if (split.length < 3 || split[2] === route)
             return arg
 
           split.splice(Math.min(3, split.length), 0, gray(route))
@@ -113,11 +113,11 @@ export const createApp = <E extends Env>(options?: ServerOptions<E>) => {
   if (options?.init) options.init(app)
 
   const routes = options?.routes || [] // @ts-ignore
-  const routeRegister = options?.routeRegister ? options.routeRegister : (_: Hono, route: Route) => { // @ts0ignore
+  const routeRegister = options?.routeRegister ? options.routeRegister : (_: Hono, route: Route) => {
     if (Array.isArray(route)) { // @ts-ignore
       _[getVerb[route[0]]](route[1], ...resolve(...route[2], route[3]))
     } else { // @ts-ignore
-      _[route.method](route.path, ...resolve(...route.middlewares), route.handle)
+      _[route.method](route.path, ...resolve(...route.middlewares, route.handle))
     }
   }
 

package/src/http.ts

@@ -29,10 +29,10 @@ export const getVerb = [
 ]
 
 function method(method: string, ...args: any[]): void | ClassDecorator {
-  if (args.length == 1 && typeof args[0] == 'function')
+  if (args.length === 1 && typeof args[0] === 'function')
     return _method(method, '/', args[0])
 
-  const path = typeof args[0] == 'string' ? args[0] : '/'
+  const path = typeof args[0] === 'string' ? args[0] : '/'
   return (target: Function) => _method(method, path, target)
 }
 
@@ -117,7 +117,7 @@ export function Middlewares(...handlers: MiddlewareType[]) {
 export function Auth(target: Function): void
 export function Auth(): ClassDecorator
 export function Auth(...args: any[]): void | ClassDecorator {
-  if (args.length == 1 && typeof args[0] == 'function')
+  if (args.length === 1 && typeof args[0] === 'function')
     return _auth(args[0])
 
   return (target: any) => _auth(target)

package/src/open-api/register.ts

@@ -61,7 +61,8 @@ export function registerOpenAPI(app: Hono, conf: any) {
       slug: opts.appName?.toLowerCase().normalize('NFD').replace(/[\u0300-\u036f]/g, '').replace(/[^\w\s_-]/g, '').replace(/[\s_-]+/g, '_').replace(/[^\x00-\x7F]/g, '') +'_'+ opts.appVersion,
       // hideDownloadButton: true,
       // onLoaded: () => document?.querySelectorAll('[href="https://www.scalar.com"]')?.forEach(el => el.remove()),
-      customCss: `[href="https://www.scalar.com"]{display:none}`,
+      customCss: `[href="https://www.scalar.com"],.scalar-mcp-layer{display:none!important}`,
+      // favicon: 'https://example.com/favicon.png',
     })
   )
 }

package/src/request.ts

@@ -27,6 +27,7 @@ export default class $Request {
   #u: Authnz<any> | null = null
 
   #host: string
+  #protocol: string
   #routePath?: string
   #matchedRoutes: RouterRoute[]
 
@@ -37,6 +38,7 @@ export default class $Request {
 
     const url = new URL(c.req.raw.url)
     this.#host = url.protocol +'//'+ url.host
+    this.#protocol = url.protocol
 
     this.#matchedRoutes = matchedRoutes(c)
   }
@@ -68,6 +70,13 @@ export default class $Request {
     return this.has(prop, value)
   }
 
+  createToken(data: any, exp: number) {
+    return Token.create(this, data, exp)
+  }
+  parseToken(token: string) {
+    return Token.parse(this, token)
+  }
+
   get cx() {
     return this.#c
   }
@@ -90,6 +99,10 @@ export default class $Request {
     return this.#c.req.header('user-agent')
   }
 
+  get protocol() {
+    return this.#protocol
+  }
+
   get url() {
     return this.#c.req.raw.url
   }

package/src/response.ts

@@ -58,7 +58,7 @@ export default class $Response {
     headers?: HeaderRecord
   ): Response | Promise<Response> {
     const res = (html: string) => this.raw(status, html, 'text/html; charset=UTF-8' as BaseMime, headers)
-    return typeof html == 'string'
+    return typeof html === 'string'
       ? res(html)
       : resolveCallback(html, HtmlEscapedCallbackPhase.Stringify, false, {}).then(res)
   }

package/src/routes.ts

@@ -4,11 +4,13 @@ import { join, resolve, relative } from 'pathe'
 import { IMPORT } from 't0n'
 import glob from 'tiny-glob'
 import { config } from 'dotenv'
-import { describeRoute, resolver } from 'hono-openapi'
+import { describeRoute, resolver, validator } from 'hono-openapi'
 import { mimes } from 'hono/utils/mime'
 import { STATUS_CODES } from 'node:http'
 import { registerHandler, registerMiddleware } from './register'
 import createApp from './create-app'
+import _response from './response'
+import _validator from './validator'
 import { isAnonFn } from './utils/func'
 import ensureDir from './utils/ensuredir'
 import versionSHA from './utils/version-sha'
@@ -20,7 +22,7 @@ import { resolve as _resolve } from './utils/resolve'
 import { highlightedMethod, highlightedURI } from './cli/utils'
 
 import type * as z from 'zod'
-import type { Routes, StandardSchemaV1 } from './types'
+import type { Routes, Rule, StandardSchemaV1 } from './types'
 
 const importName = (name?: string) => (name || 'Fn'+ Math.random().toString(36).substring(2)).replace(/\.ts$/, '')
 const walk = async (dir: string, baseDir: string, fn: Function, parentMw: string[] = []): Promise<void> => {
@@ -44,7 +46,7 @@ const walk = async (dir: string, baseDir: string, fn: Function, parentMw: string
 
     if (stat.isDirectory()) {
       await walk(fullPath, baseDir, fn, currentMw)
-    } else if (file != 'index.ts' && file.endsWith('.ts') && !file.endsWith('.d.ts')) {
+    } else if (file !== 'index.ts' && file.endsWith('.ts') && !file.endsWith('.d.ts')) {
       const mod = await IMPORT(fullPath)
       fn(fullPath, baseDir, mod.default, currentMw)
     }
@@ -54,18 +56,18 @@ const walk = async (dir: string, baseDir: string, fn: Function, parentMw: string
 function isZodSchema(obj: any): obj is z.ZodType {
   return (
     obj &&
-    typeof obj == 'object' &&
+    typeof obj === 'object' &&
     ('_def' in obj || '_type' in obj) &&
     (obj.safeParse !== undefined || obj.parse !== undefined)
   )
 }
 
 function ResolveDescribeSchema(obj: any, deep: boolean = false) {
-  if (!obj || typeof obj != 'object') return obj
+  if (!obj || typeof obj !== 'object') return obj
   if (isZodSchema(obj))
     return { content: {'application/json': { schema: resolver(obj as unknown as StandardSchemaV1) }} }
 
-  if (obj.content && typeof obj.content == 'object') {
+  if (obj.content && typeof obj.content === 'object') {
     for (const mediaType in obj.content) {
       const contentItem = obj.content[mediaType]
       if (contentItem?.schema && isZodSchema(contentItem.schema))
@@ -81,7 +83,7 @@ function ResolveDescribeSchema(obj: any, deep: boolean = false) {
   }
 
   for (const key in obj) {
-    if (obj[key] && typeof obj[key] == 'object') {
+    if (obj[key] && typeof obj[key] === 'object') {
       obj[key] = ResolveDescribeSchema(obj[key], true)
 
       if (!deep && !obj[key]?.description) {
@@ -135,7 +137,7 @@ export async function getRoutes(
       }
 
       const mw = (handle.mw?.length ? [...handle.mw, ...middlewares] : middlewares).flatMap(obj => {
-        return typeof obj == 'string' ? obj : obj?.name || null
+        return typeof obj === 'string' ? obj : obj?.name || null
       }).filter(Boolean) as Function[]
 
       routes.push({
@@ -191,7 +193,7 @@ function extractHttpPath(file: string) {
     .map(part => part.startsWith('[') && part.endsWith(']') ? ':'+ part.slice(1, -1) : part)
     .join('/')
 
-  return route == '/' ? '/' : route.replace(/\/$/, '')
+  return route === '/' ? '/' : route.replace(/\/$/, '')
 }
 
 export function sortRoutes(routes: Routes) {
@@ -210,7 +212,7 @@ export function sortRoutes(routes: Routes) {
     return metaB.score - metaA.score
   })
 
-  while (list.length && list.at(-1)?.path == '/') {
+  while (list.length && list.at(-1)?.path === '/') {
     const last = list.pop()
     last && list.unshift(last)
   }
@@ -275,9 +277,9 @@ export async function getConfigs(
     const keyPath = extractName(file).split('.')
 
     keyPath.reduce((acc, key, index) => {
-      if (index == keyPath.length - 1) {
+      if (index === keyPath.length - 1) {
         acc[key] = mod.default
-      } else if (!acc[key] || typeof acc[key] != 'object') {
+      } else if (!acc[key] || typeof acc[key] !== 'object') {
         acc[key] = {}
       }
 
@@ -295,15 +297,15 @@ function stringifyToJS(value: unknown): string {
 
   const type = typeof value
 
-  if (type == 'string') return JSON.stringify(value)
-  if (type == 'number' || type == 'boolean') return String(value)
-  if (type == 'bigint') return `${value}n`
-  if (type == 'function') return value.toString()
+  if (type === 'string') return JSON.stringify(value)
+  if (type === 'number' || type === 'boolean') return String(value)
+  if (type === 'bigint') return `${value}n`
+  if (type === 'function') return value.toString()
 
   if (Array.isArray(value))
     return `[${value.map(stringifyToJS).join(',')}]`
 
-  if (type == 'object') {
+  if (type === 'object') {
     const entries = Object.entries(value as Record<string, unknown>)
       .map(([key, val]) => `${IDENTIFIER_RE.test(key) ? key : JSON.stringify(key)}:${stringifyToJS(val)}`)
 
@@ -326,7 +328,7 @@ async function dependencyPath(lib: string) {
 export async function cacheRoutes() {
   const env = Object.entries(
     config({ path: join(_root, '.env.prod') })?.parsed || {}
-  ).filter(([key, val]) => key?.toLowerCase().indexOf('aws') != 0) // prevent AWS credentials
+  ).filter(([key, val]) => key?.toLowerCase().startsWith('aws')) // prevent AWS credentials
 
   const version = versionSHA('../../.git') // @ts-ignore
   env.push(['VERSION_SHA', process.env['VERSION_SHA'] = version]) // @ts-ignore
@@ -358,9 +360,13 @@ export async function cacheRoutes() {
     registerHandler(h[1], mod[h[1]])
   }
 
+  _validator.setParser((rule: Rule) => validator(rule.target, rule.schema, (result, c) => {
+    if (!result.success) // @ts-ignore
+      return _response.badRequest(result.error)
+  }))
   // @ts-ignore
   const openApi = await generateOpenAPI(createApp({ routes, routeRegister: (app: Hono, route: Route) => {
-    app[route.method](route.path, describeRoute(route.desc), ..._resolve(...route.middlewares), route.handle)
+    app[route.method](route.path, describeRoute(route.desc), ..._resolve(...route.middlewares, route.handle))
   } }), configs?.rajt || {})
 
   const iPath = join(_root, '.rajt/imports.mjs')
@@ -374,7 +380,7 @@ export async function cacheRoutes() {
   stringifyToJS(Object.fromEntries(routes.map(r => ([r.path + r.method, r.name]))))
 
   writeFileSync(iPath, `// AUTO-GENERATED FILE - DO NOT EDIT
-${env?.length ? `import { Envir } from '${await dependencyPath('t0n')}/dist/index'\nEnvir.add({${env.map(([key, val]) => key +':'+ stringifyToJS(val)).join(',')}})` : ''}
+${env?.length ? `import { Envir } from '${await dependencyPath('t0n')}/src/envir'\nEnvir.add({${env.map(([key, val]) => key +':'+ stringifyToJS(val)).join(',')}})` : ''}
 ${Object.entries(configs)?.length ? `import Config from '${_rajtDir}/src/config'\nConfig.add(${stringifyToJS(configs)})` : ''}
 
 import { registerHandler, registerMiddleware } from '${_rajtDir}/src/register'

package/src/utils/environment.ts

@@ -1,16 +1,17 @@
 const prd = Symbol('prd')
 const dev = Symbol('dev')
 
-let env = prd
+// @ts-ignore
+let env = process.env.RAJT_ENV || detectEnvironment()
 
-export const getEnv = () => env
+export const getEnv = () => env // @ts-ignore
 export const setEnv = (e: symbol) => env = e
 
-export function detectEnvironment() {
+export function detectEnvironment(): symbol {
   try {
     if (
-      process.env?.npm_lifecycle_event == 'dev'
-      || process.env?.npm_lifecycle_script == 'rajt'
+      process.env?.npm_lifecycle_event === 'dev'
+      || process.env?.npm_lifecycle_script === 'rajt'
       || process.env?.AWS_SAM_LOCAL
       // || process?.argv?.includes('--dev')
       || process?.argv?.some(arg => ['-port', '-platform', '--dev', '--development', '--watch'].includes(arg))
@@ -24,10 +25,11 @@ export function detectEnvironment() {
   return prd
 }
 
-export const isEnv = (e: symbol) => env == e
+export const isEnv = (e: symbol) => env === e
 
-export const isDev = () => env == dev
-export const isProd = () => env == prd
+// @ts-ignore
+export const isDev = () => env === dev
+export const isProd = () => env === prd
 
 export const isDevelopment = isDev
 export const isProduction = isProd

package/src/utils/func.ts

@@ -1,8 +1,8 @@
 export const isAsyncFn = (fn: any) => {
-  return fn?.constructor?.name == 'AsyncFunction'
+  return fn?.constructor?.name === 'AsyncFunction'
     || fn.toString().toLowerCase().trim().startsWith('async')
 }
 
 export const isAnonFn = (fn: any) => {
-    return fn?.name == '' || fn?.name == 'anonymous'
+    return fn?.name === '' || fn?.name === 'anonymous'
 }

package/src/utils/log.ts

@@ -54,7 +54,7 @@ const LOGGING_METHOD = {
 
 function prefixedLog(prefixType: keyof typeof prefixes, ...msg: any[]) {
   const length = msg.length
-  if ((msg[0] === '' || msg[0] === undefined) && length == 1)
+  if ((msg[0] === '' || msg[0] === undefined) && length === 1)
     msg.shift()
 
   const consoleMethod: keyof typeof LOGGING_METHOD =
@@ -64,12 +64,12 @@ function prefixedLog(prefixType: keyof typeof prefixes, ...msg: any[]) {
 
   const prefix = prefixes[prefixType]
   // If there's no message, don't print the prefix but a new line
-  if (length == 0) {
+  if (length === 0) {
     console[consoleMethod]('')
   } else {
     // Ensure if there's ANSI escape codes it's concatenated into one string.
     // Chrome DevTool can only handle color if it's in one string.
-    if (length == 1 && typeof msg[0] == 'string') {
+    if (length === 1 && typeof msg[0] === 'string') {
       console[consoleMethod](prefix +' '+ msg[0])
     } else {
       console[consoleMethod](prefix, ...msg)

package/src/utils/port.ts

@@ -5,7 +5,7 @@ import { error, warn } from './log'
 export function withPort(desiredPort: number, cb: (port: number) => void, maxAttempts = 10) {
   getAvailablePort(desiredPort)
     .then(([port, pid]) => {
-      if (port != desiredPort)
+      if (port !== desiredPort)
         warn(
           `Port ${desiredPort} is in use by ${pid ? 'process '+ pid : 'an unknown process'}, using available port ${port} instead`
         )

package/src/utils/resolve.ts

@@ -3,10 +3,10 @@ import { getHandler } from '../register'
 export function resolve(...objs: any[]) {
   const _ = []
   for (let obj of objs) {
-    if (typeof obj == 'string')
+    if (typeof obj === 'string')
       obj = getHandler(obj)
 
-    if (typeof obj == 'function' && obj?.length == 2) {
+    if (typeof obj === 'function' && obj?.length === 2) {
 
     } else if (obj?.run) {
       _.push(...obj.run())
@@ -34,7 +34,7 @@ export function resolve(...objs: any[]) {
 }
 
 export function resolveMiddleware(obj: any) {
-  if (typeof obj == 'function' && obj.length == 2)
+  if (typeof obj === 'function' && obj.length === 2)
     return obj
 
   if (obj?.factory)

package/src/validator.ts

@@ -1,9 +1,11 @@
 import { zValidator } from '@hono/zod-validator'
 import response from './response'
+import type * as z from 'zod'
 import type {
   Rule, Rules, RuleFn,
   ValidationTargets,
   zObject,
+  MiddlewareHandler,
 } from './types'
 
 export default class $Validator {
@@ -36,11 +38,33 @@ export default class $Validator {
   static readonly header = $Validator.fn('header')!
   static readonly cookie = $Validator.fn('cookie')!
 
+  static #parser = (rule: Rule) => zValidator(rule.target, rule.schema, (result, c) => {
+    if (!result.success) // @ts-ignore
+      return response.badRequest(formatZodErrors(result.error.issues || []))
+  })
+
+  static setParser(parser: (rule: Rule) => MiddlewareHandler) {
+    this.#parser = parser
+  }
+
   static parse(rules: Rules): Function[] {
     return (Array.isArray(rules) ? rules : [rules]) // @ts-ignore
-      .flatMap(rule => zValidator(rule.target, rule.schema, (result, c) => {
-        if (!result.success) // @ts-ignore
-          return response.badRequest({ ...result.error.flatten()[rule.eTarget] })
-      }))
+      .flatMap(this.#parser)
+  }
+}
+
+function formatZodErrors(issues: z.ZodIssue[]): Record<string, string[]> {
+  const result: Record<string, string[]> = {}
+
+  for (const issue of issues) {
+    const path = issue.path.join('.')
+    const key = path || 'root'
+
+    if (!result[key])
+      result[key] = []
+
+    result[key].push(issue.message)
   }
+
+  return result
 }