graphiti 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6cf17d52242b009350cdbfcee3da740db0eb495d31fcebaa4a64f488e0f847
-  data.tar.gz: d76151e67afde1fe2b5767e017aef86a9b1f2764bfed8bf88465f807c6c1c70d
+  metadata.gz: 185e66f29378e7e50a478f273bd0c3d2b7cf8116aa3d61668d05d34761ab8d27
+  data.tar.gz: 1a7286d5912d8133adb83a2c8bb330cd6876d088a88aab8abc01cee08dfbb251
 SHA512:
-  metadata.gz: b5afa624af4b2c280d1f818eeed4f9f90a87330494ecebb6995861a4541a4da5979a122168a45da42185ae056210bc1cf75f56682dcb06631a369125719b1bd9
-  data.tar.gz: e81fbd136f7e948be6bd77f87869d9d10b7fd96d6aea4fe8b9b435c6da35fb68620a2f8290ce0095028a79a07625b8a9a6b0e13bc9e50c6af6138c1d8112a667
+  metadata.gz: 43fc294150c26b1b09ca78290dc864171538f5d988b736d5cbd5db4c77b9979d0a3077ef738452a783b4d9a7668331e7f32a67a1fe657c6a858bc0a77e7c3ae4
+  data.tar.gz: 0a7b8ca5bc7ffba5365a1b74c2bc195b6ec56349344eb0ca44445580b0ef9db30654fc030ab135684024d872488d6652bd214d6a67619182f76fb5d4b5038732

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 graphiti changelog
 
+## [2.2.2](https://github.com/graphiti-api/graphiti/compare/v2.2.1...v2.2.2) (2026-10-22)
+
+
+### Bug Fixes
+
+* nested includes dropped by sideload_allowlist ([#549](https://github.com/graphiti-api/graphiti/issues/549)) ([96b05df](https://github.com/graphiti-api/graphiti/commit/96b05df9b4514d946c639ed157b08e99e37b3ac0))
+* render fresh included records after an update ([#552](https://github.com/graphiti-api/graphiti/issues/552)) ([aba46ac](https://github.com/graphiti-api/graphiti/commit/aba46acf22414fbc3922e579b44ebdcde6f4c9b4))
+
+## [2.2.1](https://github.com/graphiti-api/graphiti/compare/v2.2.0...v2.2.1) (2026-10-17)
+
+
+### Bug Fixes
+
+* a create or update override receives decoded foreign keys, not the public ids the client posted ([971d144](https://github.com/graphiti-api/graphiti/commit/971d144a323625b5d1b03f6e4ab551a4dfee12c4))
+
 # [2.2.0](https://github.com/graphiti-api/graphiti/compare/v2.1.3...v2.2.0) (2026-10-13)
 
 

data/lib/graphiti/query.rb

@@ -289,7 +289,7 @@ module Graphiti
           allowlist = allowlist[@resource.current_action] if allowlist
         end
 
-        scrubbed = allowlist ? Util::IncludeParams.scrub(requested, allowlist) : requested
+        scrubbed = (top_level? && allowlist) ? Util::IncludeParams.scrub(requested, allowlist) : requested
 
         scrubbed.filter do |key, value|
           sideload = @resource.class.sideload(key)

data/lib/graphiti/resource/persistence.rb

@@ -86,8 +86,6 @@ module Graphiti
           assign_params = assign_params.except(:id).merge(self.class.model_primary_key => primary_key)
         end
 
-        assign_params = decode_foreign_keys(assign_params)
-
         run_callbacks :attributes, action_name, assign_params, meta do |params|
           model_instance ||= if action_name == :update
             self.class._find(id: id).data

data/lib/graphiti/resource_proxy.rb

@@ -211,6 +211,7 @@ module Graphiti
         # adapters will cause N+1 validation calls, so lets explicitly
         # switch to a lookup context.
         Graphiti.with_context(Graphiti.context[:object], :show) do
+          @query.entity_map.clear
           @scope.resolve_sideloads([@data])
         end
       end

data/lib/graphiti/util/persistence.rb

@@ -29,7 +29,7 @@ class Graphiti::Util::Persistence
   end
 
   def assign
-    attributes = @adapter.persistence_attributes(self, @attributes)
+    attributes = decode_foreign_keys(@adapter.persistence_attributes(self, @attributes))
     assigned = @resource.assign(attributes, metadata, @meta[:method], model_instance: @assigned_model)
     @resource.decorate_record(assigned)
 
@@ -60,7 +60,9 @@ class Graphiti::Util::Persistence
 
     payload_attributes = attributes.dup
     parents = @adapter.process_belongs_to(self, attributes)
-    apply_derived_attributes(attributes, payload_attributes)
+    derived_keys = derived_keys(attributes, payload_attributes)
+    attributes = decode_foreign_keys(attributes)
+    apply_derived_attributes(attributes.slice(*derived_keys))
     persisted = persist_object(@meta[:method], attributes)
     @resource.decorate_record(persisted)
 
@@ -99,15 +101,23 @@ class Graphiti::Util::Persistence
   # +attributes+. A model that was already assigned (see ResourceProxy#assign_attributes)
   # predates those keys, so apply just them - the payload attributes are already on it,
   # and re-applying them would clobber any changes made since.
-  def apply_derived_attributes(attributes, payload_attributes)
+  def apply_derived_attributes(derived)
     return unless @assigned_model
-
-    derived = @resource.decode_foreign_keys(attributes).reject { |key, value| payload_attributes[key] == value }
     return if derived.empty?
 
     @resource.assign_attributes(@assigned_model, derived, metadata)
   end
 
+  def derived_keys(attributes, payload_attributes)
+    attributes.keys.reject { |key| payload_attributes.key?(key) && payload_attributes[key] == attributes[key] }
+  end
+
+  def decode_foreign_keys(attributes)
+    return attributes if @meta[:method] == :destroy
+
+    @resource.decode_foreign_keys(attributes)
+  end
+
   def add_hook(prc, lifecycle_event)
     ::Graphiti::Util::TransactionHooksRecorder.add(prc, lifecycle_event)
   end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "2.2.0"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Lee Richmond