@pyreon/form 0.3.0 → 0.6.0

package/src/context.ts

@@ -1,11 +1,5 @@
-import {
-  createContext,
-  pushContext,
-  popContext,
-  onUnmount,
-  useContext,
-} from '@pyreon/core'
-import type { VNodeChild, VNode, Props } from '@pyreon/core'
+import type { Props, VNode, VNodeChild } from '@pyreon/core'
+import { createContext, provide, useContext } from '@pyreon/core'
 import type { FormState } from './types'
 
 const FormContext = createContext<FormState<Record<string, unknown>> | null>(
@@ -33,10 +27,7 @@ export interface FormProviderProps<TValues extends Record<string, unknown>>
 export function FormProvider<TValues extends Record<string, unknown>>(
   props: FormProviderProps<TValues>,
 ): VNode {
-  const frame = new Map([[FormContext.id, props.form]])
-  pushContext(frame)
-
-  onUnmount(() => popContext())
+  provide(FormContext, props.form as FormState<Record<string, unknown>>)
 
   const ch = props.children
   return (typeof ch === 'function' ? (ch as () => VNodeChild)() : ch) as VNode

package/src/index.ts

@@ -1,26 +1,22 @@
-export { useForm } from './use-form'
-export { useFieldArray } from './use-field-array'
-export { useField } from './use-field'
-export { useWatch } from './use-watch'
-export { useFormState } from './use-form-state'
 export { FormProvider, useFormContext } from './context'
-
 export type {
   Accessor,
-  FieldState,
   FieldRegisterProps,
+  FieldState,
   FormState,
+  SchemaValidateFn,
   UseFormOptions,
-  ValidationError,
   ValidateFn,
-  SchemaValidateFn,
+  ValidationError,
 } from './types'
-
+export type { UseFieldResult } from './use-field'
+export { useField } from './use-field'
 export type {
   FieldArrayItem,
   UseFieldArrayResult,
 } from './use-field-array'
-
-export type { UseFieldResult } from './use-field'
-
+export { useFieldArray } from './use-field-array'
+export { useForm } from './use-form'
 export type { FormStateSummary } from './use-form-state'
+export { useFormState } from './use-form-state'
+export { useWatch } from './use-watch'

package/src/tests/devtools.test.ts

@@ -1,12 +1,12 @@
-import { signal, computed } from '@pyreon/reactivity'
+import { computed, signal } from '@pyreon/reactivity'
 import {
-  registerForm,
-  unregisterForm,
+  _resetDevtools,
   getActiveForms,
   getFormInstance,
   getFormSnapshot,
   onFormChange,
-  _resetDevtools,
+  registerForm,
+  unregisterForm,
 } from '../devtools'
 
 // Minimal form-like object for testing (avoids needing the full useForm + DOM)

package/src/tests/{form.test.ts → form.test.tsx}

@@ -1,27 +1,32 @@
-import { h } from '@pyreon/core'
 import { mount } from '@pyreon/runtime-dom'
+import type { FormState } from '../index'
 import {
-  useForm,
-  useFieldArray,
-  useField,
-  useWatch,
-  useFormState,
   FormProvider,
+  useField,
+  useFieldArray,
+  useForm,
   useFormContext,
+  useFormState,
+  useWatch,
 } from '../index'
-import type { FormState } from '../index'
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
+function Capture<T>({ fn }: { fn: () => T }) {
+  fn()
+  return null
+}
+
 function mountWith<T>(fn: () => T): { result: T; unmount: () => void } {
   let result: T | undefined
   const el = document.createElement('div')
   document.body.appendChild(el)
   const unmount = mount(
-    h(() => {
-      result = fn()
-      return null
-    }, null),
+    <Capture
+      fn={() => {
+        result = fn()
+      }}
+    />,
     el,
   )
   return {
@@ -1810,23 +1815,26 @@ describe('FormProvider / useFormContext', () => {
     const el = document.createElement('div')
     document.body.appendChild(el)
 
-    const unmount = mount(
-      h(() => {
-        const form = useForm({
-          initialValues: { email: 'context@test.com' },
-          onSubmit: () => {
-            /* noop */
-          },
-        })
-        return h(FormProvider as any, { form }, () =>
-          h(() => {
-            contextForm = useFormContext<{ email: string }>()
-            return null
-          }, null),
-        )
-      }, null),
-      el,
-    )
+    function ContextConsumer() {
+      contextForm = useFormContext() as FormState<{ email: string }>
+      return null
+    }
+
+    function ContextTest() {
+      const form = useForm({
+        initialValues: { email: 'context@test.com' },
+        onSubmit: () => {
+          /* noop */
+        },
+      })
+      return (
+        <FormProvider form={form as any}>
+          {() => <ContextConsumer />}
+        </FormProvider>
+      )
+    }
+
+    const unmount = mount(<ContextTest />, el)
 
     expect(contextForm).toBeDefined()
     expect(contextForm!.fields.email.value()).toBe('context@test.com')
@@ -1840,14 +1848,15 @@ describe('FormProvider / useFormContext', () => {
 
     let error: Error | undefined
     const unmount = mount(
-      h(() => {
-        try {
-          useFormContext()
-        } catch (e) {
-          error = e as Error
-        }
-        return null
-      }, null),
+      <Capture
+        fn={() => {
+          try {
+            useFormContext()
+          } catch (e) {
+            error = e as Error
+          }
+        }}
+      />,
       el,
     )
 

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { Signal, Computed } from '@pyreon/reactivity'
+import type { Computed, Signal } from '@pyreon/reactivity'
 
 export type ValidationError = string | undefined
 

package/src/use-field-array.ts

@@ -1,5 +1,5 @@
-import { signal, computed } from '@pyreon/reactivity'
-import type { Signal, Computed } from '@pyreon/reactivity'
+import type { Computed, Signal } from '@pyreon/reactivity'
+import { computed, signal } from '@pyreon/reactivity'
 
 export interface FieldArrayItem<T> {
   /** Stable key for keyed rendering. */

package/src/use-field.ts

@@ -1,10 +1,10 @@
+import type { Computed, Signal } from '@pyreon/reactivity'
 import { computed } from '@pyreon/reactivity'
-import type { Signal, Computed } from '@pyreon/reactivity'
 import type {
+  FieldRegisterProps,
   FieldState,
   FormState,
   ValidationError,
-  FieldRegisterProps,
 } from './types'
 
 export interface UseFieldResult<T> {

package/src/use-form-state.ts

@@ -1,5 +1,5 @@
-import { computed } from '@pyreon/reactivity'
 import type { Computed } from '@pyreon/reactivity'
+import { computed } from '@pyreon/reactivity'
 import type { FormState, ValidationError } from './types'
 
 export interface FormStateSummary<TValues extends Record<string, unknown>> {

package/src/use-form.ts

@@ -1,6 +1,6 @@
 import { onUnmount } from '@pyreon/core'
-import { signal, computed, effect } from '@pyreon/reactivity'
 import type { Signal } from '@pyreon/reactivity'
+import { computed, effect, signal } from '@pyreon/reactivity'
 import type {
   FieldRegisterProps,
   FieldState,

package/src/use-watch.ts

@@ -1,5 +1,5 @@
+import type { Computed, Signal } from '@pyreon/reactivity'
 import { computed } from '@pyreon/reactivity'
-import type { Signal, Computed } from '@pyreon/reactivity'
 import type { FormState } from './types'
 
 /**