Merge branch 'master' into log-on-unsuccessful-responses

rperryng · Dec 4, 2024 · 4668a49 · 4668a49
2 parents dea3ea9 + 6b2b430
commit 4668a49
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/lib/graphql-hive/analyzer.rb b/lib/graphql-hive/analyzer.rb
@@ -10,8 +10,11 @@ def initialize(query_or_multiplex)
       end
 
       def on_enter_field(node, _parent, visitor)
-        @used_fields.add(visitor.parent_type_definition.graphql_name)
-        @used_fields.add(make_id(visitor.parent_type_definition.graphql_name, node.name))
+        parent_type = visitor.parent_type_definition
+        if parent_type&.respond_to?(:graphql_name) && parent_type.fields[node.name]
+          @used_fields.add(parent_type.graphql_name)
+          @used_fields.add(make_id(parent_type.graphql_name, node.name))
+        end
       end
 
       # Visitor also calls 'on_enter_argument' when visiting input object fields in arguments

diff --git a/spec/graphql/graphql-hive/analyzer_spec.rb b/spec/graphql/graphql-hive/analyzer_spec.rb
@@ -349,4 +349,27 @@
       )
     end
   end
+
+  context "with an invalid field" do
+    let(:query_string) do
+      <<~GQL
+        query getGatewayProjects {
+          projectsByManyTypes(type: [STITCHING]),
+          nonExistentField {
+            subField
+          }
+        }
+      GQL
+    end
+
+    it "collects all valid fields and excludes invalid fields" do
+      expect(used_fields).to contain_exactly(
+        "Query",
+        "Query.projectsByManyTypes",
+        "ProjectType",
+        "Query.projectsByManyTypes.type",
+        "ProjectType.STITCHING"
+      )
+    end
+  end
 end