graphiti_gql 0.2.31 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba3f305f68fc23193bb245eff566feb18eaec47a775c5f0fdab8177707b564f8
-  data.tar.gz: 3f96b0cee52d9aa3c3968f125487d26f85f6bdb7acc13c2d457a2bc4feb65e11
+  metadata.gz: e8d0cda6314cfd3485283ae277bdaa56494a4b8eae9c62f9037b5b78f17b2825
+  data.tar.gz: 28fcbab36f65c81bb8a673aefaefe7bd54888f02ca741fcf5a889f2f858e094a
 SHA512:
-  metadata.gz: c05e7c4dc7b7908a1b3f43b40cba6b5bcf6bbda4c2b26be4555783a4d27018e249e22d1e3feb8e1d0df09e35b62fc0f98759f4d0e9b16edc9725199dd79d19dc
-  data.tar.gz: '049cb6c5201efa3a6921c5e964dbb7064dc70a7d5930c480bcf59b9466d839779a11c41a7d66cc7434d778ed200a94c0fc75a6736ff4b38817d453788cfc8318'
+  metadata.gz: 864e7b0fbd88fb01f3aa8bc0490ce144a4d62e02c9d9ce30dc032f6209b91cf9e5766b06bf85113cbdb9d4603dd397b8b831fcbc8f76ff123ff12307e82a4815
+  data.tar.gz: 61304ca30da99696a76c625c3737037429182df25ca6271c9f779bbbfa96740e2d1b3c792cbaaea560a31b52edc90f342b49a8aab12d607ece04804415e3d1e1

data/lib/graphiti_gql/graphiti_hax.rb

@@ -149,6 +149,7 @@ module GraphitiGql
 
       def value_object!
         config[:is_value_object] = true
+        self.graphql_entrypoint = false
         self.adapter = ::Graphiti::Adapters::Null
         config[:filters] = {}
         config[:stats] = {}
@@ -581,12 +582,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/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/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/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.31"
+  VERSION = "0.2.32"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.32
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql