rbs_activesupport 1.4.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ce460ddb405b00eeeff23d9118d5f8f4fd55fb5aef03aa8b8d5ff2c1ba6cb4
-  data.tar.gz: df9044c57407d295daeef3781715b7345f49c87275cc9327b08814b501077dad
+  metadata.gz: 438e19cbb21787f29c6c4d2f2793aa07a2423c6fd42ee9540763d232df0ace2b
+  data.tar.gz: 6af95ed3168cbd3ae7b8ef97365b36d6b3c2a03cc844b0303395cb4f0716ff98
 SHA512:
-  metadata.gz: b35f6bba26bb000cf6f0dd23da04d28a870d459c7005c79ba9fcf8cc22806693f3c38792f0c1db185dd3449d29c96576781529a0f3b2bdb18f65afaf21cfbbae
-  data.tar.gz: 87267e34c7f2971ae6d500b17a9d76b0acb7e6af93d13556901da7428cc900dd68c8159528a8e56b8b5e3e1e760e5750dd020cf6dbcc0b5b3b93809708814c98
+  metadata.gz: e447d750370fd50cf83d448a5356a520e5f6de2b4ef15bc1bfcf6cf449002052e5b9b37fac7986a07cdb130d5e760adf957f1d0f64e2128493618992f2d96485
+  data.tar.gz: 7dcd6171ed89a66d898732e8e3b27401021fad63a5ad10e7a4f3fcf312e411a11e934fe338e65c242949af9f41df36fec7b37f1544f37558cecd5b3466481be4

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
 
 Layout/LeadingCommentSpace:
   Enabled: false

data/.vscode/settings.json

@@ -1,15 +1,25 @@
 {
     "rbs-helper.signature-directory": "sig/",
     "cSpell.words": [
+        "bindir",
+        "boolish",
         "cattr",
         "classmethods",
         "Cyclomatic",
         "DEFN",
         "FCALL",
+        "ivar",
+        "KOMIYA",
         "mattr",
         "mkpath",
+        "modname",
+        "popen",
+        "raketask",
+        "readlines",
         "rmtree",
+        "Takeshi",
         "tasklib",
+        "tk0miya",
         "VCALL",
         "ZLIST"
     ],

data/lib/rbs_activesupport/ast.rb

@@ -32,7 +32,7 @@ module RbsActivesupport
         node.map { |e| eval_node(e) }
       when RubyVM::AbstractSyntaxTree::Node
         case node.type
-        when :LIT, :STR
+        when :LIT, :STR, :SYM, :INTEGER, :FLOAT
           node.children.first
         when :HASH
           children = node.children.first&.children

data/lib/rbs_activesupport/attribute_accessor.rb

@@ -13,7 +13,7 @@ module RbsActivesupport
     end
 
     def type #: String
-      # @type var trailng_comment: String?
+      # @type var trailing_comment: String?
       trailing_comment = options[:trailing_comment]
       if trailing_comment&.start_with?("#:")
         trailing_comment[2..].strip

data/lib/rbs_activesupport/class_attribute.rb

@@ -13,7 +13,7 @@ module RbsActivesupport
     end
 
     def type #: String
-      # @type var trailng_comment: String?
+      # @type var trailing_comment: String?
       trailing_comment = options[:trailing_comment]
       if trailing_comment&.start_with?("#:")
         trailing_comment[2..].strip

data/lib/rbs_activesupport/declaration_builder.rb

@@ -6,11 +6,14 @@ module RbsActivesupport
 
     include AST
 
+    attr_reader :resolver #: RBS::Resolver::TypeNameResolver
     attr_reader :method_searcher #: MethodSearcher
     attr_reader :included_modules #: Array[RBS::Namespace]
 
+    # @rbs resolver: RBS::Resolver::TypeNameResolver
     # @rbs method_searcher: MethodSearcher
-    def initialize(method_searcher) #: void
+    def initialize(resolver, method_searcher) #: void
+      @resolver = resolver
       @method_searcher = method_searcher
       @included_modules = []
     end
@@ -21,7 +24,8 @@ module RbsActivesupport
     def build(namespace, method_calls, context = nil) #: [Array[String], Array[String]]
       built = build_method_calls(namespace, method_calls, context)
       public_decls, private_decls = built.partition(&:public?)
-      [public_decls.map(&method(:render)), private_decls.map(&method(:render))] # steep:ignore BlockTypeMismatch
+      [public_decls.map { |decl| render(namespace, decl) },
+       private_decls.map { |decl| render(namespace, decl) }]
     end
 
     private
@@ -109,13 +113,14 @@ module RbsActivesupport
       end.flatten
     end
 
+    # @rbs namespace: RBS::Namespace
     # @rbs decl: t
-    def render(decl) #: String
+    def render(namespace, decl) #: String
       case decl
       when AttributeAccessor
-        render_attribute_accessor(decl)
+        render_attribute_accessor(namespace, decl)
       when ClassAttribute
-        render_class_attribute(decl)
+        render_class_attribute(namespace, decl)
       when Delegate
         render_delegate(decl)
       when Include
@@ -123,24 +128,28 @@ module RbsActivesupport
       end
     end
 
+    # @rbs namespace: RBS::Namespace
     # @rbs decl: AttributeAccessor
-    def render_attribute_accessor(decl) #: String
+    def render_attribute_accessor(namespace, decl) #: String
+      type = resolve_type(namespace, decl.type)
       methods = []
-      methods << "def self.#{decl.name}: () -> (#{decl.type})" if decl.singleton_reader?
-      methods << "def self.#{decl.name}=: (#{decl.type}) -> (#{decl.type})" if decl.singleton_writer?
-      methods << "def #{decl.name}: () -> (#{decl.type})" if decl.instance_reader?
-      methods << "def #{decl.name}=: (#{decl.type}) -> (#{decl.type})" if decl.instance_writer?
+      methods << "def self.#{decl.name}: () -> (#{type})" if decl.singleton_reader?
+      methods << "def self.#{decl.name}=: (#{type}) -> (#{type})" if decl.singleton_writer?
+      methods << "def #{decl.name}: () -> (#{type})" if decl.instance_reader?
+      methods << "def #{decl.name}=: (#{type}) -> (#{type})" if decl.instance_writer?
       methods.join("\n")
     end
 
+    # @rbs namespace: RBS::Namespace
     # @rbs decl: ClassAttribute
-    def render_class_attribute(decl) #: String
+    def render_class_attribute(namespace, decl) #: String
+      type = resolve_type(namespace, decl.type)
       methods = []
-      methods << "def self.#{decl.name}: () -> (#{decl.type})"
-      methods << "def self.#{decl.name}=: (#{decl.type}) -> (#{decl.type})"
+      methods << "def self.#{decl.name}: () -> (#{type})"
+      methods << "def self.#{decl.name}=: (#{type}) -> (#{type})"
       methods << "def self.#{decl.name}?: () -> bool" if decl.instance_predicate?
-      methods << "def #{decl.name}: () -> (#{decl.type})" if decl.instance_reader?
-      methods << "def #{decl.name}=: (#{decl.type}) -> (#{decl.type})" if decl.instance_writer?
+      methods << "def #{decl.name}: () -> (#{type})" if decl.instance_reader?
+      methods << "def #{decl.name}=: (#{type}) -> (#{type})" if decl.instance_writer?
       methods << "def #{decl.name}?: () -> bool" if decl.instance_predicate? && decl.instance_reader?
       methods.join("\n")
     end
@@ -164,5 +173,28 @@ module RbsActivesupport
         "include #{module_name.to_s.delete_suffix("::")}"
       end
     end
+
+    # @rbs namespace: RBS::Namespace
+    # @rbs type: String
+    def resolve_type(namespace, type) #: String
+      context = context_from(namespace.to_type_name)
+
+      typ = RBS::Parser.parse_type(type)
+      if typ
+        typ.map_type_name { |type_name| resolver.resolve(type_name, context:) || type_name }.to_s
+      else
+        type
+      end
+    end
+
+    # @rbs type_name: RBS::TypeName
+    def context_from(type_name) #: RBS::Resolver::context
+      if type_name.namespace == RBS::Namespace.root
+        [nil, type_name]
+      else
+        parent = context_from(type_name.namespace.to_type_name)
+        [parent, type_name]
+      end
+    end
   end
 end

data/lib/rbs_activesupport/generator.rb

@@ -21,7 +21,8 @@ module RbsActivesupport
       @pathname = pathname
 
       method_searcher = MethodSearcher.new(rbs_builder)
-      @declaration_builder = DeclarationBuilder.new(method_searcher)
+      resolver = RBS::Resolver::TypeNameResolver.new(rbs_builder.env)
+      @declaration_builder = DeclarationBuilder.new(resolver, method_searcher)
     end
 
     def generate #: String?
@@ -33,6 +34,8 @@ module RbsActivesupport
         next if public_decls.empty? && private_decls.empty?
 
         <<~RBS
+          # resolve-type-names: false
+
           #{header(namespace)}
           #{public_decls.join("\n")}
 
@@ -55,7 +58,7 @@ module RbsActivesupport
     def format(rbs) #: String
       parsed = RBS::Parser.parse_signature(rbs)
       StringIO.new.tap do |out|
-        RBS::Writer.new(out: out).write(parsed[1] + parsed[2])
+        RBS::Writer.new(out:).write(parsed[1] + parsed[2])
       end.string
     end
 
@@ -67,19 +70,16 @@ module RbsActivesupport
 
     # @rbs namespace: RBS::Namespace
     def header(namespace) #: String
-      context = +""
-      namespace.path.map do |mod_name|
-        context += "::#{mod_name}"
-        mod_object = Object.const_get(context)
+      namespace_to_names(namespace).map do |name|
+        mod_object = Object.const_get(name.to_s)
         case mod_object
         when Class
-          # @type var superclass: Class
-          superclass = _ = mod_object.superclass
-          superclass_name = superclass.name || "Object"
+          superclass = mod_object.superclass
+          superclass_name = superclass&.name || "::Object"
 
-          "class #{mod_name} < ::#{superclass_name}"
+          "class #{name} < ::#{superclass_name}"
         when Module
-          "module #{mod_name}"
+          "module #{name}"
         else
           raise "unreachable"
         end
@@ -90,5 +90,15 @@ module RbsActivesupport
     def footer(namespace) #: String
       "end\n" * namespace.path.size
     end
+
+    # @rbs namespace: RBS::Namespace
+    def namespace_to_names(namespace) #: Array[RBS::TypeName]
+      names = [] #: Array[RBS::TypeName]
+      until namespace.empty?
+        names << namespace.to_type_name
+        namespace = namespace.parent
+      end
+      names.reverse
+    end
   end
 end

data/lib/rbs_activesupport/method_searcher.rb

@@ -46,12 +46,35 @@ module RbsActivesupport
     # @rbs method: Symbol
     def lookup_method_types(type_name, method) #: Array[RBS::MethodType]
       instance = rbs_builder.build_instance(type_name)
-      method_def = instance.methods[method]
-      return [] unless method_def
+      if method.start_with? "@"
+        ivar_def = instance.instance_variables[method]
+        return [] unless ivar_def
 
-      method_def.defs.map(&:type)
+        method_def = build_method_def(ivar_def.type)
+        [method_def]
+      else
+        method_def = instance.methods[method]
+        return [] unless method_def
+
+        method_def.defs.map(&:type)
+      end
     rescue StandardError
       []
     end
+
+    # @rbs return_type: RBS::Types::t
+    def build_method_def(return_type) #: RBS::MethodType
+      type = RBS::Types::Function.new(
+        required_positionals: [],
+        optional_positionals: [],
+        rest_positionals: nil,
+        trailing_positionals: [],
+        required_keywords: {},
+        optional_keywords: {},
+        rest_keywords: nil,
+        return_type:
+      )
+      RBS::MethodType.new(type_params: [], type:, block: nil, location: nil)
+    end
   end
 end

data/lib/rbs_activesupport/parser.rb

@@ -76,20 +76,20 @@ module RbsActivesupport
                                                              included: in_included_block?,
                                                              trailing_comment: trailing_comment_for(node))
         else
-          process_orig(node, decls: decls, comments: comments, context: context)
+          process_orig(node, decls:, comments:, context:)
         end
       when :ITER
         call = node.children[0]
         if call.type == :FCALL && call.children[0] == :included && parse_included_block && !in_included_block?
           body = node.children[1].children[2]
           with_included_block do
-            process(body, decls: decls, comments: comments, context: context)
+            process(body, decls:, comments:, context:)
           end
         else
-          process_orig(node, decls: decls, comments: comments, context: context)
+          process_orig(node, decls:, comments:, context:)
         end
       else
-        process_orig(node, decls: decls, comments: comments, context: context)
+        process_orig(node, decls:, comments:, context:)
       end
     end
 

data/lib/rbs_activesupport/rake_task.rb

@@ -45,7 +45,7 @@ module RbsActivesupport
 
         target_directories.each do |dir|
           dir.glob("**/*.rb").each do |file|
-            rbs = Generator.new(file, rbs_builder).generate
+            rbs = Generator.generate(file, rbs_builder)
             next unless rbs
 
             rbs_path = signature_root_dir / file.sub_ext(".rbs").relative_path_from(Rails.root)
@@ -70,7 +70,7 @@ module RbsActivesupport
         loader = RBS::CLI::LibraryOptions.new.loader
         loader.add(path: Pathname("sig"))
         env = RBS::Environment.from_loader(loader).resolve_type_names
-        RBS::DefinitionBuilder.new(env: env)
+        RBS::DefinitionBuilder.new(env:)
       end
     end
   end

data/lib/rbs_activesupport/types.rb

@@ -11,26 +11,26 @@ module RbsActivesupport
       when nil
         "nil"
       when Integer, Float, Symbol, String
-        obj.class.name or raise
+        "::#{obj.class.name}" or raise
       when true, false
         "bool"
       when Array
-        return "Array[untyped]" if obj.empty?
+        return "::Array[untyped]" if obj.empty?
 
         items = obj.map { |e| guess_type(e) }.uniq
         if items.include?("untyped")
-          "Array[untyped]"
+          "::Array[untyped]"
         else
-          "Array[#{items.join(" | ")}]"
+          "::Array[#{items.join(" | ")}]"
         end
       when Hash
-        return "Hash[untyped, untyped]" if obj.empty?
+        return "::Hash[untyped, untyped]" if obj.empty?
 
         keys = obj.keys.map { |e| guess_type(e) }.uniq
         values = obj.values.map { |e| guess_type(e) }.uniq
         key_type = keys.include?("untyped") ? "untyped" : keys.join(" | ")
         value_type = values.include?("untyped") ? "untyped" : values.join(" | ")
-        "Hash[#{key_type}, #{value_type}]"
+        "::Hash[#{key_type}, #{value_type}]"
       else
         "untyped"
       end

data/lib/rbs_activesupport/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RbsActivesupport
-  VERSION = "1.4.3" #: String
+  VERSION = "1.6.0"
 end

data/rbs_collection.lock.yaml

@@ -2,11 +2,11 @@
 path: ".gem_rbs_collection"
 gems:
 - name: actionpack
-  version: '6.0'
+  version: '7.2'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actionview
@@ -14,7 +14,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activesupport
@@ -22,7 +22,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -30,17 +30,29 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: base64
+  version: '0.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: benchmark
   version: '0'
   source:
     type: stdlib
 - name: bigdecimal
-  version: '0'
+  version: '3.1'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: cgi
   version: '0'
   source:
@@ -50,7 +62,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: connection_pool
@@ -58,18 +70,14 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     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
+- name: digest
   version: '0'
   source:
     type: stdlib
@@ -86,7 +94,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: io-console
@@ -102,23 +110,27 @@ gems:
   source:
     type: stdlib
 - name: minitest
-  version: '0'
+  version: '5.25'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: monitor
   version: '0'
   source:
     type: stdlib
 - name: mutex_m
-  version: '0'
+  version: 0.3.0
   source:
-    type: stdlib
+    type: rubygems
 - name: nokogiri
   version: '1.11'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: openssl
@@ -134,7 +146,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: parser
@@ -142,27 +154,19 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: pathname
   version: '0'
   source:
     type: stdlib
-- 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: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rails-dom-testing
@@ -170,7 +174,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rails-html-sanitizer
@@ -178,7 +182,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: railties
@@ -186,7 +190,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rainbow
@@ -194,7 +198,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -202,11 +206,11 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.6.1
+  version: 3.9.4
   source:
     type: rubygems
 - name: rdoc
@@ -218,7 +222,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ripper
@@ -230,7 +234,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop-ast
@@ -238,7 +242,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: securerandom
@@ -253,7 +257,7 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: strscan
+- name: stringio
   version: '0'
   source:
     type: stdlib
@@ -266,7 +270,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: time
@@ -286,7 +290,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
+    revision: 4af987b9b70455bd4493ef5a10e885f36e6ca6f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: uri

data/sig/rbs_activesupport/declaration_builder.rbs

@@ -6,12 +6,15 @@ module RbsActivesupport
 
     include AST
 
+    attr_reader resolver: RBS::Resolver::TypeNameResolver
+
     attr_reader method_searcher: MethodSearcher
 
     attr_reader included_modules: Array[RBS::Namespace]
 
+    # @rbs resolver: RBS::Resolver::TypeNameResolver
     # @rbs method_searcher: MethodSearcher
-    def initialize: (MethodSearcher method_searcher) -> void
+    def initialize: (RBS::Resolver::TypeNameResolver resolver, MethodSearcher method_searcher) -> void
 
     # @rbs namespace: RBS::Namespace
     # @rbs method_calls: Array[Parser::MethodCall]
@@ -40,19 +43,29 @@ module RbsActivesupport
     # @rbs context: RBS::Namespace?
     def build_include: (RBS::Namespace namespace, Parser::MethodCall method_call, RBS::Namespace? context) -> Array[t]
 
+    # @rbs namespace: RBS::Namespace
     # @rbs decl: t
-    def render: (t decl) -> String
+    def render: (RBS::Namespace namespace, t decl) -> String
 
+    # @rbs namespace: RBS::Namespace
     # @rbs decl: AttributeAccessor
-    def render_attribute_accessor: (AttributeAccessor decl) -> String
+    def render_attribute_accessor: (RBS::Namespace namespace, AttributeAccessor decl) -> String
 
+    # @rbs namespace: RBS::Namespace
     # @rbs decl: ClassAttribute
-    def render_class_attribute: (ClassAttribute decl) -> String
+    def render_class_attribute: (RBS::Namespace namespace, ClassAttribute decl) -> String
 
     # @rbs decl: Delegate
     def render_delegate: (Delegate decl) -> String
 
     # @rbs decl: Include
     def render_include: (Include decl) -> String
+
+    # @rbs namespace: RBS::Namespace
+    # @rbs type: String
+    def resolve_type: (RBS::Namespace namespace, String type) -> String
+
+    # @rbs type_name: RBS::TypeName
+    def context_from: (RBS::TypeName type_name) -> RBS::Resolver::context
   end
 end

data/sig/rbs_activesupport/generator.rbs

@@ -30,5 +30,8 @@ module RbsActivesupport
 
     # @rbs namespace: RBS::Namespace
     def footer: (RBS::Namespace namespace) -> String
+
+    # @rbs namespace: RBS::Namespace
+    def namespace_to_names: (RBS::Namespace namespace) -> Array[RBS::TypeName]
   end
 end

data/sig/rbs_activesupport/method_searcher.rbs

@@ -21,5 +21,8 @@ module RbsActivesupport
     # @rbs type_name: RBS::TypeName
     # @rbs method: Symbol
     def lookup_method_types: (RBS::TypeName type_name, Symbol method) -> Array[RBS::MethodType]
+
+    # @rbs return_type: RBS::Types::t
+    def build_method_def: (RBS::Types::t return_type) -> RBS::MethodType
   end
 end

data/sig/rbs_activesupport/version.rbs

@@ -1,5 +1,5 @@
 # Generated from lib/rbs_activesupport/version.rb with RBS::Inline
 
 module RbsActivesupport
-  VERSION: String
+  VERSION: ::String
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_activesupport
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - i.tkomiya@gmail.com
 executables: []
@@ -106,7 +106,7 @@ metadata:
   homepage_uri: https://github.com/tk0miya/rbs_activesupport
   source_code_uri: https://github.com/tk0miya/rbs_activesupport
   changelog_uri: https://github.com/tk0miya/rbs_activesupport
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.22
-signing_key: 
+signing_key:
 specification_version: 4
-summary: A RBS files generatorfor activesupport
+summary: A RBS files generator for activesupport
 test_files: []