graphql-filters 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d399441a0d115f6f12a81f8c02b58d812565fcbb2f6643950fb47011961fc30
-  data.tar.gz: 0c6254f218d5ee41a0b69677148fccffc43952e35ce970457954f94f9f1689e3
+  metadata.gz: 384e2aca53aa1fce190281c21041e66682616963ead8887c4a05c3586f1c9c98
+  data.tar.gz: c4b48cd47c65fbe371e7e555c7bce2d2fd47c823da49e532af579c9d40df23ae
 SHA512:
-  metadata.gz: 7f3d352f14eaddf2d43d1cbf0c78a213adeb2bde8b2f8322905521d530864f4980f41490d1482fdbaadddd86865d0539ce69604c83427a3737e1a997171d9098
-  data.tar.gz: 5fd54c27598465b72b77b7cf31678d167180ddc2833bfb93d8aac43a8ee8dadbf01a3ad8639ab7888921a3f96d1dd6b48e35fd221a2278b591e080164aa0cf2b
+  metadata.gz: ebef1f3f13bc566f81ee84a522c74046eb601fd6e6d9d1b31804a7649857af719b78566acf0946173c6ae25ebfb53c114f4036883ea799719a86829a16e8e50a
+  data.tar.gz: '038e7a8eeb8b8819567101aeb4bc573eb00322ac4ebf50722a27e1448b638f072d25874db78a1f42d8277d3837a6f7975ae0f1a2c22924344f63a77a9aa5b517'

data/CHANGELOG.md

@@ -8,6 +8,22 @@
 ### Bug fixes
 )-->
 
+## 1.1.3 2025-05-21
+
+### New features
+
+- Added the `filtered_type` field option.
+
+### Bug fixes
+
+- Ensured the arguments of a `ComparisonInput` are defined after all the fields of the respective object type have been defined. Before, some cases of circular references made certain arguments not get defined.
+
+## 1.1.2 2025-05-16
+
+### Bug fixes
+
+- Using `definition_methods` broke something in newer versions of the `graphql` gem. We now use `ActiveSupport::Concern`.
+
 ## 1.1.1 2025-05-16
 
 ### Bug fixes

data/README.md

@@ -47,8 +47,6 @@ class RoutesResolver < BaseResolver
 end
 ```
 
-By default the filters are based on the `type`. If you need them to be based on a different type (for example if the result will be wrapped in another object), you can declare it with `filtered_type`, which has the same API as `type`.
-
 Using either of these resolvers for a `routes` field will generate all the necessary input types to make a query like this:
 
 ```graphql
@@ -234,6 +232,10 @@ field :name, String, null: false, filter: {enabled: false}
 
   The name of the Active Record association that the field is tied to in the model. Equivalent to `attribute_name`, has the same default.
 
+- `filtered_type`
+ 
+  The type the filters for this field need to be based on, if it's different from the field's own type (for example, a field thet returns a connection will need to be filtered based on the connection's node type). Can also be set calling the `filtered_type` on a resolver/mutation if the field is associated with one.
+
 ## Plans for future development
 
 - A finer grain support for non-nullable fields.

data/lib/graphql/filters/dsl/graphql/schema/field.rb

@@ -13,7 +13,8 @@ monkey_patch = Module.new do
                     default: {
                       enabled:          true,
                       attribute_name:   :method_sym.to_proc,
-                      association_name: :method_sym.to_proc
+                      association_name: :method_sym.to_proc,
+                      filtered_type:    ->(field){field.resolver ? field.resolver.filtered_type : field.type}
                     }
   end
 

data/lib/graphql/filters/dsl/graphql/schema/interface.rb

@@ -1,13 +1,21 @@
-GraphQL::Schema::Interface.definition_methods do
-  def comparison_input_type new_comparison_input_type=nil
-    if new_comparison_input_type.present?
-      @comparison_input_type = new_comparison_input_type
-    else
-      @comparison_input_type ||= get_comparison_input_type
+require 'active_support/concern'
+
+monkey_patch = Module.new do
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def comparison_input_type new_comparison_input_type=nil
+      if new_comparison_input_type.present?
+        @comparison_input_type = new_comparison_input_type
+      else
+        @comparison_input_type ||= get_comparison_input_type
+      end
     end
-  end
 
-  def get_comparison_input_type(*)
-    GraphQL::Filters::InputTypes::ObjectComparisonInputType[self]
+    def get_comparison_input_type(*)
+      GraphQL::Filters::InputTypes::ObjectComparisonInputType[self]
+    end
   end
 end
+
+GraphQL::Schema::Interface.include monkey_patch

data/lib/graphql/filters/input_types/fields_comparison_input_type.rb

@@ -10,24 +10,31 @@ module GraphQL
           klass.new BaseComparisonInputType do
             graphql_name "#{object_type.graphql_name}ComparisonInput"
 
-            object_type.fields.each_value do |field_object|
-              next unless field_object.filter_options[:enabled]
-
-              type = field_object.type
-              filter_options = field_object.filter_options
-
-              argument field_object.name,
-                       type.comparison_input_type,
-                       required: false,
-                       prepare: lambda { |field_comparator, _context|
-                         lambda { |scope|
-                           if scope.klass.attribute_names.include? filter_options[:attribute_name].to_s
-                             field_comparator.call scope, filter_options[:attribute_name]
-                           else
-                             field_comparator.call scope, filter_options[:association_name]
-                           end
-                         }
-                       }
+            define_singleton_method :own_arguments do |*args, **kwargs, &block|
+              unless @loaded_fields_arguments
+                object_type.fields.each_value do |field_object|
+                  next unless field_object.filter_options[:enabled]
+
+                  type = field_object.filter_options[:filtered_type]
+                  filter_options = field_object.filter_options
+
+                  argument field_object.name,
+                           type.comparison_input_type,
+                           required: false,
+                           prepare: lambda { |field_comparator, _context|
+                             lambda { |scope|
+                               if scope.klass.attribute_names.include? filter_options[:attribute_name].to_s
+                                 field_comparator.call scope, filter_options[:attribute_name]
+                               else
+                                 field_comparator.call scope, filter_options[:association_name]
+                               end
+                             }
+                           }
+                end
+                @loaded_fields_arguments = true
+              end
+
+              super(*args, **kwargs, &block)
             end
 
             define_method :prepare do

data/lib/graphql/filters/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Filters
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-filters
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Moku S.r.l.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-16 00:00:00.000000000 Z
+date: 2025-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord