@effect-app/vue-components 4.0.0-beta.33 → 4.0.0-beta.36

package/dist/vue-components.es55.js

@@ -1,67 +1,31 @@
-import { DiagComponentLogger as m } from "./vue-components.es56.js";
-import { createLogLevelDiagLogger as y } from "./vue-components.es57.js";
-import { DiagLogLevel as d } from "./vue-components.es43.js";
-import { unregisterGlobal as p, getGlobal as v, registerGlobal as w } from "./vue-components.es58.js";
-var b = function(i, n) {
-  var r = typeof Symbol == "function" && i[Symbol.iterator];
-  if (!r) return i;
-  var t = r.call(i), a, e = [], o;
-  try {
-    for (; (n === void 0 || n-- > 0) && !(a = t.next()).done; ) e.push(a.value);
-  } catch (l) {
-    o = { error: l };
-  } finally {
-    try {
-      a && !a.done && (r = t.return) && r.call(t);
-    } finally {
-      if (o) throw o.error;
-    }
-  }
-  return e;
-}, _ = function(i, n, r) {
-  if (r || arguments.length === 2) for (var t = 0, a = n.length, e; t < a; t++)
-    (e || !(t in n)) && (e || (e = Array.prototype.slice.call(n, 0, t)), e[t] = n[t]);
-  return i.concat(e || Array.prototype.slice.call(n));
-}, h = "diag", P = (
-  /** @class */
-  (function() {
-    function i() {
-      function n(a) {
-        return function() {
-          for (var e = [], o = 0; o < arguments.length; o++)
-            e[o] = arguments[o];
-          var l = v("diag");
-          if (l)
-            return l[a].apply(l, _([], b(e), !1));
-        };
-      }
-      var r = this, t = function(a, e) {
-        var o, l, g;
-        if (e === void 0 && (e = { logLevel: d.INFO }), a === r) {
-          var u = new Error("Cannot use diag as the logger for itself. Please use a DiagLogger implementation like ConsoleDiagLogger or a custom implementation");
-          return r.error((o = u.stack) !== null && o !== void 0 ? o : u.message), !1;
-        }
-        typeof e == "number" && (e = {
-          logLevel: e
-        });
-        var f = v("diag"), s = y((l = e.logLevel) !== null && l !== void 0 ? l : d.INFO, a);
-        if (f && !e.suppressOverrideMessage) {
-          var c = (g = new Error().stack) !== null && g !== void 0 ? g : "<failed to generate stacktrace>";
-          f.warn("Current logger will be overwritten from " + c), s.warn("Current logger will overwrite one already registered from " + c);
-        }
-        return w("diag", s, r, !0);
-      };
-      r.setLogger = t, r.disable = function() {
-        p(h, r);
-      }, r.createComponentLogger = function(a) {
-        return new m(a);
-      }, r.verbose = n("verbose"), r.debug = n("debug"), r.info = n("info"), r.warn = n("warn"), r.error = n("error");
-    }
-    return i.instance = function() {
-      return this._instance || (this._instance = new i()), this._instance;
-    }, i;
-  })()
-);
+import { createContextKey as o } from "./vue-components.es42.js";
+import { NonRecordingSpan as a } from "./vue-components.es51.js";
+import { ContextAPI as u } from "./vue-components.es52.js";
+var n = o("OpenTelemetry Context Key SPAN");
+function r(e) {
+  return e.getValue(n) || void 0;
+}
+function S() {
+  return r(u.getInstance().active());
+}
+function i(e, t) {
+  return e.setValue(n, t);
+}
+function l(e) {
+  return e.deleteValue(n);
+}
+function d(e, t) {
+  return i(e, new a(t));
+}
+function m(e) {
+  var t;
+  return (t = r(e)) === null || t === void 0 ? void 0 : t.spanContext();
+}
 export {
-  P as DiagAPI
+  l as deleteSpan,
+  S as getActiveSpan,
+  r as getSpan,
+  m as getSpanContext,
+  i as setSpan,
+  d as setSpanContext
 };

package/dist/vue-components.es56.js

@@ -1,58 +1,67 @@
-import { getGlobal as f } from "./vue-components.es58.js";
-var p = function(n, e) {
-  var r = typeof Symbol == "function" && n[Symbol.iterator];
-  if (!r) return n;
-  var t = r.call(n), o, a = [], g;
+import { DiagComponentLogger as m } from "./vue-components.es57.js";
+import { createLogLevelDiagLogger as y } from "./vue-components.es58.js";
+import { DiagLogLevel as d } from "./vue-components.es43.js";
+import { unregisterGlobal as p, getGlobal as v, registerGlobal as w } from "./vue-components.es59.js";
+var b = function(i, n) {
+  var r = typeof Symbol == "function" && i[Symbol.iterator];
+  if (!r) return i;
+  var t = r.call(i), a, e = [], o;
   try {
-    for (; (e === void 0 || e-- > 0) && !(o = t.next()).done; ) a.push(o.value);
-  } catch (s) {
-    g = { error: s };
+    for (; (n === void 0 || n-- > 0) && !(a = t.next()).done; ) e.push(a.value);
+  } catch (l) {
+    o = { error: l };
   } finally {
     try {
-      o && !o.done && (r = t.return) && r.call(t);
+      a && !a.done && (r = t.return) && r.call(t);
     } finally {
-      if (g) throw g.error;
+      if (o) throw o.error;
     }
   }
-  return a;
-}, l = function(n, e, r) {
-  if (r || arguments.length === 2) for (var t = 0, o = e.length, a; t < o; t++)
-    (a || !(t in e)) && (a || (a = Array.prototype.slice.call(e, 0, t)), a[t] = e[t]);
-  return n.concat(a || Array.prototype.slice.call(e));
-}, i = (
+  return e;
+}, _ = function(i, n, r) {
+  if (r || arguments.length === 2) for (var t = 0, a = n.length, e; t < a; t++)
+    (e || !(t in n)) && (e || (e = Array.prototype.slice.call(n, 0, t)), e[t] = n[t]);
+  return i.concat(e || Array.prototype.slice.call(n));
+}, h = "diag", P = (
   /** @class */
   (function() {
-    function n(e) {
-      this._namespace = e.namespace || "DiagComponentLogger";
+    function i() {
+      function n(a) {
+        return function() {
+          for (var e = [], o = 0; o < arguments.length; o++)
+            e[o] = arguments[o];
+          var l = v("diag");
+          if (l)
+            return l[a].apply(l, _([], b(e), !1));
+        };
+      }
+      var r = this, t = function(a, e) {
+        var o, l, g;
+        if (e === void 0 && (e = { logLevel: d.INFO }), a === r) {
+          var u = new Error("Cannot use diag as the logger for itself. Please use a DiagLogger implementation like ConsoleDiagLogger or a custom implementation");
+          return r.error((o = u.stack) !== null && o !== void 0 ? o : u.message), !1;
+        }
+        typeof e == "number" && (e = {
+          logLevel: e
+        });
+        var f = v("diag"), s = y((l = e.logLevel) !== null && l !== void 0 ? l : d.INFO, a);
+        if (f && !e.suppressOverrideMessage) {
+          var c = (g = new Error().stack) !== null && g !== void 0 ? g : "<failed to generate stacktrace>";
+          f.warn("Current logger will be overwritten from " + c), s.warn("Current logger will overwrite one already registered from " + c);
+        }
+        return w("diag", s, r, !0);
+      };
+      r.setLogger = t, r.disable = function() {
+        p(h, r);
+      }, r.createComponentLogger = function(a) {
+        return new m(a);
+      }, r.verbose = n("verbose"), r.debug = n("debug"), r.info = n("info"), r.warn = n("warn"), r.error = n("error");
     }
-    return n.prototype.debug = function() {
-      for (var e = [], r = 0; r < arguments.length; r++)
-        e[r] = arguments[r];
-      return u("debug", this._namespace, e);
-    }, n.prototype.error = function() {
-      for (var e = [], r = 0; r < arguments.length; r++)
-        e[r] = arguments[r];
-      return u("error", this._namespace, e);
-    }, n.prototype.info = function() {
-      for (var e = [], r = 0; r < arguments.length; r++)
-        e[r] = arguments[r];
-      return u("info", this._namespace, e);
-    }, n.prototype.warn = function() {
-      for (var e = [], r = 0; r < arguments.length; r++)
-        e[r] = arguments[r];
-      return u("warn", this._namespace, e);
-    }, n.prototype.verbose = function() {
-      for (var e = [], r = 0; r < arguments.length; r++)
-        e[r] = arguments[r];
-      return u("verbose", this._namespace, e);
-    }, n;
+    return i.instance = function() {
+      return this._instance || (this._instance = new i()), this._instance;
+    }, i;
   })()
 );
-function u(n, e, r) {
-  var t = f("diag");
-  if (t)
-    return r.unshift(e), t[n].apply(t, l([], p(r), !1));
-}
 export {
-  i as DiagComponentLogger
+  P as DiagAPI
 };

package/dist/vue-components.es57.js

@@ -1,19 +1,58 @@
-import { DiagLogLevel as r } from "./vue-components.es43.js";
-function c(n, o) {
-  n < r.NONE ? n = r.NONE : n > r.ALL && (n = r.ALL), o = o || {};
-  function i(t, f) {
-    var e = o[t];
-    return typeof e == "function" && n >= f ? e.bind(o) : function() {
-    };
+import { getGlobal as f } from "./vue-components.es59.js";
+var p = function(n, e) {
+  var r = typeof Symbol == "function" && n[Symbol.iterator];
+  if (!r) return n;
+  var t = r.call(n), o, a = [], g;
+  try {
+    for (; (e === void 0 || e-- > 0) && !(o = t.next()).done; ) a.push(o.value);
+  } catch (s) {
+    g = { error: s };
+  } finally {
+    try {
+      o && !o.done && (r = t.return) && r.call(t);
+    } finally {
+      if (g) throw g.error;
+    }
   }
-  return {
-    error: i("error", r.ERROR),
-    warn: i("warn", r.WARN),
-    info: i("info", r.INFO),
-    debug: i("debug", r.DEBUG),
-    verbose: i("verbose", r.VERBOSE)
-  };
+  return a;
+}, l = function(n, e, r) {
+  if (r || arguments.length === 2) for (var t = 0, o = e.length, a; t < o; t++)
+    (a || !(t in e)) && (a || (a = Array.prototype.slice.call(e, 0, t)), a[t] = e[t]);
+  return n.concat(a || Array.prototype.slice.call(e));
+}, i = (
+  /** @class */
+  (function() {
+    function n(e) {
+      this._namespace = e.namespace || "DiagComponentLogger";
+    }
+    return n.prototype.debug = function() {
+      for (var e = [], r = 0; r < arguments.length; r++)
+        e[r] = arguments[r];
+      return u("debug", this._namespace, e);
+    }, n.prototype.error = function() {
+      for (var e = [], r = 0; r < arguments.length; r++)
+        e[r] = arguments[r];
+      return u("error", this._namespace, e);
+    }, n.prototype.info = function() {
+      for (var e = [], r = 0; r < arguments.length; r++)
+        e[r] = arguments[r];
+      return u("info", this._namespace, e);
+    }, n.prototype.warn = function() {
+      for (var e = [], r = 0; r < arguments.length; r++)
+        e[r] = arguments[r];
+      return u("warn", this._namespace, e);
+    }, n.prototype.verbose = function() {
+      for (var e = [], r = 0; r < arguments.length; r++)
+        e[r] = arguments[r];
+      return u("verbose", this._namespace, e);
+    }, n;
+  })()
+);
+function u(n, e, r) {
+  var t = f("diag");
+  if (t)
+    return r.unshift(e), t[n].apply(t, l([], p(r), !1));
 }
 export {
-  c as createLogLevelDiagLogger
+  i as DiagComponentLogger
 };

package/dist/vue-components.es58.js

@@ -1,35 +1,19 @@
-import { VERSION as t } from "./vue-components.es61.js";
-import { isCompatible as f } from "./vue-components.es62.js";
-import { _globalThis as m } from "./vue-components.es63.js";
-var u = t.split(".")[0], n = /* @__PURE__ */ Symbol.for("opentelemetry.js.api." + u), l = m;
-function d(r, o, e, i) {
-  var v;
-  i === void 0 && (i = !1);
-  var s = l[n] = (v = l[n]) !== null && v !== void 0 ? v : {
-    version: t
-  };
-  if (!i && s[r]) {
-    var a = new Error("@opentelemetry/api: Attempted duplicate registration of API: " + r);
-    return e.error(a.stack || a.message), !1;
-  }
-  if (s.version !== t) {
-    var a = new Error("@opentelemetry/api: Registration of version v" + s.version + " for " + r + " does not match previously registered API v" + t);
-    return e.error(a.stack || a.message), !1;
+import { DiagLogLevel as r } from "./vue-components.es43.js";
+function c(n, o) {
+  n < r.NONE ? n = r.NONE : n > r.ALL && (n = r.ALL), o = o || {};
+  function i(t, f) {
+    var e = o[t];
+    return typeof e == "function" && n >= f ? e.bind(o) : function() {
+    };
   }
-  return s[r] = o, e.debug("@opentelemetry/api: Registered a global for " + r + " v" + t + "."), !0;
-}
-function E(r) {
-  var o, e, i = (o = l[n]) === null || o === void 0 ? void 0 : o.version;
-  if (!(!i || !f(i)))
-    return (e = l[n]) === null || e === void 0 ? void 0 : e[r];
-}
-function _(r, o) {
-  o.debug("@opentelemetry/api: Unregistering a global for " + r + " v" + t + ".");
-  var e = l[n];
-  e && delete e[r];
+  return {
+    error: i("error", r.ERROR),
+    warn: i("warn", r.WARN),
+    info: i("info", r.INFO),
+    debug: i("debug", r.DEBUG),
+    verbose: i("verbose", r.VERBOSE)
+  };
 }
 export {
-  E as getGlobal,
-  d as registerGlobal,
-  _ as unregisterGlobal
+  c as createLogLevelDiagLogger
 };

package/dist/vue-components.es59.js

@@ -1,31 +1,35 @@
-import { createContextKey as o } from "./vue-components.es42.js";
-import { NonRecordingSpan as a } from "./vue-components.es51.js";
-import { ContextAPI as u } from "./vue-components.es52.js";
-var n = o("OpenTelemetry Context Key SPAN");
-function r(e) {
-  return e.getValue(n) || void 0;
+import { VERSION as t } from "./vue-components.es61.js";
+import { isCompatible as f } from "./vue-components.es62.js";
+import { _globalThis as m } from "./vue-components.es63.js";
+var u = t.split(".")[0], n = /* @__PURE__ */ Symbol.for("opentelemetry.js.api." + u), l = m;
+function d(r, o, e, i) {
+  var v;
+  i === void 0 && (i = !1);
+  var s = l[n] = (v = l[n]) !== null && v !== void 0 ? v : {
+    version: t
+  };
+  if (!i && s[r]) {
+    var a = new Error("@opentelemetry/api: Attempted duplicate registration of API: " + r);
+    return e.error(a.stack || a.message), !1;
+  }
+  if (s.version !== t) {
+    var a = new Error("@opentelemetry/api: Registration of version v" + s.version + " for " + r + " does not match previously registered API v" + t);
+    return e.error(a.stack || a.message), !1;
+  }
+  return s[r] = o, e.debug("@opentelemetry/api: Registered a global for " + r + " v" + t + "."), !0;
 }
-function S() {
-  return r(u.getInstance().active());
+function E(r) {
+  var o, e, i = (o = l[n]) === null || o === void 0 ? void 0 : o.version;
+  if (!(!i || !f(i)))
+    return (e = l[n]) === null || e === void 0 ? void 0 : e[r];
 }
-function i(e, t) {
-  return e.setValue(n, t);
-}
-function l(e) {
-  return e.deleteValue(n);
-}
-function d(e, t) {
-  return i(e, new a(t));
-}
-function m(e) {
-  var t;
-  return (t = r(e)) === null || t === void 0 ? void 0 : t.spanContext();
+function _(r, o) {
+  o.debug("@opentelemetry/api: Unregistering a global for " + r + " v" + t + ".");
+  var e = l[n];
+  e && delete e[r];
 }
 export {
-  l as deleteSpan,
-  S as getActiveSpan,
-  r as getSpan,
-  m as getSpanContext,
-  i as setSpan,
-  d as setSpanContext
+  E as getGlobal,
+  d as registerGlobal,
+  _ as unregisterGlobal
 };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "4.0.0-beta.33",
+  "version": "4.0.0-beta.36",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
-    "effect": "^4.0.0-beta.37",
+    "effect": "^4.0.0-beta.40",
     "intl-messageformat": "^11.1.2",
     "mdi-js": "^1.0.1",
     "primeflex": "^4.0.0",
@@ -24,7 +24,7 @@
     "rimraf": "^6.1.3",
     "sass": "^1.97.3",
     "storybook": "^10.2.15",
-    "typescript": "~5.9.3",
+    "typescript": "~6.0.2",
     "vite": "^7.3.1",
     "vite-plugin-css-injected-by-js": "^4.0.1",
     "vitepress": "^1.6.4",
@@ -57,8 +57,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "4.0.0-beta.33",
-    "effect-app": "4.0.0-beta.33"
+    "@effect-app/vue": "4.0.0-beta.36",
+    "effect-app": "4.0.0-beta.36"
   },
   "scripts": {
     "check": "vue-tsc",

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -3,6 +3,7 @@ import { Effect, Option, type Record, S } from "effect-app"
 import { type DeepKeys, type DeepValue, type FieldAsyncValidateOrFn, type FieldValidateOrFn, type FormApi, type FormAsyncValidateOrFn, type FormOptions, type FormState, type FormValidateOrFn, type StandardSchemaV1, type VueFormApi } from "@tanstack/vue-form"
 import { isObject } from "@vueuse/core"
 import type { Fiber as EffectFiber } from "effect/Fiber"
+import type { Redacted } from "effect/Redacted"
 import { getTransformationFrom, useIntl } from "../../utils"
 import { type OmegaFieldInternalApi } from "./InputProps"
 import { type OF, type OmegaFormReturn } from "./useOmegaForm"
@@ -23,7 +24,7 @@ const isDevelopmentEnvironment = () => {
 
 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 ? ""
+  : T extends string | boolean | number | null | undefined | symbol | bigint | Redacted<any> ? ""
   // technically we cannot have array at the root
   : T extends ReadonlyArray<infer U> ? FieldPath_<U, `[${number}]`>
   : {
@@ -31,7 +32,7 @@ export type FieldPath<T> = unknown extends T ? 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 string | boolean | number | null | undefined | symbol | bigint | Redacted<any> ? Path
   : T extends ReadonlyArray<infer U> ? FieldPath_<U, `${Path}[${number}]`> | Path
   : {
     [K in keyof T]: FieldPath_<T[K], `${Path}.${K & string}`>
@@ -236,7 +237,13 @@ export type PrefixFromDepth<
   _TDepth extends any[]
 > = K
 
-export type NestedKeyOf<T> = DeepKeys<T>
+// Recursively replace Redacted<A> with its inner type so DeepKeys treats it as a leaf
+type StripRedacted<T> = T extends Redacted<any> ? string
+  : T extends ReadonlyArray<infer U> ? ReadonlyArray<StripRedacted<U>>
+  : T extends Record<string, any> ? { [K in keyof T]: StripRedacted<T[K]> }
+  : T
+
+export type NestedKeyOf<T> = DeepKeys<StripRedacted<T>>
 
 export type FieldValidators<T> = {
   onChangeAsync?: FieldAsyncValidateOrFn<T, any, any>
@@ -730,7 +737,7 @@ export const createMeta = <T = any>(
               // 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: isRequired
-                && (!S.AST.isString(typeToProcess) || !!getFieldMetadataFromAst(p.type).minLength),
+                && (!S.AST.isString(typeToProcess) || !!getFieldMetadataFromAst(typeToProcess).minLength),
               nullableOrUndefined
             }
           })
@@ -937,6 +944,70 @@ const metadataFromAst = <From, To>(
   return { meta: newMeta, defaultValues, unionMeta }
 }
 
+/*
+ * Checks if an AST node is a S.Redacted Declaration without encoding.
+ * These need to be swapped to S.RedactedFromValue for form usage
+ * because S.Redacted expects Redacted objects, not plain strings.
+ */
+const isRedactedWithoutEncoding = (ast: S.AST.AST): boolean =>
+  S.AST.isDeclaration(ast)
+  && (ast.annotations as any)?.typeConstructor?._tag === "effect/Redacted"
+  && !ast.encoding
+
+/*
+ * Creates a form-compatible schema by replacing S.Redacted(X) with
+ * S.RedactedFromValue(X). S.Redacted is a Declaration that expects
+ * Redacted<A> on both encoded and type sides, so form inputs (which
+ * produce plain strings) fail validation. S.RedactedFromValue accepts
+ * plain values on the encoded side and wraps them in Redacted on decode.
+ */
+export const toFormSchema = <From, To>(
+  schema: S.Codec<To, From, never>
+): S.Codec<To, From, never> => {
+  const ast = schema.ast
+  const objAst = S.AST.isObjects(ast)
+    ? ast
+    : S.AST.isDeclaration(ast)
+    ? S.AST.toEncoded(ast)
+    : null
+
+  if (!objAst || !("propertySignatures" in objAst)) return schema
+
+  let hasRedacted = false
+  const props: Record<string, S.Struct.Fields[string]> = {}
+
+  for (const p of objAst.propertySignatures) {
+    if (isRedactedWithoutEncoding(p.type)) {
+      hasRedacted = true
+      const innerSchema = S.make((p.type as S.AST.Declaration).typeParameters[0]!)
+      props[p.name as string] = S.RedactedFromValue(innerSchema)
+    } else if (S.AST.isUnion(p.type)) {
+      const types = p.type.types
+      const redactedType = types.find(isRedactedWithoutEncoding)
+      if (redactedType) {
+        hasRedacted = true
+        const innerSchema = S.make((redactedType as S.AST.Declaration).typeParameters[0]!)
+        const hasNull = types.some(S.AST.isNull)
+        const hasUndefined = types.some(S.AST.isUndefined)
+        const base = S.RedactedFromValue(innerSchema)
+        props[p.name as string] = hasNull && hasUndefined
+          ? S.NullishOr(base)
+          : hasNull
+          ? S.NullOr(base)
+          : hasUndefined
+          ? S.UndefinedOr(base)
+          : base
+      } else {
+        props[p.name as string] = S.make(p.type)
+      }
+    } else {
+      props[p.name as string] = S.make(p.type)
+    }
+  }
+
+  return hasRedacted ? S.Struct(props) as unknown as S.Codec<To, From, never> : schema
+}
+
 export const duplicateSchema = <From, To>(
   schema: S.Codec<To, From, never>
 ) => {

package/src/components/OmegaForm/useOmegaForm.ts

@@ -11,7 +11,7 @@ import { MergedInputProps } from "./InputProps"
 import OmegaArray from "./OmegaArray.vue"
 import OmegaAutoGen from "./OmegaAutoGen.vue"
 import OmegaErrorsInternal from "./OmegaErrorsInternal.vue"
-import { BaseProps, deepMerge, defaultsValueFromSchema, DefaultTypeProps, FieldPath, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
+import { BaseProps, deepMerge, defaultsValueFromSchema, DefaultTypeProps, FieldPath, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState, toFormSchema } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import OmegaTaggedUnion from "./OmegaTaggedUnion.vue"
 import OmegaForm from "./OmegaWrapper.vue"
@@ -395,7 +395,7 @@ export interface OmegaFormReturn<
 > extends OF<From, To> {
   // Pre-computed type aliases - computed ONCE for performance
   _paths: FieldPath<From>
-  _keys: DeepKeys<From>
+  _keys: NestedKeyOf<From>
   _schema: S.Codec<To, From, never>
 
   // this crazy thing here is copied from the OmegaFormInput.vue.d.ts, with `From` removed as Generic, instead closed over from the From generic above..
@@ -680,8 +680,9 @@ export const useOmegaForm = <
   omegaConfig?: OmegaConfig<To>
 ): OmegaFormReturn<From, To, TypeProps> => {
   if (!schema) throw new Error("Schema is required")
-  const standardSchema = S.toStandardSchemaV1(schema)
-  const decode = S.decodeUnknownEffect(schema)
+  const formCompatibleSchema = toFormSchema(schema)
+  const standardSchema = S.toStandardSchemaV1(formCompatibleSchema)
+  const decode = S.decodeUnknownEffect(formCompatibleSchema)
 
   const { meta, unionMeta } = generateMetaFromSchema(schema)