Form work

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

@@ -1,4 +1,4 @@
-import type { Schema } from "effect"
+import type { Array, Schema, SchemaAST } from "effect"
 import type * as FormTree from "./FormTree.ts"
 
 
@@ -11,34 +11,59 @@ export interface GenericFormField<S extends Schema.Schema.Any> extends FormField
     readonly value: S["Type"]
 }
 
-export interface TupleFormField<S extends Schema.Tuple<readonly Schema.Schema.Any[]>> extends FormField<S> {
+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 S["elements"]]: FormTree.FormTree<
-        S["elements"][K] extends Schema.Schema.Any
-            ? S["elements"][K]
-            : never
-    > }
+    readonly elements: [...{ readonly [K in keyof Elements]: FormTree.FormTree<Elements[K]> }]
 }
 
-export interface Tuple2FormField<S extends Schema.Tuple2<Schema.Schema.Any, Schema.Schema.Any>> extends FormField<S> {
-    readonly _tag: "Tuple2FormField"
-    readonly elements: { readonly [K in keyof S["elements"]]: FormTree.FormTree<
-        S["elements"][K] extends Schema.Schema.Any
-            ? S["elements"][K]
-            : never
-    > }
-}
-
-export interface ArrayFormField<S extends Schema.Array$<Schema.Schema.AnyNoContext>> extends FormField<S> {
+export interface ArrayFormField<
+    S extends Schema.Array$<Value>,
+    Value extends Schema.Schema.Any,
+> extends FormField<S> {
     readonly _tag: "ArrayFormField"
-    readonly elements: readonly FormTree.FormTree<S["value"]>[]
+    readonly elements: readonly FormTree.FormTree<Value>[]
 }
 
-export interface StructFormField<S extends Schema.Struct<{
-    readonly [x: string]: Schema.Schema.AnyNoContext
-    readonly [x: number]: Schema.Schema.AnyNoContext
-    readonly [x: symbol]: Schema.Schema.AnyNoContext
-}>> extends FormField<S> {
+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 S["fields"]]: FormTree.FormTree<S["fields"][K]> }
+    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>,
+> extends FormField<S> {
+    readonly _tag: "LiteralFormField"
+    readonly value: S["Type"]
+}
+
+export interface UnionFormField<
+    S extends Schema.Union<Members>,
+    Members extends ReadonlyArray<Schema.Schema.All>,
+> extends FormField<S> {
+    readonly _tag: "UnionFormField"
+    readonly member: FormTree.FormTree<Members[number]>
+}
+
+
+export interface PropertySignatureFormField<
+    S extends Schema.PropertySignature<TypeToken, Type, Key, EncodedToken, Encoded, HasDefault, R>,
+    TypeToken extends Schema.PropertySignature.Token,
+    Type,
+    Key extends PropertyKey,
+    EncodedToken extends Schema.PropertySignature.Token,
+    Encoded,
+    HasDefault extends boolean = false,
+    R = never,
+> {
+    readonly _tag: "PropertySignatureFormField"
+    readonly propertySignature: S
+    readonly value: Type
 }

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

@@ -2,16 +2,52 @@ import { Schema } from "effect"
 import type * as FormField from "./FormField.js"
 
 
-export type FormTree<S extends Schema.Schema.Any> = (
-    S extends Schema.Tuple<any> ? FormField.TupleFormField<S> :
-    S extends Schema.Tuple2<any, any> ? FormField.Tuple2FormField<S> :
-    S extends Schema.Array$<any> ? FormField.ArrayFormField<S> :
-    S extends Schema.Struct<any> ? FormField.StructFormField<S> :
-    FormField.GenericFormField<S>
+export type FormTree<S> = (
+    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,
+        infer Type,
+        infer Key,
+        infer EncodedToken,
+        infer Encoded,
+        infer HasDefault,
+        infer R
+    > ? FormField.PropertySignatureFormField<S, TypeToken, Type, Key, EncodedToken, Encoded, HasDefault, R> :
+    never
 )
 
 
+const LoginForm = Schema.Union(
+    Schema.Struct({
+        _tag: Schema.tag("ByEmail"),
+        email: Schema.String,
+        password: Schema.RedactedFromSelf(Schema.String),
+    }),
+
+    Schema.Struct({
+        _tag: Schema.tag("ByPhone"),
+        phone: Schema.String,
+        password: Schema.RedactedFromSelf(Schema.String),
+    }),
+)
+type LoginFormTree = FormTree<typeof LoginForm>
+declare const loginFormTree: LoginFormTree
+
+switch (loginFormTree.member.fields._tag.value) {
+    case "ByEmail":
+    break
+    case "ByPhone":
+    break
+}
+
+
 const User = Schema.Struct({
+    _tag: Schema.tag("User"),
     name: Schema.String,
     roles: Schema.Tuple(Schema.Literal("Admin"), Schema.Literal("Moderator"), Schema.Literal("User")),
     values: Schema.Array(Schema.String),
@@ -20,4 +56,5 @@ const User = Schema.Struct({
 type TestFormTree = FormTree<typeof User>
 declare const testFormTree: TestFormTree
 
-testFormTree.fields.roles.elements
+testFormTree.fields._tag
+testFormTree.fields.roles.elements[0].value