@effect-app/vue-components 2.9.2 → 2.10.2

package/dist/types/components/OmegaForm/OmegaFormStuff.d.ts

@@ -151,4 +151,6 @@ export type OmegaAutoGenMeta<From extends Record<PropertyKey, any>, To extends R
 declare const supportedInputs: readonly ["button", "checkbox", "color", "date", "email", "number", "password", "radio", "range", "search", "submit", "tel", "text", "time", "url"];
 export type SupportedInputs = typeof supportedInputs[number];
 export declare const getInputType: (input: string) => SupportedInputs;
+export declare function deepMerge(target: any, source: any): any;
+export declare const defaultsValueFromSchema: (schema: S.Schema<any>, record?: Record<string, any>) => any;
 export {};

package/dist/types/components/OmegaForm/useOmegaForm.d.ts

@@ -1,5 +1,6 @@
 import { type DeepKeys, DeepValue, StandardSchemaV1Issue, ValidationError, ValidationErrorMap } from "@tanstack/vue-form";
 import { Effect, Order, S } from "effect-app";
+import { UnionToTuples } from "effect-app/utils";
 import { ComputedRef, type InjectionKey } from "vue";
 import { MergedInputProps } from "./InputProps";
 import { BaseProps, DefaultTypeProps, FieldPath, type FormProps, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff";
@@ -24,6 +25,8 @@ export declare class FormErrors<From> extends FormErrors_base<{
     }>;
 }> {
 }
+export type Policies = "local" | "session" | "querystring";
+export type defaultValuesPriorityUnion = "tanstack" | "persistency" | "schema";
 export type OmegaConfig<T> = {
     i18nNamespace?: string;
     persistency?: {
@@ -31,8 +34,8 @@ export type OmegaConfig<T> = {
          * - "querystring": Highest priority when persisting
          * - "local" and then "session": Lower priority storage options
          */
-        policies?: ("local" | "session" | "querystring")[];
-        overrideDefaultValues?: boolean;
+        policies?: UnionToTuples<Policies>;
+        overrideDefaultValues?: "deprecated: use defaultValuesPriority";
         id?: string;
     } & keysRule<T>;
     ignorePreventCloseEvents?: boolean;
@@ -46,6 +49,14 @@ export type OmegaConfig<T> = {
      */
     preventWindowExit?: "prevent" | "prevent-and-reset" | "nope";
     input?: any;
+    /**
+     * Default values order is: Tanstack default values passed as second parameter to useOmegaForm, then persistency
+     * default values from querystring or local/session storage, then defaults from schema
+     * You can customize the order and  with omegaConfig.defaultValuesPriority
+     * default value = ['tanstack', 'persistency', 'schema']
+     */
+    defaultValuesPriority?: UnionToTuples<defaultValuesPriorityUnion>;
+    defaultFromSchema?: "deprecated: use defaultValuesPriority";
 };
 export interface OF<From, To> extends OmegaFormApi<From, To> {
     meta: MetaRecord<From>;

package/dist/vue-components.es.js

@@ -5,11 +5,11 @@ import { default as g } from "./vue-components.es5.js";
 import { default as I } from "./vue-components.es6.js";
 import { default as y } from "./vue-components.es7.js";
 import { default as h } from "./vue-components.es8.js";
-import { default as C } from "./vue-components.es9.js";
-import { useOmegaForm as T } from "./vue-components.es10.js";
-import { useOnClose as M, usePreventClose as j } from "./vue-components.es11.js";
-import { createMeta as P, duplicateSchema as k, generateInputStandardSchemaFromFieldMeta as w, generateMetaFromSchema as B, getInputType as D, isNullableOrUndefined as K, nullableInput as N } from "./vue-components.es12.js";
-import { createUseFormWithCustomInput as W } from "./vue-components.es13.js";
+import { default as b } from "./vue-components.es9.js";
+import { useOmegaForm as M } from "./vue-components.es10.js";
+import { useOnClose as U, usePreventClose as j } from "./vue-components.es11.js";
+import { createMeta as P, deepMerge as V, defaultsValueFromSchema as k, duplicateSchema as w, generateInputStandardSchemaFromFieldMeta as B, generateMetaFromSchema as D, getInputType as K, isNullableOrUndefined as N, nullableInput as W } from "./vue-components.es12.js";
+import { createUseFormWithCustomInput as q } from "./vue-components.es13.js";
 function r(a) {
   for (const e in o)
     if (Object.prototype.hasOwnProperty.call(o, e)) {
@@ -23,22 +23,24 @@ export {
   g as Dialog,
   I as OmegaInput,
   h as OmegaTaggedUnion,
-  C as OmegaTaggedUnionInternal,
+  b as OmegaTaggedUnionInternal,
   y as OmegaVuetifyInput,
   P as createMeta,
-  W as createUseFormWithCustomInput,
+  q as createUseFormWithCustomInput,
+  V as deepMerge,
   n as default,
-  k as duplicateSchema,
-  w as generateInputStandardSchemaFromFieldMeta,
-  B as generateMetaFromSchema,
-  D as getInputType,
+  k as defaultsValueFromSchema,
+  w as duplicateSchema,
+  B as generateInputStandardSchemaFromFieldMeta,
+  D as generateMetaFromSchema,
+  K as getInputType,
   f as getTransformationFrom,
-  K as isNullableOrUndefined,
-  N as nullableInput,
+  N as isNullableOrUndefined,
+  W as nullableInput,
   l as provideIntl,
   u as useIntl,
   s as useIntlKey,
-  T as useOmegaForm,
-  M as useOnClose,
+  M as useOmegaForm,
+  U as useOnClose,
   j as usePreventClose
 };

package/dist/vue-components.es10.js

@@ -1,228 +1,233 @@
-import { useForm as q } from "@tanstack/vue-form";
-import { Data as B, S as D, Effect as c, Fiber as A, Option as P, Array as g } from "effect-app";
-import { runtimeFiberAsPromise as K } from "./vue-components.es16.js";
-import { computed as U, onUnmounted as N, onMounted as T, onBeforeUnmount as G, watch as W, ref as z, h as k } from "vue";
-import { deepMerge as O, extractSchemaDefaults as Q } from "./vue-components.es17.js";
+import { useForm as B } from "@tanstack/vue-form";
+import { Data as K, S as $, Effect as l, Fiber as x, Option as P, Array as F } from "effect-app";
+import { runtimeFiberAsPromise as T } from "./vue-components.es17.js";
+import { computed as U, onUnmounted as N, onMounted as G, onBeforeUnmount as z, watch as W, ref as Q, h as H } from "vue";
 import X from "./vue-components.es18.js";
 import Y from "./vue-components.es19.js";
 import Z from "./vue-components.es20.js";
-import { generateMetaFromSchema as C } from "./vue-components.es12.js";
-import ee from "./vue-components.es6.js";
-import re from "./vue-components.es8.js";
-import te from "./vue-components.es21.js";
+import { generateMetaFromSchema as C, deepMerge as D, defaultsValueFromSchema as ee } from "./vue-components.es12.js";
+import re from "./vue-components.es6.js";
+import te from "./vue-components.es8.js";
+import se from "./vue-components.es21.js";
 import { trace as R } from "./vue-components.es22.js";
 import { context as L } from "./vue-components.es23.js";
-class se extends B.TaggedError("FormErrors") {
+class ne extends K.TaggedError("FormErrors") {
 }
-const E = (l) => function(n) {
+const g = (a) => function(n) {
   return {
     render() {
-      return k(n, {
-        form: l,
+      return H(n, {
+        form: a,
         ...this.$attrs
       }, this.$slots);
     }
   };
-}, ne = (l) => function(n) {
+}, oe = (a) => function(n) {
   return {
     setup() {
-      const { fieldMap: w, form: v } = l, b = v.useStore((u) => u.errors), m = v.useStore((u) => u.fieldMeta), F = v.useStore((u) => u.errorMap), _ = U(() => {
-        const u = g.filterMap(
+      const { fieldMap: b, form: h } = a, y = h.useStore((d) => d.errors), m = h.useStore((d) => d.fieldMeta), M = h.useStore((d) => d.errorMap), j = U(() => {
+        const d = F.filterMap(
           Object.entries(m.value),
-          ([M, f]) => {
+          ([O, f]) => {
             const S = f.errors ?? [];
             if (!S.length) return P.none();
-            const a = w.value.get(M);
-            return a ? P.some({
-              label: a.label,
-              inputId: a.id,
+            const c = b.value.get(O);
+            return c ? P.some({
+              label: c.label,
+              inputId: c.id,
               // Only show the first error
               errors: [S[0]?.message].filter(Boolean)
             }) : P.none();
           }
         ), o = [];
-        if (F.value.onSubmit) {
-          for (const [M, f] of Object.entries(F.value.onSubmit))
-            if (g.isArray(f) && f.length)
+        if (M.value.onSubmit) {
+          for (const [O, f] of Object.entries(M.value.onSubmit))
+            if (F.isArray(f) && f.length)
               for (const S of f) {
-                const a = S;
-                if (a?.path && g.isArray(a.path) && a.path.length) {
-                  const y = a.path.join(".");
-                  if (!w.value.has(y)) {
+                const c = S;
+                if (c?.path && F.isArray(c.path) && c.path.length) {
+                  const E = c.path.join(".");
+                  if (!b.value.has(E)) {
                     o.push({
-                      label: y,
-                      inputId: y,
-                      errors: [a.message].filter(Boolean)
+                      label: E,
+                      inputId: E,
+                      errors: [c.message].filter(Boolean)
                     });
                     break;
                   }
                 }
               }
         }
-        return [...u, ...o];
+        return [...d, ...o];
       });
       return {
-        generalErrors: b,
-        errors: _
+        generalErrors: y,
+        errors: j
       };
     },
-    render({ errors: w, generalErrors: v }) {
-      return k(n, {
-        errors: w,
-        generalErrors: v,
+    render({ errors: b, generalErrors: h }) {
+      return H(n, {
+        errors: b,
+        generalErrors: h,
         ...this.$attrs
       }, this.$slots);
     }
   };
-}, be = (l, d, n) => {
-  if (!l) throw new Error("Schema is required");
-  const w = D.standardSchemaV1(l), v = D.decode(l), { meta: b } = C(l), m = U(() => {
+}, v = (a, u) => a.includes(u), be = (a, u, n) => {
+  if (!a) throw new Error("Schema is required");
+  const b = $.standardSchemaV1(a), h = $.decode(a), { meta: y } = C(a), m = U(() => {
     if (n?.persistency?.id)
       return n.persistency.id;
-    const e = window.location.pathname, r = Object.keys(b);
+    const e = window.location.pathname, r = Object.keys(y);
     return `${e}-${r.join("-")}`;
-  }), F = () => {
+  }), M = () => {
     const e = new URLSearchParams(window.location.search);
     e.delete(m.value);
     const r = new URL(window.location.href);
     r.search = e.toString(), window.history.replaceState({}, "", r.toString());
-  }, _ = U(() => {
+  }, j = U(() => {
     let e;
     const r = n?.persistency;
     if (
       // query string has higher priority than local/session storage
-      r?.policies && !e && (r.policies.includes("local") || r.policies.includes("session"))
+      r?.policies && !e && (v(r.policies, "local") || v(r.policies, "session"))
     ) {
-      const s = r.policies.includes("local") ? localStorage : sessionStorage;
+      const s = v(r.policies, "local") ? localStorage : sessionStorage;
       if (s)
         try {
-          const i = JSON.parse(
+          const t = JSON.parse(
             s.getItem(m.value) || "{}"
           );
-          s.removeItem(m.value), e = i;
-        } catch (i) {
-          console.error(i);
+          s.removeItem(m.value), e = t;
+        } catch (t) {
+          console.error(t);
         }
     }
-    if (r?.policies && r.policies.includes("querystring"))
+    if (r?.policies && v(r.policies, "querystring"))
       try {
-        const i = new URLSearchParams(window.location.search).get(m.value);
-        F(), i && (e = O(e || {}, JSON.parse(i)));
+        const t = new URLSearchParams(window.location.search).get(m.value);
+        M(), t && (e = D(e || {}, JSON.parse(t)));
       } catch (s) {
         console.error(s);
       }
-    return e ??= {}, Q(
-      l,
-      n?.persistency?.overrideDefaultValues ? O(d?.defaultValues || {}, e) : O(e, d?.defaultValues || {})
+    e ??= {};
+    const i = {
+      tanstack: u?.defaultValues || {},
+      persistency: e,
+      schema: ee(a)
+    };
+    return (n?.defaultValuesPriority || ["tanstack", "persistency", "schema"]).reverse().reduce(
+      (s, t) => Object.keys(s).length ? D(s, i[t]) : i[t],
+      {}
     );
-  }), u = (e, r) => e ? L.with(R.setSpan(L.active(), e), r) : r(), o = q({
-    ...d,
+  }), d = (e, r) => e ? L.with(R.setSpan(L.active(), e), r) : r(), o = B({
+    ...u,
     validators: {
-      onSubmit: w,
-      ...d?.validators || {}
+      onSubmit: b,
+      ...u?.validators || {}
     },
-    onSubmit: d?.onSubmit ? ({ formApi: e, meta: r, value: s }) => u(r?.currentSpan, async () => {
-      const i = await c.runPromise(v(s)), t = d.onSubmit({
+    onSubmit: u?.onSubmit ? ({ formApi: e, meta: r, value: i }) => d(r?.currentSpan, async () => {
+      const s = await l.runPromise(h(i)), t = u.onSubmit({
         formApi: e,
         meta: r,
-        value: i
+        value: s
       });
-      return A.isFiber(t) && A.isRuntimeFiber(t) ? await K(t) : c.isEffect(t) ? await c.runPromise(
+      return x.isFiber(t) && x.isRuntimeFiber(t) ? await T(t) : l.isEffect(t) ? await l.runPromise(
         t.pipe(
           // meta?.currentSpan
           //   ? Effect.withParentSpan(meta.currentSpan)
           //   : (_) => _,
-          c.flatMap((p) => A.join(p))
+          l.flatMap((p) => x.join(p))
         )
       ) : t;
     }) : void 0,
-    defaultValues: _.value
-  }), M = () => {
-    Object.keys(b).forEach((e) => {
+    defaultValues: j.value
+  }), O = () => {
+    Object.keys(y).forEach((e) => {
       o.setFieldValue(e, void 0);
     });
-  }, f = (e) => e.reduce((r, s) => {
-    const i = s.split(".");
-    return i.reduce((t, p, x) => (x === i.length - 1 ? t[p] = o.getFieldValue(s) : t[p] = t[p] ?? {}, t[p]), r), r;
+  }, f = (e) => e.reduce((r, i) => {
+    const s = i.split(".");
+    return s.reduce((t, p, A) => (A === s.length - 1 ? t[p] = o.getFieldValue(i) : t[p] = t[p] ?? {}, t[p]), r), r;
   }, {}), S = (e) => {
     if (e) {
-      if (g.isArray(e.keys))
+      if (F.isArray(e.keys))
         return f(e.keys);
-      if (g.isArray(e.banKeys)) {
-        const r = Object.keys(b).filter((s) => e.banKeys?.includes(s));
+      if (F.isArray(e.banKeys)) {
+        const r = Object.keys(y).filter((i) => e.banKeys?.includes(i));
         return f(r);
       }
       return o.store.state.values;
     }
-  }, a = () => {
+  }, c = () => {
     const e = n?.persistency;
-    if (!(!e?.policies || e.policies.length === 0) && (e.policies.includes("local") || e.policies.includes("session"))) {
-      const r = e.policies.includes("local") ? localStorage : sessionStorage;
+    if (!(!e?.policies || e.policies.length === 0) && (v(e.policies, "local") || v(e.policies, "session"))) {
+      const r = v(e.policies, "local") ? localStorage : sessionStorage;
       if (!r) return;
-      const s = S(e);
-      return r.setItem(m.value, JSON.stringify(s));
+      const i = S(e);
+      return r.setItem(m.value, JSON.stringify(i));
     }
-  }, y = () => {
+  }, E = () => {
     const e = n?.persistency;
-    if (!(!e?.policies || e.policies.length === 0) && e.policies.includes("querystring")) {
-      const r = S(e), s = new URLSearchParams(window.location.search);
-      s.set(m.value, JSON.stringify(r));
-      const i = new URL(window.location.href);
-      i.search = s.toString(), window.history.replaceState({}, "", i.toString());
+    if (!(!e?.policies || e.policies.length === 0) && v(e.policies, "querystring")) {
+      const r = S(e), i = new URLSearchParams(window.location.search);
+      i.set(m.value, JSON.stringify(r));
+      const s = new URL(window.location.href);
+      s.search = i.toString(), window.history.replaceState({}, "", s.toString());
     }
   }, V = (e) => {
     o.store.state.isDirty && e.preventDefault();
   };
-  if (N(a), T(() => {
-    window.addEventListener("beforeunload", a), window.addEventListener("blur", y), n?.preventWindowExit && n.preventWindowExit !== "nope" && window.addEventListener("beforeunload", V);
-  }), G(() => {
-    window.removeEventListener("beforeunload", a), window.removeEventListener("blur", y), n?.preventWindowExit && n.preventWindowExit !== "nope" && window.removeEventListener("beforeunload", V);
+  if (N(c), G(() => {
+    window.addEventListener("beforeunload", c), window.addEventListener("blur", E), n?.preventWindowExit && n.preventWindowExit !== "nope" && window.addEventListener("beforeunload", V);
+  }), z(() => {
+    window.removeEventListener("beforeunload", c), window.removeEventListener("blur", E), n?.preventWindowExit && n.preventWindowExit !== "nope" && window.removeEventListener("beforeunload", V);
   }), n?.preventWindowExit === "prevent-and-reset") {
-    const e = o.useStore((t) => t.isSubmitting), r = o.useStore((t) => t.submissionAttempts), s = o.useStore((t) => t.canSubmit), i = o.useStore((t) => t.values);
-    W([e, r], ([t, p], [x]) => {
-      x && !t && p > 0 && s.value && o.reset(i.value);
+    const e = o.useStore((t) => t.isSubmitting), r = o.useStore((t) => t.submissionAttempts), i = o.useStore((t) => t.canSubmit), s = o.useStore((t) => t.values);
+    W([e, r], ([t, p], [A]) => {
+      A && !t && p > 0 && i.value && o.reset(s.value);
     });
   }
-  const I = (e) => c.currentSpan.pipe(
-    c.option,
-    c.flatMap(
-      (r) => c.promise(() => o.handleSubmit(P.isSome(r) ? { currentSpan: r.value, ...e } : e))
+  const k = (e) => l.currentSpan.pipe(
+    l.option,
+    l.flatMap(
+      (r) => l.promise(() => o.handleSubmit(P.isSome(r) ? { currentSpan: r.value, ...e } : e))
     )
-  ), H = (e) => e?.checkErrors ? I(e?.meta).pipe(c.flatMap(c.fnUntraced(function* () {
+  ), J = (e) => e?.checkErrors ? k(e?.meta).pipe(l.flatMap(l.fnUntraced(function* () {
     const r = o.getAllErrors();
     if (Object.keys(r.fields).length || r.form.errors.length)
-      return yield* new se({ form: r.form, fields: r.fields });
-  }))) : I(e?.meta), J = o.handleSubmit, j = z(/* @__PURE__ */ new Map()), h = Object.assign(o, {
+      return yield* new ne({ form: r.form, fields: r.fields });
+  }))) : k(e?.meta), q = o.handleSubmit, _ = Q(/* @__PURE__ */ new Map()), w = Object.assign(o, {
     i18nNamespace: n?.i18nNamespace,
     ignorePreventCloseEvents: n?.ignorePreventCloseEvents,
-    meta: b,
-    clear: M,
+    meta: y,
+    clear: O,
     handleSubmit: (e) => {
       const r = R.getSpan(L.active());
-      return J({ currentSpan: r, ...e });
+      return q({ currentSpan: r, ...e });
     },
     // /** @experimental */
-    handleSubmitEffect: H,
+    handleSubmitEffect: J,
     registerField: (e) => {
-      W(e, (r) => j.value.set(r.name, { label: r.label, id: r.id }), { immediate: !0 }), N(() => j.value.delete(e.value.name));
+      W(e, (r) => _.value.set(r.name, { label: r.label, id: r.id }), { immediate: !0 }), N(() => _.value.delete(e.value.name));
     }
-  }), $ = { form: h, fieldMap: j };
-  return Object.assign(h, {
+  }), I = { form: w, fieldMap: _ };
+  return Object.assign(w, {
     // Type-level properties for performance optimization (not used at runtime)
     _paths: void 0,
     _keys: void 0,
-    _schema: l,
-    errorContext: $,
-    Form: E(h)(te),
-    Input: E(h)(n?.input ?? ee),
-    TaggedUnion: E(h)(re),
+    _schema: a,
+    errorContext: I,
+    Form: g(w)(se),
+    Input: g(w)(n?.input ?? re),
+    TaggedUnion: g(w)(te),
     Field: o.Field,
-    Errors: ne($)(Z),
-    Array: E(h)(X),
-    AutoGen: E(h)(Y)
+    Errors: oe(I)(Z),
+    Array: g(w)(X),
+    AutoGen: g(w)(Y)
   });
 };
 export {
-  se as FormErrors,
+  ne as FormErrors,
   be as useOmegaForm
 };