From ac276400eb5092fbefc9a4830621cd0664285dff Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Mon, 3 Nov 2025 22:30:27 +0100
Subject: [PATCH] Improves number validation

---
 .changeset/fresh-windows-study.md                      |  5 +++++
 .../src/components/OmegaForm/OmegaInternalInput.vue    |  8 ++++++--
 .../stories/OmegaForm/SimpleFormVuetifyDefault.vue     | 10 +++-------
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/fresh-windows-study.md

diff --git a/.changeset/fresh-windows-study.md b/.changeset/fresh-windows-study.md
new file mode 100644
index 0000000000..b06cec5b3d
--- /dev/null
+++ b/.changeset/fresh-windows-study.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/vue-components": patch
+---
+
+Improves number validation
diff --git a/packages/vue-components/src/components/OmegaForm/OmegaInternalInput.vue b/packages/vue-components/src/components/OmegaForm/OmegaInternalInput.vue
index be3044a1e6..e77fda2d52 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaInternalInput.vue
+++ b/packages/vue-components/src/components/OmegaForm/OmegaInternalInput.vue
@@ -154,8 +154,12 @@ const inputProps: ComputedRef<InputProps<From, Name>> = computed(() => ({
     required: isRequired.value,
     minLength: props.meta?.type === "string" && props.meta?.minLength,
     maxLength: props.meta?.type === "string" && props.meta?.maxLength,
-    max: props.meta?.type === "number" && (props.meta?.maximum || props.meta?.exclusiveMaximum),
-    min: props.meta?.type === "number" && (props.meta?.minimum || props.meta?.exclusiveMinimum),
+    max: props.meta?.type === "number"
+      && (props.meta?.maximum
+        ?? (typeof props.meta?.exclusiveMaximum === "number" && props.meta.exclusiveMaximum - 1)),
+    min: props.meta?.type === "number"
+      && (props.meta?.minimum
+        ?? (typeof props.meta?.exclusiveMinimum === "number" && props.meta.exclusiveMinimum + 1)),
     errorMessages: errors.value,
     error: !!errors.value.length,
     type: fieldType.value,
diff --git a/packages/vue-components/stories/OmegaForm/SimpleFormVuetifyDefault.vue b/packages/vue-components/stories/OmegaForm/SimpleFormVuetifyDefault.vue
index 9615136f39..c431feeae3 100644
--- a/packages/vue-components/stories/OmegaForm/SimpleFormVuetifyDefault.vue
+++ b/packages/vue-components/stories/OmegaForm/SimpleFormVuetifyDefault.vue
@@ -1,10 +1,6 @@
 <template>
   <form.Form :subscribe="['values']">
     <template #default="{ subscribedValues: { values } }">
-      <form.Input
-        label="aString"
-        name="aString"
-      />
       <form.Input
         label="bString"
         name="bString"
@@ -22,11 +18,11 @@ import { S } from "effect-app"
 import { useOmegaForm } from "../../src"
 
 const schema = S.Struct({
-  aString: S.NullOr(S.NonEmptyString255).withDefault,
-  bString: S.NullOr(S.NonEmptyString255).withDefault
+  bString: S.PositiveNumber.pipe(S.withDefaultConstructor(() => S.PositiveNumber(2.0)))
+  // aString: S.NullOr(S.NonEmptyString).withDefault
 })
 const defaultValues = {
-  aString: ""
+  bString: -2
 }
 const form = useOmegaForm(schema, {
   onSubmit: async (values) => {