@stacksjs/validation 0.63.1 → 0.64.1

package/package.json

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

package/src/validator.ts

@@ -6,23 +6,22 @@ import type { SchemaTypes } from '@vinejs/vine/types'
 import { SimpleMessagesProvider, VineError, reportError, schema } from './'
 
 interface RequestData {
-  [key: string]: string | number | null | undefined | boolean
-}
-
-interface ValidationType {
-  rule: VineType
-  message: { [key: string]: string }
+  [key: string]: any
 }
 
 interface ValidationField {
-  [key: string]: string | ValidationType
-  validation: ValidationType
+  rule: VineType
+  message: Record<string, string>
 }
 
 interface CustomAttributes {
   [key: string]: ValidationField
 }
 
+export function isObjectNotEmpty(obj: object): boolean {
+  return Object.keys(obj).length > 0
+}
+
 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
@@ -61,12 +60,14 @@ export async function customValidate(attributes: CustomAttributes, params: Reque
 
   for (const key in attributes) {
     if (Object.prototype.hasOwnProperty.call(attributes, key)) {
-      ruleObject[key] = attributes[key]?.validation?.rule
-      const validatorMessages = attributes[key]?.validation?.message
+      const rule = attributes[key]?.rule
+      if (rule) ruleObject[key] = rule as SchemaTypes
+
+      const validatorMessages = attributes[key]?.message
 
       for (const validatorMessageKey in validatorMessages) {
         const validatorMessageString = `${key}.${validatorMessageKey}`
-        messageObject[validatorMessageString] = attributes[key]?.validation?.message[validatorMessageKey] || ''
+        messageObject[validatorMessageString] = attributes[key]?.message[validatorMessageKey] || ''
       }
     }
   }