rbi 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c3c0c783365e22f77fdee8bc3ece4169fd2a5c51b6e912adc279878a1808507
-  data.tar.gz: 24a244adfb855ac354c3f84a9bc367c906286afc915935098df4e22db40905f2
+  metadata.gz: 25403bea8eda0b45537db138c0bd858f416f6ba3f53e004bd862dbc80df71a35
+  data.tar.gz: f22394b06c7f3d5a9bfacf46c59f632f3c4cbe7f097eaec53ff55ad5cf749271
 SHA512:
-  metadata.gz: 1a2822c823f19508eb06c7c9e70753ef7c1284c0477c626aa986fbba2967b028c6d2dc4caede8c2f6b6d2037ff36803bd02d449d2a88a7ce07c44d2e9ddc6f4c
-  data.tar.gz: f93c69e41c77d06b0df42f3b65e9a64016e48a78b9d203ed8e1b364bd05aea2559a343f620d9aef5d92f0d5ade5d21bbcaeb260b0d8d2899dc8dfd23c03b5710
+  metadata.gz: 4265d4d65186de19fd085b99200c71a2b4f727067c33b1b413316228a1fb404f452caa65185130cb08d71c446ba6e11973326e010abe0c85455fe7ba7c54c6e6
+  data.tar.gz: c12e329306017b52c72ab3c5055036162f2488cc3ab5f9cb5d7f19971a63916978273e7a3229c8247b55bf7189cab54783e651930444de246b3c9081fc0f30b7

data/Gemfile

@@ -6,11 +6,11 @@ source "https://rubygems.org"
 gemspec
 
 group(:development, :test) do
-  gem("byebug")
+  gem("debug")
   gem("minitest")
   gem("minitest-reporters")
-  gem("rake", "~> 13.3")
-  gem("rubocop", "~> 1.81", require: false)
+  gem("rake", "~> 13.4")
+  gem("rubocop", "~> 1.86", require: false)
   gem("rubocop-shopify", require: false)
   gem("rubocop-sorbet", require: false)
   gem("sorbet", ">= 0.5.9204", require: false)

data/lib/rbi/model.rb

@@ -196,12 +196,12 @@ module RBI
 
   class Module < Scope
     #: String
-    attr_accessor :name
+    attr_reader :name
 
     #: (String name, ?loc: Loc?, ?comments: Array[Comment]?) ?{ (Module node) -> void } -> void
     def initialize(name, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments) {}
-      @name = name
+      @name = name.to_s #: String
       block&.call(self)
     end
 
@@ -216,7 +216,7 @@ module RBI
 
   class Class < Scope
     #: String
-    attr_accessor :name
+    attr_reader :name
 
     #: String?
     attr_accessor :superclass_name
@@ -229,7 +229,7 @@ module RBI
     #| ) ?{ (Class node) -> void } -> void
     def initialize(name, superclass_name: nil, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments) {}
-      @name = name
+      @name = name.to_s #: String
       @superclass_name = superclass_name
       block&.call(self)
     end
@@ -259,7 +259,7 @@ module RBI
 
   class Struct < Scope
     #: String
-    attr_accessor :name
+    attr_reader :name
 
     #: Array[Symbol]
     attr_accessor :members
@@ -276,7 +276,7 @@ module RBI
     #| ) ?{ (Struct struct) -> void } -> void
     def initialize(name, members: [], keyword_init: false, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments) {}
-      @name = name
+      @name = name.to_s #: String
       @members = members
       @keyword_init = keyword_init
       block&.call(self)
@@ -300,7 +300,7 @@ module RBI
     #: (String name, String value, ?loc: Loc?, ?comments: Array[Comment]?) ?{ (Const node) -> void } -> void
     def initialize(name, value, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       @value = value
       block&.call(self)
     end
@@ -453,7 +453,7 @@ module RBI
 
   class Method < NodeWithComments
     #: String
-    attr_accessor :name
+    attr_reader :name
 
     #: -> Array[Param]
     def params
@@ -499,7 +499,7 @@ module RBI
       &block
     )
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       @params = params #: Array[Param]?
       @is_singleton = is_singleton
       @visibility = visibility
@@ -605,7 +605,7 @@ module RBI
     #: (String name, ?loc: Loc?, ?comments: Array[Comment]?) -> void
     def initialize(name, loc: nil, comments: nil)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       @anonymous = name.start_with?("_") #: bool
     end
 
@@ -731,7 +731,7 @@ module RBI
     #: (String name, Array[String] names, ?loc: Loc?, ?comments: Array[Comment]?) -> void
     def initialize(name, names, loc: nil, comments: nil)
       super(loc: loc, comments: comments)
-      @names = [name, *names] #: Array[String]
+      @names = [name, *names].map(&:to_s) #: Array[String]
     end
   end
 
@@ -1022,7 +1022,7 @@ module RBI
     #: (String name, (Type | String) type, ?loc: Loc?, ?comments: Array[Comment]?) ?{ (SigParam node) -> void } -> void
     def initialize(name, type, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       @anonymous = name.start_with?("_") #: bool
       @type = type
       block&.call(self)
@@ -1054,7 +1054,7 @@ module RBI
   # @abstract
   class TStructField < NodeWithComments
     #: String
-    attr_accessor :name
+    attr_reader :name
 
     #: (Type | String)
     attr_accessor :type
@@ -1065,7 +1065,7 @@ module RBI
     #: (String name, (Type | String) type, ?default: String?, ?loc: Loc?, ?comments: Array[Comment]?) -> void
     def initialize(name, type, default: nil, loc: nil, comments: nil)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       @type = type
       @default = default
     end
@@ -1166,7 +1166,7 @@ module RBI
     #: (String name, ?loc: Loc?, ?comments: Array[Comment]?) ?{ (TEnumValue node) -> void } -> void
     def initialize(name, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       block&.call(self)
     end
 
@@ -1191,7 +1191,7 @@ module RBI
     #: (String name, ?loc: Loc?, ?comments: Array[Comment]?) ?{ (Helper node) -> void } -> void
     def initialize(name, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       block&.call(self)
     end
 
@@ -1209,7 +1209,7 @@ module RBI
     #: (String name, String value, ?loc: Loc?, ?comments: Array[Comment]?) ?{ (TypeMember node) -> void } -> void
     def initialize(name, value, loc: nil, comments: nil, &block)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
       @value = value
       block&.call(self)
     end
@@ -1254,7 +1254,7 @@ module RBI
     #: (String name, ?loc: Loc?, ?comments: Array[Comment]?) -> void
     def initialize(name, loc: nil, comments: nil)
       super(loc: loc, comments: comments)
-      @name = name
+      @name = name.to_s #: String
     end
 
     # @override

data/lib/rbi/rbs_printer.rb

@@ -380,7 +380,7 @@ module RBI
         end
       else
         if node.params.any?
-          params = node.params.reject { |param| param.is_a?(BlockParam) }
+          params = node.params.grep_v(BlockParam)
           block = node.params.find { |param| param.is_a?(BlockParam) }
 
           print("(")

data/lib/rbi/rewriters/merge_trees.rb

@@ -479,10 +479,12 @@ module RBI
       super
 
       # If self is the all-anonymous side (since compatible_with? ensures
-      # at most one side is), adopt other's non-anonymous param names and sigs.
-      if params.all?(&:anonymous?)
+      # at most one side is), or if self has no sigs but other does, adopt
+      # other's non-anonymous param names and sigs.
+      if params.all?(&:anonymous?) || (sigs.empty? && !other.sigs.empty?)
         @params = other.params.dup
         @sigs = other.sigs.dup unless other.sigs.empty?
+        return
       end
 
       other.sigs.each do |sig|

data/lib/rbi/rewriters/sort_nodes.rb

@@ -18,7 +18,7 @@ module RBI
 
         # Fast path: if no Visibility nodes are present (common after group_nodes!/nest_non_public_members!),
         # skip the chunk and sort directly.
-        has_visibility = nodes.any? { |n| n.is_a?(Visibility) }
+        has_visibility = nodes.any?(Visibility)
 
         if has_visibility
           # The child nodes contain private/protected markers. Divide into chunks

data/lib/rbi/type.rb

@@ -112,7 +112,7 @@ module RBI
       # @override
       #: -> String
       def to_rbi
-        "T::Boolean"
+        "::T::Boolean"
       end
 
       # @override
@@ -258,7 +258,7 @@ module RBI
       # @override
       #: -> String
       def to_rbi
-        "T::Class[#{@type}]"
+        "::T::Class[#{@type}]"
       end
 
       # @override
@@ -294,7 +294,7 @@ module RBI
       # @override
       #: -> String
       def to_rbi
-        "T::Module[#{@type}]"
+        "::T::Module[#{@type}]"
       end
 
       # @override
@@ -498,7 +498,7 @@ module RBI
         return type.simplify unless type.is_a?(Any)
 
         types = type.types.map(&:simplify)
-        return Untyped.new if types.any? { |type| type.is_a?(Untyped) }
+        return Untyped.new if types.any?(Untyped)
 
         has_true_class = types.any? { |type| type.is_a?(Simple) && type.name == "TrueClass" }
         has_false_class = types.any? { |type| type.is_a?(Simple) && type.name == "FalseClass" }

data/lib/rbi/version.rb

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

data/rbi/rbi.rbi

@@ -220,8 +220,6 @@ class RBI::Class < ::RBI::Scope
   sig { returns(::String) }
   def name; end
 
-  def name=(_arg0); end
-
   sig { returns(T.nilable(::String)) }
   def superclass_name; end
 
@@ -705,8 +703,6 @@ class RBI::Method < ::RBI::NodeWithComments
   sig { returns(::String) }
   def name; end
 
-  def name=(_arg0); end
-
   sig { returns(T::Array[::RBI::Param]) }
   def params; end
 
@@ -796,8 +792,6 @@ class RBI::Module < ::RBI::Scope
 
   sig { returns(::String) }
   def name; end
-
-  def name=(_arg0); end
 end
 
 class RBI::Node
@@ -2268,8 +2262,6 @@ class RBI::Struct < ::RBI::Scope
 
   sig { returns(::String) }
   def name; end
-
-  def name=(_arg0); end
 end
 
 class RBI::TEnum < ::RBI::Class
@@ -2398,8 +2390,6 @@ class RBI::TStructField < ::RBI::NodeWithComments
   sig { returns(::String) }
   def name; end
 
-  def name=(_arg0); end
-
   sig { returns(T.any(::RBI::Type, ::String)) }
   def type; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Alexandre Terrasa
@@ -89,14 +89,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: RBI generation framework
 test_files: []