graphiti_gql 0.2.28 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc7f76831ea15375482b1ec32d6fe090b19c9ebdac1ea081805dfcf32497072
-  data.tar.gz: 3ac75bdef55c8cf63de7e2f9554dbc0e58f1f5a7a23ba591cbfac9891a9b8118
+  metadata.gz: ba3f305f68fc23193bb245eff566feb18eaec47a775c5f0fdab8177707b564f8
+  data.tar.gz: 3f96b0cee52d9aa3c3968f125487d26f85f6bdb7acc13c2d457a2bc4feb65e11
 SHA512:
-  metadata.gz: e51aca16a756ed7f0e053fda559e07831433ae0e37a6ab40908468a07bfa93eb48c12abd045ea93dbdc8dc8b716ff5abb190347b88d089b13305d2fd7a6ac818
-  data.tar.gz: 53e611a009a2277cfc0bc7318710a537fd02c06760921716e149bfa8cebbbeb3607c3b409e8830460be1e80ba41b66c366507f1057c2215ee7fb7ffc79b77653
+  metadata.gz: c05e7c4dc7b7908a1b3f43b40cba6b5bcf6bbda4c2b26be4555783a4d27018e249e22d1e3feb8e1d0df09e35b62fc0f98759f4d0e9b16edc9725199dd79d19dc
+  data.tar.gz: '049cb6c5201efa3a6921c5e964dbb7064dc70a7d5930c480bcf59b9466d839779a11c41a7d66cc7434d778ed200a94c0fc75a6736ff4b38817d453788cfc8318'

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

data/lib/graphiti_gql/active_resource.rb

@@ -37,18 +37,20 @@ module GraphitiGql
       def edge(name, node_id)
         found = @edges[name].empty? ? nil : @edges[name]
         if found && node_id
-          found.find { |f| f.instance_variable_get(:@node_id) == node_id.to_s }
+          found.find do |f|
+            gql_node_id = f.instance_variable_get(:@node_id)
+            gql_node_id == node_id ||
+              gql_node_id == node_id.to_s ||
+              gql_node_id == @resource.gid(node_id)
+          end
         else
           found
         end
       end
 
-      def decoded_id
-        Base64.decode64(self.id)
-      end
-
-      def int_id
-        decoded_id.to_i
+      def _id
+        deserialized = @resource.deserialize_gid(id)
+        deserialized.to_i.to_s == deserialized ? deserialized.to_i : deserialized
       end
     end
 
@@ -77,7 +79,7 @@ module GraphitiGql
           data # fire query
           Node.new(underscore(data[data.keys.first]), @resource)
         else
-          nodes.find { |n| n.id == id.to_s }
+          nodes.find { |n| n.id == id.to_s || n.id == @resource.gid(id) }
         end
       end
 

data/lib/graphiti_gql/graphiti_hax.rb

@@ -71,13 +71,46 @@ module GraphitiGql
     end
 
     class_methods do
+      def gid(*ids)
+        ids = ids[0] if ids[0].is_a?(Array) && ids.length == 1
+        gids = ids.map { |id| serialize_gid(id) }
+        ids.length == 1 ? gids.first : gids
+      end
+
+      def serialize_gid(id)
+        Base64.encode64("#{graphql_name}/#{id}")
+      end
+
+      def deserialize_gid(gid, integer = true)
+        id = Base64.decode64(gid).split("/").last
+        id.to_i.to_s == id ? id.to_i : id
+      end
+
       def config
         return @config if @config
         super
         @config = @config.merge(value_objects: {}, is_value_object: false)
       end
 
+      def graphql_name
+        @graphql_name ||= begin
+          if name.nil?
+            'Unknown'
+          else
+            name.gsub('Resource', '').gsub('::', '')
+          end
+        end
+      end
+
       def attribute(*args)
+        # new default is :gid, not integer_id
+        if args[0] == :id && args[1] == :integer_id
+          args[1] = :gid
+          opts = args.extract_options!
+          opts[:null] = false
+          args << opts
+        end
+
         super(*args).tap do
           opts = args.extract_options!
           att = config[:attributes][args[0]]
@@ -320,6 +353,7 @@ module GraphitiGql
     description: 'Datetime with milliseconds'
   }
 
+  # Support ranges
   [:string, :integer, :float, :datetime, :precise_datetime].each do |kind|
     duped_hash = Graphiti::Util::Hash.deep_dup(Graphiti::Types[:hash])
     type = Graphiti::Types[:"#{kind}_range"] = duped_hash
@@ -334,6 +368,29 @@ module GraphitiGql
     }
   end
 
+  # Support gid
+  gid_going_out = ->(id) {
+    resource.gid(id)
+  }
+
+  gid_coming_in = definition.constructor do |input|
+    if defined?(ApplicationResource)
+      ApplicationResource.deserialize_gid(input)
+    else
+      Graphiti::Resource.deserialize_gid(input)
+    end
+  end
+
+  # Register it with Graphiti
+  Graphiti::Types[:gid] = {
+    params: gid_coming_in,
+    read: gid_going_out,
+    write: gid_coming_in,
+    kind: 'scalar',
+    canonical_name: :gid,
+    description: 'Globally-unique identifier',
+  }
+
   module ActiveRecordAdapterExtras
     extend ActiveSupport::Concern
 
@@ -344,6 +401,8 @@ module GraphitiGql
       alias_method :filter_precise_datetime_gte, :filter_gte
       alias_method :filter_precise_datetime_eq, :filter_eq
       alias_method :filter_precise_datetime_not_eq, :filter_not_eq
+      alias_method :filter_gid_eq, :filter_eq
+      alias_method :filter_gid_not_eq, :filter_not_eq
     end
 
     # TODO: integration specs mysql vs postgres for case sensitivity
@@ -393,11 +452,14 @@ module GraphitiGql
     class << self
       alias :old_default_operators :default_operators
       def default_operators
-        old_default_operators.merge({
-          precise_datetime: numerical_operators,
+        ops = old_default_operators.merge({
+          precise_datetime: numerical_operators - [:not_eq],
           string_enum: [:eq, :not_eq],
           integer_enum: [:eq, :not_eq],
+          gid: [:eq, :not_eq]
         })
+        ops[:datetime] = ops[:datetime] - [:not_eq]
+        ops
       end
     end
   end

data/lib/graphiti_gql/loaders/belongs_to.rb

@@ -1,6 +1,10 @@
 module GraphitiGql
   module Loaders
-    class FakeRecord < Struct.new(:id, :type)
+    class FakeRecord < Struct.new(:id, :type, :graphiti_resource)
+      def initialize(*args)
+        super
+        @__graphiti_resource = graphiti_resource
+      end
     end
 
     class BelongsTo < GraphQL::Batch::Loader
@@ -16,16 +20,16 @@ module GraphitiGql
         ids.compact!
         return if ids.empty?
 
-        if @params[:simpleid]
+        if @params[:simpleid] && !to_polymorphic_resource?
           if @sideload.type == :polymorphic_belongs_to
             ids.each do |id|
               child = @sideload.children.values.find { |c| c.group_name == id[:type].to_sym }
               type = Schema::Registry.instance.get(child.resource.class, interface: false)[:type]
-              fulfill(id, FakeRecord.new(id[:id], type))
+              fulfill(id, FakeRecord.new(id[:id], type, child.resource))
             end
           else
             type = Schema::Registry.instance.get(@sideload.resource.class)[:type]
-            ids.each { |id| fulfill(id, FakeRecord.new(id, type)) }
+            ids.each { |id| fulfill(id, FakeRecord.new(id, type, @sideload.resource)) }
           end
           return
         end
@@ -40,9 +44,10 @@ module GraphitiGql
           payload.each_pair do |key, value|
             params = { filter: {} }
             klass = @sideload.children.values.find { |c| c.group_name == key.to_sym }
-            params = {
-              filter: { id: { eq: value.join(",") } }
-            }
+            filter_ids = value.map { |id| @sideload.resource.class.gid(id.to_s) }
+            params = @params.merge({
+              filter: { id: { eq: filter_ids } }
+            })
 
             futures << Concurrent::Future.execute do
                { type: key, data: klass.resource.class.all(params).data }
@@ -50,14 +55,16 @@ module GraphitiGql
           end
           values = futures.map(&:value)
           ids.each do |id|
-            val = values.find { |v| v[:type] == id[:type] }
-            fulfill(id, val[:data][0])
+            records_for_type = values.find { |v| v[:type] == id[:type] }
+            corresponding = records_for_type[:data].find { |r| r.id == id[:id] }
+            fulfill(id, corresponding)
           end
         else
           resource = Schema.registry.get(@sideload.resource.class)[:resource]
-          params = {}
+          params = @params.deep_dup
           unless resource.singular
-            params[:filter] = {id: { eq: ids.join(",") } }
+            filter_ids = ids.map { |id| @sideload.resource.class.gid(id.to_s) }
+            params[:filter] = {id: { eq: filter_ids } }
           end
           records = resource.all(params).data
           if resource.singular
@@ -68,6 +75,12 @@ module GraphitiGql
           end
         end
       end
+
+      private
+
+      def to_polymorphic_resource?
+        @sideload.resource.polymorphic? && @sideload.type != :polymorphic_belongs_to
+      end
     end
   end
 end

data/lib/graphiti_gql/loaders/many.rb

@@ -15,7 +15,7 @@ module GraphitiGql
 
       def initialize(sideload, params)
         @sideload = sideload
-        @params = params
+        @params = params.merge(typecast_filters: false)
       end
 
       def perform(parent_records)
@@ -34,6 +34,7 @@ module GraphitiGql
             pk
           end
         end
+        ids.compact!
 
         build_params(ids, parent_records)
         resource = Schema.registry.get(@sideload.resource.class)[:resource]
@@ -53,13 +54,16 @@ module GraphitiGql
         if @sideload.polymorphic_as
           type = ids[0][:"#{@sideload.polymorphic_as}_type"]
           foreign_keys = ids.map { |id| id[@sideload.foreign_key] }
+          foreign_keys.map! { |id| @sideload.parent_resource.class.gid(id) }
           @params[:filter][:"#{@sideload.polymorphic_as}_type"] = type
-          @params[:filter][@sideload.foreign_key] = foreign_keys.join(",")
+          @params[:filter][@sideload.foreign_key] = foreign_keys
         elsif @sideload.type == :many_to_many
+          filter_ids = ids.map { |id| @sideload.parent_resource.class.gid(id) }
           fk = @sideload.foreign_key.values.first
-          @params[:filter].merge!(fk => { eq: ids.join(",") })
+          @params[:filter].merge!(fk => { eq: filter_ids })
         elsif !@sideload.parent_resource.class.singular
-          @params[:filter].merge!(@sideload.foreign_key => { eq: ids.join(",") })
+          filter_ids = ids.map { |id| @sideload.parent_resource.class.gid(id) }
+          @params[:filter].merge!(@sideload.foreign_key => { eq: filter_ids })
         end
 
         if @params[:stats]

data/lib/graphiti_gql/log_subscriber.rb

@@ -35,7 +35,9 @@ module GraphitiGql
       num_results = payload[:results].length
       klasses = payload[:results].map(&:class).map(&:name).uniq
       color = num_results == 0 ? :yellow : :green
-      add_chunk("#{indent}   #{num_results} #{"result".pluralize(num_results)} of #{"type".pluralize(klasses.length)} #{klasses.to_sentence}", color, true)
+      stmt = "#{indent}   #{num_results} #{"result".pluralize(num_results)}"
+      stmt << " of #{"type".pluralize(klasses.length)} #{klasses.to_sentence}" if num_results > 0
+      add_chunk(stmt, color, true)
 
       took = ((stop - start) * 1000.0).round(2)
       add_chunk("#{indent}   Took: #{took}ms", :magenta, true)
@@ -75,7 +77,7 @@ end|, :white, true)
           Graphiti.info("❌🚨 Response contained errors!", :red, true)
           response_errors.each do |err|
             Graphiti.info("#{err['extensions']['code']} - #{err['message']}", :red, true)
-            Graphiti.info("#{err['path'].join(".")}", :red, false)
+            Graphiti.info("#{err['path'].join(".")}", :red, false) if err['path']
           end
         end
       else
@@ -153,6 +155,7 @@ end|, :white, true)
 
     def thin_path
       path = Graphiti.context[:object][:current_path]
+      return [] unless path
       path.reject do |p|
         p.is_a?(Integer) ||
           p == "nodes" ||

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

@@ -37,7 +37,16 @@ module GraphitiGql
               end
             end
             return if value.nil?
-            Graphiti::Types[_config[:type]][:read].call(value)
+
+            caster = Graphiti::Types[_config[:type]][:read]
+            # Dry::Types can't be instance_exec'd
+            # This dependency has probably served it's purpose and can be
+            # refactored away
+            if caster.is_a?(Proc)
+              instance_exec(value, &caster)
+            else
+              caster.call(value)
+            end
           end
         end
 
@@ -51,7 +60,6 @@ module GraphitiGql
             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

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

@@ -12,7 +12,7 @@ module GraphitiGql
             null: true,
             extras: [:lookahead]
           unless @registered[:resource].singular
-            field.argument(:id, String, required: true)
+            field.argument(:id, GraphQL::Types::ID, required: true)
           end
           _registered = @registered
           query.define_method name do |**arguments|

data/lib/graphiti_gql/schema/list_arguments.rb

@@ -77,7 +77,6 @@ module GraphitiGql
             canonical_graphiti_type = Graphiti::Types
               .name_for(filter_config[:type])
             type = GQL_TYPE_MAP[canonical_graphiti_type]
-            type = String if filter_name == :id
           end
 
           if (allowlist = filter_config[:allow])

data/lib/graphiti_gql/schema/registry.rb

@@ -60,8 +60,7 @@ module GraphitiGql
       private
 
       def key_for_resource(resource)
-        resource.graphql_name ||
-          resource.name.gsub('Resource', '').gsub('::', '')
+        resource.graphql_name
       end
     end
   end

data/lib/graphiti_gql/schema/resource_type.rb

@@ -141,6 +141,17 @@ module GraphitiGql
           klass = Class.new(Schema.base_object)
         end
 
+        klass.define_method :resource do
+          return @resource if @resource
+          resource = object.instance_variable_get(:@__graphiti_resource)
+          resource_class = resource.class
+          if resource_class.polymorphic? && !resource_class.polymorphic_child?
+            resource_class = resource_class.resource_for_model(object)
+          end
+          @resource = resource_class
+          resource_class
+        end
+
         klass
       end
 

data/lib/graphiti_gql/schema.rb

@@ -33,6 +33,7 @@ module GraphitiGql
       integer_id: String,
       string: String,
       uuid: String,
+      gid: GraphQL::Types::ID,
       integer: Integer,
       big_integer: GraphQL::Types::BigInt,
       float: Float,
@@ -68,7 +69,9 @@ module GraphitiGql
     end
 
     def self.base_object
+      return @base_object if @base_object
       klass = Class.new(GraphQL::Schema::Object)
+
       # TODO make this config maybe
       if defined?(ActionView)
         klass.send(:include, ActionView::Helpers::TranslationHelper)
@@ -79,6 +82,7 @@ module GraphitiGql
           end
         end
       end
+      @base_object = klass
       klass
     end
 

data/lib/graphiti_gql/spec_helper.rb

@@ -74,6 +74,9 @@ module GraphitiGql
       resource.gql(params.merge(fields: fields), ctx, q, opts)
     end
 
+    def gid(*ids)
+      resource.gid(*ids)
+    end
 
     def run
       lambda do

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.28"
+  VERSION = "0.2.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.31
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -126,7 +126,6 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,94 +0,0 @@
-PATH
-  remote: .
-  specs:
-    graphiti_gql (0.2.27)
-      activemodel (> 6.0, < 8.0)
-      graphiti (~> 1.3.9)
-      graphql (~> 2.0)
-      graphql-batch (~> 0.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (7.0.3)
-      activesupport (= 7.0.3)
-    activesupport (7.0.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.5.0)
-    dry-container (0.10.1)
-      concurrent-ruby (~> 1.0)
-    dry-core (0.8.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.3.0)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    graphiti (1.3.9)
-      activesupport (>= 5.2)
-      concurrent-ruby (~> 1.0)
-      dry-types (>= 0.15.0, < 2.0)
-      graphiti_errors (~> 1.1.0)
-      jsonapi-renderer (~> 0.2, >= 0.2.2)
-      jsonapi-serializable (~> 0.3.0)
-    graphiti_errors (1.1.2)
-      jsonapi-serializable (~> 0.1)
-    graphql (2.0.12)
-    graphql-batch (0.5.1)
-      graphql (>= 1.10, < 3)
-      promise.rb (~> 0.7.2)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    jsonapi-renderer (0.2.2)
-    jsonapi-serializable (0.3.1)
-      jsonapi-renderer (~> 0.2.0)
-    method_source (1.0.0)
-    minitest (5.16.2)
-    promise.rb (0.7.4)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (10.5.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-
-PLATFORMS
-  arm64-darwin-21
-
-DEPENDENCIES
-  bundler (~> 2.3)
-  graphiti_gql!
-  pry
-  pry-byebug
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.3.12