souls 0.55.1 → 0.55.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73360700bdc37dfbecd749b27fc7130b74ab5e6b09964de3ef3a69b871ca3757
-  data.tar.gz: 7f541d2b5b3f2585e400870d8f10d9668c690823f06febfc82ecf993cf1b8e94
+  metadata.gz: e805c18e5e922c303e5adccdd50f1eea290de27488824feddff3379bbb8f2443
+  data.tar.gz: a620e8a36cae782adfd24bea8e3cd71319333a5e9c64ecdf18d5f91588a4d476
 SHA512:
-  metadata.gz: f3fb45003722268317046bf1d2888f92f402e27a9320d61ec0466131f281364ce4ffc6408b17b9abffc1d1fb46e923193dfd6f3753137e8b30bb51dea632e809
-  data.tar.gz: 2dbe0bb5b0be9f0430f932d3b83b9cc8708c12bdcfed6d31095c88afa67f18f9f1c0bcfb4c812056f5182de6dbad3546dc48e456f3e7ce52818a080137d5581b
+  metadata.gz: d185e3ac5e01a418113b6f460097148ecbd5e8524d03838f9a2de50cd4b45751137c9200c7a4dc0019da6211e3b3d86e43768a9c28da47a2d71a450832b1f098
+  data.tar.gz: 8b9feee800ab2ca6394a495a448650be3e18071a64de9e23c43c41828db77117ac1e4e70a5891fb1560f08e6144221431e73174c9bc5fc7f1a72164e19d6d24e

data/exe/souls

@@ -3,18 +3,7 @@ require "souls"
 require "thor"
 begin
   souls_command = ARGV[0]
-  require("./config/souls") unless [
-    "new",
-    "docker",
-    "-v",
-    "deploy",
-    "help",
-    "api",
-    "create",
-    "worker",
-    "",
-    nil
-  ].include?(souls_command)
+  require("./config/souls") unless ["new", "docker", "-v", "help", "", nil].include?(souls_command)
 rescue StandardError
   raise(StandardError, "No confif! Please make `./config/souls.rb` File!")
 end

data/lib/souls/api/generate/connection_rbs.rb

@@ -1,19 +1,24 @@
 module Souls
   class Generate < Thor
-    desc "connection [CLASS_NAME]", "Generate GraphQL Connection from schema.rb"
-    def connection(class_name)
-      file_dir = "./app/graphql/types/connections/"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      singularized_class_name = class_name.underscore.singularize
-      file_path = "./app/graphql/types/connections/#{singularized_class_name}_connection.rb"
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          class Types::#{singularized_class_name.camelize}Connection < Types::BaseConnection
-            edge_type(Types::#{singularized_class_name.camelize}Edge)
-          end
-        TEXT
+    desc "connection_rbs [CLASS_NAME]", "Generate GraphQL Connection RBS from schema.rb"
+    def connection_rbs(class_name)
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/types/connections/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        singularized_class_name = class_name.underscore.singularize
+        file_path = "#{file_dir}#{singularized_class_name}_connection_rbs.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Types
+              class #{singularized_class_name.camelize}Connection < Types::BaseConnection
+                def edge_type: (*untyped) -> untyped
+              end
+            end
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       end
-      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
       file_path
     rescue Thor::Error => e
       raise(Thor::Error, e)

data/lib/souls/api/generate/edge_rbs.rb

@@ -0,0 +1,30 @@
+module Souls
+  class Generate < Thor
+    desc "edge_rbs [CLASS_NAME]", "Generate GraphQL Edge RBS from schema.rb"
+    def edge_rbs(class_name)
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/types/edges/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        singularized_class_name = class_name.underscore.singularize
+        file_path = "#{file_dir}#{singularized_class_name}_edge_rbs.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Types
+              class #{singularized_class_name.camelize}Edge < BaseObject
+                def self.implements: (*untyped) -> untyped
+                def self.global_id_field: (*untyped) -> untyped
+                def self.field: (*untyped) -> untyped
+                def self.connection_type: ()-> untyped
+              end
+            end
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      end
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

data/lib/souls/api/generate/index.rb

@@ -1,5 +1,7 @@
 require_relative "./model"
+require_relative "./model_rbs"
 require_relative "./mutation"
+require_relative "./mutation_rbs"
 require_relative "./policy"
 require_relative "./query"
 require_relative "./resolver"
@@ -11,7 +13,9 @@ require_relative "./rspec_query"
 require_relative "./rspec_resolver"
 require_relative "./type"
 require_relative "./edge"
+require_relative "./edge_rbs"
 require_relative "./connection"
+require_relative "./connection_rbs"
 require_relative "./application"
 require_relative "./manager"
 

data/lib/souls/api/generate/model_rbs.rb

@@ -0,0 +1,26 @@
+module Souls
+  class Generate < Thor
+    desc "model_rbs [CLASS_NAME]", "Generate GraphQL Model RBS from schema.rb"
+    def model_rbs(class_name)
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/types/models/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        singularized_class_name = class_name.underscore.singularize
+        file_path = "#{file_dir}#{singularized_class_name}_model_rbs.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Types
+              class #{singularized_class_name.camelize} < ActiveRecord::Base
+              end
+            end
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      end
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

data/lib/souls/api/generate/mutation.rb

@@ -56,7 +56,8 @@ module Souls
                   new_line.write(<<-TEXT)
 
       def resolve args
-        args[:user_id] = context[:user].id
+        params = args.dup
+        params[:user_id] = context[:user][:id]
                   TEXT
                 else
                   new_line.write(<<-TEXT)
@@ -150,14 +151,15 @@ module Souls
                   new_line.write(<<-TEXT)
 
       def resolve args
-        args[:user_id] = context[:user].id
-        _, args[:id] = SoulsApiSchema.from_global_id(args[:id])
+        params = args.dup
+        params[:user_id] = context[:user][:id]
+        _, params[:id] = SoulsApiSchema.from_global_id(args[:id])
                   TEXT
                 else
                   new_line.write(<<-TEXT)
 
       def resolve args
-        _, args[:id] = SoulsApiSchema.from_global_id(args[:id])
+        _, params[:id] = SoulsApiSchema.from_global_id(args[:id])
                   TEXT
                 end
                 break
@@ -190,7 +192,7 @@ module Souls
       file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
       relation_params.each do |params_name|
         File.open(file_path, "a") do |new_line|
-          new_line.write("        _, args[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n")
+          new_line.write("        _, params[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n")
         end
       end
       true
@@ -200,9 +202,9 @@ module Souls
       file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
       File.open(file_path, "a") do |new_line|
         new_line.write(<<~TEXT)
-                  #{class_name} = ::#{class_name.camelize}.find args[:id]
-                  #{class_name}.update args
-                  { #{class_name}_edge: { node: ::#{class_name.camelize}.find(args[:id]) } }
+                  #{class_name} = ::#{class_name.camelize}.find params[:id]
+                  #{class_name}.update params
+                  { #{class_name}_edge: { node: ::#{class_name.camelize}.find(params[:id]) } }
                 rescue StandardError => error
                   GraphQL::ExecutionError.new(error.message)
                 end

data/lib/souls/api/generate/mutation_rbs.rb

@@ -0,0 +1,220 @@
+module Souls
+  class Generate < Thor
+    desc "mutation_rbs [CLASS_NAME]", "Generate GraphQL Mutation RBS from schema.rb"
+    def mutation_rbs(class_name)
+      singularized_class_name = class_name.underscore.singularize
+      create_rbs_mutation(class_name: singularized_class_name)
+      update_rbs_mutation(class_name: singularized_class_name)
+      delete_rbs_mutation(class_name: singularized_class_name)
+      destroy_delete_rbs_mutation(class_name: singularized_class_name)
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+
+    private
+
+    def create_rbs_mutation(class_name: "user")
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/create_#{class_name}_rbs.rbs"
+        raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
+
+        params = Souls.get_relation_params(class_name: class_name)
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            class Boolean
+            end
+            module Mutations
+              module Base
+                module #{class_name.camelize}
+                  class Create#{class_name.camelize} < BaseMutation
+                    String: String
+                    Boolean: Boolean
+                    Integer: Integer
+                    def resolve:  ({
+          TEXT
+        end
+        File.open(file_path, "a") do |f|
+          params[:params].each_with_index do |param, i|
+            type = Souls.rbs_type_check(param[:type])
+            type = "[#{type}]" if param[:array]
+            if i == params[:params].size - 1
+              f.write("                          #{param[:column_name]}: #{type}?\n")
+            else
+              f.write("                          #{param[:column_name]}: #{type}?,\n")
+            end
+          end
+        end
+        # rubocop:disable Layout/LineLength
+        File.open(file_path, "a") do |f|
+          f.write("                      }) -> ({ :#{class_name}_edge => { :node => String } } | ::GraphQL::ExecutionError )\n\n")
+        end
+        # rubocop:enable Layout/LineLength
+
+        File.open(file_path, "a") do |f|
+          params[:params].each_with_index do |param, i|
+            type = Souls.type_check(param[:type])
+            rbs_type = Souls.rbs_type_check(param[:type])
+            type = "[#{type}]" if param[:array]
+            if i.zero?
+              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+            else
+              f.write("                         | (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+            end
+          end
+        end
+
+        File.open(file_path, "a") do |f|
+          f.write(<<~TEXT)
+
+                    def self.field: (*untyped) -> String
+                    attr_accessor context: {user:{
+                      id: Integer,
+                      username: String,
+                      email: String
+                    }}
+                  end
+                end
+              end
+            end
+          TEXT
+        end
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+
+    def update_rbs_mutation(class_name: "user")
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/update_#{class_name}_rbs.rbs"
+        params = Souls.get_relation_params(class_name: class_name)
+        params[:params] << { column_name: "id", type: "string", array: false }
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Mutations
+              module Base
+                module #{class_name.camelize}
+                  class Update#{class_name.camelize} < BaseMutation
+                    def resolve:  ({
+          TEXT
+        end
+        File.open(file_path, "a") do |f|
+          params[:params].each_with_index do |param, i|
+            type = Souls.rbs_type_check(param[:type])
+            type = "[#{type}]" if param[:array]
+            if i == params[:params].size - 1
+              f.write("                          #{param[:column_name]}: #{type}?\n")
+            else
+              f.write("                          #{param[:column_name]}: #{type}?,\n")
+            end
+          end
+        end
+        # rubocop:disable Layout/LineLength
+        File.open(file_path, "a") do |f|
+          f.write("                      }) -> ({ :#{class_name}_edge => { :node => String } } | ::GraphQL::ExecutionError )\n\n")
+        end
+        # rubocop:enable Layout/LineLength
+
+        File.open(file_path, "a") do |f|
+          params[:params].each_with_index do |param, i|
+            type = Souls.type_check(param[:type])
+            rbs_type = Souls.rbs_type_check(param[:type])
+            type = "[#{type}]" if param[:array]
+            if i.zero?
+              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+            else
+              f.write("                         | (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+            end
+          end
+        end
+
+        File.open(file_path, "a") do |f|
+          f.write(<<~TEXT)
+
+                    def self.field: (*untyped) -> String
+                    attr_accessor context: {user:{
+                      id: Integer,
+                      username: String,
+                      email: String
+                    }}
+                  end
+                end
+              end
+            end
+          TEXT
+        end
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    end
+
+    def delete_rbs_mutation(class_name: "user")
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/delete_#{class_name}_rbs.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Mutations
+              module Base
+                module #{class_name.camelize}
+                  class Delete#{class_name.camelize}
+                    def resolve:  ({
+                                      id: String
+                                   }) -> ( Hash[Symbol, untyped] | ::GraphQL::ExecutionError )
+            #{'        '}
+                    def self.argument: (*untyped) -> String
+                    def self.field: (*untyped) -> String
+                  end
+                end
+              end
+            end
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      end
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+
+    def destroy_delete_rbs_mutation(class_name: "user")
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/mutations/base/#{class_name}"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/destroy_delete_#{class_name}_rbs.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Mutations
+              module Base
+                module #{class_name.camelize}
+                  class DestroyDelete#{class_name.camelize}
+                    def resolve:  ({
+                                      id: String
+                                   }) -> ( Hash[Symbol, untyped] | ::GraphQL::ExecutionError )
+            #{'        '}
+                    def self.argument: (*untyped) -> String
+                    def self.field: (*untyped) -> String
+                  end
+                end
+              end
+            end
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      end
+      file_path
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+  end
+end

data/lib/souls/cli.rb

@@ -44,15 +44,17 @@ module Souls
       puts(Souls::VERSION)
     end
 
-    desc "test", "Run (Rspec & steep check & Rubocop)"
+    desc "test", "Run Rspec & Rubocop"
     def test
       system("rubocop -A")
-      system("steep check")
       system("bundle exec rspec")
     end
 
-    desc "test_all", "Run Rspec & Rubocop"
+    desc "test_all", "Run (Rspec & steep check & Rubocop)"
     def test_all
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        system("steep check")
+      end
       system("rubocop -A")
       system("bundle exec rspec")
     end

data/lib/souls/utils/index.rb

@@ -21,6 +21,19 @@ module Souls
       }[type.to_sym]
     end
 
+    def rbs_type_check(type)
+      {
+        bigint: "Integer",
+        string: "String",
+        float: "Float",
+        text: "String",
+        datetime: "String",
+        date: "String",
+        boolean: "bool",
+        integer: "Integer"
+      }[type.to_sym]
+    end
+
     def get_type_and_name(line)
       line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
     end
@@ -98,13 +111,25 @@ module Souls
       end
     end
 
+    def get_relation_params(class_name: "user")
+      cols = get_columns_num(class_name: class_name)
+      relation_params = cols.select { |col| col[:column_name].match?(/_id$/) }
+      user_check =
+        relation_params.map do |param|
+          param[:column_name] == "user_id"
+        end
+      user_exist = user_check.include?(true)
+      { user_exist: user_exist, params: cols, relation_params: relation_params }
+    end
+
     def get_columns_num(class_name: "user")
+      pluralized_class_name = class_name.pluralize
       file_path = "./db/schema.rb"
       class_check_flag = false
       cols = []
       File.open(file_path, "r") do |f|
         f.each_line.with_index do |line, _i|
-          class_check_flag = true if line.include?("create_table") && line.include?(class_name)
+          class_check_flag = true if line.include?("create_table") && line.include?(pluralized_class_name)
           if class_check_flag == true && !line.include?("create_table")
             return cols if line.include?("t.index") || line.strip == "end"
 

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "0.55.1".freeze
+  VERSION = "0.55.5".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.34.1
+0.34.5

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.34.1
+0.34.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.55.1
+  version: 0.55.5
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -131,10 +131,13 @@ files:
 - lib/souls/api/generate/connection.rb
 - lib/souls/api/generate/connection_rbs.rb
 - lib/souls/api/generate/edge.rb
+- lib/souls/api/generate/edge_rbs.rb
 - lib/souls/api/generate/index.rb
 - lib/souls/api/generate/manager.rb
 - lib/souls/api/generate/model.rb
+- lib/souls/api/generate/model_rbs.rb
 - lib/souls/api/generate/mutation.rb
+- lib/souls/api/generate/mutation_rbs.rb
 - lib/souls/api/generate/policy.rb
 - lib/souls/api/generate/query.rb
 - lib/souls/api/generate/resolver.rb