Add support for [field].graphql.isNonNull: true

.changeset/add-isnonnull-true.md

@@ -0,0 +1,5 @@
+---
+'@keystone-6/core': breaking
+---
+
+Add support for [field].graphql.isNonNull: true

packages/core/src/lib/core/initialise-lists.ts

@@ -407,9 +407,9 @@ function getListsWithInitialisedFields (
           cacheHint: f.graphql?.cacheHint,
           isEnabled: isEnabledField,
           isNonNull: {
-            read: f.graphql?.isNonNull?.read ?? false,
-            create: f.graphql?.isNonNull?.create ?? false,
-            update: f.graphql?.isNonNull?.update ?? false,
+            read: typeof f.graphql?.isNonNull === 'boolean' ? f.graphql.isNonNull : f.graphql?.isNonNull?.read ?? false,
+            create: typeof f.graphql?.isNonNull === 'boolean' ? f.graphql.isNonNull : f.graphql?.isNonNull?.create ?? false,
+            update: typeof f.graphql?.isNonNull === 'boolean' ? f.graphql.isNonNull : f.graphql?.isNonNull?.update ?? false,
           },
         },
         ui: {

packages/core/src/lib/typescript-schema-printer.ts

@@ -95,13 +95,18 @@ function printInterimType<L extends InitialisedList> (
   list: L,
   listKey: string,
   typename: string,
-  operation: 'Create' | 'Update'
+  operation: 'create' | 'update'
 ) {
-  const prismaType = `import('${prismaClientPath}').Prisma.${listKey}${operation}Input`
+  const operationName = {
+    'create': 'Create',
+    'update': 'Update'
+  }[operation]
+  const prismaType = `import('${prismaClientPath}').Prisma.${listKey}${operationName}Input`
 
   return [
     `type Resolved${typename} = {`,
-    ...Object.entries(list.fields).map(([fieldKey, { dbField }]) => {
+    ...Object.entries(list.fields).map(([fieldKey, field]) => {
+      const { dbField } = field
       if (dbField.kind === 'none') return `  ${fieldKey}?: undefined`
 
       // TODO: this could be elsewhere, maybe id-field.ts
@@ -114,15 +119,15 @@ function printInterimType<L extends InitialisedList> (
         }
 
         // soft-block `id` updates for relationship safety
-        if (operation === 'Update') return `  id?: undefined`
+        if (operation === 'update') return `  id?: undefined`
       }
 
       if (dbField.kind === 'multi') {
         return [
           `  ${fieldKey}: {`,
           ...Object.entries(dbField.fields).map(([subFieldKey, subDbField]) => {
             // TODO: untrue if a db defaultValue is set
-            //              const optional = operation === 'Create' && subDbField.mode === 'required' ? '' : '?'
+            //              const optional = operation === 'create' && subDbField.mode === 'required' ? '' : '?'
             const optional = '?'
             return `  ${subFieldKey}${optional}: ${prismaType}['${fieldKey}_${subFieldKey}']`
           }),
@@ -131,8 +136,8 @@ function printInterimType<L extends InitialisedList> (
       }
 
       // TODO: untrue if a db defaultValue is set
-      //        const optional = operation === 'Create' && dbField.mode === 'required' ? '' : '?'
-      const optional = '?'
+      //        const optional = operation === 'create' && dbField.mode === 'required' ? '' : '?'
+      const optional = field.graphql.isNonNull[operation] ? '' : '?'
       return `  ${fieldKey}${optional}: ${prismaType}['${fieldKey}']`
     }),
     `}`,
@@ -209,7 +214,7 @@ export function printGeneratedTypes (
             list,
             listKey,
             list.graphql.names.createInputName,
-            'Create'
+            'create'
           )
         }
 
@@ -219,7 +224,7 @@ export function printGeneratedTypes (
             list,
             listKey,
             list.graphql.names.updateInputName,
-            'Update'
+            'update'
           )
         }
       }

packages/core/src/types/config/fields.ts

@@ -33,25 +33,27 @@ export type CommonFieldConfig<ListTypeInfo extends BaseListTypeInfo> = {
   }
   graphql?: {
     cacheHint?: CacheHint
-    isNonNull?: {
-      // should this field be non-nullable on the {List} GraphQL type?
-      read?: boolean
-      // should this field be non-nullable on the {List}CreateInput GraphQL type?
-      create?: boolean
-      // should this field be non-nullable on the {List}UpdateInput GraphQL type?
-      update?: boolean
-    }
+    isNonNull?:
+      | boolean
+      | {
+        // whether this field is non-nullable on the {List} GraphQL type
+        read?: boolean
+        // whether this field is non-nullable on the {List}CreateInput GraphQL type
+        create?: boolean
+        // whether this field is non-nullable on the {List}UpdateInput GraphQL type
+        update?: boolean
+      }
 
     omit?:
       | boolean
       | {
-          // should this field be omitted from the {List} GraphQL type?
-          read?: boolean
-          // should this field be omitted from the {List}CreateInput GraphQL type?
-          create?: boolean
-          // should this field be omitted from the {List}UpdateInput GraphQL type?
-          update?: boolean
-        }
+        // whether this field is omitted from the {List} GraphQL type
+        read?: boolean
+        // whether this field is omitted from the {List}CreateInput GraphQL type
+        create?: boolean
+        // whether this field is omitted from the {List}UpdateInput GraphQL type
+        update?: boolean
+      }
   }
   isFilterable?: boolean | ((args: FilterOrderArgs<ListTypeInfo>) => MaybePromise<boolean>)
   isOrderable?: boolean | ((args: FilterOrderArgs<ListTypeInfo>) => MaybePromise<boolean>)