@codeleap/form 5.4.1 → 5.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/form",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "main": "src/index.ts",
   "license": "UNLICENSED",
   "repository": {
@@ -9,9 +9,9 @@
     "directory": "packages/form"
   },
   "devDependencies": {
-    "@codeleap/config": "5.4.1",
-    "@codeleap/types": "5.4.1",
-    "@codeleap/store": "5.4.1",
+    "@codeleap/config": "5.4.2",
+    "@codeleap/types": "5.4.2",
+    "@codeleap/store": "5.4.2",
     "zod": "3.23.8",
     "ts-node-dev": "1.1.8"
   },
@@ -20,9 +20,9 @@
     "playground": "bun src/test.ts"
   },
   "peerDependencies": {
-    "@codeleap/types": "5.4.1",
-    "@codeleap/store": "5.4.1",
-    "@codeleap/logger": "5.4.1",
+    "@codeleap/types": "5.4.2",
+    "@codeleap/store": "5.4.2",
+    "@codeleap/logger": "5.4.2",
     "zod": "*",
     "react": "18.2.0",
     "typescript": "5.5.2",

package/package.json.bak

@@ -1,6 +1,6 @@
 {
   "name": "@codeleap/form",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "main": "src/index.ts",
   "license": "UNLICENSED",
   "repository": {

package/src/fields/date.ts

@@ -2,6 +2,7 @@ import { Field } from "../lib/Field"
 import { z } from 'zod'
 import { FieldOptions, Validator } from "../types"
 import { zodValidator } from "../validators"
+import dayjs from 'dayjs'
 
 export type DateValidator<R = any, Err = any> = Validator<Date, R, Err>
 
@@ -10,13 +11,42 @@ type DateFieldOptions<Validate extends DateValidator> = FieldOptions<Date, Valid
   maximumDate?: Date
 }
 
+function normalizeToDate(val: unknown): Date | undefined {
+  if (!val) return undefined
+
+  if (val instanceof Date) return val
+  if (dayjs.isDayjs(val)) return val.startOf('day').toDate()
+  if (typeof val === 'string') {
+    const parsed = dayjs(val)
+    return parsed.isValid() ? parsed.startOf('day').toDate() : undefined
+  }
+
+  return undefined
+}
+
 export class DateField<Validate extends DateValidator> extends Field<Date, Validate> {
   _type = "DATE"
 
   constructor(options: DateFieldOptions<Validate>) {
+    const { minimumDate, maximumDate, ...rest } = options
+
+    const schema = z.preprocess((val: unknown) => {
+      const normalized = normalizeToDate(val)
+
+      if (!normalized || isNaN(normalized.getTime())) return undefined
+      return normalized
+    }, z.date()
+      .refine(d => !minimumDate || d >= minimumDate, {
+        message: `Date must be on or after ${minimumDate?.toDateString()}`,
+      })
+      .refine(d => !maximumDate || d <= maximumDate, {
+        message: `Date must be on or before ${maximumDate?.toDateString()}`,
+      })
+    )
+
     super({
-      validate: zodValidator(z.date()) as unknown as Validate,
-      ...options
+      validate: zodValidator(schema) as unknown as Validate,
+      ...options,
     })
   }
 }