graphiti_gql 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a19fd68dc698b8a7284fe80686da9f50ee137365508241cd374e32aa6c505aa
-  data.tar.gz: d509f137452b90e94986c46267f8728160021de305e599ba47512af9366fe109
+  metadata.gz: ff76a3032a8378019cc0034c48cc1bd33302a8d662515fd722d970e642ee355e
+  data.tar.gz: 532980890cd827d260bceebd5f944eeb999a561cde6df3e14cff5ddbfaa5f146
 SHA512:
-  metadata.gz: 22f8643e779d272d806d53179e5f83e6ca6157fc8c261e03ea3232fdf685faa35ad50c70bd3f5f0f445b8bd4578e616b9a538c9205e330a301a30f370b2c612a
-  data.tar.gz: ec6e08b56162dc2bb077bfd3cfc5fb5dcf8edcdc3680d940347eb33949f8530967e6d828e0b914f0920a406bad4807d83c643981f9ab0136dd7a3e9e422e068a
+  metadata.gz: 8a67a1e359377aa6682b2f23fd0461b2547a05df41c14739d4abf691d879682dd8cd83a4e4deda386855ae6c7a587feb453b2aff5490d2e0d44998955ff6bba9
+  data.tar.gz: f5f83d5859fc24f3215723d3abd7d1105dcefc3f02002853f829a4d954923444df0d1a37c0cbbb736dbb79df9745dd1be1c197c6151b07febb117272eb12e8e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.1.0)
+    graphiti_gql (0.2.1)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)

data/lib/graphiti_gql/graphiti_hax.rb

@@ -121,6 +121,24 @@ module GraphitiGql
   end
   Graphiti::Scoping::Paginate.send(:prepend, PaginateExtras)
 
+  module ManyToManyExtras
+    extend ActiveSupport::Concern
+
+    class_methods do
+      attr_accessor :edge_resource
+
+      def attribute(*args, &blk)
+        @edge_resource = Class.new(Graphiti::Resource) do
+          def self.abstract_class?
+            true
+          end
+        end
+        @edge_resource.attribute(*args, &blk)
+      end
+    end
+  end
+  Graphiti::Sideload::ManyToMany.send(:include, ManyToManyExtras)
+
   module StatsExtras
     def calculate_stat(name, function)
       config = @resource.all_attributes[name] || {}
@@ -166,7 +184,9 @@ module GraphitiGql
       alias_method :filter_precise_datetime_not_eq, :filter_not_eq
     end
   end
-  Graphiti::Adapters::ActiveRecord.send(:include, ActiveRecordAdapterExtras)
+  if defined?(Graphiti::Adapters::ActiveRecord)
+    Graphiti::Adapters::ActiveRecord.send(:include, ActiveRecordAdapterExtras)
+  end
 
   Graphiti::Adapters::Abstract.class_eval do
     class << self
@@ -215,4 +235,17 @@ module GraphitiGql
     end
   end
   Graphiti::Scope.send(:prepend, ScopeExtras)
+
+  module ActiveRecordManyToManyExtras
+    # flipping .includes to .joins
+    def belongs_to_many_filter(scope, value)
+      scope
+        .joins(through_relationship_name)
+        .where(belongs_to_many_clause(value, type))
+    end
+  end
+  if defined?(ActiveRecord)
+    ::Graphiti::Adapters::ActiveRecord::ManyToManySideload
+      .send(:prepend, ActiveRecordManyToManyExtras)
+  end
 end

data/lib/graphiti_gql/loaders/many_to_many.rb

@@ -2,15 +2,32 @@ module GraphitiGql
   module Loaders
     class ManyToMany < Many
       def assign(ids, proxy)
-        records = proxy.data
         thru = @sideload.foreign_key.keys.first
         fk = @sideload.foreign_key[thru]
+        add_join_table_magic(proxy)
+        records = proxy.data
         ids.each do |id|
-          match = ->(thru) { thru.send(fk) == id }
-          corresponding = records.select { |record| record.send(thru).any?(&match) }
+          corresponding = records.select do |record|
+            record.send(:"_edge_#{fk}") == id
+          end
           fulfill(id, [corresponding, proxy])
         end
       end
+
+      private
+
+      def add_join_table_magic(proxy)
+        if defined?(ActiveRecord) && proxy.resource.model.ancestors.include?(ActiveRecord::Base)
+          thru = @sideload.foreign_key.keys.first
+          thru_model = proxy.resource.model.reflect_on_association(thru).klass
+          names = thru_model.column_names.map do |n|
+            "#{thru_model.table_name}.#{n} as _edge_#{n}"
+          end
+          scope = proxy.scope.object
+          scope = scope.select(["#{proxy.resource.model.table_name}.*"] + names)
+          proxy.scope.object = scope
+        end
+      end
     end
   end
 end

data/lib/graphiti_gql/schema/fields/attribute.rb

@@ -2,10 +2,12 @@ module GraphitiGql
   class Schema
     module Fields
       class Attribute
-        def initialize(name, config)
+        # If sideload is present, we're applying m2m metadata to an edge
+        def initialize(name, config, sideload = nil)
           @config = config
           @name = name
           @alias = config[:alias]
+          @sideload = sideload # is_edge: true
         end
 
         def apply(type)
@@ -13,20 +15,39 @@ module GraphitiGql
           _config = @config
           _name = @name
           _alias = @alias 
+          _sideload = @sideload
           opts = @config.slice(:null, :deprecation_reason)
           type.field(_name, field_type, **opts)
           type.define_method _name do
             if (readable = _config[:readable]).is_a?(Symbol)
-              resource = object.instance_variable_get(:@__graphiti_resource)
+              obj = object
+              obj = object.node if _sideload
+              resource = obj.instance_variable_get(:@__graphiti_resource)
               unless resource.send(readable)
                 path = Graphiti.context[:object][:current_path].join(".")
                 raise Errors::UnauthorizedField.new(path)
               end
             end
+
+            edge_attrs = nil
+            if _sideload
+              edge_attrs = object.node.attributes
+                .select { |k, v| k.to_s.starts_with?("_edge_") }
+              edge_attrs.transform_keys! { |k| k.to_s.gsub("_edge_", "").to_sym }
+            end
+
             value = if _config[:proc]
-              instance_eval(&_config[:proc])
+              if _sideload
+                instance_exec(edge_attrs, &_config[:proc])
+              else
+                instance_eval(&_config[:proc])
+              end
             else
-              object.send(_alias || _name)
+              if _sideload
+                edge_attrs[_alias || _name]
+              else
+                object.send(_alias || _name)
+              end
             end
             return if value.nil?
             Graphiti::Types[_config[:type]][:read].call(value)
@@ -36,9 +57,12 @@ module GraphitiGql
         private
 
         def field_type
-          canonical_graphiti_type = Graphiti::Types.name_for(@config[:type])
-          field_type = GQL_TYPE_MAP[canonical_graphiti_type.to_sym]
-          field_type = String if @name == :id
+          field_type = Graphiti::Types[@config[:type]][:graphql_type]
+          if !field_type
+            canonical_graphiti_type = Graphiti::Types.name_for(@config[:type])
+            field_type = GQL_TYPE_MAP[canonical_graphiti_type.to_sym]
+            field_type = String if @name == :id
+          end
           field_type = [field_type] if @config[:type].to_s.starts_with?("array_of")
           field_type
         end

data/lib/graphiti_gql/schema/fields/to_many.rb

@@ -4,7 +4,11 @@ module GraphitiGql
       class ToMany
         def initialize(sideload, sideload_type)
           @sideload = sideload
-          @sideload_type = sideload_type
+          @sideload_type = if customized_edge?
+              build_customized_edge_type(sideload_type)
+            else
+              sideload_type
+            end
         end
 
         def apply(type)
@@ -31,6 +35,33 @@ module GraphitiGql
             Loaders::Many.factory(_sideload, params).load(id)
           end
         end
+
+        private
+
+        def customized_edge?
+          @sideload.type == :many_to_many && @sideload.class.edge_resource
+        end
+
+        def build_customized_edge_type(sideload_type)
+          # build the edge class
+          prior_edge_class = sideload_type.edge_type_class
+          edge_class = Class.new(prior_edge_class)
+          edge_resource = @sideload.class.edge_resource
+          edge_resource.attributes.each_pair do |name, config|
+            next if name == :id
+            Schema::Fields::Attribute.new(name, config, @sideload).apply(edge_class)
+          end
+          registered_parent = Schema.registry.get(@sideload.parent_resource.class)
+          parent_name = registered_parent[:type].graphql_name
+          edge_class.define_method :graphql_name do
+            "#{parent_name}To#{sideload_type.graphql_name}Edge"
+          end
+
+          # build the sideload type with new edge class applied
+          klass = Class.new(sideload_type)
+          klass.edge_type_class(edge_class)
+          klass
+        end
       end
     end
   end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-06-23 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: []
@@ -167,7 +167,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.graphiti.dev
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []