Handle both old and new validate syntax

.changeset/long-bees-thank.md

@@ -0,0 +1,5 @@
+---
+"@keystone-6/core": patch
+---
+
+Handle combined use of old and new validate syntax

packages/core/src/fields/resolve-hooks.ts

@@ -9,32 +9,6 @@ import {
 export type InternalFieldHooks<ListTypeInfo extends BaseListTypeInfo> =
   Omit<FieldHooks<ListTypeInfo>, 'validateInput' | 'validateDelete' | 'resolveInput'>
 
-/** @deprecated, TODO: remove in breaking change */
-function resolveValidateHooks <ListTypeInfo extends BaseListTypeInfo> ({
-  validate,
-  validateInput,
-  validateDelete
-}: FieldHooks<ListTypeInfo>): Exclude<FieldHooks<ListTypeInfo>["validate"], Function> | undefined {
-  if (validateInput || validateDelete) {
-    return {
-      create: validateInput,
-      update: validateInput,
-      delete: validateDelete,
-    }
-  }
-
-  if (!validate) return
-  if (typeof validate === 'function') {
-    return {
-      create: validate,
-      update: validate,
-      delete: validate
-    }
-  }
-
-  return validate
-}
-
 function merge <
   R,
   A extends (r: R) => MaybePromise<void>,
@@ -47,6 +21,23 @@ function merge <
   }
 }
 
+/** @deprecated, TODO: remove in breaking change */
+function resolveValidateHooks <ListTypeInfo extends BaseListTypeInfo> ({
+  validate,
+  validateInput,
+  validateDelete
+}: FieldHooks<ListTypeInfo>): Exclude<FieldHooks<ListTypeInfo>["validate"], Function> | undefined {
+  if (!validate && !validateInput && !validateDelete) return
+
+  const isFnValidate = typeof validate === 'function'
+
+  return {
+    create: merge(validateInput, isFnValidate ? validate : validate?.create),
+    update: merge(validateInput, isFnValidate ? validate : validate?.update),
+    delete: merge(validateDelete, isFnValidate ? validate : validate?.delete),
+  }
+}
+
 export function mergeFieldHooks <ListTypeInfo extends BaseListTypeInfo> (
   builtin?: InternalFieldHooks<ListTypeInfo>,
   hooks?: FieldHooks<ListTypeInfo>,