graphql-rails-api 0.7.5 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be9e058e2a7ae159b7a92a033421fca0ec479cef7bd59a31519fb1c13ec4b553
-  data.tar.gz: 13f8555992be67e1491aebcfeb25b8cb995dcb8906b28d27d32f2a5985f3e34b
+  metadata.gz: c1751d6f6ae5edf98341bdf30a149cd8aa9ab4dbcb0a627cb25c380cfe15c676
+  data.tar.gz: 90c9dc17368d908efb70a8ee55837c3d6b117709762c006eaee18ddcd3a820ff
 SHA512:
-  metadata.gz: d4a6e96f941bdb060b1c1e613a1318938fcd11289fd60995500ea0ba46235ef7889e601d200f02a34a7fdfc3e0f24297ac1fe208bde429d1ef089a42eb71ee98
-  data.tar.gz: a935282ed62517179e467d7cf5b74605c9088336993894ef7b3b90d2db4ca02d59999f0707bd76fbf9508d40fb7eb651640c14860326dd5aac54c6b853af8926
+  metadata.gz: 98cd97012f608dea85e6a5417a4d1ab83ddf3cdae9a51473a014a3c4d45769ce928301a9e57ab32a9c65a76df5e3687cead2046e57a829da18a1309ecfc7ff06
+  data.tar.gz: d297e02228b4a00c81a9f29eef88c92da12a23698e9e2dc3aa9eab52c3ccf97a471c04aa134d9cb11bb516bc1d2446464ba9b69b8cc0be8d1f84d465deaa2a91

data/README.md

@@ -2,8 +2,7 @@
 
 `graphql-rails-api` is a gem that provides generators to describe easily your graphql API in a domain driven design way.
 
-Need any help or wanna talk with me about it on slack ? Don't hesitate, 
-https://bit.ly/2KvV8Pk
+Need any help or wanna talk with me about it on discord : Poilon#5412
 
 ## Installation
 
@@ -17,7 +16,6 @@ rails db:create
 
 Add these lines to your application's Gemfile:
 ```ruby
-gem 'graphql'
 gem 'graphql-rails-api'
 ```
 

data/lib/generators/graphql_add_fields/graphql_add_fields_generator.rb

@@ -245,10 +245,10 @@ t.#{@id_db_type} :#{resource.underscore.singularize}_id
     file_name = "app/models/#{model.underscore.singularize}.rb"
     return if !File.exist?(file_name) || File.read(file_name).include?(line)
 
-    line_count = `wc -l "#{file_name}"`.strip.split(' ')[0].to_i
-
+    file = open(file_name)
+    line_count = file.readlines.size
     line_nb = 0
-    File.open(file_name).each do |l|
+    file.each do |l|
       line_nb += 1
       break if l.include?('ApplicationRecord')
     end

data/lib/generators/graphql_all_connections/graphql_all_connections_generator.rb

@@ -8,6 +8,7 @@ class GraphqlAllConnectionsGenerator < Rails::Generators::NamedBase
   end
 
   def generate_connection(dir, resource)
+    FileUtils.mkdir_p(dir) unless File.directory?(dir)
     File.write(
       "#{dir}/connection.rb",
       <<~STRING

data/lib/generators/graphql_mutations/graphql_mutations_generator.rb

@@ -3,7 +3,7 @@ class GraphqlMutationsGenerator < Rails::Generators::NamedBase
   def generate
     resource = file_name.underscore.singularize
     dir = "app/graphql/#{resource.pluralize}/mutations"
-    system("mkdir -p #{dir}")
+    FileUtils.mkdir_p(dir) unless File.directory?(dir)
     generate_create_mutation(dir, resource)
     generate_update_mutation(dir, resource)
     generate_destroy_mutation(dir, resource)

data/lib/generators/graphql_rails_api/install_generator.rb

@@ -8,14 +8,17 @@ module GraphqlRailsApi
 
     def generate_files
       @app_name = File.basename(Rails.root.to_s).underscore
-      system('mkdir -p app/graphql/')
-
+      
+      folder = 'app/graphql/'
+      FileUtils.mkdir_p(folder) unless File.directory?(folder)
+       
       write_uuid_extensions_migration
 
       write_service
       write_schema
       write_query_type
       write_mutation_type
+      write_collection_ids_resolver
 
       write_controller
 
@@ -52,6 +55,25 @@ module GraphqlRailsApi
       )
     end
 
+    def write_collection_ids_resolver
+      File.write(
+        'app/graphql/collection_ids_resolver.rb',
+        <<~STRING
+          class CollectionIdsResolver
+
+            def self.call(obj, _args, ctx)
+              if obj.is_a?(OpenStruct)
+                obj[ctx.field.name.gsub('_ids', '').pluralize]&.map(&:id)
+              else
+                obj.send(ctx.field.name)
+              end
+            end
+
+          end
+        STRING
+      )
+    end
+
     def write_application_record_methods
       lines_count = File.read('app/models/application_record.rb').lines.count
 

data/lib/generators/graphql_resource/graphql_resource_generator.rb

@@ -103,7 +103,7 @@ class GraphqlResourceGenerator < Rails::Generators::NamedBase
   end
 
   def generate_basic_mutations(resource)
-    system("mkdir -p #{@mutations_directory}")
+    FileUtils.mkdir_p(@mutations_directory) unless File.directory?(@mutations_directory)
     system("rails generate graphql_mutations #{resource}")
 
     # Graphql Input Type
@@ -126,7 +126,8 @@ class GraphqlResourceGenerator < Rails::Generators::NamedBase
   end
 
   def generate_graphql_input_type(resource)
-    system("mkdir -p #{@mutations_directory}")
+    FileUtils.mkdir_p(@mutations_directory) unless File.directory?(@mutations_directory)
+
     File.write(
       "#{@mutations_directory}/input_type.rb",
       <<~STRING
@@ -241,6 +242,9 @@ class GraphqlResourceGenerator < Rails::Generators::NamedBase
   end
 
   def generate_service(resource)
+     
+    FileUtils.mkdir_p("app/graphql/#{resource.pluralize}/") unless File.directory?("app/graphql/#{resource.pluralize}/")
+     
     File.write(
       "app/graphql/#{resource.pluralize}/service.rb",
       <<~STRING
@@ -308,13 +312,13 @@ t.#{@id_db_type} :#{resource.underscore.singularize}_id
   end
 
   def add_to_model(model, line)
-    file_name = "app/models/#{model.underscore.singularize}.rb"
+    file_name = File.join("app","models","#{model.underscore.singularize}.rb")
     return if !File.exist?(file_name) || File.read(file_name).include?(line)
 
-    line_count = `wc -l "#{file_name}"`.strip.split(' ')[0].to_i
-
+    file = open(file_name)
+    line_count = file.readlines.size
     line_nb = 0
-    File.open(file_name).each do |l|
+    file.each do |l|
       line_nb += 1
       break if l.include?('ApplicationRecord')
     end

data/lib/graphql/hydrate_query.rb

@@ -4,37 +4,110 @@ require 'rkelly'
 module Graphql
   class HydrateQuery
 
-    def initialize(model, context, order_by: nil, filter: nil, id: nil, user: nil, page: nil, per_page: 10)
+    def initialize(model, context, order_by: nil, filter: nil, check_visibility: true, id: nil, user: nil, page: nil, per_page: nil)
       @context = context
       @filter = filter
       @order_by = order_by
       @model = model
       @models = [model_name.singularize.camelize]
+      @check_visibility = check_visibility
       @id = id
       @user = user
-      @page = page
-      @per_page = per_page
+      @page = page || 1
+      @per_page = per_page || 1000
     end
 
     def run
-      @model = @model.where(transform_filter(@filter)) if @filter
-      @model = @model.order(@order_by) if @order_by
-
-      @model = @model.limit(@per_page) if @per_page
-      @model = @model.offset(@per_page * (@page - 1)) if @page
-
-      @model = @model.where(id: @id) if @id
-      plucked = DeepPluck::Model.new(@model.visible_for(user: @user), user: @user).add(
-        hash_to_array_of_hashes(parse_fields(@context&.irep_node), @model)
-      ).load_all
-      result = plucked_attr_to_structs(plucked, model_name.singularize.camelize.constantize)&.compact
-      @id ? result.first : result
+      if @id
+        @model = @model.where(id: @id)
+        deep_pluck_to_structs(@context&.irep_node).first
+      else
+        @model = @model.limit(@per_page)
+        @model = @model.offset(@per_page * (@page - 1))
+        filter_and_order
+        deep_pluck_to_structs(@context&.irep_node)
+      end
+    end
+
+    def paginated_run
+      filter_and_order
+
+      @total = @model.length
+      @model = @model.limit(@per_page)
+      @model = @model.offset(@per_page * (@page - 1))
+
+      ::Rails.logger.info(@model.to_sql)
+      OpenStruct.new(
+        data: deep_pluck_to_structs(@context&.irep_node&.typed_children&.values&.first.try(:[], 'data')),
+        total_count: @total,
+        per_page: @per_page,
+        page: @page
+      )
+    end
+
+    private
+
+    def filter_and_order
+      if @filter
+        transformed_filter = transform_filter(@filter)
+        to_join = transformed_filter.split(/AND|OR|like|ilike/).map do |expression|
+          expression.strip.split(/!=|=|IS/).first.strip
+        end.select { |e| e.include?('.') }.map { |e| e.split('.').first }.map(&:to_sym)
+        to_join.reject { |j| j.to_s.pluralize.to_sym == @model.klass.to_s.pluralize.underscore.to_sym }.each do |j|
+          @model = @model.left_joins(j).distinct
+        end
+        transformed_filter = transformed_filter.split(/(AND|OR|like|ilike)/).map do |e|
+          arr = e.split(/(!=|=|IS)/)
+          if arr.first.include?('.')
+            arr.first.split('.').first.pluralize + '.' + arr.first.split('.').last + arr[1].to_s + arr[2].to_s
+          else
+            arr.join
+          end
+        end.join
+        @model = @model.where(transformed_filter)
+      end
+
+      return unless @order_by
+
+      sign = @order_by.split(' ').last.downcase == 'desc' ? 'desc' : 'asc'
+      column = @order_by.split(' ').first
+      if column.include?('.')
+        @model = @model.left_joins(column.split('.').first.to_sym)
+        string_type = %i[string text].include?(
+          evaluate_model(@model, column.split('.').first).columns_hash[column.split('.').last]&.type
+        )
+
+        @to_select_to_add = if string_type
+                              "upper(#{column.split('.').first.pluralize}.#{column.split('.').last})"
+                            else
+                              column.split('.').first.pluralize + '.' + column.split('.').last
+                            end
+        @model = @model.select(@to_select_to_add)
+        column = "#{column.split('.').first.pluralize}.#{column.split('.').last}"
+        @model = @model.order(Arel.sql("#{string_type ? "upper(#{column})" : column} #{sign}"))
+      elsif @order_by
+        column = "upper(#{model_name}.#{column})" if %i[string text].include?(@model.columns_hash[column]&.type)
+        @model = @model.order("#{column} #{sign}")
+      end
     end
 
     def transform_filter(filter)
-      parsed_filter = RKelly::Parser.new.parse(filter.gsub('like', ' | ')).to_ecma
-      parsed_filter.gsub(' | ', ' like ').
-        gsub('||', 'OR').gsub('&&', 'AND').gsub('===', '=').gsub('==', '=').delete(';')
+      parsed_filter = RKelly::Parser.new.parse(filter.gsub('like', ' | '))&.to_ecma
+      return '' unless parsed_filter
+
+      @model.klass.defined_enums.values.reduce(:merge)&.each { |k, v| parsed_filter.gsub!("= #{k}", "= #{v}") }
+      parsed_filter.gsub(' | ', ' ilike ').gsub('||', 'OR').gsub('&&', 'AND').gsub('===', '=').gsub('==', '=').gsub(
+        '!= null', 'IS NOT NULL'
+      ).gsub('= null', 'IS NULL').delete(';')
+    end
+
+    def deep_pluck_to_structs(irep_node)
+      plucked_attr_to_structs(
+        DeepPluck::Model.new(@model.visible_for(user: @user), user: @user).add(
+          ((hash_to_array_of_hashes(parse_fields(irep_node), @model) || []) + [@to_select_to_add]).compact
+        ).load_all,
+        model_name.singularize.camelize.constantize
+      )&.compact
     end
 
     def plucked_attr_to_structs(arr, parent_model)
@@ -104,9 +177,7 @@ module Graphql
 
     def parse_fields(irep_node)
       fields = irep_node&.scoped_children&.values&.first
-      if fields.key?('edges')
-        fields = fields['edges'].scoped_children.values.first['node']&.scoped_children&.values&.first
-      end
+      fields = fields['edges'].scoped_children.values.first['node']&.scoped_children&.values&.first if fields&.key?('edges')
       return if fields.blank?
 
       fields.each_with_object({}) do |(k, v), h|

data/lib/graphql/rails/api/version.rb

@@ -1,7 +1,7 @@
 module Graphql
   module Rails
     module Api
-      VERSION = '0.7.5'.freeze
+      VERSION = '0.9.1'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails-api
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.9.1
 platform: ruby
 authors:
 - poilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rkelly-remix
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Graphql rails api framework to create easily graphql api with rails