Integrate model_dependencies.rbs to each model signatures

Gemfile

@@ -11,3 +11,4 @@ gem 'rbs', '>= 3'
 gem 'rbs-inline', require: false
 gem 'steep', '>= 1.4'
 gem 'minitest'
+gem 'minitest-hooks'

Gemfile.lock

@@ -119,6 +119,8 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
     minitest (5.25.5)
+    minitest-hooks (1.5.2)
+      minitest (> 5.3)
     mutex_m (0.3.0)
     net-imap (0.5.7)
       date
@@ -232,6 +234,7 @@ PLATFORMS
 
 DEPENDENCIES
   minitest
+  minitest-hooks
   rails (>= 7.0)
   rake (~> 13.0)
   rbs (>= 3)

lib/rbs_rails/active_record.rb

@@ -10,23 +10,23 @@ def self.generatable?(klass) #: boolish
 
     # @rbs klass: untyped
     # @rbs dependencies: Array[String]
-    def self.class_to_rbs(klass, dependencies: []) #: untyped
-      Generator.new(klass, dependencies: dependencies).generate
+    def self.class_to_rbs(klass) #: untyped
+      Generator.new(klass).generate
     end
 
     class Generator
       IGNORED_ENUM_KEYS = %i[_prefix _suffix _default _scopes] #: Array[Symbol]
 
       # @rbs @parse_model_file: nil | Parser::AST::Node
-      # @rbs @dependencies: Array[String]
       # @rbs @enum_definitions: Array[Hash[Symbol, untyped]]
       # @rbs @klass_name: String
 
+      attr_reader :dependencies #: DependencyBuilder
+
       # @rbs klass: singleton(ActiveRecord::Base) & Enum
-      # @rbs dependencies: Array[String]
-      def initialize(klass, dependencies:) #: untyped
+      def initialize(klass) #: untyped
         @klass = klass
-        @dependencies = dependencies
+        @dependencies = DependencyBuilder.new
         @klass_name = Util.module_name(klass, abs: false)
 
         namespaces = klass_name(abs: false).split('::').tap{ |names| names.pop }
@@ -62,6 +62,8 @@ def generate #: String
           #{collection_proxy_decl}
 
           #{footer}
+
+          #{dependencies.build}
         RBS
       end
 

lib/rbs_rails/cli.rb

@@ -92,23 +92,16 @@ def install_hooks #: void
     def generate_models #: void
       Rails.application.eager_load!
 
-      dep_builder = DependencyBuilder.new
-
       ::ActiveRecord::Base.descendants.each do |klass|
-        generate_single_model(klass, dep_builder)
+        generate_single_model(klass)
       rescue => e
         puts "Error generating RBS for #{klass.name} model"
         raise e
       end
-
-      if dep_rbs = dep_builder.build
-        config.signature_root_dir.join('model_dependencies.rbs').write(dep_rbs)
-      end
     end
 
     # @rbs klass: singleton(ActiveRecord::Base)
-    # @rbs dep_builder: DependencyBuilder
-    def generate_single_model(klass, dep_builder) #: bool
+    def generate_single_model(klass) #: bool
       return false if config.ignored_model?(klass)
       return false unless RbsRails::ActiveRecord.generatable?(klass)
 
@@ -125,9 +118,8 @@ def generate_single_model(klass, dep_builder) #: bool
       path = config.signature_root_dir / rbs_relative_path
       path.dirname.mkpath
 
-      sig = RbsRails::ActiveRecord.class_to_rbs(klass, dependencies: dep_builder.deps)
+      sig = RbsRails::ActiveRecord.class_to_rbs(klass)
       path.write sig
-      dep_builder.done << klass.name
 
       true
     end

lib/rbs_rails/dependency_builder.rb

@@ -5,7 +5,23 @@ class DependencyBuilder
 
     def initialize #: void
       @deps = []
-      @done = Set.new(['ActiveRecord::Base', 'ActiveRecord', 'Object'])
+      @done = Set.new([
+        'ActiveRecord',
+        'ActiveRecord::Associations',
+        'ActiveRecord::Associations::CollectionProxy',
+        'ActiveRecord::Base',
+        'ActiveRecord::Relation',
+        'ActiveStorage',
+        'ActiveStorage::Attachment',
+        'ActiveStorage::Blob',
+        'ActiveStorage::Record',
+        'Object'
+      ])
+    end
+
+    # @rbs name: String
+    def <<(name) #: Array[String]
+      deps << name
     end
 
     def build #: String | nil

sig/rbs_rails/active_record.rbs

@@ -7,7 +7,7 @@ module RbsRails
 
     # @rbs klass: untyped
     # @rbs dependencies: Array[String]
-    def self.class_to_rbs: (untyped klass, ?dependencies: Array[String]) -> untyped
+    def self.class_to_rbs: (untyped klass) -> untyped
 
     class Generator
       IGNORED_ENUM_KEYS: Array[Symbol]
@@ -16,13 +16,12 @@ module RbsRails
 
       @enum_definitions: Array[Hash[Symbol, untyped]]
 
-      @dependencies: Array[String]
-
       @parse_model_file: nil | Parser::AST::Node
 
+      attr_reader dependencies: DependencyBuilder
+
       # @rbs klass: singleton(ActiveRecord::Base) & Enum
-      # @rbs dependencies: Array[String]
-      def initialize: (singleton(ActiveRecord::Base) & Enum klass, dependencies: Array[String]) -> untyped
+      def initialize: (singleton(ActiveRecord::Base) & Enum klass) -> untyped
 
       def generate: () -> String
 

sig/rbs_rails/cli.rbs

@@ -23,8 +23,7 @@ module RbsRails
     def generate_models: () -> void
 
     # @rbs klass: singleton(ActiveRecord::Base)
-    # @rbs dep_builder: DependencyBuilder
-    def generate_single_model: (singleton(ActiveRecord::Base) klass, DependencyBuilder dep_builder) -> bool
+    def generate_single_model: (singleton(ActiveRecord::Base) klass) -> bool
 
     def generate_path_helpers: () -> void
 

sig/rbs_rails/dependency_builder.rbs

@@ -8,6 +8,9 @@ module RbsRails
 
     def initialize: () -> void
 
+    # @rbs name: String
+    def <<: (String name) -> Array[String]
+
     def build: () -> (String | nil)
 
     private def shift: () -> (String | nil)

test/expectations/audited_audit.rbs

@@ -681,3 +681,6 @@ module ::Audited
     end
   end
 end
+
+module ::Audited
+end

test/expectations/blog.rbs

@@ -288,3 +288,10 @@ class ::Blog < ::ApplicationRecord
     def prepend: (*::Blog | ::Array[::Blog]) -> self
   end
 end
+
+class ::ApplicationRecord < ::ActiveRecord::Base
+end
+class ::User < ::ApplicationRecord
+end
+class ::User::ActiveRecord_Associations_CollectionProxy < ::ActiveRecord::Associations::CollectionProxy
+end

test/expectations/user.rbs

@@ -508,3 +508,10 @@ class ::User < ::ApplicationRecord
     def prepend: (*::User | ::Array[::User]) -> self
   end
 end
+
+class ::ApplicationRecord < ::ActiveRecord::Base
+end
+class ::Blog < ::ApplicationRecord
+end
+class ::Blog::ActiveRecord_Associations_CollectionProxy < ::ActiveRecord::Associations::CollectionProxy
+end

test/rbs_rails/active_record_test.rb

@@ -1,20 +1,19 @@
 require 'test_helper'
 
 class ActiveRecordTest < Minitest::Test
-  def test_type_check
+  include Minitest::Hooks
+
+  def before_all
     clean_test_signatures
 
     setup!
+  end
 
-    dir = app_dir
-    sh!('steep', 'check', chdir: dir)
+  def test_type_check
+    sh!('steep', 'check', chdir: app_dir)
   end
 
   def test_user_model_rbs_snapshot
-    clean_test_signatures
-
-    setup!
-
     rbs_path = app_dir.join('sig/rbs_rails/app/models/user.rbs')
     expect_path = expectations_dir / 'user.rbs'
     # Code to re-generate the expectation files
@@ -24,10 +23,6 @@ def test_user_model_rbs_snapshot
   end
 
   def test_blog_model_rbs_snapshot
-    clean_test_signatures
-
-    setup!
-
     rbs_path = app_dir.join('sig/rbs_rails/packs/blogs/app/models/blog.rbs')
     expect_path = expectations_dir / 'blog.rbs'
     # Code to re-generate the expectation files
@@ -37,19 +32,11 @@ def test_blog_model_rbs_snapshot
   end
 
   def test_article_model_rbs_is_skipped
-    clean_test_signatures
-
-    setup!
-
     rbs_path = app_dir.join('sig/rbs_rails/app/models/article.rbs')
     refute rbs_path.exist?
   end
 
   def test_external_library_model_rbs_generation
-    clean_test_signatures
-
-    setup!
-
     rbs_path = app_dir.join('sig/rbs_rails/app/models/audited/audit.rbs')
     expect_path = expectations_dir / 'audited_audit.rbs'
     # Code to re-generate the expectation files

test/rbs_rails/path_helper_test.rb

@@ -1,20 +1,19 @@
 require 'test_helper'
 
 class PathHelperTest < Minitest::Test
-  def test_type_check
+  include Minitest::Hooks
+
+  def before_all
     clean_test_signatures
 
     setup!
+  end
 
-    dir = app_dir
-    sh!('steep', 'check', chdir: dir)
+  def test_type_check
+    sh!('steep', 'check', chdir: app_dir)
   end
 
   def test_user_model_rbs_snapshot
-    clean_test_signatures
-
-    setup!
-
     rbs_path = app_dir.join('sig/rbs_rails/path_helpers.rbs')
     expect_path = expectations_dir / 'path_helpers.rbs'
     # Code to re-generate the expectation files

test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'minitest'
 require 'minitest/autorun'
+require 'minitest/hooks'
 
 require 'pathname'
 require 'rbs_rails'