rbi 0.3.11 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25403bea8eda0b45537db138c0bd858f416f6ba3f53e004bd862dbc80df71a35
-  data.tar.gz: f22394b06c7f3d5a9bfacf46c59f632f3c4cbe7f097eaec53ff55ad5cf749271
+  metadata.gz: b16ad7a7871bcd9c82c0228320779a44e950d2e3e54acb5a2348815bb7a2db21
+  data.tar.gz: deecb7ad84e99bf420710f17d8d94627bdf6e82a25d54d46bb4d18c6dbdfc097
 SHA512:
-  metadata.gz: 4265d4d65186de19fd085b99200c71a2b4f727067c33b1b413316228a1fb404f452caa65185130cb08d71c446ba6e11973326e010abe0c85455fe7ba7c54c6e6
-  data.tar.gz: c12e329306017b52c72ab3c5055036162f2488cc3ab5f9cb5d7f19971a63916978273e7a3229c8247b55bf7189cab54783e651930444de246b3c9081fc0f30b7
+  metadata.gz: 795d1adf5bbfdabb77cd3d47ab5e02b90f7f4d83f6dfa6e6531a1943e900b84ef863e750d7795ba109f6328025362f8dc31bfc0fef225938c552f121bba99f06
+  data.tar.gz: 6ef068e4c2e8bb7889a5c229fb59558b98bd041494bdc42213ad4e0cf1bdb00cf32e68f27204b665461d4dbfa7a3b6acc1f257295a62dc7b67f7c9bf4a3d0c5f

data/Gemfile

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

data/lib/rbi/printer.rb

@@ -748,7 +748,7 @@ module RBI
     #: (Sig node) -> void
     def print_sig_as_line(node)
       printt
-      print("T::Sig::WithoutRuntime.") if node.without_runtime
+      print("::T::Sig::WithoutRuntime.") if node.without_runtime
       print("sig")
       print("(:final)") if node.is_final
       print(" { ")
@@ -781,7 +781,7 @@ module RBI
       has_modifiers = !modifiers.empty?
 
       printt
-      print("T::Sig::WithoutRuntime.") if node.without_runtime
+      print("::T::Sig::WithoutRuntime.") if node.without_runtime
       print("sig")
       print("(:final)") if node.is_final
       printn(" do")

data/lib/rbi/rbs/method_type_translator.rb

@@ -22,6 +22,7 @@ module RBI
       def initialize(method)
         @method = method
         @result = Sig.new #: Sig
+        @type_translator = TypeTranslator.new #: TypeTranslator
       end
 
       #: (::RBS::MethodType) -> void
@@ -113,7 +114,7 @@ module RBI
 
       #: (untyped) -> Type
       def translate_type(type)
-        TypeTranslator.translate(type)
+        @type_translator.translate(type)
       end
     end
   end

data/lib/rbi/rbs/type_translator.rb

@@ -4,193 +4,201 @@
 module RBI
   module RBS
     class TypeTranslator
+      #: type rbs_type = ::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::ClassSingleton
+      #| | ::RBS::Types::ClassInstance
+      #| | ::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
+
       class << self
-        #: (
-        #|   ::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::ClassSingleton |
-        #|   ::RBS::Types::ClassInstance |
-        #|   ::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
-        #| ) -> Type
+        #: (rbs_type) -> Type
         def translate(type)
-          case type
-          when ::RBS::Types::Alias
-            translate_type_alias(type)
-          when ::RBS::Types::Bases::Any
-            Type.untyped
-          when ::RBS::Types::Bases::Bool
-            Type.boolean
-          when ::RBS::Types::Bases::Bottom
-            Type.noreturn
-          when ::RBS::Types::Bases::Class
-            Type.simple("Class")
-          when ::RBS::Types::Bases::Instance
-            Type.attached_class
-          when ::RBS::Types::Bases::Nil
-            Type.simple("NilClass")
-          when ::RBS::Types::Bases::Self
-            Type.self_type
-          when ::RBS::Types::Bases::Top
-            Type.anything
-          when ::RBS::Types::Bases::Void
-            Type.void
-          when ::RBS::Types::ClassSingleton
-            type_parameter = type.args.first ? translate(type.args.first) : nil
-            Type.class_of(Type.simple(type.name.to_s), type_parameter)
-          when ::RBS::Types::ClassInstance
-            translate_class_instance(type)
-          when ::RBS::Types::Function
-            translate_function(type)
-          when ::RBS::Types::Interface
-            # TODO: unsupported yet
-            # RBS interfaces (like _Foo) don't have a direct Sorbet equivalent
-            # and the names aren't valid Ruby identifiers
-            Type.untyped
-          when ::RBS::Types::Intersection
-            Type.all(*type.types.map { |t| translate(t) })
-          when ::RBS::Types::Literal
-            # Sorbet doesn't support literal types, so map to their base type
-            case type.literal
-            when nil then Type.simple("NilClass")
-            when true then Type.simple("TrueClass")
-            when false then Type.simple("FalseClass")
-            else
-              Type.simple(type.literal.class.to_s)
-            end
-          when ::RBS::Types::Optional
-            Type.nilable(translate(type.type))
-          when ::RBS::Types::Proc
-            proc = translate(type.type) #: as Type::Proc
-            proc.bind(translate(type.self_type)) if type.self_type
-            proc
-          when ::RBS::Types::Record
-            Type.shape(type.fields.map { |name, type| [name, translate(type)] }.to_h)
-          when ::RBS::Types::Tuple
-            Type.tuple(type.types.map { |t| translate(t) })
-          when ::RBS::Types::Union
-            Type.any(*type.types.map { |t| translate(t) })
-          when ::RBS::Types::UntypedFunction
-            Type.proc.params(arg0: Type.untyped).returns(Type.untyped)
-          when ::RBS::Types::Variable
-            Type.type_parameter(type.name)
-          else
-            type #: absurd
-          end
+          new.translate(type)
         end
+      end
 
-        private
-
-        #: (::RBS::Types::Alias) -> Type
-        def translate_type_alias(type)
-          name = ::RBS::TypeName.new(
-            namespace: type.name.namespace,
-            name: type.name.name.to_s.gsub(/(?:^|_)([a-z\d]*)/i) do |match|
-              match = match.delete_prefix("_")
-              !match.empty? ? match[0].upcase.concat(match[1..-1]) : +""
-            end,
-          )
-          Type.simple(name.to_s)
+      #: (rbs_type) -> Type
+      def translate(type)
+        case type
+        when ::RBS::Types::Alias
+          translate_type_alias(type)
+        when ::RBS::Types::Bases::Any
+          Type.untyped
+        when ::RBS::Types::Bases::Bool
+          Type.boolean
+        when ::RBS::Types::Bases::Bottom
+          Type.noreturn
+        when ::RBS::Types::Bases::Class
+          Type.simple("Class")
+        when ::RBS::Types::Bases::Instance
+          Type.attached_class
+        when ::RBS::Types::Bases::Nil
+          Type.simple("NilClass")
+        when ::RBS::Types::Bases::Self
+          Type.self_type
+        when ::RBS::Types::Bases::Top
+          Type.anything
+        when ::RBS::Types::Bases::Void
+          Type.void
+        when ::RBS::Types::ClassSingleton
+          type_parameter = type.args.first ? translate(type.args.first) : nil
+          Type.class_of(Type.simple(type.name.to_s), type_parameter)
+        when ::RBS::Types::ClassInstance
+          translate_class_instance(type)
+        when ::RBS::Types::Function
+          translate_function(type)
+        when ::RBS::Types::Interface
+          # TODO: unsupported yet
+          # RBS interfaces (like _Foo) don't have a direct Sorbet equivalent
+          # and the names aren't valid Ruby identifiers
+          Type.untyped
+        when ::RBS::Types::Intersection
+          Type.all(*type.types.map { |t| translate(t) })
+        when ::RBS::Types::Literal
+          # Sorbet doesn't support literal types, so map to their base type
+          case type.literal
+          when nil then Type.simple("NilClass")
+          when true then Type.simple("TrueClass")
+          when false then Type.simple("FalseClass")
+          else
+            Type.simple(type.literal.class.to_s)
+          end
+        when ::RBS::Types::Optional
+          Type.nilable(translate(type.type))
+        when ::RBS::Types::Proc
+          proc = translate(type.type) #: as Type::Proc
+          proc.bind(translate(type.self_type)) if type.self_type
+          proc
+        when ::RBS::Types::Record
+          Type.shape(type.all_fields.to_h do |name, (value, required)|
+            translated = translate(value)
+            [name, required ? translated : Type.nilable(translated)]
+          end)
+        when ::RBS::Types::Tuple
+          Type.tuple(type.types.map { |t| translate(t) })
+        when ::RBS::Types::Union
+          Type.any(*type.types.map { |t| translate(t) })
+        when ::RBS::Types::UntypedFunction
+          Type.proc.params(arg0: Type.untyped).returns(Type.untyped)
+        when ::RBS::Types::Variable
+          Type.type_parameter(type.name)
+        else
+          type #: absurd
         end
+      end
 
-        #: (::RBS::Types::ClassInstance) -> Type
-        def translate_class_instance(type)
-          return Type.simple(type.name.to_s) if type.args.empty?
+      private
+
+      #: (::RBS::Types::Alias) -> Type
+      def translate_type_alias(type)
+        name = ::RBS::TypeName.new(
+          namespace: type.name.namespace,
+          name: type.name.name.to_s.gsub(/(?:^|_)([a-z\d]*)/i) do |match|
+            match = match.delete_prefix("_")
+            !match.empty? ? match[0].upcase.concat(match[1..-1]) : +""
+          end,
+        )
+        Type.simple(name.to_s)
+      end
 
-          type_name = translate_t_generic_type(type.name.to_s)
-          Type.generic(type_name, *type.args.map { |arg| translate(arg) })
-        end
+      #: (::RBS::Types::ClassInstance) -> Type
+      def translate_class_instance(type)
+        return Type.simple(type.name.to_s) if type.args.empty?
 
-        #: (::RBS::Types::Function) -> Type
-        def translate_function(type)
-          proc = Type.proc
+        type_name = translate_t_generic_type(type.name.to_s)
+        Type.generic(type_name, *type.args.map { |arg| translate(arg) })
+      end
 
-          index = 0
+      #: (::RBS::Types::Function) -> Type
+      def translate_function(type)
+        proc = Type.proc
 
-          type.required_positionals.each do |param|
-            proc.proc_params[param.name || :"arg#{index}"] = translate(param.type)
-            index += 1
-          end
+        index = 0
 
-          type.optional_positionals.each do |param|
-            proc.proc_params[param.name || :"arg#{index}"] = translate(param.type)
-            index += 1
-          end
+        type.required_positionals.each do |param|
+          proc.proc_params[param.name || :"arg#{index}"] = translate(param.type)
+          index += 1
+        end
 
-          rest_positional = type.rest_positionals
-          if rest_positional
-            proc.proc_params[rest_positional.name || :"arg#{index}"] = translate(rest_positional.type)
-            index += 1
-          end
+        type.optional_positionals.each do |param|
+          proc.proc_params[param.name || :"arg#{index}"] = translate(param.type)
+          index += 1
+        end
 
-          type.trailing_positionals.each do |param|
-            proc.proc_params[param.name || :"arg#{index}"] = translate(param.type)
-            index += 1
-          end
+        rest_positional = type.rest_positionals
+        if rest_positional
+          proc.proc_params[rest_positional.name || :"arg#{index}"] = translate(rest_positional.type)
+          index += 1
+        end
 
-          type.required_keywords.each do |name, param|
-            proc.proc_params[name.to_sym] = translate(param.type)
-            index += 1
-          end
+        type.trailing_positionals.each do |param|
+          proc.proc_params[param.name || :"arg#{index}"] = translate(param.type)
+          index += 1
+        end
 
-          type.optional_keywords.each do |name, param|
-            proc.proc_params[name.to_sym] = translate(param.type)
-            index += 1
-          end
+        type.required_keywords.each do |name, param|
+          proc.proc_params[name.to_sym] = translate(param.type)
+          index += 1
+        end
 
-          rest_keyword = type.rest_keywords
-          if rest_keyword
-            proc.proc_params[rest_keyword.name || :"arg_#{index}"] = translate(rest_keyword.type)
-            index += 1
-          end
+        type.optional_keywords.each do |name, param|
+          proc.proc_params[name.to_sym] = translate(param.type)
+          index += 1
+        end
 
-          proc.returns(translate(type.return_type))
-          proc
+        rest_keyword = type.rest_keywords
+        if rest_keyword
+          proc.proc_params[rest_keyword.name || :"arg_#{index}"] = translate(rest_keyword.type)
+          index += 1
         end
 
-        #: (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
+        proc.returns(translate(type.return_type))
+        proc
+      end
+
+      #: (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
       end
     end

data/lib/rbi/rewriters/add_sig_templates.rb

@@ -31,11 +31,11 @@ module RBI
         return if attr.names.size > 1
 
         params = []
-        params << SigParam.new(attr.names.first.to_s, "T.untyped") if attr.is_a?(AttrWriter)
+        params << SigParam.new(attr.names.first.to_s, "::T.untyped") if attr.is_a?(AttrWriter)
 
         attr.sigs << Sig.new(
           params: params,
-          return_type: "T.untyped",
+          return_type: "::T.untyped",
         )
         add_todo_comment(attr)
       end
@@ -45,8 +45,8 @@ module RBI
         return unless method.sigs.empty?
 
         method.sigs << Sig.new(
-          params: method.params.map { |param| SigParam.new(param.name, "T.untyped") },
-          return_type: "T.untyped",
+          params: method.params.map { |param| SigParam.new(param.name, "::T.untyped") },
+          return_type: "::T.untyped",
         )
         add_todo_comment(method)
       end

data/lib/rbi/rewriters/translate_rbs_sigs.rb

@@ -7,6 +7,12 @@ module RBI
     class TranslateRBSSigs < Visitor
       class Error < RBI::Error; end
 
+      #: -> void
+      def initialize
+        super
+        @type_translator = RBS::TypeTranslator.new #: RBS::TypeTranslator
+      end
+
       # @override
       #: (Node? node) -> void
       def visit(node)
@@ -68,10 +74,10 @@ module RBI
           end
 
           name = node.names.first #: as !nil
-          sig.params << SigParam.new(name.to_s, RBS::TypeTranslator.translate(attr_type))
+          sig.params << SigParam.new(name.to_s, @type_translator.translate(attr_type))
         end
 
-        sig.return_type = RBS::TypeTranslator.translate(attr_type)
+        sig.return_type = @type_translator.translate(attr_type)
         sig
       end
     end

data/lib/rbi/version.rb

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

data/rbi/rbi.rbi

@@ -1418,6 +1418,27 @@ end
 class RBI::RBS::MethodTypeTranslator::Error < ::RBI::Error; end
 
 class RBI::RBS::TypeTranslator
+  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)
+    ).returns(::RBI::Type)
+  end
+  def translate(type); end
+
+  private
+
+  sig { params(type: ::RBS::Types::ClassInstance).returns(::RBI::Type) }
+  def translate_class_instance(type); end
+
+  sig { params(type: ::RBS::Types::Function).returns(::RBI::Type) }
+  def translate_function(type); end
+
+  sig { params(type_name: ::String).returns(::String) }
+  def translate_t_generic_type(type_name); end
+
+  sig { params(type: ::RBS::Types::Alias).returns(::RBI::Type) }
+  def translate_type_alias(type); end
+
   class << self
     sig do
       params(
@@ -1425,23 +1446,11 @@ class RBI::RBS::TypeTranslator
       ).returns(::RBI::Type)
     end
     def translate(type); end
-
-    private
-
-    sig { params(type: ::RBS::Types::ClassInstance).returns(::RBI::Type) }
-    def translate_class_instance(type); end
-
-    sig { params(type: ::RBS::Types::Function).returns(::RBI::Type) }
-    def translate_function(type); end
-
-    sig { params(type_name: ::String).returns(::String) }
-    def translate_t_generic_type(type_name); end
-
-    sig { params(type: ::RBS::Types::Alias).returns(::RBI::Type) }
-    def translate_type_alias(type); end
   end
 end
 
+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) }
+
 class RBI::RBSComment < ::RBI::Comment
   sig { params(other: ::Object).returns(T::Boolean) }
   def ==(other); end
@@ -2022,6 +2031,9 @@ class RBI::Rewriters::SortNodes < ::RBI::Visitor
 end
 
 class RBI::Rewriters::TranslateRBSSigs < ::RBI::Visitor
+  sig { void }
+  def initialize; end
+
   sig { override.params(node: T.nilable(::RBI::Node)).void }
   def visit(node); end
 

metadata

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