chore: attempt to finalize Svelte composition support

Author: crutchcorn

packages/svelte-form/src/AppField.svelte

@@ -5,13 +5,14 @@
 
   interface Props {
     form: any
+    fieldComponents: any
     children: Snippet
   }
-  const { children, form }: Props = $props()
+  const { children, form, fieldComponents }: Props = $props()
 </script>
 
 <form.Field name="fullName">
   {#snippet children(field: any)}
-    <InnerAppField field={field} children={children}/>
+    <InnerAppField field={field} children={children} fieldComponents={fieldComponents}/>
   {/snippet}
 </form.Field>

packages/svelte-form/src/InnerAppField.svelte

@@ -5,12 +5,13 @@
 
   interface Props {
     field: any
-    children: Snippet
+    fieldComponents: any
+    children: Snippet<[any]>
   }
 
-  const { children, field }: Props = $props()
+  const { children, field, fieldComponents }: Props = $props()
 
   setContext(fieldContextKey, field)
 </script>
 
-{@render children?.()}
+{@render children?.(Object.assign(field, fieldComponents))}

packages/svelte-form/src/createFormRune.svelte.ts

@@ -116,17 +116,15 @@ export function createFormRuneContexts() {
     >
   }
 
-  return { fieldContext: fieldContextKey, useFieldContext, useFormContext, formContext: formContextKey }
+  return { useFieldContext, useFormContext }
 }
 
 interface CreateFormRuneProps<
   TFieldComponents extends Record<string, Component<any, any>>,
   TFormComponents extends Record<string, Component<any, any>>,
 > {
   fieldComponents: TFieldComponents
-  fieldContext: Context<AnyFieldApi>
   formComponents: TFormComponents
-  formContext: Context<AnyFormApi>
 }
 
 /**
@@ -241,8 +239,6 @@ export function createFormRune<
   const TFormComponents extends Record<string, Component<any, any>>,
 >({
   fieldComponents,
-  fieldContext,
-  formContext,
   formComponents,
 }: CreateFormRuneProps<TComponents, TFormComponents>) {
   function useAppForm<
@@ -295,7 +291,7 @@ export function createFormRune<
       return AppFormSvelte(internal, { ...props, form })
     }) as Component<{ children: Snippet }>
 
-    const AppField = ((internal, props) => AppFieldSvelte(internal, { ...props, form } as never)) as FieldComponent<
+    const AppField = ((internal, props) => AppFieldSvelte(internal, { ...props, form, fieldComponents } as never)) as FieldComponent<
       TFormData,
       TOnMount,
       TOnChange,
@@ -320,64 +316,7 @@ export function createFormRune<
     return extendedForm
   }
 
-  function withForm<
-    TFormData,
-    TOnMount extends undefined | FormValidateOrFn<TFormData>,
-    TOnChange extends undefined | FormValidateOrFn<TFormData>,
-    TOnChangeAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-    TOnBlur extends undefined | FormValidateOrFn<TFormData>,
-    TOnBlurAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-    TOnSubmit extends undefined | FormValidateOrFn<TFormData>,
-    TOnSubmitAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-    TOnDynamic extends undefined | FormValidateOrFn<TFormData>,
-    TOnDynamicAsync extends undefined | FormAsyncValidateOrFn<TFormData>,
-    TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
-    TSubmitMeta,
-    TRenderProps extends object = {},
-  >({
-    render,
-    props,
-  }: WithFormProps<
-    TFormData,
-    TOnMount,
-    TOnChange,
-    TOnChangeAsync,
-    TOnBlur,
-    TOnBlurAsync,
-    TOnSubmit,
-    TOnSubmitAsync,
-    TOnDynamic,
-    TOnDynamicAsync,
-    TOnServer,
-    TSubmitMeta,
-    TComponents,
-    TFormComponents,
-    TRenderProps
-  >): WithFormProps<
-    UnwrapOrAny<TFormData>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnMount>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnChange>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnChangeAsync>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnBlur>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnBlurAsync>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnSubmit>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnSubmitAsync>,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnDynamic>,
-    UnwrapDefaultOrAny<
-      undefined | FormValidateOrFn<TFormData>,
-      TOnDynamicAsync
-    >,
-    UnwrapDefaultOrAny<undefined | FormValidateOrFn<TFormData>, TOnServer>,
-    UnwrapOrAny<TSubmitMeta>,
-    UnwrapOrAny<TComponents>,
-    UnwrapOrAny<TFormComponents>,
-    UnwrapOrAny<TRenderProps>
-  >['render'] {
-    return (innerProps) => render({ ...props, ...innerProps })
-  }
-
   return {
     useAppForm,
-    withForm,
   }
 }