graphiti_gql 0.2.30 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a02dc0813b461497979a165c77f9116922559c46a54ba26a5130e31832c4bcef
-  data.tar.gz: 60a27d5d31c31a39d062d1a65a2c0278ce3ea6f3cba3c4900ed1332525a54460
+  metadata.gz: 19b3af9f398319f335154dfffbf0eb8b13987a7ce7860bfaf273b18361715a57
+  data.tar.gz: e2c2e261a65e161817ed1f1a6aca5d07324dce1df984e37c2a40c18694d6fc27
 SHA512:
-  metadata.gz: e2a9a66b5dd624962bfffdc733115f8cf0363846db434bf9dfbe76374cd94dd0b9411ccf2aa93ce543a144ad0505e9f8d1e39bcb34b5593a7f870e17d7f13440
-  data.tar.gz: eb5004a261e6b7b815eb16ab548591c27beda1231e0875103c75d059c885ed2311b7d8c2b4d1a651d08905facdb8478b328eb5f78ec0fb812dab8cfc5f175583
+  metadata.gz: 9f0cc9d62355cbf98382b1af4f0085fca190a19546be02d8d17e4bd7d93f548964f5716a13f2acc47083484ea386df604e845776bfd76dc2dbd22a44898d1605
+  data.tar.gz: 68f697d8c75a8787a9ee23dd0263a96df8bfd70e873015e67f43c34ec7d84e9bf1b07e51766ae550fb503d19cd810a9b014d273902ad0cce2e65dc054d87bb5e

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

data/lib/graphiti_gql/graphiti_hax.rb

@@ -143,12 +143,21 @@ module GraphitiGql
         end
       end
 
+      def paginatable=(val)
+        config[:paginatable] = val
+      end
+
+      def paginatable
+        config[:paginatable] == false ? false : true
+      end
+
       def value_object?
         !!config[:is_value_object]
       end
 
       def value_object!
         config[:is_value_object] = true
+        self.graphql_entrypoint = false
         self.adapter = ::Graphiti::Adapters::Null
         config[:filters] = {}
         config[:stats] = {}
@@ -581,12 +590,6 @@ class Graphiti::ValueObjectAssociation
     @resource_class ||= Graphiti::Util::Class
       .infer_resource_class(@parent_resource_class, name)
   end
-
-  def build_resource(parent)
-    instance = resource_class.new
-    instance.parent = parent
-    instance
-  end
 end
 
 module Graphiti

data/lib/graphiti_gql/loaders/belongs_to.rb

@@ -20,7 +20,7 @@ module GraphitiGql
         ids.compact!
         return if ids.empty?
 
-        if @params[:simpleid]
+        if @params[:simpleid] && !to_polymorphic_resource?
           if @sideload.type == :polymorphic_belongs_to
             ids.each do |id|
               child = @sideload.children.values.find { |c| c.group_name == id[:type].to_sym }
@@ -55,8 +55,9 @@ module GraphitiGql
           end
           values = futures.map(&:value)
           ids.each do |id|
-            val = values.find { |v| v[:type] == id[:type] }
-            fulfill(id, val[:data][0])
+            records_for_type = values.find { |v| v[:type] == id[:type] }
+            corresponding = records_for_type[:data].find { |r| r.id == id[:id] }
+            fulfill(id, corresponding)
           end
         else
           resource = Schema.registry.get(@sideload.resource.class)[:resource]
@@ -74,6 +75,12 @@ module GraphitiGql
           end
         end
       end
+
+      private
+
+      def to_polymorphic_resource?
+        @sideload.resource.polymorphic? && @sideload.type != :polymorphic_belongs_to
+      end
     end
   end
 end

data/lib/graphiti_gql/log_subscriber.rb

@@ -76,8 +76,14 @@ end|, :white, true)
         if response_errors
           Graphiti.info("❌🚨 Response contained errors!", :red, true)
           response_errors.each do |err|
-            Graphiti.info("#{err['extensions']['code']} - #{err['message']}", :red, true)
-            Graphiti.info("#{err['path'].join(".")}", :red, false) if err['path']
+            if err['extensions']
+              Graphiti.info("#{err['extensions']['code']} - #{err['message']}", :red, true)
+            else
+              Graphiti.info(err['message'], :red, true)
+            end
+            if err['path']
+              Graphiti.info("#{err['path'].join(".")}", :red, false) if err['path']
+            end
           end
         end
       else

data/lib/graphiti_gql/schema/fields/index.rb

@@ -12,8 +12,8 @@ module GraphitiGql
             @registered[:type].connection_type,
             null: false,
             connection: false,
-            extensions: [RelayConnectionExtension],
             extras: [:lookahead]
+          field.extension(RelayConnectionExtension, resource: resource)
           ListArguments.new(resource).apply(field)
           query.define_method name do |**arguments|
             params = Util.params_from_args(arguments)

data/lib/graphiti_gql/schema/fields/to_many.rb

@@ -14,11 +14,13 @@ module GraphitiGql
             connection: false,
             extras: [:lookahead]
           }
-          opts[:extensions] = [RelayConnectionExtension] unless has_one?
           field_type = has_one? ? @sideload_type : @connection_type
           field = type.field @sideload.name,
             field_type,
             **opts
+          unless has_one?
+            field.extension(RelayConnectionExtension, resource: @sideload.resource.class)
+          end
           ListArguments.new(@sideload.resource.class, @sideload).apply(field)
           _sideload = @sideload
           type.define_method(@sideload.name) do |**arguments|

data/lib/graphiti_gql/schema/query.rb

@@ -38,7 +38,7 @@ module GraphitiGql
       end
 
       def add_value_objects
-        registry.resource_types.each do |registered|
+        registry.resource_types(value_objects: false).each do |registered|
           resource, type = registered[:resource], registered[:type]
           ResourceType.add_value_objects(resource, type)
         end

data/lib/graphiti_gql/schema/registry.rb

@@ -50,10 +50,11 @@ module GraphitiGql
       end
 
       # When polymorphic parent, returns the Interface not the Class
-      def resource_types
+      def resource_types(value_objects: true)
         values
           .select { |v| v.key?(:resource) }
-          .reject { |v| v[:interface] || v[:resource].value_object? }
+          .reject { |v| v[:interface] }
+          .reject { |v| !value_objects && v[:resource].value_object? }
           .map { |registered| get(registered[:resource]) }
       end
 

data/lib/graphiti_gql/schema/resource_type.rb

@@ -6,8 +6,9 @@ module GraphitiGql
 
         definition_methods do
           # Optional: if this method is defined, it overrides `Schema.resolve_type`
-          def resolve_type(object, context)
+          def resolve_type(object, _context)
             return object.type if object.is_a?(Loaders::FakeRecord)
+
             resource = object.instance_variable_get(:@__graphiti_resource)
             Registry.instance.get(resource.class)[:type]
           end
@@ -17,9 +18,8 @@ module GraphitiGql
       def self.add_fields(type, resource, id: true) # id: false for edges
         resource.attributes.each_pair do |name, config|
           next if name == :id && id == false
-          if config[:readable]
-            Fields::Attribute.new(resource, name, config).apply(type)
-          end
+
+          Fields::Attribute.new(resource, name, config).apply(type) if config[:readable]
         end
       end
 
@@ -27,31 +27,31 @@ module GraphitiGql
         resource.config[:value_objects].each_pair do |name, vo_association|
           vo_resource_class = vo_association.resource_class
           value_object_type = Schema.registry.get(vo_resource_class)[:type]
-          if vo_association.array?
-            value_object_type = [value_object_type]
-          end
+          value_object_type = [value_object_type] if vo_association.array?
 
           _array = vo_association.array?
           opts = { null: vo_association.null }
           opts[:deprecation_reason] = vo_association.deprecation_reason if vo_association.deprecation_reason
           type.field name, value_object_type, **opts
           type.define_method name do
-            if (method_name = vo_association.readable)
-              unless vo_association.parent_resource_class.new.send(method_name)
-                raise ::Graphiti::Errors::UnreadableAttribute
-                  .new(vo_association.parent_resource_class, name)
-              end
+            if (method_name = vo_association.readable) && !vo_association.parent_resource_class.new.send(method_name)
+              raise ::Graphiti::Errors::UnreadableAttribute
+                .new(vo_association.parent_resource_class, name)
             end
 
             result = vo_resource_class.all({ parent: object }).to_a
             default_behavior = result == [object]
-            result = result.first if !_array
+            result = result.first unless _array
             if default_behavior
               method_name = vo_association.alias.presence || name
               result = object.send(method_name)
-              if _array && !result.is_a?(Array)
-                raise Graphiti::Errors::InvalidValueObject.new(resource, name, result)
-              end
+              raise Graphiti::Errors::InvalidValueObject.new(resource, name, result) if _array && !result.is_a?(Array)
+            end
+            # For polymorphic value objects
+            if result.is_a?(Array)
+              result.each { |r| r.instance_variable_set(:@__parent, object) }
+            else
+              result.instance_variable_set(:@__parent, object) if result
             end
             result
           end
@@ -59,19 +59,19 @@ module GraphitiGql
       end
 
       def self.add_relationships(resource, type)
-        resource.sideloads.each do |name, sideload|
+        resource.sideloads.each do |_name, sideload|
           next unless sideload.readable?
 
           registered_sl = if sideload.type == :polymorphic_belongs_to
-            PolymorphicBelongsToInterface
-              .new(resource, sideload)
-              .build
-          else
-            Schema.registry.get(sideload.resource.class)
-          end
+                            PolymorphicBelongsToInterface
+                              .new(resource, sideload)
+                              .build
+                          else
+                            Schema.registry.get(sideload.resource.class)
+                          end
           sideload_type = registered_sl[:type]
 
-          if [:has_many, :many_to_many, :has_one].include?(sideload.type)
+          if %i[has_many many_to_many has_one].include?(sideload.type)
             Fields::ToMany.new(sideload, sideload_type).apply(type)
           else
             Fields::ToOne.new(sideload, sideload_type).apply(type)
@@ -86,6 +86,7 @@ module GraphitiGql
 
       def build
         return registry.get(@resource)[:type] if registry.get(@resource)
+
         type = build_base_type
         registry_name = registry.key_for(@resource, interface: poly_parent?)
         type.connection_type_class(build_connection_class)
@@ -108,6 +109,7 @@ module GraphitiGql
         # Define the actual class that implements the interface
         registry.set(@resource, type, interface: false)
         @resource.children.each do |child|
+          registry.get(child)
           if (registered = registry.get(child))
             registered[:type].implements(interface_type)
           else
@@ -128,12 +130,14 @@ module GraphitiGql
           klass.send(:include, BaseInterface)
           ctx = nil
           klass.definition_methods { ctx = self }
-          ctx.define_method :resolve_type do |object, context|
-            resource = object.instance_variable_get(:@__graphiti_resource)
-            registry_name = Registry.instance.key_for(resource.class)
-            if resource.polymorphic?
-              resource = resource.class.resource_for_model(object)
-              registry_name = Registry.instance.key_for(resource)
+          _resource = @resource
+          ctx.define_method :resolve_type do |object, _context|
+            registry_name = Registry.instance.key_for(_resource)
+            if _resource.polymorphic?
+              parent = object.instance_variable_get(:@__parent)
+              # pass parent for polymorphic value objects
+              _resource = _resource.resource_for_model(parent || object)
+              registry_name = Registry.instance.key_for(_resource)
             end
             Registry.instance[registry_name][:type]
           end
@@ -141,8 +145,15 @@ module GraphitiGql
           klass = Class.new(Schema.base_object)
         end
 
+        if @resource.value_object?
+          klass.define_method :parent do
+            object.instance_variable_get(:@__parent)
+          end
+        end
+
         klass.define_method :resource do
           return @resource if @resource
+
           resource = object.instance_variable_get(:@__graphiti_resource)
           resource_class = resource.class
           if resource_class.polymorphic? && !resource_class.polymorphic_child?
@@ -165,7 +176,7 @@ module GraphitiGql
 
       def add_fields(type, resource)
         self.class.add_fields(type, resource)
-      end 
+      end
 
       def build_connection_class
         klass = Class.new(GraphQL::Types::Relay::BaseConnection)
@@ -174,4 +185,4 @@ module GraphitiGql
       end
     end
   end
-end
+end

data/lib/graphiti_gql/schema.rb

@@ -62,6 +62,10 @@ module GraphitiGql
     }
 
     class RelayConnectionExtension < GraphQL::Schema::Field::ConnectionExtension
+      def apply
+        super if options[:resource].paginatable
+      end
+
       def resolve(object:, arguments:, context:)
         next_args = arguments.dup
         yield(object, next_args, arguments)

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.30"
+  VERSION = "0.2.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.33
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -126,7 +126,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,94 +0,0 @@
-PATH
-  remote: .
-  specs:
-    graphiti_gql (0.2.29)
-      activemodel (> 6.0, < 8.0)
-      graphiti (~> 1.3.9)
-      graphql (~> 2.0)
-      graphql-batch (~> 0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.5.0)
-    dry-container (0.10.1)
-      concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    graphiti (1.3.9)
-      activesupport (>= 5.2)
-      concurrent-ruby (~> 1.0)
-      dry-types (>= 0.15.0, < 2.0)
-      graphiti_errors (~> 1.1.0)
-      jsonapi-renderer (~> 0.2, >= 0.2.2)
-      jsonapi-serializable (~> 0.3.0)
-    graphiti_errors (1.1.2)
-      jsonapi-serializable (~> 0.1)
-    graphql (2.0.12)
-    graphql-batch (0.5.1)
-      graphql (>= 1.10, < 3)
-      promise.rb (~> 0.7.2)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    jsonapi-renderer (0.2.2)
-    jsonapi-serializable (0.3.1)
-      jsonapi-renderer (~> 0.2.0)
-    method_source (1.0.0)
-    minitest (5.16.2)
-    promise.rb (0.7.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (10.5.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-
-PLATFORMS
-  arm64-darwin-21
-
-DEPENDENCIES
-  bundler (~> 2.3)
-  graphiti_gql!
-  pry
-  pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.3.12