@stacksjs/validation 0.61.24 → 0.62.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/validation",
   "type": "module",
-  "version": "0.61.24",
+  "version": "0.62.0",
   "description": "The Stacks Validation ways.",
   "author": "Chris Breuer",
   "license": "MIT",

package/src/validator.ts

@@ -1,32 +1,71 @@
 import { log } from '@stacksjs/cli'
 import { path } from '@stacksjs/path'
-import { Model } from '@stacksjs/types'
+import type { Model } from '@stacksjs/types'
+import type { VineType } from '@stacksjs/types'
 import { SimpleMessagesProvider, VineError, reportError, schema } from '@stacksjs/validation'
 import type { SchemaTypes } from '@vinejs/vine/types'
-
 interface RequestData {
   [key: string]: string | number | null | undefined | boolean
 }
 
-export async function validateField(modelFile: string, params: RequestData): Promise<void> {
-  const model = (await import(path.userModelsPath(modelFile))).default
+interface ValidationType {
+  rule: VineType
+  message: { [key: string]: string }
+}
+
+interface ValidationField {
+  [key: string]: string | ValidationType
+  validation: ValidationType
+}
+
+interface CustomAttributes {
+  [key: string]: ValidationField
+}
 
+export async function validateField(modelFile: string, params: RequestData): Promise<any> {
+  const model = (await import(/* @vite-ignore */ path.userModelsPath(`${modelFile}.ts`))).default as Model
   const attributes = model.attributes
 
   const ruleObject: Record<string, SchemaTypes> = {}
   const messageObject: Record<string, string> = {}
 
   for (const key in attributes) {
-    // biome-ignore lint/suspicious/noPrototypeBuiltins: <explanation>
     if (attributes.hasOwnProperty(key)) {
-      ruleObject[key] = model.attributes[key].validator.rule
-
-      const validatorMessages = model.attributes[key].validator.message
+      ruleObject[key] = attributes[key]?.validation?.rule
+      const validatorMessages = attributes[key]?.validation?.message
 
       for (const validatorMessageKey in validatorMessages) {
         const validatorMessageString = `${key}.${validatorMessageKey}`
+        messageObject[validatorMessageString] = attributes[key]?.validation?.message[validatorMessageKey] || ''
+      }
+    }
+  }
+
+  schema.messagesProvider = new SimpleMessagesProvider(messageObject)
+
+  try {
+    const vineSchema = schema.object(ruleObject)
+    const validator = schema.compile(vineSchema)
+    await validator.validate(params)
+  } catch (error: any) {
+    if (error instanceof VineError.E_VALIDATION_ERROR) reportError(error.messages)
 
-        messageObject[validatorMessageString] = model.attributes[key].validator.message[validatorMessageKey]
+    throw { status: 422, errors: error.messages }
+  }
+}
+
+export async function customValidate(attributes: CustomAttributes, params: RequestData): Promise<any> {
+  const ruleObject: Record<string, SchemaTypes> = {}
+  const messageObject: Record<string, string> = {}
+
+  for (const key in attributes) {
+    if (attributes.hasOwnProperty(key)) {
+      ruleObject[key] = attributes[key]?.validation?.rule
+      const validatorMessages = attributes[key]?.validation?.message
+
+      for (const validatorMessageKey in validatorMessages) {
+        const validatorMessageString = `${key}.${validatorMessageKey}`
+        messageObject[validatorMessageString] = attributes[key]?.validation?.message[validatorMessageKey] || ''
       }
     }
   }
@@ -40,7 +79,6 @@ export async function validateField(modelFile: string, params: RequestData): Pro
   } catch (error: any) {
     if (error instanceof VineError.E_VALIDATION_ERROR) reportError(error.messages)
 
-    log.info(error.message)
-    throw error
+    throw { status: 422, errors: error.messages }
   }
 }