graphiti_gql 0.2.23 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5dfc016180ec5fd536f236be63b24cad42471a74d44ab234dee1966f2de942e
-  data.tar.gz: f97bbe243fa4a205004abdbd522942005b09e87fa37ba1db465000b383e355d0
+  metadata.gz: 00d26d5be2b1e9f1f277e0d0922faec91599f72a28fabe77ff16fb1f2ae6870f
+  data.tar.gz: a868703b6bf2a2fbf88464396f0fe17ba836ffc183cee22e2aad06b5bd6a1223
 SHA512:
-  metadata.gz: '08c76642c2b6be4401a6efcce4c9070c52eee1661c333bcefc30a328826a0558aa6ed013028cb4d173bb2b47565aeeda18c2648a946d6ebe1dbcde2147325ced'
-  data.tar.gz: d16a38a32815b6df020817bb5797ac26ce6507a443375955aad3c2c1fe8fe29192dbf0f01a854d6d565946daae1fe9a713c67df050bbc230c320c282a35e339f
+  metadata.gz: 02f91817b443a31d0eaa280316ddd1ab18691936e401c431a38354370f8a6a1b435076fa022df6d37041f35e08d06fb99fc8104aa957cca4e3b9507bba828117
+  data.tar.gz: 94ca96b977800303c54ecf61fabfeeca65c4b839fc1ae501e6192fdbb30af86181a1aada59d64a47339c28ff3ca4e5469d071a27db9280a59e8c0b339b0f70f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.23)
+    graphiti_gql (0.2.26)
       activemodel (> 6.0, < 8.0)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
@@ -21,9 +21,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    dry-container (0.10.0)
+    dry-container (0.10.1)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.0)
+    dry-core (0.8.1)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.3.0)
     dry-logic (1.2.0)

data/lib/graphiti_gql/graphiti_hax.rb

@@ -25,6 +25,10 @@ module GraphitiGql
       end
     end
 
+    def value_object?
+      self.class.value_object?
+    end
+
     def filterings
       @filterings ||= begin
         if @params.key?(:filter)
@@ -67,6 +71,11 @@ module GraphitiGql
     end
 
     class_methods do
+      def config
+        return @config if @config
+        super
+        @config = @config.merge(value_objects: {}, is_value_object: false)
+      end
 
       def attribute(*args)
         super(*args).tap do
@@ -79,7 +88,14 @@ module GraphitiGql
       end
 
       def filter(name, *args, &blk)
+        is_bool = (filters[name] && filters[name][:type] == :boolean) ||
+          args[0] == :boolean
+        opts = args.length == 1 ? args[0] : args[1]
+        boolean_array = is_bool && opts[:single] == false
         super
+        # default behavior is to force single: true
+        filters[name][:single] = false if boolean_array
+       
         opts = args.extract_options!
         if opts[:if]
           attributes[name][:filterable] = opts[:if]
@@ -93,6 +109,40 @@ module GraphitiGql
           super
         end
       end
+
+      def value_object?
+        !!config[:is_value_object]
+      end
+
+      def value_object!
+        config[:is_value_object] = true
+        self.adapter = ::Graphiti::Adapters::Null
+        config[:filters] = {}
+        config[:stats] = {}
+        config[:sorts] = {}
+        config[:attributes].delete(:id)
+        define_method :base_scope do
+          {}
+        end
+        define_method :resolve do |parent|
+          [parent]
+        end
+      end
+
+      def value_object(name, opts = {})
+        opts[:array] ||= false
+        opts[:null] = true if opts[:null] != false
+        config[:value_objects][name] = Graphiti::ValueObjectAssociation.new(
+          name,
+          parent_resource_class: self,
+          resource_class: opts[:resource],
+          _alias: opts[:alias],
+          is_array: opts[:array],
+          null: opts[:null],
+          readable: opts[:readable],
+          deprecation_reason: opts[:deprecation_reason]
+        )
+      end
     end
   end
   Graphiti::Resource.send(:prepend, ResourceExtras)
@@ -264,6 +314,20 @@ module GraphitiGql
     description: 'Datetime with milliseconds'
   }
 
+  [: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
+    type[:canonical_name] = :"#{kind}_range"
+    Graphiti::Types[:"array_of_#{kind}_ranges"] = {
+      canonical_name: :"#{kind}_range",
+      params: Dry::Types["strict.array"].of(type[:params]),
+      read: Dry::Types["strict.array"].of(type[:read]),
+      write: Dry::Types["strict.array"].of(type[:write]),
+      kind: "array",
+      description: "Base Type."
+    }
+  end
+
   module ActiveRecordAdapterExtras
     extend ActiveSupport::Concern
 
@@ -363,8 +427,18 @@ module GraphitiGql
   
   Graphiti::Query.send(:prepend, QueryExtras)
   module ScopeExtras
+    def initialize(object, resource, query, opts = {})
+      if resource.value_object?
+        object = query.params[:parent]
+        super(object, resource, query, opts)
+      else
+        super
+      end
+    end
+
     def resolve(*args)
       results = super
+      raise Graphiti::Errors::InvalidResolve unless results.is_a?(Array)
       results.reverse! if @query.hash[:reverse]
       results
     end
@@ -383,4 +457,66 @@ module GraphitiGql
     ::Graphiti::Adapters::ActiveRecord::ManyToManySideload
       .send(:prepend, ActiveRecordManyToManyExtras)
   end
+end
+
+class Graphiti::Errors::InvalidResolve < Graphiti::Errors::Base
+  def message
+    "Resource#resolve must always return an array"
+  end
+end
+
+class Graphiti::Errors::InvalidValueObject < Graphiti::Errors::Base
+  def initialize(resource, name, value)
+    @resource = resource
+    @name = name
+    @value = value
+  end
+
+  def message
+    "#{@resource} - value object '#{@name}' configured with array: true but returned non-array: #{@value.inspect}"
+  end
+end
+
+class Graphiti::ValueObjectAssociation
+  attr_reader :name,
+    :parent_resource_class,
+    :alias,
+    :readable,
+    :null,
+    :deprecation_reason
+
+  def initialize(
+    name,
+    parent_resource_class:,
+    resource_class:,
+    is_array: false,
+    readable: nil,
+    null: true,
+    _alias: nil,
+    deprecation_reason: nil
+  )
+    @name = name
+    @parent_resource_class = parent_resource_class
+    @resource_class = resource_class
+    @readable = readable
+    @array = is_array
+    @alias = _alias
+    @null = null
+    @deprecation_reason = deprecation_reason
+  end
+
+  def array?
+    !!@array
+  end
+
+  def resource_class
+    @resource_class ||= Graphiti::Util::Class
+      .infer_resource_class(@parent_resource_class, name)
+  end
+
+  def build_resource(parent)
+    instance = resource_class.new
+    instance.parent = parent
+    instance
+  end
 end

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

@@ -30,7 +30,11 @@ module GraphitiGql
             value = if _config[:proc]
               instance_eval(&_config[:proc])
             else
-              object.send(_alias || _name)
+              if object.is_a?(Hash)
+                object[_name] || object[_name.to_s]
+              else
+                object.send(_alias || _name)
+              end
             end
             return if value.nil?
             Graphiti::Types[_config[:type]][:read].call(value)

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

@@ -67,6 +67,7 @@ module GraphitiGql
           edge_resource = @sideload.edge_resource
           ResourceType.add_fields(klass, edge_resource, id: false)
           ResourceType.add_relationships(edge_resource, klass)
+          ResourceType.add_value_objects(edge_resource, klass)
           klass
         end
 

data/lib/graphiti_gql/schema/query.rb

@@ -10,6 +10,7 @@ module GraphitiGql
       def build
         @resources.each { |resource| ResourceType.new(resource).build }
         define_entrypoints
+        add_value_objects
         add_relationships
         @query_class
       end
@@ -35,6 +36,13 @@ module GraphitiGql
           ResourceType.add_relationships(resource, type)
         end
       end
+
+      def add_value_objects
+        registry.resource_types.each do |registered|
+          resource, type = registered[:resource], registered[:type]
+          ResourceType.add_value_objects(resource, type)
+        end
+      end
     end
   end
 end

data/lib/graphiti_gql/schema/registry.rb

@@ -52,7 +52,8 @@ module GraphitiGql
       # When polymorphic parent, returns the Interface not the Class
       def resource_types
         values
-          .select { |v| v.key?(:resource) && !v[:interface] }
+          .select { |v| v.key?(:resource) }
+          .reject { |v| v[:interface] || v[:resource].value_object? }
           .map { |registered| get(registered[:resource]) }
       end
 

data/lib/graphiti_gql/schema/resource_type.rb

@@ -14,7 +14,7 @@ module GraphitiGql
         end
       end
 
-      def self.add_fields(type, resource, id: true)
+      def self.add_fields(type, resource, id: true) # id: false for edges
         resource.attributes.each_pair do |name, config|
           next if name == :id && id == false
           if config[:readable]
@@ -23,6 +23,41 @@ module GraphitiGql
         end
       end
 
+      def self.add_value_objects(resource, type)
+        resource.config[:value_objects].each_pair do |name, vo_association|
+          vo_resource_class = vo_association.resource_class
+          value_object_type = Schema.registry.get(vo_resource_class)[:type]
+          if vo_association.array?
+            value_object_type = [value_object_type]
+          end
+
+          _array = vo_association.array?
+          opts = { null: vo_association.null }
+          opts[:deprecation_reason] = vo_association.deprecation_reason if vo_association.deprecation_reason
+          type.field name, value_object_type, **opts
+          type.define_method name do
+            if (method_name = vo_association.readable)
+              unless vo_association.parent_resource_class.new.send(method_name)
+                raise ::Graphiti::Errors::UnreadableAttribute
+                  .new(vo_association.parent_resource_class, name)
+              end
+            end
+
+            result = vo_resource_class.all({ parent: object }).to_a
+            default_behavior = result == [object]
+            result = result.first if !_array
+            if default_behavior
+              method_name = vo_association.alias.presence || name
+              result = object.send(method_name)
+              if _array && !result.is_a?(Array)
+                raise Graphiti::Errors::InvalidValueObject.new(resource, name, result)
+              end
+            end
+            result
+          end
+        end
+      end
+
       def self.add_relationships(resource, type)
         resource.sideloads.each do |name, sideload|
           next unless sideload.readable?

data/lib/graphiti_gql/schema.rb

@@ -4,6 +4,31 @@ module GraphitiGql
       self.time_precision = 6
     end
 
+    class DatetimeRange < GraphQL::Schema::Object
+      field :from, GraphQL::Types::ISO8601DateTime
+      field :to, GraphQL::Types::ISO8601DateTime
+    end
+
+    class PreciseDatetimeRange < GraphQL::Schema::Object
+      field :from, PreciseDatetime
+      field :to, PreciseDatetime
+    end
+
+    class StringRange < GraphQL::Schema::Object
+      field :from, String
+      field :to, String
+    end
+
+    class IntegerRange < GraphQL::Schema::Object
+      field :from, Integer
+      field :to, Integer
+    end
+
+    class FloatRange < GraphQL::Schema::Object
+      field :from, Float
+      field :to, Float
+    end
+
     GQL_TYPE_MAP = {
       integer_id: String,
       string: String,
@@ -11,18 +36,28 @@ module GraphitiGql
       integer: Integer,
       big_integer: GraphQL::Types::BigInt,
       float: Float,
-      boolean: GraphQL::Schema::Member::GraphQLTypeNames::Boolean,
+      boolean: GraphQL::Types::Boolean,
       date: GraphQL::Types::ISO8601Date,
       datetime: GraphQL::Types::ISO8601DateTime,
       precise_datetime: PreciseDatetime,
       hash: GraphQL::Types::JSON,
+      string_range: StringRange,
+      integer_range: IntegerRange,
+      float_range: FloatRange,
+      datetime_range: DatetimeRange,
+      precise_datetime_range: PreciseDatetimeRange,
       array: [GraphQL::Types::JSON],
       array_of_strings: [String],
       array_of_integers: [Integer],
       array_of_floats: [Float],
       array_of_dates: [GraphQL::Types::ISO8601Date],
       array_of_datetimes: [GraphQL::Types::ISO8601DateTime],
-      array_of_precise_datetimes: [PreciseDatetime]
+      array_of_precise_datetimes: [PreciseDatetime],
+      array_of_string_ranges: [StringRange],
+      array_of_integer_ranges: [IntegerRange],
+      array_of_float_ranges: [FloatRange],
+      array_of_datetime_ranges: [DatetimeRange],
+      array_of_precise_datetime_ranges: [PreciseDatetimeRange]
     }
 
     class RelayConnectionExtension < GraphQL::Schema::Field::ConnectionExtension

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.23"
+  VERSION = "0.2.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.26
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql