rajt 0.0.29 → 0.0.30

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

package/src/create-app.ts

@@ -95,12 +95,11 @@ export const createApp = <E extends Env>(options?: ServerOptions<E>) => {
   const routes = options?.routes || []
   for (const route of routes) {
     if (Array.isArray(route)) {
-      const handle = getHandler(route[3])
       // @ts-ignore
-      app[route[0]](route[1], ...mw(route[2], route[3]), ...resolve(handle))
+      app[route[0]](route[1], ...mw(route[2], route[3]), ...resolve(getHandler(route[3]), route[3]))
     } else {
       // @ts-ignore
-      app[route.method](route.path, ...mw(route.middlewares, route.name), ...resolve(route.handle))
+      app[route.method](route.path, ...mw(route.middlewares, route.name), ...resolve(route.handle, route.name))
     }
   }
 

package/src/register.ts

@@ -1,24 +1,13 @@
-export const handlers = {}
+export const handlers: Record<string, Function> = {}
 
 export function registerHandler(id: string, handler: any) {
-  if (typeof handler === 'function') {
-    // @ts-ignore
-    handlers[id] = handler
-  } else if (handler.prototype?.handle) {
-    const instance = new handler()
-    // @ts-ignore
-    handlers[id] = instance.handle.bind(instance)
-  } else if (handler.run) {
-    const instance = new handler()
-    // @ts-ignore
-    handlers[id] = instance.run.bind(instance)
-  } else {
-    console.warn(`Handler ${id} could not be registered - unsupported type`)
-  }
+  if (id in handlers)
+    console.warn(`Handler "${id}" has already been registered`)
+
+  handlers[id] = handler
 }
 
 export function getHandler(id: string): Function {
-  // @ts-ignore
   const handler = handlers[id] || null
   if (!handler) throw new Error(`Handler ${id} not registered`)
   return handler

package/src/utils/resolve.ts

@@ -1,21 +1,21 @@
 import Action, { ActionType } from '../action'
 import { MiddlewareType } from '../middleware'
 
-export function resolve(obj: ActionType) {
+export function resolve(obj: ActionType, id: string) {
   if (typeof obj === 'function' && obj?.length === 2)
     return [obj]
 
-  if (obj instanceof Action)
+  if (obj?.run)
     return obj.run()
 
   const instance = new (obj as new () => Action)()
-  if (Action.isPrototypeOf(obj))
+  if (obj?.prototype?.run)
     return instance.run()
 
   if (obj?.prototype?.handle)
     return [instance.handle]
 
-  throw new Error('Invalid action')
+  throw new Error(`Invalid action "${id}" - unsupported type`)
 }
 
 export function resolveMiddleware(obj: MiddlewareType) {