chore: wip

Author: chrisbbreuer

storage/framework/core/actions/src/helpers/utils.ts

@@ -17,12 +17,11 @@ import { Glob } from 'bun'
 export async function runAction(action: string, options?: ActionOptions) {
   // check if action is a file anywhere in ./app/Actions/**/*.ts
   // if it is, return and await the action
-  console.log('action', action)
   const glob = new Glob('**/*.ts')
   const scanOptions = { cwd: p.userActionsPath(), onlyFiles: true }
 
   for await (const file of glob.scan(scanOptions)) {
-    console.log('file', file)
+    log.debug('file', file)
     if (file === `${action}.ts` || file.endsWith(`${action}.ts`))
       return ((await import(p.userActionsPath(file))).default as Action).handle()
 

storage/framework/core/validation/src/rules.ts

@@ -1,6 +1,6 @@
 import { USD } from '@dinero.js/currencies'
-import vine from '@vinejs/vine'
 import { dinero as currency } from 'dinero.js'
+import { schema } from './validate'
 
 /**
  * Thanks to VineJS for the following types:
@@ -95,23 +95,22 @@ export interface ErrorReporterContract {
   report: (message: string, rule: string, field: FieldContext, args?: Record<string, any>) => any
 }
 
-export const isMoney = vine.createRule((value: unknown, _, field: FieldContext) => {
+export const isMoney = schema.createRule((value: unknown, _, field: FieldContext) => {
   /**
    * Convert string representation of a number to a JavaScript
    * Number data type.
    */
-  const asNumber = (value: unknown): number => {
-    const result = Number(value)
-    return Number.isNaN(result) ? 0 : result
-  }
-
-  const numericValue = asNumber(value)
+  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)
+    field.report(
+      'The {{ field }} field value must be a number',
+      'money',
+      field
+    )
     return
   }
 
@@ -124,4 +123,4 @@ export const isMoney = vine.createRule((value: unknown, _, field: FieldContext)
    * Mutate the field's value
    */
   field.mutate(amount, field)
-}) as any
+})

storage/framework/core/validation/src/types/money.ts

@@ -3,12 +3,15 @@ import { BaseLiteralType } from '@vinejs/vine'
 import type { FieldOptions, Validation } from '@vinejs/vine/types'
 import { isMoney } from '../rules'
 
-export class MoneyValidator extends BaseLiteralType<Money, Money> {
+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
+    return new MoneyValidator(
+      this.cloneOptions(),
+      this.cloneValidations()
+    ) as this
   }
 }

storage/framework/core/validation/src/validate.ts

@@ -5,9 +5,7 @@ import { MoneyValidator } from './types/money'
 export { schema, rule }
 
 // @ts-expect-error - investigate why this is not working
-Vine.macro('money', () => {
-  return new MoneyValidator()
-})
+Vine.macro('money', () => new MoneyValidator())
 
 type SchemaString = string
 type SchemaNumber = number
@@ -24,4 +22,4 @@ export const validate = {
 }
 
 export type { Infer } from '@vinejs/vine/types'
-export { VineString, VineBoolean, VineEnum, VineNumber } from '@vinejs/vine'
+export { VineString, VineBoolean, VineEnum, VineNumber, VineDate } from '@vinejs/vine'