@effect-app/vue-components 2.11.5 → 3.0.0

package/dist/vue-components.es9.js

@@ -1,5 +1,5 @@
-import { defineComponent as r, watch as m, nextTick as o, renderSlot as u, createCommentVNode as i, normalizeProps as f, mergeProps as c } from "vue";
-const $ = /* @__PURE__ */ r({
+import { defineComponent as m, watch as r, renderSlot as s, createCommentVNode as o, normalizeProps as i, mergeProps as f } from "vue";
+const d = /* @__PURE__ */ m({
   __name: "OmegaTaggedUnionInternal",
   props: {
     state: {},
@@ -8,21 +8,14 @@ const $ = /* @__PURE__ */ r({
     form: {}
   },
   setup(e) {
-    const a = e;
-    return m(() => a.state, (t, n) => {
-      t === null && a.field.setValue(null), t !== n && t && o(() => {
-        const s = a.form.unionDefaultValues?.[t] ?? {}, l = {
-          ...a.form.state.values,
-          ...s,
-          _tag: t
-        };
-        a.form.reset(l), setTimeout(() => {
-          a.field.validate("change");
-        }, 0);
-      });
-    }, { immediate: !0 }), (t, n) => e.state ? u(t.$slots, `${e.name ? `${e.name}.` : ""}${e.state}`, f(c({ key: 0 }, { field: e.field, state: e.state }))) : i("", !0);
+    const a = e, l = a.form.useStore(({ values: t }) => t);
+    return r(() => a.state, (t, n) => {
+      t === null && a.field.setValue(null), t !== n && (a.form.reset(l.value), setTimeout(() => {
+        a.field.validate("change");
+      }, 0));
+    }, { immediate: !0 }), (t, n) => e.state ? s(t.$slots, `${e.name ? `${e.name}.` : ""}${e.state}`, i(f({ key: 0 }, { field: e.field, state: e.state }))) : o("", !0);
   }
 });
 export {
-  $ as default
+  d as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.11.5",
+  "version": "3.0.0",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.19.3",
@@ -53,8 +53,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "2.93.6",
-    "effect-app": "3.15.1"
+    "effect-app": "3.15.1",
+    "@effect-app/vue": "2.93.6"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -356,7 +356,6 @@ export const createMeta = <T = any>(
 
   if (property?._tag === "TypeLiteral" && "propertySignatures" in property) {
     return createMeta<T>({
-      parent, // Pass parent to maintain the key prefix for nested structures
       meta,
       propertySignatures: property.propertySignatures
     })
@@ -405,13 +404,7 @@ export const createMeta = <T = any>(
               property: p.type,
               meta: { required: isRequired, nullableOrUndefined }
             })
-            // If parentMeta is a MetaRecord (nested structure from ExtendedClass), merge it
-            // Otherwise assign as single FieldMeta
-            if (parentMeta && typeof parentMeta === "object" && !("type" in parentMeta)) {
-              Object.assign(acc, parentMeta)
-            } else {
-              acc[key as NestedKeyOf<T>] = parentMeta as FieldMeta
-            }
+            acc[key as NestedKeyOf<T>] = parentMeta as FieldMeta
           }
 
           // Process each non-null type and merge their metadata
@@ -708,17 +701,11 @@ const flattenMeta = <T>(meta: MetaRecord<T> | FieldMeta, parentKey: string = "")
 
 const metadataFromAst = <From, To>(
   schema: S.Schema<To, From, never>
-): {
-  meta: MetaRecord<To>
-  defaultValues: Record<string, any>
-  unionMeta: Record<string, MetaRecord<To>>
-  unionDefaultValues: Record<string, Record<string, any>>
-} => {
+): { meta: MetaRecord<To>; defaultValues: Record<string, any>; unionMeta: Record<string, MetaRecord<To>> } => {
   const ast = schema.ast
   const newMeta: MetaRecord<To> = {}
   const defaultValues: Record<string, any> = {}
   const unionMeta: Record<string, MetaRecord<To>> = {}
-  const unionDefaultValues: Record<string, Record<string, any>> = {}
 
   if (ast._tag === "Transformation" || ast._tag === "Refinement") {
     return metadataFromAst(S.make(ast.from))
@@ -763,9 +750,6 @@ const metadataFromAst = <From, To>(
           // Store per-tag metadata for reactive lookup
           if (tagValue) {
             unionMeta[tagValue] = flattenMeta<To>(memberMeta)
-            // Create default values for this tag's schema
-            const memberSchema = S.make(memberType)
-            unionDefaultValues[tagValue] = defaultsValueFromSchema(memberSchema as any)
           }
 
           // Merge into result (for backward compatibility)
@@ -782,7 +766,7 @@ const metadataFromAst = <From, To>(
         } as FieldMeta
       }
 
-      return { meta: newMeta, defaultValues, unionMeta, unionDefaultValues }
+      return { meta: newMeta, defaultValues, unionMeta }
     }
   }
 
@@ -792,7 +776,7 @@ const metadataFromAst = <From, To>(
     })
 
     if (Object.values(meta).every((value) => value && "type" in value)) {
-      return { meta: meta as MetaRecord<To>, defaultValues, unionMeta, unionDefaultValues }
+      return { meta: meta as MetaRecord<To>, defaultValues, unionMeta }
     }
 
     const flattenObject = (
@@ -812,7 +796,7 @@ const metadataFromAst = <From, To>(
     flattenObject(meta)
   }
 
-  return { meta: newMeta, defaultValues, unionMeta, unionDefaultValues }
+  return { meta: newMeta, defaultValues, unionMeta }
 }
 
 export const duplicateSchema = <From, To>(
@@ -827,11 +811,10 @@ export const generateMetaFromSchema = <From, To>(
   schema: S.Schema<To, From, never>
   meta: MetaRecord<To>
   unionMeta: Record<string, MetaRecord<To>>
-  unionDefaultValues: Record<string, Record<string, any>>
 } => {
-  const { meta, unionDefaultValues, unionMeta } = metadataFromAst(schema)
+  const { meta, unionMeta } = metadataFromAst(schema)
 
-  return { schema, meta, unionMeta, unionDefaultValues }
+  return { schema, meta, unionMeta }
 }
 
 export const generateInputStandardSchemaFromFieldMeta = (

package/src/components/OmegaForm/OmegaInput.vue

@@ -1,6 +1,7 @@
 <template>
   <component
     :is="form.Field"
+    :key="fieldKey"
     :name="name"
     :validators="{
       onChange: schema,
@@ -75,12 +76,22 @@ const getMetaFromArray = inject<Ref<(name: string) => FieldMeta | null> | null>(
 )
 
 const meta = computed(() => {
-  const fromArray = getMetaFromArray?.value?.(props.name as DeepKeys<From>)
-  if (fromArray) {
-    return fromArray
+  if (getMetaFromArray?.value && getMetaFromArray.value(props.name as DeepKeys<From>)) {
+    return getMetaFromArray.value(propsName.value)
   }
-  const formMeta = props.form.meta[propsName.value]
-  return formMeta
+  return props.form.meta[propsName.value]
+})
+
+// Key to force Field re-mount when meta type changes (for TaggedUnion support)
+const fieldKey = computed(() => {
+  const m = meta.value
+  if (!m) return propsName.value
+  // Include type and key constraints in the key so Field re-mounts when validation rules change
+  // Cast to any since not all FieldMeta variants have these properties
+  const fm = m as any
+  return `${propsName.value}-${fm.type}-${fm.minLength ?? ""}-${fm.maxLength ?? ""}-${fm.minimum ?? ""}-${
+    fm.maximum ?? ""
+  }`
 })
 
 // Call useIntl during setup to avoid issues when computed re-evaluates

package/src/components/OmegaForm/OmegaTaggedUnion.vue

@@ -34,7 +34,6 @@ watch(
   },
   (newTag) => {
     currentTag.value = newTag ?? null
-    return undefined
   },
   { immediate: true }
 )

package/src/components/OmegaForm/OmegaTaggedUnionInternal.vue

@@ -12,7 +12,7 @@
   generic="From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Name extends DeepKeys<From>"
 >
 import { type DeepKeys, type DeepValue } from "@tanstack/vue-form"
-import { nextTick, watch } from "vue"
+import { watch } from "vue"
 import { type OmegaFieldInternalApi } from "./InputProps"
 import { type useOmegaForm } from "./useOmegaForm"
 
@@ -23,30 +23,19 @@ const props = defineProps<{
   form: ReturnType<typeof useOmegaForm<From, To>>
 }>()
 
+const values = props.form.useStore(({ values }) => values)
+
 // Watch for _tag changes
 watch(() => props.state, (newTag, oldTag) => {
   if (newTag === null) {
     props.field.setValue(null as DeepValue<From, Name>)
   }
 
-  if (newTag !== oldTag && newTag) {
-    // Use nextTick to avoid cleanup conflicts during reactive updates
-    nextTick(() => {
-      // Get default values for the new tag to ensure correct types
-      const tagDefaults = (props.form as any).unionDefaultValues?.[newTag as string] ?? {}
-      // Get current form values to preserve user's selections (e.g., carrier)
-      const currentValues = props.form.state.values
-      // Merge: keep current values, override with tag defaults for type correctness, set new _tag
-      const resetValues = {
-        ...currentValues,
-        ...tagDefaults,
-        _tag: newTag
-      }
-      props.form.reset(resetValues as any)
-      setTimeout(() => {
-        props.field.validate("change")
-      }, 0)
-    })
+  if (newTag !== oldTag) {
+    props.form.reset(values.value)
+    setTimeout(() => {
+      props.field.validate("change")
+    }, 0)
   }
 }, { immediate: true })
 </script>

package/src/components/OmegaForm/useOmegaForm.ts

@@ -218,7 +218,6 @@ export type OmegaConfig<T> = {
 export interface OF<From, To> extends OmegaFormApi<From, To> {
   meta: MetaRecord<From>
   unionMeta: Record<string, MetaRecord<From>>
-  unionDefaultValues: Record<string, Record<string, any>>
   clear: () => void
   i18nNamespace?: string
   ignorePreventCloseEvents?: boolean
@@ -684,7 +683,7 @@ export const useOmegaForm = <
   const standardSchema = S.standardSchemaV1(schema)
   const decode = S.decode(schema)
 
-  const { meta, unionDefaultValues, unionMeta } = generateMetaFromSchema(schema)
+  const { meta, unionMeta } = generateMetaFromSchema(schema)
 
   const persistencyKey = computed(() => {
     if (omegaConfig?.persistency?.id) {
@@ -919,7 +918,6 @@ export const useOmegaForm = <
         // Reset with current values to mark them as the new baseline
         form.reset(values.value)
       }
-      return undefined
     })
   }
 
@@ -956,7 +954,6 @@ export const useOmegaForm = <
     ignorePreventCloseEvents: omegaConfig?.ignorePreventCloseEvents,
     meta,
     unionMeta,
-    unionDefaultValues,
     clear,
     handleSubmit: (meta?: Record<string, any>) => {
       const span = api.trace.getSpan(api.context.active())
@@ -965,18 +962,8 @@ export const useOmegaForm = <
     // /** @experimental */
     handleSubmitEffect,
     registerField: (field: ComputedRef<{ name: string; label: string; id: string }>) => {
-      watch(field, (f) => {
-        fieldMap.value.set(f.name, { label: f.label, id: f.id })
-      }, { immediate: true })
-      onUnmounted(() => {
-        // Only delete if this component instance still owns the registration (id matches)
-        // This prevents the old component from removing the new component's registration
-        // when Vue re-keys and mounts new before unmounting old
-        const current = fieldMap.value.get(field.value.name)
-        if (current?.id === field.value.id) {
-          fieldMap.value.delete(field.value.name)
-        }
-      })
+      watch(field, (f) => fieldMap.value.set(f.name, { label: f.label, id: f.id }), { immediate: true })
+      onUnmounted(() => fieldMap.value.delete(field.value.name)) // todo; perhap only when owned (id match)
     }
   })
 

package/src/components/OmegaForm/useRegisterField.ts

@@ -5,9 +5,7 @@ const Key = Symbol("injected") as InjectionKey<Map<string, { label: string; id:
 
 export const useRegisterField = (field: ComputedRef<{ name: string; label: string; id: string }>) => {
   const map = injectCertain(Key)
-  watch(field, (f) => {
-    map.set(f.name, { label: f.label, id: f.id })
-  }, { immediate: true })
+  watch(field, (f) => map.set(f.name, { label: f.label, id: f.id }), { immediate: true })
   onUnmounted(() => map.delete(field.value.name)) // todo; perhap only when owned
 }