rajt 0.0.83 → 0.0.85

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.83",
+  "version": "0.0.85",
   "type": "module",
   "main": "./src/index.ts",
   "bin": {
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "cripta": "^0.1",
-    "forj": "^0.0.7",
+    "forj": "^0.0.9",
     "t0n": "^0.1",
     "@hono/node-server": "^1.19.9",
     "@hono/standard-validator": "^0.2.2",

package/src/cli/commands/build.ts

@@ -1,9 +1,9 @@
 import { defineCommand } from 'citty'
 import { gray } from '../../utils/colors'
-import { build, normalizePlatform, platformError } from './utils'
+import { build, normalizePlatform, platformError } from '../utils'
 import { wait, error, rn } from '../../utils/log'
 
-import { platforms } from './constants'
+import { platforms } from '../constants'
 
 export default defineCommand({
 	meta: {

package/src/cli/commands/deploy.ts

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

package/src/cli/commands/dev.ts

@@ -7,7 +7,7 @@ import {
 	_root, build, wait, watch, normalizePlatform, platformError, getRuntime,
 	wranglerConfig, createMiniflare, localflareManifest,
 	getDockerHost
-} from './utils'
+} from '../utils'
 import { error, event, log, rn, warn } from '../../utils/log'
 import { withPort } from '../../utils/port'
 import shutdown from '../../utils/shutdown'

package/src/cli/commands/make.ts

@@ -1,8 +1,9 @@
 import { defineCommand } from 'citty'
 import { join, relative } from 'node:path'
 import { Migrator } from 'forj'
-import { _root, makeFile, hasExt, camelCase, kebabCase } from './utils'
+import { _root, makeFile, hasExt, camelCase, kebabCase } from '../utils'
 import { event, error } from '../../utils/log'
+import * as stub from '../stubs'
 
 export default defineCommand({
 	meta: {
@@ -31,32 +32,20 @@ export default defineCommand({
 			case 'endpoint':
 				fileName = path(kebabCase(name))
 				if (!fileName.endsWith('.ts')) fileName += '.ts'
-				const className = camelCase(name)
-				makeFile(fileName, `import { Action } from 'rajt'
-import { IRequest, IResponse } from 'rajt/types'
-
-export default class ${className} extends Action {
-	static async handle(req: IRequest, res: IResponse) {
-		return res.ok('${className}')
-	}
-}
-`)
+				makeFile(fileName, stub.replace(stub.route, { R_NAME: camelCase(name) }))
 				break
 			case 'migrate':
 			case 'migration':
-				fileName = path(Migrator.fileName(name), 'migration')
+				fileName = Migrator.fileName(name)
+				const [table, create] = Migrator.guess(fileName)
+				fileName = path(fileName, 'migration')
 				if (!fileName.endsWith('.ts')) fileName += '.ts'
-				makeFile(fileName, `import { Migration, Schema, Blueprint } from 'rajt/db'
-
-export default class ${Migrator.className(name)} extends Migration {
-	static async run() {
-		Schema.${name.includes('create') ? 'create' : 'table'}('users', (table: Blueprint) => {
-			table.id()
-			table.timestamps()
-		})
-	}
-}
-`)
+				makeFile(fileName, stub.replace(stub.migration, {
+					M_NAME: Migrator.className(name),
+					S_NAME: create ? 'create' : 'table',
+					T_NAME: table || 'TABLE_NAME',
+					M_CONTENT: create ? stub.migrationCreate : '//',
+				}))
 				break
 			case 'model':
 				error('Action not yet implemented, contact the webmaster')

package/src/cli/commands/migrate.ts

@@ -2,7 +2,7 @@ import { defineCommand } from 'citty'
 import { spawn } from 'node:child_process'
 import { Migrator } from 'forj'
 import { gray } from '../../utils/colors'
-import { _root, getRuntime } from './utils'
+import { _root, getRuntime, cleanDir, d1Path, wait as WAIT } from '../utils'
 import { wait, info, event, rn, error, log } from '../../utils/log'
 
 export default defineCommand({
@@ -34,10 +34,17 @@ export default defineCommand({
 			switch (action) {
 				case 'migrate':
 				case 'apply':
+				case 'fresh':
+				case 'refresh':
 					if (!pending?.length)
 						log('Nothing to compile')
 					wait('Running migrations')
 
+					if (action.includes('fresh')) {
+						cleanDir(d1Path)
+						await WAIT(2000)
+					}
+
 					await Migrator.compile([...migrated, ...pending])
 
 					const child = spawn(
@@ -50,11 +57,8 @@ export default defineCommand({
 					)
 
 					child.on('exit', code => process.exit(code ?? 0))
-						.on('message', msg => {
-							process.send && process.send(msg)
-						}).on('disconnect', () => {
-							process.disconnect && process.disconnect()
-						})
+						.on('message', msg => process.send && process.send(msg))
+						.on('disconnect', () => process.disconnect && process.disconnect())
 
 					pending.forEach(item => event(item.name))
 					break

package/src/cli/commands/routes.ts

@@ -3,7 +3,7 @@ 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'
 import { rn } from '../../utils/log'
 
 export default defineCommand({

package/src/cli/stubs.ts

@@ -0,0 +1,42 @@
+export const replace = (str: string, map: Record<string, string>) => {
+  if (!str || typeof str != 'string' || !map || typeof map != 'object') return str
+  const entries = Object.entries(map)
+  const length = entries?.length || 0
+  if (!length) return str
+
+  str = str.trimStart()
+  if (length == 1)
+    return str.replaceAll(entries[0][0], entries[0][1])
+
+  return entries.reduce(
+    (acc, entry) => acc.replace(new RegExp(entry[0].replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g'), entry[1]),
+    str
+  )
+}
+
+export const route = `
+import { Action } from 'rajt'
+import { IRequest, IResponse } from 'rajt/types'
+
+export default class R_NAME extends Action {
+	static async handle(req: IRequest, res: IResponse) {
+		return res.ok('R_NAME')
+	}
+}
+`
+
+export const migration = `
+import { Migration, Schema, Blueprint } from 'rajt/db'
+
+export default class M_NAME extends Migration {
+  static async run() {
+    Schema.S_NAME('T_NAME', (table: Blueprint) => {
+      M_CONTENT
+    })
+  }
+}
+`
+export const migrationCreate = `
+      table.id()
+      table.timestamps()
+`.trim()

package/src/cli/{commands/utils.ts → utils.ts}

@@ -1,6 +1,6 @@
 import esbuild from 'esbuild'
 import { Miniflare } from 'miniflare'
-import { mkdirSync, existsSync, readdirSync, rmSync, copyFileSync, writeFileSync } from 'node:fs'
+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 'node:path'
 
@@ -8,14 +8,14 @@ import { findWranglerConfig, parseWranglerConfig, WRANGLER_CONFIG_FILES } from '
 import type { WranglerConfig, LocalflareManifest } from 'localflare-core'
 
 import chokidar from 'chokidar'
-import { gray, red } from '../../utils/colors'
+import { gray, 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 { 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 _root = join(dirname(new URL(import.meta.url).pathname), '../../../../')
 export const __rajt = join(_root, 'node_modules/rajt/src')
 
 export function normalizePlatform(platform: Platform) {
@@ -73,11 +73,7 @@ export const build = async (platform: Platform) => {
   const startTime = Date.now()
 
   const isCF = platform == 'cf'
-  const distDir = join(_root, dist)
-
-  existsSync(distDir)
-    ? readdirSync(distDir).forEach(file => rmSync(join(distDir, file), { recursive: true, force: true }))
-    : mkdirSync(distDir, { recursive: true })
+  cleanDir(join(_root, dist))
 
   if (isCF) {
     for (let file of WRANGLER_CONFIG_FILES) {
@@ -181,6 +177,24 @@ export const build = async (platform: Platform) => {
   )
 }
 
+export function cleanDir(path: string) {
+  try {
+    if (!existsSync(path))
+      return mkdirSync(path, {recursive: true})
+
+    const files = readdirSync(path)
+
+    for (const file of files) {
+      const filePath = join(path, file)
+      const stat = statSync(filePath)
+
+      stat.isDirectory()
+        ? rmSync(filePath, {recursive: true, force: true})
+        : unlinkSync(filePath)
+    }
+  } catch {}
+}
+
 export function wranglerConfig(file?: string) {
   file ??= findWranglerConfig(_root)
   if (!file) {
@@ -237,6 +251,12 @@ export function localflareManifest(opts: WranglerConfig): LocalflareManifest {
   }
 }
 
+const wranglerPath = '.wrangler/state/v3'
+export const kvPath = join(_root, wranglerPath, 'kv')
+export const d1Path = join(_root, wranglerPath, 'd1')
+export const r2Path = join(_root, wranglerPath, 'r2')
+export const doPath = join(_root, wranglerPath, 'durable_objects')
+
 export function createMiniflare(opts = {}) {
   const entry = join(_root, opts?.main || opts?.script)
   return new Miniflare({
@@ -264,11 +284,11 @@ export function createMiniflare(opts = {}) {
     // r2Buckets: Object.fromEntries((opts.r2_buckets || []).map(r2 => [r2.binding, r2.bucket_name])),
     // durableObjects: Object.fromEntries((opts.durable_objects?.bindings || []).map(do => [do.name, do.class_name])),
 
-    kvPersist: join(_root, '.wrangler/state/v3/kv'),
-    cachePersist: join(_root, '.wrangler/state/v3/cache'),
-    d1Persist: join(_root, '.wrangler/state/v3/d1'),
-    r2Persist: join(_root, '.wrangler/state/v3/r2'),
-    durablesPersist: join(_root, '.wrangler/state/v3/durable_objects'),
+    kvPersist: kvPath,
+    cachePersist: join(_root, wranglerPath, 'cache'),
+    d1Persist: d1Path,
+    r2Persist: r2Path,
+    durablesPersist: doPath,
 
     verbose: false,