Add consideration for pointer false directive when optional: pointer …

…configuration option is used (#280)

When support for the `optional` configuration parameter was added in
#198 it was done in a way that, if `optional: pointer` was set, it would
not consider the presence of `# @genqlient(pointer: false)` graphql file
declarations.

docs/CHANGELOG.md

@@ -28,6 +28,7 @@ When releasing a new version:
 - For schemas with enum values that differ only in casing, it's now possible to disable smart-casing in genqlient.yaml; see the [documentation](genqlient.yaml) for `casing` for details.
 
 ### Bug fixes:
+- The presence of negative pointer directives, i.e., `# @genqlient(pointer: false)` are now respected even in the when `optional: pointer` is set in the configuration file.
 
 ## v0.6.0
 

generate/convert.go

@@ -257,7 +257,7 @@ func (g *generator) convertType(
 			oe := true
 			options.Omitempty = &oe
 		}
-	} else if options.GetPointer() || (!typ.NonNull && g.Config.Optional == "pointer") {
+	} else if !options.PointerIsFalse() && (options.GetPointer() || (!typ.NonNull && g.Config.Optional == "pointer")) {
 		// Whatever we get, wrap it in a pointer.  (Because of the way the
 		// options work, recursing here isn't as connvenient.)
 		// Note this does []*T or [][]*T, not e.g. *[][]T.  See #16.

generate/generate_test.go

@@ -218,7 +218,12 @@ func TestGenerateWithConfig(t *testing.T) {
 		{"OptionalValue", "", []string{"ListInput.graphql", "QueryWithSlices.graphql"}, &Config{
 			Optional: "value",
 		}},
-		{"OptionalPointer", "", []string{"ListInput.graphql", "QueryWithSlices.graphql"}, &Config{
+		{"OptionalPointer", "", []string{
+			"ListInput.graphql",
+			"QueryWithSlices.graphql",
+			"SimpleQueryWithPointerFalseOverride.graphql",
+			"SimpleQueryNoOverride.graphql",
+		}, &Config{
 			Optional: "pointer",
 		}},
 		{"OptionalGeneric", "", []string{"ListInput.graphql", "QueryWithSlices.graphql"}, &Config{

generate/genqlient_directive.go

@@ -67,10 +67,11 @@ func (dir *genqlientDirective) String() string {
 	return strings.Join(lines, "\n")
 }
 
-func (dir *genqlientDirective) GetOmitempty() bool { return dir.Omitempty != nil && *dir.Omitempty }
-func (dir *genqlientDirective) GetPointer() bool   { return dir.Pointer != nil && *dir.Pointer }
-func (dir *genqlientDirective) GetStruct() bool    { return dir.Struct != nil && *dir.Struct }
-func (dir *genqlientDirective) GetFlatten() bool   { return dir.Flatten != nil && *dir.Flatten }
+func (dir *genqlientDirective) GetOmitempty() bool   { return dir.Omitempty != nil && *dir.Omitempty }
+func (dir *genqlientDirective) GetPointer() bool     { return dir.Pointer != nil && *dir.Pointer }
+func (dir *genqlientDirective) PointerIsFalse() bool { return dir.Pointer != nil && !*dir.Pointer }
+func (dir *genqlientDirective) GetStruct() bool      { return dir.Struct != nil && *dir.Struct }
+func (dir *genqlientDirective) GetFlatten() bool     { return dir.Flatten != nil && *dir.Flatten }
 
 func setBool(optionName string, dst **bool, v *ast.Value, pos *ast.Position) error {
 	if *dst != nil {

generate/testdata/queries/SimpleQueryNoOverride.graphql

@@ -0,0 +1,6 @@
+query SimpleQueryNoOverride {
+    user {
+        id
+        name
+    }
+}

generate/testdata/queries/SimpleQueryWithPointerFalseOverride.graphql

@@ -0,0 +1,7 @@
+query SimpleQueryWithPointerFalseOverride {
+    user {
+        id
+        # @genqlient(pointer: false)
+        name
+    }
+}

generate/testdata/snapshots/TestGenerate-SimpleQueryNoOverride.graphql-SimpleQueryNoOverride.graphql.json

@@ -0,0 +1,9 @@
+{
+  "operations": [
+    {
+      "operationName": "SimpleQueryNoOverride",
+      "query": "\nquery SimpleQueryNoOverride {\n\tuser {\n\t\tid\n\t\tname\n\t}\n}\n",
+      "sourceLocation": "testdata/queries/SimpleQueryNoOverride.graphql"
+    }
+  ]
+}

generate/testdata/snapshots/TestGenerate-SimpleQueryWithPointerFalseOverride.graphql-SimpleQueryWithPointerFalseOverride.graphql.json

@@ -0,0 +1,9 @@
+{
+  "operations": [
+    {
+      "operationName": "SimpleQueryWithPointerFalseOverride",
+      "query": "\nquery SimpleQueryWithPointerFalseOverride {\n\tuser {\n\t\tid\n\t\tname\n\t}\n}\n",
+      "sourceLocation": "testdata/queries/SimpleQueryWithPointerFalseOverride.graphql"
+    }
+  ]
+}