@effect-app/vue-components 2.9.1 → 2.10.0

package/dist/types/components/OmegaForm/OmegaAutoGen.vue.d.ts

@@ -1,7 +1,8 @@
 import { type DeepKeys } from "@tanstack/vue-form";
 import { Order } from "effect-app";
 import { type OmegaAutoGenMeta, type OmegaInputProps } from "./OmegaFormStuff";
-declare const __VLS_export: <From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>, Name extends DeepKeys<From>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+declare const __VLS_export: <// dprint-ignore
+From extends Record<PropertyKey, string>, To extends Record<PropertyKey, string>, Name extends DeepKeys<From>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<{
         form: OmegaInputProps<From, To, Name>["form"];
         pick?: DeepKeys<From>[];

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

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