From 571486995b52ad0ec4a1720f60e897aeabc8770c Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Tue, 4 Nov 2025 22:41:20 +0100
Subject: [PATCH 1/4] fix: update name binding logic in OmegaTaggedUnion
 components

---
 .../src/components/OmegaForm/OmegaTaggedUnion.vue           | 2 +-
 .../src/components/OmegaForm/OmegaTaggedUnionInternal.vue   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue b/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue
index 489f8e1e19..867bf0be19 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue
+++ b/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue
@@ -31,7 +31,7 @@ defineProps<{
       :options="options"
     />
   </slot>
-  <form.Field :name="(name ?? '') as any">
+  <form.Field :name="(name ? `${name}._tag` : '_tag') as any">
     <template #default="{ field, state }">
       <slot v-if="state.value" />
       <OmegaTaggedUnionInternal
diff --git a/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnionInternal.vue b/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnionInternal.vue
index 73ba19ed9d..d12feb9b39 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnionInternal.vue
+++ b/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnionInternal.vue
@@ -1,7 +1,7 @@
 <template>
   <slot
-    v-if="state?._tag"
-    :name="`${name ? `${name}.` : ''}${state?._tag}`"
+    v-if="state"
+    :name="`${name ? `${name}.` : ''}${state}`"
     v-bind="{ field, state }"
   />
 </template>
@@ -26,7 +26,7 @@ const props = defineProps<{
 }>()
 
 // Watch for _tag changes
-watch(() => props.state?._tag, (newTag, oldTag) => {
+watch(() => props.state, (newTag, oldTag) => {
   if (newTag === null) {
     props.field.setValue(null as DeepValue<From, Name>)
   }

From af2a5d126c1692050dda04d0345660adbed0879d Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Tue, 4 Nov 2025 22:46:08 +0100
Subject: [PATCH 2/4] fix: refactor slot usage in OmegaTaggedUnion component
 for improved input handling

---
 .../components/OmegaForm/OmegaTaggedUnion.vue | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue b/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue
index 867bf0be19..8418c90d6c 100644
--- a/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue
+++ b/packages/vue-components/src/components/OmegaForm/OmegaTaggedUnion.vue
@@ -23,20 +23,27 @@ defineProps<{
 </script>
 
 <template>
-  <slot name="OmegaCustomInput">
-    <form.Input
-      :name="(name ? `${name}._tag` : '_tag') as FieldPath<From>"
-      :label="label"
-      :type="type ?? 'select'"
-      :options="options"
-    />
-  </slot>
   <form.Field :name="(name ? `${name}._tag` : '_tag') as any">
-    <template #default="{ field, state }">
-      <slot v-if="state.value" />
+    <template #default="inputProps">
+      <slot
+        name="OmegaCustomInput"
+        v-bind="inputProps"
+      >
+        <form.Input
+          :name="(name ? `${name}._tag` : '_tag') as FieldPath<From>"
+          :label="label"
+          :type="type ?? 'select'"
+          :options="options"
+        />
+      </slot>
+      <slot />
+      <slot
+        v-if="inputProps.state.value"
+        name="OmegaCommon"
+      />
       <OmegaTaggedUnionInternal
-        :field="field as any"
-        :state="state.value"
+        :field="inputProps.field as any"
+        :state="inputProps.state.value"
         :name="name"
       >
         <template

From 0a3fac2177f59492cab7c557109a234835f6c9a7 Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Tue, 4 Nov 2025 22:53:14 +0100
Subject: [PATCH 3/4] fix: enhance default extraction in useOmegaForm

---
 .../src/components/OmegaForm/useOmegaForm.ts  | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
index b2b18bccf4..e5a5d272e0 100644
--- a/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
+++ b/packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
@@ -791,11 +791,27 @@ export const useOmegaForm = <
   const extractDefaultsFromAST = (schemaObj: any): any => {
     const result: Record<string, any> = {}
 
-    // Check if this schema is a union
-    if (schemaObj?.members && Array.isArray(schemaObj.members)) {
+    // If this schema has a .make() method (like ExtendedClass), use it to get complete defaults
+    // This is more reliable than manually extracting fields, especially for classes
+    if (typeof schemaObj?.make === "function") {
+      try {
+        const instance = schemaObj.make({})
+        // For ExtendedClass, the instance is already in the correct encoded format
+        return instance
+      } catch {
+        // If make() fails, fall through to manual extraction
+      }
+    }
+
+    // Check if this schema is a union - check both direct property and AST
+    const unionMembers = schemaObj?.members
+      || (schemaObj?.ast?._tag === "Union" && schemaObj.ast.types
+        ? schemaObj.ast.types.map((t: any) => S.make(t))
+        : null)
+    if (unionMembers && Array.isArray(unionMembers)) {
       // For unions, we try to find the first member that has a complete set of defaults
       // Priority is given to members with default values for discriminator fields
-      for (const member of schemaObj.members) {
+      for (const member of unionMembers) {
         const memberDefaults = extractDefaultsFromAST(member)
         if (Object.keys(memberDefaults).length > 0) {
           // Check if this member has a default value for a discriminator field (like _tag)

From 418de3119aba5db973c0c96c20ac0202cb2f746b Mon Sep 17 00:00:00 2001
From: Davide Di Pumpo <davidemak@gmail.com>
Date: Tue, 4 Nov 2025 22:54:56 +0100
Subject: [PATCH 4/4] Enhances default extraction with extended classes and
 tagged union components in OmegaForm

---
 .changeset/fair-keys-see.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fair-keys-see.md

diff --git a/.changeset/fair-keys-see.md b/.changeset/fair-keys-see.md
new file mode 100644
index 0000000000..d987f75d4e
--- /dev/null
+++ b/.changeset/fair-keys-see.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/vue-components": patch
+---
+
+Enhances default extraction with extended classes and tagged union components in OmegaForm