rajt 0.0.107 → 0.20260702.1

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.107",
+  "version": "0.20260702.1",
   "type": "module",
   "main": "./src/index.ts",
   "files": ["bin", "src"],
@@ -53,7 +53,7 @@
     "miniflare": "^4.20260312.0",
     "pathe": "^2.0",
     "quansync": "^0.2.11",
-    "t0n": "^0.1.17",
+    "t0n": "^0.20260702.0",
     "tiny-glob": "^0.2",
     "tsx": "^4.19.4",
     "wrangler": "^4.61.0",
@@ -66,7 +66,7 @@
     "bun-types": "^1.3.8",
     "typescript": "^5.9.3"
   },
-  "packageManager": "bun@1.3.10",
+  "packageManager": "bun@1.3.14",
   "engines": {
     "node": ">=18.0.0"
   },

package/src/cli/commands/build.ts

@@ -1,7 +1,7 @@
 import { defineCommand } from 'citty'
 import { gray } from 't0n/color'
+import { wait, error, rn } from 't0n/log'
 import { build, normalizePlatform, platformError } from '../utils'
-import { wait, error, rn } from '../../utils/log'
 
 import { platforms } from '../constants'
 

package/src/cli/commands/deploy.ts

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

package/src/cli/commands/dev.ts

@@ -3,17 +3,19 @@ import { spawn, type ChildProcess } from 'node:child_process'
 
 import { defineCommand } from 'citty'
 import type { Miniflare } from 'miniflare'
-import type { WranglerConfig } from 'localflare-core'
+import { WRANGLER_CONFIG_FILES, type WranglerConfig } from 'localflare-core'
+
+import { error, event, log, rn, warn } from 't0n/log'
+import { getRuntime, shutdown, watch } from 't0n/cli'
+
 import {
-	build, wait, watch, normalizePlatform, platformError, getRuntime,
+	build, wait, normalizePlatform, platformError,
 	wranglerConfig, createMiniflare, localflareManifest,
 	getDockerHost,
   findTsx
 } 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'
 
 export default defineCommand({
 	meta: {
@@ -65,7 +67,13 @@ export default defineCommand({
 					event('Restarting..')
 					await fn()
 					// event('Restarted...')
-				})
+				}, [
+          join(_root, '{actions,features,routes,configs,enums,libs,locales,middlewares,models,utils}/**/*.ts'),
+          join(_root, '.env.dev'),
+          join(_root, '.env.prod'),
+          join(_root, 'package.json'),
+          ...WRANGLER_CONFIG_FILES.map(f => join(_root, f)),
+        ], _root)
 				// @ts-ignore
 				stop && shutdown(stop)
 			} catch (e: any) {

package/src/cli/commands/make.ts

@@ -1,10 +1,11 @@
 import { defineCommand } from 'citty'
 import { join, relative } from 'pathe'
 import { Migrator } from 'forj'
-import { makeFile, hasExt, camelCase, kebabCase } from '../utils'
-import { _root } from '../../utils/paths'
-import { event, error } from '../../utils/log'
+import { camelCase, kebabCase } from 't0n'
 import { dim } from 't0n/color'
+import { event, error } from 't0n/log'
+import { makeFile, hasExt } from '../utils'
+import { _root } from '../../utils/paths'
 import * as stub from '../stubs'
 
 export default defineCommand({
@@ -22,11 +23,20 @@ export default defineCommand({
 		if (!name)
 			return error('File name is required')
 
+    const makeFileName = (s: string) => {
+      const lastDotIndex = s.lastIndexOf('.')
+      const hasExtension = lastDotIndex > 0 && lastDotIndex < s.length - 1
+
+      return hasExtension
+        ? `${kebabCase(s.substring(0, lastDotIndex))}.${s.substring(lastDotIndex + 1)}`
+        : s
+    }
+
 		const path = (p: string, dir: string = action) => join(_root, dir + 's', p)
 		let fileName = ''
 		switch (action) {
 			case 'config':
-				fileName = path(kebabCase(name))
+				fileName = path(makeFileName(name))
 				if (!hasExt(fileName)) fileName += '.ts'
 				makeFile(fileName, name.endsWith('.json') ? '{\n}' : 'export default {\n\n}\n')
 				break
@@ -36,7 +46,7 @@ export default defineCommand({
 			case 'route':
 			case 'action':
 			case 'endpoint':
-				fileName = path(kebabCase(name))
+				fileName = path(makeFileName(name))
 				if (!fileName.endsWith('.ts')) fileName += '.ts'
 				makeFile(fileName, stub.replace(stub.route, { R_NAME: camelCase(name) }))
 				break

package/src/cli/commands/migrate.ts

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

package/src/cli/commands/routes.ts

@@ -2,8 +2,8 @@ import { join } from 'pathe'
 import { defineCommand } from 'citty'
 import { inspectRoutes } from 'hono/dev'
 import { IMPORT } from 't0n'
+import { rn } from 't0n/log'
 import { _rajt } from '../../utils/paths'
-import { rn } from '../../utils/log'
 import { highlightedURI, highlightedMethod } from '../utils'
 
 export default defineCommand({

package/src/cli/index.ts

@@ -1,7 +1,7 @@
 import { defineCommand, runMain, renderUsage } from 'citty'
 import type { ArgsDef, CommandDef } from 'citty'
 import { createConsola } from 'consola'
-import { logo } from '../utils/log'
+import { logo } from 't0n/log'
 import { isColorSupported, gray } from 't0n/color'
 import { version as rajtVersion } from '../../package.json'
 

package/src/cli/types.ts

@@ -1,4 +1,3 @@
 import { platforms } from './constants'
 
-export type ChokidarEventName = 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir'
 export type Platform = typeof platforms[number]

package/src/cli/utils.ts

@@ -3,21 +3,21 @@ import esbuild from 'esbuild'
 import { Miniflare } from 'miniflare'
 import { mkdirSync, existsSync, statSync, readdirSync, rmSync, unlinkSync, copyFileSync, writeFileSync } from 'node:fs'
 import { readFile, stat, writeFile } from 'node:fs/promises'
-import { basename, dirname, join, relative } from 'pathe'
+import { basename, dirname, join } from 'pathe'
 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, purple, yellow, red } from 't0n/color'
-import type { ChokidarEventName, Platform } from './types'
+import { substep, event, error, warn } from 't0n/log'
 
 import { cacheRoutes } from '../routes'
-import { substep, event, error, wait as wwait, warn, log } from '../utils/log'
 import { platforms } from './constants'
 import { _rajt, _root } from '../utils/paths'
 
+import type { Platform } from './types'
+
 export function normalizePlatform(platform: Platform) {
   platform = platform?.toLowerCase() as Platform
   if (!platforms?.includes(platform)) return null
@@ -42,14 +42,6 @@ export function normalizePlatform(platform: Platform) {
 const formatArgs = (...args: any[]) => args.flat().map(a => gray(italic(bold(a)))).join(', ')
 export const platformError = () => error(`Provide a valid platform: ${formatArgs(platforms)}.\n`)
 
-export function getRuntime() {
-  try {
-    return process?.isBun || typeof Bun !== 'undefined' ? 'bun' : 'node'
-  } catch {
-    return 'node'
-  }
-}
-
 export const formatSize = (bytes: number) => {
   if (bytes < 1024) return `${bytes}b`
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(2)}kb`
@@ -398,64 +390,6 @@ export function createMiniflare(opts = {}) {
   })
 }
 
-function getAssetChangeMessage(
-	e: ChokidarEventName,
-	path: string
-): string {
-	path = relative(_root, path)
-	switch (e) {
-		case 'add':
-			return `File ${path} was added`
-		case 'addDir':
-			return `Directory ${path} was added`
-		case 'unlink':
-			return `File ${path} was removed`
-		case 'unlinkDir':
-			return `Directory ${path} was removed`
-		case 'change':
-		default:
-			return `${path} changed`
-	}
-}
-
-export async function watch(cb: (e: ChokidarEventName | string, file: string) => Promise<void>) {
-	const codeWatcher = chokidar.watch([
-		join(_root, '{actions,features,routes,configs,enums,libs,locales,middlewares,models,utils}/**/*.ts'),
-		join(_root, '.env.dev'),
-		join(_root, '.env.prod'),
-    join(_root, 'package.json'),
-    ...WRANGLER_CONFIG_FILES.map(f => join(_root, f)),
-	], {
-		ignored: /(^|[/\\])\../, // ignore hidden files
-		persistent: true,
-		ignoreInitial: true,
-		awaitWriteFinish: {
-			stabilityThreshold: 200,
-			pollInterval: 100,
-		},
-	})
-	let restartTimeout: NodeJS.Timeout | null = null
-
-	const watcher = (e: ChokidarEventName) => async (file: string) => {
-		log(getAssetChangeMessage(e, file))
-
-		if (restartTimeout)
-			clearTimeout(restartTimeout)
-
-		restartTimeout = setTimeout(async () => {
-			await cb(e, file)
-		}, 300)
-	}
-
-	codeWatcher.on('change', watcher('change'))
-	codeWatcher.on('add', watcher('add'))
-	codeWatcher.on('unlink', watcher('unlink'))
-	codeWatcher.on('addDir', watcher('addDir'))
-	codeWatcher.on('unlinkDir', watcher('unlinkDir'))
-
-	wwait('Watching for file changes')
-}
-
 export async function wait(ms: number) {
 	return new Promise(r => setTimeout(r, ms))
 }
@@ -491,37 +425,6 @@ export function hasExt(path: string) {
   return index > 0 && index < path.length - 1
 }
 
-function normalizeText(text: string, separator = '_') {
-  const validSeparators = ['_', '-']
-  const sep = validSeparators.includes(separator) ? separator : '_'
-
-  const lastDotIndex = text.lastIndexOf('.')
-  const hasExtension = lastDotIndex > 0 && lastDotIndex < text.length - 1
-  const fileName = hasExtension ? text.substring(0, lastDotIndex) : text
-  const extension = hasExtension ? text.substring(lastDotIndex + 1) : ''
-
-  const normalizedName = fileName
-    .replace(/([a-z])([A-Z])/g, `$1${sep}$2`)
-    .replace(/[\s\-_]+/g, sep)
-    .toLowerCase()
-    .replace(new RegExp(`[^\\w${sep}]+`, 'g'), '')
-    .replace(new RegExp(`${sep}{2,}`, 'g'), sep)
-    .replace(new RegExp(`^${sep}+|${sep}+$`, 'g'), '')
-
-  return hasExtension ? `${normalizedName}.${extension}` : normalizedName
-}
-
-export const snakeCase = (text: string) => normalizeText(text, '_')
-export const kebabCase = (text: string) => normalizeText(text, '-')
-
-export const camelCase = (text: string) =>
-  text.replace(/[^a-zA-Z0-9]+/g, ' ')
-    .trim()
-    .split(/\s+/)
-    .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
 

package/src/dev-node.ts

@@ -1,6 +1,6 @@
 import { serve, type ServerType } from '@hono/node-server'
+import { shutdown } from 't0n/cli'
 import app from './dev'
-import shutdown from './utils/shutdown'
 
 const fetch = app.fetch
 

package/src/routes.ts

@@ -2,6 +2,7 @@ import { copyFileSync, existsSync, readdirSync, statSync, writeFileSync } from '
 import { join, resolve, relative } from 'pathe'
 
 import { IMPORT, JSJSON } from 't0n'
+import { rn, substep, warn } from 't0n/log'
 import glob from 'tiny-glob'
 import { config } from 'dotenv'
 import { describeRoute, resolver, validator } from 'hono-openapi'
@@ -11,10 +12,8 @@ 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'
-import { rn, substep, warn } from './utils/log'
 import { _root, _rajt } from './utils/paths'
 import { generateOpenAPI } from './open-api/spec'
 import { verbAlias } from './http'
@@ -36,7 +35,7 @@ const walk = async (dir: string, baseDir: string, fn: Function, parentMw: string
     const mod = await IMPORT(indexFile)
     const group = mod.default
 
-    !isAnonFn(group) && group?.mw?.length && currentMw.push(group?.name)
+    group?.name && group.name !== 'anonymous' && group?.mw?.length && currentMw.push(group.name)
     fn(indexFile, baseDir, group, currentMw)
   }
 
@@ -352,11 +351,9 @@ export async function cacheRoutes() {
 
   const _rajtDir = await dependencyPath('rajt')
 
-  JSJSON(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')}/src/envir'\nEnvir.add({${env.map(([key, val]) => key +':'+ JSJSON(val)).join(',')}})` : ''}
-${Object.entries(configs)?.length ? `import Config from '${_rajtDir}/src/config'\nConfig.add(${JSJSON})` : ''}
+${env?.length ? `import { Envir } from '${await dependencyPath('t0n')}/src/envir'\nEnvir.add(${JSJSON(Object.fromEntries(env))})` : ''}
+${Object.entries(configs)?.length ? `import Config from '${_rajtDir}/src/config'\nConfig.add(${JSJSON(configs)})` : ''}
 
 import { registerHandler, registerMiddleware } from '${_rajtDir}/src/register'
 ${handlers.map(([file, name, _export]) => `\nimport ${_export ? `{ ${name} }` : name} from '${_rajtDir}/src/${file}'\nregisterHandler('${name}', ${name})`).join('\n')}

package/src/utils/port.ts

@@ -1,6 +1,6 @@
 import net from 'node:net'
 import { exec } from 'node:child_process'
-import { error, warn } from './log'
+import { error, warn } from 't0n/log'
 
 export function withPort(desiredPort: number, cb: (port: number) => void, maxAttempts = 10) {
   getAvailablePort(desiredPort)

package/src/utils/func.ts

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

package/src/utils/log.ts

@@ -1,110 +0,0 @@
-import { blue, bold, gray, green, magenta, red, yellow, white } from 't0n/color'
-
-const _step = (color: Function, ...msg: any[]) => {
-  const length = msg.length
-  if (!length) return
-  if (length < 2)
-    return console.log(color('⁕') +' '+ msg[0])
-
-  const total = length - 1
-  for (let i: number = 0; i < length; i++) {
-    switch (i) {
-      case 0:
-        console.log(color('⁕') + ' ' + msg[i])
-        continue
-      case total:
-        console.log(`   ${gray('⁕')} ${msg[i]}\t`)
-        continue
-      default:
-        console.log(`   ${gray('⁕')} ` + msg[i])
-        continue
-    }
-  }
-}
-
-export const step = (...msg: any[]) => _step(blue, ...msg)
-export const stepWarn = (...msg: any[]) => _step(yellow, ...msg)
-
-export const substep = (...msg: any[]) => {
-  const length = msg.length
-  for (let i: number = 0; i < length; i++)
-    console.log(`   ${gray('⁕')} ` + msg[i])
-}
-
-export const ln = () => console.log('\n')
-export const rn = () => console.log('\t')
-
-export const logo = gray(bold('λ'))
-export const prefixes = {
-  wait: white(bold('○')),
-  error: red(bold('⨯')),
-  warn: yellow(bold('⚠')),
-  ready: logo,
-  info: white(bold(' ')),
-  event: green(bold('✓')),
-  trace: magenta(bold('»')),
-  log: gray(bold('⁕')),
-} as const
-
-const LOGGING_METHOD = {
-  log: 'log',
-  warn: 'warn',
-  error: 'error',
-} as const
-
-function prefixedLog(prefixType: keyof typeof prefixes, ...msg: any[]) {
-  const length = msg.length
-  if ((msg[0] === '' || msg[0] === undefined) && length === 1)
-    msg.shift()
-
-  const consoleMethod: keyof typeof LOGGING_METHOD =
-    prefixType in LOGGING_METHOD
-      ? LOGGING_METHOD[prefixType as keyof typeof LOGGING_METHOD]
-      : 'log'
-
-  const prefix = prefixes[prefixType]
-  // If there's no message, don't print the prefix but a new line
-  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') {
-      console[consoleMethod](prefix +' '+ msg[0])
-    } else {
-      console[consoleMethod](prefix, ...msg)
-    }
-  }
-}
-
-export function log(...msg: any[]) {
-  prefixedLog('log', ...msg)
-}
-
-export function wait(...msg: any[]) {
-  prefixedLog('wait', ...msg)
-}
-
-export function error(...msg: any[]) {
-  prefixedLog('error', ...msg)
-}
-
-export function warn(...msg: any[]) {
-  prefixedLog('warn', ...msg)
-}
-
-export function ready(...msg: any[]) {
-  prefixedLog('ready', ...msg)
-}
-
-export function info(...msg: any[]) {
-  prefixedLog('info', ...msg)
-}
-
-export function event(...msg: any[]) {
-  prefixedLog('event', ...msg)
-}
-
-export function trace(...msg: any[]) {
-  prefixedLog('trace', ...msg)
-}

package/src/utils/shutdown.ts

@@ -1,19 +0,0 @@
-export default function shutdown(cb: (signal: string, e: unknown) => void | Promise<void>) {
-  if (!process) return
-  const down = (signal: string) => (e?: unknown) => {
-    try {
-      cb(signal, e)
-      setTimeout(() => process.exit(0), 100)
-    } catch (e) {
-      process.exit(1)
-    }
-  }
-
-  process.on('SIGINT', down('SIGINT'))
-  process.on('SIGTERM', down('SIGTERM'))
-  process.on('SIGHUP', down('SIGHUP'))
-  process.on('unhandledRejection', down('UNCAUGHT_REJECTION'))
-  process.on('uncaughtException', down('UNCAUGHT_EXCEPTION'))
-  // process.on('beforeExit', down('BEFORE_EXIT'))
-  // process.on('exit', down('EXIT'))
-}