rajt 0.0.100 → 0.0.101

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.101",
   "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/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()
 			}
 

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
 	}

package/src/cli/utils.ts

@@ -117,7 +117,7 @@ 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'
@@ -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',

package/src/create-app.ts

@@ -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/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/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> => {
@@ -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 || prd
 
-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/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
 }