rbs_rails 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7d71f04b224c69937d2e7c3fca24a085a5475ec09425baa810577d8dc403600
-  data.tar.gz: b5e4959c6afaf50ac5c9569cb095ef52eb4c54b38a48083337c177297afb05e2
+  metadata.gz: 4a0fceffc94637dc5cfe4d2779a2431bed24c741a89576fea845e6d6f8718231
+  data.tar.gz: 535cdee761f44679a26717c43eaca2b1cbae235bd54854c6107829c26035a777
 SHA512:
-  metadata.gz: 3f23018664d11f5bd9a94451830f0370e5f295bb0571ae5fc7927d7e8afe05a697bc0f51be10794924001319b8440aa0ab7ef0381f8d0df811ef8135a1162dd3
-  data.tar.gz: 37725067cf0c61a72b173f7faad77381652f04a4f8948855c318d88022ae50b34cfb277369b3ca0bbb09c1be6be4fa553b1c40a8ae70acd52c5f2ab90237e933
+  metadata.gz: dfe9d07c72b951d2c87a6f2cadfcdffaada7699f1727215be76fabc119192193b2bb2742ca6c99a769b02dc2e5762b4cc67a0811889c831b5a345af20162431a
+  data.tar.gz: cf034e981312079f7de0879270c14084b43c8c95b18957627a9e16ccc9477dd3574c843a4d5494c8df4e48198e4a4584214979a71c779be581f21452f5f57fb5

data/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 ## master (unreleased)
 
-## 0.13
+## 0.13.1
+
+* Change enum method return type from void to untyped [#366](https://github.com/pocke/rbs_rails/pull/366)
+* Fix enum methods generation to only include defined methods [#368](https://github.com/pocke/rbs_rails/pull/368)
+* Remove stale sig/rbs_rails/utils directory [#367](https://github.com/pocke/rbs_rails/pull/367)
+* Fix argument types for will_save_change_to_attribute method [#370](https://github.com/pocke/rbs_rails/pull/370)
+* Add missing migration for label column on users table [#374](https://github.com/pocke/rbs_rails/pull/374)
+* Add from: and to: keyword argument types to saved_change_to_<attr>? [#375](https://github.com/pocke/rbs_rails/pull/375)
+* Support for composed_of aggregation RBS generation [#373](https://github.com/pocke/rbs_rails/pull/373)
+* Fix belongs_to builder methods to accept optional argument [#380](https://github.com/pocke/rbs_rails/pull/380)
+* Generate RBS signatures for accepts_nested_attributes_for setters [#381](https://github.com/pocke/rbs_rails/pull/381)
+* Allow Integer and Symbol in enum attribute setter signatures [#379](https://github.com/pocke/rbs_rails/pull/379)
+* Determine primary key types for has_many and has_and_belongs_to_many associations [#376](https://github.com/pocke/rbs_rails/pull/376)
+
+### Bug fixes
+
+## 0.13.0
 
 ### New features
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs_rails (0.13.0)
+    rbs_rails (0.13.1)
       parser
       prism
       rbs (>= 1)
@@ -9,66 +9,68 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actioncable (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailbox (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionmailer (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      cgi
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4, < 3.3)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actiontext (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
       builder (~> 3.1)
+      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activejob (7.2.3.1)
+      activesupport (= 7.2.3.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.2)
-      activesupport (= 7.2.2.2)
-    activerecord (7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       timeout (>= 0.4.0)
-    activestorage (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    activestorage (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       marcel (~> 1.0)
-    activesupport (7.2.2.2)
+    activesupport (7.2.3.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -77,16 +79,17 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.3)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    cgi (0.5.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     crass (1.0.6)
     csv (3.3.4)
     date (3.4.1)
@@ -96,7 +99,7 @@ GEM
     fileutils (1.7.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
     irb (1.14.1)
@@ -133,7 +136,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.9)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parser (3.3.8.0)
@@ -143,28 +146,28 @@ GEM
     psych (5.1.2)
       stringio
     racc (1.8.1)
-    rack (3.1.18)
-    rack-session (2.1.1)
+    rack (3.2.6)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
     rackup (2.2.0)
       rack (>= 3)
-    rails (7.2.2.2)
-      actioncable (= 7.2.2.2)
-      actionmailbox (= 7.2.2.2)
-      actionmailer (= 7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actiontext (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    rails (7.2.3.1)
+      actioncable (= 7.2.3.1)
+      actionmailbox (= 7.2.3.1)
+      actionmailer (= 7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actiontext (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
+      railties (= 7.2.3.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -172,13 +175,15 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
+    railties (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
+      cgi
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)

data/README.md

@@ -73,7 +73,7 @@ RbsRails.configure do |config|
   # Enable or disable checking for database migrations.
   # If enabled, rbs_rails stops to generate RBS files if database is not migrated to the latest version.
   # Default: enabled
-  check_db_migrations = true
+  config.check_db_migrations = true
 
   # Define which models should be ignored during generation
   config.ignore_model_if do |klass|

data/example/rbs_rails.rb

@@ -10,7 +10,7 @@ RbsRails.configure do |config|
   # Enable or disable checking for database migrations.
   # If enabled, rbs_rails stops to generate RBS files if database is not migrated to the latest version.
   # Default: enabled
-  check_db_migrations = true
+  config.check_db_migrations = true
 
   # Define a proc to determine which models should be ignored during generation
   # The proc receives a model class and should return true if the model should be ignored

data/lib/rbs_rails/active_record/enum.rb

@@ -12,8 +12,8 @@ module RbsRails
       #
       #   @enum_definitions: enum_definitions
 
-      def enum(*args, **options) #: void
-        super  # steep:ignore
+      def enum(*args, **options) #: untyped
+        result = super  # steep:ignore
 
         name, values = args #: [Symbol, Array[Symbol]?]
         if values
@@ -29,6 +29,8 @@ module RbsRails
 
         @enum_definitions ||= [] #: enum_definitions
         @enum_definitions&.append([definitions, options])
+
+        result
       end
 
       def enum_definitions #: Array[[Symbol, String]]

data/lib/rbs_rails/active_record.rb

@@ -47,6 +47,7 @@ module RbsRails
           #{columns}
           #{alias_columns}
           #{associations}
+          #{composed_of_aggregations}
           #{generated_association_methods}
           #{has_secure_password}
           #{delegated_type_instance}
@@ -67,7 +68,7 @@ module RbsRails
         RBS
       end
 
-      private def pk_type #: String
+      private def pk_type_for(klass) #: String
         pk = klass.primary_key
         return 'top' unless pk
 
@@ -83,6 +84,10 @@ module RbsRails
         end
       end
 
+      private def pk_type #: String
+        pk_type_for(klass)
+      end
+
       private def generated_relation_methods_decl #: String
         <<~RBS
           module #{generated_relation_methods_name}
@@ -169,12 +174,13 @@ module RbsRails
           type = Util.module_name(a.klass)
           collection_type = "#{type}::ActiveRecord_Associations_CollectionProxy"
           @dependencies << collection_type
+          association_pk_type = pk_type_for(a.klass)
 
           <<~RUBY.chomp
             def #{a.name}: () -> #{collection_type}
             def #{a.name}=: (#{collection_type} | ::Array[#{type}]) -> (#{collection_type} | ::Array[#{type}])
-            def #{singular_name}_ids: () -> ::Array[::Integer]
-            def #{singular_name}_ids=: (::Array[::Integer]) -> ::Array[::Integer]
+            def #{singular_name}_ids: () -> ::Array[#{association_pk_type}]
+            def #{singular_name}_ids=: (::Array[#{association_pk_type}]) -> ::Array[#{association_pk_type}]
           RUBY
         end.join("\n")
       end
@@ -187,12 +193,13 @@ module RbsRails
           type = Util.module_name(a.klass)
           collection_type = "#{type}::ActiveRecord_Associations_CollectionProxy"
           @dependencies << collection_type
+          association_pk_type = pk_type_for(a.klass)
 
           <<~RUBY.chomp
             def #{a.name}: () -> #{collection_type}
             def #{a.name}=: (#{collection_type} | ::Array[#{type}]) -> (#{collection_type} | ::Array[#{type}])
-            def #{singular_name}_ids: () -> ::Array[::Integer]
-            def #{singular_name}_ids=: (::Array[::Integer]) -> ::Array[::Integer]
+            def #{singular_name}_ids: () -> ::Array[#{association_pk_type}]
+            def #{singular_name}_ids=: (::Array[#{association_pk_type}]) -> ::Array[#{association_pk_type}]
           RUBY
         end.join("\n")
       end
@@ -228,21 +235,58 @@ module RbsRails
           methods << "def #{a.name}=: (#{type_optional}) -> #{type_optional}"
           methods << "def reload_#{a.name}: () -> #{type_optional}"
           if !a.polymorphic?
-            methods << "def build_#{a.name}: (untyped) -> #{type}"
-            methods << "def create_#{a.name}: (untyped) -> #{type}"
-            methods << "def create_#{a.name}!: (untyped) -> #{type}"
+            methods << "def build_#{a.name}: (?untyped) -> #{type}"
+            methods << "def create_#{a.name}: (?untyped) -> #{type}"
+            methods << "def create_#{a.name}!: (?untyped) -> #{type}"
           end
           methods.join("\n")
         end.join("\n")
       end
 
+      private def composed_of_aggregations #: String
+        klass.reflect_on_all_aggregations.map do |a|
+          type = Util.module_name(a.klass)
+          @dependencies << a.klass.name
+          if a.options[:allow_nil]
+            type_optional = optional(type)
+            <<~RUBY.chomp
+              def #{a.name}: () -> #{type_optional}
+              def #{a.name}=: (#{type_optional}) -> #{type_optional}
+            RUBY
+          else
+            <<~RUBY.chomp
+              def #{a.name}: () -> #{type}
+              def #{a.name}=: (#{type}) -> #{type}
+            RUBY
+          end
+        end.join("\n")
+      end
+
+      private def nested_attributes_methods #: String?
+        return if klass.nested_attributes_options.empty?
+
+        klass.nested_attributes_options.each_key.map do |association_name|
+          reflection = klass.reflect_on_association(association_name)
+          next unless reflection
+
+          setter_name = "#{association_name}_attributes="
+          if reflection.collection?
+            "def #{setter_name}: (Hash[untyped, untyped] | Array[Hash[untyped, untyped]]) -> void"
+          else
+            "def #{setter_name}: (Hash[untyped, untyped]) -> void"
+          end
+        end.compact.join("\n")
+      end
+
       private def generated_association_methods #: String
-        # @type var sigs: Array[String]
+        # @type var sigs: Array[String?]
         sigs = []
 
+        sigs << "module #{klass_name}::GeneratedAssociationMethods"
+        sigs << nested_attributes_methods
+
         # Needs to require "active_storage/engine"
         if klass.respond_to?(:attachment_reflections)
-          sigs << "module #{klass_name}::GeneratedAssociationMethods"
           sigs << klass.attachment_reflections.map do |name, reflection|
             case reflection.macro
             when :has_one_attached
@@ -264,11 +308,12 @@ module RbsRails
               raise "unknown macro: #{reflection.macro}"
             end
           end.join("\n")
-          sigs << "end"
-          sigs << "include #{klass_name}::GeneratedAssociationMethods"
         end
 
-        sigs.join("\n")
+        sigs << "end"
+        sigs << "include #{klass_name}::GeneratedAssociationMethods"
+
+        sigs.compact.join("\n")
       end
 
       # @rbs singleton: bool
@@ -376,9 +421,13 @@ module RbsRails
       private def enum_instance_methods #: String
         # @type var methods: Array[String]
         methods = []
-        klass.enum_definitions.each do |_, method_name|
-          methods << "def #{method_name}!: () -> bool"
-          methods << "def #{method_name}?: () -> bool"
+        defined_methods = klass.instance_methods.to_set
+        klass.enum_definitions.each do |_, enum_method_name|
+          ["#{enum_method_name}!", "#{enum_method_name}?"].each do |method_name|
+            if defined_methods.member?(method_name.to_sym)
+              methods << "def #{method_name}: () -> bool"
+            end
+          end
         end
 
         methods.join("\n")
@@ -388,14 +437,21 @@ module RbsRails
       private def enum_class_methods(singleton:) #: String
         # @type var methods: Array[String]
         methods = []
+        defined_methods = klass.methods.to_set
         klass.enum_definitions.map(&:first).uniq.each do |name|
           column = klass.columns_hash[name.to_s] || klass.columns_hash[klass.attribute_aliases[name.to_s]]
           class_name = sql_type_to_class(column.type)
-          methods << "def #{singleton ? 'self.' : ''}#{name.to_s.pluralize}: () -> ::ActiveSupport::HashWithIndifferentAccess[::String, #{class_name}]"
+          method_name = "#{name.to_s.pluralize}"
+          if defined_methods.member?(method_name.to_sym)
+            methods << "def #{singleton ? 'self.' : ''}#{method_name}: () -> ::ActiveSupport::HashWithIndifferentAccess[::String, #{class_name}]"
+          end
         end
-        klass.enum_definitions.each do |_, method_name|
-          methods << "def #{singleton ? 'self.' : ''}#{method_name}: () -> #{relation_class_name}"
-          methods << "def #{singleton ? 'self.' : ''}not_#{method_name}: () -> #{relation_class_name}"
+        klass.enum_definitions.each do |_, enum_method_name|
+          ["#{enum_method_name}", "not_#{enum_method_name}"].each do |method_name|
+            if defined_methods.member?(method_name.to_sym)
+              methods << "def #{singleton ? 'self.' : ''}#{method_name}: () -> #{relation_class_name}"
+            end
+          end
         end
         methods.join("\n")
       end
@@ -532,6 +588,8 @@ module RbsRails
           #      if your model has `serialize ..., Array`
           # etc.
           col_serialize_to = col_serializer.try(:object_class)&.name
+
+          col_is_enum = klass.enum_definitions.any? { |name, _| name == col.name.to_sym }
           if col_serializer.is_a?(Class) && col_serializer.name == 'ActiveRecord::Coders::JSON'
             class_name = 'untyped' # JSON
           elsif col_serialize_to == 'Array'
@@ -539,7 +597,7 @@ module RbsRails
           elsif col_serialize_to == 'Hash'
             class_name = '::Hash[untyped, untyped]' # Hash
           else
-            class_name = if klass.enum_definitions.any? { |name, _| name == col.name.to_sym }
+            class_name = if col_is_enum
                            '::String'
                          else
                            sql_type_to_class(col.type)
@@ -551,9 +609,14 @@ module RbsRails
           class_name_opt = (class_name == 'untyped') ? 'untyped' : optional(class_name)
           column_type = col.null ? class_name_opt : class_name
           sql_column_type = col.null ? optional(sql_class_name) : sql_class_name
+          arg_type = if col_is_enum
+                       [sql_class_name, column_type, '::Symbol'].uniq.join('|')
+                     else
+                       column_type
+                     end
           sig = <<~EOS
             def #{col.name}: () -> #{column_type}
-            def #{col.name}=: (#{column_type}) -> #{column_type}
+            def #{col.name}=: (#{arg_type}) -> #{column_type}
             def #{col.name}?: () -> bool
             def #{col.name}_changed?: (?from: #{class_name_opt}, ?to: #{class_name_opt}) -> bool
             def #{col.name}_change: () -> [#{class_name_opt}, #{class_name_opt}]
@@ -566,8 +629,8 @@ module RbsRails
             def #{col.name}_change_to_be_saved: () -> ::Array[#{class_name_opt}]?
             def #{col.name}_in_database: () -> #{class_name_opt}
             def saved_change_to_#{col.name}: () -> ::Array[#{class_name_opt}]?
-            def saved_change_to_#{col.name}?: () -> bool
-            def will_save_change_to_#{col.name}?: () -> bool
+            def saved_change_to_#{col.name}?: (?from: #{class_name_opt}, ?to: #{class_name_opt}) -> bool
+            def will_save_change_to_#{col.name}?: (?from: #{class_name_opt}, ?to: #{class_name_opt}) -> bool
             def restore_#{col.name}!: () -> void
             def clear_#{col.name}_change: () -> void
             def #{col.name}_before_type_cast: () -> #{sql_column_type}

data/lib/rbs_rails/cli/configuration.rb

@@ -20,7 +20,7 @@ module RbsRails
       #   @signature_root_dir: Pathname?
       #   @ignore_model_if: (^(singleton(ActiveRecord::Base)) -> bool)?
 
-      attr_reader :check_db_migrations  #: bool
+      attr_accessor :check_db_migrations  #: bool
 
       def initialize #: void
         @signature_root_dir = nil

data/lib/rbs_rails/version.rb

@@ -2,5 +2,5 @@ module RbsRails
   # Because of copy_signatures is defined by lib/rbs_rails.rb
   # @dynamic self.copy_signatures
 
-  VERSION = "0.13.0" #: String
+  VERSION = "0.13.1" #: String
 end

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actionmailer
@@ -14,7 +14,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actionpack
@@ -22,7 +22,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actiontext
@@ -30,7 +30,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actionview
@@ -38,7 +38,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activejob
@@ -46,7 +46,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activemodel
@@ -54,7 +54,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activerecord
@@ -62,7 +62,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activestorage
@@ -70,7 +70,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activesupport
@@ -78,7 +78,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -86,7 +86,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: base64
@@ -102,7 +102,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: cgi
@@ -114,7 +114,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: connection_pool
@@ -122,17 +122,13 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: date
   version: '0'
   source:
     type: stdlib
-- name: dbm
-  version: '0'
-  source:
-    type: stdlib
 - name: delegate
   version: '0'
   source:
@@ -158,7 +154,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: i18n
@@ -166,7 +162,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: io-console
@@ -178,15 +174,19 @@ gems:
   source:
     type: stdlib
 - name: logger
-  version: '0'
+  version: '1.7'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: mail
   version: '2.8'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: marcel
@@ -194,7 +194,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: mini_mime
@@ -202,7 +202,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: minitest
@@ -210,7 +210,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: monitor
@@ -226,7 +226,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: nokogiri
@@ -234,7 +234,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: openssl
@@ -250,7 +250,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: pathname
@@ -261,20 +261,12 @@ gems:
   version: 1.2.0
   source:
     type: rubygems
-- name: pstore
-  version: '0'
-  source:
-    type: stdlib
-- name: psych
-  version: '0'
-  source:
-    type: stdlib
 - name: rack
   version: '2.2'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rails-dom-testing
@@ -282,7 +274,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rails-html-sanitizer
@@ -290,7 +282,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: railties
@@ -298,7 +290,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -306,11 +298,11 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.9.2
+  version: 3.9.5
   source:
     type: rubygems
 - name: rdoc
@@ -342,7 +334,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: time
@@ -362,7 +354,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: d2bc0905c6f19acd3023d0530086d6d14704b10f
+    revision: ea8449cbfd146213cc46b6e67e747ae61fefed66
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: uri

data/sig/rbs_rails/active_record/enum.rbs

@@ -13,7 +13,7 @@ module RbsRails
 
       @enum_definitions: enum_definitions
 
-      def enum: (*untyped args, **untyped options) -> void
+      def enum: (*untyped args, **untyped options) -> untyped
 
       def enum_definitions: () -> Array[[ Symbol, String ]]
 

data/sig/rbs_rails/active_record.rbs

@@ -27,6 +27,8 @@ module RbsRails
 
       private def klass_decl: () -> String
 
+      private def pk_type_for: (untyped klass) -> String
+
       private def pk_type: () -> String
 
       private def generated_relation_methods_decl: () -> String
@@ -49,6 +51,10 @@ module RbsRails
 
       private def belongs_to: () -> String
 
+      private def composed_of_aggregations: () -> String
+
+      private def nested_attributes_methods: () -> String?
+
       private def generated_association_methods: () -> String
 
       # @rbs singleton: bool

data/sig/rbs_rails/cli/configuration.rbs

@@ -15,7 +15,7 @@ module RbsRails
 
       @ignore_model_if: (^(singleton(ActiveRecord::Base)) -> bool)?
 
-      attr_reader check_db_migrations: bool
+      attr_accessor check_db_migrations: bool
 
       def initialize: () -> void
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs_rails
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
@@ -106,7 +106,6 @@ files:
 - sig/rbs_rails/rake_task.rbs
 - sig/rbs_rails/util.rbs
 - sig/rbs_rails/util/file_writer.rbs
-- sig/rbs_rails/utils/file_writer.rbs
 - sig/rbs_rails/version.rbs
 homepage: https://github.com/pocke/rbs_rails
 licenses:
@@ -129,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A RBS files generator for Rails application
 test_files: []

data/sig/rbs_rails/utils/file_writer.rbs

@@ -1,4 +0,0 @@
-# Generated from lib/rbs_rails/utils/file_writer.rb with RBS::Inline
-
-module RbsRails
-end