chore: fix type export

harry-whorlow · harry-whorlow · commit 95fcd2e658e9 · 2025-10-03T15:40:27.000+02:00
diff --git a/packages/react-form-nextjs/src/createServerValidate.ts b/packages/react-form-nextjs/src/createServerValidate.ts
@@ -12,7 +12,7 @@ import type {
   FormValidateOrFn,
   UnwrapFormAsyncValidateOrFn,
 } from '@tanstack/form-core'
-import type { ServerFormState } from './types'
+import type { ServerFormState } from '@tanstack/react-form'
 
 interface CreateServerValidateOptions<
   TFormData,
diff --git a/packages/react-form-nextjs/src/error.ts b/packages/react-form-nextjs/src/error.ts
@@ -1,5 +1,5 @@
-import type { ServerFormState } from './types'
 import type { FormAsyncValidateOrFn } from '@tanstack/form-core'
+import type { ServerFormState } from '@tanstack/react-form'
 
 interface ServerValidateErrorState<
   TFormData,
diff --git a/packages/react-form-nextjs/src/index.ts b/packages/react-form-nextjs/src/index.ts
@@ -2,4 +2,3 @@ export * from '@tanstack/react-form'
 
 export * from './createServerValidate'
 export * from './error'
-export * from './types'
diff --git a/packages/react-form-nextjs/src/types.ts b/packages/react-form-nextjs/src/types.ts
diff --git a/packages/react-form-remix/src/createServerValidate.ts b/packages/react-form-remix/src/createServerValidate.ts
@@ -12,7 +12,7 @@ import type {
   FormValidateOrFn,
   UnwrapFormAsyncValidateOrFn,
 } from '@tanstack/form-core'
-import type { ServerFormState } from './types'
+import type { ServerFormState } from '@tanstack/react-form'
 
 interface CreateServerValidateOptions<
   TFormData,
diff --git a/packages/react-form-remix/src/error.ts b/packages/react-form-remix/src/error.ts
@@ -1,5 +1,5 @@
-import type { ServerFormState } from './types'
 import type { FormAsyncValidateOrFn } from '@tanstack/form-core'
+import type { ServerFormState } from '@tanstack/react-form'
 
 interface ServerValidateErrorState<
   TFormData,
diff --git a/packages/react-form-remix/src/index.ts b/packages/react-form-remix/src/index.ts
@@ -2,4 +2,3 @@ export * from '@tanstack/react-form'
 
 export * from './createServerValidate'
 export * from './error'
-export * from './types'
diff --git a/packages/react-form-remix/src/types.ts b/packages/react-form-remix/src/types.ts
diff --git a/packages/react-form-start/src/createServerValidate.tsx b/packages/react-form-start/src/createServerValidate.tsx
@@ -7,7 +7,7 @@ import { getRequestHeader } from '@tanstack/react-start/server'
 import { decode } from 'decode-formdata'
 import { ServerValidateError } from './error'
 import { setInternalTanStackCookie } from './utils'
-import type { ServerFormState } from './types'
+import type { ServerFormState } from '@tanstack/react-form'
 import type {
   FormAsyncValidateOrFn,
   FormOptions,
diff --git a/packages/react-form-start/src/error.ts b/packages/react-form-start/src/error.ts
@@ -1,5 +1,5 @@
-import type { ServerFormState } from './types'
 import type { FormAsyncValidateOrFn } from '@tanstack/form-core'
+import type { ServerFormState } from '@tanstack/react-form'
 
 interface ServerValidateErrorState<
   TFormData,
diff --git a/packages/react-form-start/src/getFormData.tsx b/packages/react-form-start/src/getFormData.tsx
@@ -2,7 +2,7 @@ import {
   deleteInternalTanStackCookie,
   getInternalTanStackCookie,
 } from './utils'
-import type { ServerFormState } from './types'
+import type { ServerFormState } from '@tanstack/react-form'
 
 export const initialFormState = {
   errorMap: {
diff --git a/packages/react-form-start/src/index.ts b/packages/react-form-start/src/index.ts
@@ -3,4 +3,3 @@ export * from '@tanstack/react-form'
 export * from './createServerValidate'
 export * from './getFormData'
 export * from './error'
-export * from './types'
diff --git a/packages/react-form-start/src/types.ts b/packages/react-form-start/src/types.ts
diff --git a/packages/react-form/src/types.ts b/packages/react-form/src/types.ts
@@ -6,6 +6,7 @@ import type {
   FieldOptions,
   FieldValidateOrFn,
   FormAsyncValidateOrFn,
+  FormState,
   FormValidateOrFn,
 } from '@tanstack/form-core'
 
@@ -111,3 +112,23 @@ export interface UseFieldOptionsBound<
       TOnDynamicAsync
     >,
     FieldOptionsMode {}
+
+export type ServerFormState<
+  TFormData,
+  TOnServer extends undefined | FormAsyncValidateOrFn<TFormData>,
+> = Pick<
+  FormState<
+    TFormData,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    TOnServer
+  >,
+  'values' | 'errors' | 'errorMap'
+>
diff --git a/packages/react-form/tests/useTransform.test-d.tsx b/packages/react-form/tests/useTransform.test-d.tsx
@@ -1,6 +1,6 @@
 import { expectTypeOf, it } from 'vitest'
 import { formOptions, mergeForm, useForm, useTransform } from '../src'
-import type { ServerFormState } from '../src/nextjs/types'
+import type { ServerFormState } from '../src'
 
 it('should maintain the type of the form', () => {
   const state = {} as ServerFormState<any, any>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@ export * from '@tanstack/react-form'`
`2`	`2`
`3`	`3`	`export * from './createServerValidate'`
`4`	`4`	`export * from './error'`
`5`		`-export * from './types'`