rbi 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7c963f26d929bf1c52a460d2f6f47669aa5eb23ce9ebe061ec556ea91247b1
-  data.tar.gz: 4d86c174bb9270e060978f512d4193cdf1f427b9059c49bc2c913f3a0b25e4c5
+  metadata.gz: 30c1564f6fad1d76035f6cd07bf31237251e6c622350aa4911797980b3a17414
+  data.tar.gz: 1d1350fa25cf2dad93c59e74288372701bfe73c6214d46e279350a953269786d
 SHA512:
-  metadata.gz: d42622aa6fed586afe5f8c247144d3d36b6409107df4bd8a6e53b9f96812523f9d6e098ab95e8e715e9b0f4a2bb6d24dffa7831f251367038fb69a164a827496
-  data.tar.gz: 8e97964c77c0b5d96b763ab6e0b502bf5cd6fb56bbab556efe073d30a74cb1912e13777635c26993702ef5974dbe971520ac153fe8f8cc5ce481055659c3c91c
+  metadata.gz: a273b8f7e57c8471e8a9d46f71c7b554e2416243e7ef1c953137720543f7dd70f4166b0c916e327dcb9cf516e0668deaf56027ade2c36485f9fce10cfedb9d9d
+  data.tar.gz: e03adcd232b2557c68d6a18a62c0e0b1977e8f4cccb3a8718f711ae2ec35ded301026021a7d39829da51286348089cdde3593d0b3bb1703da8d69a86af6364c5

data/Gemfile

@@ -10,7 +10,7 @@ group(:development, :test) do
   gem("minitest")
   gem("minitest-reporters")
   gem("rake", "~> 13.2")
-  gem("rubocop", "~> 1.73", require: false)
+  gem("rubocop", "~> 1.75", require: false)
   gem("rubocop-shopify", require: false)
   gem("rubocop-sorbet", require: false)
   gem("sorbet", ">= 0.5.9204", require: false)

data/lib/rbi/formatter.rb

@@ -6,14 +6,15 @@ module RBI
     #: Integer?
     attr_accessor :max_line_length
 
-    #: (?add_sig_templates: bool, ?group_nodes: bool, ?max_line_length: Integer?, ?nest_singleton_methods: bool, ?nest_non_public_members: bool, ?sort_nodes: bool) -> void
+    #: (?add_sig_templates: bool, ?group_nodes: bool, ?max_line_length: Integer?, ?nest_singleton_methods: bool, ?nest_non_public_members: bool, ?sort_nodes: bool, ?replace_attributes_with_methods: bool) -> void
     def initialize(
       add_sig_templates: false,
       group_nodes: false,
       max_line_length: nil,
       nest_singleton_methods: false,
       nest_non_public_members: false,
-      sort_nodes: false
+      sort_nodes: false,
+      replace_attributes_with_methods: false
     )
       @add_sig_templates = add_sig_templates
       @group_nodes = group_nodes
@@ -21,6 +22,7 @@ module RBI
       @nest_singleton_methods = nest_singleton_methods
       @nest_non_public_members = nest_non_public_members
       @sort_nodes = sort_nodes
+      @replace_attributes_with_methods = replace_attributes_with_methods
     end
 
     #: (RBI::File file) -> String
@@ -36,6 +38,7 @@ module RBI
 
     #: (RBI::Tree tree) -> void
     def format_tree(tree)
+      tree.replace_attributes_with_methods! if @replace_attributes_with_methods
       tree.add_sig_templates! if @add_sig_templates
       tree.nest_singleton_methods! if @nest_singleton_methods
       tree.nest_non_public_members! if @nest_non_public_members

data/lib/rbi/index.rb

@@ -17,7 +17,7 @@ module RBI
     #: -> void
     def initialize
       super
-      @index = T.let({}, T::Hash[String, T::Array[Node]])
+      @index = {} #: Hash[String, Array[Node]]
     end
 
     #: -> Array[String]
@@ -217,7 +217,17 @@ module RBI
     # @override
     #: -> Array[String]
     def index_ids
-      [to_s]
+      [fully_qualified_name]
+    end
+  end
+
+  class TEnumValue
+    include Indexable
+
+    # @override
+    #: -> Array[String]
+    def index_ids
+      [fully_qualified_name]
     end
   end
 end

data/lib/rbi/loc.rb

@@ -50,7 +50,7 @@ module RBI
 
       string = String.new
       ::File.foreach(file).with_index do |line, line_number|
-        string << line if line_number + 1 >= begin_line && line_number + 1 <= end_line
+        string << line if (line_number + 1).between?(begin_line, end_line)
       end
       string
     end

data/lib/rbi/model.rb

@@ -45,7 +45,7 @@ module RBI
 
     #: -> Scope?
     def parent_scope
-      parent = T.let(parent_tree, T.nilable(Tree))
+      parent = parent_tree #: Tree?
       parent = parent.parent_tree until parent.is_a?(Scope) || parent.nil?
       parent
     end
@@ -105,7 +105,9 @@ module RBI
     def annotations
       comments
         .select { |comment| comment.text.start_with?("@") }
-        .map { |comment| T.must(comment.text[1..]) }
+        .map do |comment|
+          comment.text[1..] #: as !nil
+        end
     end
   end
 
@@ -116,7 +118,7 @@ module RBI
     #: (?loc: Loc?, ?comments: Array[Comment]) ?{ (Tree node) -> void } -> void
     def initialize(loc: nil, comments: [], &block)
       super(loc: loc, comments: comments)
-      @nodes = T.let([], T::Array[Node])
+      @nodes = [] #: Array[Node]
       block&.call(self)
     end
 
@@ -144,7 +146,7 @@ module RBI
 
     #: (?strictness: String?, ?comments: Array[Comment]) ?{ (File file) -> void } -> void
     def initialize(strictness: nil, comments: [], &block)
-      @root = T.let(Tree.new, Tree)
+      @root = Tree.new #: Tree
       @strictness = strictness
       @comments = comments
       block&.call(self)
@@ -313,7 +315,7 @@ module RBI
     #: (Symbol name, Array[Symbol] names, ?visibility: Visibility, ?sigs: Array[Sig], ?loc: Loc?, ?comments: Array[Comment]) -> void
     def initialize(name, names, visibility: Public.new, sigs: [], loc: nil, comments: [])
       super(loc: loc, comments: comments)
-      @names = T.let([name, *names], T::Array[Symbol])
+      @names = [name, *names] #: Array[Symbol]
       @visibility = visibility
       @sigs = sigs
     end
@@ -671,7 +673,7 @@ module RBI
     #: (String name, Array[String] names, ?loc: Loc?, ?comments: Array[Comment]) -> void
     def initialize(name, names, loc: nil, comments: [])
       super(loc: loc, comments: comments)
-      @names = T.let([name, *names], T::Array[String])
+      @names = [name, *names] #: Array[String]
     end
   end
 
@@ -1037,6 +1039,29 @@ module RBI
     end
   end
 
+  class TEnumValue < NodeWithComments
+    #: String
+    attr_reader :name
+
+    #: (String name, ?loc: Loc?, ?comments: Array[Comment]) ?{ (TEnumValue node) -> void } -> void
+    def initialize(name, loc: nil, comments: [], &block)
+      super(loc: loc, comments: comments)
+      @name = name
+      block&.call(self)
+    end
+
+    #: -> String
+    def fully_qualified_name
+      "#{parent_scope&.fully_qualified_name}::#{name}"
+    end
+
+    # @override
+    #: -> String
+    def to_s
+      fully_qualified_name
+    end
+  end
+
   # Sorbet's misc.
 
   class Helper < NodeWithComments

data/lib/rbi/parser.rb

@@ -136,7 +136,18 @@ module RBI
 
       #: (Prism::Node node) -> String
       def node_string!(node)
-        T.must(node_string(node))
+        node_string(node) #: as !nil
+      end
+
+      #: (Prism::Node node) -> Prism::Location
+      def adjust_prism_location_for_heredoc(node)
+        visitor = HeredocLocationVisitor.new(
+          node.location.send(:source),
+          node.location.start_offset,
+          node.location.end_offset,
+        )
+        visitor.visit(node)
+        visitor.location
       end
     end
 
@@ -151,12 +162,12 @@ module RBI
       def initialize(source, comments:, file:)
         super(source, file: file)
 
-        @comments_by_line = T.let(comments.to_h { |c| [c.location.start_line, c] }, T::Hash[Integer, Prism::Comment])
-        @tree = T.let(Tree.new, Tree)
+        @comments_by_line = comments.to_h { |c| [c.location.start_line, c] } #: Hash[Integer, Prism::Comment]
+        @tree = Tree.new #: Tree
 
-        @scopes_stack = T.let([@tree], T::Array[Tree])
-        @last_node = T.let(nil, T.nilable(Prism::Node))
-        @last_sigs = T.let([], T::Array[RBI::Sig])
+        @scopes_stack = [@tree] #: Array[Tree]
+        @last_node = nil #: Prism::Node?
+        @last_sigs = [] #: Array[RBI::Sig]
       end
 
       # @override
@@ -217,30 +228,51 @@ module RBI
 
         current_scope << if struct
           struct
-        elsif type_variable_definition?(node.value)
-          TypeMember.new(
+        elsif t_enum_value?(node)
+          TEnumValue.new(
             case node
             when Prism::ConstantWriteNode
               node.name.to_s
             when Prism::ConstantPathWriteNode
               node_string!(node.target)
             end,
-            node_string!(node.value),
             loc: node_loc(node),
             comments: node_comments(node),
           )
         else
-          Const.new(
-            case node
-            when Prism::ConstantWriteNode
-              node.name.to_s
-            when Prism::ConstantPathWriteNode
-              node_string!(node.target)
-            end,
-            node_string!(node.value),
-            loc: node_loc(node),
-            comments: node_comments(node),
+          adjusted_node_location = adjust_prism_location_for_heredoc(node)
+
+          adjusted_value_location = Prism::Location.new(
+            node.value.location.send(:source),
+            node.value.location.start_offset,
+            adjusted_node_location.end_offset - node.value.location.start_offset,
           )
+
+          if type_variable_definition?(node.value)
+            TypeMember.new(
+              case node
+              when Prism::ConstantWriteNode
+                node.name.to_s
+              when Prism::ConstantPathWriteNode
+                node_string!(node.target)
+              end,
+              adjusted_value_location.slice,
+              loc: Loc.from_prism(@file, adjusted_node_location),
+              comments: node_comments(node),
+            )
+          else
+            Const.new(
+              case node
+              when Prism::ConstantWriteNode
+                node.name.to_s
+              when Prism::ConstantPathWriteNode
+                node_string!(node.target)
+              end,
+              adjusted_value_location.slice,
+              loc: Loc.from_prism(@file, adjusted_node_location),
+              comments: node_comments(node),
+            )
+          end
         end
       end
 
@@ -509,7 +541,7 @@ module RBI
       # Collect all the remaining comments after visiting the tree
       #: -> void
       def collect_orphan_comments
-        last_line = T.let(nil, T.nilable(Integer))
+        last_line = nil #: Integer?
         last_node_end = @tree.nodes.last&.loc&.end_line
 
         @comments_by_line.each do |line, comment|
@@ -532,7 +564,7 @@ module RBI
 
       #: -> Tree
       def current_scope
-        T.must(@scopes_stack.last) # Should never be nil since we create a Tree as the root
+        @scopes_stack.last #: as !nil # Should never be nil since we create a Tree as the root
       end
 
       #: -> Array[Sig]
@@ -544,7 +576,7 @@ module RBI
 
       #: (Array[Sig] sigs) -> Array[Comment]
       def detach_comments_from_sigs(sigs)
-        comments = T.let([], T::Array[Comment])
+        comments = [] #: Array[Comment]
 
         sigs.each do |sig|
           comments += sig.comments.dup
@@ -587,7 +619,7 @@ module RBI
 
       #: (Prism::Node? node) -> Array[Arg]
       def parse_send_args(node)
-        args = T.let([], T::Array[Arg])
+        args = [] #: Array[Arg]
         return args unless node.is_a?(Prism::ArgumentsNode)
 
         node.arguments.each do |arg|
@@ -598,11 +630,13 @@ module RBI
 
               args << KwArg.new(
                 node_string!(assoc.key).delete_suffix(":"),
-                T.must(node_string(assoc.value)),
+                node_string(assoc.value), #: as !nil
               )
             end
           else
-            args << Arg.new(T.must(node_string(arg)))
+            args << Arg.new(
+              node_string(arg), #: as !nil
+            )
           end
         end
 
@@ -703,7 +737,7 @@ module RBI
         return unless node_string(recv) =~ /(::)?Struct/
 
         members = []
-        keyword_init = T.let(false, T::Boolean)
+        keyword_init = false #: bool
 
         args = send.arguments
         if args.is_a?(Prism::ArgumentsNode)
@@ -753,7 +787,7 @@ module RBI
         type = node_string!(type_arg)
         loc = node_loc(send)
         comments = node_comments(send)
-        default_value = T.let(nil, T.nilable(String))
+        default_value = nil #: String?
 
         rest.each do |arg|
           next unless arg.is_a?(Prism::KeywordHashNode)
@@ -819,6 +853,19 @@ module RBI
       def type_variable_definition?(node)
         node.is_a?(Prism::CallNode) && (node.message == "type_member" || node.message == "type_template")
       end
+
+      #: (Prism::Node? node) -> bool
+      def t_enum_value?(node)
+        return false unless current_scope.is_a?(TEnumBlock)
+
+        return false unless node.is_a?(Prism::ConstantWriteNode)
+
+        value = node.value
+        return false unless value.is_a?(Prism::CallNode)
+        return false unless value.message == "new"
+
+        true
+      end
     end
 
     class SigBuilder < Visitor
@@ -829,7 +876,7 @@ module RBI
       def initialize(content, file:)
         super
 
-        @current = T.let(Sig.new, Sig)
+        @current = Sig.new #: Sig
       end
 
       # @override
@@ -903,5 +950,57 @@ module RBI
         )
       end
     end
+
+    class HeredocLocationVisitor < Prism::Visitor
+      #: (Prism::Source source, Integer begin_offset, Integer end_offset) -> void
+      def initialize(source, begin_offset, end_offset)
+        super()
+        @source = source
+        @begin_offset = begin_offset
+        @end_offset = end_offset
+        @offset_last_newline = false #: bool
+      end
+
+      #: (Prism::StringNode node) -> void
+      def visit_string_node(node)
+        return unless node.heredoc?
+
+        closing_loc = node.closing_loc
+        return unless closing_loc
+
+        handle_string_node(node)
+      end
+
+      #: (Prism::InterpolatedStringNode node) -> void
+      def visit_interpolated_string_node(node)
+        return super unless node.heredoc?
+
+        closing_loc = node.closing_loc
+        return super unless closing_loc
+
+        handle_string_node(node)
+      end
+
+      #: -> Prism::Location
+      def location
+        Prism::Location.new(
+          @source,
+          @begin_offset,
+          @end_offset - @begin_offset - (@offset_last_newline ? 1 : 0),
+        )
+      end
+
+      private
+
+      #: (Prism::StringNode | Prism::InterpolatedStringNode node) -> void
+      def handle_string_node(node)
+        closing_loc = node.closing_loc #: as !nil
+
+        if closing_loc.end_offset > @end_offset
+          @end_offset = closing_loc.end_offset
+          @offset_last_newline = true if node.closing_loc&.slice&.end_with?("\n")
+        end
+      end
+    end
   end
 end

data/lib/rbi/printer.rb

@@ -23,8 +23,8 @@ module RBI
       @out = out
       @current_indent = indent
       @print_locs = print_locs
-      @in_visibility_group = T.let(false, T::Boolean)
-      @previous_node = T.let(nil, T.nilable(Node))
+      @in_visibility_group = false #: bool
+      @previous_node = nil #: Node?
       @max_line_length = max_line_length
     end
 
@@ -542,6 +542,16 @@ module RBI
       printl("end")
     end
 
+    # @override
+    #: (TEnumValue node) -> void
+    def visit_tenum_value(node)
+      print_blank_line_before(node)
+      print_loc(node)
+      visit_all(node.comments)
+
+      printl("#{node.name} = new")
+    end
+
     # @override
     #: (TypeMember node) -> void
     def visit_type_member(node)
@@ -675,6 +685,13 @@ module RBI
         node.comments.empty? && node.empty?
       when Attr
         node.comments.empty? && node.sigs.empty?
+      when Const
+        return false unless node.comments.empty?
+
+        loc = node.loc
+        return true unless loc
+
+        loc.begin_line == loc.end_line
       when Method
         node.comments.empty? && node.sigs.empty? && node.params.all? { |p| p.comments.empty? }
       when Sig
@@ -722,7 +739,9 @@ module RBI
       printn(" do")
       indent
       if modifiers.any?
-        printl(T.must(modifiers.first))
+        printl(
+          modifiers.first, #: as !nil
+        )
         indent
         modifiers[1..]&.each do |modifier|
           printl(".#{modifier}")
@@ -771,7 +790,7 @@ module RBI
 
     #: (Sig node) -> Array[String]
     def sig_modifiers(node)
-      modifiers = T.let([], T::Array[String])
+      modifiers = [] #: Array[String]
       modifiers << "abstract" if node.is_abstract
 
       if node.is_override

data/lib/rbi/rbs/method_type_translator.rb

@@ -21,7 +21,7 @@ module RBI
       #: (Method) -> void
       def initialize(method)
         @method = method
-        @result = T.let(Sig.new, Sig)
+        @result = Sig.new #: Sig
       end
 
       #: (::RBS::MethodType) -> void
@@ -44,7 +44,7 @@ module RBI
         raise Error, "No block param found" unless block_param
 
         block_name = block_param.name
-        block_type = T.cast(translate_type(type.type), RBI::Type::Proc)
+        block_type = translate_type(type.type) #: as RBI::Type::Proc
 
         bind = type.self_type
         block_type.bind(translate_type(bind)) if bind

data/lib/rbi/rbs/type_translator.rb

@@ -75,7 +75,7 @@ module RBI
           when ::RBS::Types::Optional
             Type.nilable(translate(type.type))
           when ::RBS::Types::Proc
-            proc = T.cast(translate(type.type), Type::Proc)
+            proc = translate(type.type) #: as Type::Proc
             proc.bind(translate(type.self_type)) if type.self_type
             proc
           when ::RBS::Types::Record

data/lib/rbi/rbs_printer.rb

@@ -23,9 +23,9 @@ module RBI
       @out = out
       @current_indent = indent
       @print_locs = print_locs
-      @in_visibility_group = T.let(false, T::Boolean)
-      @previous_node = T.let(nil, T.nilable(Node))
-      @positional_names = T.let(positional_names, T::Boolean)
+      @in_visibility_group = false #: bool
+      @previous_node = nil #: Node?
+      @positional_names = positional_names #: bool
     end
 
     # Printing
@@ -349,7 +349,10 @@ module RBI
       print(": ")
       if sigs.any?
         first, *rest = sigs
-        print_method_sig(node, T.must(first))
+        print_method_sig(
+          node,
+          first, #: as !nil
+        )
         if rest.any?
           spaces = node.name.size + 4
           rest.each do |sig|
@@ -645,19 +648,22 @@ module RBI
     # @override
     #: (TEnumBlock node) -> void
     def visit_tenum_block(node)
-      node.nodes.each do |child|
-        child = if child.is_a?(Const) && child.value == "new"
-          parent = node.parent_scope
-          Const.new(
-            child.name,
-            "T.let(nil, #{parent.is_a?(TEnum) ? parent.name : "T.untyped"})",
-            comments: child.comments,
-          )
-        else
-          child
-        end
-        visit(child)
-        @previous_node = child
+      visit_all(node.nodes)
+    end
+
+    # @override
+    #: (TEnumValue node) -> void
+    def visit_tenum_value(node)
+      print_blank_line_before(node)
+      print_loc(node)
+      visit_all(node.comments)
+
+      t_enum = node.parent_scope&.parent_scope
+
+      if t_enum.is_a?(TEnum)
+        printl("#{node.name}: #{t_enum.name}")
+      else
+        printl("#{node.name}: untyped")
       end
     end
 
@@ -882,7 +888,7 @@ module RBI
 
     #: -> void
     def initialize
-      @string = T.let(String.new, String)
+      @string = String.new #: String
     end
 
     #: (Type node) -> void

data/lib/rbi/rewriters/flatten_singleton_methods.rb

@@ -41,7 +41,8 @@ module RBI
 
             child.detach
             child.is_singleton = true
-            T.must(node.parent_tree) << child
+            parent_tree = node.parent_tree #: as !nil
+            parent_tree << child
           end
 
           node.detach if node.nodes.empty?

data/lib/rbi/rewriters/flatten_visibilities.rb

@@ -29,7 +29,7 @@ module RBI
       def initialize
         super
 
-        @current_visibility = T.let([Public.new], T::Array[Visibility])
+        @current_visibility = [Public.new] #: Array[Visibility]
       end
 
       # @override
@@ -46,7 +46,7 @@ module RBI
           visit_all(node.nodes.dup)
           @current_visibility.pop
         when Attr, Method
-          node.visibility = T.must(@current_visibility.last)
+          node.visibility = @current_visibility.last #: as !nil
         end
       end
     end

data/lib/rbi/rewriters/merge_trees.rb

@@ -67,8 +67,8 @@ module RBI
         @left_name = left_name
         @right_name = right_name
         @keep = keep
-        @tree = T.let(MergeTree.new, MergeTree)
-        @scope_stack = T.let([@tree], T::Array[Tree])
+        @tree = MergeTree.new #: MergeTree
+        @scope_stack = [@tree] #: Array[Tree]
       end
 
       #: (Tree tree) -> void
@@ -99,12 +99,12 @@ module RBI
         def initialize(output, left_name: "left", right_name: "right", keep: Keep::NONE)
           super()
           @tree = output
-          @index = T.let(output.index, Index)
-          @scope_stack = T.let([@tree], T::Array[Tree])
+          @index = output.index #: Index
+          @scope_stack = [@tree] #: Array[Tree]
           @left_name = left_name
           @right_name = right_name
           @keep = keep
-          @conflicts = T.let([], T::Array[Conflict])
+          @conflicts = [] #: Array[Conflict]
         end
 
         # @override
@@ -159,7 +159,7 @@ module RBI
 
         #: -> Tree
         def current_scope
-          T.must(@scope_stack.last)
+          @scope_stack.last #: as !nil
         end
 
         #: (Node node) -> Node?
@@ -245,7 +245,7 @@ module RBI
         # @override
         #: (Array[Node] nodes) -> void
         def visit_all(nodes)
-          last_conflict_tree = T.let(nil, T.nilable(ConflictTree))
+          last_conflict_tree = nil #: ConflictTree?
           nodes.dup.each do |node|
             if node.is_a?(ConflictTree)
               if last_conflict_tree
@@ -287,7 +287,7 @@ module RBI
 
     #: -> ConflictTree?
     def parent_conflict_tree
-      parent = T.let(parent_tree, T.nilable(Node))
+      parent = parent_tree #: Node?
       while parent
         return parent if parent.is_a?(ConflictTree)
 
@@ -555,9 +555,9 @@ module RBI
       super()
       @left_name = left_name
       @right_name = right_name
-      @left = T.let(Tree.new, Tree)
+      @left = Tree.new #: Tree
       @left.parent_tree = self
-      @right = T.let(Tree.new, Tree)
+      @right = Tree.new #: Tree
       @right.parent_tree = self
     end
   end

data/lib/rbi/rewriters/nest_top_level_members.rb

@@ -24,7 +24,7 @@ module RBI
       def initialize
         super
 
-        @top_level_object_class = T.let(nil, T.nilable(Class))
+        @top_level_object_class = nil #: Class?
       end
 
       # @override

data/lib/rbi/rewriters/remove_known_definitions.rb

@@ -53,7 +53,7 @@ module RBI
       def initialize(index)
         super()
         @index = index
-        @operations = T.let([], T::Array[Operation])
+        @operations = [] #: Array[Operation]
       end
 
       class << self
@@ -107,10 +107,10 @@ module RBI
         when Scope
           node.empty?
         when Attr
-          previous = T.cast(previous, Attr)
+          previous = previous #: as Attr
           node.names == previous.names && node.sigs == previous.sigs
         when Method
-          previous = T.cast(previous, Method)
+          previous = previous #: as Method
           node.params == previous.params && node.sigs == previous.sigs
         else
           true

data/lib/rbi/rewriters/sort_nodes.rb

@@ -31,7 +31,9 @@ module RBI
             next res if res && res != 0 # we can sort the nodes by their name, let's stop here
 
             # Finally, if the two nodes have the same rank and the same name or at least one node is anonymous then,
-            T.must(original_order[a]) <=> T.must(original_order[b]) # we keep the original order
+            original_order_a = original_order[a] #: as !nil
+            original_order_b = original_order[b] #: as !nil
+            original_order_a <=> original_order_b # we keep the original order
           end
         end
 

data/lib/rbi/rewriters/translate_rbs_sigs.rb

@@ -35,7 +35,7 @@ module RBI
         comments = node.comments.dup
         node.comments.clear
 
-        rbs_sigs = T.let([], T::Array[RBSComment])
+        rbs_sigs = [] #: Array[RBSComment]
 
         comments.each do |comment|
           case comment
@@ -67,7 +67,7 @@ module RBI
             raise Error, "AttrWriter must have exactly one name"
           end
 
-          name = T.must(node.names.first)
+          name = node.names.first #: as !nil
           sig.params << SigParam.new(name.to_s, RBS::TypeTranslator.translate(attr_type))
         end
 

data/lib/rbi/type.rb

@@ -285,7 +285,7 @@ module RBI
       def initialize(name, *params)
         super()
         @name = name
-        @params = T.let(params, T::Array[Type])
+        @params = params #: Array[Type]
       end
 
       # @override
@@ -395,9 +395,9 @@ module RBI
       #: -> void
       def initialize
         super
-        @proc_params = T.let({}, T::Hash[Symbol, Type])
-        @proc_returns = T.let(Type.void, Type)
-        @proc_bind = T.let(nil, T.nilable(Type))
+        @proc_params = {} #: Hash[Symbol, Type]
+        @proc_returns = Type.void #: Type
+        @proc_bind = nil #: Type?
       end
 
       # @override
@@ -570,7 +570,7 @@ module RBI
         end.uniq
 
         if flattened.size == 1
-          T.must(flattened.first)
+          flattened.first #: as !nil
         else
           raise ArgumentError, "RBI::Type.all should have at least 2 types supplied" if flattened.size < 2
 
@@ -596,7 +596,7 @@ module RBI
           end
         end
 
-        is_nilable = T.let(false, T::Boolean)
+        is_nilable = false #: bool
 
         types = flattened.filter_map do |type|
           case type
@@ -632,7 +632,7 @@ module RBI
             raise ArgumentError, "RBI::Type.any should have at least 2 types supplied"
           end
         when 1
-          T.must(types.first)
+          types.first #: as !nil
         else
           Any.new(types)
         end
@@ -693,7 +693,7 @@ module RBI
 
     #: -> void
     def initialize
-      @nilable = T.let(false, T::Boolean)
+      @nilable = false #: bool
     end
 
     # Returns a new type that is `nilable` if it is not already.

data/lib/rbi/type_parser.rb

@@ -18,7 +18,7 @@ module RBI
         raise Error, "Expected a type expression, got nothing" if node.statements.body.empty?
         raise Error, "Expected a single type expression, got `#{node.slice}`" if node.statements.body.size > 1
 
-        node = T.must(node.statements.body.first)
+        node = node.statements.body.first #: as !nil
         parse_node(node)
       end
 
@@ -40,7 +40,9 @@ module RBI
           children = body.body
           raise Error, "Expected exactly 1 child, got #{children.size}" unless children.size == 1
 
-          parse_node(T.must(children.first))
+          parse_node(
+            children.first, #: as !nil
+          )
         else
           raise Error, "Unexpected node `#{node}`"
         end
@@ -84,7 +86,11 @@ module RBI
             if t_class?(recv)
               # `T::Class[Foo]` or `::T::Class[Foo]`
               args = check_arguments_exactly!(node, 1)
-              return Type::Class.new(parse_node(T.must(args.first)))
+              return Type::Class.new(
+                parse_node(
+                  args.first, #: as !nil
+                ),
+              )
             else
               # `::Foo[Bar]` or `::Foo[Bar, Baz]`
               args = check_arguments_at_least!(node, 1)
@@ -94,11 +100,15 @@ module RBI
             # `T.class_of(Foo)[Bar]`
             if t_class_of?(recv)
               type_args = check_arguments_exactly!(recv, 1)
-              type = parse_node(T.must(type_args.first))
+              type = parse_node(
+                type_args.first, #: as !nil
+              )
               raise Error, "Expected a simple type, got `#{type}`" unless type.is_a?(Type::Simple)
 
               type_param_args = check_arguments_exactly!(node, 1)
-              type_param = parse_node(T.must(type_param_args.first))
+              type_param = parse_node(
+                type_param_args.first, #: as !nil
+              )
               return Type::ClassOf.new(type, type_param)
             end
           end
@@ -117,7 +127,9 @@ module RBI
         when :nilable
           # `T.nilable(Foo)`
           args = check_arguments_exactly!(node, 1)
-          type = parse_node(T.must(args.first))
+          type = parse_node(
+            args.first, #: as !nil
+          )
           Type::Nilable.new(type)
         when :anything
           # `T.anything`
@@ -142,7 +154,9 @@ module RBI
         when :class_of
           # `T.class_of(Foo)`
           args = check_arguments_exactly!(node, 1)
-          type = parse_node(T.must(args.first))
+          type = parse_node(
+            args.first, #: as !nil
+          )
           raise Error, "Expected a simple type, got `#{type}`" unless type.is_a?(Type::Simple)
 
           Type::ClassOf.new(type)
@@ -180,7 +194,9 @@ module RBI
           elem_key = elem.key
           key = case elem_key
           when Prism::SymbolNode
-            T.must(elem_key.value).to_sym
+            elem_key
+              .value #: as !nil
+              .to_sym
           when Prism::StringNode
             elem_key.content
           else
@@ -216,14 +232,22 @@ module RBI
             T.unsafe(type).params(**params)
           when :returns
             args = check_arguments_exactly!(call, 1)
-            type.returns(parse_node(T.must(args.first)))
+            type.returns(
+              parse_node(
+                args.first, #: as !nil
+              ),
+            )
           when :void
             type.void
           when :proc
             return type
           when :bind
             args = check_arguments_exactly!(call, 1)
-            type.bind(parse_node(T.must(args.first)))
+            type.bind(
+              parse_node(
+                args.first, #: as !nil
+              ),
+            )
           else
             raise Error, "Unexpected expression `#{node.slice}`"
           end
@@ -261,8 +285,8 @@ module RBI
 
       #: (Prism::CallNode node) -> Array[Prism::Node]
       def call_chain(node)
-        call_chain = T.let([node], T::Array[Prism::Node])
-        receiver = T.let(node.receiver, T.nilable(Prism::Node))
+        call_chain = [node] #: Array[Prism::Node]
+        receiver = node.receiver #: Prism::Node?
         while receiver
           call_chain.prepend(receiver)
           break unless receiver.is_a?(Prism::CallNode)

data/lib/rbi/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/rbi/visitor.rb

@@ -88,6 +88,8 @@ module RBI
         visit_sig(node)
       when SigParam
         visit_sig_param(node)
+      when TEnumValue
+        visit_tenum_value(node)
       when TStructConst
         visit_tstruct_const(node)
       when TStructProp
@@ -222,6 +224,9 @@ module RBI
     #: (TEnumBlock node) -> void
     def visit_tenum_block(node); end
 
+    #: (TEnumValue node) -> void
+    def visit_tenum_value(node); end
+
     #: (Helper node) -> void
     def visit_helper(node); end
 

data/rbi/rbi.rbi

@@ -403,10 +403,11 @@ class RBI::Formatter
       max_line_length: T.nilable(::Integer),
       nest_singleton_methods: T::Boolean,
       nest_non_public_members: T::Boolean,
-      sort_nodes: T::Boolean
+      sort_nodes: T::Boolean,
+      replace_attributes_with_methods: T::Boolean
     ).void
   end
-  def initialize(add_sig_templates: T.unsafe(nil), group_nodes: T.unsafe(nil), max_line_length: T.unsafe(nil), nest_singleton_methods: T.unsafe(nil), nest_non_public_members: T.unsafe(nil), sort_nodes: T.unsafe(nil)); end
+  def initialize(add_sig_templates: T.unsafe(nil), group_nodes: T.unsafe(nil), max_line_length: T.unsafe(nil), nest_singleton_methods: T.unsafe(nil), nest_non_public_members: T.unsafe(nil), sort_nodes: T.unsafe(nil), replace_attributes_with_methods: T.unsafe(nil)); end
 
   sig { params(file: ::RBI::File).void }
   def format_file(file); end
@@ -1005,6 +1006,25 @@ class RBI::Parser
   end
 end
 
+class RBI::Parser::HeredocLocationVisitor < ::Prism::Visitor
+  sig { params(source: ::Prism::Source, begin_offset: ::Integer, end_offset: ::Integer).void }
+  def initialize(source, begin_offset, end_offset); end
+
+  sig { returns(::Prism::Location) }
+  def location; end
+
+  sig { params(node: ::Prism::InterpolatedStringNode).void }
+  def visit_interpolated_string_node(node); end
+
+  sig { params(node: ::Prism::StringNode).void }
+  def visit_string_node(node); end
+
+  private
+
+  sig { params(node: T.any(::Prism::InterpolatedStringNode, ::Prism::StringNode)).void }
+  def handle_string_node(node); end
+end
+
 class RBI::Parser::SigBuilder < ::RBI::Parser::Visitor
   sig { params(content: ::String, file: ::String).void }
   def initialize(content, file:); end
@@ -1109,6 +1129,9 @@ class RBI::Parser::TreeBuilder < ::RBI::Parser::Visitor
   sig { void }
   def set_root_tree_loc; end
 
+  sig { params(node: T.nilable(::Prism::Node)).returns(T::Boolean) }
+  def t_enum_value?(node); end
+
   sig { params(node: T.nilable(::Prism::Node)).returns(T::Boolean) }
   def type_variable_definition?(node); end
 end
@@ -1119,6 +1142,9 @@ class RBI::Parser::Visitor < ::Prism::Visitor
 
   private
 
+  sig { params(node: ::Prism::Node).returns(::Prism::Location) }
+  def adjust_prism_location_for_heredoc(node); end
+
   sig { params(node: ::Prism::Node).returns(::RBI::Loc) }
   def node_loc(node); end
 
@@ -1345,6 +1371,9 @@ class RBI::Printer < ::RBI::Visitor
   sig { override.params(node: ::RBI::TEnumBlock).void }
   def visit_tenum_block(node); end
 
+  sig { override.params(node: ::RBI::TEnumValue).void }
+  def visit_tenum_value(node); end
+
   sig { override.params(node: ::RBI::Tree).void }
   def visit_tree(node); end
 
@@ -1658,6 +1687,9 @@ class RBI::RBSPrinter < ::RBI::Visitor
   sig { override.params(node: ::RBI::TEnumBlock).void }
   def visit_tenum_block(node); end
 
+  sig { override.params(node: ::RBI::TEnumValue).void }
+  def visit_tenum_value(node); end
+
   sig { override.params(node: ::RBI::Tree).void }
   def visit_tree(node); end
 
@@ -2549,6 +2581,32 @@ class RBI::TEnumBlock < ::RBI::Scope
   def to_s; end
 end
 
+class RBI::TEnumValue < ::RBI::NodeWithComments
+  include ::RBI::Indexable
+
+  sig do
+    params(
+      name: ::String,
+      loc: T.nilable(::RBI::Loc),
+      comments: T::Array[::RBI::Comment],
+      block: T.nilable(T.proc.params(node: ::RBI::TEnumValue).void)
+    ).void
+  end
+  def initialize(name, loc: T.unsafe(nil), comments: T.unsafe(nil), &block); end
+
+  sig { returns(::String) }
+  def fully_qualified_name; end
+
+  sig { override.returns(T::Array[::String]) }
+  def index_ids; end
+
+  sig { returns(::String) }
+  def name; end
+
+  sig { override.returns(::String) }
+  def to_s; end
+end
+
 # Sorbet's T::Struct
 class RBI::TStruct < ::RBI::Class
   sig do
@@ -3590,6 +3648,9 @@ class RBI::Visitor
   sig { params(node: ::RBI::TEnumBlock).void }
   def visit_tenum_block(node); end
 
+  sig { params(node: ::RBI::TEnumValue).void }
+  def visit_tenum_value(node); end
+
   sig { params(node: ::RBI::Tree).void }
   def visit_tree(node); end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alexandre Terrasa
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.6
 specification_version: 4
 summary: RBI generation framework
 test_files: []