@effect-app/vue-components 0.14.5 → 0.14.6

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

@@ -13,6 +13,10 @@ declare const _default: <From extends Record<PropertyKey, any>, To extends Recor
             subState: import("@tanstack/vue-form").FieldState<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").StandardSchemaV1<From, To>, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormAsyncValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormAsyncValidateOrFn<From> | undefined>;
             index: number;
         }) => any;
+    } & {
+        field?: (props: {
+            field: import("@tanstack/vue-form").FieldApi<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FieldAsyncValidateOrFn<From, DeepKeys<From>, DeepValue<From, DeepKeys<From>>> | undefined, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").StandardSchemaV1<From, To>, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormAsyncValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormAsyncValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormAsyncValidateOrFn<From> | undefined, import("@tanstack/vue-form").FormAsyncValidateOrFn<From> | undefined>;
+        }) => any;
     };
     emit: {};
 }>) => import("vue").VNode & {

package/dist/vue-components.es10.js

@@ -1,6 +1,6 @@
 import { S as n, Option as f, pipe as O } from "effect-app";
 import { useIntl as A } from "./vue-components.es3.js";
-const M = n.NonEmptyArray(n.String), L = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKeyword" || i === n.Null.ast), y = (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, m = ({ meta: e = {}, parent: i = "", property: t, propertySignatures: o }, l = {}) => {
+const M = n.NonEmptyArray(n.String), L = (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, m = ({ meta: e = {}, parent: i = "", property: t, propertySignatures: o }, l = {}) => {
   if (t && t._tag === "Transformation")
     return m({
       parent: i,
@@ -14,85 +14,86 @@ const M = n.NonEmptyArray(n.String), L = (e) => n.AST.isUnion(e) && e.types.find
     });
   if (o) {
     for (const r of o) {
-      const u = i ? `${i}.${r.name.toString()}` : r.name.toString(), s = y(r.type), p = !s, b = r.type;
+      const u = i ? `${i}.${r.name.toString()}` : r.name.toString(), a = g(r.type), p = !a, b = r.type;
       if (n.AST.isUnion(r.type)) {
-        const d = r.type.types.filter(
-          (a) => a._tag !== "UndefinedKeyword" && a !== n.Null.ast
+        const y = r.type.types.filter(
+          (s) => s._tag !== "UndefinedKeyword" && s !== n.Null.ast
         );
-        if (d.some(
-          (a) => "propertySignatures" in a
+        if (y.some(
+          (s) => "propertySignatures" in s
         )) {
-          const a = m({
-            parent: u,
-            property: r.type,
-            meta: { required: p, nullableOrUndefined: s }
-          });
-          l[u] = a;
-          for (const g of d)
-            "propertySignatures" in g && Object.assign(
+          if (!a) {
+            const s = m({
+              parent: u,
+              property: r.type,
+              meta: { required: p, nullableOrUndefined: a }
+            });
+            l[u] = s;
+          }
+          for (const s of y)
+            "propertySignatures" in s && Object.assign(
               l,
               m({
                 parent: u,
-                propertySignatures: g.propertySignatures,
-                meta: { required: p, nullableOrUndefined: s }
+                propertySignatures: s.propertySignatures,
+                meta: { required: p, nullableOrUndefined: a }
               })
             );
         } else {
-          const a = m({
+          const s = m({
             parent: u,
             property: r.type,
-            meta: { required: p, nullableOrUndefined: s }
+            meta: { required: p, nullableOrUndefined: a }
           });
-          l[u] = a;
+          l[u] = s;
         }
-      }
-      if ("propertySignatures" in b)
+      } else if ("propertySignatures" in b)
         Object.assign(
           l,
           m({
             parent: u,
             propertySignatures: b.propertySignatures,
-            meta: { required: p, nullableOrUndefined: s }
+            meta: { required: p, nullableOrUndefined: a }
           })
         );
       else if (n.AST.isTupleType(r.type))
         if (r.type.rest.length > 0 && r.type.rest[0].type._tag === "TypeLiteral" && "propertySignatures" in r.type.rest[0].type) {
-          const S = r.type.rest[0].type;
-          if (S._tag === "TypeLiteral" && "propertySignatures" in S)
-            for (const a of S.propertySignatures) {
-              const g = `${u}.${a.name.toString()}`;
-              if (n.AST.isTupleType(a.type) && a.type.rest.length > 0) {
-                const c = a.type.rest[0].type;
-                if (c._tag === "TypeLiteral" && "propertySignatures" in c)
-                  for (const T of c.propertySignatures) {
-                    const h = `${g}.${T.name.toString()}`, x = m({
+          const c = r.type.rest[0].type;
+          if (c._tag === "TypeLiteral" && "propertySignatures" in c)
+            for (const s of c.propertySignatures) {
+              const S = `${u}.${s.name.toString()}`;
+              if (n.AST.isTupleType(s.type) && s.type.rest.length > 0) {
+                const d = s.type.rest[0].type;
+                if (d._tag === "TypeLiteral" && "propertySignatures" in d)
+                  for (const T of d.propertySignatures) {
+                    const h = `${S}.${T.name.toString()}`, x = m({
                       parent: h,
                       property: T.type,
                       meta: {
-                        required: !y(T.type),
-                        nullableOrUndefined: y(T.type)
+                        required: !g(T.type),
+                        nullableOrUndefined: g(T.type)
                       }
                     });
                     l[h] = x;
                   }
                 else
-                  l[g] = {
+                  l[S] = {
                     type: "multiple",
-                    members: a.type.elements,
-                    rest: a.type.rest,
-                    required: !y(a.type),
-                    nullableOrUndefined: y(a.type)
+                    members: s.type.elements,
+                    rest: s.type.rest,
+                    required: !g(s.type),
+                    nullableOrUndefined: g(s.type)
                   };
               } else {
-                const c = m({
-                  parent: g,
-                  property: a.type,
+                const d = m({
+                  parent: S,
+                  property: s.type,
                   meta: {
-                    required: !y(a.type),
-                    nullableOrUndefined: y(a.type)
+                    required: !g(s.type),
+                    nullableOrUndefined: g(s.type)
                   }
                 });
-                l[g] = c;
+                l[S] = d;
               }
             }
         } else
@@ -101,15 +102,15 @@ const M = n.NonEmptyArray(n.String), L = (e) => n.AST.isUnion(e) && e.types.find
             members: r.type.elements,
             rest: r.type.rest,
             required: p,
-            nullableOrUndefined: s
+            nullableOrUndefined: a
           };
       else {
-        const d = m({
+        const y = m({
           parent: u,
           property: r.type,
-          meta: { required: p, nullableOrUndefined: s }
+          meta: { required: p, nullableOrUndefined: a }
         });
-        l[u] = d;
+        l[u] = y;
       }
     }
     return l;
@@ -117,11 +118,11 @@ const M = n.NonEmptyArray(n.String), L = (e) => n.AST.isUnion(e) && e.types.find
   if (t) {
     const r = L(t);
     if (Object.hasOwnProperty.call(e, "required") || (e.required = !r), n.AST.isUnion(t)) {
-      const s = t.types.find(
+      const a = t.types.find(
         (p) => p._tag !== "UndefinedKeyword" && p !== n.Null.ast
       );
-      return "propertySignatures" in s ? m({
-        propertySignatures: s.propertySignatures,
+      return "propertySignatures" in a ? m({
+        propertySignatures: a.propertySignatures,
         parent: i,
         meta: e
       }) : t.types.every(n.AST.isLiteral) ? {
@@ -133,7 +134,7 @@ const M = n.NonEmptyArray(n.String), L = (e) => n.AST.isUnion(e) && e.types.find
         ...m({
           parent: i,
           meta: e,
-          property: s
+          property: a
         })
       };
     }
@@ -171,9 +172,9 @@ const M = n.NonEmptyArray(n.String), L = (e) => n.AST.isUnion(e) && e.types.find
     if (Object.values(o).every((r) => r && "type" in r))
       return o;
     const l = (r, u = "") => {
-      for (const s in r) {
-        const p = u ? `${u}.${s}` : s;
-        r[s] && typeof r[s] == "object" && "type" in r[s] ? t[p] = r[s] : r[s] && typeof r[s] == "object" && l(r[s], p);
+      for (const a in r) {
+        const p = u ? `${u}.${a}` : a;
+        r[a] && typeof r[a] == "object" && "type" in r[a] ? t[p] = r[a] : r[a] && typeof r[a] == "object" && l(r[a], p);
       }
     };
     l(o);

package/dist/vue-components.es4.js

@@ -1,6 +1,6 @@
-import { defineComponent as d, inject as f, computed as o, createBlock as n, openBlock as m, resolveDynamicComponent as v, withCtx as l, createCommentVNode as c, mergeProps as y, renderSlot as g, normalizeProps as h, guardReactiveProps as C } from "vue";
-import { generateInputStandardSchemaFromFieldMeta as F } from "./vue-components.es10.js";
-import b from "./vue-components.es24.js";
+import { defineComponent as d, inject as f, computed as r, createBlock as n, openBlock as m, resolveDynamicComponent as c, withCtx as l, createCommentVNode as v, mergeProps as y, renderSlot as g, normalizeProps as h, guardReactiveProps as b } from "vue";
+import { generateInputStandardSchemaFromFieldMeta as C } from "./vue-components.es10.js";
+import F from "./vue-components.es24.js";
 const P = /* @__PURE__ */ d({
   inheritAttrs: !1,
   __name: "OmegaInput",
@@ -13,15 +13,15 @@ const P = /* @__PURE__ */ d({
     type: {}
   },
   setup(s) {
-    const a = s, r = f(
+    const a = s, o = f(
       "getMetaFromArray",
       null
-    ), t = o(() => r?.value && r.value(a.name) ? r.value(a.name) : a.form.meta[a.name]), i = o(() => {
+    ), t = r(() => o?.value && o.value(a.name) ? o.value(a.name) : a.form.meta[a.name]), i = r(() => {
       if (!t.value)
-        throw new Error("Meta is undefined");
-      return F(t.value);
+        throw console.log(a.name, Object.keys(a.form.meta), a.form.meta), new Error("Meta is undefined");
+      return C(t.value);
     });
-    return (e, M) => (m(), n(v(e.form.Field), {
+    return (e, k) => (m(), n(c(e.form.Field), {
       name: e.name,
       validators: {
         onChange: i.value,
@@ -29,7 +29,7 @@ const P = /* @__PURE__ */ d({
       }
     }, {
       default: l(({ field: p }) => [
-        t.value ? (m(), n(b, y({
+        t.value ? (m(), n(F, y({
           key: 0,
           field: p,
           label: e.label,
@@ -38,10 +38,10 @@ const P = /* @__PURE__ */ d({
           type: e.type
         }, e.$attrs), {
           default: l((u) => [
-            g(e.$slots, "default", h(C(u)))
+            g(e.$slots, "default", h(b(u)))
           ]),
           _: 2
-        }, 1040, ["field", "label", "options", "meta", "type"])) : c("", !0)
+        }, 1040, ["field", "label", "options", "meta", "type"])) : v("", !0)
       ]),
       _: 3
     }, 8, ["name", "validators"]));

package/dist/vue-components.es7.js

@@ -1,5 +1,5 @@
-import { defineComponent as i, computed as m, onMounted as p, provide as g, createElementBlock as h, openBlock as s, Fragment as v, renderList as y, createBlock as F, resolveDynamicComponent as M, withCtx as _, renderSlot as $, mergeProps as k } from "vue";
-const P = /* @__PURE__ */ i({
+import { defineComponent as F, computed as l, onMounted as P, provide as $, createElementBlock as s, openBlock as n, Fragment as u, createBlock as d, renderList as M, resolveDynamicComponent as i, withCtx as f, renderSlot as p, mergeProps as k, normalizeProps as A, guardReactiveProps as b } from "vue";
+const B = /* @__PURE__ */ F({
   inheritAttrs: !1,
   __name: "OmegaArray",
   props: {
@@ -8,30 +8,38 @@ const P = /* @__PURE__ */ i({
     defaultItems: {},
     items: {}
   },
-  setup(l) {
-    const t = l, u = t.form.useStore((e) => e.values), o = m(() => t.name.replace(/\[/g, ".").replace(/\]/g, "").split(".").reduce((r, a) => r[a], u.value));
-    p(async () => {
-      t.defaultItems && !o.value && t.form.setFieldValue(t.name, t.defaultItems);
+  setup(c) {
+    const r = c, g = r.form.useStore((e) => e.values), m = l(() => r.name.replace(/\[/g, ".").replace(/\]/g, "").split(".").reduce((a, t) => a[t], g.value));
+    P(async () => {
+      r.defaultItems && !m.value && r.form.setFieldValue(r.name, r.defaultItems);
     });
-    const d = m(() => (r) => {
-      const a = r.replace(/\[\d+\]/g, "");
-      return t.form.meta[a];
+    const v = l(() => (a) => {
+      const t = a.replace(/\[\d+\]/g, "");
+      return r.form.meta[t];
     });
-    return g("getMetaFromArray", d), (e, r) => (s(!0), h(v, null, y(o.value, (a, n) => (s(), F(M(e.form.Field), {
-      key: `${e.name}[${Number(n)}]`,
-      name: `${e.name}[${Number(n)}]`
-    }, {
-      default: _(({ field: c, state: f }) => [
-        $(e.$slots, "default", k({ ref_for: !0 }, {
-          subField: c,
-          subState: f,
-          index: Number(n)
-        }))
-      ]),
-      _: 2
-    }, 1032, ["name"]))), 128));
+    return $("getMetaFromArray", v), (e, a) => (n(), s(u, null, [
+      (n(!0), s(u, null, M(m.value, (t, o) => (n(), d(i(e.form.Field), {
+        key: `${e.name}[${Number(o)}]`,
+        name: `${e.name}[${Number(o)}]`
+      }, {
+        default: f(({ field: h, state: y }) => [
+          p(e.$slots, "default", k({ ref_for: !0 }, {
+            subField: h,
+            subState: y,
+            index: Number(o)
+          }))
+        ]),
+        _: 2
+      }, 1032, ["name"]))), 128)),
+      (n(), d(i(e.form.Field), { name: e.name }, {
+        default: f(({ field: t }) => [
+          p(e.$slots, "field", A(b({ field: t })))
+        ]),
+        _: 3
+      }, 8, ["name"]))
+    ], 64));
   }
 });
 export {
-  P as default
+  B as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "@tanstack/vue-form": "^1.2.4",

package/src/components/OmegaForm/OmegaArray.vue

@@ -17,8 +17,12 @@
       />
     </template>
   </component>
+  <component :is="form.Field" :name="name">
+    <template #default="{ field }">
+      <slot name="field" v-bind="{ field }" />
+    </template>
+  </component>
 </template>
-
 <script
   setup
   lang="ts"

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -268,14 +268,16 @@ export const createMeta = <T = any>(
         )
 
         if (hasStructMembers) {
-          // Create metadata for the parent level (the union itself)
-          const parentMeta = createMeta<T>({
-            parent: key,
-            property: p.type,
-            meta: { required: isRequired, nullableOrUndefined },
-          })
-          acc[key as NestedKeyOf<T>] = parentMeta as FieldMeta
-
+          // Only create parent meta for non-NullOr unions to avoid duplicates
+          if (!nullableOrUndefined) {
+            const parentMeta = createMeta<T>({
+              parent: key,
+              property: p.type,
+              meta: { required: isRequired, nullableOrUndefined },
+            })
+            acc[key as NestedKeyOf<T>] = parentMeta as FieldMeta
+          }
+          
           // Process each non-null type and merge their metadata
           for (const nonNullType of nonNullTypes) {
             if ("propertySignatures" in nonNullType) {
@@ -298,8 +300,7 @@ export const createMeta = <T = any>(
           })
           acc[key as NestedKeyOf<T>] = newMeta as FieldMeta
         }
-      }
-      if ("propertySignatures" in typeToProcess) {
+      } else if ("propertySignatures" in typeToProcess) {
         Object.assign(
           acc,
           createMeta<T>({

package/src/components/OmegaForm/OmegaInput.vue

@@ -54,6 +54,7 @@ const meta = computed(() => {
 
 const schema = computed(() => {
   if (!meta.value) {
+    console.log(props.name, Object.keys(props.form.meta), props.form.meta)
     throw new Error("Meta is undefined")
   }
   return generateInputStandardSchemaFromFieldMeta(meta.value)