rajt 0.0.2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rajt",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -16,17 +16,17 @@
     "dev": "tsx watch src/dev.ts",
     "prod": "bun run build && bun run sam",
     "build": "bun run cache:routes && bun run export && bun run clean:temp",
-    "build:watch": "chokidar \"{actions,src,models,utils,configs}/**/*.ts\" -c \"bun run build\" --initial",
-    "export": "esbuild --bundle --minify --outfile=dist/index.js --platform=node --target=node20 --format=esm --tree-shaking=true --legal-comments=none src/prod.ts",
+    "build:watch": "chokidar \"../../{actions,configs,models,utils}/**/*.ts\" -c \"bun run build\" --initial",
+    "export": "esbuild --bundle --minify --outfile=../../dist/index.js --platform=node --target=node20 --format=esm --tree-shaking=true --legal-comments=none src/prod.ts",
     "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",
-    "clean:build": "rm -rf dist",
-    "clean:temp": "rm -rf tmp",
-    "zip": "zip -j lambda.zip dist/index.js",
-    "update": "aws lambda update-function-code --zip-file fileb://lambda.zip --function-name hello",
+    "ensure-dirs": "rm -rf ../../dist ../../tmp && mkdir -p ../../tmp && chmod 755 ../../tmp && mkdir -p ../../dist && chmod 755 ../../dist",
+    "clean": "rm -rf ../../dist ../../tmp",
+    "clean:build": "rm -rf ../../dist",
+    "clean:temp": "rm -rf ../../tmp",
+    "zip": "zip -j lambda.zip ../../dist/index.js",
+    "update": "aws lambda update-function-code --zip-file fileb://../../lambda.zip --function-name hello",
     "deploy": "run-s build zip update",
-    "start": "node dist/index.js"
+    "start": "node ../../dist/index.js"
   },
   "dependencies": {
     "@hono/node-server": "^1.14.1",

package/src/create-app.ts

@@ -116,6 +116,7 @@ export const createApp = <E extends Env>(options?: ServerOptions<E>) => {
 
 function mw(...objs: string[]): Function[] {
   return objs.flatMap(obj => {
+    if (typeof obj !== 'string') return null
     // @ts-ignore
     return getHandler(obj)?.mw || null
   }).flat().filter(Boolean)

package/src/prod.ts

@@ -5,10 +5,10 @@ import createApp from './create-app'
 config({ path: '.env.prod' })
 
 // @ts-ignore
-await import('../tmp/import-routes.mjs')
+await import('../../../tmp/import-routes.mjs')
 
 // @ts-ignore
-const routes = (await import('../tmp/routes.json')).default
+const routes = (await import('../../../tmp/routes.json')).default
 // @ts-ignore
 const app = createApp({ routes })
 

package/src/routes.ts

@@ -49,7 +49,7 @@ export default async function getRoutes(all: boolean = false, baseDir: string =
             method: handle.m.toLowerCase(),
             path: handle.p,
             name: handle.name.replace(/\.ts$/, ''),
-            file: relative(process.cwd(), fullPath),
+            file: baseDir + fullPath.split(baseDir)[1],
             middlewares,
             handle,
           })
@@ -58,6 +58,6 @@ export default async function getRoutes(all: boolean = false, baseDir: string =
     }
   }
 
-  await walk(path.resolve(__dirname, '..', baseDir))
+  await walk(path.resolve(__dirname, '../../..', baseDir))
   return routes
 }

package/src/scripts/cache-routes.ts

@@ -5,10 +5,10 @@ import ensureDir from '../utils/ensuredir'
 async function cacheRoutes() {
   const routes = await getRoutes(true)
 
-  const iPath = './tmp/import-routes.mjs'
+  const iPath = '../../tmp/import-routes.mjs'
   ensureDir(iPath)
   writeFileSync(iPath, `// AUTO-GENERATED FILE - DO NOT EDIT
-import { registerHandler } from '../src/register'
+import { registerHandler } from '../node_modules/rajt/src/register'
 
 ${routes.map(r => `import ${r.name} from '../${normalizePath(r.file)}'`).join('\n')}
 
@@ -20,12 +20,12 @@ try {
       registerHandler(name, handler)
     }
   }
-} catch (error) {
-  console.error('Failed to register handlers:', error)
+} catch (e) {
+  console.error('Failed to register handlers:', e)
 }
 `)
 
-  const rPath = './tmp/routes.json'
+  const rPath = '../../tmp/routes.json'
   ensureDir(rPath)
   writeFileSync(rPath, JSON.stringify(routes.filter(r => r.method && r.path).map(route => [
     route.method,