@stacksjs/validation 0.61.24 → 0.63.0

package/package.json

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

package/src/rules.ts

@@ -1,7 +1,3 @@
-import { USD } from '@dinero.js/currencies'
-import { dinero as currency } from 'dinero.js'
-import { schema } from './schema'
-
 /**
  * Thanks to VineJS for the following types:
  *
@@ -94,29 +90,3 @@ export interface ErrorReporterContract {
    */
   report: (message: string, rule: string, field: FieldContext, args?: Record<string, any>) => any
 }
-
-export const isMoney = schema.createRule((value: unknown, _, field: FieldContext) => {
-  /**
-   * Convert string representation of a number to a JavaScript
-   * Number data type.
-   */
-  const numericValue = schema.helpers.asNumber(value)
-
-  /**
-   * Report error, if the value is NaN post-conversion
-   */
-  if (Number.isNaN(numericValue)) {
-    field.report('The {{ field }} field value must be a number', 'money', field)
-    return
-  }
-
-  /**
-   * Create amount type
-   */
-  const amount = currency({ amount: numericValue, currency: USD })
-
-  /**
-   * Mutate the field's value
-   */
-  field.mutate(amount, field)
-})

package/src/schema.ts

@@ -1,13 +1,9 @@
-import schema, { Vine } from '@vinejs/vine'
+import schema from '@vinejs/vine'
 import { SimpleMessagesProvider, errors as VineError } from '@vinejs/vine'
 import rule from 'validator'
-import { MoneyValidator } from './types/money'
 
 export { schema, rule, SimpleMessagesProvider, VineError }
 
-// @ts-expect-error - investigate why this is not working
-Vine.macro('money', () => new MoneyValidator())
-
 type SchemaString = string
 type SchemaNumber = number
 type SchemaBoolean = boolean

package/src/types/index.ts

@@ -1,4 +1,3 @@
-export * from './money'
 export {
   VineEnum as ValidationEnum,
   VineBoolean as ValidationBoolean,

package/src/validator.ts

@@ -1,32 +1,72 @@
-import { log } from '@stacksjs/cli'
 import { path } from '@stacksjs/path'
-import { Model } from '@stacksjs/types'
-import { SimpleMessagesProvider, VineError, reportError, schema } from '@stacksjs/validation'
+import { snakeCase } from '@stacksjs/strings'
+import type { Model } from '@stacksjs/types'
+import type { VineType } from '@stacksjs/types'
 import type { SchemaTypes } from '@vinejs/vine/types'
+import { SimpleMessagesProvider, VineError, reportError, schema } from './'
 
 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
+    if (Object.prototype.hasOwnProperty.call(attributes, key)) {
+      ruleObject[snakeCase(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)
+
+    throw { status: 422, errors: error.messages }
+  }
+}
 
-        messageObject[validatorMessageString] = model.attributes[key].validator.message[validatorMessageKey]
+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 (Object.prototype.hasOwnProperty.call(attributes, 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 +80,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 }
   }
 }

package/src/types/money.ts

@@ -1,14 +0,0 @@
-import type { Money } from '@stacksjs/types'
-import { BaseLiteralType } from '@vinejs/vine'
-import type { FieldOptions, Validation } from '@vinejs/vine/types'
-import { isMoney } from '../rules'
-
-export class MoneyValidator extends BaseLiteralType<string, Money, Money> {
-  constructor(options?: FieldOptions, validations?: Validation<any>[]) {
-    super(options, validations || [isMoney()])
-  }
-
-  clone() {
-    return new MoneyValidator(this.cloneOptions(), this.cloneValidations()) as this
-  }
-}