graphql 2.5.19 → 2.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a94d75c592000805bf9fd18507343c0b3428f1cf1d9a1828edc921828fd2735
-  data.tar.gz: 2984583eb702965d43e45f58f1ac29b6a782b8ecf02b4ee1953b5c5bbb6ec872
+  metadata.gz: a3389acc9cdde64e7a96d73e206c1e97b6d2e55e2b11c97672435682ba7b4324
+  data.tar.gz: cc6ceaf0af5a61ccbd3c2c38eb8d87035ba04ca23e40cc14eee60cd1093332d3
 SHA512:
-  metadata.gz: 743bd603f22bb38bdff984c75b37eea32d460aeafd50617fc52dc9c4b93fe1d3265df196b728432a7b2d6494a6ba20c47b658ee84b387377037ea173844c654b
-  data.tar.gz: 12354210f6208443a5ec0dc931606440de29bfe0bdb7c6468e7faf9bc013a67671eab62fcc3bd88405d1ffb840a5c0e04be337d9a6707d511a2046d315722f63
+  metadata.gz: 472188116841eba00d2e98c216fb1c381c306c83d51dd283dff9feb62849cb9e72b5cb23d86125ddcbdd2e8975df2ab686b69af7864a3ffae88227517e709aa7
+  data.tar.gz: ae9573fcaa2271c3e4351f067cd992db0adbf50b38d98aab92300d0f08b8756ecf5c9d44f274feeead5d9d99f9721ade833cfe96471966d03bd70fae6add7fb5

data/lib/graphql/dashboard/application_controller.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require "action_controller"
+
+module Graphql
+  class Dashboard < Rails::Engine
+    class ApplicationController < ActionController::Base
+      protect_from_forgery with: :exception
+      prepend_view_path(File.expand_path("../views", __FILE__))
+
+      content_security_policy do |policy|
+        policy.default_src(:self) if policy.default_src(*policy.default_src).blank?
+        policy.connect_src(:self) if policy.connect_src(*policy.connect_src).blank?
+        policy.base_uri(:none) if policy.base_uri(*policy.base_uri).blank?
+        policy.font_src(:self) if policy.font_src(*policy.font_src).blank?
+        policy.img_src(:self, :data) if policy.img_src(*policy.img_src).blank?
+        policy.object_src(:none) if policy.object_src(*policy.object_src).blank?
+        policy.script_src(:self) if policy.script_src(*policy.script_src).blank?
+        policy.style_src(:self) if policy.style_src(*policy.style_src).blank?
+        policy.form_action(:self) if policy.form_action(*policy.form_action).blank?
+        policy.frame_ancestors(:none) if policy.frame_ancestors(*policy.frame_ancestors).blank?
+      end
+
+      def schema_class
+        @schema_class ||= begin
+          schema_param = request.query_parameters["schema"] || params[:schema]
+          case schema_param
+          when Class
+            schema_param
+          when String
+            schema_param.constantize
+          else
+            raise "Missing `params[:schema]`, please provide a class or string to `mount GraphQL::Dashboard, schema: ...`"
+          end
+        end
+      end
+      helper_method :schema_class
+    end
+  end
+end
+
+ActiveSupport.run_load_hooks(:graphql_dashboard_application_controller, GraphQL::Dashboard::ApplicationController)

data/lib/graphql/dashboard/landings_controller.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+module Graphql
+  class Dashboard < Rails::Engine
+    class LandingsController < ApplicationController
+      def show
+      end
+    end
+  end
+end

data/lib/graphql/dashboard/statics_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Graphql
+  class Dashboard < Rails::Engine
+    class StaticsController < ApplicationController
+      skip_forgery_protection
+      # Use an explicit list of files to avoid any chance of reading other files from disk
+      STATICS = {}
+
+      [
+        "icon.png",
+        "header-icon.png",
+        "charts.min.css",
+        "dashboard.css",
+        "dashboard.js",
+        "bootstrap-5.3.3.min.css",
+        "bootstrap-5.3.3.min.js",
+      ].each do |static_file|
+        STATICS[static_file] = File.expand_path("../statics/#{static_file}", __FILE__)
+      end
+
+      def show
+        expires_in 1.year, public: true
+        if (filepath = STATICS[params[:id]])
+          render file: filepath
+        else
+          head :not_found
+        end
+      end
+    end
+  end
+end

data/lib/graphql/dashboard/subscriptions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require_relative "./installable"
 module Graphql
   class Dashboard < Rails::Engine
     module Subscriptions
@@ -6,7 +7,7 @@ module Graphql
         include Installable
 
         def feature_installed?
-          schema_class.subscriptions.is_a?(GraphQL::Pro::Subscriptions)
+          defined?(GraphQL::Pro::Subscriptions) && schema_class.subscriptions.is_a?(GraphQL::Pro::Subscriptions)
         end
 
         INSTALLABLE_COMPONENT_HEADER_HTML = "GraphQL-Pro Subscriptions aren't installed on this schema yet.".html_safe

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

@@ -5,9 +5,9 @@
     <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" />
+    <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 %>

data/lib/graphql/dashboard.rb

@@ -35,6 +35,15 @@ module Graphql
   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\-.]+/ }
@@ -77,85 +86,11 @@ module Graphql
         resources :subscriptions, only: [:show], constraints: { id: /[a-zA-Z0-9\-]+/ }
         post "/subscriptions/clear_all", to: "subscriptions#clear_all", as: :clear_all
       end
-
-      ApplicationController.include(Dashboard.routes.url_helpers)
-    end
-
-    class ApplicationController < ActionController::Base
-      protect_from_forgery with: :exception
-      prepend_view_path(File.join(__FILE__, "../dashboard/views"))
-
-      content_security_policy do |policy|
-        policy.default_src(:self) if policy.default_src(*policy.default_src).blank?
-        policy.connect_src(:self) if policy.connect_src(*policy.connect_src).blank?
-        policy.base_uri(:none) if policy.base_uri(*policy.base_uri).blank?
-        policy.font_src(:self) if policy.font_src(*policy.font_src).blank?
-        policy.img_src(:self, :data) if policy.img_src(*policy.img_src).blank?
-        policy.object_src(:none) if policy.object_src(*policy.object_src).blank?
-        policy.script_src(:self) if policy.script_src(*policy.script_src).blank?
-        policy.style_src(:self) if policy.style_src(*policy.style_src).blank?
-        policy.form_action(:self) if policy.form_action(*policy.form_action).blank?
-        policy.frame_ancestors(:none) if policy.frame_ancestors(*policy.frame_ancestors).blank?
-      end
-
-      def schema_class
-        @schema_class ||= begin
-          schema_param = request.query_parameters["schema"] || params[:schema]
-          case schema_param
-          when Class
-            schema_param
-          when String
-            schema_param.constantize
-          else
-            raise "Missing `params[:schema]`, please provide a class or string to `mount GraphQL::Dashboard, schema: ...`"
-          end
-        end
-      end
-      helper_method :schema_class
-    end
-
-    class LandingsController < ApplicationController
-      def show
-      end
-    end
-
-    class StaticsController < ApplicationController
-      skip_forgery_protection
-      # Use an explicit list of files to avoid any chance of reading other files from disk
-      STATICS = {}
-
-      [
-        "icon.png",
-        "header-icon.png",
-        "charts.min.css",
-        "dashboard.css",
-        "dashboard.js",
-        "bootstrap-5.3.3.min.css",
-        "bootstrap-5.3.3.min.js",
-      ].each do |static_file|
-        STATICS[static_file] = File.expand_path("../dashboard/statics/#{static_file}", __FILE__)
-      end
-
-      def show
-        expires_in 1.year, public: true
-        if (filepath = STATICS[params[:id]])
-          render file: filepath
-        else
-          head :not_found
-        end
-      end
     end
   end
 end
 
-require 'graphql/dashboard/detailed_traces'
-require 'graphql/dashboard/limiters'
-require 'graphql/dashboard/operation_store'
-require 'graphql/dashboard/subscriptions'
-
 # 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
-
-ActiveSupport.run_load_hooks(:graphql_dashboard_application_controller, GraphQL::Dashboard::ApplicationController)

data/lib/graphql/dataloader/null_dataloader.rb

@@ -37,13 +37,17 @@ module GraphQL
       end
 
       def run_isolated
-        new_dl = self.class.new
+        # 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
-        new_dl.append_job {
+        append_job {
           res = yield
         }
-        new_dl.run
+        run
         res
+      ensure
+        @lazies_at_depth = prev_lazies_at_depth
       end
 
       def clear_cache; end

data/lib/graphql/execution/multiplex.rb

@@ -33,7 +33,7 @@ module GraphQL
         @queries.each { |q| q.multiplex = self }
         @context = context
         @dataloader = @context[:dataloader] ||= @schema.dataloader_class.new
-        @tracers = schema.tracers + (context[:tracers] || [])
+        @tracers = schema.tracers + (context[:tracers] || EmptyObjects::EMPTY_ARRAY)
         @max_complexity = max_complexity
         @current_trace = context[:trace] ||= schema.new_trace(multiplex: self)
         @logger = nil