chore: wip

Author: glennmichael123

app/Actions/Cms/CategorizableStoreAction.ts

@@ -1,15 +1,29 @@
-import type { CategorizableRequestType } from '@stacksjs/types'
+import type { RequestInstance } from '@stacksjs/types'
 import { Action } from '@stacksjs/actions'
 import { categorizable } from '@stacksjs/cms'
 import { response } from '@stacksjs/router'
+import { schema } from '@stacksjs/validation'
 
 export default new Action({
   name: 'Category Store',
   description: 'Category Store ORM Action',
   method: 'POST',
-  async handle(request: CategorizableRequestType) {
-    await request.validate()
-
+  async handle(request: RequestInstance) {
+    await request.validate({
+      name: {
+        rule: schema.string(),
+        message: {
+          name: 'Name is required',
+        },
+      },
+      description: {
+        rule: schema.string(),
+        message: {
+          description: 'Description is required',
+        },
+      },
+      
+    })
     const data = {
       name: request.get('name'),
       description: request.get('description'),

storage/framework/core/router/src/request.ts

@@ -1,3 +1,4 @@
+import { HttpError } from '@stacksjs/error-handling'
 import type { AuthToken, CustomAttributes, NumericField, RequestData, RequestInstance, RouteParam, RouteParams } from '@stacksjs/types'
 
 import { customValidate, validateField } from '@stacksjs/validation'
@@ -76,7 +77,7 @@ export class Request<T extends RequestData = RequestData> implements RequestInst
 
   public async validate(attributes?: CustomAttributes): Promise<void> {
     if (attributes === undefined || attributes === null)
-      throw new Error('Attributes are required')
+      throw new HttpError(422, 'Attributes are required')
     else
       await customValidate(attributes, this.all())
   }

storage/framework/core/router/src/router.ts

@@ -351,6 +351,7 @@ export class Router implements RouterInterface {
 
     this.logError(error)
 
+    
     // Return structured error response
     if (error.status === 422) {
       return { status: 422, body: JSON.parse(error.message), stack: stackTrace }

storage/framework/core/router/src/server.ts

@@ -15,6 +15,7 @@ import { middlewares } from './middleware'
 
 import { request as RequestParam } from './request'
 import { traitInterfaces } from '@stacksjs/orm'
+import { camelCase } from '@stacksjs/strings'
 
 // const limiter = new RateLimiter({
 //   windowMs: 15 * 60 * 1000, // 15 minutes
@@ -308,12 +309,13 @@ async function execute(foundRoute: Route, req: Request, { statusCode }: Options)
         status: 403,
       })
     }
-
+   
     if (foundCallback.status === 422) {
       const { status, ...rest } = await foundCallback
 
-      const { errors } = rest
-      return new Response(JSON.stringify(errors), {
+      const { body } = rest
+
+      return new Response(JSON.stringify(body), {
         headers: {
           'Content-Type': 'application/json',
           'Access-Control-Allow-Origin': '*',
@@ -390,7 +392,7 @@ async function applyToAllRequests(operation: 'addBodies' | 'addParam' | 'addHead
     const modelName = getModelName(model, modelFile)
     const requestPath = path.frameworkPath(`requests/${modelName}Request.ts`)
     const requestImport = await import(requestPath)
-    const requestInstance = requestImport.request
+    const requestInstance = requestImport[`${camelCase(modelName)}Request`]
 
     if (requestInstance) {
       requestInstance[operation](data)
@@ -402,7 +404,7 @@ async function applyToAllRequests(operation: 'addBodies' | 'addParam' | 'addHead
     const requestPath = path.frameworkPath(`requests/${trait.name}Request.ts`)
     try {
       const requestImport = await import(requestPath)
-      const requestInstance = requestImport.request
+      const requestInstance = requestImport[`${camelCase(trait.name)}Request`]
 
       if (requestInstance) {
         requestInstance[operation](data)

storage/framework/core/router/src/utils.ts

@@ -78,7 +78,7 @@ export async function findRequestInstance(requestInstance: string): Promise<Mode
 
   const reqInstance = await import(filePath)
 
-  return reqInstance.request
+  return reqInstance[camelCase(requestInstance)]
 }
 
 export async function extractDefaultRequest(): Promise<RequestInstance> {