graphiti 2.0.0.beta.8 → 2.0.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5605ecf7bc316cef1342565d7cd54cf7136a98915d669905550dcce32452d7c
-  data.tar.gz: 71be03dd2e18fed5485fe154957e8d5366ec21d648cfaf023281277e7d7c5e5a
+  metadata.gz: b1e331ab2dea47987ea47260eb0890c9a953d3435bba2e7ef37cbfbbc83fe5ab
+  data.tar.gz: 13a7483ead9f4ad5ed69390ff6a4a122a819813c2147c0a56dceebdfebc57e17
 SHA512:
-  metadata.gz: facebd92bdb5be565324696a089595e2b224cbf79872e60cc92dc4422ded817ad22937a3e9b9008744140f55b1519b97f00cb0e7708a92a7bfda88d5339a18a9
-  data.tar.gz: cb80adbf97d38e470c1a6b56bb0cbe49b59abfbe4a81cc0438696cc6452b2677a6f4d2d43a859c6eb4e06815ac4912ae3aa4c52085fbff89f8f05b1f5c9c32eb
+  metadata.gz: cca252389b52b5a2983407b4eff7cf7fe8b49759b478228f9d78303522bc40f2948a1784d6c863373f10521dc80b61d35f201009e830d8a968cc989b37d2ad81
+  data.tar.gz: 3fdfda722d09ddea6c366ca4102258bdea6d36c923be729ae141063e7e62b43ae0730f30a6422ae4448f858a5c1d4269f80180279d7939ce050c88008613cedb

data/.github/workflows/ci.yml

@@ -139,7 +139,7 @@ jobs:
     # Only main auto-releases. Beta releases are cut by manually running
     # "Generate New Release" with the beta branch selected.
     if: github.ref == 'refs/heads/main'
-    needs: [test]
+    needs: [lint, test]
     steps:
       - name: Dispatch Release
         uses: benc-uk/workflow-dispatch@v1

data/.github/workflows/docs.yml

@@ -1,20 +1,23 @@
 name: Docs
 
-# Publishes the documentation site from beta. graphiti.dev now points at this
-# repo via website/static/CNAME, so this deploy is the live site: the 1.x
-# Jekyll site is frozen under website/static/1.13 and ships with every build,
-# and graphiti-api.github.io no longer serves the domain.
+# Publishes the documentation site from beta, and from main once 2.0 lands
+# there. graphiti.dev now points at this repo via website/static/CNAME, so this
+# deploy is the live site: the 1.x Jekyll site is frozen under
+# website/static/1.13 and ships with every build, and graphiti-api.github.io no
+# longer serves the domain.
 on:
   push:
-    branches: [beta]
+    branches: [beta, main]
     paths:
       - 'docs/**'
       - 'website/**'
       - '.github/workflows/docs.yml'
   workflow_dispatch: {}
 
+# One static group: deploys from different branches force-push the same
+# gh-pages branch, so they must not interleave.
 concurrency:
-  group: docs-${{ github.ref }}
+  group: docs
   cancel-in-progress: true
 
 permissions:

data/.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: "4.0"
       - name: Build
         run: |
           gem install bundler

data/CHANGELOG.md

@@ -1,5 +1,48 @@
 graphiti changelog
 
+# [2.0.0-beta.10](https://github.com/graphiti-api/graphiti/compare/v2.0.0-beta.9...v2.0.0-beta.10) (2026-08-24)
+
+
+### Bug Fixes
+
+* apply sideloads at definition once setup! has run ([39ef393](https://github.com/graphiti-api/graphiti/commit/39ef39383520816319282854c0ae99677bcd5127)), closes [#524](https://github.com/graphiti-api/graphiti/issues/524)
+* give client-caused errors real detail and stop 500ing on bad query params ([35acc3e](https://github.com/graphiti-api/graphiti/commit/35acc3e6c78f68eeeb05728ea16264b136455c30)), closes [#531](https://github.com/graphiti-api/graphiti/issues/531)
+* let an abstract resource declare relationships ([6036392](https://github.com/graphiti-api/graphiti/commit/6036392ebd611c7ed492beb3fe5754433eac9ffd)), closes [#453](https://github.com/graphiti-api/graphiti/issues/453)
+* reject a non-object data payload instead of raising TypeError ([51603b8](https://github.com/graphiti-api/graphiti/commit/51603b854270715b80a75d9aa05a4020e6bbdce5))
+* Update some missing sections and terms after renames, register unsupported pagination error ([39cff19](https://github.com/graphiti-api/graphiti/commit/39cff19f6f1f73126514c8b18234a18ad5eb7379))
+
+
+### Features
+
+* carry CurrentAttributes into concurrent sideloads ([7092096](https://github.com/graphiti-api/graphiti/commit/7092096f6d99ad277cc56817c616d946f655d55b))
+* fold allow_nil and deny_empty into one blanks: filter option ([a108403](https://github.com/graphiti-api/graphiti/commit/a108403e5cd87fd2fdf177da30c4c4f97b9fe750))
+* move link rendering onto the resource as page_links and relationship_links ([57878d1](https://github.com/graphiti-api/graphiti/commit/57878d14fdfc4741e8d418c8edbc4a8687335843))
+* move typecast_reads onto the resource and let the railtie own Rails config ([236e970](https://github.com/graphiti-api/graphiti/commit/236e9706d7d8f08e9640c5c22ac596e2f7466849))
+* one link mode per relationship, cascading from relationship_links ([f0e1da1](https://github.com/graphiti-api/graphiti/commit/f0e1da1e13a8d12b47458495b378779f5687ffe2))
+* point connection pool timeouts at the sizing formula and add an audit task to check ([6e017c6](https://github.com/graphiti-api/graphiti/commit/6e017c60fd45338e4e6c8527adebfd46be4bfd8d))
+* split validate_endpoints into validate_requests and validate_links ([100a370](https://github.com/graphiti-api/graphiti/commit/100a370deec6a0e6ae165bdf77e50b6b14d068d3))
+
+# [2.0.0-beta.9](https://github.com/graphiti-api/graphiti/compare/v2.0.0-beta.8...v2.0.0-beta.9) (2026-08-22)
+
+
+### Bug Fixes
+
+* bridge the last 1.x names that died with a bare NameError ([34e1dbd](https://github.com/graphiti-api/graphiti/commit/34e1dbd3e34bb8e6be56292c51fcb32674f75995))
+* build the entity map when the root query is, not on first use ([134d18b](https://github.com/graphiti-api/graphiti/commit/134d18b12b9ebb6903cca813209f60e5626b25a6))
+* coerce debug flags from env strings ([46be6aa](https://github.com/graphiti-api/graphiti/commit/46be6aa05d4e2a9e5d6b2562f223b4b05582bb39))
+* keep a customized sideload's instances out of entity dedup ([b1beee3](https://github.com/graphiti-api/graphiti/commit/b1beee3288fae2b20b009983aaa2f6c71189e2ca))
+* raise a more helpful named error when belongs_to linkage reads an unselected foreign key ([f59ea0b](https://github.com/graphiti-api/graphiti/commit/f59ea0bda94b388b1c2c0ae0e50b258f8ce0eb11))
+* resolve inline when already on a sideload pool thread ([11c9de7](https://github.com/graphiti-api/graphiti/commit/11c9de7fb4bfc2d83b02aaba3e58c1f94c84cec4))
+* scope debugger chunks to the request rather than the class ([9a77896](https://github.com/graphiti-api/graphiti/commit/9a77896c6e56d23b89d0a2aef358d8e8e0c28c54))
+* surface the first child error from concurrent polymorphic sideloads ([5a08c0e](https://github.com/graphiti-api/graphiti/commit/5a08c0edab2bc1ee0c87c6abbe1067297569411e))
+
+
+### Performance Improvements
+
+* nest the entity map instead of keying it by an array ([20bf625](https://github.com/graphiti-api/graphiti/commit/20bf6259d0347b02568b7d47054bb799e69629c3))
+* skip the promise machinery when nothing is sideloaded ([d879923](https://github.com/graphiti-api/graphiti/commit/d879923070a35d1a0e908b2d04746aa81effb262))
+* skip zipping a lone sideload promise ([7ef2cea](https://github.com/graphiti-api/graphiti/commit/7ef2cea654c48175504105f907b5b651c9fcdaf3))
+
 # [2.0.0-beta.8](https://github.com/graphiti-api/graphiti/compare/v2.0.0-beta.7...v2.0.0-beta.8) (2026-08-10)
 
 

data/Rakefile

@@ -11,6 +11,34 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   end
 end
 
+namespace :performance do
+  # Shelling out keeps a failure to the script's own message, with no rake backtrace on top.
+  def measure(*arguments)
+    exit(1) unless system("bundle", "exec", "ruby", "spec/performance/measure_releases.rb", *arguments)
+  end
+
+  desc "Compare the working tree to the last release, and plot it"
+  task :current do
+    measure
+  end
+
+  desc "Plot the release history plus the working tree to tmp/performance.html and open it"
+  task :page do
+    exit(1) unless system("bundle", "exec", "ruby", "spec/performance/chart_page.rb")
+  end
+
+  desc "Measure one release and record it (TAG=v2.0.0-beta.9)"
+  task :record do
+    tag = ENV["TAG"] or abort "pass the release to record, e.g. rake performance:record TAG=v2.0.0-beta.9"
+    measure(tag)
+  end
+
+  desc "Re-record every release for this ruby, replacing its rows"
+  task :record_all do
+    measure("--all")
+  end
+end
+
 if ENV["APPRAISAL_INITIALIZED"]
   task default: [:spec]
 else

data/UPGRADING.md

@@ -2,4 +2,4 @@
 
 The upgrade guide lives with the rest of the documentation, so it can link into the concept pages and offer the same version picker: **https://graphiti.dev/upgrading**
 
-In this repository it is [docs/upgrading/](docs/upgrading/index.md).
+In this repository it is [docs/upgrading.md](docs/upgrading.md).

data/lib/generators/graphiti/generator_mixin.rb

@@ -33,6 +33,30 @@ module Graphiti
       methods.any? { |m| actions.include?(m) }
     end
 
+    def resource_setting_groups
+      name_width = Graphiti::Resource::SETTINGS.keys.map(&:length).max
+      assignments = Graphiti::Resource::SETTINGS.to_h do |name, setting|
+        value = setting[:format] || setting[:default].inspect
+        [name, "self.#{name.to_s.ljust(name_width)} = #{value}"]
+      end
+      hint_column = assignments.values.map(&:length).max + 2
+
+      Graphiti::Resource::SETTING_GROUPS.transform_values do |settings|
+        settings.map do |name, setting|
+          hint = resource_setting_hint(setting)
+          hint ? "#{assignments[name].ljust(hint_column)}# #{hint}" : assignments[name]
+        end
+      end
+    end
+
+    def resource_setting_hint(setting)
+      return setting[:note] if setting[:note]
+      return unless setting[:values]
+
+      setting[:values].map(&:inspect)
+        .to_sentence(two_words_connector: " or ", last_word_connector: ", or ")
+    end
+
     def graphiti_config
       File.exist?(".graphiticfg.yml") ? YAML.load_file(".graphiticfg.yml") : {}
     end

data/lib/generators/graphiti/templates/application_resource.rb.erb

@@ -14,21 +14,14 @@ class ApplicationResource < Graphiti::Resource
   self.endpoint_namespace = '<%= api_namespace %>'
   <%- unless omit_comments? -%>
 
-  # Defaults every Resource inherits. These are already the values shown;
-  # uncomment to change them API-wide, or set them on individual Resources.
-  # See https://graphiti.dev/concepts/resources
-  #
-  # self.attributes_readable_by_default     = true
-  # self.attributes_writable_by_default     = true
-  # self.attributes_sortable_by_default     = true
-  # self.attributes_filterable_by_default   = true
-  # self.attributes_schema_by_default       = true
-  # self.relationships_readable_by_default  = true
-  # self.relationships_writable_by_default  = true
-  # self.belongs_to_resource_ids_by_default = :foreign_key
-  # self.filters_accept_nil_by_default      = false
-  # self.filters_deny_empty_by_default      = false
-  # self.default_page_size                  = 20
-  # self.max_page_size                      = 1_000
+  # Defaults every Resource inherits. Uncomment to change them API-wide, or set
+  # them on individual Resources. See https://graphiti.dev/concepts/resources
+  <%- resource_setting_groups.each_pair do |group, lines| -%>
+
+  # <%= group.to_s.humanize %>
+    <%- lines.each do |line| -%>
+  # <%= line %>
+    <%- end -%>
+  <%- end -%>
   <%- end -%>
 end

data/lib/graphiti/configuration.rb

@@ -24,10 +24,6 @@ module Graphiti
 
     attr_accessor :respond_to
     attr_accessor :context_for_endpoint
-    attr_accessor :links_on_demand
-    attr_accessor :pagination_links_on_demand
-    attr_accessor :pagination_links
-    attr_accessor :typecast_reads
     attr_accessor :raise_on_missing_sidepost
     attr_accessor :before_sideload
 
@@ -44,32 +40,12 @@ module Graphiti
       @concurrency = false
       @concurrency_max_threads = 4
       @respond_to = [:json, :jsonapi, :xml]
-      @links_on_demand = false
-      @pagination_links_on_demand = false
-      @pagination_links = false
-      @typecast_reads = true
       @raise_on_missing_sidepost = true
       @cache_rendering = false
       self.debug = ENV.fetch("GRAPHITI_DEBUG", true)
       self.debug_models = ENV.fetch("GRAPHITI_DEBUG_MODELS", false)
 
       @uri_decoder = infer_uri_decoder
-
-      # FIXME: Don't duplicate the Railtie's initializer
-      if defined?(::Rails.root) && (root = ::Rails.root)
-        config_file = root.join(".graphiticfg.yml")
-        if config_file.exist?
-          cfg = YAML.load_file(config_file)
-          @schema_path = root.join("public#{cfg["namespace"]}/schema.json")
-        else
-          @schema_path = root.join("public/schema.json")
-        end
-
-        if (logger = ::Rails.logger)
-          self.debug = logger.debug? && debug
-          Graphiti.logger = logger
-        end
-      end
     end
 
     def cache_rendering?
@@ -87,13 +63,20 @@ module Graphiti
     end
 
     def debug=(val)
-      @debug = val
-      Debugger.enabled = val
+      @debug = coerce_flag(val)
+      Debugger.enabled = @debug
     end
 
     def debug_models=(val)
-      @debug_models = val
-      Debugger.debug_models = val
+      @debug_models = coerce_flag(val)
+      Debugger.debug_models = @debug_models
+    end
+
+    # every value comes back from ENV as a string and "false" is truthy
+    def coerce_flag(val)
+      return false if ["false", "0", ""].include?(val.to_s.strip.downcase)
+
+      !!val
     end
 
     def with_option(key, value)
@@ -104,6 +87,48 @@ module Graphiti
       send(:"#{key}=", original)
     end
 
+    def typecast_reads
+      Resource.typecast_reads
+    end
+
+    def typecast_reads=(val)
+      Resource.typecast_reads = val
+    end
+
+    def links_on_demand
+      Resource.relationship_links == :on_demand
+    end
+
+    def links_on_demand=(val)
+      if val
+        Resource.relationship_links = :on_demand
+      elsif Resource.relationship_links == :on_demand
+        Resource.relationship_links = true
+      end
+    end
+
+    def pagination_links
+      Resource.page_links == true
+    end
+
+    def pagination_links=(val)
+      return if Resource.page_links == :on_demand
+
+      Resource.page_links = !!val
+    end
+
+    def pagination_links_on_demand
+      Resource.page_links == :on_demand
+    end
+
+    def pagination_links_on_demand=(val)
+      if val
+        Resource.page_links = :on_demand
+      elsif Resource.page_links == :on_demand
+        Resource.page_links = false
+      end
+    end
+
     def uri_decoder=(decoder)
       unless decoder.respond_to?(:call)
         raise "uri_decoder must respond to `call`."
@@ -134,4 +159,17 @@ module Graphiti
 
   msg = "Use `config.graphiti.respond_to_formats`"
   DEPRECATOR.deprecate_methods(Configuration, respond_to: msg, "respond_to=": msg)
+
+  relationship_msg = "Set `self.relationship_links` (true, false, or :on_demand) on your resource"
+  pagination_msg = "Set `self.page_links` (true, false, or :on_demand) on your resource"
+  typecast_msg = "Set `self.typecast_reads` on your resource"
+  DEPRECATOR.deprecate_methods(Configuration,
+    typecast_reads: typecast_msg,
+    "typecast_reads=": typecast_msg,
+    links_on_demand: relationship_msg,
+    "links_on_demand=": relationship_msg,
+    pagination_links: pagination_msg,
+    "pagination_links=": pagination_msg,
+    pagination_links_on_demand: pagination_msg,
+    "pagination_links_on_demand=": pagination_msg)
 end

data/lib/graphiti/debugger.rb

@@ -4,11 +4,22 @@
 module Graphiti
   class Debugger
     class << self
-      attr_accessor :enabled, :chunks, :debug_models, :preserve, :pry
+      attr_accessor :enabled, :debug_models, :preserve, :pry
     end
-    self.chunks = []
+
+    CHUNKS = :__graphiti_debugger_chunks
+    private_constant :CHUNKS
 
     class << self
+      # Pool threads inherit this through the thread-local copy Scope#future_with_context makes, so their chunks reach the right request.
+      def chunks
+        Thread.current[CHUNKS] ||= Concurrent::Array.new
+      end
+
+      def chunks=(value)
+        Thread.current[CHUNKS] = value
+      end
+
       def on_data(name, start, stop, id, payload)
         return [] unless enabled
 
@@ -179,14 +190,15 @@ module Graphiti
       end
 
       def graph_statements
-        @chunks.each do |chunk|
+        statements = chunks
+        statements.each do |chunk|
           if (parent = chunk[:parent])
-            relevant = chunks.find { |c| c[:resource] == parent }
+            relevant = statements.find { |c| c[:resource] == parent }
             relevant[:children].unshift(chunk) if relevant
           end
         end
-        @chunks.reject! { |c| !!c[:parent] }
-        @chunks
+        statements.reject! { |c| !!c[:parent] }
+        statements
       end
 
       def chunk_to_hash(chunk)

data/lib/graphiti/delegates/pagination.rb

@@ -6,7 +6,7 @@ module Graphiti
       end
 
       def links?
-        @proxy.query.pagination_links? && @proxy.data.present?
+        @proxy.query.page_links? && @proxy.data.present?
       end
 
       def links
@@ -104,7 +104,7 @@ module Graphiti
 
       def page_size
         @page_size ||= (page_param[:size] ||
-                        @proxy.resource.default_page_size ||
+                        @proxy.resource.page_default_size ||
                         Graphiti::Scoping::Paginate::DEFAULT_PAGE_SIZE).to_i
       end
 

data/lib/graphiti/error_serializers/deprecated_constants.rb

@@ -23,6 +23,29 @@ module GraphitiErrors
     MSG
   end
 
+  # The old global rendering toggle, most often flipped in specs.
+  class << self
+    def enable!
+      Graphiti::DEPRECATOR.deprecation_warning("GraphitiErrors.enable!", "wrap the request in Graphiti::Rails::TestHelpers#handle_request_exceptions instead")
+      test_helpers.handle_request_exceptions(true)
+    end
+
+    def disable!
+      Graphiti::DEPRECATOR.deprecation_warning("GraphitiErrors.disable!", "wrap the request in Graphiti::Rails::TestHelpers#handle_request_exceptions instead")
+      test_helpers.handle_request_exceptions(false)
+    end
+
+    def disabled?
+      !test_helpers.handle_request_exceptions?
+    end
+
+    private
+
+    def test_helpers
+      @test_helpers ||= Object.new.extend(Graphiti::Rails::TestHelpers)
+    end
+  end
+
   module Validation; end
 
   module InvalidRequest; end

data/lib/graphiti/error_serializers/invalid_request.rb

@@ -36,6 +36,12 @@ module Graphiti
         end
       end
 
+      # graphiti_errors named the payload this. Remove in 3.0.
+      def rendered_errors
+        Graphiti::DEPRECATOR.deprecation_warning("#rendered_errors", "use #errors")
+        errors
+      end
+
       private
 
       def code

data/lib/graphiti/errors.rb

@@ -221,7 +221,7 @@ module Graphiti
 
           Make sure the endpoint "#{@sideload.resource.endpoint[:full_path]}" exists with action #{@action.inspect}, or customize the endpoint for #{@sideload.resource.class.name}.
 
-          If you do not wish to generate a link, pass link: false or set self.autolink = false.
+          If you do not wish to generate a link, pass link: false or set self.relationship_links = false. To keep the link and stop checking it, set self.validate_links = false.
         MSG
       end
     end
@@ -255,6 +255,8 @@ module Graphiti
           Graphiti.config.context_for_endpoint must be set to enable link generation:
 
           Graphiti.config.context_for_endpoint = ->(path, action) { ... }
+
+          Or set self.validate_links = false to render links without checking them.
         MSG
       end
     end
@@ -445,9 +447,9 @@ module Graphiti
 
           secondary_endpoint '/my_url', [:index, :update]
 
-          Or disable endpoint validation for this resource:
+          Or disable request validation for this resource:
 
-          self.validate_endpoints = false
+          self.validate_requests = false
 
           See https://graphiti.dev/concepts/links for more information.
 
@@ -708,6 +710,52 @@ module Graphiti
       end
     end
 
+    class InvalidFilterBlanks < Base
+      def initialize(resource_class, attribute, value)
+        @resource_class = resource_class
+        @attribute = attribute
+        @value = value
+      end
+
+      def message
+        <<~MSG
+          #{@resource_class.name}: #{@attribute} must be one of :as_literal, :as_nil, or :reject. Got #{@value.inspect}.
+
+            :as_literal - "null" and "" reach the filter as strings (default)
+            :as_nil     - "null" becomes nil, so the filter can query for NULL
+            :reject     - a blank value raises InvalidFilterValue
+        MSG
+      end
+    end
+
+    class InvalidLinkRendering < Base
+      def initialize(resource_class, attribute, value)
+        @resource_class = resource_class
+        @attribute = attribute
+        @value = value
+      end
+
+      def message
+        "#{@resource_class.name}: #{@attribute} must be true, false, or :on_demand. Got #{@value.inspect}."
+      end
+    end
+
+    class UnselectedForeignKey < Base
+      def initialize(resource_class, sideload, model)
+        @resource_class = resource_class
+        @sideload = sideload
+        @model = model
+      end
+
+      def message
+        <<~MSG
+          #{@resource_class.name}: rendering resource linkage for relationship #{@sideload.name.inspect} reads ##{@sideload.foreign_key} off #{@model.class.name}, but that attribute is not loaded.
+
+          Keep #{@sideload.foreign_key} in the selected columns, or turn linkage off with `resource_ids: false` on the relationship or `self.belongs_to_resource_ids_by_default = :never` on the resource.
+        MSG
+      end
+    end
+
     class MissingRelationshipMethod < Base
       def initialize(resource_class, sideload, model)
         @resource_class = resource_class

data/lib/graphiti/query.rb

@@ -2,6 +2,9 @@ require "digest"
 
 module Graphiti
   class Query
+    TRUTHY_LINKS = [true, "true"].freeze
+    LINKLESS_FORMATS = [:json, :xml, "json", "xml"].freeze
+
     attr_reader :resource, :association_name, :params, :action
 
     def initialize(resource, params, *positional, association_name: nil, nested_include: nil, parents: [], action: nil)
@@ -22,6 +25,7 @@ module Graphiti
       @include_param = nested_include || @params[:include]
       @parents = parents
       @action = parse_action(action)
+      @entity_map = Concurrent::Map.new if parents.empty?
     end
 
     def association?
@@ -32,32 +36,46 @@ module Graphiti
     def entity_map
       return root.entity_map unless root == self
 
-      @entity_map ||= Concurrent::Map.new
+      @entity_map
     end
 
     def top_level?
       !association?
     end
 
-    def links?
-      return false if [:json, :xml, "json", "xml"].include?(params[:format])
-      if Graphiti.config.links_on_demand
-        [true, "true"].include?(@params[:links])
-      else
-        true
-      end
+    def links_requested?
+      return @links_requested if defined?(@links_requested)
+
+      @links_requested = TRUTHY_LINKS.include?(@params[:links])
+    end
+
+    def suppress_links?
+      return @suppress_links if defined?(@suppress_links)
+
+      @suppress_links = LINKLESS_FORMATS.include?(params[:format])
     end
 
-    def pagination_links?
+    def render_link?(mode)
+      return false if suppress_links?
+
+      (mode == :on_demand) ? links_requested? : mode == true
+    end
+
+    def page_links?
       if action == :find
         false
-      elsif Graphiti.config.pagination_links_on_demand
-        [true, "true"].include?(@params[:pagination_links])
+      elsif @resource.page_links == :on_demand
+        page_links_requested?
       else
-        Graphiti.config.pagination_links
+        @resource.page_links
       end
     end
 
+    def page_links_requested?
+      [@params[:page_links], @params[:pagination_links]]
+        .any? { |value| [true, "true"].include?(value) }
+    end
+
     def debug_requested?
       !!@params[:debug]
     end
@@ -266,8 +284,8 @@ module Graphiti
     def query_cache_key
       attrs = {extra_fields: extra_fields,
                fields: fields,
-               links: links?,
-               pagination_links: pagination_links?,
+               links: suppress_links? ? :none : links_requested?,
+               page_links: page_links?,
                format: params[:format]}
 
       Digest::SHA1.hexdigest(attrs.to_s)
@@ -386,5 +404,9 @@ module Graphiti
         action
       end
     end
+
+    alias_method :pagination_links?, :page_links?
+    DEPRECATOR.deprecate_methods(self,
+      pagination_links?: "Use `page_links?`")
   end
 end