@stacksjs/router 0.61.20 → 0.61.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/router",
   "type": "module",
-  "version": "0.61.20",
+  "version": "0.61.21",
   "description": "The Stacks framework router.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -49,13 +49,13 @@
   },
   "peerDependencies": {
     "@stacksjs/config": "latest",
-    "unplugin-vue-router": "^0.8.8",
+    "unplugin-vue-router": "^0.9.0",
     "vue-router": "^4.3.2"
   },
   "dependencies": {
     "@stacksjs/config": "latest",
     "@stacksjs/logging": "latest",
-    "unplugin-vue-router": "^0.8.8",
+    "unplugin-vue-router": "^0.9.0",
     "vue-router": "^4.3.2"
   },
   "devDependencies": {

package/src/request.ts

@@ -1,4 +1,4 @@
-import type { RouteParam } from '@stacksjs/types'
+import type { RequestInstance, RouteParam } from "@stacksjs/types"
 
 interface RequestData {
   [key: string]: string
@@ -6,7 +6,7 @@ interface RequestData {
 
 type RouteParams = { [key: string]: string } | null
 
-export class Request {
+export class Request implements RequestInstance{
   private static instance: Request
   private query: RequestData = {}
   private params: RouteParams = null
@@ -62,6 +62,6 @@ export class Request {
     const value = this.params ? this.params[key] || null : null
     return value ? Number.parseInt(value) : null
   }
-}
+} 
 
 export const request = new Request()

package/src/router.ts

@@ -3,8 +3,11 @@ import { log } from '@stacksjs/logging'
 import { path as p, projectStoragePath, routesPath } from '@stacksjs/path'
 import { kebabCase, pascalCase } from '@stacksjs/strings'
 import type { Job } from '@stacksjs/types'
+import { request } from '@stacksjs/router'
 import type { RedirectCode, Route, RouteGroupOptions, RouterInterface, StatusCode } from '@stacksjs/types'
 
+import { extractModelRequest } from './utils'
+
 type ActionPath = string // TODO: narrow this by automating its generation
 
 export class Router implements RouterInterface {
@@ -93,6 +96,8 @@ export class Router implements RouterInterface {
   }
 
   public async action(path: ActionPath | Route['path']): Promise<this> {
+    if (!path) return this
+
     // check if action is a file anywhere in ./app/Actions/**/*.ts
     if (path?.endsWith('.ts')) {
       // given it ends with .ts, we treat it as an Actions path
@@ -102,22 +107,15 @@ export class Router implements RouterInterface {
     }
 
     path = pascalCase(path) // actions are PascalCase
-    const userActionsPath = p.userActionsPath(`${path}.ts`)
 
     try {
-      const action = (await import(userActionsPath)).default as Action
+      const action = (await import(p.userActionsPath(`${path}.ts`))).default as Action
 
       return this.addRoute(action.method ?? 'GET', this.prepareUri(path), action.handle, 200)
     } catch (error) {
-      try {
-        const action = (await import(p.userActionsPath(`${path}.ts`))).default as Action
-
-        return this.addRoute(action.method ?? 'GET', this.prepareUri(path), action.handle, 200)
-      } catch (error) {
-        log.error(`Could not find Action for path: ${path}`)
+      log.error(`Could not find Action for path: ${path}`)
 
-        return this
-      }
+      return this
     }
   }
 
@@ -304,9 +302,9 @@ export class Router implements RouterInterface {
     // if succeeds, run the handle
     // if fails, return validation error
 
-    if (condition) return await actionModule.default.handle()
-
-    return await actionModule.default.handle(request)
+    const requestInstance = await extractModelRequest(modulePath)
+    
+    return await actionModule.default.handle(requestInstance)
   }
 
   private normalizePath(path: string): string {

package/src/server.ts

@@ -1,10 +1,13 @@
 import process from 'node:process'
 import { log } from '@stacksjs/logging'
-import { extname } from '@stacksjs/path'
-import type { Route, RouteParam, StatusCode } from '@stacksjs/types'
+import { extname, path } from '@stacksjs/path'
+import { glob } from '@stacksjs/storage'
+import type { Model, Route, RouteParam, StatusCode } from '@stacksjs/types'
 import { route } from '.'
 import { middlewares } from './middleware'
 import { request as RequestParam } from './request'
+import { getModelName } from '@stacksjs/orm'
+import { lowercase } from '@stacksjs/strings'
 
 interface ServeOptions {
   host?: string
@@ -71,8 +74,8 @@ export async function serverResponse(req: Request) {
 
   const routeParams = extractDynamicSegments(foundRoute.uri, url.pathname)
 
-  addRouteQuery(url)
-  addRouteParam(routeParams)
+  await addRouteQuery(url)
+  await addRouteParam(routeParams)
 
   await executeMiddleware(foundRoute)
 
@@ -146,13 +149,43 @@ function noCache(response: Response) {
   return response
 }
 
-function addRouteQuery(url: URL): void {
-  if (!isObjectNotEmpty(url.searchParams)) RequestParam.addQuery(url)
+async function addRouteQuery(url: URL) {
+  const modelFiles = glob.sync(path.userModelsPath('*.ts'));
 
-  // requestInstance.extractParamsFromRoute(route.uri, url.pathname)
+  for (const modelFile of modelFiles) {
+    const model = (await import(modelFile)).default;
+    const modelName = getModelName(model, modelFile);
+    const modelNameLower = `${lowercase(modelName)}Request`;
+    const requestPath = path.projectStoragePath(`framework/requests/${modelName}Request.ts`);
+    const requestImport = await import(requestPath);
+    const requestInstance = requestImport[modelNameLower];
+
+    if (requestInstance && !isObjectNotEmpty(url.searchParams)) {
+      requestInstance.addQuery(url);
+    }
+  }
+
+  if (!isObjectNotEmpty(url.searchParams)) {
+    RequestParam.addQuery(url);
+  }
 }
 
-function addRouteParam(param: RouteParam): void {
+async function addRouteParam(param: RouteParam): Promise<void> {
+  const modelFiles = glob.sync(path.userModelsPath('*.ts'));
+
+  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 requestImport = await import(requestPath);
+    const requestInstance = requestImport[modelNameLower];
+
+    if (requestInstance) {
+      requestInstance.addParam(param);
+    }
+  }
+
   RequestParam.addParam(param)
 }
 

package/src/utils.ts

@@ -1,4 +1,8 @@
+import { ok } from '@stacksjs/error-handling'
 import { route } from './router'
+import { path } from '@stacksjs/path'
+
+import { lowercase } from '@stacksjs/strings'
 
 export async function listRoutes() {
   const routeLists = await route.getRoutes()
@@ -7,3 +11,52 @@ export async function listRoutes() {
 
   return ok('Successfully listed routes!')
 }
+
+export function extractModelFromAction(action: string): string {
+  let model = ''
+
+  if (action.includes("StoreOrmAction")) {
+    const match = action.match(/\/([A-Z][a-z]+)StoreOrmAction/);
+
+    const modelString = match ? match[1] : '';
+  
+    model = modelString as string
+  }
+
+  if (action.includes("ShowOrmAction")) {
+    const match = action.match(/\/([A-Z][a-z]+)ShowOrmAction/);
+    const modelString = match ? match[1] : '';
+  
+    model = modelString as string
+  }
+
+  if (action.includes("UpdateOrmAction")) {
+    const match = action.match(/\/([A-Z][a-z]+)UpdateOrmAction/);
+    const modelString = match ? match[1] : '';
+  
+    model = modelString as string
+  }
+
+  if (action.includes("DestroyOrmAction")) {
+    const match = action.match(/\/([A-Z][a-z]+)DestroyOrmAction/);
+    const modelString = match ? match[1] : '';
+  
+    model = modelString as string
+  }
+
+  return model
+}
+
+export async function extractModelRequest(action: string) {
+  const extractedModel = extractModelFromAction(action)
+
+  const lowerCaseModel = lowercase(extractedModel)
+
+  const requestPath = path.projectStoragePath(`framework/requests/${extractedModel}Request.ts`)
+
+  const requestInstance = await import(requestPath)
+
+  const requestIndex = `${lowerCaseModel}Request`
+  
+  return requestInstance[requestIndex]
+}