graphiform 0.2.9 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841f7ddfa6fd9f56cda166df64e77ec0d94fac684c872ce44b5fc024afe3d433
-  data.tar.gz: 10c339a1f949bf05dfa2dcf94a8bf3332f3a1c468699c605ab8ac60966644fd0
+  metadata.gz: 24d0d05956c47d3c131958d9b273951c53d313f28dd622a5f841724ce18e1a4a
+  data.tar.gz: 82bd9b1ba24f07a5abc4cb164bd64ea8d217409d434613b543a2441edf5ba202
 SHA512:
-  metadata.gz: e72009f747cf7bf8b6655940eb443900cf2c08e419cb25e1786aafc1b36347fb0f6916bc7d837a82681e46280a6bc5b6fe617b80ba081556f7acf319f01ed40b
-  data.tar.gz: d13b40bf891ccad27f83e7a23c55b20b5c94c594bc83d28ee07b762aca7a5740030aeaec20789d2cccc590ca701a566e0257555d5e0c2ee67fe02608e61c25ec
+  metadata.gz: b5480858bde4de83a235a691ee1e7ec05f49f7348d44e0e8b3fd6e739ab17211f1f4ea7e0e651cd43edbe7b34b4227c429c7c87d542bea668a406cd679fff9b5
+  data.tar.gz: 96d29abd576caf4dfe334f10df9eddf89a32055c9677bcb600dccb07529a24d7531c5a2fb9e5a25595626164e9398bc900a0211b07537269a09472240480416a

data/lib/graphiform.rb

@@ -19,4 +19,34 @@ module Graphiform
       include Graphiform::Fields
     end
   end
+
+  def self.configuration
+    @configuration ||= {
+      scalar_mappings: {
+        string: GraphQL::Types::String,
+        text: GraphQL::Types::String,
+        # nchar: GraphQL::Types::String,
+
+        date: GraphQL::Types::ISO8601Date,
+
+        time: GraphQL::Types::ISO8601DateTime,
+        datetime: GraphQL::Types::ISO8601DateTime,
+        timestamp: GraphQL::Types::ISO8601DateTime,
+
+        integer: GraphQL::Types::Int,
+
+        float: GraphQL::Types::Float,
+        decimal: GraphQL::Types::Float,
+
+        boolean: GraphQL::Types::Boolean,
+
+        json: GraphQL::Types::JSON,
+        jsonb: GraphQL::Types::JSON,
+      },
+    }
+  end
+
+  def self.configure
+    yield(configuration)
+  end
 end

data/lib/graphiform/association_source.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Graphiform
+  class AssociationSource < GraphQL::Dataloader::Source
+    def initialize(model, attribute, **options)
+      super()
+
+      @model = model
+      @attribute = attribute
+      @options = options
+    end
+
+    def fetch(values)
+      normalized_values = normalize_values(values)
+      records = query(normalized_values.uniq).to_a
+      results(normalized_values, records)
+    end
+
+    def query(values)
+      query = @model
+      query = query.merge(@model.instance_exec(&@options[:scope])) if @options[:scope].present?
+      query = query.where(@attribute => values)
+
+      query = query.includes(@options[:includes]) if @options[:includes].present? && query.respond_to?(:includes)
+      query = query.apply_filters(@options[:where].to_h) if @options[:where].present? && query.respond_to?(:apply_filters)
+      query = query.apply_sorts(@options[:sort].to_h) if @options[:sort].present? && query.respond_to?(:apply_sorts)
+
+      query
+    end
+
+    def normalize_value(value)
+      value = value.downcase if !@options[:case_sensitive] && value.is_a?(String)
+
+      value
+    end
+
+    def normalize_values(values)
+      type_for_attribute = @model.type_for_attribute(@attribute) if @model.respond_to?(:type_for_attribute)
+      values.map do |value|
+        value = type_for_attribute.cast(value) if type_for_attribute.present?
+        normalize_value(value)
+      end
+    end
+
+    def results(values, records)
+      record_attributes = records.map { |record| normalize_value(record[@attribute]) }
+      values.map do |value|
+        if @options[:multi]
+          indexes = record_attributes.each_index.select { |index| record_attributes[index] == value }
+          indexes.map { |index| index && records[index] }
+        else
+          index = record_attributes.index(value)
+          index && records[index]
+        end
+      end
+    end
+  end
+end

data/lib/graphiform/core.rb

@@ -3,6 +3,7 @@
 require 'active_support/concern'
 
 require 'graphiform/helpers'
+require 'graphiform/association_source'
 
 module Graphiform
   module Core
@@ -37,6 +38,7 @@ module Graphiform
           end
           @filter.class_eval do
             argument 'OR', [self], required: false
+            argument 'AND', [self], required: false
           end
         end
 
@@ -153,7 +155,7 @@ module Graphiform
             def base_resolve(**args)
               @value = model.all
               apply_built_ins(**args)
-              @value.first
+              @value.take
             end
           end
         end
@@ -173,18 +175,62 @@ module Graphiform
         end
       end
 
-      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: nil, read_resolve: nil, null: true, **)
+      def graphql_create_resolver(method_name, resolver_type = graphql_type, read_prepare: nil, read_resolve: nil, null: true, skip_dataloader: false, case_sensitive: Graphiform.configuration[:case_sensitive], **)
         Class.new(graphql_base_resolver) do
           type resolver_type, null: null
 
           define_method :base_resolve do |**args|
             @value = object
 
-            @value = instance_exec(@value, context, &read_resolve) if read_resolve
-            @value = @value.public_send(method_name) if !read_resolve && @value.respond_to?(method_name)
-            @value = instance_exec(@value, context, &read_prepare) if read_prepare
+            association_def = @value.association(method_name)&.reflection
+            join_keys = association_def&.join_keys
 
-            apply_built_ins(**args)
+            skip_dataloader ||=
+              !association_def ||
+              !Helpers.dataloader_support?(dataloader, association_def, join_keys.foreign_key) ||
+              read_resolve ||
+              read_prepare ||
+              args[:group]
+
+            if skip_dataloader
+              @value = instance_exec(@value, context, &read_resolve) if read_resolve
+              @value = @value.public_send(method_name) if !read_resolve && @value.respond_to?(method_name)
+              @value = instance_exec(@value, context, &read_prepare) if read_prepare
+
+              apply_built_ins(**args)
+            else
+              dataloader
+                .with(
+                  AssociationSource,
+                  association_def.klass,
+                  join_keys.key,
+                  scope: association_def.scope,
+                  where: args[:where],
+                  sort: args[:sort],
+                  multi: true,
+                  case_sensitive: case_sensitive,
+                )
+                .load(
+                  @value.public_send(join_keys.foreign_key)
+                )
+            end
+          end
+        end
+      end
+
+      def graphql_create_association_resolver(association_def, resolver_type, null: true, skip_dataloader: false, case_sensitive: nil, **)
+        Class.new(::Resolvers::BaseResolver) do
+          type resolver_type, null: null
+
+          define_method :resolve do |*|
+            join_keys = association_def.join_keys
+
+            skip_dataloader ||= !Helpers.dataloader_support?(dataloader, association_def, join_keys.foreign_key)
+
+            return object.public_send(association_def.name) if skip_dataloader
+
+            value = object.public_send(join_keys.foreign_key)
+            dataloader.with(AssociationSource, association_def.klass, join_keys.key, scope: association_def.scope, case_sensitive: case_sensitive).load(value)
           end
         end
       end

data/lib/graphiform/fields.rb

@@ -12,16 +12,17 @@ module Graphiform
         as: nil,
         **options
       )
-        column_def = column(as || name)
-        association_def = association(as || name)
+        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_scopes_to_filter(name, as || name)
-        graphql_field_to_sort(name, as || name)
-        graphql_field_to_grouping(name, as || name)
+        graphql_add_scopes_to_filter(name, identifier)
+        graphql_field_to_sort(name, identifier)
+        graphql_field_to_grouping(name, identifier)
       end
 
       def graphql_writable_field(
@@ -266,6 +267,8 @@ module Graphiform
         include_connection: true,
         read_prepare: nil,
         read_resolve: nil,
+        skip_dataloader: false,
+        case_sensitive: Graphiform.configuration[:case_sensitive],
         **options
       )
         unless association_def.klass.respond_to?(:graphql_type)
@@ -291,7 +294,9 @@ module Graphiform
               klass.graphql_connection,
               read_prepare: read_prepare,
               read_resolve: read_resolve,
-              null: false
+              null: false,
+              skip_dataloader: true,
+              case_sensitive: case_sensitive
             ),
             false,
             **options
@@ -306,10 +311,17 @@ module Graphiform
                 [klass.graphql_type],
                 read_prepare: read_prepare,
                 read_resolve: read_resolve,
-                null: false
+                null: false,
+                skip_dataloader: skip_dataloader,
+                case_sensitive: case_sensitive
               )
             else
-              klass.graphql_type
+              klass.graphql_create_association_resolver(
+                association_def,
+                klass.graphql_type,
+                skip_dataloader: skip_dataloader,
+                case_sensitive: case_sensitive
+              )
             end
           )
 

data/lib/graphiform/helpers.rb

@@ -5,7 +5,7 @@ module Graphiform
     def self.logger
       return Rails.logger if Rails.logger.present?
 
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Logger.new($stdout)
       @logger
     end
 
@@ -19,22 +19,7 @@ module Graphiform
     def self.graphql_type_single(active_record_type)
       return active_record_type unless active_record_type.respond_to?(:to_sym)
 
-      case active_record_type.to_sym
-      when :string, :text
-        GraphQL::Types::String
-      when :date
-        GraphQL::Types::ISO8601Date
-      when :time, :datetime, :timestamp
-        GraphQL::Types::ISO8601DateTime
-      when :integer
-        GraphQL::Types::Int
-      when :float, :decimal
-        GraphQL::Types::Float
-      when :boolean
-        GraphQL::Types::Boolean
-      else
-        active_record_type
-      end
+      Graphiform.configuration[:scalar_mappings][active_record_type.to_sym] || active_record_type
     end
 
     def self.resolver?(val)
@@ -70,5 +55,19 @@ module Graphiform
         association_def.klass.send(method).respond_to?(:arguments) &&
         !association_def.klass.send(method).arguments.empty?
     end
+
+    def self.dataloader_support?(dataloader, association_def, keys)
+      (
+        association_def.present? &&
+        !association_def.polymorphic? &&
+        !association_def.through_reflection? &&
+        (
+          !association_def.scope ||
+          association_def.scope.arity.zero?
+        ) &&
+        !keys.is_a?(Array) &&
+        !dataloader.is_a?(GraphQL::Dataloader::NullDataloader)
+      )
+    end
   end
 end

data/lib/graphiform/version.rb

@@ -1,3 +1,3 @@
 module Graphiform
-  VERSION = '0.2.9'.freeze
+  VERSION = '0.2.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiform
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.13
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - Rakefile
 - lib/graphiform.rb
 - lib/graphiform/active_record_helpers.rb
+- lib/graphiform/association_source.rb
 - lib/graphiform/core.rb
 - lib/graphiform/fields.rb
 - lib/graphiform/helpers.rb