graphiti_gql 0.2.7 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38c8d27dc214efd323ee98932bcb858bca8553e45c5e4428858b3b5503db44d
-  data.tar.gz: ae38e08ba55f6c38b464ed9a3cbd592394568c080aac2361d0549adea259b9fe
+  metadata.gz: c8778ea5c62ff7c2eb9f32d674ece0a9b0c87ee30f57417fe02e61e2ed8c75e8
+  data.tar.gz: a80c2443b2c13cbd0d36d7160f8b2e3bde75ac97d87b4d58278440fab0e8426e
 SHA512:
-  metadata.gz: d50257d774787869a18187e76e924503fb34dfad8c4d93fd73d99289fc203626d120585448bc646175cb9ff80e607df5c374a6207a95732aeccedb2d20ea9d39
-  data.tar.gz: e1f1ff11574682dd8946907f2e76e3b9279c08039e29e4bc1f53436f184c1e6bd0e04f2ef52f391526abd1d837ef6a9dbd3f1a8a617528ee90942857b66d9706
+  metadata.gz: cad6708ae17b85ec5010245978d2f1dae7077fbbcc7d1303241ac1798a110b58638e68ab4d66ffab73a285f5a6ea5d8bc92b2cc347e2bd49c87d3b74fe96dcd7
+  data.tar.gz: '09d2dc8810af44fca96160ab941cca950dd35779b7659b30882cd3e2ec3a40a9551055c5cc585ff6c9514a3c3952491c986225f8ede57e915dc64af0901df739'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.2)
+    graphiti_gql (0.2.9)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)

data/lib/graphiti_gql/active_resource.rb

@@ -118,7 +118,7 @@ module GraphitiGql
 
         name = Schema.registry.key_for(@resource)
         sortvar = "$sort: [#{name}Sort!]," if @resource.sorts.any?
-        filter_bang = "!" if @resource.filters.values.any? { |f| f[:required] }
+        filter_bang = "!" if @resource.grouped_filters.any? || @resource.filters.values.any? { |f| f[:required] }
         filtervar = "$filter: #{name}Filter#{filter_bang}," if @resource.filters.any?
 
         if !(fields = @params[:fields])

data/lib/graphiti_gql/graphiti_hax.rb

@@ -162,6 +162,7 @@ module GraphitiGql
 
     def apply_belongs_to_many_filter
       super
+      return unless respond_to?(:belongs_to_many_filter) # activerecord
       self_ref = self
       fk_type = parent_resource_class.attributes[:id][:type]
       fk_type = :hash if polymorphic?

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

@@ -4,11 +4,8 @@ module GraphitiGql
       class ToMany
         def initialize(sideload, sideload_type)
           @sideload = sideload
-          @sideload_type = if customized_edge?
-              build_customized_edge_type(sideload_type)
-            else
-              sideload_type
-            end
+          @sideload_type = sideload_type
+          @connection_type = find_or_build_connection
         end
 
         def apply(type)
@@ -18,7 +15,7 @@ module GraphitiGql
             extras: [:lookahead]
           }
           opts[:extensions] = [RelayConnectionExtension] unless has_one?
-          field_type = has_one? ? @sideload_type : @sideload_type.connection_type
+          field_type = has_one? ? @sideload_type : @connection_type
           field = type.field @sideload.name,
             field_type,
             **opts
@@ -41,23 +38,23 @@ module GraphitiGql
           @sideload.type == :many_to_many && @sideload.class.edge_resource
         end
 
-        def build_customized_edge_type(sideload_type)
-          edge_type_class = build_edge_type_class(sideload_type)
+        def find_or_build_connection
+          registered_parent = Schema.registry.get(@sideload.parent_resource.class)
+          parent_name = registered_parent[:type].graphql_name
+          name = "#{parent_name}To#{@sideload_type.graphql_name}Connection"
+          return Schema.registry[name][:type] if Schema.registry[name]
 
-          # Build the sideload type with new edge class applied
-          if sideload_type.is_a?(Module)
-            klass = sideload_type
-            # There's some magic that happens when subclassing, but modules
-            # don't subclass. This is the kind of resetting we need to happen.
-            # Might be a graphql-ruby issue.
-            klass.instance_variable_set(:@connection_type, nil)
-            klass.instance_variable_set(:@edge_type, nil)
-            klass.edge_type_class(edge_type_class)
+          if customized_edge?
+            prior = @sideload_type.connection_type
+            klass = Class.new(prior)
+            klass.graphql_name(name)
+            edge_type_class = build_edge_type_class(@sideload_type)
+            edge_type_class.node_type(prior.node_type)
+            klass.edge_type(edge_type_class)
+            Schema.registry[name] = { type: klass }
             klass
           else
-            klass = Class.new(sideload_type)
-            klass.edge_type_class(edge_class)
-            klass
+            @sideload_type.connection_type
           end
         end
 

data/lib/graphiti_gql/schema/list_arguments.rb

@@ -23,16 +23,20 @@ module GraphitiGql
         Registry.instance
       end
 
+      # TODO - when no sorts schema error, when no filters schema error
       def define_filters(field)
         filter_type = generate_filter_type(field)
         required = @resource.filters.any? { |name, config|
           value = !!config[:required]
           if @sideload
-            value && @sideload.foreign_key != name
+            fk = @sideload.foreign_key
+            fk = fk.values.first if fk.is_a?(Hash)
+            value && fk != name
           else
             value
           end
         }
+        required = true if @resource.grouped_filters.any? && !@sideload
         field.argument :filter, filter_type, required: required
       end
     
@@ -43,11 +47,18 @@ module GraphitiGql
         end
         klass = Class.new(GraphQL::Schema::InputObject)
         klass.graphql_name type_name
+        required_via_group = []
+        if (group = @resource.grouped_filters).present?
+          if group[:required] == :all
+            required_via_group = group[:names].map(&:to_sym)
+          end
+        end
         @resource.filters.each_pair do |name, config|
           attr_type = generate_filter_attribute_type(type_name, name, config)
+          required = !!config[:required] || required_via_group.include?(name)
           klass.argument name.to_s.camelize(:lower),
             attr_type,
-            required: !!config[:required]
+            required: required
         end
         registry[type_name] = { type: klass }
         klass

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.7"
+  VERSION = "0.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.10
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-description: 
+description:
 email:
 - richmolj@gmail.com
 executables: []
@@ -170,7 +170,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.graphiti.dev
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,8 +185,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []