dedupe makeValidationHook for mode and validate hook

packages/core/src/fields/non-null-graphql.ts

@@ -1,19 +1,23 @@
-import { type BaseListTypeInfo, type CommonFieldConfig, type FieldData } from '../types'
+import {
+  type BaseListTypeInfo,
+  type FieldData,
+} from '../types'
+import {
+  type ValidateFieldHook
+} from '../types/config/hooks'
 
 export function getResolvedIsNullable (
   validation: undefined | { isRequired?: boolean },
   db: undefined | { isNullable?: boolean }
 ): boolean {
-  if (db?.isNullable === false) {
-    return false
-  }
+  if (db?.isNullable === false) return false
   if (db?.isNullable === undefined && validation?.isRequired) {
     return false
   }
   return true
 }
 
-export function resolveHasValidation (
+function resolveHasValidation (
   db?: { isNullable?: boolean },
   validation?: unknown
 ) {
@@ -22,9 +26,63 @@ export function resolveHasValidation (
   return false
 }
 
+export function makeValidateHook <ListTypeInfo extends BaseListTypeInfo> (
+  meta: FieldData,
+  config: {
+    label?: string,
+    db?: {
+      isNullable?: boolean
+    },
+    graphql?: {
+      isNonNull?: {
+        read?: boolean
+      }
+    },
+    validation?: {
+      isRequired?: boolean
+    },
+  },
+  f?: ValidateFieldHook<ListTypeInfo, 'create' | 'update' | 'delete', ListTypeInfo['fields']>
+) {
+  const resolvedIsNullable = getResolvedIsNullable(config.validation, config.db)
+  const mode = resolvedIsNullable === false ? ('required' as const) : ('optional' as const)
+
+  assertReadIsNonNullAllowed(meta, config, resolvedIsNullable)
+  const hasValidation = resolveHasValidation(config.db, config.validation)
+  if (hasValidation) {
+    const validate = async function (args) {
+      const { operation, addValidationError, resolvedData } = args
+      if (operation !== 'delete') {
+        const value = resolvedData[meta.fieldKey]
+        if ((config.validation?.isRequired || resolvedIsNullable === false) && value === null) {
+          addValidationError(`Missing value`)
+        }
+      }
+
+      await f?.(args)
+    } satisfies ValidateFieldHook<ListTypeInfo, 'create' | 'update' | 'delete', ListTypeInfo['fields']>
+
+    return {
+      mode,
+      validate,
+    }
+  }
+
+  return {
+    mode,
+    validate: undefined
+  }
+}
+
 export function assertReadIsNonNullAllowed<ListTypeInfo extends BaseListTypeInfo> (
   meta: FieldData,
-  config: CommonFieldConfig<ListTypeInfo>,
+  config: {
+    graphql?: {
+      isNonNull?: {
+        read?: boolean
+      }
+    }
+  },
   resolvedIsNullable: boolean
 ) {
   if (!resolvedIsNullable) return

packages/core/src/fields/types/bigInt/index.ts

@@ -1,4 +1,3 @@
-import { humanize } from '../../../lib/utils'
 import {
   type BaseListTypeInfo,
   type CommonFieldConfig,
@@ -8,15 +7,11 @@ import {
 } from '../../../types'
 import { graphql } from '../../..'
 import {
-  assertReadIsNonNullAllowed,
   getResolvedIsNullable,
-  resolveHasValidation,
+  makeValidateHook
 } from '../../non-null-graphql'
 import { filters } from '../../filters'
-import {
-  type InternalFieldHooks,
-  mergeFieldHooks,
-} from '../../resolve-hooks'
+import { mergeFieldHooks } from '../../resolve-hooks'
 
 export type BigIntFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
   CommonFieldConfig<ListTypeInfo> & {
@@ -84,41 +79,23 @@ export function bigInt <ListTypeInfo extends BaseListTypeInfo> (
       throw new Error(`The bigInt field at ${meta.listKey}.${meta.fieldKey} specifies a validation.max that is less than the validation.min, and therefore has no valid options`)
     }
 
-    assertReadIsNonNullAllowed(meta, config, isNullable)
-
-    const mode = isNullable === false ? 'required' : 'optional'
-    const fieldLabel = config.label ?? humanize(meta.fieldKey)
-    const hasValidation = resolveHasValidation(config.db, validation)
-
-    const hooks: InternalFieldHooks<ListTypeInfo> = {}
-    if (hasValidation) {
-      hooks.validate = ({ resolvedData, operation, addValidationError }) => {
-        if (operation === 'delete') return
-
-        const value = resolvedData[meta.fieldKey]
+    const {
+      mode,
+      validate,
+    } = makeValidateHook(meta, config, ({ resolvedData, operation, addValidationError }) => {
+      if (operation === 'delete') return
 
-        if (
-          (validation?.isRequired || isNullable === false) &&
-          (value === null ||
-            (operation === 'create' && value === undefined && !hasAutoIncDefault))
-        ) {
-          addValidationError(`${fieldLabel} is required`)
+      const value = resolvedData[meta.fieldKey]
+      if (typeof value === 'number') {
+        if (validation?.min !== undefined && value < validation.min) {
+          addValidationError(`value must be greater than or equal to ${validation.min}`)
         }
-        if (typeof value === 'number') {
-          if (validation?.min !== undefined && value < validation.min) {
-            addValidationError(
-              `${fieldLabel} must be greater than or equal to ${validation.min}`
-            )
-          }
 
-          if (validation?.max !== undefined && value > validation.max) {
-            addValidationError(
-              `${fieldLabel} must be less than or equal to ${validation.max}`
-            )
-          }
+        if (validation?.max !== undefined && value > validation.max) {
+          addValidationError(`value must be less than or equal to ${validation.max}`)
         }
       }
-    }
+    })
 
     return fieldType({
       kind: 'scalar',
@@ -136,10 +113,9 @@ export function bigInt <ListTypeInfo extends BaseListTypeInfo> (
       extendPrismaSchema: config.db?.extendPrismaSchema,
     })({
       ...config,
-      hooks: mergeFieldHooks(hooks, config.hooks),
+      hooks: mergeFieldHooks({ validate }, config.hooks),
       input: {
-        uniqueWhere:
-          isIndexed === 'unique' ? { arg: graphql.arg({ type: graphql.BigInt }) } : undefined,
+        uniqueWhere: isIndexed === 'unique' ? { arg: graphql.arg({ type: graphql.BigInt }) } : undefined,
         where: {
           arg: graphql.arg({ type: filters[meta.provider].BigInt[mode] }),
           resolve: mode === 'optional' ? filters.resolveCommon : undefined,

packages/core/src/fields/types/calendarDay/index.ts

@@ -1,20 +1,15 @@
-import { humanize } from '../../../lib/utils'
 import {
   type BaseListTypeInfo,
-  fieldType,
-  type FieldTypeFunc,
   type CommonFieldConfig,
+  type FieldTypeFunc,
+  fieldType,
   orderDirectionEnum,
 } from '../../../types'
+import { type CalendarDayFieldMeta } from './views'
 import { graphql } from '../../..'
-import {
-  assertReadIsNonNullAllowed,
-  getResolvedIsNullable,
-  resolveHasValidation,
-} from '../../non-null-graphql'
 import { filters } from '../../filters'
-import { type CalendarDayFieldMeta } from './views'
-import { mergeFieldHooks, type InternalFieldHooks } from '../../resolve-hooks'
+import { makeValidateHook } from '../../non-null-graphql'
+import { mergeFieldHooks } from '../../resolve-hooks'
 
 export type CalendarDayFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
   CommonFieldConfig<ListTypeInfo> & {
@@ -48,13 +43,7 @@ export const calendarDay =
       }
     }
 
-    const resolvedIsNullable = getResolvedIsNullable(validation, config.db)
-    assertReadIsNonNullAllowed(meta, config, resolvedIsNullable)
-
-    const mode = resolvedIsNullable === false ? 'required' : 'optional'
-    const fieldLabel = config.label ?? humanize(meta.fieldKey)
     const usesNativeDateType = meta.provider === 'postgresql' || meta.provider === 'mysql'
-    const hasValidation = resolveHasValidation(config.db, validation)
 
     function resolveInput (value: string | null | undefined) {
       if (meta.provider === 'sqlite' || value == null) {
@@ -63,20 +52,12 @@ export const calendarDay =
       return dateStringToDateObjectInUTC(value)
     }
 
+    const {
+      mode,
+      validate,
+    } = makeValidateHook(meta, config)
     const commonResolveFilter = mode === 'optional' ? filters.resolveCommon : <T>(x: T) => x
 
-    const hooks: InternalFieldHooks<ListTypeInfo> = {}
-    if (hasValidation) {
-      hooks.validate = ({ resolvedData, addValidationError, operation }) => {
-        if (operation === 'delete') return
-
-        const value = resolvedData[meta.fieldKey]
-        if ((validation?.isRequired || resolvedIsNullable === false) && value === null) {
-          addValidationError(`${fieldLabel} is required`)
-        }
-      }
-    }
-
     return fieldType({
       kind: 'scalar',
       mode,
@@ -94,7 +75,7 @@ export const calendarDay =
       nativeType: usesNativeDateType ? 'Date' : undefined,
     })({
       ...config,
-      hooks: mergeFieldHooks(hooks, config.hooks),
+      hooks: mergeFieldHooks({ validate }, config.hooks),
       input: {
         uniqueWhere:
           isIndexed === 'unique'

packages/core/src/fields/types/decimal/index.ts

@@ -1,22 +1,17 @@
-import { humanize } from '../../../lib/utils'
 import {
-  fieldType,
-  type FieldTypeFunc,
   type BaseListTypeInfo,
   type CommonFieldConfig,
+  type FieldData,
+  type FieldTypeFunc,
+  fieldType,
   orderDirectionEnum,
   Decimal,
-  type FieldData,
 } from '../../../types'
 import { graphql } from '../../..'
-import {
-  assertReadIsNonNullAllowed,
-  getResolvedIsNullable,
-  resolveHasValidation,
-} from '../../non-null-graphql'
 import { filters } from '../../filters'
 import { type DecimalFieldMeta } from './views'
-import { mergeFieldHooks, type InternalFieldHooks } from '../../resolve-hooks'
+import { makeValidateHook } from '../../non-null-graphql'
+import { mergeFieldHooks } from '../../resolve-hooks'
 
 export type DecimalFieldConfig<ListTypeInfo extends BaseListTypeInfo> =
   CommonFieldConfig<ListTypeInfo> & {
@@ -86,8 +81,6 @@ export const decimal =
       )
     }
 
-    const fieldLabel = config.label ?? humanize(meta.fieldKey)
-
     const max =
       validation?.max === undefined
         ? undefined
@@ -108,12 +101,24 @@ export const decimal =
         ? undefined
         : parseDecimalValueOption(meta, defaultValue, 'defaultValue')
 
-    const isNullable = getResolvedIsNullable(validation, config.db)
-    const hasValidation = resolveHasValidation(config.db, validation)
+    const {
+      mode,
+      validate,
+    } = makeValidateHook(meta, config, ({ resolvedData, operation, addValidationError }) => {
+      if (operation === 'delete') return
+
+      const val: Decimal | null | undefined = resolvedData[meta.fieldKey]
+      if (val != null) {
+        if (min !== undefined && val.lessThan(min)) {
+          addValidationError(`value must be greater than or equal to ${min}`)
+        }
 
-    assertReadIsNonNullAllowed(meta, config, isNullable)
+        if (max !== undefined && val.greaterThan(max)) {
+          addValidationError(`value must be less than or equal to ${max}`)
+        }
+      }
+    })
 
-    const mode = isNullable === false ? 'required' : 'optional'
     const index = isIndexed === true ? 'index' : isIndexed || undefined
     const dbField = {
       kind: 'scalar',
@@ -127,31 +132,9 @@ export const decimal =
       extendPrismaSchema: config.db?.extendPrismaSchema,
     } as const
 
-    const hooks: InternalFieldHooks<ListTypeInfo> = {}
-    if (hasValidation) {
-      hooks.validate = ({ resolvedData, addValidationError, operation }) => {
-        if (operation === 'delete') return
-
-        const val: Decimal | null | undefined = resolvedData[meta.fieldKey]
-
-        if (val === null && (validation?.isRequired || isNullable === false)) {
-          addValidationError(`${fieldLabel} is required`)
-        }
-        if (val != null) {
-          if (min !== undefined && val.lessThan(min)) {
-            addValidationError(`${fieldLabel} must be greater than or equal to ${min}`)
-          }
-
-          if (max !== undefined && val.greaterThan(max)) {
-            addValidationError(`${fieldLabel} must be less than or equal to ${max}`)
-          }
-        }
-      }
-    }
-
     return fieldType(dbField)({
       ...config,
-      hooks: mergeFieldHooks(hooks, config.hooks),
+      hooks: mergeFieldHooks({ validate }, config.hooks),
       input: {
         uniqueWhere:
           isIndexed === 'unique' ? { arg: graphql.arg({ type: graphql.Decimal }) } : undefined,

packages/core/src/fields/types/file/index.ts

@@ -72,7 +72,7 @@ export function file <ListTypeInfo extends BaseListTypeInfo> (config: FileFieldC
           const filenameKey = `${fieldKey}_filename`
           const filename = args.item[filenameKey]
 
-          // This will occur on an update where a file already existed but has been
+          // this will occur on an update where a file already existed but has been
           // changed, or on a delete, where there is no longer an item
           if (
             (args.operation === 'delete' ||