rajt 0.0.96 → 0.0.97

package/bin/rajt.js

@@ -93,8 +93,8 @@ function semiver(a, b, bool) {
 function directly() {
   try {
     const arg = (process.argv[1] || '')?.replace(/\\/g, '/');
-    return arg?.endsWith('node_modules/.bin/rajt')
-      || arg?.endsWith('node_modules/rajt/bin/rajt.js')
+    return arg?.endsWith('.bin/rajt')
+      || arg?.endsWith('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.96",
+  "version": "0.0.97",
   "type": "module",
   "main": "./src/index.ts",
   "bin": {
@@ -39,13 +39,14 @@
   },
   "dependencies": {
     "cripta": "^0.1",
-    "forj": "^0.1",
+    "forj": "0.1.7",
     "t0n": "^0.1",
     "@hono/node-server": "^1.19.9",
     "@hono/standard-validator": "^0.2.2",
     "@scalar/hono-api-reference": "^0.9.40",
-    "chokidar-cli": "^3.0.0",
+    "chokidar": "^3.5.2",
     "citty": "^0.1.6",
+    "consola": "^3.4.2",
     "dotenv": "^16.5.0",
     "esbuild": "^0.25.2",
     "hono": "^4.11.7",
@@ -59,6 +60,7 @@
     "tsx": "^4.19.3",
     "ua-parser-js": "^2.0.8",
     "wrangler": "^4.61.0",
+    "zod": "^4.3.6",
     "zod-openapi": "4"
   },
   "devDependencies": {
@@ -72,8 +74,8 @@
     "@miniflare/sites": "^2.14.4",
     "@miniflare/storage-file": "^2.14.4",
     "@miniflare/web-sockets": "^2.14.4",
-    "@types/node": "^20.11.0",
-    "bun-types": "^1.2.14",
+    "@types/node": "^25.1.0",
+    "bun-types": "^1.3.8",
     "typescript": "^5.9.3"
   },
   "engines": {
@@ -109,4 +111,4 @@
     "bun",
     "nodejs"
   ]
-}
+}

package/src/auth/ability.ts

@@ -13,12 +13,6 @@ export class Ability {
   static fromRoutes(actions: Routes) {
     if (!actions?.length) return
 
-    const paths = actions?.map(a => Array.isArray(a) ? a[0] + a[1] : a.method + a.path) || []
-    const items = new Set(paths)
-
-    if (items.size != actions.length)
-      throw new Error(`Duplicate routes detected: "${paths.filter((path, index) => paths.indexOf(path) != index).join('", "')}"`)
-
     this.#abilities = Array.from(new Set(actions?.map(a => Array.isArray(a) ? a[3] : a.name) || []))
       .map(a => this.format(a))
       .filter(Boolean)

package/src/cli/commands/deploy.ts

@@ -1,8 +1,9 @@
 import { spawn } from 'node:child_process'
 import { defineCommand } from 'citty'
 
-import { _root, normalizePlatform, platformError, getRuntime } from '../utils'
+import { normalizePlatform, platformError, getRuntime } from '../utils'
 import { error } from '../../utils/log'
+import { _root } from '../../utils/paths'
 import { platforms } from '../constants'
 
 import build from './build'

package/src/cli/commands/dev.ts

@@ -4,11 +4,12 @@ import { spawn, type ChildProcess } from 'node:child_process'
 import { defineCommand } from 'citty'
 import type { Miniflare } from 'miniflare'
 import {
-	_root, build, wait, watch, normalizePlatform, platformError, getRuntime,
+	build, wait, watch, normalizePlatform, platformError, getRuntime,
 	wranglerConfig, createMiniflare, localflareManifest,
 	getDockerHost
 } from '../utils'
 import { error, event, log, rn, warn } from '../../utils/log'
+import { _root } from '../../utils/paths'
 import { withPort } from '../../utils/port'
 import shutdown from '../../utils/shutdown'
 
@@ -165,7 +166,9 @@ export default defineCommand({
 					let localflare: Miniflare | null = null
 					const startWorker = async () => {
 						if (worker) await worker.dispose()
-						if (localflare) await localflare.dispose()
+            if (localflare) await localflare.dispose()
+
+            // await wait(500)
 
 						const workerConfig = await wranglerConfig()
 						workerConfig.host = host
@@ -179,7 +182,7 @@ export default defineCommand({
 								...workerConfig.vars,
 								LOCALFLARE_MANIFEST: JSON.stringify(localflareManifest(workerConfig)),
 							},
-							main: 'node_modules/localflare-api/dist/worker/index.js',
+							main: '.rajt/localfire.js',
 							port: 8788,
 							inspectorPort: 9230,
 						})

package/src/cli/commands/make.ts

@@ -1,7 +1,8 @@
 import { defineCommand } from 'citty'
 import { join, relative } from 'pathe'
 import { Migrator } from 'forj'
-import { _root, makeFile, hasExt, camelCase, kebabCase } from '../utils'
+import { makeFile, hasExt, camelCase, kebabCase } from '../utils'
+import { _root } from '../../utils/paths'
 import { event, error } from '../../utils/log'
 import { dim } from '../../utils/colors'
 import * as stub from '../stubs'

package/src/cli/commands/migrate.ts

@@ -3,7 +3,8 @@ import { spawn } from 'node:child_process'
 import { join } from 'pathe'
 import { Migrator } from 'forj'
 import { gray } from '../../utils/colors'
-import { _root, getRuntime, cleanDB, cleanDir } from '../utils'
+import { getRuntime, cleanDB, cleanDir } from '../utils'
+import { _root } from '../../utils/paths'
 import { wait, info, event, rn, error, log } from '../../utils/log'
 
 export default defineCommand({

package/src/cli/commands/routes.ts

@@ -2,9 +2,9 @@ import { join } from 'pathe'
 import { defineCommand } from 'citty'
 import { inspectRoutes } from 'hono/dev'
 import { IMPORT } from 't0n'
-import { gray, purple, red, yellow } from '../../utils/colors'
-import { __rajt } from '../utils'
+import { _rajt } from '../../utils/paths'
 import { rn } from '../../utils/log'
+import { highlightedURI, highlightedMethod } from '../utils'
 
 export default defineCommand({
 	meta: {
@@ -26,7 +26,7 @@ export default defineCommand({
 		},
 	},
 	async run({ args }) {
-		const mod = await IMPORT(join(__rajt, 'dev.ts'))
+		const mod = await IMPORT(join(_rajt, 'dev.ts'))
 		const app = mod.default
 
 		const opts = {
@@ -39,28 +39,6 @@ export default defineCommand({
 		let maxMethodLength = 0
 		let maxPathLength = 0
 
-		const colorMethod = (method: string, str?: string) => {
-			const val = str || method
-
-			switch (method) {
-				case 'HEAD':
-				case 'OPTIONS':
-				case 'CONNECT':
-				case 'TRACE':
-					return gray(val)
-				case 'GET':
-					return purple(val)
-				case 'POST':
-				case 'PUT':
-				case 'PATCH':
-					return yellow(val)
-				case 'DELETE':
-					return red(val)
-			}
-
-			return val
-		}
-
 		let routes = inspectRoutes(app)
 			.filter(({ method, path, isMiddleware }) => {
 				const key = method + '-' + path
@@ -88,17 +66,12 @@ export default defineCommand({
 			const { method, path } = route
 
 			let mLength = method.length
-			let str = colorMethod(method)
+			let str = highlightedMethod(method, null, true)
 
-			if (method == 'GET') {
+			if (method == 'GET')
 				mLength += 5
-				str += gray('|') + colorMethod('HEAD')
-			}
 
-			console.log(str + ' '.repeat(maxMethodLength - mLength) +'  '+ path.replace(
-				/(?::([a-zA-Z_][a-zA-Z0-9_]*)(\{[^}]+\})?|\*)/g,
-				_ => colorMethod(method, _)
-			))
+			console.log(str + ' '.repeat(maxMethodLength - mLength) +'  '+ highlightedURI(path, method))
 		})
 
 		rn()

package/src/cli/utils.ts

@@ -1,23 +1,21 @@
 import esbuild from 'esbuild'
 import { Miniflare } from 'miniflare'
-import { mkdirSync, existsSync, statSync, readdirSync, rmSync, unlinkSync, copyFileSync, writeFileSync } from 'node:fs'
+import { mkdirSync, existsSync, statSync, readdirSync, rmSync, unlinkSync, copyFileSync, writeFileSync, readFileSync } from 'node:fs'
 import { readFile, stat, writeFile } from 'node:fs/promises'
 import { basename, dirname, join, relative } from 'pathe'
-import crypto, { createHash } from 'node:crypto'
+import { createHash, createHmac } from 'node:crypto'
 
 import { findWranglerConfig, parseWranglerConfig, WRANGLER_CONFIG_FILES } from 'localflare-core'
 import type { WranglerConfig, LocalflareManifest } from 'localflare-core'
 
 import chokidar from 'chokidar'
-import { gray, bold, italic } from '../utils/colors'
+import { gray, bold, italic, purple, yellow, red } from '../utils/colors'
 import type { ChokidarEventName, Platform } from './types'
 
 import { cacheRoutes } from '../routes'
 import { substep, event, error, wait as wwait, warn, log } from '../utils/log'
 import { platforms } from './constants'
-
-export const _root = join(dirname(new URL(import.meta.url).pathname), '../../../../')
-export const __rajt = join(_root, 'node_modules/rajt/src')
+import { _rajt, _root } from '../utils/paths'
 
 export function normalizePlatform(platform: Platform) {
   platform = platform?.toLowerCase() as Platform
@@ -91,7 +89,7 @@ export const build = async (platform: Platform) => {
   // @ts-ignore
   platform = platform != 'node' ? '-'+ platform : ''
   const opts = {
-    entryPoints: [join(__rajt, `prod${platform}.ts`)],
+    entryPoints: [join(_rajt, `prod${platform}.ts`)],
     bundle: true,
     minify: true,
     outfile: join(_root, dist +'/index.js'),
@@ -122,6 +120,12 @@ export const build = async (platform: Platform) => {
     // sourcemap: true,
     // logLevel: 'info',
     plugins: [
+      {
+        name: 'rajt-resolver',
+        setup(build) {
+          build.onResolve({ filter: /\.rajt[\/\\]/ }, args => ({ path: join(_root, args.path) }))
+        }
+      },
       {
         name: 'preserve-class-names',
         setup(build) {
@@ -199,11 +203,11 @@ export function cleanDir(path: string) {
 }
 
 function durableObjectNamespace(name: string, uniqueKey: string) {
-  const key = crypto.createHash('sha256').update(uniqueKey).digest()
-  const nameHmac = crypto.createHmac('sha256', key).update(name).digest().subarray(0, 16)
+  const key = createHash('sha256').update(uniqueKey).digest()
+  const nameHmac = createHmac('sha256', key).update(name).digest().subarray(0, 16)
   return Buffer.concat([
     nameHmac,
-    crypto.createHmac('sha256', key).update(nameHmac).digest().subarray(0, 16)
+    createHmac('sha256', key).update(nameHmac).digest().subarray(0, 16)
   ]).toString('hex')
 }
 
@@ -474,3 +478,30 @@ export const camelCase = (text: string) =>
     .filter(word => word.length > 0)
     .map(word => word.charAt(0).toUpperCase() + word.slice(1))
     .join('')
+
+export const highlightedMethod = (method: string, str?: string | null, siblings: boolean = false): string => {
+  const val = str || method
+
+  switch (method) {
+    case 'HEAD':
+    case 'OPTIONS':
+    case 'CONNECT':
+    case 'TRACE':
+      return gray(val)
+    case 'GET':
+      return purple(val) + (siblings ? gray('|') + highlightedMethod('HEAD') : '')
+    case 'POST':
+    case 'PUT':
+    case 'PATCH':
+      return yellow(val)
+    case 'DELETE':
+      return red(val)
+  }
+
+  return val
+}
+
+export const highlightedURI = (uri: string, method: string) => uri.replace(
+  /(?::([a-zA-Z_][a-zA-Z0-9_]*)(\{[^}]+\})?|\*)/g,
+  _ => highlightedMethod(method, _)
+)

package/src/prod.ts

@@ -4,9 +4,9 @@ import { Ability } from './auth'
 import createApp from './create-app'
 
 // @ts-ignore
-import '../../../.rajt/imports.mjs'
+import '.rajt/imports.mjs'
 // @ts-ignore
-import routes from '../../../.rajt/routes.json'
+import routes from '.rajt/routes.json'
 
 // @ts-ignore
 Ability.fromRoutes(routes)

package/src/routes.ts

@@ -1,5 +1,5 @@
-import { existsSync, readdirSync, statSync, writeFileSync } from 'node:fs'
-import { dirname, join, resolve } from 'pathe'
+import { copyFileSync, existsSync, readdirSync, statSync, writeFileSync } from 'node:fs'
+import { join, resolve, relative } from 'pathe'
 
 import glob from 'tiny-glob'
 import { config } from 'dotenv'
@@ -11,7 +11,8 @@ import { isAnonFn } from './utils/func'
 import ensureDir from './utils/ensuredir'
 import versionSHA from './utils/version-sha'
 import type { Routes, StandardSchemaV1 } from './types'
-import { substep, warn } from './utils/log'
+import { rn, substep, warn } from './utils/log'
+import { _root } from './utils/paths'
 
 import OAS from './oas'
 import z from 'zod'
@@ -19,8 +20,7 @@ import { resolver } from 'hono-openapi'
 import { mimes } from 'hono/utils/mime'
 import { STATUS_CODES } from 'node:http'
 
-const __filename = new URL(import.meta.url).pathname
-const __root = resolve(dirname(__filename), '../../..')
+import { highlightedMethod, highlightedURI } from './cli/utils'
 
 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> => {
@@ -105,9 +105,17 @@ export async function getRoutes(
   let length = 0
   const keys: Set<string> = new Set()
   const bag: Record<string, string[]> = {}
+  const _route = (key: string, _: string) => {
+    if (!keys.has(key)) {
+      keys.add(key)
+    } else {
+      ;(bag[key] ||= []).push(_)
+      length++
+    }
+  }
 
   await Promise.all(dirs.map(dir => walk(
-    resolve(__root, dir),
+    resolve(_root, dir),
     dir,
     (path: string, baseDir: string, handle: any, middlewares: string[]) => {
       const name = importName(handle?.name)
@@ -136,21 +144,26 @@ export async function getRoutes(
         desc,
       })
 
-      if (!keys.has(name)) {
-        keys.add(name)
-      } else {
-        ;(bag[name] ||= []).push(file)
-        length++
-      }
+      const routeKey = method +'|'+ uri
+      _route(name, file)
+      _route(routeKey, file)
     }
   )))
 
   if (length) {
     hasDuplicatedRoutes = true
     Object.entries(bag).forEach(([name, paths]) => {
-      warn(`Route "${name}" has `+ (paths.length > 1 ? `registered ${paths.length} times:` : 'already been registered:'))
+      if (name.includes('|')) {
+        let [method, uri] = name.split('|')
+        method = method.toUpperCase()
+        name =  `${highlightedMethod(method, null, true)}  "${highlightedURI(uri, method)}"`
+      }
+
+      warn(`Route ${name} has `+ (paths.length > 1 ? `registered ${paths.length} times:` : 'already been registered:'))
       substep(...paths)
     })
+
+    rn()
   }
 
   return sortRoutes(routes)
@@ -224,7 +237,7 @@ export async function getMiddlewares(
   const mw: Routes = []
 
   await Promise.all(dirs.map(dir => walk(
-    resolve(__root, dir),
+    resolve(_root, dir),
     dir,
     (fullPath: string, baseDir: string, handle: any) => {
       // @ts-ignore
@@ -246,15 +259,15 @@ function extractName(file: string) {
 export async function getConfigs(
   dirs: string[] = ['configs']
 ): Promise<Record<string, any>> {
-  dirs = dirs.filter(dir => existsSync(join(__root, dir)))
+  dirs = dirs.filter(dir => existsSync(join(_root, dir)))
   if (!dirs?.length) return {}
   const configs: Record<string, any> = {}
 
-  const files = (await glob(join(__root, dirs?.length > 1 ? `{${dirs.join(',')}}` : dirs[0], '/**/*.{ts,js,cjs,mjs,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))
+    const mod = await IMPORT(join(_root, file))
     const keyPath = extractName(file).split('.')
 
     keyPath.reduce((acc, key, index) => {
@@ -296,16 +309,26 @@ function stringifyToJS(value: unknown): string {
   return 'undefined'
 }
 
+export async function dependencyEntry(lib: string, root: string) {
+  const path = await import.meta.resolve(lib)
+  return relative(root, path.replace('file://', ''))
+}
+
+async function dependencyPath(lib: string) {
+  const entry = await dependencyEntry(lib, join(_root, '.rajt'))
+  return entry.substring(0, entry.lastIndexOf(lib) + lib.length)
+}
+
 export async function cacheRoutes() {
   const env = Object.entries(
-    config({ path: '../../.env.prod' })?.parsed || {}
+    config({ path: join(_root, '.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')
+  const rolePath = join(_root, 'configs/roles.ts')
   ensureDir(rolePath)
   if (!existsSync(rolePath))
     writeFileSync(rolePath, `export default {\n\n}`)
@@ -323,13 +346,18 @@ export async function cacheRoutes() {
   // @ts-ignore
   const openApi = await OAS.generateSpecs(createApp({ routes }), configs?.rajt || {})
 
-  const iPath = join(__root, '.rajt/imports.mjs')
+  const iPath = join(_root, '.rajt/imports.mjs')
   ensureDir(iPath)
+
+  const localfireEntry = await dependencyEntry('localflare-api', _root)
+  copyFileSync(localfireEntry, join(_root, '.rajt/localfire.js'))
+
+  const _rajtDir = await dependencyPath('rajt')
   writeFileSync(iPath, `// AUTO-GENERATED FILE - DO NOT EDIT
-${env?.length ? `import { Envir } from '../node_modules/t0n/dist/index'\nEnvir.add({${env.map(([key, val]) => key +':'+ stringifyToJS(val)).join(',')}})` : ''}
-${Object.entries(configs)?.length ? `import Config from '../node_modules/rajt/src/config'\nConfig.add(${stringifyToJS(configs)})` : ''}
+${env?.length ? `import { Envir } from '${await dependencyPath('t0n')}/dist/index'\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 '../node_modules/rajt/src/register'
+import { registerHandler, registerMiddleware } from '${_rajtDir}/src/register'
 
 ${Object.entries(openApi)?.length ? `registerHandler('RAJT_OPENAPI', ${stringifyToJS(openApi)})` : ''}
 
@@ -355,7 +383,7 @@ try {
 }
 `)
 
-  const rPath = join(__root, '.rajt/routes.json')
+  const rPath = join(_root, '.rajt/routes.json')
   ensureDir(rPath)
   writeFileSync(rPath, JSON.stringify(routes.filter(r => r.method && r.path).map(route => [
     route.method,

package/src/utils/paths.ts

@@ -0,0 +1,5 @@
+import { dirname, join } from 'pathe'
+import { Envir } from 't0n'
+
+export const _rajt = join(dirname(new URL(import.meta.url).pathname), '..')
+export const _root = Envir.get('npm_config_local_prefix') || Envir.get('PWD') || join(_rajt, '../../../')