souls 0.58.1 → 0.59.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df3e97f09a33df717c37504932a277cc12db4f5ae7afb7f2aac641d102667bf
-  data.tar.gz: 6475f26cd6de63284c674a2f7260fda05d2519d7dabc6480da19d4614bb2b710
+  metadata.gz: 56b456c1559798f49b0e0c7804bea985816f077e5ca90d41678ab64a57c143a6
+  data.tar.gz: c7faba385e7615c85b2a8f1dadcbc057b3bf6d98cd5ece76975ec125b29b3270
 SHA512:
-  metadata.gz: c814aae89079dbca22d511821b8d0dbbfcb5dd6330ad925f790afed826d4e3a97f944b982264293e3e8ba5c06913523e9ce3959f3297a99453a0056a88a8a8b8
-  data.tar.gz: 1e69761fd775545dc58cc8bb5170fba3b3364572bd0fdfb1d8c0c62474b052b4f31ae034174b799d6cbe41fce4197d9c7240679b54719963d0ce3e01dbd2663e
+  metadata.gz: d151483cfab1cc36b0cf2d90657a575c8812403a9c53585899ff7830ab0b820f64312c0e1cd1c5078118c73bb187c32f48b8815a889fa476c50ce68d3c2e7fe2
+  data.tar.gz: f38d7ea5c80f1c4ae127a9b40c77d83a59f8635c36256bdcdc4355776cb8788d76084ec233726026d8e6f33774d243872e3d780372b149ca10abeb8c328c176c

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

@@ -12,7 +12,7 @@ module Souls
           f.write(<<~TEXT)
             module Types
               class #{singularized_class_name.camelize}Connection < Types::BaseConnection
-                def edge_type: (*untyped) -> untyped
+                def self.edge_type: (*untyped) -> untyped
               end
             end
           TEXT

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

@@ -12,9 +12,9 @@ module Souls
           f.write(<<~TEXT)
             module Types
               class #{singularized_class_name.camelize}Edge < BaseObject
-                def self.implements: (*untyped) -> untyped
+                def self.edge_type: (*untyped) -> untyped
+                def self.node_type: (*untyped) -> untyped
                 def self.global_id_field: (*untyped) -> untyped
-                def self.field: (*untyped) -> untyped
                 def self.connection_type: ()-> untyped
               end
             end

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

@@ -159,6 +159,7 @@ module Souls
                   new_line.write(<<-TEXT)
 
       def resolve args
+        params = args.dup
         _, params[:id] = SoulsApiSchema.from_global_id(args[:id])
                   TEXT
                 end

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

@@ -102,7 +102,11 @@ module Souls
               module Base
                 module #{class_name.camelize}
                   class Update#{class_name.camelize} < BaseMutation
+                    String: String
+                    Boolean: Boolean
+                    Integer: Integer
                     def resolve:  ({
+                                    id: String,
           TEXT
         end
         File.open(file_path, "a") do |f|
@@ -127,10 +131,11 @@ module Souls
             type = Souls.type_check(param[:type])
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            required = param[:column_name] == "id" ? "required: true" : "required: false"
             if i.zero?
-              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
             else
-              f.write("                         | (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              f.write("                         | (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
             end
           end
         end

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

@@ -10,12 +10,15 @@ module Souls
         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
+            module SearchObject
+              def self.module: (Symbol) -> untyped
+            end
             class #{singularized_class_name.camelize}Search < Base
+              include SearchObject
               def self.scope: () ?{ () -> nil } -> [Hash[Symbol, untyped]]
               def self.type: (*untyped) -> String
               def self.option: (:filter, type: untyped, with: :apply_filter) -> String
@@ -25,33 +28,11 @@ module Souls
               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
-            module Types
-              class BaseBaseInputObject
               end
             end
           TEXT

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

@@ -21,13 +21,13 @@ module Souls
         end
         File.open(file_path, "a") do |f|
           params[:params].each_with_index do |param, i|
-            type = Souls.rbs_type_check(param[:type])
+            type = Souls.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")
+              f.write("    def self.field: (:#{param[:column_name]}, #{type}, null: true) -> #{rbs_type}\n")
             else
-              f.write("                  | (:#{param[:column_name]}, #{type}, null: false) -> #{rbs_type}\n")
+              f.write("                  | (:#{param[:column_name]}, #{type}, null: true) -> #{rbs_type}\n")
             end
           end
         end

data/lib/souls/cli/upgrade/gemfile.rb

@@ -14,7 +14,7 @@ module Souls
 
     def update_gem
       file_path = "./Gemfile"
-      tmp_file = "./tmp/Gemfile"
+      tmp_file = "./config/Gemfile"
       new_gems = gemfile_latest_version
       logs = []
       message = Paint["\nAlready Up to date!", :green]
@@ -70,7 +70,7 @@ module Souls
       end
       FileUtils.rm("./Gemfile")
       FileUtils.rm("./Gemfile.lock")
-      FileUtils.mv("./tmp/Gemfile", "./Gemfile")
+      FileUtils.mv("./config/Gemfile", "./Gemfile")
       system("bundle update")
       success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
       puts(success)

data/lib/souls/utils/index.rb

@@ -112,7 +112,6 @@ module Souls
     end
 
     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"

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.37.1
+0.38.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.37.1
+0.38.1

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.58.1
+  version: 0.59.1
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -200,7 +200,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。