Remove usage of Field.from_options

Author: iChebbi

.ruby-version

@@ -1 +1 @@
-3.1
+3.1.0

Gemfile.lock

@@ -27,7 +27,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
-    base64 (0.2.0)
+    base64 (0.3.0)
     benchmark-ips (2.8.2)
     bigdecimal (3.1.8)
     concurrent-ruby (1.3.4)
@@ -41,14 +41,15 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     drb (2.2.1)
-    fiber-storage (1.0.0)
+    fiber-storage (1.0.1)
     gqli (1.0.0)
       hashie (~> 3.0)
       http (> 0.8, < 3.0)
       multi_json (~> 1)
-    graphql (2.3.19)
+    graphql (2.5.18)
       base64
       fiber-storage
+      logger
     groupdate (6.5.1)
       activesupport (>= 7)
     gruff (0.10.0)

lib/graphql/groups/has_aggregates.rb

@@ -30,7 +30,17 @@ def aggregate(name, *_, **options, &block)
         end
 
         def aggregate_field(*args, **kwargs, &block)
-          field_defn = Schema::AggregateField.from_options(*args, owner: self, **kwargs, &block)
+          if args.any?
+            name_arg = args.shift
+            type_arg = args.shift
+            desc_arg = args.shift
+
+            kwargs[:name] ||= name_arg
+            kwargs[:type] ||= type_arg if type_arg
+            kwargs[:description] ||= desc_arg if desc_arg
+          end
+
+          field_defn = Schema::AggregateField.new(owner: self, **kwargs, &block)
           field_defn.ensure_loaded if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.3')
           add_field(field_defn)
           field_defn

lib/graphql/groups/has_groups.rb

@@ -37,7 +37,17 @@ def by(name, **options, &block)
         end
 
         def group_field(*args, **kwargs, &block)
-          field_defn = field_class.from_options(*args, owner: self, **kwargs, &block)
+          if args.any?
+            name_arg = args.shift
+            type_arg = args.shift
+            desc_arg = args.shift
+
+            kwargs[:name] ||= name_arg
+            kwargs[:type] ||= type_arg if type_arg
+            kwargs[:description] ||= desc_arg if desc_arg
+          end
+
+          field_defn = field_class.new(owner: self, **kwargs, &block)
           add_field(field_defn)
           field_defn
         end