From 6f211153f35220f3e6658d1da7a9a5433f8a43c2 Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Mon, 20 Oct 2025 15:43:56 +0200
Subject: [PATCH 1/6] refactor: Enhance input name

---
 .../src/components/OmegaForm/OmegaFormStuff.ts       | 12 ++++++++++--
 .../vue-components/stories/OmegaForm/SimpleForm.vue  |  8 ++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
index ca279d02fb..b47e4ba242 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
+++ b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
@@ -7,11 +7,19 @@ import { getTransformationFrom, useIntl } from "../../utils"
 import { type OmegaFieldInternalApi } from "./InputProps"
 import { type OF, type OmegaFormReturn } from "./useOmegaForm"
 
-export type BaseProps<From, TName extends DeepKeys<From>> = {
+type Leaves<T, Path extends string = ""> = T extends ReadonlyArray<infer U>
+  ? Leaves<U, `${Path extends "" ? "" : `${Path}`}[number]`> & {}
+  : {
+    [K in keyof T]: T[K] extends string | boolean | number | null | undefined | symbol | bigint
+      ? `${Path extends "" ? "" : `${Path}.`}${K & string}`
+      : Leaves<T[K], `${Path extends "" ? "" : `${Path}.`}${K & string}`> & {}
+  }[keyof T]
+
+export type BaseProps<From, TName extends DeepKeys<From> = DeepKeys<From>> = {
   /** Will fallback to i18n when not specified */
   label?: string
   validators?: FieldValidators<From>
-  name: TName
+  name: TName & Leaves<From>
 }
 
 export type TypesWithOptions = "radio" | "select" | "multiple" | "autocomplete" | "autocompletemultiple"
diff --git a/packages/vue-components/stories/OmegaForm/SimpleForm.vue b/packages/vue-components/stories/OmegaForm/SimpleForm.vue
index 5c51256b82..3d78540075 100644
--- a/packages/vue-components/stories/OmegaForm/SimpleForm.vue
+++ b/packages/vue-components/stories/OmegaForm/SimpleForm.vue
@@ -4,7 +4,7 @@
       <div>values: {{ values }} {{ isDirty }}</div>
       <form.Input
         label="asder2"
-        name="asder2"
+        name="asder2.value"
       >
         <template #default="{ field, label, state }">
           <label :for="field.name">{{ label }}</label>
@@ -28,7 +28,11 @@
 import { S } from "effect-app"
 import { useOmegaForm } from "../../src/components/OmegaForm"
 
-const schema = S.Struct({ asder2: S.String })
+const schema = S.Struct({
+  asder2: S.Struct({
+    value: S.String
+  })
+})
 const form = useOmegaForm(schema, {
   onSubmit: async ({ value }) => {
     console.log(value)

From 76a900e7982e79c7f02629a038a901adf4e5a0e1 Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Mon, 20 Oct 2025 15:46:14 +0200
Subject: [PATCH 2/6] refactor: Add 'name' property to OmegaInputProps
 interface

---
 .../src/components/OmegaForm/useOmegaForm.ts         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
index e29468877b..9d70ea7d08 100644
--- a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
+++ b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
@@ -234,10 +234,14 @@ export interface OmegaFormReturn<
             >,
             never
           >
-          & (Omit<OmegaInputProps<From, To>, "validators" | "options" | "label" | "type" | "items" | "form"> & {
-            defaultItems?: DeepValue<From, DeepKeys<From>>
-            items?: "please use `defaultItems` instead"
-          })
+          & (
+            & Omit<OmegaInputProps<From, To>, "validators" | "options" | "label" | "type" | "items" | "form" | "name">
+            & {
+              name: DeepKeys<From>
+              defaultItems?: DeepValue<From, DeepKeys<From>>
+              items?: "please use `defaultItems` instead"
+            }
+          )
           & {}
         >
         & import("vue").PublicProps

From 11d597239c387deb055e6182148a4351c237a6b0 Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Mon, 20 Oct 2025 16:06:11 +0200
Subject: [PATCH 3/6] refactor: fixes array path handling in BaseProps

---
 .../src/components/OmegaForm/OmegaFormStuff.ts             | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
index b47e4ba242..aff6c8f6f4 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
+++ b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
@@ -15,11 +15,16 @@ type Leaves<T, Path extends string = ""> = T extends ReadonlyArray<infer U>
       : Leaves<T[K], `${Path extends "" ? "" : `${Path}.`}${K & string}`> & {}
   }[keyof T]
 
+// Helper type to make array indices flexible - accepts both [number] and numeric literals [0], [1], etc.
+type FlexibleArrayPath<T extends string> = T extends `${infer Before}[number]${infer After}`
+  ? T | `${Before}[${number}]${FlexibleArrayPath<After>}`
+  : T
+
 export type BaseProps<From, TName extends DeepKeys<From> = DeepKeys<From>> = {
   /** Will fallback to i18n when not specified */
   label?: string
   validators?: FieldValidators<From>
-  name: TName & Leaves<From>
+  name: TName & FlexibleArrayPath<Leaves<From>>
 }
 
 export type TypesWithOptions = "radio" | "select" | "multiple" | "autocomplete" | "autocompletemultiple"

From 9f54fe739cfd84dbbdec114370e48745f9c1c37e Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Mon, 20 Oct 2025 16:10:27 +0200
Subject: [PATCH 4/6] simplify

---
 .../vue-components/src/components/OmegaForm/OmegaFormStuff.ts  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
index aff6c8f6f4..980b832a32 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
+++ b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
@@ -7,8 +7,7 @@ import { getTransformationFrom, useIntl } from "../../utils"
 import { type OmegaFieldInternalApi } from "./InputProps"
 import { type OF, type OmegaFormReturn } from "./useOmegaForm"
 
-type Leaves<T, Path extends string = ""> = T extends ReadonlyArray<infer U>
-  ? Leaves<U, `${Path extends "" ? "" : `${Path}`}[number]`> & {}
+type Leaves<T, Path extends string = ""> = T extends ReadonlyArray<infer U> ? Leaves<U, `${Path}[number]`> & {}
   : {
     [K in keyof T]: T[K] extends string | boolean | number | null | undefined | symbol | bigint
       ? `${Path extends "" ? "" : `${Path}.`}${K & string}`

From c472a606c9a549b7e3c3fdb5138e0c1fc7f43b9c Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Mon, 20 Oct 2025 16:26:23 +0200
Subject: [PATCH 5/6] refactor: streamline OmegaArray and OmegaInput props
 handling

---
 .../src/components/OmegaForm/OmegaArray.vue     | 15 +++------------
 .../src/components/OmegaForm/OmegaFormStuff.ts  | 17 ++++++++++++++++-
 .../src/components/OmegaForm/OmegaInput.vue     | 12 ++++++++----
 .../src/components/OmegaForm/useOmegaForm.ts    | 11 ++---------
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/packages/vue-components/src/components/OmegaForm/OmegaArray.vue b/packages/vue-components/src/components/OmegaForm/OmegaArray.vue
index a7777246df..7aeede001d 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaArray.vue
+++ b/packages/vue-components/src/components/OmegaForm/OmegaArray.vue
@@ -48,20 +48,11 @@
   To extends Record<PropertyKey, any>
 "
 >
-import { type DeepKeys, type DeepValue } from "@tanstack/vue-form"
+import { type DeepKeys } from "@tanstack/vue-form"
 import { computed, onMounted, provide } from "vue"
-import { type OmegaInputProps } from "./OmegaFormStuff"
+import { type OmegaArrayProps } from "./OmegaFormStuff"
 
-const props = defineProps<
-  Omit<
-    OmegaInputProps<From, To>,
-    "validators" | "options" | "label" | "type" | "items"
-  > & {
-    defaultItems?: DeepValue<From, DeepKeys<From>>
-    // deprecated items, caused bugs in state update, use defaultItems instead. It's not a simple Never, because Volar explodes
-    items?: "please use `defaultItems` instead"
-  }
->()
+const props = defineProps<OmegaArrayProps<From, To>>()
 
 defineOptions({
   inheritAttrs: false
diff --git a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
index 980b832a32..8831cbbbac 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
+++ b/packages/vue-components/src/components/OmegaForm/OmegaFormStuff.ts
@@ -1,7 +1,7 @@
 import { type Effect, Option, type Record, S } from "effect-app"
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { getMetadataFromSchema } from "@effect-app/vue/form"
-import { type DeepKeys, type FieldAsyncValidateOrFn, type FieldValidateOrFn, type FormApi, type FormAsyncValidateOrFn, type FormOptions, type FormState, type FormValidateOrFn, type StandardSchemaV1, type VueFormApi } from "@tanstack/vue-form"
+import { type DeepKeys, type DeepValue, type FieldAsyncValidateOrFn, type FieldValidateOrFn, type FormApi, type FormAsyncValidateOrFn, type FormOptions, type FormState, type FormValidateOrFn, type StandardSchemaV1, type VueFormApi } from "@tanstack/vue-form"
 import { type RuntimeFiber } from "effect/Fiber"
 import { getTransformationFrom, useIntl } from "../../utils"
 import { type OmegaFieldInternalApi } from "./InputProps"
@@ -61,6 +61,21 @@ export type OmegaInputProps<
   }
 } & BaseProps<From, NestedKeyOf<From>>
 
+export type OmegaArrayProps<
+  From extends Record<PropertyKey, any>,
+  To extends Record<PropertyKey, any>
+> =
+  & Omit<
+    OmegaInputProps<From, To>,
+    "validators" | "options" | "label" | "type" | "items" | "name"
+  >
+  & {
+    name: DeepKeys<From>
+    defaultItems?: DeepValue<From, DeepKeys<From>>
+    // deprecated items, caused bugs in state update, use defaultItems instead. It's not a simple Never, because Volar explodes
+    items?: "please use `defaultItems` instead"
+  }
+
 export type TypeOverride =
   | "string"
   | "text"
diff --git a/packages/vue-components/src/components/OmegaForm/OmegaInput.vue b/packages/vue-components/src/components/OmegaForm/OmegaInput.vue
index ceae22f7d9..870ad32dac 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaInput.vue
+++ b/packages/vue-components/src/components/OmegaForm/OmegaInput.vue
@@ -34,6 +34,7 @@
   To extends Record<PropertyKey, any>
 "
 >
+import { type DeepKeys } from "@tanstack/vue-form"
 import { computed, inject, type Ref } from "vue"
 import { useIntl } from "../../utils"
 import { type FieldMeta, generateInputStandardSchemaFromFieldMeta, type OmegaInputPropsBase } from "./OmegaFormStuff"
@@ -41,6 +42,9 @@ import OmegaInternalInput from "./OmegaInternalInput.vue"
 
 const props = defineProps<OmegaInputPropsBase<From, To>>()
 
+// downgrade to DeepKeys<From> to avoid useless and possible infinite recursion in TS
+const propsName: Ref<DeepKeys<From>> = computed(() => props.name)
+
 defineOptions({
   inheritAttrs: false
 })
@@ -52,9 +56,9 @@ const getMetaFromArray = inject<Ref<(name: string) => FieldMeta | null> | null>(
 
 const meta = computed(() => {
   if (getMetaFromArray?.value && getMetaFromArray.value(props.name)) {
-    return getMetaFromArray.value(props.name)
+    return getMetaFromArray.value(propsName.value)
   }
-  return props.form.meta[props.name]
+  return props.form.meta[propsName.value]
 })
 
 const schema = computed(() => {
@@ -72,9 +76,9 @@ const humanize = (str: string) => {
     .replace(/^./, (char) => char.toUpperCase()) // Capitalize the first letter
     .trim() // Remove leading/trailing spaces
 }
-const fallback = () => formatMessage({ id: `general.fields.${props.name}`, defaultMessage: humanize(props.name) })
+const fallback = () => formatMessage({ id: `general.fields.${propsName.value}`, defaultMessage: humanize(props.name) })
 const i18n = () =>
   props.form.i18nNamespace
-    ? formatMessage({ id: `${props.form.i18nNamespace}.fields.${props.name}`, defaultMessage: fallback() })
+    ? formatMessage({ id: `${props.form.i18nNamespace}.fields.${propsName.value}`, defaultMessage: fallback() })
     : fallback()
 </script>
diff --git a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
index 9d70ea7d08..f47fba1d10 100644
--- a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
+++ b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
@@ -12,7 +12,7 @@ import { MergedInputProps } from "./InputProps"
 import OmegaArray from "./OmegaArray.vue"
 import OmegaAutoGen from "./OmegaAutoGen.vue"
 import OmegaErrorsInternal from "./OmegaErrorsInternal.vue"
-import { BaseProps, DefaultTypeProps, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, OmegaInputProps } from "./OmegaFormStuff"
+import { BaseProps, DefaultTypeProps, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import OmegaForm from "./OmegaWrapper.vue"
 
@@ -234,14 +234,7 @@ export interface OmegaFormReturn<
             >,
             never
           >
-          & (
-            & Omit<OmegaInputProps<From, To>, "validators" | "options" | "label" | "type" | "items" | "form" | "name">
-            & {
-              name: DeepKeys<From>
-              defaultItems?: DeepValue<From, DeepKeys<From>>
-              items?: "please use `defaultItems` instead"
-            }
-          )
+          & (OmegaArrayProps<From, To>)
           & {}
         >
         & import("vue").PublicProps

From 77b92b1870a90923e37273c304fdb2940c6c9d9d Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Mon, 20 Oct 2025 16:28:03 +0200
Subject: [PATCH 6/6] chore version

---
 .changeset/whole-dogs-bow.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/whole-dogs-bow.md

diff --git a/.changeset/whole-dogs-bow.md b/.changeset/whole-dogs-bow.md
new file mode 100644
index 0000000000..75d474c2dc
--- /dev/null
+++ b/.changeset/whole-dogs-bow.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/vue-components": minor
+---
+
+Improves type handling for Input Props Name, that now only accept leaves schema values and not every valid key of the schema