graphiform 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843abce3fab5e2fcc03b27f6a4edf4a1635b7648f1fb8eaca1cff602d155e3d0
-  data.tar.gz: 10e6c019669c55183c96041bb8862bd9505eba7c6ff7d604dd72127df8b3455b
+  metadata.gz: 79311a028aff4bd3c7446554c4661ab87841fdbc82697c2d49080047d614afa1
+  data.tar.gz: 6da53e957a2d9494cc5efdfa7d962200626cb8d70affd1b54f8201b958a54f23
 SHA512:
-  metadata.gz: 1ddd81b9eaa52a0b92db63c41f4f0948fca928c33937b0bd5f5b8d5e08cafa2b4187c0cc7b7c3ab8d115c85488231f2bdd282f2579e35e195d3fc64c1cdbdd81
-  data.tar.gz: c700abaaeca982cf422e720bb9f87c05342733ea78e36074e7e4262b62c5fca00905217290d586f2066e14e930e8e6317f87c8a1395694f19668d614ecea329f
+  metadata.gz: 6b126781364fd8bcd1981cbb014a1b0a69b1ddc966c786e83ebd1d6b985e3fdf808bf3f1d56bc207fde7fc9db941da57eafd5cff08856c3b92aa36ed2ee0aa65
+  data.tar.gz: fa9f8f19ac3820edb8ccf20465c67c4ab74aac074ef0dca32b6f723d566fa204396fc0aeec5d17fdf0a341da856eba60a852d9e1484dd5e578dc96cf0b1d15d3

data/lib/graphiform/core.rb

@@ -11,21 +11,33 @@ module Graphiform
 
     module ClassMethods
       def graphql_type
-        local_demodulized_name = demodulized_name
-        Helpers.get_const_or_create(local_demodulized_name, ::Types) do
-          Class.new(::Types::BaseObject) do
-            graphql_name local_demodulized_name
+        unless defined? @graphql_type
+          local_demodulized_name = demodulized_name
+          @graphql_type = Helpers.get_const_or_create(local_demodulized_name, ::Types) do
+            Class.new(::Types::BaseObject) do
+              graphql_name local_demodulized_name
+            end
+          end
+          @graphql_type.class_eval do
+            field_class Graphiform.configuration[:field_class] if Graphiform.configuration[:field_class].present?
           end
         end
+        @graphql_type
       end
 
       def graphql_input
-        local_demodulized_name = demodulized_name
-        Helpers.get_const_or_create(local_demodulized_name, ::Inputs) do
-          Class.new(::Inputs::BaseInput) do
-            graphql_name "#{local_demodulized_name}Input"
+        unless defined? @graphql_input
+          local_demodulized_name = demodulized_name
+          @graphql_input = Helpers.get_const_or_create(local_demodulized_name, ::Inputs) do
+            Class.new(::Inputs::BaseInput) do
+              graphql_name "#{local_demodulized_name}Input"
+            end
+          end
+          @graphql_input.class_eval do
+            argument_class Graphiform.configuration[:argument_class] if Graphiform.configuration[:argument_class].present?
           end
         end
+        @graphql_input
       end
 
       def graphql_filter
@@ -37,6 +49,7 @@ module Graphiform
             end
           end
           @filter.class_eval do
+            argument_class Graphiform.configuration[:argument_class] if Graphiform.configuration[:argument_class].present?
             argument 'OR', [self], required: false
             argument 'AND', [self], required: false
           end
@@ -46,21 +59,34 @@ module Graphiform
       end
 
       def graphql_sort
-        local_demodulized_name = demodulized_name
-        Helpers.get_const_or_create(local_demodulized_name, ::Inputs::Sorts) do
-          Class.new(::Inputs::Sorts::BaseSort) do
-            graphql_name "#{local_demodulized_name}Sort"
+        unless defined? @graphql_sort
+          local_demodulized_name = demodulized_name
+          @graphql_sort = Helpers.get_const_or_create(local_demodulized_name, ::Inputs::Sorts) do
+            Class.new(::Inputs::Sorts::BaseSort) do
+              graphql_name "#{local_demodulized_name}Sort"
+            end
+          end
+          @graphql_sort.class_eval do
+            argument_class Graphiform.configuration[:argument_class] if Graphiform.configuration[:argument_class].present?
           end
         end
+        @graphql_sort
       end
 
       def graphql_grouping
-        local_demodulized_name = demodulized_name
-        Helpers.get_const_or_create(local_demodulized_name, ::Inputs::Groupings) do
-          Class.new(::Inputs::Groupings::BaseGrouping) do
-            graphql_name "#{local_demodulized_name}Grouping"
+        unless defined? @graphql_grouping
+          local_demodulized_name = demodulized_name
+          @graphql_grouping = Helpers.get_const_or_create(local_demodulized_name, ::Inputs::Groupings) do
+            Class.new(::Inputs::Groupings::BaseGrouping) do
+              graphql_name "#{local_demodulized_name}Grouping"
+              argument_class Graphiform.configuration[:argument_class] if Graphiform.configuration[:argument_class].present?
+            end
+          end
+          @graphql_grouping.class_eval do
+            argument_class Graphiform.configuration[:argument_class] if Graphiform.configuration[:argument_class].present?
           end
         end
+        @graphql_grouping
       end
 
       def graphql_edge

data/lib/graphiform/fields.rb

@@ -10,19 +10,21 @@ module Graphiform
       def graphql_readable_field(
         name,
         as: nil,
+        read_prepare: nil,
+        null: nil,
         **options
       )
         identifier = as || name
         column_def = column(identifier)
         association_def = association(identifier)
 
-        graphql_add_column_field(name, column_def, as: as, **options) if column_def.present?
-        graphql_add_association_field(name, association_def, as: as, **options) if association_def.present?
-        graphql_add_method_field(name, as: as, **options) unless column_def.present? || association_def.present?
+        graphql_add_column_field(name, column_def, read_prepare: read_prepare, null: null, as: as, **options) if column_def.present?
+        graphql_add_association_field(name, association_def, read_prepare: read_prepare, null: null, as: as, **options) if association_def.present?
+        graphql_add_method_field(name, read_prepare: read_prepare, null: null, as: as, **options) unless column_def.present? || association_def.present?
 
-        graphql_add_scopes_to_filter(name, identifier)
-        graphql_field_to_sort(name, identifier)
-        graphql_field_to_grouping(name, identifier)
+        graphql_add_scopes_to_filter(name, identifier, **options)
+        graphql_field_to_sort(name, identifier, **options)
+        graphql_field_to_grouping(name, identifier, **options)
       end
 
       def graphql_writable_field(
@@ -34,7 +36,7 @@ module Graphiform
         description: nil,
         default_value: ::GraphQL::Schema::Argument::NO_DEFAULT,
         as: nil,
-        **
+        **args
       )
         name = name.to_sym
         has_nested_attributes_method = instance_methods.include?("#{as || name}_attributes=".to_sym)
@@ -56,9 +58,10 @@ module Graphiform
             description: description,
             default_value: default_value,
             as: as,
-            method_access: false
+            method_access: false,
+            **args
           )
-        end
+        end unless graphql_input.arguments.keys.any? { |key| Helpers.equal_graphql_names?(key, argument_name) }
       end
 
       def graphql_field(
@@ -66,10 +69,13 @@ module Graphiform
         write_name: nil,
         readable: true,
         writable: false,
+        read_prepare: nil,
+        write_prepare: nil,
+        null: nil,
         **options
       )
-        graphql_readable_field(name, **options) if readable
-        graphql_writable_field(write_name || name, **options) if writable
+        graphql_readable_field(name, read_prepare: read_prepare, null: null, **options) if readable
+        graphql_writable_field(write_name || name, write_prepare: write_prepare, **options) if writable
       end
 
       def graphql_fields(*names, **options)
@@ -109,7 +115,7 @@ module Graphiform
         has_many ? [association_def.klass.graphql_input] : association_def.klass.graphql_input
       end
 
-      def graphql_add_scopes_to_filter(name, as)
+      def graphql_add_scopes_to_filter(name, as, **options)
         added_scopes = auto_scopes_by_attribute(as)
 
         return if added_scopes.empty?
@@ -132,11 +138,11 @@ module Graphiform
             enum = graphql_create_enum(name)
             scope_argument_type = scope_argument_type.is_a?(Array) ? [enum] : enum
           end
-          add_scope_def_to_filter(name, added_scope, scope_argument_type)
+          add_scope_def_to_filter(name, added_scope, scope_argument_type, **options)
         end
       end
 
-      def add_scope_def_to_filter(name, scope_def, argument_type)
+      def add_scope_def_to_filter(name, scope_def, argument_type, **options)
         return unless argument_type
 
         argument_type = Helpers.graphql_type(argument_type)
@@ -152,12 +158,13 @@ module Graphiform
             argument_type,
             required: false,
             as: scope_name,
-            method_access: false
+            method_access: false,
+            **options
           )
-        end
+        end unless graphql_filter.arguments.keys.any? { |key| Helpers.equal_graphql_names?(key, argument_name) }
       end
 
-      def graphql_field_to_sort(name, as)
+      def graphql_field_to_sort(name, as, **options)
         column_def = column(as || name)
         association_def = association(as || name)
 
@@ -174,12 +181,13 @@ module Graphiform
             type,
             required: false,
             as: as,
-            method_access: false
+            method_access: false,
+            **options
           )
-        end
+        end unless local_graphql_sort.arguments.keys.any? { |key| Helpers.equal_graphql_names?(key, name) }
       end
 
-      def graphql_field_to_grouping(name, as)
+      def graphql_field_to_grouping(name, as, **options)
         column_def = column(as || name)
         association_def = association(as || name)
 
@@ -196,9 +204,10 @@ module Graphiform
             type,
             required: false,
             as: as,
-            method_access: false
+            method_access: false,
+            **options
           )
-        end
+        end unless local_graphql_grouping.arguments.keys.any? { |key| Helpers.equal_graphql_names?(key, name) }
       end
 
       def graphql_add_field_to_type(
@@ -211,7 +220,7 @@ module Graphiform
         as: nil,
         read_prepare: nil,
         read_resolve: nil,
-        **
+        **options
       )
         type = Helpers.graphql_type(type)
         is_resolver = Helpers.resolver?(type)
@@ -231,7 +240,7 @@ module Graphiform
         end
 
         graphql_type.class_eval do
-          added_field = field(field_name, **field_options)
+          added_field = field(field_name, **field_options, **options)
 
           if read_prepare || read_resolve
             define_method(
@@ -244,7 +253,7 @@ module Graphiform
               end
             )
           end
-        end
+        end unless graphql_type.fields.keys.any? { |key| Helpers.equal_graphql_names?(key, field_name) }
       end
 
       def graphql_add_column_field(field_name, column_def, type: nil, null: nil, as: nil, **options)

data/lib/graphiform/helpers.rb

@@ -42,6 +42,10 @@ module Graphiform
       val
     end
 
+    def self.equal_graphql_names?(key, name)
+      key.downcase == name.to_s.camelize.downcase || key.downcase == name.to_s.downcase
+    end
+
     def self.full_const_name(name)
       name = "Object#{name}" if name.starts_with?('::')
       name = "Object::#{name}" unless name.starts_with?('Object::')

data/lib/graphiform/skeleton.rb

@@ -3,7 +3,6 @@ require 'graphiform/helpers'
 
 module Graphiform
   def self.create_skeleton
-
     # Types
     Helpers.get_const_or_create('Types') do
       Module.new

data/lib/graphiform/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/graphiform.rb

@@ -6,6 +6,7 @@ require 'graphiform/active_record_helpers'
 require 'graphiform/core'
 require 'graphiform/fields'
 require 'graphiform/sort_enum'
+class GraphiformConfigurationError < StandardError; end
 
 module Graphiform
   def self.included(base)
@@ -49,5 +50,10 @@ module Graphiform
 
   def self.configure
     yield(configuration)
+    if configuration[:field_class].present? && configuration[:argument_class].blank?
+      raise GraphiformConfigurationError, 'If field_class is provided an argument class must also be provided'
+    elsif configuration[:field_class].blank? && configuration[:argument_class].present?
+      raise GraphiformConfigurationError, 'If argument_class is provided a field_class must also be provided'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord