rajt 0.0.53 → 0.0.55

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.53",
+  "version": "0.0.55",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

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/http.ts

@@ -4,48 +4,81 @@ import Response from './response'
 import { Ability, Auth as Gate } from './auth'
 import mergeMiddleware from './utils/merge-middleware'
 
-function method(method: string, path = '/') {
-  return function (target: any) {
-    target.m = method
-    target.p = path
-    target.mw = []
-  }
+function method(method: string, ...args: any[]): void | ClassDecorator {
+  if (args.length === 1 && typeof args[0] === 'function')
+    return _method(method, '/', args[0])
+
+  const path = typeof args[0] === 'string' ? args[0] : '/'
+  return (target: Function) => _method(method, path, target)
+}
+
+function _method(method: string, path = '/', target: Function | any) {
+  target.m = method
+  target.p = path
+  target.mw = []
 }
 
-export function Get(path = '/') {
-  return method('get', path)
+export function Get(): ClassDecorator
+export function Get(target: Function): void
+export function Get(path: string): ClassDecorator
+export function Get(...args: any[]): void | ClassDecorator {
+  return method('get', ...args)
 }
 
-export function Post(path = '/') {
-  return method('post', path)
+export function Post(): ClassDecorator
+export function Post(target: Function): void
+export function Post(path: string): ClassDecorator
+export function Post(...args: any[]): void | ClassDecorator {
+  return method('post', ...args)
 }
 
-export function Put(path = '/') {
-  return method('put', path)
+export function Put(): ClassDecorator
+export function Put(target: Function): void
+export function Put(path: string): ClassDecorator
+export function Put(...args: any[]): void | ClassDecorator {
+  return method('put', ...args)
 }
 
-export function Patch(path = '/') {
-  return method('patch', path)
+export function Patch(): ClassDecorator
+export function Patch(target: Function): void
+export function Patch(path: string): ClassDecorator
+export function Patch(...args: any[]): void | ClassDecorator {
+  return method('patch', ...args)
 }
 
-export function Delete(path = '/') {
-  return method('delete', path)
+export function Delete(): ClassDecorator
+export function Delete(target: Function): void
+export function Delete(path: string): ClassDecorator
+export function Delete(...args: any[]): void | ClassDecorator {
+  return method('delete', ...args)
 }
 
-export function Head(path = '/') {
-  return method('head', path)
+export function Head(): ClassDecorator
+export function Head(target: Function): void
+export function Head(path: string): ClassDecorator
+export function Head(...args: any[]): void | ClassDecorator {
+  return method('head', ...args)
 }
 
-export function Options(path = '/') {
-  return method('options', path)
+export function Options(): ClassDecorator
+export function Options(target: Function): void
+export function Options(path: string): ClassDecorator
+export function Options(...args: any[]): void | ClassDecorator {
+  return method('options', ...args)
 }
 
-export function Connect(path = '/') {
-  return method('connect', path)
+export function Connect(): ClassDecorator
+export function Connect(target: Function): void
+export function Connect(path: string): ClassDecorator
+export function Connect(...args: any[]): void | ClassDecorator {
+  return method('connect', ...args)
 }
 
-export function Trace(path = '/') {
-  return method('trace', path)
+export function Trace(): ClassDecorator
+export function Trace(target: Function): void
+export function Trace(path: string): ClassDecorator
+export function Trace(...args: any[]): void | ClassDecorator {
+  return method('trace', ...args)
 }
 
 export function Middleware(...handlers: MiddlewareType[]) {

package/src/scripts/cache-routes.ts

@@ -2,8 +2,15 @@ import { existsSync, writeFileSync } from 'node:fs'
 import { config } from 'dotenv'
 import { getRoutes, getMiddlewares } from '../routes'
 import ensureDir from '../utils/ensuredir'
+import versionSHA from '../utils/version-sha'
 
-config({ path: '../../.env.dev' })
+const env = Object.entries(
+  config({ path: '../../.env.prod' })?.parsed || {}
+).filter(([key, val]) => key?.toLowerCase().indexOf('aws') != 0) // prevent AWS credentials
+
+const version = versionSHA('../../.git')
+env.push(['VERSION_SHA', process.env['VERSION_SHA'] = version])
+env.push(['VERSION_HASH', process.env['VERSION_HASH'] = version?.substring(0, 7)])
 
 async function cacheRoutes() {
   const rolePath = '../../roles.json'
@@ -16,6 +23,8 @@ 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')}
+
 import { registerHandler, registerMiddleware } from '../node_modules/rajt/src/register'
 
 ${routes.map(r => `import ${r.name} from '../${normalizePath(r.file)}'`).join('\n')}

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

@@ -0,0 +1,19 @@
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+export default function getLastCommitHash(path: string = '.git') {
+  try {
+    const gitDir = join(process.cwd(), path)
+    const headPath = join(gitDir, 'HEAD')
+
+    let headContent = readFileSync(headPath, 'utf8').trim()
+
+    if (headContent.startsWith('ref:'))
+      headContent = readFileSync(join(gitDir, headContent.substring(5)), 'utf8').trim()
+
+    return headContent
+  } catch (e) {
+    console.error('Error reading HEAD file: ', e?.message)
+    return null
+  }
+}