graphiti_gql 0.2.33 → 0.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b3af9f398319f335154dfffbf0eb8b13987a7ce7860bfaf273b18361715a57
-  data.tar.gz: e2c2e261a65e161817ed1f1a6aca5d07324dce1df984e37c2a40c18694d6fc27
+  metadata.gz: 5e404a080bb36a50e41942d18eadaa0813c92eef0c965adf07dcddb80218b151
+  data.tar.gz: 20f073ab99227e37bdf357511b58e96172994682d5d3dcd881abdb8d4f1a2bca
 SHA512:
-  metadata.gz: 9f0cc9d62355cbf98382b1af4f0085fca190a19546be02d8d17e4bd7d93f548964f5716a13f2acc47083484ea386df604e845776bfd76dc2dbd22a44898d1605
-  data.tar.gz: 68f697d8c75a8787a9ee23dd0263a96df8bfd70e873015e67f43c34ec7d84e9bf1b07e51766ae550fb503d19cd810a9b014d273902ad0cce2e65dc054d87bb5e
+  metadata.gz: ba6307b54c651e5367555290ee756db75c3c0a9f6504167f16968d564b88bdd6fb5c7d7e8cc73982d321157ad59039688d107f834ab61078b350783e16259a5d
+  data.tar.gz: 1c3e2611f9fd313097b807b0b09082d037c34a9ffc87ce749b36b3283a9d98c428374fa64d1e4eca4d0c47b9918b2f9738b4e1054177c55e9e881ff6eda9c457

data/lib/graphiti_gql/engine.rb

@@ -2,10 +2,7 @@ module GraphitiGql
   class Engine < ::Rails::Engine
     isolate_namespace GraphitiGql
 
-    config.to_prepare do
-      Dir.glob("#{Rails.root}/app/resources/**/*").each { |f| require(f) }
-      GraphitiGql.schema!
-
+    config.after_initialize do
       log_level = ENV.fetch('GRAPHITI_LOG_LEVEL', '1').to_i
       log_activerecord = false
       if log_level == -1 && defined?(ActiveRecord)

data/lib/graphiti_gql/graphiti_hax.rb

@@ -128,13 +128,21 @@ module GraphitiGql
         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]
         end
       end
 
+      def sort(name, *args, &blk)
+        super
+        opts = args.extract_options!
+        if opts[:schema] == false
+          config[:sorts][name][:schema] = false
+        end
+      end
+
       def filter_group(filter_names, *args)
         if filter_names.blank?
           config[:grouped_filters] = {}
@@ -297,7 +305,7 @@ module GraphitiGql
         attr_reader :join_table_alias, :edge_magic, :edge_resource
       end
     end
-    
+
     def initialize(name, opts = {})
       @join_table_alias = opts[:join_table_alias]
       @edge_magic = opts[:edge_magic] == false ? false : true
@@ -439,7 +447,7 @@ module GraphitiGql
       clause = {attribute => value}
       is_not ? scope.where.not(clause) : scope.where(clause)
     end
- 
+
     def sanitized_like_for(scope, attribute, value, &block)
       escape_char = "\\"
       column = column_for(scope, attribute)
@@ -501,7 +509,7 @@ module GraphitiGql
       hash
     end
   end
-  
+
   Graphiti::Query.send(:prepend, QueryExtras)
   module ScopeExtras
     def initialize(object, resource, query, opts = {})
@@ -607,4 +615,4 @@ module Graphiti
     level ||= :debug
     logger.send(level, colored)
   end
-end
+end

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

@@ -4,6 +4,7 @@ module GraphitiGql
       class ToMany
         def initialize(sideload, sideload_type)
           @sideload = sideload
+          @sideload_resource = Schema.registry.get(sideload.resource.class)[:resource]
           @sideload_type = sideload_type
           @connection_type = find_or_build_connection
         end
@@ -19,9 +20,9 @@ module GraphitiGql
             field_type,
             **opts
           unless has_one?
-            field.extension(RelayConnectionExtension, resource: @sideload.resource.class)
+            field.extension(RelayConnectionExtension, resource: @sideload_resource)
           end
-          ListArguments.new(@sideload.resource.class, @sideload).apply(field)
+          ListArguments.new(@sideload_resource, @sideload).apply(field)
           _sideload = @sideload
           type.define_method(@sideload.name) do |**arguments|
             Util.is_readable_sideload!(_sideload)

data/lib/graphiti_gql/schema/list_arguments.rb

@@ -14,7 +14,7 @@ module GraphitiGql
 
       def apply(field)
         define_filters(field) unless @resource.filters.empty?
-        define_sorts(field) unless @resource.sorts.empty?
+        define_sorts(field) unless sorts.empty?
       end
 
       private
@@ -39,7 +39,7 @@ module GraphitiGql
         required = true if @resource.grouped_filters.any? && !@sideload
         field.argument :filter, filter_type, required: required
       end
-    
+
       def generate_filter_type(field)
         type_name = "#{registry.key_for(@resource)}Filter"
         if (registered = registry[type_name])
@@ -65,7 +65,7 @@ module GraphitiGql
         registry[type_name] = { type: klass }
         klass
       end
-    
+
       def generate_filter_attribute_type(type_name, filter_name, filter_config)
         klass = Class.new(GraphQL::Schema::InputObject)
         filter_graphql_name = "#{type_name}Filter#{filter_name.to_s.camelize(:lower)}"
@@ -82,13 +82,13 @@ module GraphitiGql
           if (allowlist = filter_config[:allow])
             type = define_allowlist_type(filter_graphql_name, allowlist)
           end
-  
+
           type = [type] unless !!filter_config[:single]
           klass.argument operator, type, required: false
         end
         klass
       end
-    
+
       def define_allowlist_type(filter_graphql_name, allowlist)
         name = "#{filter_graphql_name}Allow"
         if (registered = registry[name])
@@ -103,6 +103,12 @@ module GraphitiGql
         klass
       end
 
+      def sorts
+        @resource.sorts.reject do |key, value|
+          value[:schema] == false
+        end
+      end
+
       def define_sorts(field)
         sort_type = generate_sort_type
         field.argument :sort, [sort_type], required: false
@@ -116,13 +122,13 @@ module GraphitiGql
         klass = Class.new(GraphQL::Schema::Enum) {
           graphql_name(type_name)
         }
-        @resource.sorts.each_pair do |name, config|
+        sorts.each_pair do |name, config|
           klass.value name.to_s.camelize(:lower), "Sort by #{name}"
         end
         registry[type_name] = { type: klass }
         klass
       end
-  
+
       def generate_sort_type
         type_name = "#{registry.key_for(@resource)}Sort"
         if (registered = registry[type_name])
@@ -139,4 +145,4 @@ module GraphitiGql
       end
     end
   end
-end
+end

data/lib/graphiti_gql/schema/query.rb

@@ -8,10 +8,7 @@ module GraphitiGql
       end
 
       def build
-        @resources.each { |resource| ResourceType.new(resource).build }
         define_entrypoints
-        add_value_objects
-        add_relationships
         @query_class
       end
 
@@ -29,20 +26,6 @@ module GraphitiGql
           end
         end
       end
-
-      def add_relationships
-        registry.resource_types.each do |registered|
-          resource, type = registered[:resource], registered[:type]
-          ResourceType.add_relationships(resource, type)
-        end
-      end
-
-      def add_value_objects
-        registry.resource_types(value_objects: false).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.rb

@@ -102,8 +102,25 @@ module GraphitiGql
       @resources = resources
     end
 
+    def self.resource_types!
+      resources = Graphiti.resources.reject(&:abstract_class?)
+      resources.each { |resource| ResourceType.new(resource).build }
+      # add relationships
+      registry.resource_types.each do |registered|
+        resource, type = registered[:resource], registered[:type]
+        ResourceType.add_relationships(resource, type)
+      end
+      # add_value_objects
+      registry.resource_types(value_objects: false).each do |registered|
+        resource, type = registered[:resource], registered[:type]
+        ResourceType.add_value_objects(resource, type)
+      end
+    end
+
     def generate
-      klass = Class.new(::GraphQL::Schema)
+      klass = Class.new(::GraphitiGql.config.base_schema || ::GraphQL::Schema)
+      return if klass.query
+      # TODO inherit from klass.query if exists
       klass.query(Query.new(@resources).build)
       klass.use(GraphQL::Batch)
       klass.connections.add(ResponseShim, Connection)

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.33"
+  VERSION = "0.2.35"
 end

data/lib/graphiti_gql.rb

@@ -35,7 +35,10 @@ module GraphitiGql
   class Error < StandardError; end
 
   class Configuration
-    attr_accessor :exception_handler, :error_handling, :logging
+    attr_accessor :base_schema,
+      :exception_handler,
+      :error_handling,
+      :logging
 
     def exception_handler
       @exception_handler ||= ExceptionHandler
@@ -51,13 +54,12 @@ module GraphitiGql
   end
 
   def self.schema!
-    Schema::Registry.instance.clear
     resources ||= Graphiti.resources.reject(&:abstract_class?)
     @schema = Schema.new(resources).generate
   end
 
   def self.schema
-    @schema
+    @schema ||= schema!
   end
 
   def self.config

metadata

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