jpie 4.1.4.pre.202611030311 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424c323cc11e74643e4496fea1f22ba10a221758899c991851c2393ccbe94c88
-  data.tar.gz: eabe34694e9800c516ac9e4a7aaa42bc50ba9325335651bb49e1764793735074
+  metadata.gz: 618cb164f0b64934d5cd9a0c6e871b726bcc6b40f4add24c3204bea490a0cd5c
+  data.tar.gz: f4acc02e6f57760deae01dc2d4c49acb29fb5273acefb3eac290f7519e3f53d4
 SHA512:
-  metadata.gz: c8fac7dbe88b50d3d4cf4a41316f53e5ba1a6ac3ef8110e3453885d317c03c2d42ea37737c923464b2f48a4043208115d0f7c6b9a23699959cc72644ac901e6f
-  data.tar.gz: b692711be75fb09abc50b92fa1611eb97a2e6b74275d6af5c087a6e6aaf269c5bb16b9df9171611629446c3e9b53d93d7f9fe4791391baa94ec051c15ccb08a0
+  metadata.gz: b83a3b08c429dc700144718b112c578bb9c67243a05a2400ef7fdd9055f614e50852e4819bd63c6897e04cf168eee09e1f7d2b606da39340b9dc6acd2e723b8a
+  data.tar.gz: 79f17c229521c0c99541e9787e298e9e00268996759ca8a54f67fec95f212f3cd7f124ea672d8c9da65f65546c6ad02794c971b49a8a8fef7b874883eb601760

data/CHANGELOG.md

@@ -7,6 +7,32 @@ at release time.
 
 ## [Unreleased]
 
+## [4.1.5] - 2026-11-11
+
+### Fixed
+
+- **Run resource preloads once for the subclasses of a polymorphic hop.** The
+  include preload step grouped the targets of a hop by exact class and ran the
+  `records` preloads of the resource once for each class. Five STI subclasses
+  that share one preload set ran each preload five times. The step now groups
+  the targets by the preloads their resource declares. Classes that share a
+  preload set run each preload once for all their records. A mixed STI set on
+  a hop that is not polymorphic now gets the preloads of every subclass. The
+  response does not change. Regression spec:
+  `polymorphic_sti_resource_preload_spec.rb`.
+
+## [4.1.4] - 2026-11-10
+
+### Fixed
+
+- **Vet an STI include once for the base class.** The include filter vets
+  record ids under the class the association reads, the base class of an STI
+  tree. The warm step grouped the loaded records by their own subclass, so
+  the warm work was lost and the serializer ran its own query for each
+  parent. The warm step now uses the association class. An include of an STI
+  association costs one vetting query for the whole page. Regression spec:
+  `include_filter_sti_base_class_spec.rb`.
+
 ## [4.1.3] - 2026-10-10
 
 ### Fixed

data/lib/json_api/controllers/concerns/resource_actions/include_preloading.rb

@@ -66,7 +66,7 @@ module JSONAPI
           targets = collect_include_targets(records, association_name)
           next if targets.empty?
 
-          apply_preloads_for_targets(targets, reflection.polymorphic?)
+          apply_resource_preloads(targets)
           next if subtree.empty?
 
           descend_resource_tree(targets, reflection, subtree)
@@ -85,11 +85,13 @@ module JSONAPI
         end
       end
 
-      def apply_preloads_for_targets(targets, polymorphic)
-        if polymorphic
-          targets.group_by(&:class).each_value { |recs| apply_resource_preloads(recs) }
-        else
-          apply_resource_preloads(targets)
+      # Groups the targets by the preloads their resource declares, so classes that share them
+      # (STI subclasses and sibling resources) run each preload once for all their records.
+      def apply_resource_preloads(targets)
+        groups = Hash.new { |hash, values| hash[values] = [] }
+        targets.group_by(&:class).each { |klass, records| groups[resource_preload_values(klass)].concat(records) }
+        groups.each do |values, records|
+          ActiveRecord::Associations::Preloader.new(records:, associations: values).call unless values.empty?
         end
       end
 
@@ -100,15 +102,9 @@ module JSONAPI
         end.compact.uniq
       end
 
-      def apply_resource_preloads(records)
-        return if records.empty?
-
-        klass = records.first.class
-        resource_scope = ResourceLoader.find_for_model(klass, namespace: jsonapi_namespace).records
-        preload_values = resource_scope.preload_values + resource_scope.includes_values
-        return if preload_values.empty?
-
-        ActiveRecord::Associations::Preloader.new(records:, associations: preload_values).call
+      def resource_preload_values(klass)
+        scope = ResourceLoader.find_for_model(klass, namespace: jsonapi_namespace).records
+        scope.preload_values + scope.includes_values
       end
     end
   end

data/lib/json_api/controllers/concerns/resource_actions/serialization.rb

@@ -71,9 +71,18 @@ module JSONAPI
         cache
       end
 
+      # The serializer vets a hop under the class its association reads, which
+      # is the base class of an STI tree. Warm under that same class, so both use
+      # one key, and warm once per class so the page size does not set the
+      # query count.
       def warm_include_level(cache, records, association_name)
-        targets = records.flat_map { |record| loaded_association_targets(record, association_name) }
-        targets.group_by(&:class).each { |klass, recs| cache.warm(klass, recs.filter_map(&:id)) }
+        ids_by_klass = Hash.new { |hash, klass| hash[klass] = [] }
+        targets = records.flat_map do |record|
+          found = loaded_association_targets(record, association_name)
+          ids_by_klass[record.association(association_name).klass].concat(found.filter_map(&:id)) if found.any?
+          found
+        end
+        ids_by_klass.each { |klass, ids| cache.warm(klass, ids) }
         targets
       end
 

data/lib/json_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONAPI
-  VERSION = "4.1.4.pre.202611030311"
+  VERSION = "4.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpie
 version: !ruby/object:Gem::Version
-  version: 4.1.4.pre.202611030311
+  version: 4.1.5
 platform: ruby
 authors:
 - Emil Kampp