graphiti_gql 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38c8d27dc214efd323ee98932bcb858bca8553e45c5e4428858b3b5503db44d
-  data.tar.gz: ae38e08ba55f6c38b464ed9a3cbd592394568c080aac2361d0549adea259b9fe
+  metadata.gz: c8711fac905c21ac485bec3ead197d2c5a8e2135eb5fcf1ff4156fec2a34d3ec
+  data.tar.gz: 82a643591b6f630d78d67e480cf915b8dbf1c0531fa0c817f204a9ae405d237c
 SHA512:
-  metadata.gz: d50257d774787869a18187e76e924503fb34dfad8c4d93fd73d99289fc203626d120585448bc646175cb9ff80e607df5c374a6207a95732aeccedb2d20ea9d39
-  data.tar.gz: e1f1ff11574682dd8946907f2e76e3b9279c08039e29e4bc1f53436f184c1e6bd0e04f2ef52f391526abd1d837ef6a9dbd3f1a8a617528ee90942857b66d9706
+  metadata.gz: 6a6935dda01d0d68bacfc8c49252469322e93c96613a852f092dc76aa80cc44545b7e3c3d478fd5da28d6039c1a33940c9164f8bb1aad0b8018b1d2a5c92de72
+  data.tar.gz: fd9004e64db1c3dc39321e4eb2df56e5a7bf37a221c5323b062ddce182446ea1a4285649f61fdbb8508ac0b1a654c3311a7429bdc535f2589866b053c9d0617e

data/Gemfile.lock

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

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,20 @@ 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)
-
-          # 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)
+        def find_or_build_connection
+          if customized_edge?
+            prior = @sideload_type.connection_type
+            klass = Class.new(prior)
+            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"
+            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)
             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,12 +23,15 @@ 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

data/lib/graphiti_gql/version.rb

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2022-07-11 00:00:00.000000000 Z
@@ -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: []