rbi 0.3.14 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 706ddd81ba73b7bb27a27d7de59da2022a8b82f13e7494e1ef43d42b58213ee6
-  data.tar.gz: 236feb610cd95b7a18f0f00ff6b571fddeaba0dc7536c01e37118f8782337c5a
+  metadata.gz: 3c7c65440f9d48552a65ab2c087b141ab728a4eb03ba330b55e885df49792379
+  data.tar.gz: 4ed1352e4bdf88b220597979bc3b478e7f66227e156ce5fbfe71fcb5bf73ad34
 SHA512:
-  metadata.gz: e14e69a584e199a555940f778bafe41291c8303a3010943fe83b14be772082bebfe44aa5831e5f0f13618b2301a51e66ce45f85e90a85d9db4acefedd46d38c7
-  data.tar.gz: f24d3afe0e15c4dbab8e9e2ae0db3f1acb157e167274842b6fae00e84fdd9518c710f53d0f2934273507c167fc90ed5770b2da054f1fe547484248af12598b45
+  metadata.gz: 9d21c501fe9927818ed2afe2c7e68e0e4838c1d835a5c40ccbc57d49144fee05a4e8c2a447893bc4d8d6a0e774d4f5757791ec8202388a37e33fa445ec2946c8
+  data.tar.gz: 4b24fcee126547e8d0981e419994a1a39ff8f70a55aa93259fcaf7837d837a8842769da9205db28d414ed9920fb3a651eccdaa36c91dcf67ca323833926bca6d

data/Gemfile

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

data/lib/rbi/loc.rb

@@ -48,6 +48,13 @@ module RBI
       )
     end
 
+    #: -> bool
+    def multiline?
+      begin_line = self.begin_line
+      end_line = self.end_line
+      !!(begin_line && end_line && end_line > begin_line)
+    end
+
     #: -> String
     def to_s
       if end_line && end_column

data/lib/rbi/rbs/method_type_translator.rb

@@ -15,20 +15,40 @@ module RBI
         end
       end
 
+      class Options
+        #: bool
+        attr_reader :erase_generic_types
+
+        #: (?erase_generic_types: bool) -> void
+        def initialize(erase_generic_types: false)
+          @erase_generic_types = erase_generic_types
+        end
+
+        @default = new.freeze #: Options
+        class << self
+          #: Options
+          attr_reader :default
+        end
+      end
+
       #: Sig
       attr_reader :result
 
-      #: (Method) -> void
-      def initialize(method)
+      #: (Method, ?options: Options) -> void
+      def initialize(method, options: Options.default)
         @method = method
+        @options = options
+
         @result = Sig.new #: Sig
-        @type_translator = TypeTranslator.new #: TypeTranslator
+        @type_translator = TypeTranslator.new(options: @options) #: TypeTranslator
       end
 
       #: (::RBS::MethodType) -> void
       def visit(type)
-        type.type_params.each do |param|
-          result.type_params << param.name
+        unless @options.erase_generic_types
+          type.type_params.each do |param|
+            result.type_params << param.name
+          end
         end
 
         visit_function_type(type.type)

data/lib/rbi/rbs/type_translator.rb

@@ -35,6 +35,13 @@ module RBI
         end
       end
 
+      Options = MethodTypeTranslator::Options
+
+      #: (?options: Options) -> void
+      def initialize(options: Options.default)
+        @options = options
+      end
+
       #: (rbs_type) -> Type
       def translate(type)
         case type
@@ -59,7 +66,8 @@ module RBI
         when ::RBS::Types::Bases::Void
           Type.void
         when ::RBS::Types::ClassSingleton
-          type_parameter = type.args.first ? translate(type.args.first) : nil
+          type_arg = type.args.first
+          type_parameter = translate(type_arg) if type_arg && !@options.erase_generic_types
           Type.class_of(Type.simple(type.name.to_s), type_parameter)
         when ::RBS::Types::ClassInstance
           translate_class_instance(type)
@@ -99,7 +107,11 @@ module RBI
         when ::RBS::Types::UntypedFunction
           Type.proc.params(arg0: Type.untyped).returns(Type.untyped)
         when ::RBS::Types::Variable
-          Type.type_parameter(type.name)
+          if @options.erase_generic_types
+            Type.anything
+          else
+            Type.type_parameter(type.name)
+          end
         else
           type #: absurd
         end
@@ -121,10 +133,14 @@ module RBI
 
       #: (::RBS::Types::ClassInstance) -> Type
       def translate_class_instance(type)
-        return Type.simple(type.name.to_s) if type.args.empty?
+        type_name = type.name.to_s
+        return Type.simple(type_name) if type.args.empty?
 
-        type_name = translate_t_generic_type(type.name.to_s)
-        Type.generic(type_name, *type.args.map { |arg| translate(arg) })
+        if @options.erase_generic_types
+          Type.simple(erase_t_generic_type(type_name))
+        else
+          Type.generic(translate_t_generic_type(type_name), *type.args.map { |arg| translate(arg) })
+        end
       end
 
       #: (::RBS::Types::Function) -> Type
@@ -174,32 +190,35 @@ module RBI
         proc
       end
 
+      RUNTIME_GENERIC_TYPES = [
+        "Array",
+        "Class",
+        "Enumerable",
+        "Enumerator",
+        "Enumerator::Chain",
+        "Enumerator::Lazy",
+        "Hash",
+        "Module",
+        "Set",
+        "Range",
+      ].freeze #: Array[String]
+
+      GENERIC_TYPE_TO_SORBET_GENERIC_TYPE = RUNTIME_GENERIC_TYPES.flat_map do |type|
+        [[type, "::T::#{type}"], ["::#{type}", "::T::#{type}"]]
+      end.to_h.freeze #: Hash[String, String]
+
+      SORBET_GENERIC_TYPE_TO_GENERIC_TYPE = RUNTIME_GENERIC_TYPES.flat_map do |type|
+        [["T::#{type}", "::#{type}"], ["::T::#{type}", "::#{type}"]]
+      end.to_h.freeze #: Hash[String, String]
+
       #: (String type_name) -> String
       def translate_t_generic_type(type_name)
-        case type_name.delete_prefix("::")
-        when "Array"
-          "::T::Array"
-        when "Class"
-          "::T::Class"
-        when "Enumerable"
-          "::T::Enumerable"
-        when "Enumerator"
-          "::T::Enumerator"
-        when "Enumerator::Chain"
-          "::T::Enumerator::Chain"
-        when "Enumerator::Lazy"
-          "::T::Enumerator::Lazy"
-        when "Hash"
-          "::T::Hash"
-        when "Module"
-          "::T::Module"
-        when "Set"
-          "::T::Set"
-        when "Range"
-          "::T::Range"
-        else
-          type_name
-        end
+        GENERIC_TYPE_TO_SORBET_GENERIC_TYPE.fetch(type_name, type_name)
+      end
+
+      #: (String type_name) -> String
+      def erase_t_generic_type(type_name)
+        SORBET_GENERIC_TYPE_TO_GENERIC_TYPE.fetch(type_name, type_name)
       end
     end
   end

data/lib/rbi/rbs_printer.rb

@@ -25,9 +25,17 @@ module RBI
     #|   ?indent: Integer,
     #|   ?print_locs: bool,
     #|   ?positional_names: bool,
-    #|   ?max_line_length: Integer?
+    #|   ?max_line_length: Integer?,
+    #|   ?force_multiline_signatures: bool
     #| ) -> void
-    def initialize(out: $stdout, indent: 0, print_locs: false, positional_names: true, max_line_length: nil)
+    def initialize(
+      out: $stdout,
+      indent: 0,
+      print_locs: false,
+      positional_names: true,
+      max_line_length: nil,
+      force_multiline_signatures: false
+    )
       super()
       @out = out
       @current_indent = indent
@@ -36,6 +44,7 @@ module RBI
       @previous_node = nil #: Node?
       @positional_names = positional_names #: bool
       @max_line_length = max_line_length #: Integer?
+      @force_multiline_signatures = force_multiline_signatures #: bool
     end
 
     # Printing
@@ -406,10 +415,10 @@ module RBI
       @out = old_out
 
       max_line_length = @max_line_length
-      if max_line_length.nil? || new_out.string.size <= max_line_length
-        print(new_out.string)
-      else
+      if @force_multiline_signatures || (max_line_length && new_out.string.size > max_line_length)
         print_method_sig_multiline(node, sig)
+      else
+        print(new_out.string)
       end
     end
 

data/lib/rbi/version.rb

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

data/rbi/rbi.rbi

@@ -600,6 +600,9 @@ class RBI::Loc
   sig { params(other: ::RBI::Loc).returns(::RBI::Loc) }
   def join(other); end
 
+  sig { returns(T::Boolean) }
+  def multiline?; end
+
   sig { returns(T.nilable(::String)) }
   def source; end
 
@@ -1386,8 +1389,8 @@ RBI::Public::DEFAULT = T.let(T.unsafe(nil), RBI::Public)
 module RBI::RBS; end
 
 class RBI::RBS::MethodTypeTranslator
-  sig { params(method: ::RBI::Method).void }
-  def initialize(method); end
+  sig { params(method: ::RBI::Method, options: ::RBI::RBS::MethodTypeTranslator::Options).void }
+  def initialize(method, options: T.unsafe(nil)); end
 
   sig { returns(::RBI::Sig) }
   def result; end
@@ -1417,7 +1420,23 @@ end
 
 class RBI::RBS::MethodTypeTranslator::Error < ::RBI::Error; end
 
+class RBI::RBS::MethodTypeTranslator::Options
+  sig { params(erase_generic_types: T::Boolean).void }
+  def initialize(erase_generic_types: T.unsafe(nil)); end
+
+  sig { returns(T::Boolean) }
+  def erase_generic_types; end
+
+  class << self
+    sig { returns(::RBI::RBS::MethodTypeTranslator::Options) }
+    def default; end
+  end
+end
+
 class RBI::RBS::TypeTranslator
+  sig { params(options: ::RBI::RBS::MethodTypeTranslator::Options).void }
+  def initialize(options: T.unsafe(nil)); end
+
   sig do
     params(
       type: T.any(::RBS::Types::Alias, ::RBS::Types::Bases::Any, ::RBS::Types::Bases::Bool, ::RBS::Types::Bases::Bottom, ::RBS::Types::Bases::Class, ::RBS::Types::Bases::Instance, ::RBS::Types::Bases::Nil, ::RBS::Types::Bases::Self, ::RBS::Types::Bases::Top, ::RBS::Types::Bases::Void, ::RBS::Types::ClassInstance, ::RBS::Types::ClassSingleton, ::RBS::Types::Function, ::RBS::Types::Interface, ::RBS::Types::Intersection, ::RBS::Types::Literal, ::RBS::Types::Optional, ::RBS::Types::Proc, ::RBS::Types::Record, ::RBS::Types::Tuple, ::RBS::Types::Union, ::RBS::Types::UntypedFunction, ::RBS::Types::Variable)
@@ -1427,6 +1446,9 @@ class RBI::RBS::TypeTranslator
 
   private
 
+  sig { params(type_name: ::String).returns(::String) }
+  def erase_t_generic_type(type_name); end
+
   sig { params(type: ::RBS::Types::ClassInstance).returns(::RBI::Type) }
   def translate_class_instance(type); end
 
@@ -1449,7 +1471,11 @@ class RBI::RBS::TypeTranslator
   end
 end
 
+RBI::RBS::TypeTranslator::GENERIC_TYPE_TO_SORBET_GENERIC_TYPE = T.let(T.unsafe(nil), Hash)
+RBI::RBS::TypeTranslator::Options = RBI::RBS::MethodTypeTranslator::Options
+RBI::RBS::TypeTranslator::RUNTIME_GENERIC_TYPES = T.let(T.unsafe(nil), Array)
 RBI::RBS::TypeTranslator::RbsType = T.type_alias { T.any(::RBS::Types::Alias, ::RBS::Types::Bases::Any, ::RBS::Types::Bases::Bool, ::RBS::Types::Bases::Bottom, ::RBS::Types::Bases::Class, ::RBS::Types::Bases::Instance, ::RBS::Types::Bases::Nil, ::RBS::Types::Bases::Self, ::RBS::Types::Bases::Top, ::RBS::Types::Bases::Void, ::RBS::Types::ClassInstance, ::RBS::Types::ClassSingleton, ::RBS::Types::Function, ::RBS::Types::Interface, ::RBS::Types::Intersection, ::RBS::Types::Literal, ::RBS::Types::Optional, ::RBS::Types::Proc, ::RBS::Types::Record, ::RBS::Types::Tuple, ::RBS::Types::Union, ::RBS::Types::UntypedFunction, ::RBS::Types::Variable) }
+RBI::RBS::TypeTranslator::SORBET_GENERIC_TYPE_TO_GENERIC_TYPE = T.let(T.unsafe(nil), Hash)
 
 class RBI::RBSComment < ::RBI::Comment
   sig { params(other: ::Object).returns(T::Boolean) }
@@ -1463,10 +1489,11 @@ class RBI::RBSPrinter < ::RBI::Visitor
       indent: ::Integer,
       print_locs: T::Boolean,
       positional_names: T::Boolean,
-      max_line_length: T.nilable(::Integer)
+      max_line_length: T.nilable(::Integer),
+      force_multiline_signatures: T::Boolean
     ).void
   end
-  def initialize(out: T.unsafe(nil), indent: T.unsafe(nil), print_locs: T.unsafe(nil), positional_names: T.unsafe(nil), max_line_length: T.unsafe(nil)); end
+  def initialize(out: T.unsafe(nil), indent: T.unsafe(nil), print_locs: T.unsafe(nil), positional_names: T.unsafe(nil), max_line_length: T.unsafe(nil), force_multiline_signatures: T.unsafe(nil)); end
 
   sig { returns(::Integer) }
   def current_indent; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.16
 platform: ruby
 authors:
 - Alexandre Terrasa