hq-graphql 2.0.7 → 2.1.1

data/lib/hq/graphql/root_query.rb

@@ -1,4 +1,3 @@
-# typed: true
 # frozen_string_literal: true
 
 module HQ

data/lib/hq/graphql/scalars.rb

@@ -1,4 +1,3 @@
-# typed: strict
 # frozen_string_literal: true
 
 require "hq/graphql/types/object"

data/lib/hq/graphql/schema.rb

@@ -4,7 +4,7 @@ module HQ
   module GraphQL
     class Schema < ::GraphQL::Schema
       class << self
-        def dump_directory(directory = Rails.root.join("app", "graphql"))
+        def dump_directory(directory = Rails.root.join("app/graphql"))
           @dump_directory ||= directory
         end
 

data/lib/hq/graphql/types.rb

@@ -1,6 +1,8 @@
-# typed: true
 # frozen_string_literal: true
 
+require "hq/graphql/types/object"
+require "hq/graphql/types/uuid"
+
 module HQ
   module GraphQL
     module Types
@@ -8,12 +10,23 @@ module HQ
         MISSING_TYPE_MSG = "The GraphQL type for `%{klass}` is missing."
       end
 
-      def self.[](key, *args)
-        @types ||= Hash.new do |hash, options|
+      def self.registry
+        @registry ||= Hash.new do |hash, options|
           klass, nil_klass = Array(options)
           hash[klass] = nil_klass ? nil_query_klass(klass) : klass_for(klass)
         end
-        @types[[key, *args]]
+      end
+
+      def self.register(k, v)
+        self[k] = v
+      end
+
+      def self.[]=(key, is_nil = false, value)
+        registry[[key, is_nil]] = value
+      end
+
+      def self.[](key, is_nil = false)
+        registry[[key, is_nil]]
       end
 
       def self.type_from_column(column)
@@ -38,7 +51,7 @@ module HQ
 
       # Only being used in testing
       def self.reset!
-        @types = nil
+        @registry = nil
       end
 
       class << self
@@ -54,9 +67,10 @@ module HQ
 
         def find_klass(klass_or_string, method)
           klass = klass_or_string.is_a?(String) ? klass_or_string.constantize : klass_or_string
-          ::HQ::GraphQL.types.detect { |t| t.model_klass == klass }&.send(method) ||
-          ::HQ::GraphQL.types.detect { |t| t.model_klass == klass.base_class }&.send(method) ||
-             raise(Error, Error::MISSING_TYPE_MSG % { klass: klass.name })
+          resource = ::HQ::GraphQL.lookup_resource(klass)
+
+          raise(Error, Error::MISSING_TYPE_MSG % { klass: klass.name }) if !resource
+          resource.send(method)
         end
       end
     end

data/lib/hq/graphql/types/object.rb

@@ -1,4 +1,3 @@
-# typed: true
 # frozen_string_literal: true
 
 module HQ
@@ -7,17 +6,15 @@ module HQ
       class Object < ::GraphQL::Schema::Scalar
         description "Object"
 
-        class << self
-          extend T::Sig
-
-          def coerce_input(value, _context)
-            validate_and_return_object(value)
-          end
+        def self.coerce_input(value, _context)
+          validate_and_return_object(value)
+        end
 
-          def coerce_result(value, _context)
-            validate_and_return_object(value)
-          end
+        def self.coerce_result(value, _context)
+          validate_and_return_object(value)
+        end
 
+        class << self
           private
 
           def validate_and_return_object(value)
@@ -28,7 +25,6 @@ module HQ
             end
           end
 
-          sig { params(value: T.untyped).returns(T::Boolean) }
           def validate_object(value)
             value.is_a?(Hash)
           end

data/lib/hq/graphql/types/uuid.rb

@@ -1,4 +1,3 @@
-# typed: strict
 # frozen_string_literal: true
 
 module HQ
@@ -7,22 +6,17 @@ module HQ
       class UUID < ::GraphQL::Schema::Scalar
         description "UUID"
 
-        class << self
-          extend T::Sig
-
-          sig { params(value: T.untyped, _context: T.untyped).returns(String) }
-          def coerce_input(value, _context)
-            validate_and_return_uuid(value)
-          end
+        def self.coerce_input(value, _context)
+          validate_and_return_uuid(value)
+        end
 
-          sig { params(value: T.untyped, _context: T.untyped).returns(String) }
-          def coerce_result(value, _context)
-            validate_and_return_uuid(value)
-          end
+        def self.coerce_result(value, _context)
+          validate_and_return_uuid(value)
+        end
 
+        class << self
           private
 
-          sig { params(value: T.untyped).returns(String) }
           def validate_and_return_uuid(value)
             if validate_uuid(value)
               value
@@ -31,7 +25,6 @@ module HQ
             end
           end
 
-          sig { params(value: T.untyped).returns(T::Boolean) }
           def validate_uuid(value)
             !!value.to_s.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
           end

data/lib/hq/graphql/version.rb

@@ -1,8 +1,7 @@
-# typed: strong
 # frozen_string_literal: true
 
 module HQ
   module GraphQL
-    VERSION = "2.0.7"
+    VERSION = "2.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.1.1
 platform: ruby
 authors:
 - Danny Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.6
   type: :runtime
@@ -39,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.6
 - !ruby/object:Gem::Dependency
@@ -86,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: sorbet-runtime
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -254,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: sorbet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: OneHQ GraphQL Library
 email:
 - dpjones09@gmail.com
@@ -281,18 +247,25 @@ files:
 - lib/hq-graphql.rb
 - lib/hq/graphql.rb
 - lib/hq/graphql/active_record_extensions.rb
+- lib/hq/graphql/association_loader.rb
 - lib/hq/graphql/comparator.rb
 - lib/hq/graphql/config.rb
 - lib/hq/graphql/engine.rb
+- lib/hq/graphql/enum.rb
+- lib/hq/graphql/enum/sort_by.rb
+- lib/hq/graphql/enum/sort_order.rb
 - lib/hq/graphql/field.rb
+- lib/hq/graphql/field_extension/association_loader_extension.rb
+- lib/hq/graphql/field_extension/paginated_arguments.rb
+- lib/hq/graphql/field_extension/paginated_loader.rb
 - lib/hq/graphql/input_object.rb
 - lib/hq/graphql/inputs.rb
-- lib/hq/graphql/loaders.rb
-- lib/hq/graphql/loaders/association.rb
 - lib/hq/graphql/mutation.rb
 - lib/hq/graphql/object.rb
+- lib/hq/graphql/object_association.rb
+- lib/hq/graphql/paginated_association_loader.rb
 - lib/hq/graphql/resource.rb
-- lib/hq/graphql/resource/mutation.rb
+- lib/hq/graphql/resource/auto_mutation.rb
 - lib/hq/graphql/root_mutation.rb
 - lib/hq/graphql/root_query.rb
 - lib/hq/graphql/scalars.rb

data/lib/hq/graphql/loaders.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# typed: strict
-require "hq/graphql/loaders/association"

data/lib/hq/graphql/loaders/association.rb

@@ -1,52 +0,0 @@
-# typed: false
-# frozen_string_literal: true
-
-module HQ
-  module GraphQL
-    module Loaders
-      class Association < ::GraphQL::Batch::Loader
-        def initialize(model, association_name)
-          @model = model
-          @association_name = association_name
-          validate
-        end
-
-        def load(record)
-          raise TypeError, "#{@model} loader can't load association for #{record.class}" unless record.is_a?(@model)
-          return Promise.resolve(read_association(record)) if association_loaded?(record)
-          super
-        end
-
-        # We want to load the associations on all records, even if they have the same id
-        def cache_key(record)
-          record.object_id
-        end
-
-        def perform(records)
-          preload_association(records)
-          records.each { |record| fulfill(record, read_association(record)) }
-        end
-
-        private
-
-        def validate
-          unless @model.reflect_on_association(@association_name)
-            raise ArgumentError, "No association #{@association_name} on #{@model}"
-          end
-        end
-
-        def preload_association(records)
-          ::ActiveRecord::Associations::Preloader.new.preload(records, @association_name)
-        end
-
-        def read_association(record)
-          record.public_send(@association_name)
-        end
-
-        def association_loaded?(record)
-          record.association(@association_name).loaded?
-        end
-      end
-    end
-  end
-end

data/lib/hq/graphql/resource/mutation.rb

@@ -1,39 +0,0 @@
-# typed: false
-# frozen_string_literal: true
-
-module HQ
-  module GraphQL
-    module Resource
-      module Mutation
-        def self.build(model_name, action:, graphql_name:, require_primary_key: false, nil_klass: false, &block)
-          Class.new(::HQ::GraphQL::Mutation) do
-            graphql_name graphql_name
-
-            define_method(:ready?) do |*args|
-              super(*args) && ::HQ::GraphQL.authorized?(action, model_name, context)
-            end
-
-            lazy_load do
-              field :errors, ::HQ::GraphQL::Types::Object, null: false
-              field :resource, ::HQ::GraphQL::Types[model_name, nil_klass], null: true
-            end
-
-            instance_eval(&block)
-
-            if require_primary_key
-              lazy_load do
-                klass = model_name.constantize
-                primary_key = klass.primary_key
-                argument primary_key, ::GraphQL::Types::ID, required: true
-              end
-            end
-
-            def errors_from_resource(resource)
-              resource.errors.to_h.deep_transform_keys { |k| k.to_s.camelize(:lower) }
-            end
-          end
-        end
-      end
-    end
-  end
-end