Merge branch 'master' into one-of-prepare-fix

Author: rmosolgo

.github/workflows/ci.yaml

@@ -52,7 +52,6 @@ jobs:
           - gemfile: gemfiles/rails_master.gemfile
             ruby: 3.3
             graphql_reject_numbers_followed_by_names: 1
-            coverage: 1
             redis: 1
           - gemfile: gemfiles/rails_master.gemfile
             ruby: 3.4
@@ -79,13 +78,6 @@ jobs:
         bundler-cache: true
     - run: bundle exec rake compile
     - run: bundle exec rake test
-    - run: git fetch --no-tags --prune --unshallow origin +refs/heads/*:refs/remotes/origin/*
-      if: ${{ !!matrix.coverage }}
-    - run: bundle exec pronto run -f github_pr -c origin/${{ github.base_ref }}
-      if: ${{ !!matrix.coverage }}
-      env:
-        PRONTO_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
-        PRONTO_GITHUB_ACCESS_TOKEN: "${{ github.token }}"
   javascript_test:
     runs-on: ubuntu-latest
     steps:

.github/workflows/pronto.yaml

@@ -0,0 +1,19 @@
+name: Pronto
+on:
+  - pull_request_target
+
+jobs:
+  pronto:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - run: git fetch --no-tags --prune --unshallow origin +refs/heads/*:refs/remotes/origin/*
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+      - name: Setup pronto
+        run: gem install undercover pronto pronto-rubocop pronto-undercover
+      - name: Run Pronto
+        run: PRONTO_PULL_REQUEST_ID="${{ github.event.pull_request.number }}" PRONTO_GITHUB_ACCESS_TOKEN="${{ github.token }}" pronto run -f github_pr -c origin/${{ github.base_ref }}

graphql.gemspec

@@ -44,8 +44,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-lcov"
   s.add_development_dependency "undercover"
-  s.add_development_dependency "pronto"
-  s.add_development_dependency "pronto-undercover"
   # website stuff
   s.add_development_dependency "jekyll"
   s.add_development_dependency "jekyll-sass-converter", "~>2.2"

lib/graphql/backtrace/table.rb

@@ -78,30 +78,53 @@ def rows
             end
           end
 
-
           object = result.graphql_application_value.object.inspect
-          ast_node = result.graphql_selections.find { |s| s.alias == last_part || s.name == last_part }
-          field_defn = query.get_field(result.graphql_result_type, ast_node.name)
-          args = query.arguments_for(ast_node, field_defn).to_h
-          field_path = field_defn.path
-          if ast_node.alias
-            field_path += " as #{ast_node.alias}"
+          ast_node = nil
+          result.graphql_selections.each do |s|
+            found_ast_node = find_ast_node(s, last_part)
+            if found_ast_node
+              ast_node = found_ast_node
+              break
+            end
           end
 
-          rows << [
-            ast_node.position.join(":"),
-            field_path,
-            "#{object}",
-            args.inspect,
-            inspect_result(@override_value)
-          ]
+          if ast_node
+            field_defn = query.get_field(result.graphql_result_type, ast_node.name)
+            args = query.arguments_for(ast_node, field_defn).to_h
+            field_path = field_defn.path
+            if ast_node.alias
+              field_path += " as #{ast_node.alias}"
+            end
+
+            rows << [
+              ast_node.position.join(":"),
+              field_path,
+              "#{object}",
+              args.inspect,
+              inspect_result(@override_value)
+            ]
+          end
 
           rows << HEADERS
           rows.reverse!
           rows
         end
       end
 
+      def find_ast_node(node, last_part)
+        return nil unless node
+        return node if node.respond_to?(:alias) && node.respond_to?(:name) && (node.alias == last_part || node.name == last_part)
+        return nil unless node.respond_to?(:selections)
+        return nil if node.selections.nil? || node.selections.empty?
+
+        node.selections.each do |child|
+          child_ast_node = find_ast_node(child, last_part)
+          return child_ast_node if child_ast_node
+        end
+
+        nil
+      end
+
       # @return [String]
       def render_table(rows)
         max = Array.new(HEADERS.length, MIN_COL_WIDTH)

spec/graphql/backtrace_spec.rb

@@ -159,6 +159,43 @@ def execute_multiplex(multiplex:)
       assert_includes err.message, "more lines"
     end
 
+    it "annotates crashes from user code when using inline fragments" do
+      err = assert_raises(GraphQL::Backtrace::TracedError) {
+        backtrace_schema.execute <<-GRAPHQL, root_value: "Root"
+        query($msg: String = \"Boom\") {
+          field1 {
+            ... on Thing {
+              boomError: raiseField(message: $msg)
+            }
+          }
+        }
+        GRAPHQL
+      }
+
+      # GraphQL backtrace is present
+      expected_graphql_backtrace = [
+        "4:15: Thing.raiseField as boomError",
+        "2:11: Query.field1",
+        "1:9: query",
+      ]
+      assert_equal expected_graphql_backtrace, err.graphql_backtrace
+
+      hash_inspect = { message: "Boom" }.inspect
+      # The message includes the GraphQL context
+      rendered_table = [
+        'Loc  | Field                         | Object     | ' + "Arguments".ljust(hash_inspect.size) + ' | Result',
+        '4:15 | Thing.raiseField as boomError | :something | ' + hash_inspect + ' | #<RuntimeError: This is broken: Boom>',
+        '2:11 | Query.field1                  | "Root"     | ' + "{}".ljust(hash_inspect.size) + ' | {}',
+        '1:9  | query                         | "Root"     | ' + {"msg" => "Boom"}.inspect.ljust(hash_inspect.size) + ' | {field1: {...}}',
+      ].join("\n")
+
+      assert_includes err.message, "\n" + rendered_table
+      # The message includes the original error message
+      assert_includes err.message, "This is broken: Boom"
+      assert_includes err.message, "spec/graphql/backtrace_spec.rb:49", "It includes the original backtrace"
+      assert_includes err.message, "more lines"
+    end
+
     it "annotates errors from Query#result" do
       query_str = "query StrField { field2 { strField } __typename }"
       context = { backtrace: true }