fix field hooks

keystonejs · Jul 25, 2024 · a75a2fe · a75a2fe
1 parent 6104291
commit a75a2fe
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 19 deletions.
diff --git a/packages/core/src/fields/types/bigInt/index.ts b/packages/core/src/fields/types/bigInt/index.ts
@@ -128,7 +128,8 @@ export function bigInt <ListTypeInfo extends BaseListTypeInfo> (config: BigIntFi
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         }
       },
       input: {

diff --git a/packages/core/src/fields/types/calendarDay/index.ts b/packages/core/src/fields/types/calendarDay/index.ts
@@ -78,8 +78,8 @@ export function calendarDay <ListTypeInfo extends BaseListTypeInfo> (config: Cal
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       input: {

diff --git a/packages/core/src/fields/types/decimal/index.ts b/packages/core/src/fields/types/decimal/index.ts
@@ -138,8 +138,8 @@ export function decimal <ListTypeInfo extends BaseListTypeInfo> (config: Decimal
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       input: {

diff --git a/packages/core/src/fields/types/float/index.ts b/packages/core/src/fields/types/float/index.ts
@@ -91,8 +91,8 @@ export function float <ListTypeInfo extends BaseListTypeInfo> (config: FloatFiel
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       input: {

diff --git a/packages/core/src/fields/types/integer/index.ts b/packages/core/src/fields/types/integer/index.ts
@@ -125,8 +125,8 @@ export function integer <ListTypeInfo extends BaseListTypeInfo> (config: Integer
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       input: {

diff --git a/packages/core/src/fields/types/multiselect/index.ts b/packages/core/src/fields/types/multiselect/index.ts
@@ -112,8 +112,8 @@ export function multiselect <ListTypeInfo extends BaseListTypeInfo> (
           ...config.hooks,
           validate: {
             ...config.hooks?.validate,
-            create: merge(config.hooks?.validate?.create, validate),
-            update: merge(config.hooks?.validate?.update, validate),
+            create: merge(validate, config.hooks?.validate?.create),
+            update: merge(validate, config.hooks?.validate?.update),
           },
         },
         views: '@keystone-6/core/fields/types/multiselect/views',

diff --git a/packages/core/src/fields/types/password/index.ts b/packages/core/src/fields/types/password/index.ts
@@ -141,8 +141,8 @@ export function password <ListTypeInfo extends BaseListTypeInfo> (config: Passwo
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       input: {

diff --git a/packages/core/src/fields/types/select/index.ts b/packages/core/src/fields/types/select/index.ts
@@ -99,8 +99,8 @@ export function select <ListTypeInfo extends BaseListTypeInfo> (config: SelectFi
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       __ksTelemetryFieldTypeName: '@keystone-6/select',

diff --git a/packages/core/src/fields/types/text/index.ts b/packages/core/src/fields/types/text/index.ts
@@ -146,8 +146,8 @@ export function text <ListTypeInfo extends BaseListTypeInfo> (
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       input: {

diff --git a/packages/core/src/fields/types/timestamp/index.ts b/packages/core/src/fields/types/timestamp/index.ts
@@ -77,8 +77,8 @@ export function timestamp <ListTypeInfo extends BaseListTypeInfo> (
         ...config.hooks,
         validate: {
           ...config.hooks?.validate,
-          create: merge(config.hooks?.validate?.create, validate),
-          update: merge(config.hooks?.validate?.update, validate),
+          create: merge(validate, config.hooks?.validate?.create),
+          update: merge(validate, config.hooks?.validate?.update),
         },
       },
       input: {