@effect-app/vue-components 2.4.7 → 2.4.9

package/dist/vue-components.es10.js

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

package/dist/vue-components.es36.js

@@ -1,7 +1,7 @@
 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.es52.js";
+import { getOmegaStore as c } from "./vue-components.es53.js";
 const S = ["disabled"], V = /* @__PURE__ */ m({
   __name: "OmegaWrapper",
   props: {

package/dist/vue-components.es52.js

@@ -1,13 +1,6 @@
-import { useStore as u } from "@tanstack/vue-form";
-import { computed as f } from "vue";
-function c(o, t) {
-  return f(() => t ? u(o.store, (n) => {
-    const r = {};
-    for (const e of t)
-      r[e] = n[e];
-    return r;
-  }).value : {});
-}
+(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";
+
 export {
-  c as getOmegaStore
+  o as default
 };

package/dist/vue-components.es53.js

@@ -1,6 +1,13 @@
-(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 { useStore as u } from "@tanstack/vue-form";
+import { computed as f } from "vue";
+function c(o, t) {
+  return f(() => t ? u(o.store, (n) => {
+    const r = {};
+    for (const e of t)
+      r[e] = n[e];
+    return r;
+  }).value : {});
+}
 export {
-  o as default
+  c as getOmegaStore
 };

package/package.json

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

package/src/components/OmegaForm/OmegaArray.vue

@@ -45,15 +45,14 @@
   generic="
   // dprint ignore - somehow with 120 chars, this becomes a mess. should report it.
   From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>,
-  Name extends DeepKeys<From>
+  To extends Record<PropertyKey, any>
 "
 >
 import { type DeepKeys } from "@tanstack/vue-form"
 import { computed, onMounted, provide } from "vue"
 import { type OmegaArrayProps } from "./OmegaFormStuff"
 
-const props = defineProps<OmegaArrayProps<From, To, Name>>()
+const props = defineProps<OmegaArrayProps<From, To>>()
 
 defineOptions({
   inheritAttrs: false

package/src/components/OmegaForm/OmegaAutoGen.vue

@@ -4,7 +4,7 @@
     :child="{ name, label, ...attrs }"
   >
     <form.Input
-      :name="name as FieldPath<From>"
+      :name="name"
       :label="label"
       v-bind="attrs"
     />
@@ -16,16 +16,15 @@
   lang="ts"
   generic="
   From extends Record<PropertyKey, string>,
-  To extends Record<PropertyKey, string>,
-  Name extends DeepKeys<From>
+  To extends Record<PropertyKey, string>
 "
 >
 import { type DeepKeys } from "@tanstack/vue-form"
 import { Array as A, Order, pipe } from "effect-app"
 import { computed } from "vue"
-import { type FieldMeta, type FieldPath, type OmegaAutoGenMeta, type OmegaInputProps } from "./OmegaFormStuff"
+import { type FieldMeta, type OmegaAutoGenMeta, type OmegaInputProps } from "./OmegaFormStuff"
 
-type NewMeta = OmegaAutoGenMeta<From, To, Name>
+type NewMeta = OmegaAutoGenMeta<From, To>
 
 const mapObject = <K extends string, A, B>(fn: (value: A, key: K) => B) => (obj: Record<K, A>): Record<K, B> =>
   Object.fromEntries(
@@ -52,7 +51,7 @@ const filterMapRecord =
     )
 
 const props = defineProps<{
-  form: OmegaInputProps<From, To, Name>["form"]
+  form: OmegaInputProps<From, To>["form"]
   pick?: DeepKeys<From>[]
   omit?: DeepKeys<From>[]
   labelMap?: (key: DeepKeys<From>) => string | undefined

package/src/components/OmegaForm/OmegaFormInput.vue

@@ -27,8 +27,7 @@ import { OmegaFormKey } from "./useOmegaForm"
 
 const form = inject(OmegaFormKey) as unknown as OmegaInputProps<
   From,
-  To,
-  Name
+  To
 >["form"]
 
 if (!form) {
@@ -36,7 +35,7 @@ if (!form) {
 }
 
 defineProps<
-  BaseProps<From, Name> & DefaultTypeProps
+  BaseProps<From> & DefaultTypeProps
 >()
 
 defineSlots<{

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -17,19 +17,19 @@ export type FieldPath<T> = unknown extends T ? string
   // technically we cannot have primitive at the root
   : T extends string | boolean | number | null | undefined | symbol | bigint ? ""
   // technically we cannot have array at the root
-  : T extends ReadonlyArray<infer U> ? FieldPath_<U, `[${number}]`>
+  : T extends ReadonlyArray<infer U> ? Compute<FieldPath_<U, `[${number}]`>>
   : {
-    [K in keyof T]: FieldPath_<T[K], `${K & string}`>
+    [K in keyof T]: Compute<FieldPath_<T[K], `${K & string}`>>
   }[keyof T]
 
 export type FieldPath_<T, Path extends string> = unknown extends T ? string
   : T extends string | boolean | number | null | undefined | symbol | bigint ? Path
-  : T extends ReadonlyArray<infer U> ? FieldPath_<U, `${Path}[${number}]`> | Path
+  : T extends ReadonlyArray<infer U> ? Compute<FieldPath_<U, `${Path}[${number}]`>> | Path
   : {
-    [K in keyof T]: FieldPath_<T[K], `${Path}.${K & string}`>
+    [K in keyof T]: Compute<FieldPath_<T[K], `${Path}.${K & string}`>>
   }[keyof T]
 
-export type BaseProps<From, TName extends FieldPath<From>> = {
+export type BaseProps<From, TName extends FieldPath<From> = FieldPath<From>> = {
   /**
    * Will fallback to i18n when not specified.
    * Can also be provided via #label slot for custom HTML labels.
@@ -64,34 +64,31 @@ export type DefaultTypeProps = {
 
 export type OmegaInputPropsBase<
   From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>,
-  Name extends DeepKeys<From>
+  To extends Record<PropertyKey, any>
 > = {
   form: OF<From, To> & {
     meta: MetaRecord<From>
     i18nNamespace?: string
   }
-} & BaseProps<From, Name>
+} & BaseProps<From>
 
 export type OmegaInputProps<
   From extends Record<PropertyKey, any>,
   To extends Record<PropertyKey, any>,
-  Name extends DeepKeys<From>,
   TypeProps = DefaultTypeProps
 > = {
   form: OmegaFormReturn<From, To, TypeProps> & {
     meta: MetaRecord<From>
     i18nNamespace?: string
   }
-} & BaseProps<From, Name>
+} & BaseProps<From>
 
 export type OmegaArrayProps<
   From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>,
-  Name extends DeepKeys<From>
+  To extends Record<PropertyKey, any>
 > =
   & Omit<
-    OmegaInputProps<From, To, Name>,
+    OmegaInputProps<From, To>,
     "validators" | "options" | "label" | "type" | "items" | "name"
   >
   & {
@@ -889,9 +886,8 @@ export const nullableInput = <A, I, R>(
 
 export type OmegaAutoGenMeta<
   From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>,
-  Name extends DeepKeys<From>
-> = Omit<OmegaInputProps<From, To, Name>, "form">
+  To extends Record<PropertyKey, any>
+> = Omit<OmegaInputProps<From, To>, "form">
 
 const supportedInputs = [
   "button",

package/src/components/OmegaForm/OmegaInput.vue

@@ -40,8 +40,7 @@
   generic="
   // dprint ignore - somehow with 120 chars, this becomes a mess. should report it.
   From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>,
-  Name extends DeepKeys<From>
+  To extends Record<PropertyKey, any>
 "
 >
 import { type DeepKeys } from "@tanstack/vue-form"
@@ -50,7 +49,7 @@ import { useIntl } from "../../utils"
 import { type FieldMeta, generateInputStandardSchemaFromFieldMeta, type OmegaInputPropsBase } from "./OmegaFormStuff"
 import OmegaInternalInput from "./OmegaInternalInput.vue"
 
-const props = defineProps<OmegaInputPropsBase<From, To, Name>>()
+const props = defineProps<OmegaInputPropsBase<From, To>>()
 
 // downgrade to *as* DeepKeys<From> to avoid useless and possible infinite recursion in TS
 const propsName = computed(() => props.name as DeepKeys<From>)