@effect-app/vue-components 2.7.0 → 2.7.2

package/dist/vue-components.es38.js

@@ -1,194 +1,34 @@
-import { defineComponent as k, resolveComponent as b, createElementBlock as v, openBlock as a, createBlock as n, createCommentVNode as u, resolveDynamicComponent as g, mergeProps as o, createSlots as d, withCtx as r, renderSlot as m, normalizeProps as s, guardReactiveProps as P, unref as C, Fragment as V, renderList as U } from "vue";
-import { getInputType as c } from "./vue-components.es12.js";
-const w = /* @__PURE__ */ k({
-  inheritAttrs: !1,
-  __name: "OmegaInputVuetify",
+import { defineComponent as m, createElementBlock as d, openBlock as u, withModifiers as f, createElementVNode as l, unref as s, renderSlot as a } from "vue";
+import { useStore as b } from "@tanstack/vue-form";
+import { usePreventClose as p } from "./vue-components.es11.js";
+import { getOmegaStore as c } from "./vue-components.es53.js";
+const S = ["disabled"], V = /* @__PURE__ */ m({
+  __name: "OmegaWrapper",
   props: {
-    inputProps: {},
-    field: {},
-    state: {}
+    form: {},
+    disabled: { type: Boolean },
+    subscribe: {}
   },
-  emits: ["focus", "blur"],
-  setup(e) {
-    return (l, i) => {
-      const y = b("v-text-field"), p = b("v-textarea"), f = b("v-radio"), h = b("v-radio-group"), q = b("v-select"), $ = b("v-autocomplete");
-      return a(), v("div", {
-        class: "omega-input",
-        onFocusout: i[4] || (i[4] = (t) => l.$emit("blur", t)),
-        onFocusin: i[5] || (i[5] = (t) => l.$emit("focus", t))
+  setup(o) {
+    const e = o, i = b(
+      e.form.store,
+      (t) => t.isSubmitting
+    ), n = c(
+      e.form,
+      e.subscribe
+    );
+    return e.form.ignorePreventCloseEvents || p(() => e.form.useStore((t) => t.isDirty)), (t, r) => (u(), d("form", {
+      novalidate: "",
+      onSubmit: r[0] || (r[0] = f((v) => o.form.handleSubmit(), ["prevent", "stop"]))
+    }, [
+      l("fieldset", {
+        disabled: s(i) || o.disabled
       }, [
-        e.inputProps.type === "boolean" || e.inputProps.type === "switch" ? (a(), n(g(e.inputProps.type === "boolean" ? "v-checkbox" : "v-switch"), o({
-          key: 0,
-          id: e.inputProps.id,
-          name: e.field.name,
-          label: e.inputProps.label,
-          "error-messages": e.inputProps.errorMessages,
-          error: e.inputProps.error,
-          ripple: ""
-        }, l.$attrs, {
-          "model-value": e.state.value,
-          onChange: i[0] || (i[0] = (t) => e.field.handleChange(t.target.checked))
-        }), d({ _: 2 }, [
-          l.$slots.label ? {
-            name: "label",
-            fn: r(() => [
-              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1040, ["id", "name", "label", "error-messages", "error", "model-value"])) : u("", !0),
-        e.inputProps.type === "email" || e.inputProps.type === "string" || e.inputProps.type === "password" || e.inputProps.type === "date" ? (a(), n(y, o({
-          key: 1,
-          id: e.inputProps.id,
-          required: e.inputProps.required,
-          "min-length": e.inputProps.minLength,
-          "max-length": e.inputProps.maxLength,
-          type: C(c)(e.inputProps.type),
-          name: e.field.name,
-          label: e.inputProps.label,
-          "error-messages": e.inputProps.errorMessages,
-          error: e.inputProps.error
-        }, l.$attrs, {
-          "model-value": e.state.value,
-          "onUpdate:modelValue": e.field.handleChange
-        }), d({ _: 2 }, [
-          l.$slots.label ? {
-            name: "label",
-            fn: r(() => [
-              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1040, ["id", "required", "min-length", "max-length", "type", "name", "label", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
-        e.inputProps.type === "text" ? (a(), n(p, o({
-          key: 2,
-          id: e.inputProps.id,
-          required: e.inputProps.required,
-          "min-length": e.inputProps.minLength,
-          "max-length": e.inputProps.maxLength,
-          name: e.field.name,
-          label: e.inputProps.label,
-          "error-messages": e.inputProps.errorMessages,
-          error: e.inputProps.error
-        }, l.$attrs, {
-          "model-value": e.state.value,
-          "onUpdate:modelValue": e.field.handleChange
-        }), d({ _: 2 }, [
-          l.$slots.label ? {
-            name: "label",
-            fn: r(() => [
-              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1040, ["id", "required", "min-length", "max-length", "name", "label", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
-        e.inputProps.type === "number" || e.inputProps.type === "range" ? (a(), n(g(e.inputProps.type === "range" ? "v-slider" : "v-text-field"), o({
-          key: 3,
-          id: e.inputProps.id,
-          required: e.inputProps.required,
-          min: e.inputProps.min,
-          max: e.inputProps.max,
-          type: e.inputProps.type,
-          name: e.field.name,
-          label: e.inputProps.label,
-          "error-messages": e.inputProps.errorMessages,
-          error: e.inputProps.error
-        }, l.$attrs, {
-          "model-value": e.state.value,
-          "onUpdate:modelValue": i[1] || (i[1] = (t) => {
-            t || t === 0 ? e.field.handleChange(Number(t)) : e.field.handleChange(void 0);
-          })
-        }), d({ _: 2 }, [
-          l.$slots.label ? {
-            name: "label",
-            fn: r(() => [
-              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1040, ["id", "required", "min", "max", "type", "name", "label", "error-messages", "error", "model-value"])) : u("", !0),
-        e.inputProps.type === "radio" ? (a(), n(h, o({
-          key: 4,
-          id: e.inputProps.id,
-          name: e.field.name,
-          label: e.inputProps.label,
-          "error-messages": e.inputProps.errorMessages,
-          error: e.inputProps.error
-        }, l.$attrs, {
-          "model-value": e.state.value,
-          "onUpdate:modelValue": e.field.handleChange
-        }), d({
-          default: r(() => [
-            (a(!0), v(V, null, U(e.inputProps.options, (t) => (a(), n(f, {
-              key: t.value,
-              label: t.title,
-              value: t.value
-            }, null, 8, ["label", "value"]))), 128))
-          ]),
-          _: 2
-        }, [
-          l.$slots.label ? {
-            name: "label",
-            fn: r(() => [
-              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1040, ["id", "name", "label", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
-        e.inputProps.type === "select" || e.inputProps.type === "multiple" ? (a(), n(q, o({
-          key: 5,
-          id: e.inputProps.id,
-          clearable: e.inputProps.type === "select",
-          required: e.inputProps.required,
-          multiple: e.inputProps.type === "multiple",
-          chips: e.inputProps.type === "multiple",
-          name: e.field.name,
-          label: e.inputProps.label,
-          items: e.inputProps.options,
-          "error-messages": e.inputProps.errorMessages,
-          error: e.inputProps.error
-        }, l.$attrs, {
-          "model-value": e.state.value,
-          onClear: i[2] || (i[2] = (t) => e.field.handleChange(void 0)),
-          "onUpdate:modelValue": e.field.handleChange
-        }), d({ _: 2 }, [
-          l.$slots.label ? {
-            name: "label",
-            fn: r(() => [
-              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1040, ["id", "clearable", "required", "multiple", "chips", "name", "label", "items", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
-        e.inputProps.type === "autocomplete" || e.inputProps.type === "autocompletemultiple" ? (a(), n($, o({
-          key: 6,
-          id: e.inputProps.id,
-          clearable: e.inputProps.type === "autocomplete",
-          multiple: e.inputProps.type === "autocompletemultiple",
-          required: e.inputProps.required,
-          name: e.field.name,
-          label: e.inputProps.label,
-          items: e.inputProps.options,
-          "error-messages": e.inputProps.errorMessages,
-          error: e.inputProps.error,
-          chips: e.inputProps.type === "autocompletemultiple"
-        }, l.$attrs, {
-          "model-value": e.state.value,
-          onClear: i[3] || (i[3] = (t) => e.field.handleChange(void 0)),
-          "onUpdate:modelValue": e.field.handleChange
-        }), d({ _: 2 }, [
-          l.$slots.label ? {
-            name: "label",
-            fn: r(() => [
-              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1040, ["id", "clearable", "multiple", "required", "name", "label", "items", "error-messages", "error", "chips", "model-value", "onUpdate:modelValue"])) : u("", !0)
-      ], 32);
-    };
+        a(t.$slots, "default", { subscribedValues: s(n) }, void 0, !0)
+      ], 8, S)
+    ], 32));
   }
 });
 export {
-  w as default
+  V as default
 };

package/dist/vue-components.es40.js

@@ -1,5 +1,5 @@
 (function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
-import o from "./vue-components.es38.js";
+import o from "./vue-components.es30.js";
 
 export {
   o as default

package/dist/vue-components.es7.js

@@ -1,7 +1,7 @@
 (function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
 import { defineComponent as $, computed as n, getCurrentInstance as N, useAttrs as S, useSlots as k, useId as q, renderSlot as u, normalizeProps as s, guardReactiveProps as d, createElementVNode as B, normalizeClass as w, createBlock as I, createCommentVNode as L, unref as A, openBlock as F, mergeProps as O, createSlots as R, withCtx as V } from "vue";
 import { useStore as z } from "@tanstack/vue-form";
-import T from "./vue-components.es38.js";
+import T from "./vue-components.es30.js";
 
 const H = /* @__PURE__ */ $({
   inheritAttrs: !1,

package/dist/vue-components.es8.js

@@ -1,6 +1,6 @@
-import { defineComponent as s, createElementBlock as f, openBlock as d, Fragment as c, renderSlot as n, createVNode as a, unref as o, withCtx as r, createCommentVNode as g, createSlots as $, renderList as y, normalizeProps as b, guardReactiveProps as p } from "vue";
+import { defineComponent as d, createBlock as u, openBlock as g, unref as l, withCtx as o, renderSlot as n, createVNode as r, createCommentVNode as c, normalizeProps as s, guardReactiveProps as f, createSlots as $, renderList as y } from "vue";
 import C from "./vue-components.es9.js";
-const F = /* @__PURE__ */ s({
+const h = /* @__PURE__ */ d({
   __name: "OmegaTaggedUnion",
   props: {
     name: {},
@@ -10,38 +10,37 @@ const F = /* @__PURE__ */ s({
     label: {}
   },
   setup(e) {
-    return (t, k) => (d(), f(c, null, [
-      n(t.$slots, "OmegaCustomInput", {}, () => [
-        a(o(e.form).Input, {
-          name: e.name ? `${e.name}._tag` : "_tag",
-          label: e.label,
-          type: e.type ?? "select",
-          options: e.options
-        }, null, 8, ["name", "label", "type", "options"])
-      ]),
-      a(o(e.form).Field, {
-        name: e.name ?? ""
-      }, {
-        default: r(({ field: u, state: m }) => [
-          m.value ? n(t.$slots, "default", { key: 0 }) : g("", !0),
-          a(C, {
-            field: u,
-            state: m.value,
-            name: e.name
-          }, $({ _: 2 }, [
-            y(t.$slots, (v, l) => ({
-              name: l,
-              fn: r((i) => [
-                n(t.$slots, l, b(p(i)))
-              ])
-            }))
-          ]), 1032, ["field", "state", "name"])
+    return (a, b) => (g(), u(l(e.form).Field, {
+      name: e.name ? `${e.name}._tag` : "_tag"
+    }, {
+      default: o((t) => [
+        n(a.$slots, "OmegaCustomInput", s(f(t)), () => [
+          r(l(e.form).Input, {
+            name: e.name ? `${e.name}._tag` : "_tag",
+            label: e.label,
+            type: e.type ?? "select",
+            options: e.options
+          }, null, 8, ["name", "label", "type", "options"])
         ]),
-        _: 3
-      }, 8, ["name"])
-    ], 64));
+        n(a.$slots, "default"),
+        r(C, {
+          field: t.field,
+          state: t.state.value,
+          name: e.name
+        }, $({ _: 2 }, [
+          y(a.$slots, (k, m) => ({
+            name: m,
+            fn: o((i) => [
+              n(a.$slots, m, s(f(i)))
+            ])
+          }))
+        ]), 1032, ["field", "state", "name"]),
+        t.state.value ? n(a.$slots, "OmegaCommon", { key: 0 }) : c("", !0)
+      ]),
+      _: 3
+    }, 8, ["name"]));
   }
 });
 export {
-  F as default
+  h as default
 };

package/dist/vue-components.es9.js

@@ -8,11 +8,11 @@ const f = /* @__PURE__ */ l({
   },
   setup(e) {
     const a = e;
-    return i(() => a.state?._tag, (t, n) => {
+    return i(() => a.state, (t, n) => {
       t === null && a.field.setValue(null), t !== n && setTimeout(() => {
         a.field.validate("change");
       }, 0);
-    }), (t, n) => e.state?._tag ? m(t.$slots, `${e.name ? `${e.name}.` : ""}${e.state?._tag}`, o(r({ key: 0 }, { field: e.field, state: e.state }))) : s("", !0);
+    }), (t, n) => e.state ? m(t.$slots, `${e.name ? `${e.name}.` : ""}${e.state}`, o(r({ key: 0 }, { field: e.field, state: e.state }))) : s("", !0);
   }
 });
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.18.0",

package/src/components/OmegaForm/OmegaTaggedUnion.vue

@@ -23,20 +23,23 @@ 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 />
       <OmegaTaggedUnionInternal
-        :field="field as any"
-        :state="state.value"
+        :field="inputProps.field as any"
+        :state="inputProps.state.value"
         :name="name"
       >
         <template
@@ -49,6 +52,10 @@ defineProps<{
           />
         </template>
       </OmegaTaggedUnionInternal>
+      <slot
+        v-if="inputProps.state.value"
+        name="OmegaCommon"
+      />
     </template>
   </form.Field>
 </template>

package/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>)
   }

package/src/components/OmegaForm/useOmegaForm.ts

@@ -762,10 +762,26 @@ export const useOmegaForm = <
     if (!values) return undefined
     const normalized: any = { ...values }
 
+    // Helper to get nested value from object using dot notation
+    const getNestedValue = (obj: any, path: string) => {
+      return path.split(".").reduce((current, key) => current?.[key], obj)
+    }
+
+    // Helper to set nested value in object using dot notation
+    const setNestedValue = (obj: any, path: string, value: any) => {
+      const parts = path.split(".")
+      const last = parts.pop()!
+      const target = parts.reduce((current, key) => {
+        if (!current[key]) current[key] = {}
+        return current[key]
+      }, obj)
+      target[last] = value
+    }
+
     // Process all fields in the schema metadata
     for (const key in meta) {
       const fieldMeta = meta[key as keyof typeof meta]
-      const value = normalized[key]
+      const value = getNestedValue(normalized, key)
 
       // Check if the value is falsy (but not boolean false or zero)
       const isFalsyButNotZero = value == null || value === false || value === "" || Number.isNaN(value)
@@ -779,7 +795,7 @@ export const useOmegaForm = <
       ) {
         // If value is missing or falsy, set to null or undefined based on schema
         if (value === undefined || isFalsy) {
-          normalized[key] = fieldMeta.nullableOrUndefined === "undefined" ? undefined : null
+          setNestedValue(normalized, key, fieldMeta.nullableOrUndefined === "undefined" ? undefined : null)
         }
       }
     }
@@ -791,11 +807,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 as any[]) {
         const memberDefaults = extractDefaultsFromAST(member)
         if (Object.keys(memberDefaults).length > 0) {
           // Check if this member has a default value for a discriminator field (like _tag)
@@ -879,46 +911,15 @@ export const useOmegaForm = <
   }
 
   const defaultValues = computed(() => {
-    // Normalize tanstack default values at the beginning
-    const normalizedTanstackDefaults = extractSchemaDefaults(
-      normalizeDefaultValues(
-        tanstackFormOptions?.defaultValues
-      )
-    )
-
-    if (
-      normalizedTanstackDefaults
-      && !omegaConfig?.persistency?.overrideDefaultValues
-    ) {
-      // defaultValues from tanstack are not partial,
-      // so if ovverrideDefaultValues is false we return the normalized values
-      return normalizedTanstackDefaults
-    }
-
-    // we are here because there are no default values from tankstack
-    // or because omegaConfig?.persistency?.overrideDefaultValues is true
-
     // will contain what we get from querystring or local/session storage
     let defValuesPatch
 
     const persistency = omegaConfig?.persistency
-    if (!persistency?.policies || persistency.policies.length === 0) return {}
-    if (persistency.policies.includes("querystring")) {
-      try {
-        const params = new URLSearchParams(window.location.search)
-        const value = params.get(persistencyKey.value)
-        clearUrlParams()
-        if (value) {
-          defValuesPatch = JSON.parse(value)
-        }
-      } catch (error) {
-        console.error(error)
-      }
-    }
 
     if (
       // query string has higher priority than local/session storage
-      !defValuesPatch
+      persistency?.policies
+      && !defValuesPatch
       && (persistency.policies.includes("local")
         || persistency.policies.includes("session"))
     ) {
@@ -937,16 +938,30 @@ export const useOmegaForm = <
         }
       }
     }
+    if (persistency?.policies && persistency.policies.includes("querystring")) {
+      try {
+        const params = new URLSearchParams(window.location.search)
+        const value = params.get(persistencyKey.value)
+        clearUrlParams()
+        if (value) {
+          defValuesPatch = deepMerge(defValuesPatch || {}, JSON.parse(value))
+        }
+      } catch (error) {
+        console.error(error)
+      }
+    }
 
     // to be sure we have a valid object at the end of the gathering process
-    defValuesPatch ??= extractSchemaDefaults({})
+    defValuesPatch ??= {}
 
-    if (!normalizedTanstackDefaults) {
-      // we just return what we gathered from the query/storage
-      return defValuesPatch
-    } else {
-      return deepMerge(normalizedTanstackDefaults, defValuesPatch)
-    }
+    // we just return what we gathered from the query/storage
+    return extractSchemaDefaults(
+      normalizeDefaultValues(
+        omegaConfig?.persistency?.overrideDefaultValues
+          ? deepMerge(tanstackFormOptions?.defaultValues || {}, defValuesPatch)
+          : deepMerge(defValuesPatch, tanstackFormOptions?.defaultValues || {})
+      )
+    )
   })
 
   const wrapWithSpan = (span: api.Span | undefined, toWrap: () => any) => {

package/dist/vue-components.es31.js

@@ -1,4 +0,0 @@
-import f from "./vue-components.es18.js";
-export {
-  f as default
-};

package/dist/vue-components.es36.js

@@ -1,34 +0,0 @@
-import { defineComponent as m, createElementBlock as d, openBlock as u, withModifiers as f, createElementVNode as l, unref as s, renderSlot as a } from "vue";
-import { useStore as b } from "@tanstack/vue-form";
-import { usePreventClose as p } from "./vue-components.es11.js";
-import { getOmegaStore as c } from "./vue-components.es53.js";
-const S = ["disabled"], V = /* @__PURE__ */ m({
-  __name: "OmegaWrapper",
-  props: {
-    form: {},
-    disabled: { type: Boolean },
-    subscribe: {}
-  },
-  setup(o) {
-    const e = o, i = b(
-      e.form.store,
-      (t) => t.isSubmitting
-    ), n = c(
-      e.form,
-      e.subscribe
-    );
-    return e.form.ignorePreventCloseEvents || p(() => e.form.useStore((t) => t.isDirty)), (t, r) => (u(), d("form", {
-      novalidate: "",
-      onSubmit: r[0] || (r[0] = f((v) => o.form.handleSubmit(), ["prevent", "stop"]))
-    }, [
-      l("fieldset", {
-        disabled: s(i) || o.disabled
-      }, [
-        a(t.$slots, "default", { subscribedValues: s(n) }, void 0, !0)
-      ], 8, S)
-    ], 32));
-  }
-});
-export {
-  V as default
-};