@tanstack/form-core 1.4.0 → 1.5.0

package/src/standardSchemaValidator.ts

@@ -1,10 +1,24 @@
 import type { ValidationSource } from './types'
 
-export type TStandardSchemaValidatorValue<TData> = {
+export type TStandardSchemaValidatorValue<
+  TData,
+  TSource extends ValidationSource = ValidationSource,
+> = {
   value: TData
-  validationSource: ValidationSource
+  validationSource: TSource
 }
 
+export type TStandardSchemaValidatorIssue<
+  TSource extends ValidationSource = ValidationSource,
+> = TSource extends 'form'
+  ? {
+      form: Record<string, StandardSchemaV1Issue[]>
+      fields: Record<string, StandardSchemaV1Issue[]>
+    }
+  : TSource extends 'field'
+    ? StandardSchemaV1Issue[]
+    : never
+
 function prefixSchemaToErrors(issues: readonly StandardSchemaV1Issue[]) {
   const schema = new Map<string, StandardSchemaV1Issue[]>()
 
@@ -26,30 +40,24 @@ function prefixSchemaToErrors(issues: readonly StandardSchemaV1Issue[]) {
   return Object.fromEntries(schema)
 }
 
-const defaultFieldTransformer = (issues: readonly StandardSchemaV1Issue[]) =>
-  issues
-
-const defaultFormTransformer = (issues: readonly StandardSchemaV1Issue[]) => {
+const transformFormIssues = <TSource extends ValidationSource>(
+  issues: readonly StandardSchemaV1Issue[],
+): TStandardSchemaValidatorIssue<TSource> => {
   const schemaErrors = prefixSchemaToErrors(issues)
   return {
     form: schemaErrors,
     fields: schemaErrors,
-  }
+  } as TStandardSchemaValidatorIssue<TSource>
 }
 
-const transformIssues = (
-  validationSource: 'form' | 'field',
-  issues: readonly StandardSchemaV1Issue[],
-) =>
-  validationSource === 'form'
-    ? defaultFormTransformer(issues)
-    : defaultFieldTransformer(issues)
-
 export const standardSchemaValidators = {
-  validate(
-    { value, validationSource }: TStandardSchemaValidatorValue<unknown>,
+  validate<TSource extends ValidationSource = ValidationSource>(
+    {
+      value,
+      validationSource,
+    }: TStandardSchemaValidatorValue<unknown, TSource>,
     schema: StandardSchemaV1,
-  ) {
+  ): TStandardSchemaValidatorIssue<TSource> | undefined {
     const result = schema['~standard'].validate(value)
 
     if (result instanceof Promise) {
@@ -58,17 +66,24 @@ export const standardSchemaValidators = {
 
     if (!result.issues) return
 
-    return transformIssues(validationSource, result.issues)
+    if (validationSource === 'field')
+      return result.issues as TStandardSchemaValidatorIssue<TSource>
+    return transformFormIssues<TSource>(result.issues)
   },
-  async validateAsync(
-    { value, validationSource }: TStandardSchemaValidatorValue<unknown>,
+  async validateAsync<TSource extends ValidationSource>(
+    {
+      value,
+      validationSource,
+    }: TStandardSchemaValidatorValue<unknown, TSource>,
     schema: StandardSchemaV1,
-  ) {
+  ): Promise<TStandardSchemaValidatorIssue<TSource> | undefined> {
     const result = await schema['~standard'].validate(value)
 
     if (!result.issues) return
 
-    return transformIssues(validationSource, result.issues)
+    if (validationSource === 'field')
+      return result.issues as TStandardSchemaValidatorIssue<TSource>
+    return transformFormIssues<TSource>(result.issues)
   },
 }
 

package/src/util-types.ts

@@ -19,8 +19,6 @@ type Try<A1, A2, Catch = never> = A1 extends A2 ? A1 : Catch
  */
 export type Narrow<A> = Try<A, [], NarrowRaw<A>>
 
-type IsAny<T> = 0 extends 1 & T ? true : false
-
 export interface AnyDeepKeyAndValue {
   key: string
   value: any
@@ -117,15 +115,13 @@ export interface UnknownDeepKeyAndValue<TParent extends AnyDeepKeyAndValue> {
   value: unknown
 }
 
-export type DeepKeyAndValueUnknown<TParent extends AnyDeepKeyAndValue> =
-  UnknownDeepKeyAndValue<TParent>
-
 export type DeepKeysAndValues<
   T,
   TParent extends AnyDeepKeyAndValue = never,
   TAcc = never,
-> =
-  IsAny<T> extends true
+> = unknown extends T
+  ? TAcc | UnknownDeepKeyAndValue<TParent>
+  : unknown extends T // this stops runaway recursion when T is any
     ? T
     : T extends string | number | boolean | bigint | Date
       ? TAcc
@@ -134,7 +130,7 @@ export type DeepKeysAndValues<
           ? DeepKeyAndValueArray<TParent, T, TAcc>
           : DeepKeyAndValueTuple<TParent, T, TAcc>
         : keyof T extends never
-          ? TAcc | DeepKeyAndValueUnknown<TParent>
+          ? TAcc | UnknownDeepKeyAndValue<TParent>
           : T extends object
             ? DeepKeyAndValueObject<TParent, T, TAcc>
             : TAcc