rajt 0.0.54 → 0.0.56

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.54",
+  "version": "0.0.56",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -19,17 +19,22 @@
   ],
   "scripts": {
     "dev": "tsx watch src/dev.ts",
-    "local": "bun run --silent build && bun run --silent sam:local",
-    "build": "bun run --silent cache:routes && bun run --silent export && bun run --silent clean:temp",
-    "build:watch": "chokidar \"../../{actions,configs,models,utils}/**/*.ts\" -c \"bun run --silent build\" --initial",
-    "export": "node src/esbuild.mjs",
-    "package": "bun run --silent build && bun run --silent sam:package",
-    "deploy": "bun run --silent build && bun run --silent sam:package && bun run --silent sam:deploy",
-    "update": "bun run --silent build && bun run --silent zip && bun run --silent sam:update",
+    "aws:build": "bun run --silent cache:routes && bun run --silent aws:export && bun run --silent clean:temp",
+    "cf:build": "bun run --silent cache:routes && bun run --silent cf:export && bun run --silent clean:temp",
+    "aws:build:watch": "chokidar \"../../{actions,configs,enums,locales,middlewares,models,utils}/**/*.ts\" -c \"bun run --silent aws:build\" --initial",
+    "cf:build:watch": "chokidar \"../../{actions,configs,enums,locales,middlewares,models,utils}/**/*.ts\" -c \"bun run --silent cf:build\" --initial",
+    "aws:export": "node src/esbuild.mjs aws",
+    "cf:export": "node src/esbuild.mjs cf",
+    "aws:local": "bun run --silent aws:build && bun run --silent sam:local",
+    "aws:package": "bun run --silent aws:build && bun run --silent sam:package",
+    "aws:deploy": "bun run --silent aws:build && bun run --silent sam:package && bun run --silent sam:deploy",
+    "aws:update": "bun run --silent aws:build && bun run --silent zip && bun run --silent sam:update",
     "sam:local": "sam local start-api --warm-containers LAZY --debug --template-file ../../template-dev.yaml",
     "sam:package": "sam package --template-file ../../template-prod.yaml --output-template-file ../../packaged.yaml",
     "sam:deploy": "sam deploy --template-file ../../packaged.yaml --stack-name rajt-llrt --capabilities CAPABILITY_IAM",
     "sam:update": "source ../../.env.prod && aws lambda update-function-code --function-name $AWS_NAME --zip-file fileb://../../lambda.zip --region $AWS_REGION --no-cli-pager 2>&1 >/dev/null",
+    "cf:local": "bun run --silent cf:build && cd ../../dist && bunx wrangler dev",
+    "cf:deploy": "bun run --silent cf:build && cd ../../dist && bunx wrangler deploy",
     "cache:routes": "tsx src/scripts/cache-routes.ts",
     "ensure-dirs": "rm -rf ../../dist ../../tmp && mkdir -p ../../tmp && chmod 755 ../../tmp && mkdir -p ../../dist && chmod 755 ../../dist",
     "clean": "rm -rf ../../dist ../../tmp",
@@ -45,7 +50,7 @@
     "@hono/zod-validator": "^0.4.3",
     "@types/node": "^20.11.0",
     "chokidar-cli": "^3.0.0",
-    "cripta": "0.1.8",
+    "cripta": "^0.1",
     "dotenv": "^16.5.0",
     "esbuild": "^0.25.2",
     "hono": "^4.7.6",
@@ -88,4 +93,4 @@
     "bun",
     "nodejs"
   ]
-}
+}

package/src/dev.ts

@@ -6,6 +6,9 @@ import { registerHandler, registerMiddleware } from './register'
 import { Ability } from './auth'
 import { getAvailablePort } from './utils/port'
 import jsonImport from './utils/json-import'
+import { setEnv, detectEnvironment } from './utils/environment'
+
+setEnv(detectEnvironment())
 
 config({ path: '../../.env.dev' })
 

package/src/esbuild.mjs

@@ -1,7 +1,20 @@
 import esbuild from 'esbuild'
-import { dirname, join, relative } from 'path'
+import { basename, dirname, join, relative } from 'node:path'
 import { fileURLToPath } from 'url'
-import { readFile, stat, writeFile } from 'fs/promises'
+import { mkdirSync, existsSync, readdirSync, rmSync, copyFileSync } from 'node:fs'
+import { readFile, stat, writeFile } from 'node:fs/promises'
+
+const fail = (e) => {
+  console.error('❌ Build failed' + (e ? ':' : ''), e || '')
+  process.exit(1)
+}
+
+const args = process.argv.slice(2)
+const platform = args[0] || ''
+
+const platforms = ['aws', 'cf']
+if (!platform || !platforms.includes(platform))
+  fail()
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
@@ -16,7 +29,7 @@ const formatTime = (ms) => {
 }
 
 const buildOptions = {
-  entryPoints: [join(__dirname, 'prod.ts')],
+  entryPoints: [join(__dirname, `prod-${platform}.ts`)],
   bundle: true,
   minify: true,
   outfile: join(__dirname, '../../../dist/index.js'),
@@ -69,21 +82,33 @@ const buildOptions = {
   ]
 }
 
-try {
-  const startTime = Date.now()
-  const result = await esbuild.build(buildOptions)
+const startTime = Date.now()
+const cwd = join(__dirname, '../../..')
 
-  const cwd = join(__dirname, '../../..')
+const distDir = join(cwd, 'dist')
+existsSync(distDir)
+  ? readdirSync(distDir).forEach(file => rmSync(join(distDir, file), { recursive: true, force: true }))
+  : mkdirSync(distDir, { recursive: true })
 
-  const outputFile = buildOptions.outfile
-  const stats = await stat(outputFile)
-  const size = formatSize(stats.size)
+for (const file of await readdirSync(distDir))
+  await rmSync(join(distDir, file))
 
-  console.log(`\n⚡️ Done in ${formatTime(Date.now() - startTime)}`)
-  console.log(`    ${relative(join(cwd, 'node_modules/rajt/src'), buildOptions.entryPoints[0])} → ${relative(cwd, outputFile)}`)
-  console.log(`    Size: ${size}`)
-  console.log(`    Files: ${Object.keys(result.metafile.outputs).length}`)
-} catch (error) {
-  console.error('❌ Build failed:', error)
-  process.exit(1)
+for (let file of [
+  'wrangler.toml',
+]) {
+  file = join(cwd, file)
+  if (existsSync(file))
+    copyFileSync(file, join(cwd, 'dist', basename(file)))
 }
+
+esbuild.build(buildOptions)
+  .then(async result => {
+    const outputFile = buildOptions.outfile
+    const stats = await stat(outputFile)
+    const size = formatSize(stats.size)
+
+    console.log(`\n⚡️ Done in ${formatTime(Date.now() - startTime)}`)
+    console.log(`    ${relative(join(cwd, 'node_modules/rajt/src'), buildOptions.entryPoints[0])} → ${relative(cwd, outputFile)}`)
+    console.log(`    Size: ${size}`)
+    console.log(`    Files: ${Object.keys(result.metafile.outputs).length}`)
+  }).catch(fail)

package/src/{prod.ts → prod-aws.ts}

@@ -16,5 +16,4 @@ Ability.fromRoutes(routes)
 // @ts-ignore
 const app = createApp({ routes })
 
-// export default app // AWS Lambda & Cloudflare Workers
 export const handler = handle(app) // AWS Lambda (LLRT)

package/src/prod-cf.ts

@@ -0,0 +1,18 @@
+import createApp from './create-app'
+import { Ability } from './auth'
+
+// @ts-ignore
+await import('../../../tmp/import-routes.mjs')
+
+// @ts-ignore
+const routes = (await import('../../../tmp/routes.json')).default
+
+// @ts-ignore
+Ability.roles = (await import('../../../roles.json')).default
+// @ts-ignore
+Ability.fromRoutes(routes)
+
+// @ts-ignore
+const app = createApp({ routes })
+
+export default app

package/src/scripts/cache-routes.ts

@@ -23,7 +23,7 @@ async function cacheRoutes() {
   const iPath = '../../tmp/import-routes.mjs'
   ensureDir(iPath)
   writeFileSync(iPath, `// AUTO-GENERATED FILE - DO NOT EDIT
-${env.map(([key, val]) => `process.env.${key} = ${JSON.stringify(val)}`).join('\n')}
+${env?.length ? `import { Envir } from '../node_modules/t0n/dist/index'\nEnvir.add({${env.map(([key, val]) => key + ':' + JSON.stringify(val)).join(',')}})` : ''}
 
 import { registerHandler, registerMiddleware } from '../node_modules/rajt/src/register'
 

package/src/utils/environment.ts

@@ -1,19 +1,33 @@
-export default function getEnvironment() {
+const prd = Symbol('prd')
+const dev = Symbol('dev')
+
+let env = prd
+
+export const getEnv = () => env
+export const setEnv = (e: symbol) => env = e
+
+export function detectEnvironment() {
   try {
     if (
-      process.env?.npm_lifecycle_event === 'dev'
+      process.env?.npm_lifecycle_event == 'dev'
       || process.env?.AWS_SAM_LOCAL
-      || process?.argv?.includes('--dev')
+      // || process?.argv?.includes('--dev')
+      || process?.argv?.some(arg => ['--dev', '--development', '--watch'].includes(arg))
       || process?.execArgv?.includes('--watch')
       || import.meta.url?.includes('localhost')
     ) {
-      return 'dev'
+      return dev
     }
   } catch (e) { }
 
-  return 'prod'
+  return prd
 }
 
-export const isDev = () => getEnvironment() === 'dev'
-export const isProd = () => getEnvironment() === 'prod'
+export const isEnv = (e: symbol) => env == e
+
+export const isDev = () => env == dev
+export const isProd = () => env == prd
+
+export const isDevelopment = isDev
+export const isProduction = isProd
 export const isPrd = isProd

package/src/utils/version-sha.ts

@@ -13,7 +13,7 @@ export default function getLastCommitHash(path: string = '.git') {
 
     return headContent
   } catch (e) {
-    console.error('Error reading HEAD file: ', e?.message)
+    // console.error('Error reading HEAD file: ', e?.message)
     return null
   }
 }