graphiti_gql 0.2.8 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8711fac905c21ac485bec3ead197d2c5a8e2135eb5fcf1ff4156fec2a34d3ec
-  data.tar.gz: 82a643591b6f630d78d67e480cf915b8dbf1c0531fa0c817f204a9ae405d237c
+  metadata.gz: 71fdec4bf251efc22810991433ff68f9797cd347537e01a9cd309557c68567ea
+  data.tar.gz: 9b65200d9eb293333b3cb4727389bc4c51ebc46da014d12f478f95c75fc48b0b
 SHA512:
-  metadata.gz: 6a6935dda01d0d68bacfc8c49252469322e93c96613a852f092dc76aa80cc44545b7e3c3d478fd5da28d6039c1a33940c9164f8bb1aad0b8018b1d2a5c92de72
-  data.tar.gz: fd9004e64db1c3dc39321e4eb2df56e5a7bf37a221c5323b062ddce182446ea1a4285649f61fdbb8508ac0b1a654c3311a7429bdc535f2589866b053c9d0617e
+  metadata.gz: f6e7ad07688af72a5850d5a93338ebce34c224e54259fce30a32b51a5deb842a8e9b1f3f2779bcf21ca841bfc7e7a88206c63e5bd3cb56644c92612c626762ec
+  data.tar.gz: a18337b399b74f1389e43becffddff4119a0c07b6c53ddfc84a0e2d925d7b5339206823d6f366adf24484838b79dda45298b11cee785d258455cebd802c46c1a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.7)
+    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/schema/fields/to_many.rb

@@ -39,16 +39,19 @@ module GraphitiGql
         end
 
         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]
+
           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)
+            Schema.registry[name] = { type: klass }
             klass
           else
             @sideload_type.connection_type

data/lib/graphiti_gql/schema/list_arguments.rb

@@ -36,6 +36,7 @@ module GraphitiGql
             value
           end
         }
+        required = true if @resource.grouped_filters.any? && !@sideload
         field.argument :filter, filter_type, required: required
       end
     
@@ -46,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/spec_helper.rb

@@ -72,10 +72,12 @@ module GraphitiGql
       resource.gql(params.merge(fields: fields), ctx, q)
     end
 
+
     def run
       lambda do
-        proxy.to_h
-        proxy
+        instance = proxy
+        instance.to_h
+        instance
       end
     end
 

data/lib/graphiti_gql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.11
 platform: ruby
 authors:
 - Lee Richmond
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-16 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.3.7
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []