@stacksjs/validation 0.62.0 → 0.63.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/validation",
   "type": "module",
-  "version": "0.62.0",
+  "version": "0.63.1",
   "description": "The Stacks Validation ways.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -47,11 +47,6 @@
     "typecheck": "bun --bun tsc --noEmit",
     "prepublishOnly": "bun run build"
   },
-  "peerDependencies": {
-    "@stacksjs/strings": "latest",
-    "@stacksjs/types": "latest",
-    "@vinejs/vine": "^2.1.0"
-  },
   "dependencies": {
     "@stacksjs/strings": "latest",
     "@stacksjs/types": "latest",

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,9 +1,10 @@
-import { log } from '@stacksjs/cli'
 import { path } from '@stacksjs/path'
+import { snakeCase } from '@stacksjs/strings'
 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'
+import { SimpleMessagesProvider, VineError, reportError, schema } from './'
+
 interface RequestData {
   [key: string]: string | number | null | undefined | boolean
 }
@@ -30,8 +31,8 @@ export async function validateField(modelFile: string, params: RequestData): Pro
   const messageObject: Record<string, string> = {}
 
   for (const key in attributes) {
-    if (attributes.hasOwnProperty(key)) {
-      ruleObject[key] = attributes[key]?.validation?.rule
+    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) {
@@ -59,7 +60,7 @@ export async function customValidate(attributes: CustomAttributes, params: Reque
   const messageObject: Record<string, string> = {}
 
   for (const key in attributes) {
-    if (attributes.hasOwnProperty(key)) {
+    if (Object.prototype.hasOwnProperty.call(attributes, key)) {
       ruleObject[key] = attributes[key]?.validation?.rule
       const validatorMessages = attributes[key]?.validation?.message
 

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
-  }
-}