rajt 0.0.61 → 0.0.63

package/README.md

@@ -6,6 +6,9 @@
 
 <br/>
 
+> ⚠️ Rajt is under ALFA development — expect updates, rough edges, and occasional breack changes.
+<br/>
+
 This framework is fully geared towards the serverless world, specifically AWS Lambda (Node.js, Bun and LLRT runtime) / Cloudflare Workers.
 
 - 💡 Instant Server Start

package/bin/rajt.js

@@ -2,19 +2,16 @@
 import { spawn } from "node:child_process";
 import { join, dirname } from "node:path";
 import { existsSync } from "node:fs";
-import { fileURLToPath } from "node:url";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const __dirname = dirname(new URL(import.meta.url).pathname);
 
 const ERR_NODE_VERSION = "18.0.0";
 const MIN_NODE_VERSION = "18.0.0";
 
 let rajtProcess;
 
-// Executes ../src/cli/index.ts
 function runRajt() {
-  if (semiver(process.versions.node, ERR_NODE_VERSION) < 0) {
+  if (process?.versions?.node && semiver(process.versions.node, ERR_NODE_VERSION) < 0) {
     console.error(
       `Rajt requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of Node.js.
 
@@ -24,30 +21,35 @@ Consider using a Node.js version manager such as https://volta.sh or https://git
     return;
   }
 
-  const tsxPaths = [
-    // join(__dirname, "../node_modules/.bin/tsx"),
-    // join(__dirname, "../../.bin/tsx"),
-    join(__dirname, "../node_modules/.bin/tsx"),
-    join(__dirname, "../../node_modules/.bin/tsx"),
-    join(process.cwd(), "node_modules/.bin/tsx"),
-    "tsx",
-  ];
-
+  const isBun = process?.isBun || typeof Bun != 'undefined';
   let tsxPath;
-  for (const pathOption of tsxPaths) {
-    if (pathOption == "tsx" || existsSync(pathOption)) {
-      tsxPath = pathOption;
-      break;
+  // const params = isBun ? bunParams() : nodeParams();
+
+  if (!isBun) {
+    const tsxPaths = [
+      // join(__dirname, "../node_modules/.bin/tsx"),
+      // join(__dirname, "../../.bin/tsx"),
+      join(__dirname, "../node_modules/.bin/tsx"),
+      join(__dirname, "../../node_modules/.bin/tsx"),
+      join(process.cwd(), "node_modules/.bin/tsx"),
+      "tsx",
+    ];
+
+    for (const pathOption of tsxPaths) {
+      if (pathOption == "tsx" || existsSync(pathOption)) {
+        tsxPath = pathOption;
+        break;
+      }
     }
-  }
 
-  if (!tsxPath) {
-    console.error("TypeScript file found but 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;
+    if (!tsxPath) {
+      console.error("TypeScript file found but 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(
@@ -56,12 +58,9 @@ Consider using a Node.js version manager such as https://volta.sh or https://git
       "--no-warnings",
       ...process.execArgv,
       tsxPath,
-      join(__dirname, "../cli/index.ts"),
+      join(__dirname, "../src/cli/index.ts"),
       ...process.argv.slice(2),
-    ].filter(arg =>
-      !arg.includes('experimental-vm-modules') &&
-      !arg.includes('loader')
-    ),
+    ].filter(arg => arg && !arg.includes('experimental-vm-modules') && !arg.includes('loader')),
     {
       stdio: ["inherit", "inherit", "inherit", "ipc"],
       env: {
@@ -70,20 +69,17 @@ Consider using a Node.js version manager such as https://volta.sh or https://git
         TSX_DISABLE_CACHE: process.env.TSX_DISABLE_CACHE || '1',
       }
     }
-  )
-    .on("exit", (code) =>
-      process.exit(code == null ? 0 : code)
-    )
-    .on("message", (message) => {
-      if (process.send) {
-        process.send(message);
-      }
-    })
-    .on("disconnect", () => {
-      if (process.disconnect) {
-        process.disconnect();
-      }
-    });
+  ).on("exit", (code) =>
+    process.exit(code == null ? 0 : code)
+  ).on("message", (message) => {
+    if (process.send) {
+      process.send(message);
+    }
+  }).on("disconnect", () => {
+    if (process.disconnect) {
+      process.disconnect();
+    }
+  });
 }
 
 var fn = new Intl.Collator(0, { numeric: 1 }).compare;
@@ -104,7 +100,10 @@ function semiver(a, b, bool) {
 function directly() {
   try {
     return process.env?.npm_lifecycle_script == 'rajt'
-      && process.argv[1]?.endsWith('node_modules/.bin/rajt')
+      && (
+        process.argv[1]?.endsWith('node_modules/.bin/rajt')
+        || process.argv[1]?.endsWith('node_modules/rajt/bin/rajt.js')
+      )
   } catch {
     return false
   }

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.61",
+  "version": "0.0.63",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -52,12 +52,20 @@
     "start": "node ../../dist/index.js"
   },
   "dependencies": {
-    "@hono/zod-validator": "^0.4.3",
     "cripta": "^0.1",
     "forj": "^0.0.4",
-    "hono": "^4.7.6",
     "t0n": "^0.1",
-    "ua-parser-js": "^2.0.4"
+    "@hono/zod-validator": "^0.7.6",
+    "chokidar-cli": "^3.0.0",
+    "citty": "^0.1.6",
+    "dotenv": "^16.5.0",
+    "esbuild": "^0.25.2",
+    "hono": "^4.11.7",
+    "miniflare": "^4.20251217.0",
+    "picocolors": "^1.1.1",
+    "tiny-glob": "^0.2",
+    "tsx": "^4.19.3",
+    "ua-parser-js": "^2.0.8"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20251230.0",
@@ -74,16 +82,8 @@
     "@miniflare/web-sockets": "^2.14.4",
     "@types/node": "^20.11.0",
     "bun-types": "^1.2.14",
-    "chokidar-cli": "^3.0.0",
-    "citty": "^0.1.6",
-    "dotenv": "^16.5.0",
-    "esbuild": "^0.25.2",
-    "miniflare": "^4.20251217.0",
-    "picocolors": "^1.1.1",
-    "tiny-glob": "^0.2",
-    "tsx": "^4.19.3",
-    "typescript": "^5.8.3",
-    "wrangler": "^4.56.0"
+    "typescript": "^5.9.3",
+    "wrangler": "^4.61.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/action.ts

@@ -1,11 +1,12 @@
 import response from './response'
 import validator from './validator'
+import { GET_REQUEST } from './request'
 import type { Context, IRequest, IResponse, IValidator, Rules } from './types'
 
 export default class Action {
   static run() {
     const rules = this.rules(validator)
-    const h = async (c: Context) => await this.handle(c.get('_'), response)
+    const h = async (c: Context) => await this.handle(c.get(GET_REQUEST as unknown as string), response)
     if (!rules) return [h]
 
     const pipe = validator.parse(rules)

package/src/cli/commands/dev/index.ts

@@ -1,10 +1,9 @@
 import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 import { dirname, join, relative } from 'node:path'
 import { spawn, type ChildProcess } from 'node:child_process'
 
 import chokidar from 'chokidar'
-import colors from 'picocolors'
+// import colors from 'picocolors'
 import { defineCommand } from 'citty'
 import type { ChokidarEventName } from '../../types'
 
@@ -13,7 +12,7 @@ import { build, createMiniflare } from './utils'
 import { getAvailablePort } from '../../../utils/port'
 import shutdown from '../../../utils/shutdown'
 
-const __dirname = join(dirname(fileURLToPath(import.meta.url)), '../../../../../../')
+const __dirname = join(dirname(new URL(import.meta.url).pathname), '../../../../../../')
 
 export default defineCommand({
 	meta: {
@@ -36,7 +35,7 @@ export default defineCommand({
 			description: 'Environment platform',
 			type: 'enum',
 			options: ['aws', 'cf', 'node'] as const,
-			required: true,
+			// required: true,
 		},
 	},
 	async run({ args }) {
@@ -93,7 +92,7 @@ export default defineCommand({
 								'local', 'start-api',
 								'--warm-containers', 'LAZY',
 								'--debug', '--template-file', join(__dirname, 'template-dev.yaml'),
-								'--port', args.port,
+								'--port', String(port),
 							],
 							{
 								stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
@@ -168,30 +167,43 @@ export default defineCommand({
 						logger.step('Server restarted')
 					})
 				})
+			default:
 			case 'node':
 				return withPort(desiredPort, async (port) => {
 					logger.step(`API running on http://${host}:${port}`)
+					const isBun = process?.isBun || typeof Bun != 'undefined'
+					const params = isBun
+						? ['run', '--port='+ port, '--hot', '--silent', '--no-clear-screen', '--no-summary', join(__dirname, 'node_modules/rajt/src/dev.ts')]
+						: [join(__dirname, 'node_modules/.bin/tsx'), 'watch', join(__dirname, 'node_modules/rajt/src/dev-node.ts')]
 
-					spawn(
+					const child = spawn(
 						process.execPath,
-						[
-							join(__dirname, 'node_modules/.bin/tsx'), 'watch', join(__dirname, 'node_modules/rajt/src/dev.ts'),
-						],
+						params,
 						{
-							stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
-							env: {...process.env, PORT: args.port},
+							stdio: ['inherit', isBun ? 'pipe' : 'inherit', 'inherit', 'ipc'],
+							env: {...process.env, PORT: port},
 						}
-					).on('exit', code => process.exit(code ?? 0))
-					.on('message', msg => {
-						if (process.send) process.send(msg)
-					}).on('disconnect', () => {
-						if (process.disconnect) process.disconnect()
-					})
+					)
+
+					if (isBun && child?.stdout) {
+						child.stdout?.on('data', data => {
+							const output = data.toString()
+							if (!output.includes('Started development server'))
+									process.stdout.write(output)
+						})
+					}
+
+					child.on('exit', code => process.exit(code ?? 0))
+						.on('message', msg => {
+							if (process.send) process.send(msg)
+						}).on('disconnect', () => {
+							if (process.disconnect) process.disconnect()
+						})
 				})
-			default:
-				return logger.warn(
-					`🟠 Provide a valid platform: ${['aws', 'cf', 'node'].map(p => colors.blue(p)).join(', ')}.\n`
-				)
+			// default:
+			// 	return logger.warn(
+			// 		`🟠 Provide a valid platform: ${['aws', 'cf', 'node'].map(p => colors.blue(p)).join(', ')}.\n`
+			// 	)
     }
 	},
 })

package/src/cli/commands/dev/utils.ts

@@ -1,14 +1,13 @@
 import esbuild from 'esbuild'
 import TOML from '@iarna/toml'
 import { Miniflare } from 'miniflare'
-import { fileURLToPath } from 'node:url'
 import { mkdirSync, existsSync, readdirSync, rmSync, copyFileSync } from 'node:fs'
 import { readFile, stat, writeFile } from 'node:fs/promises'
 import { basename, dirname, join, relative } from 'node:path'
 
 import { cacheRoutes } from '../../../routes'
 
-const __dirname = join(dirname(fileURLToPath(import.meta.url)), '../../../../../../')
+const __dirname = join(dirname(new URL(import.meta.url).pathname), '../../../../../../')
 const __rajt = join(__dirname, 'node_modules/rajt/src')
 
 export const formatSize = (bytes: number) => {

package/src/cli/index.ts

@@ -25,11 +25,9 @@ console.error = () => {}
 const directly = () => {
   try {
     // @ts-ignore
-		return typeof vitest == 'undefined'
-			&& (
-				![typeof require, typeof module].includes('undefined') && require.main == module
-				|| import.meta.url == `file://${process.argv[1]}`
-			)
+    return typeof vitest == 'undefined'
+      && process.env?.npm_lifecycle_script == 'rajt'
+      && import.meta.url == `file://${process.argv[1]}`
 	} catch {
 		return false
 	}

package/src/create-app.ts

@@ -6,7 +6,8 @@ import type { Env, Context, ErrorHandler, NotFoundHandler, Next } from 'hono'
 // import { createMiddleware } from 'hono/factory'
 // import type { H, Handler, HandlerResponse } from 'hono/types'
 import type { HTTPResponseError } from 'hono/types'
-import colors from 'picocolors'
+import { createColors } from 'picocolors'
+import { getColorEnabledAsync } from 'hono/utils/color'
 import { Envir } from 't0n'
 import type { Routes } from './types'
 import { BadRequest, Unauthorized } from './exceptions'
@@ -14,9 +15,11 @@ import { resolve, resolveMiddleware } from './utils/resolve'
 import { getMiddlewares, getHandler } from './register'
 import { isDev } from './utils/environment'
 import localDate from './utils/local-date'
-import request from './request'
+import request, { GET_REQUEST } from './request'
 import response from './response'
 
+const colors = createColors(await getColorEnabledAsync())
+
 type InitFunction<E extends Env = Env> = (app: Hono<E>) => void
 
 export type ServerOptions<E extends Env = Env> = Partial<{
@@ -85,12 +88,12 @@ export const createApp = <E extends Env>(options?: ServerOptions<E>) => {
     app.use('*', logger((...args: any[]) => console.log(colors.gray(localDate()), ...args)))
 
   app.use(async (c: Context, next: Next) => {
-    c.set('_', new request(c))
+    c.set(GET_REQUEST as unknown as string, new request(c))
     if (c.env) Envir.add(c.env)
     await next()
   })
   getMiddlewares().forEach(mw => {
-    const h = async (c: Context, next: Next) => await resolveMiddleware(mw)(c.get('_'), next)
+    const h = async (c: Context, next: Next) => await resolveMiddleware(mw)(c.get(GET_REQUEST as unknown as string), next)
     // @ts-ignore
     mw?.path ? app.use(String(mw.path), h) : app.use(h)
   })

package/src/dev-node.ts

@@ -0,0 +1,16 @@
+import { serve, type ServerType } from '@hono/node-server'
+import app from './dev'
+import shutdown from './utils/shutdown'
+
+const fetch = app.fetch
+
+const port = process.env?.PORT ? Number(process.env.PORT) : 3000
+
+let server: ServerType | null = serve({ fetch, port })
+
+shutdown(() => {
+  if (server) {
+    server?.close()
+    server = null
+  }
+})

package/src/dev.ts

@@ -1,19 +1,15 @@
-import { fileURLToPath } from 'node:url'
 import { dirname, join } from 'node:path'
 import { config } from 'dotenv'
-import { serve, type ServerType } from '@hono/node-server'
 import createApp from './create-app'
 import { getRoutes, getMiddlewares, getConfigs } from './routes'
 import { registerHandler, registerMiddleware } from './register'
 import Config from './config'
-import { Ability } from './auth'
-import jsonImport from './utils/json-import'
-import { setEnv, detectEnvironment } from './utils/environment'
-import shutdown from './utils/shutdown'
+import { Ability } from 'rajt/auth'
+import { setEnv, detectEnvironment } from 'rajt/env'
 
 setEnv(detectEnvironment())
 
-const __dirname = join(dirname(fileURLToPath(import.meta.url)), '../../../')
+const __dirname = join(dirname(new URL(import.meta.url).pathname), '../../../')
 
 config({ path: join(__dirname, '.env.dev') })
 
@@ -29,15 +25,6 @@ middlewares.forEach(mw => registerMiddleware(mw.handle))
 Ability.fromRoutes(routes)
 Ability.roles = Config.get('roles', {})
 
-const fetch = createApp({ routes }).fetch
+const app = createApp({ routes })
 
-const port = process.env?.PORT ? Number(process.env.PORT) : 3000
-
-let server: ServerType | null = serve({ fetch, port })
-
-shutdown(() => {
-  if (server) {
-    server?.close()
-    server = null
-  }
-})
+export default app

package/src/esbuild.mjs

@@ -1,6 +1,5 @@
 import esbuild from 'esbuild'
 import { basename, dirname, join, relative } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { mkdirSync, existsSync, readdirSync, rmSync, copyFileSync } from 'node:fs'
 import { readFile, stat, writeFile } from 'node:fs/promises'
 
@@ -16,7 +15,7 @@ const platforms = ['aws', 'cf']
 if (!platform || !platforms.includes(platform))
   fail()
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
+const __dirname = dirname(new URL(import.meta.url).pathname)
 
 const formatSize = (bytes) => {
   if (bytes < 1024) return `${bytes}b`

package/src/http.ts

@@ -1,6 +1,7 @@
 import type { Context, Next } from 'hono'
 import { MiddlewareType } from './middleware'
 import response from './response'
+import { GET_REQUEST } from './request'
 import { Ability } from './auth'
 import mergeMiddleware from './utils/merge-middleware'
 import { IRequest } from './types'
@@ -102,7 +103,7 @@ export function Auth(...args: any[]): void | ClassDecorator {
 
 function _auth(target: Function | any) {
   mergeMiddleware(target, async (c: Context, next: Next) => {
-    const req = c.get('_') as IRequest
+    const req = c.get(GET_REQUEST as unknown as string) as IRequest
     const ability = Ability.fromAction(target)
 
     if (!req?.user || !ability || req.cant(ability))

package/src/index.ts

@@ -1,5 +1,7 @@
-export { default as Action } from './action'
+export { default as Action, default as Route } from './action'
 export { default as Middleware } from './middleware'
 export { default as Response } from './response'
 export { default as Config } from './config'
+
 export { Enum, Envir } from 't0n'
+export type { EnumStatic, EnumValue, EnumType } from 't0n'

package/src/request.ts

@@ -17,6 +17,8 @@ const cookieWrapper = (c: Context) => ({
   delete: (name: string, opt?: CookieOptions) => deleteCookie(c, name, opt)
 })
 
+export const GET_REQUEST: unique symbol = Symbol()
+
 export default class $Request {
   #c!: Context
   #cookie: ReturnType<typeof cookieWrapper>

package/src/routes.ts

@@ -1,6 +1,5 @@
 import { existsSync, readdirSync, statSync, writeFileSync } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 
 import glob from 'tiny-glob'
 import { config } from 'dotenv'
@@ -11,7 +10,7 @@ import ensureDir from './utils/ensuredir'
 import versionSHA from './utils/version-sha'
 import type { Route } from './types'
 
-const __filename = fileURLToPath(import.meta.url)
+const __filename = new URL(import.meta.url).pathname
 const __root = resolve(dirname(__filename), '../../..')
 
 const importName = (name?: string) => (name || 'Fn'+ Math.random().toString(36).substring(2)).replace(/\.ts$/, '')
@@ -159,7 +158,8 @@ export async function getConfigs(
   if (!dirs?.length) return {}
   const configs: Record<string, any> = {}
 
-  const files = await glob(join(__root, dirs?.length > 1 ? `{${dirs.join(',')}}` : dirs[0], '/**/*.{ts,js,json}'))
+  const files = (await glob(join(__root, dirs?.length > 1 ? `{${dirs.join(',')}}` : dirs[0], '/**/*.{ts,js,cjs,mjs,json}')))
+    .filter(file => !file.includes('.d.'))
 
   for (const file of files) {
     const mod = await IMPORT(join(__root, file))
@@ -179,14 +179,6 @@ export async function getConfigs(
   return configs
 }
 
-const env = Object.entries(
-  config({ path: '../../.env.prod' })?.parsed || {}
-).filter(([key, val]) => key?.toLowerCase().indexOf('aws') != 0) // prevent AWS credentials
-
-const version = versionSHA('../../.git') // @ts-ignore
-env.push(['VERSION_SHA', process.env['VERSION_SHA'] = version]) // @ts-ignore
-env.push(['VERSION_HASH', process.env['VERSION_HASH'] = version?.substring(0, 7)])
-
 const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u
 function stringifyToJS(value: unknown): string {
   if (value === null) return 'null'
@@ -213,6 +205,14 @@ function stringifyToJS(value: unknown): string {
 }
 
 export async function cacheRoutes() {
+  const env = Object.entries(
+    config({ path: '../../.env.prod' })?.parsed || {}
+  ).filter(([key, val]) => key?.toLowerCase().indexOf('aws') != 0) // prevent AWS credentials
+
+  const version = versionSHA('../../.git') // @ts-ignore
+  env.push(['VERSION_SHA', process.env['VERSION_SHA'] = version]) // @ts-ignore
+  env.push(['VERSION_HASH', process.env['VERSION_HASH'] = version?.substring(0, 7)])
+
   const rolePath = join(__root, 'configs/roles.ts')
   ensureDir(rolePath)
   if (!existsSync(rolePath))
@@ -230,8 +230,8 @@ ${configs?.length ? `import Config from '../node_modules/rajt/src/config'\nConfi
 
 import { registerHandler, registerMiddleware } from '../node_modules/rajt/src/register'
 
-${routes.map(r => `import ${r.name} from '../${normalizePath(r.file)}'`).join('\n')}
-${middlewares.map(r => `import ${r.name} from '../${normalizePath(r.file)}'`).join('\n')}
+${routes.map(r => `import ${r.name} from '../${normalizeImportPath(r.file)}'`).join('\n')}
+${middlewares.map(r => `import ${r.name} from '../${normalizeImportPath(r.file)}'`).join('\n')}
 
 try {
   const handlers = {${routes.map(r => r.name).join()}}
@@ -262,6 +262,6 @@ try {
   ])))
 }
 
-function normalizePath(file: string) {
+function normalizeImportPath(file: string) {
   return file.replace(/\.tsx?$/i, '').replace(/(\/index)+$/i, '').replace(/\/+$/g, '')
 }

package/src/utils/json-import.ts

@@ -1,10 +1,8 @@
 import { readFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
 
 export default function jsonImport<T = any>(filePath: string, defaultValue: T = {} as T): T {
-  const __filename = fileURLToPath(import.meta.url)
-  const __dirname = dirname(__filename)
+  const __dirname = dirname(new URL(import.meta.url).pathname)
 
   try {
     const fullPath = join(__dirname, filePath)

package/src/utils/logger.ts

@@ -13,17 +13,18 @@ export interface ILogger {
   // custom
   step(...data: any[]): void;
   substep(...data: any[]): void;
+  stepWarn(...data: any[]): void;
   ln(): void;
 }
 
 export const logger = {
-	step(...args: any[]) {
-		if (args?.length && args.length < 2) return _console.log(colors.blue('⁕') +` ${args[0]}\n`)
+  $step(color: Function, ...args: any[]) {
+    if (args?.length && args.length < 2) return _console.log(color('⁕') +` ${args[0]}\n`)
 		const length = args.length - 1
 		args.forEach((arg, index) => {
 				switch (index) {
 					case 0:
-						return _console.log(colors.blue('⁕') + ' ' + arg)
+						return _console.log(color('⁕') + ' ' + arg)
 						// return _console.log(colors.blue('⁕') +` ${arg} \n`)
 					case length:
 						return _console.log(`   ${colors.gray('⁕')} ${arg}\n`)
@@ -31,6 +32,12 @@ export const logger = {
 						return _console.log(`   ${colors.gray('⁕')} ` + arg)
 				}
     })
+  },
+	step(...args: any[]) {
+		this.$step(colors.blue, ...args)
+	},
+	stepWarn(...args: any[]) {
+		this.$step(colors.yellow, ...args)
 	},
 	substep(...args: any[]) {
 		args.forEach(arg => _console.log(`   ${colors.gray('⁕')} ` + arg))