feat: modify @include/skip field as nullable.

fireboomio · Jun 4, 2024 · af842ae · af842ae
1 parent 9a360a7
commit af842ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/engine/build/operations_graphql_document.go b/pkg/engine/build/operations_graphql_document.go
@@ -174,6 +174,7 @@ func (i *QueryDocumentItem) resolveSelectionSet(datasourceQuote string, selectio
 			var (
 				itemName                    string
 				itemPath                    []string
+				itemNonNull                 bool
 				itemSchemaRef               *openapi3.SchemaRef
 				itemCustomizedDirectiveName string
 			)
@@ -221,9 +222,7 @@ func (i *QueryDocumentItem) resolveSelectionSet(datasourceQuote string, selectio
 					}
 					return
 				}, path...)
-				if fieldDefinition.Type.NonNull {
-					selectionSchema.Required = append(selectionSchema.Required, itemName)
-				}
+				itemNonNull = fieldDefinition.Type.NonNull
 				i.resolveSelectionArguments(field.Name, field.Arguments, fieldDefinition, path...)
 			} else {
 				var itemError error
@@ -241,7 +240,11 @@ func (i *QueryDocumentItem) resolveSelectionSet(datasourceQuote string, selectio
 			}
 
 			selectionSchema.Properties[itemName] = itemSchemaRef
+			originNullable := itemSchemaRef.Value.Nullable
 			i.resolveSelectionDirectives(field.Directives, itemPath, itemSchemaRef, itemCustomizedDirectiveName)
+			if itemNonNull && !(!originNullable && itemSchemaRef.Value.Nullable) {
+				selectionSchema.Required = append(selectionSchema.Required, itemName)
+			}
 		}
 	}
 	return

diff --git a/pkg/engine/directives/selection_include.go b/pkg/engine/directives/selection_include.go
@@ -53,6 +53,7 @@ func (s *include) Resolve(resolver *SelectionResolver) (err error) {
 		return
 	}
 
+	resolver.Schema.Value.Nullable = true
 	if argIfFound {
 		if err = s.addVariablesSchema(resolver, argIfValue, boolSchema); err != nil {
 			return
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
+    	resolver.Schema.Value.Nullable = true
     	if argIfFound {
     		if err = s.addVariablesSchema(resolver, argIfValue, boolSchema); err != nil {
     			return
@@ Expand Down @@