rajt 0.0.57 → 0.0.59

package/README.md

@@ -1,7 +1,7 @@
-<h1 align="left">Rajt λ<br/><a href="https://pr.new/attla/rajt"><img align="right" src="https://developer.stackblitz.com/img/start_pr_dark_small.svg" alt="Start new PR in StackBlitz Codeflow"></a><a href="https://npmjs.com/package/rajt"><img align="right" src="https://img.shields.io/npm/v/rajt.svg" alt="npm package"></a></h1>
+<h1 align="left">λ Rajt<br/><a href="https://pr.new/attla/rajt"><img align="right" src="https://developer.stackblitz.com/img/start_pr_dark_small.svg" alt="Start new PR in StackBlitz Codeflow"></a><a href="https://npmjs.com/package/rajt"><img align="right" src="https://img.shields.io/npm/v/rajt.svg" alt="npm package"></a></h1>
 <br/>
 
-> This framework is fully geared towards the serverless world, specifically AWS Lambda (Node.js and LLRT) / Cloudflare Workers.
+> This framework is fully geared towards the serverless world, specifically AWS Lambda (Node.js, Bun and LLRT runtime) / Cloudflare Workers.
 
 - 💡 Instant Server Start
 - ⚡️ Fast Cold Start
@@ -9,12 +9,15 @@
 
 [Read the Docs to Learn More](https://github.com/attla/rajt/blob/main/DOCS.md)
 
-## Packages
+## Ecosystem Packages
 
-| Package                                             | Version                                                                        |
-| --------------------------------------------------- | :----------------------------------------------------------------------------- |
-| [rajt](https://github.com/attla/rajt)               | ![rajt version](https://img.shields.io/npm/v/rajt.svg?label=%20)               |
-| [create-rajt](https://github.com/attla/create-rajt) | ![create-rajt version](https://img.shields.io/npm/v/create-rajt.svg?label=%20) |
+| Package | Version | Description |
+| -: | :- | :- |
+| [rajt](https://github.com/attla/rajt) | [![rajt version](https://img.shields.io/npm/v/rajt.svg?label=%20)](https://npm.im/rajt) | 🧱 The core of Rajt serverless framework. |
+| [create-rajt](https://github.com/attla/create-rajt) | [![create-rajt version](https://img.shields.io/npm/v/create-rajt.svg?label=%20)](https://npm.im/create-rajt) | 📁 CLI tool for create new Rajt projects, from starter templates. |
+| [forj](https://github.com/attla/forj) | [![forj version](https://img.shields.io/npm/v/forj.svg?label=%20)](https://npm.im/forj) | 🗂️ Just another query builder in typescript |
+| [t0n](https://github.com/attla/t0n) | [![t0n version](https://img.shields.io/npm/v/t0n.svg?label=%20)](https://npm.im/t0n) | 🧰 Collection of elegant typescript resources for web artisans. |
+| [cripta](https://github.com/attla/cripta) | [![cripta version](https://img.shields.io/npm/v/cripta.svg?label=%20)](https://npm.im/cripta) | 🧛 A layer of encryption a little too judicious. |
 
 ## License
 

package/package.json

@@ -1,14 +1,20 @@
 {
   "name": "rajt",
   "description": "A serverless bundler layer, fully typed for AWS Lambda (Node.js and LLRT) and Cloudflare Workers.",
-  "version": "0.0.57",
+  "version": "0.0.59",
   "type": "module",
   "main": "dist/index.js",
+  "bin": {
+    "rajt": "./src/bin/rajt.js"
+  },
   "exports": {
     ".": "./src/index.ts",
     "./auth": "./src/auth/index.ts",
-    "./dynamodb": "./src/dynamodb/index.ts",
-    "./dynamodb/types": "./src/dynamodb/types.ts",
+    "./d1": "./src/db/d1.ts",
+    "./d1/types": "./src/db.d.ts",
+    "./dynamodb": "./src/db/dynamodb.ts",
+    "./dynamodb/types": "./src/db/dynamodb.d.ts",
+    "./enum": "./src/enum.ts",
     "./http": "./src/http.ts",
     "./types": "./src/types.ts",
     "./env": "./src/utils/environment.ts",
@@ -18,6 +24,7 @@
     "src"
   ],
   "scripts": {
+    "rajt": "./src/bin/rajt.js",
     "dev": "tsx watch src/dev.ts",
     "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",
@@ -33,7 +40,7 @@
     "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:local-": "source ../../.env.dev && bun run --silent cf:build:watch -- cd ../../dist && bunx wrangler dev --port=$PORT --persist-to='../.wrangler/state'",
     "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",
@@ -44,24 +51,37 @@
     "start": "node ../../dist/index.js"
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "3.817.0",
-    "@aws-sdk/lib-dynamodb": "3.817.0",
-    "@hono/node-server": "^1.14.1",
     "@hono/zod-validator": "^0.4.3",
+    "cripta": "^0.1",
+    "forj": "^0.0.2",
+    "hono": "^4.7.6",
+    "t0n": "^0.1.5",
+    "ua-parser-js": "^2.0.4"
+  },
+  "devDependencies": {
+    "@cloudflare/workers-types": "^4.20251230.0",
+    "@hono/node-server": "^1.14.1",
+    "@iarna/toml": "^2.2.5",
+    "@miniflare/core": "^2.14.4",
+    "@miniflare/d1": "^2.14.4",
+    "@miniflare/durable-objects": "^2.14.4",
+    "@miniflare/kv": "^2.14.4",
+    "@miniflare/r2": "^2.14.4",
+    "@miniflare/scheduler": "^2.14.4",
+    "@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",
     "chokidar-cli": "^3.0.0",
-    "cripta": "^0.1",
+    "citty": "^0.1.6",
     "dotenv": "^16.5.0",
     "esbuild": "^0.25.2",
-    "hono": "^4.7.6",
-    "plur": "^5.1.0",
-    "tsconfig-paths": "^4.2.0",
+    "miniflare": "^4.20251217.0",
+    "picocolors": "^1.1.1",
     "tsx": "^4.19.3",
     "typescript": "^5.8.3",
-    "ua-parser-js": "^2.0.4"
-  },
-  "devDependencies": {
-    "bun-types": "^1.2.14"
+    "wrangler": "^4.56.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/action-old.ts

@@ -0,0 +1,72 @@
+// import { Context, Handler, HonoRequest, MiddlewareHandler, Next, ValidationTargets } from 'hono'
+// import { JSONValue } from 'hono/utils/types'
+import { Context, Handler, ValidationTargets } from 'hono'
+import { z, ZodObject } from 'zod'
+import { zValidator } from '@hono/zod-validator'
+import response from './response'
+import cx from './context'
+
+export type ActionType = Function | Handler | Action | (new () => Action)
+
+type RuleDefinition = {
+  schema: z.ZodObject<any>
+  target: keyof ValidationTargets
+  eTarget?: 'fieldErrors' | 'formErrors'
+}
+
+export default class Action {
+  static rule<T extends keyof ValidationTargets>(target: T): { schema: (schema: ZodObject<any>) => RuleDefinition }
+  static rule<T extends keyof ValidationTargets>(target: T, schema: ZodObject<any>): RuleDefinition
+  static rule<T extends keyof ValidationTargets>(target: T, schema?: ZodObject<any>):
+    | { schema: (schema: ZodObject<any>) => RuleDefinition }
+    | RuleDefinition
+  {
+    if (schema !== undefined) {
+      return {
+        target,
+        schema,
+        eTarget: 'fieldErrors' // | 'formErrors'
+      } satisfies RuleDefinition
+    }
+
+    return {
+      schema: (schema: ZodObject<any>) => ({
+        target,
+        schema,
+        eTarget: 'fieldErrors' // | 'formErrors'
+      })
+    }
+  }
+
+  static validate() {
+    const rules = this.rules()
+    const h = async (c: Context) => {
+      return await this.handle(cx.cx)
+    }
+    if (!rules) return [h]
+
+    const rulesArray: Function[] = (Array.isArray(rules) ? rules : [rules])
+      // @ts-ignore
+      .map(rule => zValidator(rule.target, rule.schema, (result, c) => {
+        if (!result.success) {
+          // @ts-ignore
+          return response.badRequest({ ...result.error.flatten()[rule.eTarget] })
+        }
+      }))
+
+    rulesArray.push(h)
+    return rulesArray
+  }
+
+  static run() {
+    return this.validate()
+  }
+
+  static rules(): RuleDefinition[] | RuleDefinition | null {
+    return null
+  }
+
+  static async handle(c: Context): Promise<Response> {
+    return Promise.resolve(response.raw(200, 'Action handle not implemented'))
+  }
+}

package/src/action.ts

@@ -1,72 +1,23 @@
-// import { Context, Handler, HonoRequest, MiddlewareHandler, Next, ValidationTargets } from 'hono'
-// import { JSONValue } from 'hono/utils/types'
-import { Context, Handler, ValidationTargets } from 'hono'
-import { z, ZodObject } from 'zod'
-import { zValidator } from '@hono/zod-validator'
-import Response from './response'
-import cx from './context'
-
-export type ActionType = Function | Handler | Action | (new () => Action)
-
-type RuleDefinition = {
-  schema: z.ZodObject<any>
-  target: keyof ValidationTargets
-  eTarget?: 'fieldErrors' | 'formErrors'
-}
+import response from './response'
+import validator from './validator'
+import type { Context, IRequest, IResponse, IValidator, Rules } from './types'
 
 export default class Action {
-  static rule<T extends keyof ValidationTargets>(target: T): { schema: (schema: ZodObject<any>) => RuleDefinition }
-  static rule<T extends keyof ValidationTargets>(target: T, schema: ZodObject<any>): RuleDefinition
-  static rule<T extends keyof ValidationTargets>(target: T, schema?: ZodObject<any>):
-    | { schema: (schema: ZodObject<any>) => RuleDefinition }
-    | RuleDefinition
-  {
-    if (schema !== undefined) {
-      return {
-        target,
-        schema,
-        eTarget: 'fieldErrors' // | 'formErrors'
-      } satisfies RuleDefinition
-    }
-
-    return {
-      schema: (schema: ZodObject<any>) => ({
-        target,
-        schema,
-        eTarget: 'fieldErrors' // | 'formErrors'
-      })
-    }
-  }
-
-  static validate() {
-    const rules = this.rules()
-    const h = async (c: Context) => {
-      return await this.handle(cx.cx)
-    }
+  static run() {
+    const rules = this.rules(validator)
+    const h = async (c: Context) => await this.handle(c.get('_'), response)
     if (!rules) return [h]
 
-    const rulesArray: Function[] = (Array.isArray(rules) ? rules : [rules])
-      // @ts-ignore
-      .map(rule => zValidator(rule.target, rule.schema, (result, c) => {
-        if (!result.success) {
-          // @ts-ignore
-          return Response.badRequest({ ...result.error.flatten()[rule.eTarget] })
-        }
-      }))
-
-    rulesArray.push(h)
-    return rulesArray
-  }
-
-  static run() {
-    return this.validate()
+    const pipe = validator.parse(rules)
+    pipe.push(h)
+    return pipe
   }
 
-  static rules(): RuleDefinition[] | RuleDefinition | null {
+  static rules(v: IValidator): Rules {
     return null
   }
 
-  static async handle(c: Context): Promise<Response> {
-    return Promise.resolve(Response.raw(200, 'Action handle not implemented'))
+  static async handle(req: IRequest, res: IResponse): Promise<Response> {
+    return Promise.resolve(res.raw(200, 'Action handle not implemented'))
   }
 }

package/src/auth/ability.ts

@@ -16,8 +16,8 @@ export class Ability {
     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('", "')}"`)
+    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))

package/src/auth/authnz.ts

@@ -79,4 +79,7 @@ export class Authnz<T extends object> {
   get data() {
     return this.#data
   }
+  get user() {
+    return this.#data
+  }
 }

package/src/auth/index.ts

@@ -1,5 +1,4 @@
 export { Ability } from './ability'
-export { Auth, Auth as Gate } from './auth'
 export { Authnz } from './authnz'
 export { Token } from './token'
 

package/src/auth/token.ts

@@ -1,19 +1,20 @@
 import { Envir } from 't0n'
 import { Token as Factory } from 'cripta'
 import { UAParser } from 'ua-parser-js'
-import c from '../context'
+import type { IRequest } from '@/types'
 
 export class Token {
+  static #cookieName: string = '__auth_'
   static #name: string = 'Authorization'
   static #prefix: string = 'bearer'
 
-  static fromRequest() {
-    const token = this.fromCookie() || this.fromHeader()
-    return token ? this.parse(token) : null
+  static fromRequest(req: IRequest) {
+    const token = this.fromCookie(req) || this.fromHeader(req)
+    return token ? this.parse(req, token) : null
   }
 
-  static fromHeader(): string | null {
-    const header = c.cx.req.header(this.#name) || c.cx.req.header('HTTP_AUTHORIZATION') || c.cx.req.header('REDIRECT_HTTP_AUTHORIZATION') || null
+  static fromHeader(req: IRequest): string | null {
+    const header = req.header(this.#name) || req.header('HTTP_AUTHORIZATION') || req.header('REDIRECT_HTTP_AUTHORIZATION') || null
 
     if (header) {
       const pos = header.toLowerCase().indexOf(this.#prefix.toLowerCase())
@@ -29,39 +30,39 @@ export class Token {
     return null
   }
 
-  static fromCookie(): string | null {
-    const uid = c.cx.req.header('uid')
+  static fromCookie(req: IRequest): string | null {
+    const uid = req.header('uid')
 
     if (uid) {
-      const auth = c.cookie.get('__auth_' + uid)
+      const auth = req.cookie.get(this.#cookieName + uid)
       return auth ? auth : null
     }
 
     return null
   }
 
-  static parse(token: string) {
-    const host = this.host()
+  static parse(req: IRequest, token: string) {
+    const host = this.host(req)
     const serveHost = Envir.get('FLOW_SERVER', host) as string
 
     return Factory.parse(token)
       .issuedBy(serveHost)
       .permittedFor(host)
-      .withClaim('u', this.userAgent())
-      .withClaim('i', this.ip())
+      .withClaim('u', this.userAgent(req))
+      .withClaim('i', this.ip(req))
   }
 
-  static create(user: any, exp: number = 7200) {
+  static create(req: IRequest, user: any, exp: number = 7200) {
     const time = Math.floor(Date.now() / 1000)
-    const host = this.host(c.cx.req.header('host') || '')
+    const host = this.host(req)
 
     return Factory.create()
       .issuedBy(host)
       .permittedFor(host)
       .issuedAt(time)
       .expiresAt(time + exp)
-      .withClaim('u', this.userAgent())
-      .withClaim('i', this.ip())
+      .withClaim('u', this.userAgent(req))
+      .withClaim('i', this.ip(req))
       .body(user)
   }
 
@@ -73,8 +74,9 @@ export class Token {
     this.#name = name
   }
 
-  static host(url?: string | null | undefined): string {
-    if (!url) url = c.cx.req.url || c.cx.req.header('host') || ''
+  static host(req: IRequest): string {
+    const url = req.url || req.header('host')
+    if (!url) return ''
 
     let formattedUrl = String(url)
     if (!formattedUrl.startsWith('http'))
@@ -88,13 +90,14 @@ export class Token {
     }
   }
 
-  static userAgent() {
-    if (!c?.userAgent) return 0
-    const { browser, device, os } = UAParser(c.userAgent)
+  static userAgent(req: IRequest) {
+    const ua = req?.userAgent
+    if (!ua) return 0
+    const { browser, device, os } = UAParser(ua)
     return (browser?.name || '') + (browser?.major || '') + (device?.model || '') + (os?.name || '')
   }
 
-  static ip() {
-     return c?.ip || 0
+  static ip(req: IRequest) {
+     return req?.ip || 0
   }
 }

package/src/bin/rajt.js

@@ -0,0 +1,123 @@
+#!/usr/bin/env node
+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 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) {
+    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.
+
+Consider using a Node.js version manager such as https://volta.sh or https://github.com/nvm-sh/nvm.`
+    );
+    process.exitCode = 1;
+    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",
+  ];
+
+  let tsxPath;
+  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;
+  }
+
+  return spawn(
+    process.execPath,
+    [
+      "--no-warnings",
+      ...process.execArgv,
+      tsxPath,
+      join(__dirname, "../rajt/src/cli/index.ts"),
+      ...process.argv.slice(2),
+    ].filter(arg =>
+      !arg.includes('experimental-vm-modules') &&
+      !arg.includes('loader')
+    ),
+    {
+      stdio: ["inherit", "inherit", "inherit", "ipc"],
+      env: {
+        ...process.env,
+        NODE_ENV: process.env.NODE_ENV || 'development',
+        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();
+      }
+    });
+}
+
+var fn = new Intl.Collator(0, { numeric: 1 }).compare;
+
+function semiver(a, b, bool) {
+  a = a.split(".");
+  b = b.split(".");
+
+  return (
+    fn(a[0], b[0]) ||
+    fn(a[1], b[1]) ||
+    ((b[2] = b.slice(2).join(".")),
+      (bool = /[.-]/.test((a[2] = a.slice(2).join(".")))),
+      bool == /[.-]/.test(b[2]) ? fn(a[2], b[2]) : bool ? -1 : 1)
+  );
+}
+
+function directly() {
+  try {
+    return ![typeof require, typeof module].includes('undefined') && require.main == module
+      || import.meta.url == `file://${process.argv[1]}`
+      || process.argv[1].endsWith(process.env?.npm_package_bin_rajt)
+      || import.meta?.url?.endsWith(process.env?.npm_package_bin_rajt)
+  } catch {
+    return false
+  }
+}
+
+if (directly()) {
+  rajtProcess = runRajt();
+  process.on("SIGINT", () => {
+    rajtProcess && rajtProcess.kill();
+  });
+  process.on("SIGTERM", () => {
+    rajtProcess && rajtProcess.kill();
+  });
+}