souls 0.65.4 → 0.65.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57f8f27aa8628383a5be6f93140a07aa1a7a386f6b42859a538339f1f719ff44
-  data.tar.gz: 445b08e504ad79fc36b3c6ca60ef26ea04e299496284cdd7fc0b6753b8662a13
+  metadata.gz: 2189748c3d80909f1e0281373e2016c8b6d0ee25a40b0db9f3d7d487d2fc7d11
+  data.tar.gz: 1ef32917dd90e7a9b41c65e9d1c176a131f786a118757f66202e7990c571f1b9
 SHA512:
-  metadata.gz: f67a5b0cc1784a43f38c12bca5d37e1d7dba8a36676476a22f878bbc9f0c2c0a48e759c65d9d148cbc63b63939875b93cedb78ccd0698fae94a95c62c7d71c96
-  data.tar.gz: 19649c52d26137a06dc0b8eb5e7cc55489ca02df5653abd216cf72ca39e2bd8c10d945649c216b2dc5e74de618ed8bf01dbdd6acd47254abeb4866b030e293bd
+  metadata.gz: 587fdae00e9252f6862712b4da67bc3bbfd848b928caaa28a2508cf3c08a0e3d7214762487718263675831e5f331624a757eadd5489765bb0e222c13fcf77974
+  data.tar.gz: 15407243da04231cd9841287f774a005029067fd5c4a364aa17f297a10e3dd373e713a6cfc3d71130aa7e351a09ba807af7b1ffb419a3f594f926721f2f5a304

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

@@ -45,7 +45,7 @@ module Souls
           type = Souls.type_check(param[:type])
           type = "[#{type}]" if param[:array]
           type = "String" if param[:column_name].match?(/$*_id\z/)
-          next if params[:column_name] == "user_id"
+          next if param[:column_name] == "user_id"
 
           if i == params[:params].size - 1
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
@@ -121,6 +121,7 @@ module Souls
           if i == params[:params].size - 1
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
             f.write("      def resolve(args)\n")
+            f.write("      _, data_id = SoulsApiSchema.from_global_id(args[:id])\n")
           else
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n")
           end
@@ -140,12 +141,11 @@ module Souls
               ", #{n[:column_name]}: #{n[:column_name]}"
             end
           f.write("        new_record = { **args #{relation_params.compact.join} }\n")
-          f.write("        data = ::#{singularized_class_name.camelize}.find(article_id)\n")
-          f.write("        data.update(new_record)\n")
         else
-          f.write("        data = ::#{singularized_class_name.camelize}.find(args[:id])\n")
-          f.write("        data.update(args)\n")
+          f.write("        new_record = args.except(:id)\n")
         end
+        f.write("        data = ::#{singularized_class_name.camelize}.find(data_id)\n")
+        f.write("        data.update(new_record)\n")
       end
       File.open(file_path, "a") do |new_line|
         new_line.write(<<~TEXT)

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

@@ -61,7 +61,11 @@ module Souls
             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")
+              if param[:column_name].match?(/$*_id\z/)
+                f.write("        def self.argument: (:#{param[:column_name]}, String, required: false ) -> #{rbs_type}\n")
+              else
+                f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              end
             elsif param[:column_name].match?(/$*_id\z/)
               f.write("                         | (:#{param[:column_name]}, String, required: false ) -> String\n")
             else
@@ -117,6 +121,8 @@ module Souls
           params[:params].each_with_index do |param, i|
             type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            next if param[:column_name] == "user_id"
+
             if i == params[:params].size - 1
               f.write("                          #{param[:column_name]}: #{type}?\n")
             else
@@ -135,9 +141,16 @@ module Souls
             type = Souls.type_check(param[:type])
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            next if param[:column_name] == "user_id"
+
             required = param[:column_name] == "id" ? "required: true" : "required: false"
             if i.zero?
-              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
+              if param[:column_name].match?(/$*_id\z/)
+                f.write("        def self.argument: (:#{param[:column_name]}, String, #{required} ) -> String\n")
+              else
+                f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
+              end
+
             else
               f.write("                         | (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")
             end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.44.4
+0.44.5

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.44.4
+0.44.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.65.4
+  version: 0.65.5
 platform: ruby
 authors:
 - POPPIN-FUMI