Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fair-keys-see.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect-app/vue-components": patch
---

Enhances default extraction with extended classes and tagged union components in OmegaForm
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?? '') as any">
<template #default="{ field, state }">
<slot v-if="state.value" />
<form.Field :name="(name ? `${name}._tag` : '_tag') as any">
<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
Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>)
}
Expand Down
22 changes: 19 additions & 3 deletions packages/vue-components/src/components/OmegaForm/useOmegaForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading