@effect-app/vue-components 2.7.7 → 2.7.8

package/dist/vue-components.es10.js

@@ -1,8 +1,8 @@
 import { useForm as z } from "@tanstack/vue-form";
-import { Data as Q, S as v, Effect as b, Array as g, Fiber as O, Option as D } from "effect-app";
+import { Data as Q, S, Effect as b, Array as g, Fiber as O, Option as D } from "effect-app";
 import { runtimeFiberAsPromise as X } from "./vue-components.es16.js";
 import { isObject as Y } from "./vue-components.es17.js";
-import { computed as T, onUnmounted as W, onMounted as Z, onBeforeUnmount as C, watch as H, ref as ee, h as B } from "vue";
+import { computed as V, onUnmounted as W, onMounted as Z, onBeforeUnmount as C, watch as H, ref as ee, h as B } from "vue";
 import te from "./vue-components.es18.js";
 import re from "./vue-components.es19.js";
 import ne from "./vue-components.es20.js";
@@ -11,34 +11,34 @@ import oe from "./vue-components.es6.js";
 import ie from "./vue-components.es8.js";
 import ae from "./vue-components.es21.js";
 import { trace as q } from "./vue-components.es22.js";
-import { context as V } from "./vue-components.es23.js";
-const _ = (l) => {
-  const i = l.ast;
+import { context as T } from "./vue-components.es23.js";
+const A = (c) => {
+  const i = c.ast;
   if (i._tag === "Union") {
     const o = i.types.map((f) => {
-      const c = v.make(f);
-      return _(c).ast;
+      const l = S.make(f);
+      return A(l).ast;
     }), p = {
       ...i,
       types: o
     };
-    return v.make(p);
+    return S.make(p);
   }
   if (i._tag === "Transformation") {
-    const o = v.make(i.from), p = v.make(i.to), f = _(o), c = _(p), d = {
+    const o = S.make(i.from), p = S.make(i.to), f = A(o), l = A(p), d = {
       ...i,
       from: f.ast,
-      to: c.ast
+      to: l.ast
     };
-    return v.make(d);
+    return S.make(d);
   }
   if (i._tag === "TypeLiteral") {
     const o = i.propertySignatures.map((f) => {
-      const c = f.type;
-      let d = c;
-      if (c._tag === "TypeLiteral" || c._tag === "Union" || c._tag === "Transformation") {
-        const k = v.make(c);
-        d = _(k).ast;
+      const l = f.type;
+      let d = l;
+      if (l._tag === "TypeLiteral" || l._tag === "Union" || l._tag === "Transformation") {
+        const k = S.make(l);
+        d = A(k).ast;
       }
       return {
         ...f,
@@ -49,29 +49,29 @@ const _ = (l) => {
       ...i,
       propertySignatures: o
     };
-    return v.make(p);
+    return S.make(p);
   }
-  return l;
+  return c;
 };
 class le extends Q.TaggedError("FormErrors") {
 }
-const U = (l) => function(o) {
+const M = (c) => function(o) {
   return {
     render() {
       return B(o, {
-        form: l,
+        form: c,
         ...this.$attrs
       }, this.$slots);
     }
   };
-}, ce = (l) => function(o) {
+}, ce = (c) => function(o) {
   return {
     setup() {
-      const { fieldMap: p, form: f } = l, c = f.useStore((S) => S.errors), d = f.useStore((S) => S.fieldMeta), k = f.useStore((S) => S.errorMap), w = T(() => {
-        const S = g.filterMap(
+      const { fieldMap: p, form: f } = c, l = f.useStore((v) => v.errors), d = f.useStore((v) => v.fieldMeta), k = f.useStore((v) => v.errorMap), h = V(() => {
+        const v = g.filterMap(
           Object.entries(d.value),
-          ([x, h]) => {
-            const a = h.errors ?? [];
+          ([x, w]) => {
+            const a = w.errors ?? [];
             if (!a.length) return D.none();
             const y = p.value.get(x);
             return y ? D.some({
@@ -83,16 +83,16 @@ const U = (l) => function(o) {
           }
         ), F = [];
         if (k.value.onSubmit) {
-          for (const [x, h] of Object.entries(k.value.onSubmit))
-            if (g.isArray(h) && h.length)
-              for (const a of h) {
+          for (const [x, w] of Object.entries(k.value.onSubmit))
+            if (g.isArray(w) && w.length)
+              for (const a of w) {
                 const y = a;
                 if (y?.path && g.isArray(y.path) && y.path.length) {
-                  const A = y.path.join(".");
-                  if (!p.value.has(A)) {
+                  const _ = y.path.join(".");
+                  if (!p.value.has(_)) {
                     F.push({
-                      label: A,
-                      inputId: A,
+                      label: _,
+                      inputId: _,
                       errors: [y.message].filter(Boolean)
                     });
                     break;
@@ -100,11 +100,11 @@ const U = (l) => function(o) {
                 }
               }
         }
-        return [...S, ...F];
+        return [...v, ...F];
       });
       return {
-        generalErrors: c,
-        errors: w
+        generalErrors: l,
+        errors: h
       };
     },
     render({ errors: p, generalErrors: f }) {
@@ -115,12 +115,12 @@ const U = (l) => function(o) {
       }, this.$slots);
     }
   };
-}, Ae = (l, i, o) => {
-  if (!l) throw new Error("Schema is required");
-  const p = v.standardSchemaV1(l), f = v.decode(l), { meta: c } = se(l), d = T(() => {
+}, _e = (c, i, o) => {
+  if (!c) throw new Error("Schema is required");
+  const p = S.standardSchemaV1(c), f = S.decode(c), { meta: l } = se(c), d = V(() => {
     if (o?.persistency?.id)
       return o.persistency.id;
-    const e = window.location.pathname, t = Object.keys(c);
+    const e = window.location.pathname, t = Object.keys(l);
     return `${e}-${t.join("-")}`;
   }), k = () => {
     const e = new URLSearchParams(window.location.search);
@@ -128,12 +128,12 @@ const U = (l) => function(o) {
     const t = new URL(window.location.href);
     t.search = e.toString(), window.history.replaceState({}, "", t.toString());
   };
-  function w(e, t) {
+  function h(e, t) {
     for (const r in t)
-      g.isArray(t[r]) ? e[r] = t[r] : t[r] && Y(t[r]) ? (e[r] || (e[r] = {}), w(e[r], t[r])) : e[r] = t[r];
+      g.isArray(t[r]) ? e[r] = t[r] : t[r] && Y(t[r]) ? (e[r] || (e[r] = {}), h(e[r], t[r])) : e[r] = t[r];
     return e;
   }
-  const S = (e) => {
+  const v = (e) => {
     const t = {};
     if (typeof e?.make == "function")
       try {
@@ -141,19 +141,19 @@ const U = (l) => function(o) {
         if (e?.fields && typeof e.fields == "object") {
           for (const [s, u] of Object.entries(e.fields))
             if (n[s] === void 0) {
-              const m = u.ast, M = J(m);
-              M === "null" ? n[s] = null : M === "undefined" && (n[s] = void 0);
+              const m = u?.ast, U = J(m);
+              U === "null" ? n[s] = null : U === "undefined" && (n[s] = void 0);
             }
         }
         return n;
       } catch {
       }
-    const r = e?.members || (e?.ast?._tag === "Union" && e.ast.types ? e.ast.types.map((n) => v.make(n)) : null);
+    const r = e?.members || (e?.ast?._tag === "Union" && e.ast.types ? e.ast.types.map((n) => S.make(n)) : null);
     if (r && g.isArray(r)) {
       for (const n of r) {
-        const s = S(n);
+        const s = v(n);
         if (Object.keys(s).length > 0 && n?.fields && Object.entries(n.fields).some(
-          ([m, M]) => m === "_tag" || m === "type" || m === "kind" ? M?.ast?.defaultValue !== void 0 : !1
+          ([m, U]) => m === "_tag" || m === "type" || m === "kind" ? U?.ast?.defaultValue !== void 0 : !1
         ))
           return s;
       }
@@ -168,7 +168,7 @@ const U = (l) => function(o) {
           } catch {
           }
         else {
-          const m = s.ast;
+          const m = s?.ast;
           switch (J(m)) {
             case "null":
               t[n] = null;
@@ -178,26 +178,28 @@ const U = (l) => function(o) {
               break;
           }
         }
-        const u = S(s);
+        const u = v(s);
         Object.keys(u).length > 0 && (t[n] && typeof t[n] == "object" ? Object.assign(t[n], u) : t[n] || (t[n] = u));
       }
     return t;
   }, F = (e = {}) => {
     let t = {};
     try {
-      const r = l.make(e);
-      t = v.encodeSync(_(S(l)))(r);
+      let r = c;
+      r?.ast?._tag === "Refinement" && r?.from && (r = r.from);
+      const n = r.make(e);
+      t = S.encodeSync(A(r))(n);
     } catch (r) {
       window.location.hostname === "localhost" && console.warn("schema.make() failed, extracting defaults from AST:", r);
       try {
-        const n = S(l);
-        t = v.encodeSync(_(l))(n);
+        const n = v(c);
+        t = S.encodeSync(A(c))(n);
       } catch (n) {
         window.location.hostname === "localhost" && console.warn("Could not extract defaults from AST:", n);
       }
     }
-    return w(t, e);
-  }, x = T(() => {
+    return h(t, e);
+  }, x = V(() => {
     let e;
     const t = o?.persistency;
     if (
@@ -218,20 +220,20 @@ const U = (l) => function(o) {
     if (t?.policies && t.policies.includes("querystring"))
       try {
         const n = new URLSearchParams(window.location.search).get(d.value);
-        k(), n && (e = w(e || {}, JSON.parse(n)));
+        k(), n && (e = h(e || {}, JSON.parse(n)));
       } catch (r) {
         console.error(r);
       }
     return e ??= {}, F(
-      o?.persistency?.overrideDefaultValues ? w(i?.defaultValues || {}, e) : w(e, i?.defaultValues || {})
+      o?.persistency?.overrideDefaultValues ? h(i?.defaultValues || {}, e) : h(e, i?.defaultValues || {})
     );
-  }), h = (e, t) => e ? V.with(q.setSpan(V.active(), e), t) : t(), a = z({
+  }), w = (e, t) => e ? T.with(q.setSpan(T.active(), e), t) : t(), a = z({
     ...i,
     validators: {
       onSubmit: p,
       ...i?.validators || {}
     },
-    onSubmit: i?.onSubmit ? ({ formApi: e, meta: t, value: r }) => h(t?.currentSpan, async () => {
+    onSubmit: i?.onSubmit ? ({ formApi: e, meta: t, value: r }) => w(t?.currentSpan, async () => {
       const n = await b.runPromise(f(r)), s = i.onSubmit({
         formApi: e,
         meta: t,
@@ -248,19 +250,19 @@ const U = (l) => function(o) {
     }) : void 0,
     defaultValues: x.value
   }), y = () => {
-    Object.keys(c).forEach((e) => {
+    Object.keys(l).forEach((e) => {
       a.setFieldValue(e, void 0);
     });
-  }, A = (e) => e.reduce((t, r) => {
+  }, _ = (e) => e.reduce((t, r) => {
     const n = r.split(".");
     return n.reduce((s, u, m) => (m === n.length - 1 ? s[u] = a.getFieldValue(r) : s[u] = s[u] ?? {}, s[u]), t), t;
   }, {}), j = (e) => {
     if (e) {
       if (g.isArray(e.keys))
-        return A(e.keys);
+        return _(e.keys);
       if (g.isArray(e.banKeys)) {
-        const t = Object.keys(c).filter((r) => e.banKeys?.includes(r));
-        return A(t);
+        const t = Object.keys(l).filter((r) => e.banKeys?.includes(r));
+        return _(t);
       }
       return a.store.state.values;
     }
@@ -305,10 +307,10 @@ const U = (l) => function(o) {
   }))) : N(e?.meta), G = a.handleSubmit, L = ee(/* @__PURE__ */ new Map()), E = Object.assign(a, {
     i18nNamespace: o?.i18nNamespace,
     ignorePreventCloseEvents: o?.ignorePreventCloseEvents,
-    meta: c,
+    meta: l,
     clear: y,
     handleSubmit: (e) => {
-      const t = q.getSpan(V.active());
+      const t = q.getSpan(T.active());
       return G({ currentSpan: t, ...e });
     },
     // /** @experimental */
@@ -322,16 +324,16 @@ const U = (l) => function(o) {
     _paths: void 0,
     _keys: void 0,
     errorContext: R,
-    Form: U(E)(ae),
-    Input: U(E)(o?.input ?? oe),
-    TaggedUnion: U(E)(ie),
+    Form: M(E)(ae),
+    Input: M(E)(o?.input ?? oe),
+    TaggedUnion: M(E)(ie),
     Field: a.Field,
     Errors: ce(R)(ne),
-    Array: U(E)(te),
-    AutoGen: U(E)(re)
+    Array: M(E)(te),
+    AutoGen: M(E)(re)
   });
 };
 export {
   le as FormErrors,
-  Ae as useOmegaForm
+  _e as useOmegaForm
 };

package/dist/vue-components.es12.js

@@ -1,7 +1,7 @@
 import { S as n, Option as L } from "effect-app";
-import { getMetadataFromSchema as w } from "@effect-app/vue/form";
-import { useIntl as N, getTransformationFrom as M } from "./vue-components.es3.js";
-const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKeyword" || i === n.Null.ast), d = (e) => !e || !n.AST.isUnion(e) ? !1 : e.types.find((i) => i._tag === "UndefinedKeyword") ? "undefined" : e.types.find((i) => i === n.Null.ast) ? "null" : !1, _ = (e) => {
+import { getMetadataFromSchema as q } from "@effect-app/vue/form";
+import { useIntl as N, getTransformationFrom as w } from "./vue-components.es3.js";
+const k = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKeyword" || i === n.Null.ast), g = (e) => !e || !n.AST.isUnion(e) ? !1 : e.types.find((i) => i._tag === "UndefinedKeyword") ? "undefined" : e.types.find((i) => i === n.Null.ast) ? "null" : !1, _ = (e) => {
   const i = [];
   for (const t of e)
     if (n.AST.isUnion(t)) {
@@ -24,14 +24,14 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
     });
   if (c) {
     for (const r of c) {
-      const p = i ? `${i}.${r.name.toString()}` : r.name.toString(), s = d(r.type);
+      const p = i ? `${i}.${r.name.toString()}` : r.name.toString(), s = g(r.type);
       let a;
       e._isNullableDiscriminatedUnion && r.name.toString() === "_tag" || e.required === !1 ? a = !1 : a = !s;
       const f = r.type;
       if (n.AST.isUnion(r.type)) {
         const S = _(r.type.types).filter(
           (l) => l._tag !== "UndefinedKeyword" && l !== n.Null.ast
-        ).map(M);
+        ).map(w);
         if (S.some(
           (l) => "propertySignatures" in l
         )) {
@@ -68,28 +68,28 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
             }, m.rest && m.rest.length > 0) {
               const T = m.rest[0];
               if (T.type._tag === "TypeLiteral" && "propertySignatures" in T.type)
-                for (const g of T.type.propertySignatures) {
-                  const h = `${p}.${g.name.toString()}`, v = u({
+                for (const d of T.type.propertySignatures) {
+                  const h = `${p}.${d.name.toString()}`, v = u({
                     parent: h,
-                    property: g.type,
+                    property: d.type,
                     meta: {
-                      required: !d(g.type),
-                      nullableOrUndefined: d(g.type)
+                      required: !g(d.type),
+                      nullableOrUndefined: g(d.type)
                     }
                   });
-                  if (v && typeof v == "object" && "type" in v && (o[h] = v, v.type === "multiple" && n.AST.isTupleType(g.type) && g.type.rest && g.type.rest.length > 0)) {
-                    const U = g.type.rest[0];
-                    if (U.type._tag === "TypeLiteral" && "propertySignatures" in U.type)
-                      for (const x of U.type.propertySignatures) {
-                        const A = `${h}.${x.name.toString()}`, O = u({
+                  if (v && typeof v == "object" && "type" in v && (o[h] = v, v.type === "multiple" && n.AST.isTupleType(d.type) && d.type.rest && d.type.rest.length > 0)) {
+                    const O = d.type.rest[0];
+                    if (O.type._tag === "TypeLiteral" && "propertySignatures" in O.type)
+                      for (const x of O.type.propertySignatures) {
+                        const A = `${h}.${x.name.toString()}`, U = u({
                           parent: A,
                           property: x.type,
                           meta: {
-                            required: !d(x.type),
-                            nullableOrUndefined: d(x.type)
+                            required: !g(x.type),
+                            nullableOrUndefined: g(x.type)
                           }
                         });
-                        O && typeof O == "object" && "type" in O && (o[A] = O);
+                        U && typeof U == "object" && "type" in U && (o[A] = U);
                       }
                   }
                 }
@@ -122,31 +122,31 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
                 const m = y.type.rest[0].type;
                 if (m._tag === "TypeLiteral" && "propertySignatures" in m)
                   for (const T of m.propertySignatures) {
-                    const g = `${l}.${T.name.toString()}`, h = u({
-                      parent: g,
+                    const d = `${l}.${T.name.toString()}`, h = u({
+                      parent: d,
                       property: T.type,
                       meta: {
-                        required: !d(T.type),
-                        nullableOrUndefined: d(T.type)
+                        required: !g(T.type),
+                        nullableOrUndefined: g(T.type)
                       }
                     });
-                    o[g] = h;
+                    o[d] = h;
                   }
                 else
                   o[l] = {
                     type: "multiple",
                     members: y.type.elements,
                     rest: y.type.rest,
-                    required: !d(y.type),
-                    nullableOrUndefined: d(y.type)
+                    required: !g(y.type),
+                    nullableOrUndefined: g(y.type)
                   };
               } else {
                 const m = u({
                   parent: l,
                   property: y.type,
                   meta: {
-                    required: !d(y.type),
-                    nullableOrUndefined: d(y.type)
+                    required: !g(y.type),
+                    nullableOrUndefined: g(y.type)
                   }
                 });
                 o[l] = m;
@@ -167,7 +167,7 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
           meta: {
             // an empty string is valid for a S.String field, so we should not mark it as required
             // TODO: handle this better via the createMeta minLength parsing
-            required: a && (r.type._tag !== "StringKeyword" || w(r.type).minLength),
+            required: a && (r.type._tag !== "StringKeyword" || q(r.type).minLength),
             nullableOrUndefined: s
           }
         });
@@ -177,7 +177,7 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
     return o;
   }
   if (t) {
-    const r = E(t);
+    const r = k(t);
     if (Object.hasOwnProperty.call(e, "required") || (e.required = !r), n.AST.isUnion(t)) {
       const s = _(t.types), a = s.find(
         (f) => f._tag !== "UndefinedKeyword" && f !== n.Null.ast
@@ -222,12 +222,12 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
     ), e);
   }
   return o;
-}, q = (e) => {
+}, M = (e) => {
   const i = e.ast, t = {};
   if (i._tag === "Transformation" || i._tag === "Refinement")
-    return q(n.make(i.from));
+    return M(n.make(i.from));
   if (i._tag === "Union") {
-    const r = (i.types || []).filter((s) => s._tag !== "UndefinedKeyword" && s !== n.Null.ast).map(M);
+    const r = (i.types || []).filter((s) => s._tag !== "UndefinedKeyword" && s !== n.Null.ast).map(w);
     if (r.every((s) => s._tag === "TypeLiteral" && "propertySignatures" in s) && r.length > 0) {
       const s = [];
       for (const a of r)
@@ -264,7 +264,7 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
   }
   return t;
 }, P = (e) => n.extend(e, n.Struct({})), j = (e) => {
-  const i = q(e);
+  const i = M(e);
   return { schema: e, meta: i };
 }, F = (e) => {
   const { trans: i } = N();
@@ -341,10 +341,12 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
     case "boolean":
       t = n.Boolean;
       break;
-    // todo: switch must be exhaustive or have default case, otherwise falls through with schema undefined.
     case "unknown":
       t = n.Unknown;
       break;
+    default:
+      console.warn(`Unhandled field type: ${e}`), t = n.Unknown;
+      break;
   }
   return e.required ? t.pipe(
     n.annotations({
@@ -356,7 +358,7 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
     decode: (t) => t ?? i(),
     encode: (t) => t
   })
-), k = [
+), E = [
   "button",
   "checkbox",
   "color",
@@ -372,13 +374,13 @@ const E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKe
   "text",
   "time",
   "url"
-], R = (e) => k.includes(e) ? e : "text";
+], R = (e) => E.includes(e) ? e : "text";
 export {
   u as createMeta,
   P as duplicateSchema,
   F as generateInputStandardSchemaFromFieldMeta,
   j as generateMetaFromSchema,
   R as getInputType,
-  d as isNullableOrUndefined,
+  g as isNullableOrUndefined,
   D as nullableInput
 };

package/package.json

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

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -915,11 +915,16 @@ export const generateInputStandardSchemaFromFieldMeta = (
     case "boolean":
       schema = S.Boolean
       break
-    // todo: switch must be exhaustive or have default case, otherwise falls through with schema undefined.
 
     case "unknown":
       schema = S.Unknown
       break
+
+    default:
+      // For any unhandled types, use Unknown schema to prevent undefined errors
+      console.warn(`Unhandled field type: ${meta}`)
+      schema = S.Unknown
+      break
   }
   if (!meta.required) {
     schema = S.NullishOr(schema)

package/src/components/OmegaForm/useOmegaForm.ts

@@ -774,7 +774,7 @@ export const useOmegaForm = <
           for (const [key, fieldSchema] of Object.entries(schemaObj.fields)) {
             // Only fix fields that are undefined in the instance
             if (instance[key] === undefined) {
-              const ast = (fieldSchema as any).ast
+              const ast = (fieldSchema as any)?.ast
               const nullableOrUndefined = isNullableOrUndefined(ast)
               if (nullableOrUndefined === "null") {
                 instance[key] = null
@@ -835,7 +835,7 @@ export const useOmegaForm = <
           }
         } else {
           // TODO Should we put to null/undefined only leaves?
-          const ast = (fieldSchema as any).ast
+          const ast = (fieldSchema as any)?.ast
           const nullableOrUndefined = isNullableOrUndefined(ast)
           switch (nullableOrUndefined) {
             case "null":
@@ -869,11 +869,16 @@ export const useOmegaForm = <
     let result: Partial<From> = {}
 
     try {
-      // First try to use schema.make() if available
+      // For filtered schemas (created with S.filter), use the original unfiltered schema's make method
+      let schemaToUse = schema as any
+      if (schemaToUse?.ast?._tag === "Refinement" && schemaToUse?.from) {
+        schemaToUse = schemaToUse.from
+      }
+
       // First try to use schema.make() if available
       // Note: Partial schemas don't have .make() method yet (https://github.com/Effect-TS/effect/issues/4222)
-      const decoded = (schema as any).make(defaultValues)
-      result = S.encodeSync(partialRecursive(extractDefaultsFromAST(schema)))(decoded)
+      const decoded = schemaToUse.make(defaultValues)
+      result = S.encodeSync(partialRecursive(schemaToUse))(decoded)
     } catch (error) {
       // If make() fails, try to extract defaults from AST
       if (window.location.hostname === "localhost") {