graphiti_gql 0.2.6 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0558a0d0edaf2e03b09fe28ce603afb10eb0cbd02e8aa56be43cfd1044bebab
-  data.tar.gz: 69660d61a4191bd6428a2ad33d2f9e3e6a4227c31d4be636a6b886af543f35f3
+  metadata.gz: 544e1209bfdf6e48d70a76490edec46bc04639d75d91bae2a35ab95ea8fb4530
+  data.tar.gz: '0688127e3a2ab48d4bdd3f7f70a4efd544dd4bb4c9a952c0c4302ede86c1c24a'
 SHA512:
-  metadata.gz: 892b44992e36645282bd7003218067d248e04ac6f440feaac137afa1449f9b01017d7bcb577bbaf3bd8dc7f1c808b7f9b6eaf6e0c4474b4f1d6910dabb49ad3e
-  data.tar.gz: 3d29b975b6748e292e4420707c2f8e4825a8e743c197f70126863c230a22ad75f0efece663a2400704716d2c7621d8cdd90732185ee7540c317c23708004a4d0
+  metadata.gz: 67b52a3241814fd821cf23982ed55e02c1e0e171d41c5c3bb54cdcd53e04ea28a13fab327d86a5756dee7499f88d163316b93cfebf730a4681ab54a627693f9b
+  data.tar.gz: ce6ab0de40b33e0750f4eb33c63249c91a6b478503cce6fc0cc92081b18190346a9e4190027b940020f69459c40094a963b3a0d1e440e63ed4a2f47e1bd904cd

data/.github/probots.yml

@@ -0,0 +1,2 @@
+enabled:
+  - cla

data/Gemfile.lock

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

data/lib/graphiti_gql/active_resource.rb

@@ -17,6 +17,8 @@ module GraphitiGql
                   Node.new(edge.except(:node).merge(node_id: node_id))
                 end
                 hash[key] = value[:edges].map { |v| Node.new(v[:node], sideload.resource.class) }
+              elsif value.key?(:nodes)
+                hash[key] = value[:nodes].map { |n| Node.new(n, sideload.resource.class) }
               else
                 hash[key] = Node.new(value, sideload.resource.class)
               end
@@ -115,8 +117,9 @@ module GraphitiGql
         return @query if @query
 
         name = Schema.registry.key_for(@resource)
-        filter_bang = "!" if @resource.filters.values.any? { |f| f[:required] }
         sortvar = "$sort: [#{name}Sort!]," if @resource.sorts.any?
+        filter_bang = "!" if @resource.filters.values.any? { |f| f[:required] }
+        filtervar = "$filter: #{name}Filter#{filter_bang}," if @resource.filters.any?
 
         if !(fields = @params[:fields])
           fields = []
@@ -127,7 +130,7 @@ module GraphitiGql
 
         q = %|
           query #{name} (
-            $filter: #{name}Filter#{filter_bang},
+            #{filtervar}
             #{sortvar}
             $first: Int,
             $last: Int,
@@ -135,7 +138,7 @@ module GraphitiGql
             $after: String,
           ) {
             #{@resource.graphql_entrypoint} (
-              filter: $filter,
+              #{ 'filter: $filter,' if filtervar }
               #{ 'sort: $sort,' if sortvar }
               first: $first,
               last: $last,

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,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.6"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.9
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/probots.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"