RubyGems - graphql - Versions diffs - 2.4.5 → 2.5.21 - Mend

graphql 2.4.5 → 2.5.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (192) hide show

checksums.yaml +4 -4
data/lib/generators/graphql/detailed_trace_generator.rb +77 -0
data/lib/generators/graphql/templates/create_graphql_detailed_traces.erb +10 -0
data/lib/graphql/analysis/analyzer.rb +2 -1
data/lib/graphql/analysis/query_complexity.rb +87 -7
data/lib/graphql/analysis/visitor.rb +37 -40
data/lib/graphql/analysis.rb +12 -9
data/lib/graphql/autoload.rb +1 -0
data/lib/graphql/backtrace/table.rb +118 -55
data/lib/graphql/backtrace.rb +1 -19
data/lib/graphql/current.rb +6 -1
data/lib/graphql/dashboard/application_controller.rb +41 -0
data/lib/graphql/dashboard/detailed_traces.rb +47 -0
data/lib/graphql/dashboard/installable.rb +22 -0
data/lib/graphql/dashboard/landings_controller.rb +9 -0
data/lib/graphql/dashboard/limiters.rb +93 -0
data/lib/graphql/dashboard/operation_store.rb +199 -0
data/lib/graphql/dashboard/statics/bootstrap-5.3.3.min.css +6 -0
data/lib/graphql/dashboard/statics/bootstrap-5.3.3.min.js +7 -0
data/lib/graphql/dashboard/statics/charts.min.css +1 -0
data/lib/graphql/dashboard/statics/dashboard.css +30 -0
data/lib/graphql/dashboard/statics/dashboard.js +143 -0
data/lib/graphql/dashboard/statics/header-icon.png +0 -0
data/lib/graphql/dashboard/statics/icon.png +0 -0
data/lib/graphql/dashboard/statics_controller.rb +31 -0
data/lib/graphql/dashboard/subscriptions.rb +97 -0
data/lib/graphql/dashboard/views/graphql/dashboard/detailed_traces/traces/index.html.erb +45 -0
data/lib/graphql/dashboard/views/graphql/dashboard/landings/show.html.erb +18 -0
data/lib/graphql/dashboard/views/graphql/dashboard/limiters/limiters/show.html.erb +62 -0
data/lib/graphql/dashboard/views/graphql/dashboard/not_installed.html.erb +18 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/clients/_form.html.erb +24 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/clients/edit.html.erb +21 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/clients/index.html.erb +69 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/clients/new.html.erb +7 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/index_entries/index.html.erb +39 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/index_entries/show.html.erb +32 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/operations/index.html.erb +81 -0
data/lib/graphql/dashboard/views/graphql/dashboard/operation_store/operations/show.html.erb +71 -0
data/lib/graphql/dashboard/views/graphql/dashboard/subscriptions/subscriptions/show.html.erb +41 -0
data/lib/graphql/dashboard/views/graphql/dashboard/subscriptions/topics/index.html.erb +55 -0
data/lib/graphql/dashboard/views/graphql/dashboard/subscriptions/topics/show.html.erb +40 -0
data/lib/graphql/dashboard/views/layouts/graphql/dashboard/application.html.erb +108 -0
data/lib/graphql/dashboard.rb +96 -0
data/lib/graphql/dataloader/active_record_association_source.rb +84 -0
data/lib/graphql/dataloader/active_record_source.rb +47 -0
data/lib/graphql/dataloader/async_dataloader.rb +38 -15
data/lib/graphql/dataloader/null_dataloader.rb +55 -10
data/lib/graphql/dataloader/source.rb +18 -6
data/lib/graphql/dataloader.rb +110 -26
data/lib/graphql/date_encoding_error.rb +1 -1
data/lib/graphql/dig.rb +2 -1
data/lib/graphql/execution/interpreter/resolve.rb +10 -16
data/lib/graphql/execution/interpreter/runtime/graphql_result.rb +58 -5
data/lib/graphql/execution/interpreter/runtime.rb +229 -93
data/lib/graphql/execution/interpreter.rb +15 -24
data/lib/graphql/execution/multiplex.rb +7 -6
data/lib/graphql/execution/next/field_resolve_step.rb +690 -0
data/lib/graphql/execution/next/load_argument_step.rb +60 -0
data/lib/graphql/execution/next/prepare_object_step.rb +129 -0
data/lib/graphql/execution/next/runner.rb +389 -0
data/lib/graphql/execution/next/selections_step.rb +37 -0
data/lib/graphql/execution/next.rb +69 -0
data/lib/graphql/execution.rb +1 -0
data/lib/graphql/execution_error.rb +13 -10
data/lib/graphql/introspection/directive_location_enum.rb +1 -1
data/lib/graphql/introspection/directive_type.rb +7 -3
data/lib/graphql/introspection/dynamic_fields.rb +5 -1
data/lib/graphql/introspection/entry_points.rb +11 -3
data/lib/graphql/introspection/enum_value_type.rb +5 -5
data/lib/graphql/introspection/field_type.rb +13 -5
data/lib/graphql/introspection/input_value_type.rb +21 -13
data/lib/graphql/introspection/type_type.rb +64 -28
data/lib/graphql/invalid_name_error.rb +1 -1
data/lib/graphql/invalid_null_error.rb +25 -16
data/lib/graphql/language/document_from_schema_definition.rb +2 -1
data/lib/graphql/language/lexer.rb +16 -5
data/lib/graphql/language/nodes.rb +8 -1
data/lib/graphql/language/parser.rb +16 -8
data/lib/graphql/language/static_visitor.rb +37 -33
data/lib/graphql/language/visitor.rb +59 -55
data/lib/graphql/language.rb +21 -12
data/lib/graphql/pagination/connection.rb +2 -0
data/lib/graphql/pagination/connections.rb +32 -0
data/lib/graphql/query/context.rb +6 -10
data/lib/graphql/query/null_context.rb +9 -3
data/lib/graphql/query/partial.rb +179 -0
data/lib/graphql/query.rb +64 -64
data/lib/graphql/railtie.rb +1 -1
data/lib/graphql/schema/addition.rb +3 -1
data/lib/graphql/schema/always_visible.rb +1 -0
data/lib/graphql/schema/argument.rb +24 -8
data/lib/graphql/schema/build_from_definition.rb +113 -54
data/lib/graphql/schema/directive/flagged.rb +2 -0
data/lib/graphql/schema/directive.rb +52 -2
data/lib/graphql/schema/enum.rb +36 -1
data/lib/graphql/schema/enum_value.rb +1 -1
data/lib/graphql/schema/field/connection_extension.rb +15 -35
data/lib/graphql/schema/field/scope_extension.rb +22 -13
data/lib/graphql/schema/field.rb +101 -51
data/lib/graphql/schema/field_extension.rb +33 -0
data/lib/graphql/schema/input_object.rb +45 -38
data/lib/graphql/schema/interface.rb +2 -1
data/lib/graphql/schema/list.rb +1 -1
data/lib/graphql/schema/member/base_dsl_methods.rb +1 -1
data/lib/graphql/schema/member/has_arguments.rb +56 -19
data/lib/graphql/schema/member/has_authorization.rb +35 -0
data/lib/graphql/schema/member/has_dataloader.rb +79 -0
data/lib/graphql/schema/member/has_deprecation_reason.rb +15 -0
data/lib/graphql/schema/member/has_directives.rb +1 -1
data/lib/graphql/schema/member/has_fields.rb +81 -5
data/lib/graphql/schema/member/has_interfaces.rb +3 -3
data/lib/graphql/schema/member/scoped.rb +1 -1
data/lib/graphql/schema/member/type_system_helpers.rb +17 -3
data/lib/graphql/schema/member.rb +6 -0
data/lib/graphql/schema/object.rb +18 -8
data/lib/graphql/schema/ractor_shareable.rb +79 -0
data/lib/graphql/schema/resolver.rb +52 -6
data/lib/graphql/schema/scalar.rb +1 -6
data/lib/graphql/schema/subscription.rb +50 -4
data/lib/graphql/schema/timeout.rb +19 -2
data/lib/graphql/schema/validator/required_validator.rb +71 -14
data/lib/graphql/schema/visibility/migration.rb +3 -2
data/lib/graphql/schema/visibility/profile.rb +115 -23
data/lib/graphql/schema/visibility.rb +49 -32
data/lib/graphql/schema/warden.rb +23 -2
data/lib/graphql/schema.rb +333 -68
data/lib/graphql/static_validation/all_rules.rb +2 -2
data/lib/graphql/static_validation/rules/fields_have_appropriate_selections.rb +47 -13
data/lib/graphql/static_validation/rules/fields_will_merge.rb +79 -17
data/lib/graphql/static_validation/rules/fields_will_merge_error.rb +10 -2
data/lib/graphql/static_validation/rules/not_single_subscription_error.rb +25 -0
data/lib/graphql/static_validation/rules/subscription_root_exists_and_single_subscription_selection.rb +26 -0
data/lib/graphql/static_validation/rules/unique_directives_per_location.rb +6 -2
data/lib/graphql/static_validation/validator.rb +6 -1
data/lib/graphql/subscriptions/action_cable_subscriptions.rb +1 -0
data/lib/graphql/subscriptions/default_subscription_resolve_extension.rb +12 -10
data/lib/graphql/subscriptions/event.rb +12 -1
data/lib/graphql/subscriptions/serialize.rb +1 -1
data/lib/graphql/subscriptions.rb +1 -1
data/lib/graphql/testing/helpers.rb +17 -11
data/lib/graphql/testing/mock_action_cable.rb +111 -0
data/lib/graphql/testing.rb +1 -0
data/lib/graphql/tracing/active_support_notifications_trace.rb +14 -3
data/lib/graphql/tracing/active_support_notifications_tracing.rb +1 -1
data/lib/graphql/tracing/appoptics_trace.rb +9 -1
data/lib/graphql/tracing/appoptics_tracing.rb +7 -0
data/lib/graphql/tracing/appsignal_trace.rb +32 -55
data/lib/graphql/tracing/appsignal_tracing.rb +2 -0
data/lib/graphql/tracing/call_legacy_tracers.rb +66 -0
data/lib/graphql/tracing/data_dog_trace.rb +46 -158
data/lib/graphql/tracing/data_dog_tracing.rb +2 -0
data/lib/graphql/tracing/detailed_trace/active_record_backend.rb +74 -0
data/lib/graphql/tracing/detailed_trace/memory_backend.rb +60 -0
data/lib/graphql/tracing/detailed_trace/redis_backend.rb +72 -0
data/lib/graphql/tracing/detailed_trace.rb +156 -0
data/lib/graphql/tracing/legacy_hooks_trace.rb +1 -0
data/lib/graphql/tracing/legacy_trace.rb +4 -61
data/lib/graphql/tracing/monitor_trace.rb +283 -0
data/lib/graphql/tracing/new_relic_trace.rb +47 -54
data/lib/graphql/tracing/new_relic_tracing.rb +2 -0
data/lib/graphql/tracing/notifications_trace.rb +184 -34
data/lib/graphql/tracing/notifications_tracing.rb +2 -0
data/lib/graphql/tracing/null_trace.rb +9 -0
data/lib/graphql/tracing/perfetto_trace/trace.proto +141 -0
data/lib/graphql/tracing/perfetto_trace/trace_pb.rb +33 -0
data/lib/graphql/tracing/perfetto_trace.rb +864 -0
data/lib/graphql/tracing/platform_trace.rb +5 -0
data/lib/graphql/tracing/prometheus_trace/graphql_collector.rb +2 -0
data/lib/graphql/tracing/prometheus_trace.rb +72 -68
data/lib/graphql/tracing/prometheus_tracing.rb +2 -0
data/lib/graphql/tracing/scout_trace.rb +32 -55
data/lib/graphql/tracing/scout_tracing.rb +2 -0
data/lib/graphql/tracing/sentry_trace.rb +64 -94
data/lib/graphql/tracing/statsd_trace.rb +33 -41
data/lib/graphql/tracing/statsd_tracing.rb +2 -0
data/lib/graphql/tracing/trace.rb +111 -1
data/lib/graphql/tracing.rb +31 -30
data/lib/graphql/type_kinds.rb +1 -0
data/lib/graphql/types/relay/connection_behaviors.rb +9 -7
data/lib/graphql/types/relay/edge_behaviors.rb +5 -4
data/lib/graphql/types/relay/has_node_field.rb +13 -8
data/lib/graphql/types/relay/has_nodes_field.rb +13 -8
data/lib/graphql/types/relay/node_behaviors.rb +13 -2
data/lib/graphql/unauthorized_error.rb +5 -1
data/lib/graphql/version.rb +1 -1
data/lib/graphql.rb +12 -31
metadata +174 -11
data/lib/graphql/backtrace/inspect_result.rb +0 -38
data/lib/graphql/backtrace/trace.rb +0 -93
data/lib/graphql/backtrace/tracer.rb +0 -80
data/lib/graphql/schema/null_mask.rb +0 -11
data/lib/graphql/static_validation/rules/subscription_root_exists.rb +0 -17

data/lib/graphql/dashboard/views/graphql/dashboard/subscriptions/topics/index.html.erb ADDED Viewed

@@ -0,0 +1,55 @@
+<% content_for(:title, "Subscriptions - Topics") %>
+<div class="row mt-3 justify-content-between">
+  <div class="col-auto">
+    <h3>
+      <%= pluralize(@all_topics_count, "Subscription Topic") %>
+    </h3>
+  </div>
+  <div class="col-auto">
+    <%= button_tag "Clear All", class: "btn btn-outline-danger", data: { subscriptions_delete_all: graphql_dashboard.subscriptions_clear_all_path } %>
+  </div>
+</div>
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th># Subscriptions</th>
+      <th>Last Triggered At</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if @all_topics_count == 0 %>
+      <tr>
+        <td colspan="3" class="text-center">
+          <em>There aren't any subscriptions right now.</em>
+        </td>
+      </tr>
+    <% else %>
+      <% @topics.each do |topic| %>
+        <tr>
+          <td><%= link_to(topic.name, graphql_dashboard.subscriptions_topic_path(name: topic.name)) %></td>
+          <td><%= topic.subscriptions_count %></td>
+          <td><%= topic.last_triggered_at || "--" %></td>
+        </tr>
+      <% end %>
+    <% end %>
+  </tbody>
+</table>
+<div class="row">
+  <div class="col-auto">
+    <% if @page > 1 %>
+      <%= link_to("« prev", graphql_dashboard.subscriptions_topics_path(per_page: params[:per_page], page: @page - 1), class: "btn btn-outline-secondary") %>
+    <% else %>
+      <button class="btn btn-outline-secondary" disabled>« prev</button>
+    <% end %>
+  </div>
+  <div class="col-auto">
+    <% if @has_next_page %>
+      <%= link_to("next »", graphql_dashboard.subscriptions_topics_path(per_page: params[:per_page], page: @page + 1), class: "btn btn-outline-secondary") %>
+    <% else %>
+      <button class="btn btn-outline-secondary" disabled>next »</button>
+    <% end %>
+  </div>
+</div>

data/lib/graphql/dashboard/views/graphql/dashboard/subscriptions/topics/show.html.erb ADDED Viewed

@@ -0,0 +1,40 @@
+<%= content_for(:title, "Subscriptions - #{params[:name]}") %>
+<div class="row mt-3">
+  <div class="col">
+    <h3>Topic: <code><%= params[:name] %></code></h3>
+  </div>
+</div>
+<div class="row">
+  <div class="col">
+    <p>Last triggered: <%= @topic_last_triggered_at || "none" %></p>
+    <p><%= pluralize(@subscriptions_count, "Subscription") %></p>
+  </div>
+</div>
+<div class="row">
+  <div class="col">
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Subscription ID</th>
+          <th>Created At</th>
+          <th>Subscribed?</th>
+          <th>Broadcast?</th>
+          <% if @show_broadcast_subscribers_count %><th>Subscribers</th><% end %>
+        </tr>
+      </thead>
+      <tbody>
+        <% @subscriptions.each do |subscription| %>
+          <tr>
+            <td><%= link_to(subscription[:id], graphql_dashboard.subscriptions_subscription_path(subscription[:id])) %></td>
+            <td><%= subscription[:created_at] %></td>
+            <td><code><%= subscription[:still_subscribed] ? "YES" : "NO" %></code></td>
+            <td><code><%= subscription[:is_broadcast] ? "YES" : "NO" %></code></td>
+            <% if @show_broadcast_subscribers_count %><td><%= subscription[:subscribers_count] %></td><% end %>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/lib/graphql/dashboard/views/layouts/graphql/dashboard/application.html.erb ADDED Viewed

@@ -0,0 +1,108 @@
+<!doctype html>
+<html lang="en" class="h-100" >
+  <head>
+    <link rel="icon" type="image/png" href="<%= graphql_dashboard.static_path("icon.png") %>">
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>GraphQL Dashboard <%= content_for?(:title) ? " · #{content_for(:title)}" : "" %> </title>
+    <link rel="stylesheet" href="<%= graphql_dashboard.static_path("bootstrap-5.3.3.min.css") %>" media="screen">
+    <link rel="stylesheet" href="<%= graphql_dashboard.static_path("charts.min.css") %>" media="screen">
+    <link rel="stylesheet" href="<%= graphql_dashboard.static_path("dashboard.css") %>" media="screen">
+    <script src="<%= graphql_dashboard.static_path("bootstrap-5.3.3.min.js") %>"></script>
+    <script src="<%= graphql_dashboard.static_path("dashboard.js") %>"></script>
+    <%= csrf_meta_tags %>
+  </head>
+  <body class="h-100 d-flex flex-column">
+    <main class="flex-shrink-0">
+      <div class="container-fluid">
+        <div class="row">
+          <div class="col gx-0">
+            <nav class="navbar navbar-expand-lg bg-body-tertiary">
+              <div class="container-fluid">
+                <%= link_to graphql_dashboard.root_path, class: "navbar-brand" do %>
+                  <img id="header-icon" src="<%= graphql_dashboard.static_path("header-icon.png") %>" alt="GraphQL-Ruby">
+                <% end %>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+                  <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                  <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                    <li class="nav-item">
+                      <%= link_to "Traces", graphql_dashboard.detailed_traces_traces_path, class: "nav-link #{params[:controller] == "graphql/dashboard/detailed_traces" ? "active" : ""}" %>
+                    </li>
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle <%= params[:controller].include?("operation_store") ? "active" : "" %>" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                        Persisted Operations
+                      </a>
+                      <ul class="dropdown-menu">
+                        <li>
+                          <%= link_to "Clients", graphql_dashboard.operation_store_clients_path, class: "dropdown-item" %>
+                        </li>
+                        <li>
+                          <%= link_to "Operations", graphql_dashboard.operation_store_operations_path, class: "dropdown-item" %>
+                        </li>
+                        <li>
+                          <%= link_to "Index", graphql_dashboard.operation_store_index_entries_path, class: "dropdown-item" %>
+                        </li>
+                      </ul>
+                    </li>
+                    <li class="nav-item">
+                      <%= link_to "Subscriptions", graphql_dashboard.subscriptions_topics_path, class: "nav-link #{params[:controller] == "graphql/dashboard/subscriptions" ? "active" : ""}" %>
+                    </li>
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle <%= params[:controller].include?("limiters") ? "active" : "" %>" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                        Rate Limiters
+                      </a>
+                      <ul class="dropdown-menu">
+                        <li>
+                          <%= link_to "Runtime", graphql_dashboard.limiters_limiter_path("runtime", chart: params[:chart]), class: "dropdown-item" %>
+                        </li>
+                        <li>
+                          <%= link_to "Active Operations", graphql_dashboard.limiters_limiter_path("active_operations", chart: params[:chart]), class: "dropdown-item" %>
+                        </li>
+                        <% if schema_class.respond_to?(:enterprise_mutation_limiter) && schema_class.enterprise_mutation_limiter %>
+                          <li>
+                            <%= link_to "Mutations", graphql_dashboard.limiters_limiter_path("mutations", chart: params[:chart]), class: "dropdown-item" %>
+                          </li>
+                        <% end %>
+                      </ul>
+                    </li>
+                  </ul>
+                  <span class="navbar-text pe-2">
+                    <%= link_to ".", "#", class: "nav-link", id: "themeToggle" %>
+                  </span>
+                </div>
+              </div>
+            </nav>
+          </div>
+        </div>
+        <% flash.each do |flash_type, flash_message| %>
+          <div class="row mt-2">
+            <div class="col">
+              <div class="alert alert-<%= flash_type %> alert-dismissible fade show" role="alert">
+                <%= flash_message %>
+                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      </div>
+      <div class="container-fluid">
+        <%= yield %>
+      </div>
+    </main>
+    <footer class="mt-auto">
+      <div class="container-fluid">
+        <div class="sticky-bottom">
+          <div class="row bg-body-tertiary">
+            <div class="col gx-0 px-4">
+              <p class="fs-6 text-center pt-2 text-muted">
+                <em>GraphQL-Ruby v<%= GraphQL::VERSION %></em> · <code><%= schema_class %></code>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </footer>
+  </body>
+</html>

data/lib/graphql/dashboard.rb ADDED Viewed

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+require 'rails/engine'
+require 'action_controller'
+module Graphql
+  # `GraphQL::Dashboard` is a `Rails::Engine`-based dashboard for viewing metadata about your GraphQL schema.
+  #
+  # Pass the class name of your schema when mounting it.
+  # @see GraphQL::Tracing::DetailedTrace DetailedTrace for viewing production traces in the Dashboard
+  #
+  # @example Mounting the Dashboard in your app
+  #   mount GraphQL::Dashboard, at: "graphql_dashboard", schema: "MySchema"
+  #
+  # @example Authenticating the Dashboard with HTTP Basic Auth
+  #   # config/initializers/graphql_dashboard.rb
+  #   GraphQL::Dashboard.middleware.use(Rack::Auth::Basic) do |username, password|
+  #     # Compare the provided username/password to an application setting:
+  #     ActiveSupport::SecurityUtils.secure_compare(Rails.application.credentials.graphql_dashboard_username, username) &&
+  #       ActiveSupport::SecurityUtils.secure_compare(Rails.application.credentials.graphql_dashboard_username, password)
+  #   end
+  #
+  # @example Custom Rails authentication
+  #   # config/initializers/graphql_dashboard.rb
+  #   ActiveSupport.on_load(:graphql_dashboard_application_controller) do
+  #     # context here is GraphQL::Dashboard::ApplicationController
+  #
+  #     before_action do
+  #       raise ActionController::RoutingError.new('Not Found') unless current_user&.admin?
+  #     end
+  #
+  #     def current_user
+  #       # load current user
+  #     end
+  #   end
+  #
+  class Dashboard < Rails::Engine
+    engine_name "graphql_dashboard"
+    isolate_namespace(Graphql::Dashboard)
+    autoload :ApplicationController, "graphql/dashboard/application_controller"
+    autoload :LandingsController, "graphql/dashboard/landings_controller"
+    autoload :StaticsController, "graphql/dashboard/statics_controller"
+    autoload :DetailedTraces, "graphql/dashboard/detailed_traces"
+    autoload :Subscriptions, "graphql/dashboard/subscriptions"
+    autoload :OperationStore, "graphql/dashboard/operation_store"
+    autoload :Limiters, "graphql/dashboard/limiters"
+    routes do
+      root "landings#show"
+      resources :statics, only: :show, constraints: { id: /[0-9A-Za-z\-.]+/ }
+      namespace :detailed_traces do
+        resources :traces, only: [:index, :show, :destroy] do
+          collection do
+            delete :delete_all, to: "traces#delete_all", as: :delete_all
+          end
+        end
+      end
+      namespace :limiters do
+        resources :limiters, only: [:show, :update], param: :name
+      end
+      namespace :operation_store do
+        resources :clients, param: :name do
+          resources :operations, param: :digest, only: [:index] do
+            collection do
+              get :archived, to: "operations#index", archived_status: :archived, as: :archived
+              post :archive, to: "operations#update", modification: :archive, as: :archive
+              post :unarchive, to: "operations#update", modification: :unarchive, as: :unarchive
+            end
+          end
+        end
+        resources :operations, param: :digest, only: [:index, :show] do
+          collection do
+            get :archived, to: "operations#index", archived_status: :archived, as: :archived
+            post :archive, to: "operations#update", modification: :archive, as: :archive
+            post :unarchive, to: "operations#update", modification: :unarchive, as: :unarchive
+          end
+        end
+        resources :index_entries, only: [:index, :show], param: :name, constraints: { name: /[A-Za-z0-9_.]+/}
+      end
+      namespace :subscriptions do
+        resources :topics, only: [:index, :show], param: :name, constraints: { name: /.*/ }
+        resources :subscriptions, only: [:show], constraints: { id: /[a-zA-Z0-9\-]+/ }
+        post "/subscriptions/clear_all", to: "subscriptions#clear_all", as: :clear_all
+      end
+    end
+  end
+end
+# Rails expects the engine to be called `Graphql::Dashboard`,
+# but `GraphQL::Dashboard` is consistent with this gem's naming.
+# So define both constants to refer to the same class.
+GraphQL::Dashboard = Graphql::Dashboard

data/lib/graphql/dataloader/active_record_association_source.rb ADDED Viewed

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+require "graphql/dataloader/source"
+require "graphql/dataloader/active_record_source"
+module GraphQL
+  class Dataloader
+    class ActiveRecordAssociationSource < GraphQL::Dataloader::Source
+      RECORD_SOURCE_CLASS = ActiveRecordSource
+      def initialize(association, scope = nil)
+        @association = association
+        @scope = scope
+      end
+      def self.batch_key_for(association, scope = nil)
+        if scope
+          [association, scope.to_sql]
+        else
+          [association]
+        end
+      end
+      def load(record)
+        if (assoc = record.association(@association)).loaded?
+          assoc.target
+        else
+          super
+        end
+      end
+      def fetch(records)
+        record_classes = Set.new.compare_by_identity
+        associated_classes = Set.new.compare_by_identity
+        scoped_fetch = !@scope.nil?
+        records.each do |record|
+          if scoped_fetch
+            assoc = record.association(@association)
+            assoc.reset
+          end
+          if record_classes.add?(record.class)
+            reflection = record.class.reflect_on_association(@association)
+            if !reflection.polymorphic? && reflection.klass
+              associated_classes.add(reflection.klass)
+            end
+          end
+        end
+        available_records = []
+        associated_classes.each do |assoc_class|
+          already_loaded_records = dataloader.with(RECORD_SOURCE_CLASS, assoc_class).results.values
+          available_records.concat(already_loaded_records)
+        end
+        ::ActiveRecord::Associations::Preloader.new(records: records, associations: @association, available_records: available_records, scope: @scope).call
+        loaded_associated_records = records.map { |r|
+          assoc = r.association(@association)
+          lar = assoc.target
+          if scoped_fetch
+            assoc.reset
+          end
+          lar
+        }
+        if !scoped_fetch
+          # Don't cache records loaded via scope because they might have reduced `SELECT`s
+          # Could check .select_values here?
+          records_by_model = {}
+          loaded_associated_records.flatten.each do |record|
+            if record
+              updates = records_by_model[record.class] ||= {}
+              updates[record.id] = record
+            end
+          end
+          records_by_model.each do |model_class, updates|
+            dataloader.with(RECORD_SOURCE_CLASS, model_class).merge(updates)
+          end
+        end
+        loaded_associated_records
+      end
+    end
+  end
+end

data/lib/graphql/dataloader/active_record_source.rb ADDED Viewed

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+require "graphql/dataloader/source"
+module GraphQL
+  class Dataloader
+    class ActiveRecordSource < GraphQL::Dataloader::Source
+      def initialize(model_class, find_by: model_class.primary_key)
+        @model_class = model_class
+        @find_by = find_by
+        @find_by_many = find_by.is_a?(Array)
+        if @find_by_many
+          @type_for_column = @find_by.map { |fb| @model_class.type_for_attribute(fb) }
+        else
+          @type_for_column = @model_class.type_for_attribute(@find_by)
+        end
+      end
+      def result_key_for(requested_key)
+        normalize_fetch_key(requested_key)
+      end
+      def normalize_fetch_key(requested_key)
+        if @find_by_many
+          requested_key.each_with_index.map do |k, idx|
+            @type_for_column[idx].cast(k)
+          end
+        else
+          @type_for_column.cast(requested_key)
+        end
+      end
+      def fetch(record_ids)
+        records = @model_class.where(@find_by => record_ids)
+        record_lookup = {}
+        if @find_by_many
+          records.each do |r|
+            key = @find_by.map { |fb| r.public_send(fb) }
+            record_lookup[key] = r
+          end
+        else
+          records.each { |r| record_lookup[r.public_send(@find_by)] = r }
+        end
+        record_ids.map { |id| record_lookup[id] }
+      end
+    end
+  end
+end

data/lib/graphql/dataloader/async_dataloader.rb CHANGED Viewed

@@ -2,16 +2,20 @@
 module GraphQL
   class Dataloader
     class AsyncDataloader < Dataloader
-      def yield
+      def yield(source = Fiber[:__graphql_current_dataloader_source])
+        trace = Fiber[:__graphql_current_multiplex]&.current_trace
+        trace&.dataloader_fiber_yield(source)
         if (condition = Fiber[:graphql_dataloader_next_tick])
           condition.wait
         else
           Fiber.yield
         end
+        trace&.dataloader_fiber_resume(source)
         nil
       end
-      def run
+      def run(trace_query_lazy: nil)
+        trace = Fiber[:__graphql_current_multiplex]&.current_trace
         jobs_fiber_limit, total_fiber_limit = calculate_fiber_limit
         job_fibers = []
         next_job_fibers = []
@@ -20,25 +24,17 @@ module GraphQL
         first_pass = true
         sources_condition = Async::Condition.new
         manager = spawn_fiber do
+          trace&.begin_dataloader(self)
           while first_pass || !job_fibers.empty?
             first_pass = false
             fiber_vars = get_fiber_variables
-            while (f = (job_fibers.shift || (((job_fibers.size + next_job_fibers.size + source_tasks.size) < jobs_fiber_limit) && spawn_job_fiber)))
-              if f.alive?
-                finished = run_fiber(f)
-                if !finished
-                  next_job_fibers << f
-                end
-              end
-            end
-            job_fibers.concat(next_job_fibers)
-            next_job_fibers.clear
+            run_pending_steps(job_fibers, next_job_fibers, source_tasks, jobs_fiber_limit, trace)
             Sync do |root_task|
               set_fiber_variables(fiber_vars)
               while !source_tasks.empty? || @source_cache.each_value.any? { |group_sources| group_sources.each_value.any?(&:pending?) }
-                while (task = (source_tasks.shift || (((job_fibers.size + next_job_fibers.size + source_tasks.size + next_source_tasks.size) < total_fiber_limit) && spawn_source_task(root_task, sources_condition))))
+                while (task = (source_tasks.shift || (((job_fibers.size + next_job_fibers.size + source_tasks.size + next_source_tasks.size) < total_fiber_limit) && spawn_source_task(root_task, sources_condition, trace))))
                   if task.alive?
                     root_task.yield # give the source task a chance to run
                     next_source_tasks << task
@@ -49,7 +45,15 @@ module GraphQL
                 next_source_tasks.clear
               end
             end
+            if !@lazies_at_depth.empty?
+              with_trace_query_lazy(trace_query_lazy) do
+                run_next_pending_lazies(job_fibers, trace)
+                run_pending_steps(job_fibers, next_job_fibers, source_tasks, jobs_fiber_limit, trace)
+              end
+            end
           end
+          trace&.end_dataloader(self)
         end
         manager.resume
@@ -63,7 +67,20 @@ module GraphQL
       private
-      def spawn_source_task(parent_task, condition)
+      def run_pending_steps(job_fibers, next_job_fibers, source_tasks, jobs_fiber_limit, trace)
+        while (f = (job_fibers.shift || (((job_fibers.size + next_job_fibers.size + source_tasks.size) < jobs_fiber_limit) && spawn_job_fiber(trace))))
+          if f.alive?
+            finished = run_fiber(f)
+            if !finished
+              next_job_fibers << f
+            end
+          end
+        end
+        job_fibers.concat(next_job_fibers)
+        next_job_fibers.clear
+      end
+      def spawn_source_task(parent_task, condition, trace)
         pending_sources = nil
         @source_cache.each_value do |source_by_batch_params|
           source_by_batch_params.each_value do |source|
@@ -77,10 +94,16 @@ module GraphQL
         if pending_sources
           fiber_vars = get_fiber_variables
           parent_task.async do
+            trace&.dataloader_spawn_source_fiber(pending_sources)
             set_fiber_variables(fiber_vars)
             Fiber[:graphql_dataloader_next_tick] = condition
-            pending_sources.each(&:run_pending_keys)
+            pending_sources.each do |s|
+              trace&.begin_dataloader_source(s)
+              s.run_pending_keys
+              trace&.end_dataloader_source(s)
+            end
             cleanup_fiber
+            trace&.dataloader_fiber_exit
           end
         end
       end

data/lib/graphql/dataloader/null_dataloader.rb CHANGED Viewed

@@ -2,23 +2,68 @@
 module GraphQL
   class Dataloader
-    # The default implementation of dataloading -- all no-ops.
+    # GraphQL-Ruby uses this when Dataloader isn't enabled.
     #
-    # The Dataloader interface isn't public, but it enables
-    # simple internal code while adding the option to add Dataloader.
+    # It runs execution code inline and gathers lazy objects (eg. Promises)
+    # and resolves them during {#run}.
     class NullDataloader < Dataloader
-      # These are all no-ops because code was
-      # executed synchronously.
-      def run; end
-      def run_isolated; yield; end
-      def yield
+      def initialize(*)
+        @lazies_at_depth = Hash.new { |h,k| h[k] = [] }
+      end
+      def freeze
+        @lazies_at_depth.default_proc = nil
+        @lazies_at_depth.freeze
+        super
+      end
+      def run(trace_query_lazy: nil)
+        with_trace_query_lazy(trace_query_lazy) do
+          while !@lazies_at_depth.empty?
+            smallest_depth = nil
+            @lazies_at_depth.each_key do |depth_key|
+              smallest_depth ||= depth_key
+              if depth_key < smallest_depth
+                smallest_depth = depth_key
+              end
+            end
+            if smallest_depth
+              lazies = @lazies_at_depth.delete(smallest_depth)
+              lazies.each(&:value) # resolve these Lazy instances
+            end
+          end
+        end
+      end
+      def run_isolated
+        # Reuse this instance because execution code may already have a reference to _this_ `dataloader` inside the given block.
+        prev_lazies_at_depth = @lazies_at_depth
+        @lazies_at_depth = @lazies_at_depth.dup.clear
+        res = nil
+        append_job {
+          res = yield
+        }
+        run
+        res
+      ensure
+        @lazies_at_depth = prev_lazies_at_depth
+      end
+      def clear_cache; end
+      def yield(_source)
         raise GraphQL::Error, "GraphQL::Dataloader is not running -- add `use GraphQL::Dataloader` to your schema to use Dataloader sources."
       end
-      def append_job
-        yield
+      def append_job(callable = nil)
+        callable ? callable.call : yield
         nil
       end
+      def with(*)
+        raise GraphQL::Error, "GraphQL::Dataloader is not running -- add `use GraphQL::Dataloader` to your schema to use Dataloader sources."
+      end
     end
   end
 end