rbs_activesupport 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccecb9129edd479a2f56c541fc90b0a6a2d97f72e757716767ff48c8d54b2400
-  data.tar.gz: df1a171c089788a1fd9e63c5cde999e92513973344943148baa39e8f29ea06ce
+  metadata.gz: 9aff5090ae7c5a84c8472fe704bad2d643c7eec74367a71ade06e67fe548fbd4
+  data.tar.gz: 1c69a70033b144fe532c45cc313312406631a04503752f2a6deddf5a4960a3d2
 SHA512:
-  metadata.gz: f9f43ad74fe99dcff010b3beed25ffbf58e923ae5d7d0a4aeaa7777f167eb2a0bdcd2ad215cf6c7b593948f975e326007d8b03ce22472a0cb153119a56fb1a7b
-  data.tar.gz: 5bbaefec682d46203cda74d49bd6e9eab1c7461afc6d13448d0056f93da5d1cd485ac790a4e415790e11abd57532fdf0bf8fcb61a48cc6189146539118ac0038
+  metadata.gz: bbe64bfcf0498b6ea9500ccfbd4f250117bff44dabedd05fc5289ae3a3ecbb027b71c3d54e2fc6032ada3301a3d82887de1892886c7fd2ae856a953cc4fc0725
+  data.tar.gz: 6028e5ae17c835205bd7e32e3e59d050ce2cabe0439c0e040927075626f29b7dfb4b448301fd6502d5951e05aa4b13a48c3506a8e618b73f670011b9d346a985

data/README.md

@@ -91,6 +91,34 @@ class User
 end
 ```
 
+rbs_activesupport also supports class attributes definition inside the "included" block:
+
+```ruby
+module MyConcern
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :name
+  end
+end
+```
+
+It is translated to the following RBS:
+
+```ruby
+module MyConcern
+  module ClassMethods
+    def name: () -> untyped
+    def name=: (untyped) -> untyped
+    def name?: () -> bool
+  end
+
+  def name: () -> untyped
+  def name=: (untyped) -> untyped
+  def name?: () -> bool
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also

data/lib/rbs_activesupport/ast.rb

@@ -3,8 +3,8 @@
 module RbsActivesupport
   module AST
     # @rbs node: Array[untyped]
-    def eval_args(node) #: Array[Array[Symbol?]]
-      # @type var args: Array[Array[Symbol?]]
+    def eval_include_args(node) #: Array[RBS::Namespace]
+      # @type var args: Array[RBS::Namespace]
       *args, _ = eval_node(node)
       args
     end
@@ -22,21 +22,25 @@ module RbsActivesupport
       end
     end
 
-    def eval_node(node)
+    def eval_node(node) # rubocop:disable Metrics/PerceivedComplexity
       case node
       when nil
         nil
-      when Symbol, Hash # Only for debug use
+      when Symbol, Hash, RBS::Namespace # Only for debug use
         node
       when Array
         node.map { |e| eval_node(e) }
       when RubyVM::AbstractSyntaxTree::Node
         case node.type
-        when :LIT
+        when :LIT, :STR
           node.children.first
         when :HASH
           elem = node.children.first.children.compact.map { |e| eval_node(e) }
           Hash[*elem]
+        when :ZLIST
+          []
+        when :LIST
+          node.children[...-1]&.map { |e| eval_node(e) }
         when :TRUE
           true
         when :FALSE
@@ -44,11 +48,11 @@ module RbsActivesupport
         when :NIL
           nil
         when :CONST
-          node.children
+          RBS::Namespace.new(path: node.children, absolute: false)
         when :COLON2
-          eval_node(node.children.first) + [node.children.last]
+          eval_node(node.children.first) + RBS::Namespace.new(path: [node.children.last], absolute: false)
         when :COLON3
-          [nil, node.children.first]
+          RBS::Namespace.new(path: node.children, absolute: true)
         else
           p node # for debug
           raise

data/lib/rbs_activesupport/attribute_accessor.rb

@@ -17,6 +17,8 @@ module RbsActivesupport
       trailing_comment = options[:trailing_comment]
       if trailing_comment&.start_with?("#:")
         trailing_comment[2..].strip
+      elsif default?
+        default_type
       else
         "untyped"
       end
@@ -42,6 +44,15 @@ module RbsActivesupport
       options.fetch(:instance_writer, instance_accessor?)
     end
 
+    def default? #: boolish
+      options.fetch(:default, nil)
+    end
+
+    def default_type #: String
+      default = options.fetch(:default, nil)
+      RbsActivesupport::Types.guess_type(default)
+    end
+
     def public? #: bool
       !private?
     end
@@ -49,5 +60,9 @@ module RbsActivesupport
     def private? #: bool
       options.fetch(:private, false)
     end
+
+    def included? #: bool
+      options.fetch(:included, false)
+    end
   end
 end

data/lib/rbs_activesupport/class_attribute.rb

@@ -17,6 +17,8 @@ module RbsActivesupport
       trailing_comment = options[:trailing_comment]
       if trailing_comment&.start_with?("#:")
         trailing_comment[2..].strip
+      elsif default?
+        default_type
       else
         "untyped"
       end
@@ -38,6 +40,15 @@ module RbsActivesupport
       options.fetch(:instance_predicate, true)
     end
 
+    def default? #: boolish
+      options.fetch(:default, nil)
+    end
+
+    def default_type #: String
+      default = options.fetch(:default, nil)
+      RbsActivesupport::Types.guess_type(default)
+    end
+
     def public? #: bool
       !private?
     end
@@ -45,5 +56,9 @@ module RbsActivesupport
     def private? #: bool
       options.fetch(:private, false)
     end
+
+    def included? #: bool
+      options.fetch(:included, false)
+    end
   end
 end

data/lib/rbs_activesupport/declaration_builder.rb

@@ -15,17 +15,19 @@ module RbsActivesupport
 
     # @rbs namespace: RBS::Namespace
     # @rbs method_calls: Array[Parser::MethodCall]
-    def build(namespace, method_calls) #: [Array[String], Array[String]]
-      public_decls, private_decls = build_method_calls(namespace, method_calls).partition(&:public?)
-      [public_decls.map(&method(:render)).compact, # steep:ignore BlockTypeMismatch
-       private_decls.map(&method(:render)).compact] # steep:ignore BlockTypeMismatch
+    # @rbs context: RBS::Namespace?
+    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
     end
 
     private
 
     # @rbs namespace: RBS::Namespace
     # @rbs method_calls: Array[Parser::MethodCall]
-    def build_method_calls(namespace, method_calls) #: Array[t]
+    # @rbs context: RBS::Namespace?
+    def build_method_calls(namespace, method_calls, context) #: Array[t]
       method_calls.flat_map do |method_call|
         case method_call.name
         when :class_attribute
@@ -35,7 +37,7 @@ module RbsActivesupport
         when :cattr_accessor, :mattr_accessor, :cattr_reader, :mattr_reader, :cattr_writer, :mattr_writer
           build_attribute_accessor(method_call)
         when :include
-          build_include(namespace, method_call)
+          build_include(namespace, method_call, context)
         end
       rescue StandardError => e
         puts "ERROR: #{namespace}:#{method_call.name}: Failed to build method calls: #{e}"
@@ -51,6 +53,7 @@ module RbsActivesupport
       options[:instance_reader] = false if %i[cattr_writer mattr_writer].include?(method_call.name)
       options[:instance_writer] = false if %i[cattr_reader mattr_reader].include?(method_call.name)
       options[:private] = true if method_call.private?
+      options[:included] = method_call.included
       options[:trailing_comment] = method_call.trailing_comment
       methods.map do |method|
         AttributeAccessor.new(method, options)
@@ -61,6 +64,7 @@ module RbsActivesupport
     def build_class_attribute(method_call) #: Array[ClassAttribute]
       methods, options = eval_args_with_options(method_call.args)
       options[:private] = true if method_call.private?
+      options[:included] = method_call.included
       options[:trailing_comment] = method_call.trailing_comment
       methods.map do |method|
         ClassAttribute.new(method, options)
@@ -79,15 +83,19 @@ module RbsActivesupport
 
     # @rbs namespace: RBS::Namespace
     # @rbs method_call: Parser::MethodCall
-    def build_include(namespace, method_call) #: Array[Include]
-      module_paths = eval_args(method_call.args)
-      module_paths.map do |module_path|
-        Include.new(namespace, module_path, { private: method_call.private? })
+    # @rbs context: RBS::Namespace?
+    def build_include(namespace, method_call, context) #: Array[t]
+      module_paths = eval_include_args(method_call.args)
+      module_paths.flat_map do |module_path|
+        include = Include.new(context || namespace, module_path, { private: method_call.private? })
+        ([include] +
+         build_method_calls(namespace, include.nested_includes, include.module_name) +
+         build_method_calls(namespace, include.method_calls_in_included_block, include.module_name))
       end
     end
 
     # @rbs decl: t
-    def render(decl) #: String?
+    def render(decl) #: String
       case decl
       when AttributeAccessor
         render_attribute_accessor(decl)
@@ -130,13 +138,16 @@ module RbsActivesupport
     end
 
     # @rbs decl: Include
-    def render_include(decl) #: String?
-      return unless decl.concern? && decl.classmethods?
-
-      <<~RBS
-        include #{decl.argument.to_s.delete_suffix("::")}
-        extend #{decl.argument}ClassMethods
-      RBS
+    def render_include(decl) #: String
+      module_name = decl.module_name || decl.module_path
+      if decl.concern? && decl.classmethods?
+        <<~RBS
+          include #{module_name.to_s.delete_suffix("::")}
+          extend #{module_name}ClassMethods
+        RBS
+      else
+        "include #{module_name.to_s.delete_suffix("::")}"
+      end
     end
   end
 end

data/lib/rbs_activesupport/include.rb

@@ -5,11 +5,11 @@ require "active_support/concern"
 module RbsActivesupport
   class Include
     attr_reader :context #: RBS::Namespace
-    attr_reader :module_path #: Array[Symbol?]
+    attr_reader :module_path #: RBS::Namespace
     attr_reader :options #: Hash[Symbol, untyped]
 
     # @rbs context: RBS::Namespace
-    # @rbs module_path: Array[Symbol?]
+    # @rbs module_path: RBS::Namespace
     # @rbs options: Hash[Symbol, untyped]
     def initialize(context, module_path, options) #: void
       @context = context
@@ -17,20 +17,12 @@ module RbsActivesupport
       @options = options
     end
 
-    def argument #: RBS::Namespace
-      if module_path.first.nil?
-        RBS::Namespace.new(path: module_path[1...], absolute: true) # steep:ignore ArgumentTypeMismatch
-      else
-        RBS::Namespace.new(path: module_path, absolute: false) # steep:ignore ArgumentTypeMismatch
-      end
-    end
-
     # @rbs %a{pure}
     def module_name #: RBS::Namespace?
       namespace = @context
 
       loop do
-        modname = namespace + argument
+        modname = namespace + module_path
         return modname if Object.const_defined?(modname.to_s.delete_suffix("::"))
 
         break if namespace.empty?
@@ -39,21 +31,40 @@ module RbsActivesupport
       end
     end
 
-    def concern? #: bool
-      return false unless module_name
+    # @rbs %a{pure}
+    def module #: Module?
+      return unless module_name
 
       modname = module_name.to_s.delete_suffix("::")
-      return false unless Object.const_defined?(modname)
+      return unless Object.const_defined?(modname)
+
+      Object.const_get(modname)
+    end
+
+    def concern? #: boolish
+      self.module&.singleton_class&.include?(ActiveSupport::Concern)
+    end
+
+    def classmethods? #: boolish
+      return false unless self.module
+
+      self.module&.const_defined?(:ClassMethods)
+    end
+
+    def nested_includes #: Array[Parser::MethodCall]
+      return [] unless module_name
+      return [] unless parser
 
-      mod = Object.const_get(modname)
-      mod&.singleton_class&.include?(ActiveSupport::Concern)
+      method_calls = parser.method_calls[module_name] || []
+      method_calls.select { |call| call.name == :include && !call.included }
     end
 
-    def classmethods? #: bool
-      return false unless module_name
+    def method_calls_in_included_block #: Array[Parser::MethodCall]
+      return [] unless module_name
+      return [] unless parser
 
-      modname = module_name.append(:ClassMethods).to_s.delete_suffix("::")
-      Object.const_defined?(modname)
+      method_calls = parser.method_calls[module_name] || []
+      method_calls.select(&:included)
     end
 
     def public? #: bool
@@ -63,5 +74,23 @@ module RbsActivesupport
     def private? #: bool
       options.fetch(:private, false)
     end
+
+    private
+
+    # @rbs @parser: Parser
+
+    # @rbs %a{pure}
+    def parser #: Parser?
+      return nil unless module_name
+
+      @parser ||= begin
+        path, = Object.const_source_location(module_name.to_s.delete_suffix("::")) #: String?
+        return nil unless path && File.exist?(path)
+
+        Parser.new(parse_included_block: true).tap do |parser|
+          parser.parse(File.read(path))
+        end
+      end
+    end
   end
 end

data/lib/rbs_activesupport/parser.rb

@@ -10,6 +10,7 @@ module RbsActivesupport
     class MethodCall
       attr_reader :name #: t
       attr_reader :args #: Array[RubyVM::AbstractSyntaxTree::Node]
+      attr_reader :included #: bool
       attr_reader :trailing_comment #: String?
 
       # @rbs @private: bool
@@ -17,11 +18,13 @@ module RbsActivesupport
       # @rbs name: t
       # @rbs args: Array[RubyVM::AbstractSyntaxTree::Node]
       # @rbs private: bool
+      # @rbs included: bool
       # @rbs trailing_comment: String?
-      def initialize(name, args, private, trailing_comment: nil) #: void
+      def initialize(name, args, private, included: false, trailing_comment: nil) #: void
         @name = name
         @args = args
         @private = private
+        @included = included
         @trailing_comment = trailing_comment
       end
 
@@ -42,11 +45,16 @@ module RbsActivesupport
 
     attr_reader :comment_parser #: CommentParser
     attr_reader :method_calls #: Hash[RBS::Namespace, Array[MethodCall]]
+    attr_reader :parse_included_block #: bool
 
-    def initialize #: void
-      super
+    # @rbs @in_included_block: bool
+
+    def initialize(parse_included_block: false) #: void
+      super()
       @comment_parser = CommentParser.new
+      @parse_included_block = parse_included_block
       @method_calls = Hash.new { |hash, key| hash[key] = [] }
+      @in_included_block = false
     end
 
     # @rbs string: String
@@ -56,17 +64,30 @@ module RbsActivesupport
     end
 
     # @rbs override
-    def process(node, decls:, comments:, context:)
+    def process(node, decls:, comments:, context:) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       case node.type
+      when :DEFN, :DEFS
+        # ignore definitions inside methods
       when :FCALL, :VCALL
         args = node.children[1]&.children || []
         case node.children[0]
         when *METHODS
           @method_calls[context.namespace] << MethodCall.new(node.children[0], args, private?(decls),
+                                                             included: in_included_block?,
                                                              trailing_comment: trailing_comment_for(node))
         else
           process_orig(node, decls: decls, comments: comments, context: 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)
+          end
+        else
+          process_orig(node, decls: decls, comments: comments, context: context)
+        end
       else
         process_orig(node, decls: decls, comments: comments, context: context)
       end
@@ -81,5 +102,17 @@ module RbsActivesupport
     def private?(decls) #: bool
       current_accessibility(decls) == private
     end
+
+    def in_included_block? #: bool
+      @in_included_block
+    end
+
+    # @rbs &block: () -> void
+    def with_included_block(&block) #: void
+      @in_included_block = true
+      block.call
+    ensure
+      @in_included_block = false
+    end
   end
 end

data/lib/rbs_activesupport/types.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module RbsActivesupport
+  module Types
+    # @rbs!
+    #   def self.guess_type: (untyped obj) -> String
+
+    # @rbs obj: untyped
+    def guess_type(obj) #: String # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      case obj
+      when nil
+        "nil"
+      when Integer, Float, Symbol, String
+        obj.class.name or raise
+      when true, false
+        "bool"
+      when Array
+        return "Array[untyped]" if obj.empty?
+
+        items = obj.map { |e| guess_type(e) }.uniq
+        if items.include?("untyped")
+          "Array[untyped]"
+        else
+          "Array[#{items.join(" | ")}]"
+        end
+      when Hash
+        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}]"
+      else
+        "untyped"
+      end
+    end
+    module_function :guess_type
+  end
+end

data/lib/rbs_activesupport/version.rb

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

data/lib/rbs_activesupport.rb

@@ -10,6 +10,7 @@ require_relative "rbs_activesupport/include"
 require_relative "rbs_activesupport/method_searcher"
 require_relative "rbs_activesupport/parser"
 require_relative "rbs_activesupport/parser/comment_parser"
+require_relative "rbs_activesupport/types"
 require_relative "rbs_activesupport/version"
 
 module RbsActivesupport

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     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: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     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: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -30,7 +30,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: base64
@@ -50,7 +50,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: connection_pool
@@ -58,7 +58,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: date
@@ -82,7 +82,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: io-console
@@ -114,7 +114,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: optparse
@@ -126,7 +126,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: parser
@@ -134,7 +134,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: pathname
@@ -154,7 +154,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rails-dom-testing
@@ -162,7 +162,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: railties
@@ -170,7 +170,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rainbow
@@ -178,7 +178,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -186,11 +186,11 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.5.2
+  version: 3.6.1
   source:
     type: rubygems
 - name: rdoc
@@ -202,7 +202,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ripper
@@ -214,7 +214,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rubocop-ast
@@ -222,7 +222,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: securerandom
@@ -246,7 +246,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: time
@@ -266,7 +266,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: f88536536950701925e9293f7fa7d3629965c53f
+    revision: dcc30eaed71a6e36acde3a018e6f1ffd27f72d09
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: uri

data/rbs_collection.yaml

@@ -14,4 +14,6 @@ sources:
 path: .gem_rbs_collection
 
 gems:
+  - name: optparse
+  - name: pathname
   - name: ripper

data/sig/rbs_activesupport/ast.rbs

@@ -3,7 +3,7 @@
 module RbsActivesupport
   module AST
     # @rbs node: Array[untyped]
-    def eval_args: (Array[untyped] node) -> Array[Array[Symbol?]]
+    def eval_include_args: (Array[untyped] node) -> Array[RBS::Namespace]
 
     # @rbs node: Array[untyped]
     def eval_args_with_options: (Array[untyped] node) -> [ Array[Symbol], Hash[Symbol, untyped] ]

data/sig/rbs_activesupport/attribute_accessor.rbs

@@ -22,8 +22,14 @@ module RbsActivesupport
 
     def instance_writer?: () -> bool
 
+    def default?: () -> boolish
+
+    def default_type: () -> String
+
     def public?: () -> bool
 
     def private?: () -> bool
+
+    def included?: () -> bool
   end
 end

data/sig/rbs_activesupport/class_attribute.rbs

@@ -20,8 +20,14 @@ module RbsActivesupport
 
     def instance_predicate?: () -> bool
 
+    def default?: () -> boolish
+
+    def default_type: () -> String
+
     def public?: () -> bool
 
     def private?: () -> bool
+
+    def included?: () -> bool
   end
 end

data/sig/rbs_activesupport/declaration_builder.rbs

@@ -13,13 +13,15 @@ module RbsActivesupport
 
     # @rbs namespace: RBS::Namespace
     # @rbs method_calls: Array[Parser::MethodCall]
-    def build: (RBS::Namespace namespace, Array[Parser::MethodCall] method_calls) -> [ Array[String], Array[String] ]
+    # @rbs context: RBS::Namespace?
+    def build: (RBS::Namespace namespace, Array[Parser::MethodCall] method_calls, ?RBS::Namespace? context) -> [ Array[String], Array[String] ]
 
     private
 
     # @rbs namespace: RBS::Namespace
     # @rbs method_calls: Array[Parser::MethodCall]
-    def build_method_calls: (RBS::Namespace namespace, Array[Parser::MethodCall] method_calls) -> Array[t]
+    # @rbs context: RBS::Namespace?
+    def build_method_calls: (RBS::Namespace namespace, Array[Parser::MethodCall] method_calls, RBS::Namespace? context) -> Array[t]
 
     # @rbs method_call: Parser::MethodCall
     def build_attribute_accessor: (Parser::MethodCall method_call) -> Array[AttributeAccessor]
@@ -33,10 +35,11 @@ module RbsActivesupport
 
     # @rbs namespace: RBS::Namespace
     # @rbs method_call: Parser::MethodCall
-    def build_include: (RBS::Namespace namespace, Parser::MethodCall method_call) -> Array[Include]
+    # @rbs context: RBS::Namespace?
+    def build_include: (RBS::Namespace namespace, Parser::MethodCall method_call, RBS::Namespace? context) -> Array[t]
 
     # @rbs decl: t
-    def render: (t decl) -> String?
+    def render: (t decl) -> String
 
     # @rbs decl: AttributeAccessor
     def render_attribute_accessor: (AttributeAccessor decl) -> String
@@ -48,6 +51,6 @@ module RbsActivesupport
     def render_delegate: (Delegate decl) -> String
 
     # @rbs decl: Include
-    def render_include: (Include decl) -> String?
+    def render_include: (Include decl) -> String
   end
 end

data/sig/rbs_activesupport/include.rbs

@@ -4,27 +4,41 @@ module RbsActivesupport
   class Include
     attr_reader context: RBS::Namespace
 
-    attr_reader module_path: Array[Symbol?]
+    attr_reader module_path: RBS::Namespace
 
     attr_reader options: Hash[Symbol, untyped]
 
     # @rbs context: RBS::Namespace
-    # @rbs module_path: Array[Symbol?]
+    # @rbs module_path: RBS::Namespace
     # @rbs options: Hash[Symbol, untyped]
-    def initialize: (RBS::Namespace context, Array[Symbol?] module_path, Hash[Symbol, untyped] options) -> void
-
-    def argument: () -> RBS::Namespace
+    def initialize: (RBS::Namespace context, RBS::Namespace module_path, Hash[Symbol, untyped] options) -> void
 
     # @rbs %a{pure}
     %a{pure}
     def module_name: () -> RBS::Namespace?
 
-    def concern?: () -> bool
+    # @rbs %a{pure}
+    %a{pure}
+    def module: () -> Module?
+
+    def concern?: () -> boolish
+
+    def classmethods?: () -> boolish
+
+    def nested_includes: () -> Array[Parser::MethodCall]
 
-    def classmethods?: () -> bool
+    def method_calls_in_included_block: () -> Array[Parser::MethodCall]
 
     def public?: () -> bool
 
     def private?: () -> bool
+
+    private
+
+    @parser: Parser
+
+    # @rbs %a{pure}
+    %a{pure}
+    def parser: () -> Parser?
   end
 end

data/sig/rbs_activesupport/parser.rbs

@@ -7,6 +7,8 @@ module RbsActivesupport
 
       attr_reader args: Array[RubyVM::AbstractSyntaxTree::Node]
 
+      attr_reader included: bool
+
       attr_reader trailing_comment: String?
 
       @private: bool
@@ -14,8 +16,9 @@ module RbsActivesupport
       # @rbs name: t
       # @rbs args: Array[RubyVM::AbstractSyntaxTree::Node]
       # @rbs private: bool
+      # @rbs included: bool
       # @rbs trailing_comment: String?
-      def initialize: (t name, Array[RubyVM::AbstractSyntaxTree::Node] args, bool private, ?trailing_comment: String?) -> void
+      def initialize: (t name, Array[RubyVM::AbstractSyntaxTree::Node] args, bool private, ?included: bool, ?trailing_comment: String?) -> void
 
       def private?: () -> bool
     end
@@ -30,7 +33,11 @@ module RbsActivesupport
 
     attr_reader method_calls: Hash[RBS::Namespace, Array[MethodCall]]
 
-    def initialize: () -> void
+    attr_reader parse_included_block: bool
+
+    @in_included_block: bool
+
+    def initialize: (?parse_included_block: untyped) -> void
 
     # @rbs string: String
     def parse: (String string) -> void
@@ -45,5 +52,10 @@ module RbsActivesupport
     def private?: (Array[RBS::AST::Declarations::t | RBS::AST::Members::t] decls) -> bool
 
     private
+
+    def in_included_block?: () -> bool
+
+    # @rbs &block: () -> void
+    def with_included_block: () { () -> void } -> void
   end
 end

data/sig/rbs_activesupport/types.rbs

@@ -0,0 +1,10 @@
+# Generated from lib/rbs_activesupport/types.rb with RBS::Inline
+
+module RbsActivesupport
+  module Types
+    def self.guess_type: (untyped obj) -> String
+
+    # @rbs obj: untyped
+    def guess_type: (untyped obj) -> String
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs_activesupport
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,7 @@ files:
 - lib/rbs_activesupport/parser.rb
 - lib/rbs_activesupport/parser/comment_parser.rb
 - lib/rbs_activesupport/rake_task.rb
+- lib/rbs_activesupport/types.rb
 - lib/rbs_activesupport/version.rb
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
@@ -96,6 +97,7 @@ files:
 - sig/rbs_activesupport/parser.rbs
 - sig/rbs_activesupport/parser/comment_parser.rbs
 - sig/rbs_activesupport/rake_task.rbs
+- sig/rbs_activesupport/types.rbs
 - sig/rbs_activesupport/version.rbs
 homepage: https://github.com/tk0miya/rbs_activesupport
 licenses: