@playfast/reform-forms 1.0.1 → 1.2.0

package/README.md

@@ -13,7 +13,7 @@ Values, validation, field metadata, list operations, submit flow, and correlatio
 
 ---
 
-`@playfast/reform-forms` owns everything a form needs *except* its widgets. It has no DOM and no React API — it produces a typed, platform-neutral view that any renderer can map. Pair it with [`@playfast/reform-forms-react`](https://www.npmjs.com/package/@playfast/reform-forms-react) for typed JSX, or consume the view directly from a custom host.
+`@playfast/reform-forms` owns everything a form needs _except_ its widgets. It has no DOM and no React API — it produces a typed, platform-neutral view that any renderer can map. Pair it with [`@playfast/reform-forms-react`](https://www.npmjs.com/package/@playfast/reform-forms-react) for typed JSX, or consume the view directly from a custom host.
 
 ## Install
 
@@ -61,9 +61,7 @@ const CheckoutFormLive = Form.live(CheckoutForm, {
     items: { minItems: 1, maxItems: inputs.settings.maxItems },
   }),
   validate: ({ values }) =>
-    values.email.includes('@')
-      ? undefined
-      : Form.error('email', 'Email must contain @'),
+    values.email.includes('@') ? undefined : Form.error('email', 'Email must contain @'),
   submit: ({ decoded, inputs }) => saveCheckout(decoded, inputs.user.id),
 })
 ```
@@ -71,7 +69,7 @@ const CheckoutFormLive = Form.live(CheckoutForm, {
 Read the form inside compositions with `Form.view(CheckoutForm)` — a typed, platform-neutral object:
 
 ```ts
-const form = yield* Form.view(CheckoutForm)
+const form = yield * Form.view(CheckoutForm)
 
 form.field('email').set('a@example.com')
 form.array('items').append({ name: 'Milk', qty: 1 })

package/package.json

@@ -1,37 +1,39 @@
 {
   "name": "@playfast/reform-forms",
-  "playbook": "./playbook",
-  "version": "1.0.1",
-  "type": "module",
+  "version": "1.2.0",
   "description": "Headless, schema-driven form state for reform — values, validation, field limitations, list operations, and submit flow, rendering nothing.",
   "keywords": [
-    "reform",
     "effect",
-    "forms",
     "form-state",
-    "validation",
+    "forms",
+    "headless",
+    "reform",
     "schema",
-    "headless"
+    "validation"
   ],
+  "bugs": {
+    "url": "https://github.com/playfast/reform/issues"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/playfast/reform.git",
     "directory": "packages/forms"
   },
-  "bugs": {
-    "url": "https://github.com/playfast/reform/issues"
-  },
+  "files": [
+    "src",
+    "README.md"
+  ],
+  "type": "module",
   "sideEffects": false,
   "exports": {
     "./package.json": "./package.json",
     ".": "./src/index.ts",
     "./*": "./src/*.ts"
   },
-  "files": [
-    "src",
-    "README.md"
-  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "clean": "rm -rf dist .tsbuildinfo",
     "check": "tsc --noEmit",
@@ -43,10 +45,8 @@
     "lint:fix": "oxlint --fix src"
   },
   "peerDependencies": {
-    "effect": "*",
-    "@playfast/reform": "*"
+    "@playfast/reform": "*",
+    "effect": "*"
   },
-  "publishConfig": {
-    "access": "public"
-  }
+  "playbook": "./playbook"
 }

package/src/form.test.ts

@@ -1,5 +1,5 @@
-import { expect, test } from 'vitest'
-import { Effect, Layer, ManagedRuntime, Option, Schema as S } from 'effect'
+import { expect, it } from '@effect/vitest'
+import { Effect, Layer, Option, Schema as S } from 'effect'
 import { Engine } from '@playfast/reform'
 import * as Form from './form'
 
@@ -23,7 +23,9 @@ const CheckoutSchema = S.Struct({
   ),
 })
 
-class CheckoutForm extends Form.make('CheckoutForm', { schema: CheckoutSchema }) {}
+class CheckoutForm extends Form.make('CheckoutForm', {
+  schema: CheckoutSchema,
+}) {}
 
 const layer = Form.live(CheckoutForm, {
   initial: {
@@ -35,58 +37,40 @@ const layer = Form.live(CheckoutForm, {
     values.email.includes('@') ? undefined : Form.error('email', 'Email must contain @'),
 }).pipe(Layer.provideMerge(Engine))
 
-test('field bindings write through the form reducer', async () => {
-  const runtime = ManagedRuntime.make(layer)
-  try {
-    await runtime.runPromise(
-      Effect.gen(function* () {
-        const view = yield* Form.view(CheckoutForm)
-        view.field('email').set('a@example.com')
+it.scopedLive('field bindings write through the form reducer', () =>
+  Effect.gen(function* () {
+    const view = yield* Form.view(CheckoutForm)
+    view.field('email').set('a@example.com')
 
-        const next = yield* waitUntil(Form.view(CheckoutForm), (v) => v.values.email === 'a@example.com')
-        expect(next.field('email').dirty).toBe(true)
-      }),
+    const next = yield* waitUntil(
+      Form.view(CheckoutForm),
+      (v) => v.values.email === 'a@example.com',
     )
-  } finally {
-    await runtime.dispose()
-  }
-})
+    expect(next.field('email').dirty).toBe(true)
+  }).pipe(Effect.provide(layer)),
+)
 
-test('array bindings append and remove items', async () => {
-  const runtime = ManagedRuntime.make(layer)
-  try {
-    await runtime.runPromise(
-      Effect.gen(function* () {
-        const view = yield* Form.view(CheckoutForm)
-        view.array('items').append({ name: 'milk', qty: 1 })
+it.scopedLive('array bindings append and remove items', () =>
+  Effect.gen(function* () {
+    const view = yield* Form.view(CheckoutForm)
+    view.array('items').append({ name: 'milk', qty: 1 })
 
-        const withItem = yield* waitUntil(Form.view(CheckoutForm), (v) => v.values.items.length === 1)
-        expect(withItem.array('items').items[0]?.key).toMatch(/^form-item-/)
+    const withItem = yield* waitUntil(Form.view(CheckoutForm), (v) => v.values.items.length === 1)
+    expect(withItem.array('items').items[0]?.key).toMatch(/^form-item-/)
 
-        withItem.array('items').remove(0)
-        const empty = yield* waitUntil(Form.view(CheckoutForm), (v) => v.values.items.length === 0)
-        expect(empty.values.items).toEqual([])
-      }),
-    )
-  } finally {
-    await runtime.dispose()
-  }
-})
+    withItem.array('items').remove(0)
+    const empty = yield* waitUntil(Form.view(CheckoutForm), (v) => v.values.items.length === 0)
+    expect(empty.values.items).toEqual([])
+  }).pipe(Effect.provide(layer)),
+)
 
-test('submit routes custom validation errors to fields', async () => {
-  const runtime = ManagedRuntime.make(layer)
-  try {
-    await runtime.runPromise(
-      Effect.gen(function* () {
-        const view = yield* Form.view(CheckoutForm)
-        view.submit()
+it.scopedLive('submit routes custom validation errors to fields', () =>
+  Effect.gen(function* () {
+    const view = yield* Form.view(CheckoutForm)
+    view.submit()
 
-        const invalid = yield* waitUntil(Form.view(CheckoutForm), (v) => v.validationCount > 0)
-        const error = invalid.field('email').error
-        expect(Option.isSome(error) ? error.value : undefined).toBe('Email must contain @')
-      }),
-    )
-  } finally {
-    await runtime.dispose()
-  }
-})
+    const invalid = yield* waitUntil(Form.view(CheckoutForm), (v) => v.validationCount > 0)
+    const error = invalid.field('email').error
+    expect(Option.isSome(error) ? error.value : undefined).toBe('Email must contain @')
+  }).pipe(Effect.provide(layer)),
+)

package/src/form.ts

@@ -9,17 +9,17 @@ import {
   Runtime,
   Schema as S,
 } from 'effect'
+import { Event, Reducer, State, type Trigger } from '@playfast/reform'
 import {
+  type AnySource,
   Bus,
   CurrentTracker,
-  Event,
-  Reducer,
   Reducers,
-  State,
+  type SourceIdentifier,
+  type SourceName,
+  type SourceValue as ReformSourceValue,
   type Store,
-  type Trigger,
-} from '@playfast/reform'
-import type { AnySource, Source } from '@playfast/reform'
+} from '@playfast/reform/internal'
 import {
   getNestedValue,
   isPathOrParentDirty,
@@ -46,9 +46,6 @@ import {
 
 export { error }
 
-// Plain-JSON UI-contract shape (flows into FieldBinding.limitations, serialized
-// over the wire): optional knobs are part of the external contract, so the
-// `ExternalApi` postfix opts this out of the Option-only field rule.
 export interface FieldLimitationsExternalApi<A = unknown> {
   readonly required?: boolean
   readonly disabled?: boolean
@@ -129,33 +126,25 @@ export interface FormView<Values, Inputs = {}> {
 
 type InputRecord = Readonly<Record<string, AnySource>>
 
-// Extracted structurally (`S['name']`) rather than through a `Source<infer N,
-// unknown>` conditional: `Source`'s value parameter is invariant (`in out A`),
-// so a concrete `StateToken<'x', V>` never matches `Source<_, unknown>` and the
-// conditional would erase every input's key to `never`.
-type SourceName<S extends AnySource> = S['name']
-type SourceValue<S> = S extends Source<string, infer A> ? A : never
-
 type InputsObject<Inputs extends InputRecord> = {
-  readonly [K in keyof Inputs as SourceName<Inputs[K]>]: SourceValue<Inputs[K]>
+  readonly [K in keyof Inputs as SourceName<Inputs[K]>]: ReformSourceValue<Inputs[K]>
 }
 
 type InputStores<Inputs extends InputRecord> = {
-  [K in keyof Inputs]: Inputs[K] extends { readonly store: Context.Tag<infer Service, any> }
+  [K in keyof Inputs]: Inputs[K] extends {
+    readonly store: Context.Tag<infer Service, infer _Store>
+  }
     ? Service
     : never
 }[keyof Inputs]
 
-type ValuesOfSchema<S extends S.Schema.Any> = S.Schema.Encoded<S>
-type DecodedOfSchema<S extends S.Schema.Any> = S.Schema.Type<S>
+type ValuesOfSchema<Schema extends S.Schema.AnyNoContext> = S.Schema.Encoded<Schema>
+type DecodedOfSchema<Schema extends S.Schema.AnyNoContext> = S.Schema.Type<Schema>
 
 export interface RuntimeConfig<Values, Decoded, Inputs> {
   readonly initial: Values
   // oxlint-disable-next-line reform-rules/no-optional-fields -- optional Effect-returning config knob (not a serializable shape); Option would break external form definitions
-  readonly limit?: (ctx: {
-    readonly values: Values
-    readonly inputs: Inputs
-  }) => Limitations
+  readonly limit?: (ctx: { readonly values: Values; readonly inputs: Inputs }) => Limitations
   readonly validate: (ctx: {
     readonly values: Values
     readonly decoded: Decoded
@@ -171,10 +160,7 @@ export interface RuntimeConfig<Values, Decoded, Inputs> {
 export interface FormLiveConfig<Values, Decoded, Inputs, R = never> {
   readonly initial: Values
   // oxlint-disable-next-line reform-rules/no-optional-fields -- optional Effect-returning config knob; Option would break external form definitions
-  readonly limit?: (ctx: {
-    readonly values: Values
-    readonly inputs: Inputs
-  }) => Limitations
+  readonly limit?: (ctx: { readonly values: Values; readonly inputs: Inputs }) => Limitations
   // oxlint-disable-next-line reform-rules/no-optional-fields -- optional Effect-returning config knob; Option would break external form definitions
   readonly validate?: (ctx: {
     readonly values: Values
@@ -193,9 +179,22 @@ export interface FormLiveConfig<Values, Decoded, Inputs, R = never> {
   }) => void | Effect.Effect<unknown, unknown, R>
 }
 
-export interface FormManifest<N extends string, Schema extends S.Schema.Any, Inputs extends InputRecord> {
+export interface FormSchemaReflection {
+  readonly ast: S.Schema<unknown, unknown, unknown>['ast']
+}
+
+export interface FormManifestReflection<N extends string> {
   readonly kind: 'Form'
   readonly name: N
+  readonly schema: FormSchemaReflection
+  readonly inputs: InputRecord
+}
+
+export interface FormManifest<
+  N extends string,
+  Schema extends S.Schema.AnyNoContext,
+  Inputs extends InputRecord,
+> extends FormManifestReflection<N> {
   readonly schema: Schema
   readonly inputs: Inputs
 }
@@ -209,17 +208,40 @@ interface FormEvents {
   readonly submitSucceeded: Event.EventClass<string, { readonly values: unknown }>
   readonly append: Event.EventClass<string, { readonly path: string; readonly value: unknown }>
   readonly remove: Event.EventClass<string, { readonly path: string; readonly index: number }>
-  readonly move: Event.EventClass<string, { readonly path: string; readonly from: number; readonly to: number }>
-  readonly swap: Event.EventClass<string, { readonly path: string; readonly a: number; readonly b: number }>
+  readonly move: Event.EventClass<
+    string,
+    { readonly path: string; readonly from: number; readonly to: number }
+  >
+  readonly swap: Event.EventClass<
+    string,
+    { readonly path: string; readonly a: number; readonly b: number }
+  >
+}
+
+export interface FormVisitor<Result> {
+  readonly visit: <
+    N extends string,
+    Schema extends S.Schema.AnyNoContext,
+    Inputs extends InputRecord,
+  >(
+    form: FormClass<N, Schema, Inputs>,
+  ) => Result
+}
+
+export interface AnyForm {
+  new (): {}
+  readonly manifest: FormManifestReflection<string>
+  readonly capture: <Result>(visitor: FormVisitor<Result>) => Result
 }
 
 export interface FormClass<
   N extends string,
-  Schema extends S.Schema.Any,
+  Schema extends S.Schema.AnyNoContext,
   Inputs extends InputRecord,
 > {
   new (): {}
   readonly manifest: FormManifest<N, Schema, Inputs>
+  readonly capture: <Result>(visitor: FormVisitor<Result>) => Result
   readonly state: State.StateClass<`${N}/state`, FormState<ValuesOfSchema<Schema>>>
   readonly config: Context.Tag<
     RuntimeConfig<ValuesOfSchema<Schema>, DecodedOfSchema<Schema>, InputsObject<Inputs>>,
@@ -232,27 +254,16 @@ export interface FormClass<
   >
 }
 
-// `any` (not `InputRecord`) in the inputs slot: the inputs type flows into the
-// invariant `config` tag (via `InputsObject`), so a wildcard there must be `any`
-// for a concrete form — whose inputs object has real keys — to remain assignable
-// to `AnyForm`. Same Schema-variance escape the schema slot already uses.
-export type AnyForm = FormClass<string, S.Schema.Any, any>
-
-export type Values<F extends AnyForm> = F extends FormClass<string, infer Schema, any>
-  ? ValuesOfSchema<Schema>
-  : never
+export type Values<F> =
+  F extends FormClass<infer _Name, infer Schema, infer _Inputs> ? ValuesOfSchema<Schema> : never
 
-export type Decoded<F extends AnyForm> = F extends FormClass<string, infer Schema, any>
-  ? DecodedOfSchema<Schema>
-  : never
+export type Decoded<F> =
+  F extends FormClass<infer _Name, infer Schema, infer _Inputs> ? DecodedOfSchema<Schema> : never
 
-export type Inputs<F extends AnyForm> = F extends FormClass<string, S.Schema.Any, infer Inputs>
-  ? InputsObject<Inputs>
-  : never
+export type Inputs<F> =
+  F extends FormClass<infer _Name, infer _Schema, infer Inputs> ? InputsObject<Inputs> : never
 
-export type View<F extends AnyForm> = FormView<Values<F>, Inputs<F>>
-
-const unknownSchema: S.Schema<any, any> = Fn.unsafeCoerce(S.Unknown)
+export type View<F> = FormView<Values<F>, Inputs<F>>
 
 const arrayKeyCounter = { current: 0 }
 const makeArrayKey = (): string => `form-item-${arrayKeyCounter.current++}`
@@ -262,12 +273,15 @@ export const arrayKeysFor = (source: unknown, path = ''): Record<string, Readonl
   const visit = (node: KeyVisitNode): void => {
     if (Array.isArray(node.current)) {
       out[node.path] = node.current.map(() => makeArrayKey())
-      node.current.forEach((element, index) => visit({ current: element, path: `${node.path}[${index}]` }))
+      node.current.forEach((element, index) =>
+        visit({ current: element, path: `${node.path}[${index}]` }),
+      )
       return
     }
     if (node.current !== null && typeof node.current === 'object') {
-      Record.toEntries(Fn.unsafeCoerce<unknown, Record<string, unknown>>(node.current)).forEach(([key, child]) =>
-        visit({ current: child, path: node.path.length === 0 ? key : `${node.path}.${key}` }),
+      Record.toEntries(Fn.unsafeCoerce<unknown, Record<string, unknown>>(node.current)).forEach(
+        ([key, child]) =>
+          visit({ current: child, path: node.path.length === 0 ? key : `${node.path}.${key}` }),
       )
     }
   }
@@ -287,8 +301,10 @@ const initialState = <Values>(initial: Values): FormState<Values> => ({
   arrayKeys: arrayKeysFor(initial),
 })
 
-const markTouched = (touched: Readonly<Record<string, boolean>>, path: string): Readonly<Record<string, boolean>> =>
-  ({ ...touched, [path]: true })
+const markTouched = (
+  touched: Readonly<Record<string, boolean>>,
+  path: string,
+): Readonly<Record<string, boolean>> => ({ ...touched, [path]: true })
 
 interface ArrayLookup {
   readonly source: unknown
@@ -339,7 +355,8 @@ const updateKeys = (
   path: string,
   transform: (keys: ReadonlyArray<string>) => ReadonlyArray<string>,
 ): Readonly<Record<string, ReadonlyArray<string>>> => {
-  const existing = state.arrayKeys[path] ?? currentArray({ source: state.values, path }).map(() => makeArrayKey())
+  const existing =
+    state.arrayKeys[path] ?? currentArray({ source: state.values, path }).map(() => makeArrayKey())
   return { ...state.arrayKeys, [path]: transform(existing) }
 }
 
@@ -351,7 +368,10 @@ const appendAtPath = <Values>(input: SetPathInput<Values>): FormState<Values> =>
   const nextValues = setNestedValue(input.state.values, input.path, [...elements, input.value])
   return {
     ...withValues(input.state, nextValues),
-    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => [...keys, makeArrayKey()]),
+    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => [
+      ...keys,
+      makeArrayKey(),
+    ]),
   }
 }
 
@@ -382,7 +402,9 @@ const moveAtPath = <Values>(input: MovePathInput<Values>): FormState<Values> =>
   const nextValues = setNestedValue(input.state.values, input.path, next)
   return {
     ...withValues(input.state, nextValues),
-    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) => moveAt(keys, input.from, input.to)),
+    arrayKeys: updateKeys(Fn.unsafeCoerce(input.state), input.path, (keys) =>
+      moveAt(keys, input.from, input.to),
+    ),
   }
 }
 
@@ -397,7 +419,11 @@ const swapAtPath = <Values>(input: SwapPathInput<Values>): FormState<Values> =>
   ) {
     return input.state
   }
-  const swapped = replaceAt(replaceAt(elements, input.first, elements[input.second]), input.second, elements[input.first])
+  const swapped = replaceAt(
+    replaceAt(elements, input.first, elements[input.second]),
+    input.second,
+    elements[input.first],
+  )
   const nextValues = setNestedValue(input.state.values, input.path, swapped)
   return {
     ...withValues(input.state, nextValues),
@@ -411,7 +437,7 @@ const swapAtPath = <Values>(input: SwapPathInput<Values>): FormState<Values> =>
   }
 }
 
-interface MakeConfig<Schema extends S.Schema.Any, Inputs extends InputRecord> {
+interface MakeConfig<Schema extends S.Schema.AnyNoContext, Inputs extends InputRecord> {
   readonly schema: Schema
   // oxlint-disable-next-line reform-rules/no-optional-fields -- optional source map on the public make() config; Option would break callers passing only a schema
   readonly inputs?: Inputs
@@ -419,30 +445,51 @@ interface MakeConfig<Schema extends S.Schema.Any, Inputs extends InputRecord> {
 
 export const make = <
   const N extends string,
-  Schema extends S.Schema.Any,
+  Schema extends S.Schema.AnyNoContext,
   const Inputs extends InputRecord = {},
 >(
   name: N,
   config: MakeConfig<Schema, Inputs>,
 ): FormClass<N, Schema, Inputs> => {
-  const state: State.StateClass<`${N}/state`, FormState<ValuesOfSchema<Schema>>> = Fn.unsafeCoerce(
-    State.make(`${name}/state`, unknownSchema, { title: `${name} form state` }),
+  const valuesSchema = S.encodedSchema(config.schema)
+  const stringRecord = S.Record({ key: S.String, value: S.String })
+  const stateSchema = S.Struct({
+    values: valuesSchema,
+    initialValues: valuesSchema,
+    touched: S.Record({ key: S.String, value: S.Boolean }),
+    errors: stringRecord,
+    dirtyPaths: S.Array(S.String),
+    submitCount: S.Number,
+    validationCount: S.Number,
+    lastSubmittedValues: S.OptionFromSelf(valuesSchema),
+    arrayKeys: S.Record({ key: S.String, value: S.Array(S.String) }),
+  })
+  const state: State.StateClass<`${N}/state`, FormState<ValuesOfSchema<Schema>>> = State.make(
+    `${name}/state`,
+    stateSchema,
+    { title: `${name} form state` },
   )
   const events: FormEvents = {
     set: Event.make(`${name}/SetField`, S.Struct({ path: S.String, value: S.Unknown })),
     blur: Event.make(`${name}/BlurField`, S.Struct({ path: S.String })),
     reset: Event.make(`${name}/Reset`, S.Struct({})),
-    validationFinished: Event.make(`${name}/ValidationFinished`, S.Struct({
-      errors: S.Record({ key: S.String, value: S.String }),
-    })),
+    validationFinished: Event.make(
+      `${name}/ValidationFinished`,
+      S.Struct({
+        errors: S.Record({ key: S.String, value: S.String }),
+      }),
+    ),
     submitAttempted: Event.make(`${name}/SubmitAttempted`, S.Struct({})),
     submitSucceeded: Event.make(`${name}/SubmitSucceeded`, S.Struct({ values: S.Unknown })),
     append: Event.make(`${name}/AppendItem`, S.Struct({ path: S.String, value: S.Unknown })),
     remove: Event.make(`${name}/RemoveItem`, S.Struct({ path: S.String, index: S.Number })),
-    move: Event.make(`${name}/MoveItem`, S.Struct({ path: S.String, from: S.Number, to: S.Number })),
+    move: Event.make(
+      `${name}/MoveItem`,
+      S.Struct({ path: S.String, from: S.Number, to: S.Number }),
+    ),
     swap: Event.make(`${name}/SwapItems`, S.Struct({ path: S.String, a: S.Number, b: S.Number })),
   }
-  const reducer = Reducer.make(`${name}/FormReducer`, {
+  const reducer: FormClass<N, Schema, Inputs>['reducer'] = Reducer.make(`${name}/FormReducer`, {
     states: [state],
     events: Object.values(events),
   })
@@ -450,10 +497,12 @@ export const make = <
     RuntimeConfig<ValuesOfSchema<Schema>, DecodedOfSchema<Schema>, InputsObject<Inputs>>,
     RuntimeConfig<ValuesOfSchema<Schema>, DecodedOfSchema<Schema>, InputsObject<Inputs>>
   >(`reform/form/${name}/config`)
-  const inputs: Inputs = Fn.unsafeCoerce(Option.getOrElse(Option.fromNullable(config.inputs), () => ({})))
+  const inputs: Inputs = Fn.unsafeCoerce(
+    Option.getOrElse(Option.fromNullable(config.inputs), () => ({})),
+  )
   class FormImpl {
-    static readonly manifest = {
-      kind: 'Form' as const,
+    static readonly manifest: FormManifest<N, Schema, Inputs> = {
+      kind: 'Form',
       name,
       schema: config.schema,
       inputs,
@@ -462,33 +511,50 @@ export const make = <
     static readonly config = runtimeConfig
     static readonly events = events
     static readonly reducer = reducer
+    static capture<Result>(visitor: FormVisitor<Result>): Result {
+      return visitor.visit(FormImpl)
+    }
   }
-  return Fn.unsafeCoerce(FormImpl)
+  return FormImpl
 }
 
 export const live = <
-  F extends AnyForm,
+  N extends string,
+  Schema extends S.Schema.AnyNoContext,
+  FormInputs extends InputRecord,
   R = never,
 >(
-  form: F,
-  config: FormLiveConfig<Values<F>, Decoded<F>, Inputs<F>, R>,
+  form: FormClass<N, Schema, FormInputs>,
+  config: FormLiveConfig<
+    ValuesOfSchema<Schema>,
+    DecodedOfSchema<Schema>,
+    InputsObject<FormInputs>,
+    R
+  >,
 ): Layer.Layer<
-  Store<FormState<Values<F>>> | RuntimeConfig<Values<F>, Decoded<F>, Inputs<F>>,
+  | State.StateStore<`${N}/state`, FormState<ValuesOfSchema<Schema>>>
+  | RuntimeConfig<ValuesOfSchema<Schema>, DecodedOfSchema<Schema>, InputsObject<FormInputs>>,
   never,
   Bus | Reducers | R
 > => {
   const configTag: Context.Tag<
-    RuntimeConfig<Values<F>, Decoded<F>, Inputs<F>>,
-    RuntimeConfig<Values<F>, Decoded<F>, Inputs<F>>
-  > = Fn.unsafeCoerce(form.config)
+    RuntimeConfig<ValuesOfSchema<Schema>, DecodedOfSchema<Schema>, InputsObject<FormInputs>>,
+    RuntimeConfig<ValuesOfSchema<Schema>, DecodedOfSchema<Schema>, InputsObject<FormInputs>>
+  > = form.config
   const configLayer = Layer.effect(
     configTag,
     Effect.map(Effect.context<R | Bus>(), (context) => {
-      const runtimeConfig: RuntimeConfig<Values<F>, Decoded<F>, Inputs<F>> = {
+      const runtimeConfig: RuntimeConfig<
+        ValuesOfSchema<Schema>,
+        DecodedOfSchema<Schema>,
+        InputsObject<FormInputs>
+      > = {
         initial: config.initial,
         validate: (ctx) => {
           const validationOutput = config.validate?.(ctx)
-          const effect = Effect.isEffect(validationOutput) ? validationOutput : Effect.succeed(validationOutput)
+          const effect = Effect.isEffect(validationOutput)
+            ? validationOutput
+            : Effect.succeed(validationOutput)
           return Fn.unsafeCoerce(
             Effect.map(Effect.provide(effect, context), (rawErrors) => normalizeErrors(rawErrors)),
           )
@@ -499,9 +565,7 @@ export const live = <
           return Fn.unsafeCoerce(Effect.asVoid(Effect.provide(effect, context)))
         },
       }
-      return config.limit === undefined
-        ? runtimeConfig
-        : { ...runtimeConfig, limit: config.limit }
+      return config.limit === undefined ? runtimeConfig : { ...runtimeConfig, limit: config.limit }
     }),
   )
 
@@ -517,12 +581,19 @@ export const live = <
 
   const reducerLayer = Reducer.live(
     form.reducer,
-    (state: FormState<Values<F>>, event: InternalEvent): FormState<Values<F>> => {
+    (
+      state: FormState<ValuesOfSchema<Schema>>,
+      event: InternalEvent,
+    ): FormState<ValuesOfSchema<Schema>> => {
       if (event._tag === form.events.set.tag) {
-        return 'path' in event && 'value' in event ? setAtPath({ state, path: event.path, value: event.value }) : state
+        return 'path' in event && 'value' in event
+          ? setAtPath({ state, path: event.path, value: event.value })
+          : state
       }
       if (event._tag === form.events.blur.tag) {
-        return 'path' in event ? { ...state, touched: markTouched(state.touched, event.path) } : state
+        return 'path' in event
+          ? { ...state, touched: markTouched(state.touched, event.path) }
+          : state
       }
       if (event._tag === form.events.reset.tag) {
         return initialState(state.initialValues)
@@ -536,9 +607,15 @@ export const live = <
         return { ...state, submitCount: state.submitCount + 1 }
       }
       if (event._tag === form.events.submitSucceeded.tag) {
-        return 'values' in event
-          ? { ...state, lastSubmittedValues: Option.some(Fn.unsafeCoerce<unknown, Values<F>>(event.values)) }
-          : state
+        if (!('values' in event)) {
+          return state
+        }
+        return {
+          ...state,
+          lastSubmittedValues: Option.some(
+            Fn.unsafeCoerce<unknown, ValuesOfSchema<Schema>>(event.values),
+          ),
+        }
       }
       if (event._tag === form.events.append.tag) {
         return 'path' in event && 'value' in event
@@ -564,26 +641,23 @@ export const live = <
     },
   )
 
-  return Fn.unsafeCoerce(
-    Layer.mergeAll(configLayer, reducerLayer).pipe(
-      Layer.provideMerge(State.live(form.state, initialState(config.initial))),
-    ),
+  return Layer.mergeAll(configLayer, reducerLayer).pipe(
+    Layer.provideMerge(State.live(form.state, initialState(config.initial))),
   )
 }
 
-const readInput = <Source extends AnySource>(
-  source: Source,
-): Effect.Effect<SourceValue<Source>, never, Store<SourceValue<Source>>> =>
-  Fn.unsafeCoerce(
-    Effect.gen(function* () {
-      const store = yield* source.store
-      const tracker = yield* Effect.serviceOption(CurrentTracker)
-      if (Option.isSome(tracker)) {
-        tracker.value.add(store)
-      }
-      return store.getSnapshot()
-    }),
+const readInput = Effect.fn('forms.readInput')(function* <Input extends AnySource>(
+  source: Input,
+): Effect.fn.Return<ReformSourceValue<Input>, never, SourceIdentifier<Input>> {
+  const store = yield* Context.GenericTag<SourceIdentifier<Input>, Store<ReformSourceValue<Input>>>(
+    source.store.key,
   )
+  const tracker = yield* Effect.serviceOption(CurrentTracker)
+  if (Option.isSome(tracker)) {
+    tracker.value.add(store)
+  }
+  return store.getSnapshot()
+})
 
 const readInputs = <Inputs extends InputRecord>(
   inputs: Inputs,
@@ -591,35 +665,41 @@ const readInputs = <Inputs extends InputRecord>(
   Fn.unsafeCoerce(
     Effect.gen(function* () {
       const pairs = yield* Effect.forEach(Object.values(inputs), (source) =>
-        Effect.map(readInput(source), (snapshot) => [source.name, snapshot] as const),
+        Effect.map(readInput(source), (snapshot): readonly [string, unknown] => [
+          source.name,
+          snapshot,
+        ]),
       )
       return Record.fromEntries(pairs)
     }),
   )
 
-const limitationsFor = <A>(
-  limitations: Limitations,
-  path: string,
-): FieldLimitations<A> =>
+const limitationsFor = <A>(limitations: Limitations, path: string): FieldLimitations<A> =>
   Fn.unsafeCoerce(Option.getOrElse(Option.fromNullable(limitations[path]), () => ({})))
 
-const trigger = <P>(eventTrigger: Effect.Effect<Trigger<P>, never, Bus>): Effect.Effect<Trigger<P>, never, Bus> =>
-  eventTrigger
+const trigger = <P>(
+  eventTrigger: Effect.Effect<Trigger<P>, never, Bus>,
+): Effect.Effect<Trigger<P>, never, Bus> => eventTrigger
 
-// oxlint-disable-next-line reform-rules/prefer-effect-fn -- public generic view: the explicit R (Store | RuntimeConfig | Bus | InputStores) must be preserved verbatim; Effect.fn would re-infer requirements off the erased AnyForm wildcard
-export const view = <F extends AnyForm>(
-  form: F,
-): Effect.Effect<View<F>, never, Store<FormState<Values<F>>> | RuntimeConfig<Values<F>, Decoded<F>, Inputs<F>> | Bus | InputStores<F['manifest']['inputs']>> =>
+// oxlint-disable-next-line reform-rules/prefer-effect-fn -- public generic view preserves the exact form state/config/input requirements verbatim
+export const view = <
+  N extends string,
+  Schema extends S.Schema.AnyNoContext,
+  FormInputs extends InputRecord,
+>(
+  form: FormClass<N, Schema, FormInputs>,
+): Effect.Effect<
+  FormView<ValuesOfSchema<Schema>, InputsObject<FormInputs>>,
+  never,
+  | State.StateStore<`${N}/state`, FormState<ValuesOfSchema<Schema>>>
+  | RuntimeConfig<ValuesOfSchema<Schema>, DecodedOfSchema<Schema>, InputsObject<FormInputs>>
+  | Bus
+  | InputStores<FormInputs>
+> =>
   Effect.gen(function* () {
     const state = yield* form.state
     const runtimeConfig = yield* form.config
-    // Erased boundary (same shape as the coercions closing `live`/`readInputs`):
-    // under the `AnyForm` constraint `form.manifest.inputs` is the wildcard
-    // `any`, which would dissolve the generator's R to `unknown`; restate the
-    // call at the concrete `F`'s types so R keeps the declared input stores.
-    const inputs: Inputs<F> = Fn.unsafeCoerce(
-      yield* readInputs(Fn.unsafeCoerce<typeof form.manifest.inputs, InputRecord>(form.manifest.inputs)),
-    )
+    const inputs = yield* readInputs(form.manifest.inputs)
     const limitations = Option.getOrElse(
       Option.fromNullable(runtimeConfig.limit?.({ values: state.values, inputs })),
       () => ({}),
@@ -633,7 +713,7 @@ export const view = <F extends AnyForm>(
     const swap = yield* trigger(form.events.swap.trigger)
     const runtime = yield* Effect.runtime<Bus>()
 
-    const schema: S.Schema<Decoded<F>, Values<F>, never> = Fn.unsafeCoerce(form.manifest.schema)
+    const schema = form.manifest.schema
     const decodeEither = S.decodeUnknownEither(schema, { errors: 'all' })(state.values)
     const canSubmit = Either.isRight(decodeEither) && Record.keys(state.errors).length === 0
 
@@ -645,15 +725,21 @@ export const view = <F extends AnyForm>(
         }
         const decoded = S.decodeUnknownEither(schema, { errors: 'all' })(state.values)
         if (Either.isLeft(decoded)) {
-          yield* Event.dispatch(form.events.validationFinished, { errors: routeParseError(decoded.left) })
-          return Option.none<Decoded<F>>()
+          yield* Event.dispatch(form.events.validationFinished, {
+            errors: routeParseError(decoded.left),
+          })
+          return Option.none<DecodedOfSchema<Schema>>()
         }
-        const custom = yield* runtimeConfig.validate({ values: state.values, decoded: decoded.right, inputs })
+        const custom = yield* runtimeConfig.validate({
+          values: state.values,
+          decoded: decoded.right,
+          inputs,
+        })
         const errors = errorsToRecord(custom)
         yield* Event.dispatch(form.events.validationFinished, { errors })
         return Record.keys(errors).length === 0
-          ? Option.some(Fn.unsafeCoerce<unknown, Decoded<F>>(decoded.right))
-          : Option.none<Decoded<F>>()
+          ? Option.some(decoded.right)
+          : Option.none<DecodedOfSchema<Schema>>()
       })
 
     const submit = () => {
@@ -665,7 +751,9 @@ export const view = <F extends AnyForm>(
           }
           yield* runtimeConfig.submit({ values: state.values, decoded: decoded.value, inputs })
           yield* Event.dispatch(form.events.submitSucceeded, { values: state.values })
-        }).pipe(Effect.catchAllCause((cause) => Effect.logError('reform form submit failed', cause))),
+        }).pipe(
+          Effect.catchAllCause((cause) => Effect.logError('reform form submit failed', cause)),
+        ),
       )
     }
 
@@ -673,16 +761,21 @@ export const view = <F extends AnyForm>(
       Runtime.runFork(runtime)(runValidation(false))
     }
 
-    const field = <P extends FieldPath<Values<F>>>(path: P): FieldBinding<PathValue<Values<F>, P>> => {
-      const fieldValue: PathValue<Values<F>, P> = Fn.unsafeCoerce(getNestedValue(state.values, path))
+    const field = <P extends FieldPath<ValuesOfSchema<Schema>>>(
+      path: P,
+    ): FieldBinding<PathValue<ValuesOfSchema<Schema>, P>> => {
+      const fieldValue: PathValue<ValuesOfSchema<Schema>, P> = Fn.unsafeCoerce(
+        getNestedValue(state.values, path),
+      )
       return {
         path,
         value: fieldValue,
         set: (next) => {
           if (typeof next === 'function') {
-            const updater = Fn.unsafeCoerce<typeof next, (prev: PathValue<Values<F>, P>) => PathValue<Values<F>, P>>(
-              next,
-            )
+            const updater = Fn.unsafeCoerce<
+              typeof next,
+              (prev: PathValue<ValuesOfSchema<Schema>, P>) => PathValue<ValuesOfSchema<Schema>, P>
+            >(next)
             setField({ path, value: updater(fieldValue) })
             return
           }
@@ -693,12 +786,14 @@ export const view = <F extends AnyForm>(
         dirty: isPathOrParentDirty(state.dirtyPaths, path),
         touched: state.touched[path] === true,
         validating: false,
-        limitations: limitationsFor<PathValue<Values<F>, P>>(limitations, path),
+        limitations: limitationsFor<PathValue<ValuesOfSchema<Schema>, P>>(limitations, path),
       }
     }
 
-    const array = <P extends ArrayPath<Values<F>>>(path: P): ArrayBinding<ArrayItem<Values<F>, P>> => {
-      const arrayValues: ReadonlyArray<ArrayItem<Values<F>, P>> = Fn.unsafeCoerce(
+    const array = <P extends ArrayPath<ValuesOfSchema<Schema>>>(
+      path: P,
+    ): ArrayBinding<ArrayItem<ValuesOfSchema<Schema>, P>> => {
+      const arrayValues: ReadonlyArray<ArrayItem<ValuesOfSchema<Schema>, P>> = Fn.unsafeCoerce(
         currentArray({ source: state.values, path }),
       )
       const keys = state.arrayKeys[path] ?? arrayValues.map((_, index) => `${path}-${index}`)
@@ -715,11 +810,14 @@ export const view = <F extends AnyForm>(
         remove: (index) => remove({ path, index }),
         move: (from, to) => move({ path, from, to }),
         swap: (first, second) => swap({ path, a: first, b: second }),
-        limitations: limitationsFor<ReadonlyArray<ArrayItem<Values<F>, P>>>(limitations, path),
+        limitations: limitationsFor<ReadonlyArray<ArrayItem<ValuesOfSchema<Schema>, P>>>(
+          limitations,
+          path,
+        ),
       }
     }
 
-    const formView: View<F> = Fn.unsafeCoerce({
+    const formView: FormView<ValuesOfSchema<Schema>, InputsObject<FormInputs>> = Fn.unsafeCoerce({
       values: state.values,
       inputs,
       errors: state.errors,

package/src/index.ts

@@ -16,13 +16,7 @@ export type {
   Values,
   View,
 } from './form'
-export {
-  arrayKeysFor as unsafeArrayKeysFor,
-  error,
-  live,
-  make,
-  view,
-} from './form'
+export { arrayKeysFor as unsafeArrayKeysFor, error, live, make, view } from './form'
 export type {
   ArrayItem,
   ArrayPath,

package/src/path.ts

@@ -5,8 +5,7 @@ import { sort as sortArray } from 'effect/Array'
 const BRACKET_NOTATION_REGEX = /\[(\d+)\]/g
 const NO_INDEX = -1
 
-// `null` is a genuine leaf of arbitrary form values (JSON-shaped user data); it
-// is matched here to stop path recursion at primitive leaves.
+// JSON null is a real form-value leaf — stop path recursion here.
 export type Primitive =
   | string
   | number
@@ -25,52 +24,48 @@ type IsTagged<T> = T extends Tagged ? true : false
 export type FieldPath<T> = T extends Primitive
   ? never
   : {
-      readonly [K in StringKey<T>]:
-        T[K] extends ReadonlyArray<unknown>
+      readonly [K in StringKey<T>]: T[K] extends ReadonlyArray<unknown>
+        ? never
+        : IsTagged<T[K]> extends true
           ? never
-          : IsTagged<T[K]> extends true
-            ? never
-            : T[K] extends Primitive
-              ? K
-              : T[K] extends object
-                ? K | `${K}.${FieldPath<T[K]>}`
-                : K
+          : T[K] extends Primitive
+            ? K
+            : T[K] extends object
+              ? K | `${K}.${FieldPath<T[K]>}`
+              : K
     }[StringKey<T>]
 
 export type ArrayPath<T> = T extends Primitive
   ? never
   : {
-      readonly [K in StringKey<T>]:
-        T[K] extends ReadonlyArray<unknown>
-          ? K
-          : IsTagged<T[K]> extends true
-            ? never
-            : T[K] extends object
-              ? `${K}.${ArrayPath<T[K]>}`
-              : never
+      readonly [K in StringKey<T>]: T[K] extends ReadonlyArray<unknown>
+        ? K
+        : IsTagged<T[K]> extends true
+          ? never
+          : T[K] extends object
+            ? `${K}.${ArrayPath<T[K]>}`
+            : never
     }[StringKey<T>]
 
 export type VariantPath<T> = T extends Primitive
   ? never
   : {
-      readonly [K in StringKey<T>]:
-        IsTagged<T[K]> extends true
-          ? K
-          : T[K] extends ReadonlyArray<unknown>
-            ? never
-            : T[K] extends object
-              ? `${K}.${VariantPath<T[K]>}`
-              : never
+      readonly [K in StringKey<T>]: IsTagged<T[K]> extends true
+        ? K
+        : T[K] extends ReadonlyArray<unknown>
+          ? never
+          : T[K] extends object
+            ? `${K}.${VariantPath<T[K]>}`
+            : never
     }[StringKey<T>]
 
-export type PathValue<T, P extends string> =
-  P extends `${infer Head}.${infer Tail}`
-    ? Head extends keyof T
-      ? PathValue<T[Head], Tail>
-      : never
-    : P extends keyof T
-      ? T[P]
-      : never
+export type PathValue<T, P extends string> = P extends `${infer Head}.${infer Tail}`
+  ? Head extends keyof T
+    ? PathValue<T[Head], Tail>
+    : never
+  : P extends keyof T
+    ? T[P]
+    : never
 
 export type ArrayItem<T, P extends string> =
   PathValue<T, P> extends ReadonlyArray<infer Item> ? Item : never
@@ -83,8 +78,6 @@ export type VariantCase<V, Tag extends string> = Extract<V, { readonly _tag: Tag
 
 export type VariantBody<V, Tag extends string> = Omit<VariantCase<V, Tag>, '_tag'>
 
-// Typed view over an arbitrary object for string-keyed traversal of unknown form
-// values. `unsafeCoerce` is the Effect-blessed identity coercion (no `as`).
 const asRecord = (source: unknown): Record<string, unknown> => Fn.unsafeCoerce(source)
 
 export const schemaPathToFieldPath = (path: ReadonlyArray<PropertyKey>): string =>
@@ -199,7 +192,9 @@ export const recalculateDirtyPaths = (
     ) {
       const currentRecord = asRecord(current)
       const originalRecord = asRecord(original)
-      const keys = Array.from(new Set([...Record.keys(currentRecord), ...Record.keys(originalRecord)]))
+      const keys = Array.from(
+        new Set([...Record.keys(currentRecord), ...Record.keys(originalRecord)]),
+      )
       return keys.flatMap((key) =>
         visit({
           current: currentRecord[key],