Form work

packages/extension-form/src/internal/FormField.ts

@@ -1,41 +1,11 @@
 import type { Array, Schema, SchemaAST } from "effect"
-import type * as FormTree from "./FormTree.ts"
+import type * as Formify from "./Formify.js"
 
 
 export interface FormField<S extends Schema.Schema.Any> {
     readonly schema: S
 }
 
-export interface GenericFormField<S extends Schema.Schema.Any> extends FormField<S> {
-    readonly _tag: "GenericFormField"
-    readonly value: S["Type"]
-}
-
-export interface TupleFormField<
-    S extends Schema.TupleType<Elements, Rest>,
-    Elements extends Schema.TupleType.Elements,
-    Rest extends Schema.TupleType.Rest,
-> extends FormField<S> {
-    readonly _tag: "TupleFormField"
-    readonly elements: [...{ readonly [K in keyof Elements]: FormTree.FormTree<Elements[K]> }]
-}
-
-export interface ArrayFormField<
-    S extends Schema.Array$<Value>,
-    Value extends Schema.Schema.Any,
-> extends FormField<S> {
-    readonly _tag: "ArrayFormField"
-    readonly elements: readonly FormTree.FormTree<Value>[]
-}
-
-export interface StructFormField<
-    S extends Schema.Struct<Fields>,
-    Fields extends Schema.Struct.Fields,
-> extends FormField<S> {
-    readonly _tag: "StructFormField"
-    readonly fields: { readonly [K in keyof Fields]: FormTree.FormTree<Fields[K]> }
-}
-
 export interface LiteralFormField<
     S extends Schema.Literal<Literals>,
     Literals extends Array.NonEmptyReadonlyArray<SchemaAST.LiteralValue>,
@@ -49,7 +19,37 @@ export interface UnionFormField<
     Members extends ReadonlyArray<Schema.Schema.All>,
 > extends FormField<S> {
     readonly _tag: "UnionFormField"
-    readonly member: FormTree.FormTree<Members[number]>
+    readonly member: Formify.Formify<Members[number]>
+}
+
+export interface TupleFormField<
+    S extends Schema.TupleType<Elements, Rest>,
+    Elements extends Schema.TupleType.Elements,
+    Rest extends Schema.TupleType.Rest,
+> extends FormField<S> {
+    readonly _tag: "TupleFormField"
+    readonly elements: [...{ readonly [K in keyof Elements]: Formify.Formify<Elements[K]> }]
+}
+
+export interface ArrayFormField<
+    S extends Schema.Array$<Value>,
+    Value extends Schema.Schema.Any,
+> extends FormField<S> {
+    readonly _tag: "ArrayFormField"
+    readonly elements: readonly Formify.Formify<Value>[]
+}
+
+export interface StructFormField<
+    S extends Schema.Struct<Fields>,
+    Fields extends Schema.Struct.Fields,
+> extends FormField<S> {
+    readonly _tag: "StructFormField"
+    readonly fields: { readonly [K in keyof Fields]: Formify.Formify<Fields[K]> }
+}
+
+export interface GenericFormField<S extends Schema.Schema.Any> extends FormField<S> {
+    readonly _tag: "GenericFormField"
+    readonly value: S["Type"]
 }
 
 

packages/extension-form/src/internal/Formify.ts

@@ -2,12 +2,12 @@ import { Schema } from "effect"
 import type * as FormField from "./FormField.js"
 
 
-export type FormTree<S> = (
+export type Formify<S> = (
+    S extends Schema.Literal<infer Literals> ? FormField.LiteralFormField<S, Literals> :
+    S extends Schema.Union<infer Members> ? FormField.UnionFormField<S, Members> :
     S extends Schema.TupleType<infer Elements, infer Rest> ? FormField.TupleFormField<S, Elements, Rest> :
     S extends Schema.Array$<infer Value> ? FormField.ArrayFormField<S, Value> :
     S extends Schema.Struct<infer Fields> ? FormField.StructFormField<S, Fields> :
-    S extends Schema.Literal<infer Literals> ? FormField.LiteralFormField<S, Literals> :
-    S extends Schema.Union<infer Members> ? FormField.UnionFormField<S, Members> :
     S extends Schema.Schema.Any ? FormField.GenericFormField<S> :
     S extends Schema.PropertySignature<
         infer TypeToken,
@@ -35,7 +35,7 @@ const LoginForm = Schema.Union(
         password: Schema.RedactedFromSelf(Schema.String),
     }),
 )
-type LoginFormTree = FormTree<typeof LoginForm>
+type LoginFormTree = Formify<typeof LoginForm>
 declare const loginFormTree: LoginFormTree
 
 switch (loginFormTree.member.fields._tag.value) {
@@ -53,7 +53,7 @@ const User = Schema.Struct({
     values: Schema.Array(Schema.String),
 })
 
-type TestFormTree = FormTree<typeof User>
+type TestFormTree = Formify<typeof User>
 declare const testFormTree: TestFormTree
 
 testFormTree.fields._tag