@stacksjs/router 0.62.0 → 0.63.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/router",
   "type": "module",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "description": "The Stacks framework router.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -49,14 +49,14 @@
   },
   "peerDependencies": {
     "@stacksjs/config": "latest",
-    "unplugin-vue-router": "^0.10.0",
-    "vue-router": "^4.4.0"
+    "unplugin-vue-router": "^0.10.6",
+    "vue-router": "^4.4.3"
   },
   "dependencies": {
     "@stacksjs/config": "latest",
     "@stacksjs/logging": "latest",
-    "unplugin-vue-router": "^0.10.0",
-    "vue-router": "^4.4.0"
+    "unplugin-vue-router": "^0.10.6",
+    "vue-router": "^4.4.3"
   },
   "devDependencies": {
     "@stacksjs/development": "latest"

package/src/request.ts

@@ -103,7 +103,7 @@ export class Request implements RequestInstance {
   public bearerToken(): string | null {
     const authorizationHeader = this.headers.get('authorization')
 
-    if (authorizationHeader && authorizationHeader.startsWith('Bearer ')) {
+    if (authorizationHeader?.startsWith('Bearer ')) {
       return authorizationHeader.substring(7)
     }
 

package/src/router.ts

@@ -4,8 +4,7 @@ import { path as p, projectStoragePath, routesPath } from '@stacksjs/path'
 import { kebabCase, pascalCase } from '@stacksjs/strings'
 import type { Job } from '@stacksjs/types'
 import type { RedirectCode, Route, RouteGroupOptions, RouterInterface, StatusCode } from '@stacksjs/types'
-
-import { extractDynamicRequest, extractModelRequest } from './utils'
+import { extractDefaultRequest, extractModelRequest, findRequestInstance } from './utils'
 
 type ActionPath = string // TODO: narrow this by automating its generation
 
@@ -283,7 +282,9 @@ export class Router implements RouterInterface {
 
     let actionModule = null
 
-    if (modulePath.includes('OrmAction'))
+    if (modulePath.includes('storage/framework/orm')) actionModule = await import(`${modulePath}.ts`)
+    else if (modulePath.includes('app/Actions')) actionModule = await import(`${modulePath}.ts`)
+    else if (modulePath.includes('OrmAction'))
       actionModule = await import(importPathFunction(`/framework/orm/${modulePath}.ts`))
     else actionModule = await import(importPathFunction(`${modulePath}.ts`))
 
@@ -300,8 +301,15 @@ export class Router implements RouterInterface {
     // if fails, return validation error
     let requestInstance
 
-    if (modulePath.includes('OrmAction')) requestInstance = await extractModelRequest(modulePath)
-    else requestInstance = await extractDynamicRequest(modulePath)
+    console.log('actionModule', actionModule)
+
+    if (actionModule.default.requestFile) {
+      requestInstance = await findRequestInstance(actionModule.default.requestFile)
+    } else {
+      requestInstance = await extractDefaultRequest(modulePath)
+    }
+
+    console.log(actionModule.default.requestFile)
 
     try {
       return await actionModule.default.handle(requestInstance)

package/src/server.ts

@@ -3,7 +3,6 @@ import { log } from '@stacksjs/logging'
 import { getModelName } from '@stacksjs/orm'
 import { path, extname } from '@stacksjs/path'
 import { glob } from '@stacksjs/storage'
-import { camelCase, lowercase } from '@stacksjs/strings'
 import type { Model, Route, RouteParam, StatusCode } from '@stacksjs/types'
 import { route } from '.'
 import { middlewares } from './middleware'
@@ -130,8 +129,10 @@ function extractDynamicSegments(routePattern: string, path: string): RouteParam
   return dynamicSegments
 }
 
+type CallbackWithStatus = Route['callback'] & { status: number }
+
 async function execute(foundRoute: Route, req: Request, { statusCode }: Options) {
-  const foundCallback = await route.resolveCallback(foundRoute.callback)
+  const foundCallback: CallbackWithStatus = await route.resolveCallback(foundRoute.callback)
 
   const middlewarePayload = await executeMiddleware(foundRoute)
 
@@ -142,9 +143,9 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
   ) {
     const middlewareStatus = middlewarePayload.status
 
-    delete middlewarePayload.status
+    const { status, ...payloadWithoutStatus } = middlewarePayload
 
-    return await new Response(JSON.stringify(middlewarePayload), {
+    return await new Response(JSON.stringify(payloadWithoutStatus), {
       headers: {
         'Content-Type': 'json',
         'Access-Control-Allow-Origin': '*',
@@ -163,7 +164,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     return await noCache(response)
   }
 
-  if (foundRoute?.method !== req.method)
+  if (foundRoute?.method !== req.method) {
     return new Response('Method not allowed', {
       status: 405,
       headers: {
@@ -171,6 +172,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
         'Access-Control-Allow-Headers': '*',
       },
     })
+  }
 
   // Check if it's a path to an HTML file
   if (isString(foundCallback) && extname(foundCallback) === '.html') {
@@ -219,9 +221,9 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
 
   if (isObject(foundCallback) && foundCallback.status) {
     if (foundCallback.status === 401) {
-      delete foundCallback.status
+      const { status, ...rest } = foundCallback
 
-      return await new Response(JSON.stringify(foundCallback), {
+      return await new Response(JSON.stringify(rest), {
         headers: {
           'Content-Type': 'json',
           'Access-Control-Allow-Origin': '*',
@@ -232,8 +234,9 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     }
 
     if (foundCallback.status === 403) {
-      delete foundCallback.status
-      return await new Response(JSON.stringify(foundCallback), {
+      const { status, ...rest } = foundCallback
+
+      return await new Response(JSON.stringify(rest), {
         headers: {
           'Content-Type': 'json',
           'Access-Control-Allow-Origin': '*',
@@ -244,10 +247,9 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     }
 
     if (foundCallback.status === 422) {
-      // biome-ignore lint/performance/noDelete: <explanation>
-      delete foundCallback.status
+      const { status, ...rest } = foundCallback
 
-      return await new Response(JSON.stringify(foundCallback), {
+      return await new Response(JSON.stringify(rest), {
         headers: {
           'Content-Type': 'json',
           'Access-Control-Allow-Origin': '*',
@@ -258,19 +260,16 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
     }
 
     if (foundCallback.status === 500) {
-      delete foundCallback.status
-      return await new Response(JSON.stringify(foundCallback), {
-        headers: {
-          'Content-Type': 'json',
-          'Access-Control-Allow-Origin': '*',
-          'Access-Control-Allow-Headers': '*',
-        },
+      const { status, ...rest } = foundCallback
+
+      return await new Response(JSON.stringify(rest), {
+        headers: { 'Content-Type': 'json', 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Headers': '*' },
         status: 500,
       })
     }
   }
 
-  if (isObject(foundCallback))
+  if (isObject(foundCallback)) {
     return await new Response(JSON.stringify(foundCallback), {
       headers: {
         'Content-Type': 'json',
@@ -279,6 +278,7 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
       },
       status: 200,
     })
+  }
 
   // If no known type matched, return a generic error.
   return await new Response('Unknown callback type.', {
@@ -305,10 +305,9 @@ async function addRouteQuery(url: URL) {
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default
     const modelName = getModelName(model, modelFile)
-    const modelNameLower = `${camelCase(modelName)}Request`
-    const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`)
+    const requestPath = path.frameworkPath(`requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
-    const requestInstance = requestImport[modelNameLower]
+    const requestInstance = requestImport.request
 
     if (requestInstance) {
       requestInstance.addQuery(url)
@@ -324,10 +323,9 @@ async function addBody(params: any) {
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default
     const modelName = getModelName(model, modelFile)
-    const modelNameLower = `${camelCase(modelName)}Request`
-    const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`)
+    const requestPath = path.frameworkPath(`requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
-    const requestInstance = requestImport[modelNameLower]
+    const requestInstance = requestImport.request
 
     if (requestInstance) {
       requestInstance.addBodies(JSON.parse(params))
@@ -343,10 +341,9 @@ async function addRouteParam(param: RouteParam): Promise<void> {
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default as Model
     const modelName = getModelName(model, modelFile)
-    const modelNameLower = `${lowercase(modelName)}Request`
-    const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`)
+    const requestPath = path.frameworkPath(`requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
-    const requestInstance = requestImport[modelNameLower]
+    const requestInstance = requestImport.request
 
     if (requestInstance) {
       requestInstance.addParam(param)
@@ -362,10 +359,9 @@ async function addHeaders(headers: Headers): Promise<void> {
   for (const modelFile of modelFiles) {
     const model = (await import(modelFile)).default as Model
     const modelName = getModelName(model, modelFile)
-    const modelNameLower = `${lowercase(modelName)}Request`
-    const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`)
+    const requestPath = path.frameworkPath(`requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
-    const requestInstance = requestImport[modelNameLower]
+    const requestInstance = requestImport.request
 
     if (requestInstance) {
       requestInstance.addHeaders(headers)

package/src/utils.ts

@@ -1,6 +1,6 @@
 import { ok } from '@stacksjs/error-handling'
 import { path } from '@stacksjs/path'
-import { glob } from '@stacksjs/storage'
+import { existsSync } from '@stacksjs/storage'
 import { camelCase } from '@stacksjs/strings'
 import { route } from './router'
 
@@ -15,6 +15,14 @@ export async function listRoutes() {
 export function extractModelFromAction(action: string): string {
   let model = ''
 
+  if (action.includes('IndexOrmAction')) {
+    const match = action.match(/\/([A-Z][a-z]+)IndexOrmAction/)
+
+    const modelString = match ? match[1] : ''
+
+    model = modelString as string
+  }
+
   if (action.includes('StoreOrmAction')) {
     const match = action.match(/\/([A-Z][a-z]+)StoreOrmAction/)
 
@@ -60,7 +68,7 @@ export async function extractModelRequest(action: string) {
 
   const lowerCaseModel = camelCase(extractedModel)
 
-  const requestPath = path.projectStoragePath(`framework/requests/${extractedModel}Request.ts`)
+  const requestPath = path.frameworkPath(`requests/${extractedModel}Request.ts`)
 
   const requestInstance = await import(requestPath)
 
@@ -69,29 +77,36 @@ export async function extractModelRequest(action: string) {
   return requestInstance[requestIndex]
 }
 
-export async function extractDynamicRequest(action: string) {
-  const extractedModel = extractDynamicAction(action) || ''
+export async function findRequestInstance(requestInstance: string) {
+  const frameworkDirectory = path.projectStoragePath('framework/requests')
 
-  const lowerCaseModel = camelCase(extractedModel)
+  const filePath = path.join(frameworkDirectory, `${requestInstance}.ts`)
 
-  const modelFiles = glob.sync(path.userModelsPath('*.ts'))
+  const pathExists = await existsSync(filePath)
 
-  const fileToCheck = `${extractedModel}.ts`
+  // Check if the directory exists
+  if (pathExists) {
+    const requestInstance = await import(filePath)
 
-  const fileExists = modelFiles.some((file) => file.split('/').pop() === fileToCheck)
+    return requestInstance.request
+  }
+
+  const defaultRequestPath = path.projectStoragePath('framework/core/router/src/request.ts')
 
-  if (!fileExists) {
-    const requestPath = path.projectStoragePath(`framework/core/router/src/request.ts`)
-    const requestInstance = await import(requestPath)
+  const fileExists = await existsSync(defaultRequestPath)
+
+  if (fileExists) {
+    const requestInstance = await import(defaultRequestPath)
 
     return requestInstance.request
   }
 
-  const requestPath = path.projectStoragePath(`framework/requests/${extractedModel}Request.ts`)
+  return null
+}
 
+export async function extractDefaultRequest(action: string) {
+  const requestPath = path.frameworkPath(`core/router/src/request.ts`)
   const requestInstance = await import(requestPath)
 
-  const requestIndex = `${lowerCaseModel}Request`
-
-  return requestInstance[requestIndex]
+  return requestInstance.request
 }