souls 0.55.5 → 0.56.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e805c18e5e922c303e5adccdd50f1eea290de27488824feddff3379bbb8f2443
-  data.tar.gz: a620e8a36cae782adfd24bea8e3cd71319333a5e9c64ecdf18d5f91588a4d476
+  metadata.gz: e5360bb3d20a6a1f91eda45b66406933ed4bcaf0d96a2399b422253aab666414
+  data.tar.gz: 1b4c4b01fbb83c71c750ffb473d6d98217b2475c3d19fe6f2303ce3966048145
 SHA512:
-  metadata.gz: d185e3ac5e01a418113b6f460097148ecbd5e8524d03838f9a2de50cd4b45751137c9200c7a4dc0019da6211e3b3d86e43768a9c28da47a2d71a450832b1f098
-  data.tar.gz: 8b9feee800ab2ca6394a495a448650be3e18071a64de9e23c43c41828db77117ac1e4e70a5891fb1560f08e6144221431e73174c9bc5fc7f1a72164e19d6d24e
+  metadata.gz: 5414a53f3bef877e03f5bb0ecbb5325c88378349a4c3c267609080e7363efd64ce68b750d00b775aba7e7c4948a514c61d247fe3da4dab58655e4075f25ecde9
+  data.tar.gz: 6ea321a597b311e4019c92f246a803d40b6264e223ac3152ad73100a181542dc406c9b10d344bd1259c5d3679eab6beb4a6557129ceff59c6405b83fe44cec77

data/README.md

@@ -84,7 +84,7 @@ And Create Your APP
 
 Check your GraphQL PlayGround
 
-(localhost:4000/playground)[localhost:4000/playground]
+[localhost:4000/playground](localhost:4000/playground)
 
 ## Gemfile 自動更新アップデート
 

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

@@ -4,18 +4,26 @@ module Souls
     def scaffold(class_name)
       singularized_class_name = class_name.singularize
       model(singularized_class_name)
+      model_rbs(singularized_class_name)
       type(singularized_class_name)
+      type_rbs(singularized_class_name)
+      query(singularized_class_name)
+      query_rbs(singularized_class_name)
+      mutation(singularized_class_name)
+      mutation_rbs(singularized_class_name)
+      policy(singularized_class_name)
+      policy_rbs(singularized_class_name)
       edge(singularized_class_name)
+      edge_rbs(singularized_class_name)
       connection(singularized_class_name)
+      connection_rbs(singularized_class_name)
       resolver(singularized_class_name)
+      resolver_rbs(singularized_class_name)
       rspec_factory(singularized_class_name)
       rspec_model(singularized_class_name)
       rspec_mutation(singularized_class_name)
       rspec_query(singularized_class_name)
       rspec_resolver(singularized_class_name)
-      query(singularized_class_name)
-      mutation(singularized_class_name)
-      policy(singularized_class_name)
       rspec_policy(singularized_class_name)
       true
     rescue Thor::Error => e

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

@@ -7,7 +7,7 @@ module Souls
         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_path = "#{file_dir}#{singularized_class_name}_connection.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             module Types

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

@@ -7,7 +7,7 @@ module Souls
         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_path = "#{file_dir}#{singularized_class_name}_edge.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             module Types

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

@@ -1,30 +1,13 @@
-require_relative "./model"
-require_relative "./model_rbs"
-require_relative "./mutation"
-require_relative "./mutation_rbs"
-require_relative "./policy"
-require_relative "./query"
-require_relative "./resolver"
-require_relative "./rspec_factory"
-require_relative "./rspec_model"
-require_relative "./rspec_mutation"
-require_relative "./rspec_policy"
-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"
+require_paths = []
+dev_path = "lib/souls/api/generate/*"
+souls_path = Dir["#{Gem.dir}/gems/souls-*"].last
+gem_path = "#{souls_path}/lib/souls/api/generate/*"
+file_paths = File.exist?("souls.gemspec") ? dev_path : gem_path
+Dir[file_paths].map do |n|
+  next if n.include?("index.rb")
 
-# require_paths = []
-# Dir["lib/souls/api/generate/*"].map do |n|
-#   next if n.include?("index.rb")
-
-#   require_paths << n.split("/").last.gsub(".rb", "")
-# end
-# require_paths.each do |path|
-#   require_relative "./#{path}"
-# end
+  require_paths << n.split("/").last.gsub(".rb", "")
+end
+require_paths.each do |path|
+  require_relative "./#{path}"
+end

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

@@ -7,7 +7,7 @@ module Souls
         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_path = "#{file_dir}#{singularized_class_name}_model.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             module Types

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

@@ -18,10 +18,10 @@ module Souls
       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"
+        file_path = "#{file_dir}/create_#{class_name}.rbs"
         raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
 
-        params = Souls.get_relation_params(class_name: class_name)
+        params = Souls.get_relation_params(class_name: class_name, col: "mutation")
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             class Boolean
@@ -93,8 +93,8 @@ module Souls
       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)
+        file_path = "#{file_dir}/update_#{class_name}.rbs"
+        params = Souls.get_relation_params(class_name: class_name, col: "mutation")
         params[:params] << { column_name: "id", type: "string", array: false }
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
@@ -160,7 +160,7 @@ module Souls
       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_path = "#{file_dir}/delete_#{class_name}.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             module Mutations
@@ -191,7 +191,7 @@ module Souls
       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_path = "#{file_dir}/destroy_delete_#{class_name}.rbs"
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
             module Mutations

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

@@ -0,0 +1,35 @@
+module Souls
+  class Generate < Thor
+    desc "policy_rbs [CLASS_NAME]", "Generate Policy RBS"
+    def policy_rbs(class_name)
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/types/policies/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        singularized_class_name = class_name.underscore.singularize
+        file_path = "#{file_dir}#{singularized_class_name}_policy.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            class #{singularized_class_name.camelize}Policy
+              @user: untyped
+
+              def show?: -> true
+              def index?: -> true
+              def create?: -> bool
+              def update?: -> bool
+              def delete?: -> bool
+
+              private
+              def user_permissions?: -> untyped
+              def admin_permissions?: -> untyped
+            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/query_rbs.rb

@@ -0,0 +1,67 @@
+module Souls
+  class Generate < Thor
+    desc "query_rbs [CLASS_NAME]", "Generate GraphQL Query RBS"
+    def query_rbs(class_name)
+      single_query_rbs(class_name)
+      queries_rbs(class_name)
+    end
+
+    private
+
+    def single_query_rbs(class_name)
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/queries/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        singularized_class_name = class_name.underscore.singularize
+        file_path = "#{file_dir}#{singularized_class_name}.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Queries
+              class BaseQuery
+              end
+              class #{singularized_class_name.camelize} < Queries::BaseQuery
+                def resolve:  ({
+                                id: String?
+                              }) -> ( Hash[Symbol, ( String | Integer | bool )] | ::GraphQL::ExecutionError )
+
+                def self.argument: (*untyped) -> String
+                def self.type: (*untyped) -> String
+              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 queries_rbs(class_name)
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/queries/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        pluralized_class_name = class_name.underscore.pluralize
+        file_path = "#{file_dir}#{pluralized_class_name}.rbs"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Queries
+              class BaseQuery
+              end
+              class #{pluralized_class_name.camelize} < Queries::BaseQuery
+                def resolve:  () -> ( Hash[Symbol, ( String | Integer | bool )] | ::GraphQL::ExecutionError)
+                def self.type: (*untyped) -> String
+              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/resolver_rbs.rb

@@ -0,0 +1,67 @@
+module Souls
+  class Generate < Thor
+    desc "resolver_rbs [CLASS_NAME]", "Generate GraphQL Resolver RBS from schema.rb"
+    def resolver_rbs(class_name)
+      singularized_class_name = class_name.underscore.singularize
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/resolvers"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/#{singularized_class_name}_search.rbs"
+        raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
+
+        params = Souls.get_relation_params(class_name: singularized_class_name)
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            class Base
+            end
+            class #{singularized_class_name.camelize}Search < Base
+              def self.scope: () ?{ () -> nil } -> [Hash[Symbol, untyped]]
+              def self.type: (*untyped) -> String
+              def self.option: (:filter, type: untyped, with: :apply_filter) -> String
+                              | (:first, type: untyped, with: :apply_first) -> String
+                              | (:skip, type: untyped, with: :apply_skip) -> String
+              def self.description: (String) -> String
+              def self.types: (*untyped) -> String
+              def decode_global_key: (String value) -> Integer
+              def apply_filter: (untyped scope, untyped value) -> untyped
+              def normalize_filters: (untyped value, ?Array[untyped] branches) -> Array[untyped]
+
+              class #{singularized_class_name.camelize}Filter
+                String: String
+                Boolean: Boolean
+                Integer: Integer
+          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]
+            rbs_type = Souls.rbs_type_check(param[:type])
+            if i.zero?
+              f.write("    def self.argument: (:OR, [self], required: false) -> String\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)
+                end
+              end
+            end
+            module Types
+              class BaseBaseInputObject
+              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
+  end
+end

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

@@ -0,0 +1,50 @@
+module Souls
+  class Generate < Thor
+    desc "type_rbs [CLASS_NAME]", "Generate GraphQL Type RBS from schema.rb"
+    def type_rbs(class_name)
+      singularized_class_name = class_name.underscore.singularize
+      file_path = ""
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        file_dir = "./sig/api/app/graphql/types"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/#{singularized_class_name}_type.rbs"
+        raise(Thor::Error, "Type RBS already exist! #{file_path}") if File.exist?(file_path)
+
+        params = Souls.get_relation_params(class_name: singularized_class_name)
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            module Types
+              class #{singularized_class_name.camelize}Type < BaseObject
+                def self.implements: (*untyped) -> untyped
+                def self.global_id_field: (:id) -> String
+          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]
+            rbs_type = Souls.rbs_type_check(param[:type])
+            if i.zero?
+              f.write("    def self.field: (:#{param[:column_name]}, #{type}, null: false) -> #{rbs_type}\n")
+            else
+              f.write("                  | (:#{param[:column_name]}, #{type}, null: false) -> #{rbs_type}\n")
+            end
+          end
+        end
+
+        File.open(file_path, "a") do |f|
+          f.write(<<~TEXT)
+              def self.edge_type: () -> void
+                def self.connection_type: () -> void
+              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
+  end
+end

data/lib/souls/utils/index.rb

@@ -111,15 +111,23 @@ 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 }
+    def get_relation_params(class_name: "user", col: "")
+      require("#{Souls.get_api_path}/config/souls")
+      Dir.chdir(Souls.get_api_path.to_s) do
+        cols =
+          if col == "mutation"
+            get_columns_num_no_timestamp(class_name: class_name)
+          else
+            get_columns_num(class_name: class_name)
+          end
+        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)
+        return { user_exist: user_exist, params: cols, relation_params: relation_params }
+      end
     end
 
     def get_columns_num(class_name: "user")
@@ -142,6 +150,29 @@ module Souls
       cols
     end
 
+    def get_columns_num_no_timestamp(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?(pluralized_class_name)
+          if class_check_flag == true && !line.include?("create_table")
+            return cols if line.include?("t.index") || line.strip == "end"
+
+            types = Souls.get_type_and_name(line)
+            array = line.include?("array: true")
+            cols << { column_name: types[1], type: types[0], array: array } unless %w[
+              created_at
+              updated_at
+            ].include?(types[1])
+          end
+        end
+      end
+      cols
+    end
+
     def get_create_migration_type(class_name: "user")
       pluralized_class_name = class_name.pluralize
       file_path = Dir["db/migrate/*_create_#{pluralized_class_name}.rb"][0]

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.34.5
+0.35.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.34.5
+0.35.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.55.5
+  version: 0.56.3
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -139,8 +139,11 @@ files:
 - lib/souls/api/generate/mutation.rb
 - lib/souls/api/generate/mutation_rbs.rb
 - lib/souls/api/generate/policy.rb
+- lib/souls/api/generate/policy_rbs.rb
 - lib/souls/api/generate/query.rb
+- lib/souls/api/generate/query_rbs.rb
 - lib/souls/api/generate/resolver.rb
+- lib/souls/api/generate/resolver_rbs.rb
 - lib/souls/api/generate/rspec_factory.rb
 - lib/souls/api/generate/rspec_model.rb
 - lib/souls/api/generate/rspec_mutation.rb
@@ -148,6 +151,7 @@ files:
 - lib/souls/api/generate/rspec_query.rb
 - lib/souls/api/generate/rspec_resolver.rb
 - lib/souls/api/generate/type.rb
+- lib/souls/api/generate/type_rbs.rb
 - lib/souls/api/index.rb
 - lib/souls/api/update/index.rb
 - lib/souls/api/update/mutation.rb