@effect-app/vue-components 2.3.1 → 2.4.0

package/dist/types/components/OmegaForm/OmegaFormStuff.d.ts

@@ -3,10 +3,10 @@ import { type DeepKeys, type DeepValue, type FieldAsyncValidateOrFn, type FieldV
 import { type RuntimeFiber } from "effect/Fiber";
 import { type OmegaFieldInternalApi } from "./InputProps";
 import { type OF, type OmegaFormReturn } from "./useOmegaForm";
-export type Leaves<T, Path extends string = ""> = T extends ReadonlyArray<infer U> ? Leaves<U, `${Path}[${number}]`> & {} : {
-    [K in keyof T]: T[K] extends string | boolean | number | null | undefined | symbol | bigint ? `${Path extends "" ? "" : `${Path}.`}${K & string}` : Leaves<T[K], `${Path extends "" ? "" : `${Path}.`}${K & string}`> & {};
+export type FieldPath<T, Path extends string = ""> = unknown extends T ? string : T extends string | boolean | number | null | undefined | symbol | bigint ? `${Path extends "" ? "" : `${Path}`}` : T extends ReadonlyArray<infer U> ? (FieldPath<U, `${Path}[${number}]`> & {}) | Path : {
+    [K in keyof T]: T[K] extends string | boolean | number | null | undefined | symbol | bigint ? `${Path extends "" ? "" : `${Path}.`}${K & string}` : FieldPath<T[K], `${Path extends "" ? "" : `${Path}.`}${K & string}`> & {};
 }[keyof T];
-export type BaseProps<From, TName extends NestedKeyOf<From> = NestedKeyOf<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.
@@ -14,7 +14,7 @@ export type BaseProps<From, TName extends NestedKeyOf<From> = NestedKeyOf<From>>
      */
     label?: string;
     validators?: FieldValidators<From>;
-    name: TName & Leaves<From>;
+    name: TName;
     /**
      * Optional class to apply to the input element.
      * - If a string is provided, it will be used instead of the general class

package/dist/types/components/OmegaForm/useOmegaForm.d.ts

@@ -2,7 +2,7 @@ import { type DeepKeys, DeepValue, StandardSchemaV1Issue, ValidationError, Valid
 import { Effect, Order, S } from "effect-app";
 import { ComputedRef, type InjectionKey } from "vue";
 import { MergedInputProps } from "./InputProps";
-import { BaseProps, DefaultTypeProps, type FormProps, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff";
+import { BaseProps, DefaultTypeProps, FieldPath, type FormProps, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff";
 type keysRule<T> = {
     keys?: NestedKeyOf<T>[];
     banKeys?: "You should only use one of banKeys or keys, not both, moron";
@@ -77,8 +77,8 @@ type __VLS_PrettifyLocal<T> = {
     [K in keyof T]: T[K];
 } & {};
 export interface OmegaFormReturn<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, TypeProps = DefaultTypeProps> extends OF<From, To> {
-    Input: <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<Pick<Partial<{}> & Omit<{} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, never> & BaseProps<From> & TypeProps & Partial<{}>> & import("vue").PublicProps;
+    Input: <Name extends FieldPath<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<Pick<Partial<{}> & Omit<{} & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>, never> & BaseProps<From, Name> & TypeProps & Partial<{}>> & import("vue").PublicProps;
         expose(exposed: import("vue").ShallowUnwrapRef<{}>): void;
         attrs: any;
         slots: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.18.0",
@@ -53,8 +53,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "effect-app": "3.12.0",
-    "@effect-app/vue": "2.92.1"
+    "@effect-app/vue": "2.92.1",
+    "effect-app": "3.12.0"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -7,15 +7,16 @@ import { getTransformationFrom, useIntl } from "../../utils"
 import { type OmegaFieldInternalApi } from "./InputProps"
 import { type OF, type OmegaFormReturn } from "./useOmegaForm"
 
-export type Leaves<T, Path extends string = ""> = T extends ReadonlyArray<infer U>
-  ? Leaves<U, `${Path}[${number}]`> & {}
+export type FieldPath<T, Path extends string = ""> = unknown extends T ? string
+  : T extends string | boolean | number | null | undefined | symbol | bigint ? `${Path extends "" ? "" : `${Path}`}`
+  : T extends ReadonlyArray<infer U> ? (FieldPath<U, `${Path}[${number}]`> & {}) | Path
   : {
     [K in keyof T]: T[K] extends string | boolean | number | null | undefined | symbol | bigint
       ? `${Path extends "" ? "" : `${Path}.`}${K & string}`
-      : Leaves<T[K], `${Path extends "" ? "" : `${Path}.`}${K & string}`> & {}
+      : FieldPath<T[K], `${Path extends "" ? "" : `${Path}.`}${K & string}`> & {}
   }[keyof T]
 
-export type BaseProps<From, TName extends NestedKeyOf<From> = NestedKeyOf<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.
@@ -24,7 +25,7 @@ export type BaseProps<From, TName extends NestedKeyOf<From> = NestedKeyOf<From>>
   label?: string
   validators?: FieldValidators<From>
   // Use FlexibleArrayPath: if name contains [], just use TName; otherwise intersect with Leaves<From>
-  name: TName & Leaves<From>
+  name: TName
   /**
    * Optional class to apply to the input element.
    * - If a string is provided, it will be used instead of the general class

package/src/components/OmegaForm/OmegaTaggedUnion.vue

@@ -10,7 +10,7 @@
 import { type DeepKeys, type DeepValue } from "@tanstack/vue-form"
 import { onMounted } from "vue"
 import { type TaggedUnionOption, type TaggedUnionOptionsArray } from "./InputProps"
-import { type Leaves } from "./OmegaFormStuff"
+import { type FieldPath } from "./OmegaFormStuff"
 import OmegaTaggedUnionInternal from "./OmegaTaggedUnionInternal.vue"
 import { type useOmegaForm } from "./useOmegaForm"
 
@@ -46,7 +46,7 @@ onMounted(() => {
 
 <template>
   <form.Input
-    :name="`${name}._tag` as Leaves<From, ''>"
+    :name="`${name}._tag` as FieldPath<From, ''>"
     :label="label"
     :type="type ?? 'select'"
     :options="options as unknown as TaggedUnionOption<From, Name>[]"

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, DefaultTypeProps, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
+import { BaseProps, DefaultTypeProps, FieldPath, type FormProps, generateMetaFromSchema, type MetaRecord, type NestedKeyOf, OmegaArrayProps, OmegaAutoGenMeta, OmegaError, type OmegaFormApi, OmegaFormState } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import OmegaTaggedUnion from "./OmegaTaggedUnion.vue"
 import OmegaForm from "./OmegaWrapper.vue"
@@ -213,7 +213,7 @@ export interface OmegaFormReturn<
   TypeProps = DefaultTypeProps
 > extends OF<From, To> {
   // 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..
-  Input: <Name extends DeepKeys<From>>(
+  Input: <Name extends FieldPath<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"],
@@ -228,7 +228,7 @@ export interface OmegaFormReturn<
             >,
             never
           >
-          & BaseProps<From>
+          & BaseProps<From, Name>
           & TypeProps
           & Partial<{}>
         >