rails-graphql 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7e0b35058deec4afd328520ed24fcd24fe4b0f8765b064b0ff0005398e9e7a
-  data.tar.gz: 0ef41b6819bbbe8057fa203ff6f008812e385030d3c171b401ac051a5890d756
+  metadata.gz: d18315ad503f122d67555202db0417507d7b5d72ecf5c060396bf7974b7cf826
+  data.tar.gz: 3688696c6d83cd9aebe2be3024906292bbdd291f3fb4b272bb5b1841714ba10e
 SHA512:
-  metadata.gz: 14d030f7f42f0096d30d0fe9eab85baf3b52526ad5432620a16fa2288e6cfc5e0c123b8f433c78d1155a1dc0869ce5c7567bcdd3b6ff6eef5eca3de1d13ab399
-  data.tar.gz: 933ce0bcb53a39d436a1ff60056882d187bdcf4ec6a76b883f91724b550cdb81164a16e2bc91642db8e2093a76f3c20138ea8fa2ae92772e626352d3807f1adb
+  metadata.gz: 79d8b337fd5ef5caaf93a6bc8dfc4a21cc6f7f5f5633ab1b9e4076bef0c90c163792283fd2b0cd02063c3111bf2a569e4909130e04e419455a8f9c3d80dc744d
+  data.tar.gz: 58d5dbe146a65ed87987b05d5e00ba14bb3a22ded1ba300f27bb08ef2f36783bcabfe42f9c2550187f01d286341387ac17acec51d79ee00fccfc7a34783d5c5e

data/lib/rails/graphql/request/strategy.rb

@@ -131,8 +131,9 @@ module Rails
           return unless args.size.zero?
 
           if field.try(:dynamic_resolver?)
-            prepared = prepared_data_for(field)
-            args << Event.trigger(:resolve, field, self, prepared_data: prepared, &field.resolver)
+            extra = prepared_data_for(field, with_null: true)
+            extra = extra === PreparedData::NULL ? EMPTY_HASH : { prepared: extra }
+            args << Event.trigger(:resolve, field, self, **extra, &field.resolver)
           elsif field.prepared_data?
             args << prepared_data_for(field)
           else
@@ -206,11 +207,14 @@ module Rails
 
         # Get the prepared data for the given +field+, getting ready for
         # resolve, while ensuring to check prepared data on request
-        def prepared_data_for(field)
-          return @data_pool[field] unless field.prepared_data?
-
-          prepared = request.prepared_data_for(field).next
-          prepared unless prepared === PreparedData::NULL
+        def prepared_data_for(field, with_null: false)
+          if field.prepared_data?
+            request.prepared_data_for(field).next
+          elsif @data_pool.key?(field)
+            @data_pool[field]
+          elsif with_null
+            PreparedData::NULL
+          end
         end
 
         # Simply run the organize step for compilation

data/lib/rails/graphql/source/active_record_source.rb

@@ -256,6 +256,12 @@ module Rails
       # Once the records are pre-loaded due to +preload_association+, use the
       # parent value and the preloader result to get the records
       def parent_owned_records(collection_result = false)
+        # The absence of the prepared data key means we got to a point that we
+        # don't know the result of the association, so we simply call it
+        unless event.data.key?(:prepared_data)
+          return current_value.public_send(field.method_name)
+        end
+
         data = event.data[:prepared_data]
         return collection_result ? [] : nil unless data
 

data/lib/rails/graphql/version.rb

@@ -14,7 +14,7 @@ module Rails
     module VERSION
       MAJOR = 1
       MINOR = 0
-      TINY  = 5
+      TINY  = 6
       PRE   = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/test/assets/sqlite.gql

@@ -226,6 +226,10 @@ type LiteShip {
   name: String
 }
 
+type Sample {
+  faction: LiteFaction!
+}
+
 type _Mutation {
   createLiteBase(liteBase: LiteBaseInput!): LiteBase!
   
@@ -262,6 +266,8 @@ type _Query {
   liteShip(id: ID!): LiteShip!
   
   liteShips: [LiteShip!]!
+  
+  sample: Sample!
 }
 
 """

data/test/integration/schemas/sqlite.rb

@@ -95,4 +95,16 @@ class StartWarsSqliteSchema < GraphQL::Schema
   end
 
   source LiteShip
+
+  object 'Sample' do
+    field :faction, 'LiteFaction', null: false
+  end
+
+  query_fields do
+    field :sample, 'Sample', null: false
+  end
+
+  def sample
+    { faction: LiteFaction.last }
+  end
 end

data/test/integration/sqlite/star_wars_query_test.rb

@@ -88,4 +88,13 @@ class Integration_SQLite_StarWarsQueryTest < GraphQL::IntegrationTestCase
       query EmpireFleet { liteFaction(id: "2") { greeting } }
     GQL
   end
+
+  def test_nested_non_prepared_source
+    bases = named_list('Death Star', 'Shield Generator', 'Headquarters')
+    sample = { sample: { faction: { name: 'Galactic Empire', bases: bases } } }
+
+    assert_result({ data: sample }, <<~GQL)
+      query SampleFaction { sample { faction { name bases { name } } } }
+    GQL
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-graphql
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Carlos Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-30 00:00:00.000000000 Z
+date: 2025-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails