Form work

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

@@ -1,4 +1,4 @@
-import type { Array, Schema, SchemaAST } from "effect"
+import type { Effect, Schema } from "effect"
 import type * as Formify from "./Formify.js"
 
 
@@ -6,19 +6,18 @@ export interface FormField<S extends Schema.Schema.Any> {
     readonly schema: S
 }
 
-export interface LiteralFormField<
+export const makeFormField = <S extends Schema.Schema.Any>(
-    S extends Schema.Literal<Literals>,
+    schema: S,
-    Literals extends Array.NonEmptyReadonlyArray<SchemaAST.LiteralValue>,
+    get: Effect.Effect<S["Type"]>,
-> extends FormField<S> {
+    set: (value: S["Type"]) => Effect.Effect<void>,
-    readonly _tag: "LiteralFormField"
+): FormField<S> => {
-    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: Formify.Formify<Members[number]>
 }
 
@@ -27,7 +26,6 @@ export interface TupleFormField<
     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]> }]
 }
 
@@ -35,21 +33,24 @@ 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<
+export type StructFormField<
     S extends Schema.Struct<Fields>,
     Fields extends Schema.Struct.Fields,
-> extends FormField<S> {
+> = (
-    readonly _tag: "StructFormField"
+    & FormField<S>
-    readonly fields: { readonly [K in keyof Fields]: Formify.Formify<Fields[K]> }
+    & { readonly fields: { readonly [K in keyof Fields]: Formify.Formify<Fields[K]> } }
-}
+    & {
+        [K in keyof Fields as Fields[K] extends
+            Schema.tag<infer _> ? K : never
+        ]: Fields[K] extends
+            Schema.tag<infer Tag> ? Tag : never
+    }
+)
 
 export interface GenericFormField<S extends Schema.Schema.Any> extends FormField<S> {
-    readonly _tag: "GenericFormField"
-    readonly value: S["Type"]
 }
 
 
@@ -63,7 +64,6 @@ export interface PropertySignatureFormField<
     HasDefault extends boolean = false,
     R = never,
 > {
-    readonly _tag: "PropertySignatureFormField"
     readonly propertySignature: S
     readonly value: Type
 }

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

@@ -3,7 +3,6 @@ import type * as FormField from "./FormField.js"
 
 
 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> :
@@ -22,7 +21,7 @@ export type Formify<S> = (
 )
 
 
-const LoginForm = Schema.Union(
+const Login = Schema.Union(
     Schema.Struct({
         _tag: Schema.tag("ByEmail"),
         email: Schema.String,
@@ -34,27 +33,19 @@ const LoginForm = Schema.Union(
         phone: Schema.String,
         password: Schema.RedactedFromSelf(Schema.String),
     }),
-)
-type LoginFormTree = Formify<typeof LoginForm>
-declare const loginFormTree: LoginFormTree
 
-switch (loginFormTree.member.fields._tag.value) {
+    Schema.TaggedStruct("ByKey", {
+        id: Schema.String,
+        password: Schema.RedactedFromSelf(Schema.String),
+    }),
+)
+type LoginForm = Formify<typeof Login>
+declare const loginForm: LoginForm
+
+switch (loginForm.member._tag) {
     case "ByEmail":
+        loginForm.member
     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),
-})
-
-type TestFormTree = Formify<typeof User>
-declare const testFormTree: TestFormTree
-
-testFormTree.fields._tag
-testFormTree.fields.roles.elements[0].value