rbi 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a98dd77d2fde6771b24b8ab87d585b94b944beea38a2d60a2ba38f7738deb67b
-  data.tar.gz: 56eb299a37b8755b57ebd72ffc4dcf6179a739e4146f6903c3d63450a586307b
+  metadata.gz: b377a351b9385e3c256fa079584f193232a767df408850e72265db4319346aa9
+  data.tar.gz: 04a3e0cd339374e9ccc3f0d2d769e564730ad69881c73c4f42ae328db48bcad5
 SHA512:
-  metadata.gz: 7e2a8e48b3210f41a3b38bf2844d895a0d232c8296b7122ecb64705ec9b77d56dd88ca0e1dd3b2fa15755ce90e63ee3ef17ccbc1174b3034b4d825bb4444c357
-  data.tar.gz: df19f77e6e4dd24e9309b03d4a1cd3008386bc3a48fe6998782008459fac78f9f97c52f603db2f65b1c68d42c3fe49f1145a7d40fcc845473c667ec4287127af
+  metadata.gz: e9123353786e09d5869e8621f086ef057d57b21ff8a05ddb6c1be3dffa5dc0d94bc433e0074f0e7b4dff0eb63ed66d300ab11856d536a299f8560ec53912f444
+  data.tar.gz: 6a12ef064826678ce3a47b6a1d327e8de0b506fd09c100f4f88111afe6b84d11549cf41ef727a70bb9b93e16dd1868a00f3ed7a3e5b9e10578e159a7aafa2c04

data/Gemfile

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

data/lib/rbi/formatter.rb

@@ -5,8 +5,20 @@ module RBI
   class Formatter
     extend T::Sig
 
-    sig { returns(T::Boolean) }
-    attr_accessor :add_sig_templates, :group_nodes, :nest_singleton_methods, :nest_non_public_methods, :sort_nodes
+    sig { params(sort_nodes: T::Boolean).returns(T::Boolean) }
+    attr_writer :sort_nodes
+
+    sig { params(nest_singleton_methods: T::Boolean).returns(T::Boolean) }
+    attr_writer :nest_singleton_methods
+
+    sig { params(add_sig_templates: T::Boolean).returns(T::Boolean) }
+    attr_writer :add_sig_templates
+
+    sig { params(group_nodes: T::Boolean).returns(T::Boolean) }
+    attr_writer :group_nodes
+
+    sig { params(nest_non_public_methods: T::Boolean).returns(T::Boolean) }
+    attr_writer :nest_non_public_methods
 
     sig { returns(T.nilable(Integer)) }
     attr_accessor :max_line_length
@@ -18,7 +30,7 @@ module RBI
         max_line_length: T.nilable(Integer),
         nest_singleton_methods: T::Boolean,
         nest_non_public_methods: T::Boolean,
-        sort_nodes: T::Boolean
+        sort_nodes: T::Boolean,
       ).void
     end
     def initialize(
@@ -43,12 +55,6 @@ module RBI
       file.string(max_line_length: @max_line_length)
     end
 
-    sig { params(tree: RBI::Tree).returns(String) }
-    def print_tree(tree)
-      format_tree(tree)
-      tree.string(max_line_length: @max_line_length)
-    end
-
     sig { params(file: RBI::File).void }
     def format_file(file)
       format_tree(file.root)

data/lib/rbi/index.rb

@@ -6,11 +6,15 @@ module RBI
     extend T::Sig
     include T::Enumerable
 
-    sig { params(node: Node).returns(Index) }
-    def self.index(*node)
-      index = Index.new
-      index.visit_all(node)
-      index
+    class << self
+      extend T::Sig
+
+      sig { params(node: Node).returns(Index) }
+      def index(*node)
+        index = Index.new
+        index.visit_all(node)
+        index
+      end
     end
 
     sig { void }
@@ -171,6 +175,16 @@ module RBI
     end
   end
 
+  class TypeMember
+    extend T::Sig
+    include Indexable
+
+    sig { override.returns(T::Array[String]) }
+    def index_ids
+      [to_s]
+    end
+  end
+
   class Send
     extend T::Sig
     include Indexable

data/lib/rbi/loc.rb

@@ -17,7 +17,7 @@ module RBI
         begin_line: T.nilable(Integer),
         end_line: T.nilable(Integer),
         begin_column: T.nilable(Integer),
-        end_column: T.nilable(Integer)
+        end_column: T.nilable(Integer),
       ).void
     end
     def initialize(file: nil, begin_line: nil, end_line: nil, begin_column: nil, end_column: nil)
@@ -36,8 +36,8 @@ module RBI
     sig { returns(T.nilable(String)) }
     def source
       file = self.file
-      return nil unless file
-      return nil unless ::File.file?(file)
+      return unless file
+      return unless ::File.file?(file)
 
       return ::File.read(file) unless begin_line && end_line
 

data/lib/rbi/model.rb

@@ -24,6 +24,7 @@ module RBI
     def detach
       tree = parent_tree
       return unless tree
+
       tree.nodes.delete(self)
       self.parent_tree = nil
     end
@@ -32,8 +33,10 @@ module RBI
     def replace(node)
       tree = parent_tree
       raise unless tree
+
       index = tree.nodes.index(self)
       raise unless index
+
       tree.nodes[index] = node
       node.parent_tree = tree
       self.parent_tree = nil
@@ -62,6 +65,7 @@ module RBI
     sig { params(other: Object).returns(T::Boolean) }
     def ==(other)
       return false unless other.is_a?(Comment)
+
       text == other.text
     end
   end
@@ -109,7 +113,7 @@ module RBI
       params(
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Tree).void)
+        block: T.nilable(T.proc.params(node: Tree).void),
       ).void
     end
     def initialize(loc: nil, comments: [], &block)
@@ -146,7 +150,7 @@ module RBI
       params(
         strictness: T.nilable(String),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(file: File).void)
+        block: T.nilable(T.proc.params(file: File).void),
       ).void
     end
     def initialize(strictness: nil, comments: [], &block)
@@ -194,7 +198,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Module).void)
+        block: T.nilable(T.proc.params(node: Module).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -206,6 +210,7 @@ module RBI
     sig { override.returns(String) }
     def fully_qualified_name
       return name if name.start_with?("::")
+
       "#{parent_scope&.fully_qualified_name}::#{name}"
     end
   end
@@ -225,7 +230,7 @@ module RBI
         superclass_name: T.nilable(String),
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Class).void)
+        block: T.nilable(T.proc.params(node: Class).void),
       ).void
     end
     def initialize(name, superclass_name: nil, loc: nil, comments: [], &block)
@@ -238,6 +243,7 @@ module RBI
     sig { override.returns(String) }
     def fully_qualified_name
       return name if name.start_with?("::")
+
       "#{parent_scope&.fully_qualified_name}::#{name}"
     end
   end
@@ -249,7 +255,7 @@ module RBI
       params(
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: SingletonClass).void)
+        block: T.nilable(T.proc.params(node: SingletonClass).void),
       ).void
     end
     def initialize(loc: nil, comments: [], &block)
@@ -282,7 +288,7 @@ module RBI
         keyword_init: T::Boolean,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(struct: Struct).void)
+        block: T.nilable(T.proc.params(struct: Struct).void),
       ).void
     end
     def initialize(name, members: [], keyword_init: false, loc: nil, comments: [], &block)
@@ -296,6 +302,7 @@ module RBI
     sig { override.returns(String) }
     def fully_qualified_name
       return name if name.start_with?("::")
+
       "#{parent_scope&.fully_qualified_name}::#{name}"
     end
   end
@@ -314,7 +321,7 @@ module RBI
         value: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Const).void)
+        block: T.nilable(T.proc.params(node: Const).void),
       ).void
     end
     def initialize(name, value, loc: nil, comments: [], &block)
@@ -327,6 +334,7 @@ module RBI
     sig { returns(String) }
     def fully_qualified_name
       return name if name.start_with?("::")
+
       "#{parent_scope&.fully_qualified_name}::#{name}"
     end
 
@@ -360,7 +368,7 @@ module RBI
         visibility: Visibility,
         sigs: T::Array[Sig],
         loc: T.nilable(Loc),
-        comments: T::Array[Comment]
+        comments: T::Array[Comment],
       ).void
     end
     def initialize(name, names, visibility: Public.new, sigs: [], loc: nil, comments: [])
@@ -385,7 +393,7 @@ module RBI
         sigs: T::Array[Sig],
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: AttrAccessor).void)
+        block: T.nilable(T.proc.params(node: AttrAccessor).void),
       ).void
     end
     def initialize(name, *names, visibility: Public.new, sigs: [], loc: nil, comments: [], &block)
@@ -417,7 +425,7 @@ module RBI
         sigs: T::Array[Sig],
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: AttrReader).void)
+        block: T.nilable(T.proc.params(node: AttrReader).void),
       ).void
     end
     def initialize(name, *names, visibility: Public.new, sigs: [], loc: nil, comments: [], &block)
@@ -449,7 +457,7 @@ module RBI
         sigs: T::Array[Sig],
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: AttrWriter).void)
+        block: T.nilable(T.proc.params(node: AttrWriter).void),
       ).void
     end
     def initialize(name, *names, visibility: Public.new, sigs: [], loc: nil, comments: [], &block)
@@ -499,7 +507,7 @@ module RBI
         sigs: T::Array[Sig],
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Method).void)
+        block: T.nilable(T.proc.params(node: Method).void),
       ).void
     end
     def initialize(
@@ -576,7 +584,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: ReqParam).void)
+        block: T.nilable(T.proc.params(node: ReqParam).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -602,7 +610,7 @@ module RBI
         value: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: OptParam).void)
+        block: T.nilable(T.proc.params(node: OptParam).void),
       ).void
     end
     def initialize(name, value, loc: nil, comments: [], &block)
@@ -613,7 +621,7 @@ module RBI
 
     sig { params(other: T.nilable(Object)).returns(T::Boolean) }
     def ==(other)
-      OptParam === other && name == other.name && value == other.value
+      OptParam === other && name == other.name
     end
   end
 
@@ -625,7 +633,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: RestParam).void)
+        block: T.nilable(T.proc.params(node: RestParam).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -652,7 +660,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: KwParam).void)
+        block: T.nilable(T.proc.params(node: KwParam).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -683,7 +691,7 @@ module RBI
         value: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: KwOptParam).void)
+        block: T.nilable(T.proc.params(node: KwOptParam).void),
       ).void
     end
     def initialize(name, value, loc: nil, comments: [], &block)
@@ -699,7 +707,7 @@ module RBI
 
     sig { params(other: T.nilable(Object)).returns(T::Boolean) }
     def ==(other)
-      KwOptParam === other && name == other.name && value == other.value
+      KwOptParam === other && name == other.name
     end
   end
 
@@ -711,7 +719,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: KwRestParam).void)
+        block: T.nilable(T.proc.params(node: KwRestParam).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -738,7 +746,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: BlockParam).void)
+        block: T.nilable(T.proc.params(node: BlockParam).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -773,7 +781,7 @@ module RBI
         name: String,
         names: T::Array[String],
         loc: T.nilable(Loc),
-        comments: T::Array[Comment]
+        comments: T::Array[Comment],
       ).void
     end
     def initialize(name, names, loc: nil, comments: [])
@@ -791,7 +799,7 @@ module RBI
         names: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Include).void)
+        block: T.nilable(T.proc.params(node: Include).void),
       ).void
     end
     def initialize(name, *names, loc: nil, comments: [], &block)
@@ -814,7 +822,7 @@ module RBI
         names: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Extend).void)
+        block: T.nilable(T.proc.params(node: Extend).void),
       ).void
     end
     def initialize(name, *names, loc: nil, comments: [], &block)
@@ -873,7 +881,7 @@ module RBI
       params(
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Public).void)
+        block: T.nilable(T.proc.params(node: Public).void),
       ).void
     end
     def initialize(loc: nil, comments: [], &block)
@@ -889,7 +897,7 @@ module RBI
       params(
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Protected).void)
+        block: T.nilable(T.proc.params(node: Protected).void),
       ).void
     end
     def initialize(loc: nil, comments: [], &block)
@@ -905,7 +913,7 @@ module RBI
       params(
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Private).void)
+        block: T.nilable(T.proc.params(node: Private).void),
       ).void
     end
     def initialize(loc: nil, comments: [], &block)
@@ -931,7 +939,7 @@ module RBI
         args: T::Array[Arg],
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Send).void)
+        block: T.nilable(T.proc.params(node: Send).void),
       ).void
     end
     def initialize(method, args = [], loc: nil, comments: [], &block)
@@ -966,7 +974,7 @@ module RBI
     sig do
       params(
         value: String,
-        loc: T.nilable(Loc)
+        loc: T.nilable(Loc),
       ).void
     end
     def initialize(value, loc: nil)
@@ -995,7 +1003,7 @@ module RBI
       params(
         keyword: String,
         value: String,
-        loc: T.nilable(Loc)
+        loc: T.nilable(Loc),
       ).void
     end
     def initialize(keyword, value, loc: nil)
@@ -1045,7 +1053,7 @@ module RBI
         type_params: T::Array[String],
         checked: T.nilable(Symbol),
         loc: T.nilable(Loc),
-        block: T.nilable(T.proc.params(node: Sig).void)
+        block: T.nilable(T.proc.params(node: Sig).void),
       ).void
     end
     def initialize(
@@ -1080,6 +1088,7 @@ module RBI
     sig { params(other: Object).returns(T::Boolean) }
     def ==(other)
       return false unless other.is_a?(Sig)
+
       params == other.params && return_type == other.return_type && is_abstract == other.is_abstract &&
         is_override == other.is_override && is_overridable == other.is_overridable && is_final == other.is_final &&
         type_params == other.type_params && checked == other.checked
@@ -1098,7 +1107,7 @@ module RBI
         type: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: SigParam).void)
+        block: T.nilable(T.proc.params(node: SigParam).void),
       ).void
     end
     def initialize(name, type, loc: nil, comments: [], &block)
@@ -1124,7 +1133,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(klass: TStruct).void)
+        block: T.nilable(T.proc.params(klass: TStruct).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -1151,7 +1160,7 @@ module RBI
         type: String,
         default: T.nilable(String),
         loc: T.nilable(Loc),
-        comments: T::Array[Comment]
+        comments: T::Array[Comment],
       ).void
     end
     def initialize(name, type, default: nil, loc: nil, comments: [])
@@ -1175,7 +1184,7 @@ module RBI
         default: T.nilable(String),
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: TStructConst).void)
+        block: T.nilable(T.proc.params(node: TStructConst).void),
       ).void
     end
     def initialize(name, type, default: nil, loc: nil, comments: [], &block)
@@ -1205,7 +1214,7 @@ module RBI
         default: T.nilable(String),
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: TStructProp).void)
+        block: T.nilable(T.proc.params(node: TStructProp).void),
       ).void
     end
     def initialize(name, type, default: nil, loc: nil, comments: [], &block)
@@ -1235,7 +1244,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(klass: TEnum).void)
+        block: T.nilable(T.proc.params(klass: TEnum).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -1255,7 +1264,7 @@ module RBI
         names: T::Array[String],
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: TEnumBlock).void)
+        block: T.nilable(T.proc.params(node: TEnumBlock).void),
       ).void
     end
     def initialize(names = [], loc: nil, comments: [], &block)
@@ -1293,7 +1302,7 @@ module RBI
         name: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: Helper).void)
+        block: T.nilable(T.proc.params(node: Helper).void),
       ).void
     end
     def initialize(name, loc: nil, comments: [], &block)
@@ -1320,7 +1329,7 @@ module RBI
         value: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: TypeMember).void)
+        block: T.nilable(T.proc.params(node: TypeMember).void),
       ).void
     end
     def initialize(name, value, loc: nil, comments: [], &block)
@@ -1333,6 +1342,7 @@ module RBI
     sig { returns(String) }
     def fully_qualified_name
       return name if name.start_with?("::")
+
       "#{parent_scope&.fully_qualified_name}::#{name}"
     end
 
@@ -1351,7 +1361,7 @@ module RBI
         names: String,
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
-        block: T.nilable(T.proc.params(node: MixesInClassMethods).void)
+        block: T.nilable(T.proc.params(node: MixesInClassMethods).void),
       ).void
     end
     def initialize(name, *names, loc: nil, comments: [], &block)
@@ -1375,7 +1385,7 @@ module RBI
       params(
         name: String,
         loc: T.nilable(Loc),
-        comments: T::Array[Comment]
+        comments: T::Array[Comment],
       ).void
     end
     def initialize(name, loc: nil, comments: [])

data/lib/rbi/parser.rb

@@ -66,20 +66,30 @@ module RBI
       require "unparser" unless defined?(::Unparser)
     end
 
-    sig { params(string: String).returns(Tree) }
-    def self.parse_string(string)
-      Parser.new.parse_string(string)
-    end
+    class << self
+      extend T::Sig
 
-    sig { params(path: String).returns(Tree) }
-    def self.parse_file(path)
-      Parser.new.parse_file(path)
-    end
+      sig { params(string: String).returns(Tree) }
+      def parse_string(string)
+        Parser.new.parse_string(string)
+      end
+
+      sig { params(path: String).returns(Tree) }
+      def parse_file(path)
+        Parser.new.parse_file(path)
+      end
+
+      sig { params(paths: T::Array[String]).returns(T::Array[Tree]) }
+      def parse_files(paths)
+        parser = Parser.new
+        paths.map { |path| parser.parse_file(path) }
+      end
 
-    sig { params(paths: T::Array[String]).returns(T::Array[Tree]) }
-    def self.parse_files(paths)
-      parser = Parser.new
-      paths.map { |path| parser.parse_file(path) }
+      sig { params(strings: T::Array[String]).returns(T::Array[Tree]) }
+      def parse_strings(strings)
+        parser = Parser.new
+        strings.map { |string| parser.parse_string(string) }
+      end
     end
 
     sig { params(string: String).returns(Tree) }
@@ -87,12 +97,6 @@ module RBI
       parse(string, file: "-")
     end
 
-    sig { params(strings: T::Array[String]).returns(T::Array[Tree]) }
-    def self.parse_strings(strings)
-      parser = Parser.new
-      strings.map { |string| parser.parse_string(string) }
-    end
-
     sig { params(path: String).returns(Tree) }
     def parse_file(path)
       parse(::File.read(path), file: path)
@@ -166,7 +170,7 @@ module RBI
       params(
         file: String,
         comments: T::Array[::Parser::Source::Comment],
-        nodes_comments_assoc: T::Hash[::Parser::Source::Map, T::Array[::Parser::Source::Comment]]
+        nodes_comments_assoc: T::Hash[::Parser::Source::Map, T::Array[::Parser::Source::Comment]],
       ).void
     end
     def initialize(file:, comments: [], nodes_comments_assoc: {})
@@ -192,6 +196,7 @@ module RBI
     sig { override.params(node: T.nilable(Object)).void }
     def visit(node)
       return unless node.is_a?(AST::Node)
+
       @last_node = node
 
       case node.type
@@ -250,6 +255,8 @@ module RBI
       node_value = node.children[2]
       if struct_definition?(node_value)
         parse_struct(node)
+      elsif type_variable_definition?(node_value)
+        parse_type_variable(node)
       else
         name = parse_name(node)
         value = parse_expr(node_value)
@@ -270,7 +277,7 @@ module RBI
           params: node.children[1].children.map { |child| parse_param(child) },
           sigs: current_sigs,
           loc: loc,
-          comments: current_sigs_comments + node_comments(node)
+          comments: current_sigs_comments + node_comments(node),
         )
       when :defs
         Method.new(
@@ -279,7 +286,7 @@ module RBI
           is_singleton: true,
           sigs: current_sigs,
           loc: loc,
-          comments: current_sigs_comments + node_comments(node)
+          comments: current_sigs_comments + node_comments(node),
         )
       else
         raise ParseError.new("Unsupported def node type `#{node.type}`", loc)
@@ -317,7 +324,7 @@ module RBI
     sig { params(node: AST::Node).returns(T.nilable(RBI::Node)) }
     def parse_send(node)
       recv = node.children[0]
-      return nil if recv && recv != :self
+      return if recv && recv != :self
 
       method_name = node.children[1]
       loc = node_loc(node)
@@ -362,6 +369,7 @@ module RBI
         when :send
           snode = parse_send(nested_node)
           raise ParseError.new("Unexpected token `private` before `#{nested_node.type}`", loc) unless snode.is_a?(Attr)
+
           snode.visibility = visibility
           snode
         when nil
@@ -459,6 +467,24 @@ module RBI
       struct
     end
 
+    sig { params(node: AST::Node).returns(T::Boolean) }
+    def type_variable_definition?(node)
+      (node.type == :send && node.children[0].nil? && (node.children[1] == :type_member ||
+        node.children[1] == :type_template)) ||
+        (node.type == :block && type_variable_definition?(node.children[0]))
+    end
+
+    sig { params(node: AST::Node).returns(RBI::TypeMember) }
+    def parse_type_variable(node)
+      name = parse_name(node)
+      loc = node_loc(node)
+      comments = node_comments(node)
+
+      send = node.children[2]
+
+      TypeMember.new(name, send.location.expression.source, loc: loc, comments: comments)
+    end
+
     sig { params(node: AST::Node).returns([String, String, T.nilable(String)]) }
     def parse_tstruct_prop(node)
       name = node.children[2].children[0].to_s
@@ -516,6 +542,7 @@ module RBI
     def node_comments(node)
       comments = @nodes_comments_assoc[node.location]
       return [] unless comments
+
       comments.map do |comment|
         text = comment.text[1..-1].strip
         loc = Loc.from_ast_loc(@file, comment.location)
@@ -592,7 +619,7 @@ module RBI
         begin_line: first_loc&.begin_line || 0,
         begin_column: first_loc&.begin_column || 0,
         end_line: last_loc&.end_line || 0,
-        end_column: last_loc&.end_column || 0
+        end_column: last_loc&.end_column || 0,
       )
     end
   end
@@ -600,14 +627,6 @@ module RBI
   class ConstBuilder < ASTVisitor
     extend T::Sig
 
-    sig { params(node: T.nilable(AST::Node)).returns(T.nilable(String)) }
-    def self.visit(node)
-      v = ConstBuilder.new
-      v.visit(node)
-      return nil if v.names.empty?
-      v.names.join("::")
-    end
-
     sig { returns(T::Array[String]) }
     attr_accessor :names
 
@@ -617,9 +636,23 @@ module RBI
       @names = T.let([], T::Array[String])
     end
 
+    class << self
+      extend T::Sig
+
+      sig { params(node: T.nilable(AST::Node)).returns(T.nilable(String)) }
+      def visit(node)
+        v = ConstBuilder.new
+        v.visit(node)
+        return if v.names.empty?
+
+        v.names.join("::")
+      end
+    end
+
     sig { override.params(node: T.nilable(AST::Node)).void }
     def visit(node)
       return unless node
+
       case node.type
       when :const, :casgn
         visit(node.children[0])
@@ -635,15 +668,8 @@ module RBI
   class SigBuilder < ASTVisitor
     extend T::Sig
 
-    sig { params(node: AST::Node).returns(Sig) }
-    def self.build(node)
-      v = SigBuilder.new
-      v.visit_all(node.children)
-      v.current
-    end
-
     sig { returns(Sig) }
-    attr_accessor :current
+    attr_reader :current
 
     sig { void }
     def initialize
@@ -651,9 +677,21 @@ module RBI
       @current = T.let(Sig.new, Sig)
     end
 
+    class << self
+      extend T::Sig
+
+      sig { params(node: AST::Node).returns(Sig) }
+      def build(node)
+        v = SigBuilder.new
+        v.visit_all(node.children)
+        v.current
+      end
+    end
+
     sig { override.params(node: T.nilable(AST::Node)).void }
     def visit(node)
       return unless node
+
       case node.type
       when :send
         visit_send(node)
@@ -703,15 +741,19 @@ module RBI
   end
 
   class Loc
-    sig { params(file: String, ast_loc: T.any(::Parser::Source::Map, ::Parser::Source::Range)).returns(Loc) }
-    def self.from_ast_loc(file, ast_loc)
-      Loc.new(
-        file: file,
-        begin_line: ast_loc.line,
-        begin_column: ast_loc.column,
-        end_line: ast_loc.last_line,
-        end_column: ast_loc.last_column
-      )
+    class << self
+      extend T::Sig
+
+      sig { params(file: String, ast_loc: T.any(::Parser::Source::Map, ::Parser::Source::Range)).returns(Loc) }
+      def from_ast_loc(file, ast_loc)
+        Loc.new(
+          file: file,
+          begin_line: ast_loc.line,
+          begin_column: ast_loc.column,
+          end_line: ast_loc.last_line,
+          end_column: ast_loc.last_column,
+        )
+      end
     end
   end
 end

data/lib/rbi/printer.rb

@@ -22,7 +22,7 @@ module RBI
         out: T.any(IO, StringIO),
         indent: Integer,
         print_locs: T::Boolean,
-        max_line_length: T.nilable(Integer)
+        max_line_length: T.nilable(Integer),
       ).void
     end
     def initialize(out: $stdout, indent: 0, print_locs: false, max_line_length: nil)
@@ -82,6 +82,7 @@ module RBI
     sig { override.params(node: T.nilable(Node)).void }
     def visit(node)
       return unless node
+
       node.accept_printer(self)
     end
 
@@ -122,7 +123,7 @@ module RBI
         out: T.any(IO, StringIO),
         indent: Integer,
         print_locs: T::Boolean,
-        max_line_length: T.nilable(Integer)
+        max_line_length: T.nilable(Integer),
       ).void
     end
     def print(out: $stdout, indent: 0, print_locs: false, max_line_length: nil)
@@ -149,7 +150,7 @@ module RBI
         out: T.any(IO, StringIO),
         indent: Integer,
         print_locs: T::Boolean,
-        max_line_length: T.nilable(Integer)
+        max_line_length: T.nilable(Integer),
       ).void
     end
     def print(out: $stdout, indent: 0, print_locs: false, max_line_length: nil)
@@ -170,6 +171,7 @@ module RBI
       return unless previous_node
       return if previous_node.is_a?(BlankLine)
       return if previous_node.oneline? && oneline?
+
       v.printn
     end
 

data/lib/rbi/rewriters/add_sig_templates.rb

@@ -36,7 +36,7 @@ module RBI
 
         attr.sigs << Sig.new(
           params: params,
-          return_type: "T.untyped"
+          return_type: "T.untyped",
         )
         add_todo_comment(attr)
       end
@@ -47,7 +47,7 @@ module RBI
 
         method.sigs << Sig.new(
           params: method.params.map { |param| SigParam.new(param.name, "T.untyped") },
-          return_type: "T.untyped"
+          return_type: "T.untyped",
         )
         add_todo_comment(method)
       end

data/lib/rbi/rewriters/annotate.rb

@@ -30,6 +30,7 @@ module RBI
       sig { params(node: NodeWithComments).void }
       def annotate_node(node)
         return if node.annotations.one?(@annotation)
+
         node.comments << Comment.new("@#{@annotation}")
       end
 
@@ -49,7 +50,7 @@ module RBI
       visitor = Rewriters::Annotate.new(
         annotation,
         annotate_scopes: annotate_scopes,
-        annotate_properties: annotate_properties
+        annotate_properties: annotate_properties,
       )
       visitor.visit(self)
     end

data/lib/rbi/rewriters/deannotate.rb

@@ -26,6 +26,7 @@ module RBI
       sig { params(node: NodeWithComments).void }
       def deannotate_node(node)
         return unless node.annotations.one?(@annotation)
+
         node.comments.reject! do |comment|
           comment.text == "@#{@annotation}"
         end

data/lib/rbi/rewriters/merge_trees.rb

@@ -47,16 +47,20 @@ module RBI
         end
       end
 
-      sig { params(left: Tree, right: Tree, left_name: String, right_name: String, keep: Keep).returns(MergeTree) }
-      def self.merge_trees(left, right, left_name: "left", right_name: "right", keep: Keep::NONE)
-        left.nest_singleton_methods!
-        right.nest_singleton_methods!
-        rewriter = Rewriters::Merge.new(left_name: left_name, right_name: right_name, keep: keep)
-        rewriter.merge(left)
-        rewriter.merge(right)
-        tree = rewriter.tree
-        ConflictTreeMerger.new.visit(tree)
-        tree
+      class << self
+        extend T::Sig
+
+        sig { params(left: Tree, right: Tree, left_name: String, right_name: String, keep: Keep).returns(MergeTree) }
+        def merge_trees(left, right, left_name: "left", right_name: "right", keep: Keep::NONE)
+          left.nest_singleton_methods!
+          right.nest_singleton_methods!
+          rewriter = Rewriters::Merge.new(left_name: left_name, right_name: right_name, keep: keep)
+          rewriter.merge(left)
+          rewriter.merge(right)
+          tree = rewriter.tree
+          ConflictTreeMerger.new.visit(tree)
+          tree
+        end
       end
 
       sig { returns(MergeTree) }
@@ -293,6 +297,7 @@ module RBI
       parent = T.let(parent_tree, T.nilable(Node))
       while parent
         return parent if parent.is_a?(ConflictTree)
+
         parent = parent.parent_tree
       end
       nil
@@ -305,6 +310,7 @@ module RBI
     sig { override.params(other: Node).void }
     def merge_with(other)
       return unless other.is_a?(NodeWithComments)
+
       other.comments.each do |comment|
         comments << comment unless comments.include?(comment)
       end
@@ -332,7 +338,7 @@ module RBI
         loc: T.nilable(Loc),
         comments: T::Array[Comment],
         conflicts: T::Array[Rewriters::Merge::Conflict],
-        block: T.nilable(T.proc.params(node: Tree).void)
+        block: T.nilable(T.proc.params(node: Tree).void),
       ).void
     end
     def initialize(loc: nil, comments: [], conflicts: [], &block)
@@ -406,12 +412,14 @@ module RBI
     def compatible_with?(other)
       return false unless other.is_a?(Attr)
       return false unless names == other.names
+
       sigs.empty? || other.sigs.empty? || sigs == other.sigs
     end
 
     sig { override.params(other: Node).void }
     def merge_with(other)
       return unless other.is_a?(Attr)
+
       super
       other.sigs.each do |sig|
         sigs << sig unless sigs.include?(sig)
@@ -454,12 +462,14 @@ module RBI
       return false unless other.is_a?(Method)
       return false unless name == other.name
       return false unless params == other.params
+
       sigs.empty? || other.sigs.empty? || sigs == other.sigs
     end
 
     sig { override.params(other: Node).void }
     def merge_with(other)
       return unless other.is_a?(Method)
+
       super
       other.sigs.each do |sig|
         sigs << sig unless sigs.include?(sig)
@@ -545,6 +555,7 @@ module RBI
     sig { override.params(other: Node).void }
     def merge_with(other)
       return unless other.is_a?(TEnumBlock)
+
       super
       other.names.each do |name|
         names << name unless names.include?(name)
@@ -625,7 +636,7 @@ module RBI
         left: Scope,
         right: Scope,
         left_name: String,
-        right_name: String
+        right_name: String,
       ).void
     end
     def initialize(left:, right:, left_name: "left", right_name: "right")

data/lib/rbi/rewriters/nest_non_public_methods.rb

@@ -19,6 +19,7 @@ module RBI
           node.nodes.dup.each do |child|
             visit(child)
             next unless child.is_a?(Method)
+
             child.detach
             case child.visibility
             when Protected

data/lib/rbi/rewriters/nest_singleton_methods.rb

@@ -17,6 +17,7 @@ module RBI
           node.nodes.dup.each do |child|
             visit(child)
             next unless child.is_a?(Method) && child.is_singleton
+
             child.detach
             child.is_singleton = false
             singleton_class << child

data/lib/rbi/rewriters/remove_known_definitions.rb

@@ -48,18 +48,6 @@ module RBI
     class RemoveKnownDefinitions < Visitor
       extend T::Sig
 
-      sig do
-        params(
-          tree: Tree,
-          index: Index
-        ).returns([Tree, T::Array[Operation]])
-      end
-      def self.remove(tree, index)
-        v = RemoveKnownDefinitions.new(index)
-        v.visit(tree)
-        [tree, v.operations]
-      end
-
       sig { returns(T::Array[Operation]) }
       attr_reader :operations
 
@@ -70,6 +58,22 @@ module RBI
         @operations = T.let([], T::Array[Operation])
       end
 
+      class << self
+        extend T::Sig
+
+        sig do
+          params(
+            tree: Tree,
+            index: Index,
+          ).returns([Tree, T::Array[Operation]])
+        end
+        def remove(tree, index)
+          v = RemoveKnownDefinitions.new(index)
+          v.visit(tree)
+          [tree, v.operations]
+        end
+      end
+
       sig { params(nodes: T::Array[Node]).void }
       def visit_all(nodes)
         nodes.dup.each { |node| visit(node) }

data/lib/rbi/rewriters/sort_nodes.rb

@@ -11,20 +11,32 @@ module RBI
         sort_node_names!(node) if node
 
         return unless node.is_a?(Tree)
+
         visit_all(node.nodes)
         original_order = node.nodes.map.with_index.to_h
-        node.nodes.sort! do |a, b|
-          # First we try to compare the nodes by their node rank (based on the node type)
-          res = node_rank(a) <=> node_rank(b)
-          next res if res != 0 # we can sort the nodes by their rank, let's stop here
 
-          # Then, if the nodes ranks are the same (res == 0), we try to compare the nodes by their name
-          res = node_name(a) <=> node_name(b)
-          next res if res && res != 0 # we can sort the nodes by their name, let's stop here
+        # The child nodes could contain private/protected markers. If so, they should not be moved in the file.
+        # Otherwise, some methods could see their privacy change. To avoid that problem, divide the array of child
+        # nodes into chunks based on whether any Visibility nodes appear, and sort the chunks independently. This
+        # applies the ordering rules from the node_rank method as much as possible, while preserving visibility.
+        sorted_nodes = node.nodes.chunk do |n|
+          n.is_a?(Visibility)
+        end.flat_map do |_, nodes|
+          nodes.sort! do |a, b|
+            # First we try to compare the nodes by their node rank (based on the node type)
+            res = node_rank(a) <=> node_rank(b)
+            next res if res != 0 # we can sort the nodes by their rank, let's stop here
+
+            # Then, if the nodes ranks are the same (res == 0), we try to compare the nodes by their name
+            res = node_name(a) <=> node_name(b)
+            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
+            # 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
+          end
         end
+
+        node.nodes.replace(sorted_nodes)
       end
 
       private
@@ -81,10 +93,12 @@ module RBI
       sig { params(node: Node).returns(T.nilable(String)) }
       def node_name(node)
         case node
-        when Module, Class, Struct, Const, Method, Helper, TStructField, RequiresAncestor
+        when Module, Class, Struct, Const, Method, Helper, RequiresAncestor
           node.name
         when Attr
           node.names.first.to_s
+        when TStructField, Mixin
+          nil # we never want to sort these nodes by their name
         end
       end
 

data/lib/rbi/version.rb

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

data/lib/rbi.rb

@@ -3,11 +3,6 @@
 
 require "sorbet-runtime"
 require "stringio"
-
-module RBI
-  class Error < StandardError; end
-end
-
 require "rbi/loc"
 require "rbi/model"
 require "rbi/visitor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.4.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.4.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.6
 description: 
 email:
 - ruby@shopify.com
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.14
 signing_key: 
 specification_version: 4
 summary: RBI generation framework