rbs 3.2.2 → 3.3.0.pre.1

data/lib/rbs.rb

@@ -30,6 +30,7 @@ require "rbs/definition"
 require "rbs/definition_builder"
 require "rbs/definition_builder/ancestor_builder"
 require "rbs/definition_builder/method_builder"
+require "rbs/diff"
 require "rbs/variance_calculator"
 require "rbs/substitution"
 require "rbs/constant"

data/rbs.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 3.0"
+  spec.add_dependency "abbrev"
 end

data/sig/annotate/formatter.rbs

@@ -17,8 +17,8 @@ module RBS
 
       def self.translate: (RDoc::Markup::Document) -> String?
 
-      def self.each_part: (RDoc::Markup::Document) { (RDoc::Markup::Document) -> void } -> void
-                        | (RDoc::Markup::Document) -> Enumerator[RDoc::Markup::Document, void]
+      def self.each_part: (RDoc::Markup::Document | RDoc::Comment | String) { (RDoc::Markup::Document) -> void } -> void
+                        | (RDoc::Markup::Document | RDoc::Comment | String) -> Enumerator[RDoc::Markup::Document, void]
     end
   end
 end

data/sig/annotate/rdoc_annotater.rbs

@@ -17,7 +17,7 @@ module RBS
       end
 
       interface _WithRDocComment
-        def comment: () -> RDoc::Markup::Document
+        def comment: () -> (RDoc::Markup::Document | RDoc::Comment | String)
       end
 
       def each_part: (Array[Object & _WithRDocComment], tester: _PathTester) { ([RDoc::Markup::Document, Object & _WithRDocComment]) -> void } -> void

data/sig/cli/colored_io.rbs

@@ -0,0 +1,15 @@
+module RBS
+  class CLI
+    class ColoredIO
+      attr_reader stdout: CLI::_IO
+      def initialize: (stdout: CLI::_IO) -> void
+      def puts_green: (String) -> void
+      def puts_red: (String) -> void
+      def puts: (?String) -> void
+
+      private def can_display_colors?: () -> bool
+      private def are_colors_supported?: () -> bool
+      private def are_colors_disabled?: () -> bool
+    end
+  end
+end

data/sig/cli/diff.rbs

@@ -0,0 +1,21 @@
+module RBS
+  class CLI
+    class Diff
+      @format: String
+      @stdout: _IO
+      @stderr: _IO
+      @diff: RBS::Diff
+
+      def initialize: (
+        argv: Array[String],
+        library_options: RBS::CLI::LibraryOptions,
+        ?stdout: _IO,
+        ?stderr: _IO,
+      ) -> void
+
+      def run: () -> void
+      def run_diff: () -> void
+      def run_markdown: () -> void
+    end
+  end
+end

data/sig/cli.rbs

@@ -18,6 +18,8 @@ module RBS
     interface _IO
       def puts: (*untyped) -> void
 
+      def tty?: () -> bool
+
       def print: (*untyped) -> void
 
       def flush: () -> void

data/sig/collection/config/lockfile.rbs

@@ -7,7 +7,6 @@ module RBS
         # Data structure stored in `rbs_collection.lock.yaml`
         #
         type lockfile_data = {
-          "sources" => Array[Sources::Git::source_entry]?,   # null if empty
           "path" => String,
           "gems" => Array[library_data]?,         # null if empty
           "gemfile_lock_path" => String?          # gemfile_lock_path is optional because older versions doesn't have it
@@ -43,8 +42,6 @@ module RBS
         #
         attr_reader gemfile_lock_path: Pathname?
 
-        attr_reader sources: Hash[String, Sources::Git]
-
         attr_reader gems: Hash[String, library]
 
         def initialize: (lockfile_path: Pathname, path: Pathname, gemfile_lock_path: Pathname?) -> void
@@ -59,9 +56,6 @@ module RBS
 
         def to_lockfile: () -> lockfile_data
 
-        def each_source: () { (Sources::t) -> void } -> void
-                       | () -> Enumerator[Sources::t, void]
-
         def self.from_lockfile: (lockfile_path: Pathname, data: lockfile_data) -> Lockfile
 
         # Validates if directories are set up correctly

data/sig/diff.rbs

@@ -0,0 +1,23 @@
+module RBS
+  class Diff
+    @type_name: TypeName
+    @library_options: RBS::CLI::LibraryOptions
+    @after_path: Array[String]
+    @before_path: Array[String]
+
+    def initialize: (
+      type_name: TypeName,
+      library_options: RBS::CLI::LibraryOptions,
+      ?after_path: Array[String],
+      ?before_path: Array[String]
+    ) -> void
+
+    def each_diff: () { (String before, String after) -> void } -> void
+
+    private def each_diff_by: (Symbol kind, Hash[::Symbol, Definition::Method] before_methods, Hash[::Symbol, Definition::Method] after_methods) { (String before, String after) -> void } -> void
+    private def build_methods: (Array[String] path) -> [ Hash[::Symbol, Definition::Method], Hash[::Symbol, Definition::Method] ]
+    private def build_env: (Array[String] path) -> Environment
+    private def build_builder: (Environment env) -> DefinitionBuilder
+    private def definition_method_to_s: (Symbol key, Symbol kind, Definition::Method definition_method) -> String?
+  end
+end

data/sig/errors.rbs

@@ -20,11 +20,7 @@ module RBS
     %a{pure} def location: () -> Location[untyped, untyped]?
   end
 
-  interface _DetailedMessage
-    def detailed_message: (**untyped) -> String
-  end
-
-  module DetailedMessageable : _Location, _DetailedMessage
+  module DetailedMessageable : _Location, Exception
     def detailed_message: (?highlight: boolish, **untyped) -> String
   end
 

data/sig/method_types.rbs

@@ -48,5 +48,11 @@ module RBS
     def to_s: () -> String
 
     def type_param_names: () -> Array[Symbol]
+
+    def has_self_type?: () -> bool
+
+    def has_classish_type?: () -> bool
+
+    def with_nonreturn_void?: () -> bool
   end
 end

data/sig/prototype/runtime.rbs

@@ -0,0 +1,108 @@
+module RBS
+  module Prototype
+    class Runtime
+      class Todo
+        @builder: DefinitionBuilder
+
+        @mixin_decls_cache: Hash[TypeName, Array[untyped]]
+
+        def initialize: (builder: DefinitionBuilder) -> void
+
+        def skip_mixin?: (type_name: TypeName, module_name: TypeName, mixin_class: mixin_class) -> bool
+
+        def skip_singleton_method?: (module_name: TypeName, name: Symbol) -> bool
+
+        def skip_instance_method?: (module_name: TypeName, name: Symbol) -> bool
+
+        def skip_constant?: (module_name: String, name: Symbol) -> bool
+
+        private def mixin_decls: (TypeName type_name) -> Array[AST::Members::Include | AST::Members::Extend | AST::Members::Prepend]
+      end
+
+      type mixin_class = singleton(AST::Members::Include) | singleton(AST::Members::Prepend) | singleton(AST::Members::Extend)
+
+      @decls: Array[AST::Declarations::t]?
+
+      @modules: Hash[String, Module]
+
+      @builder: DefinitionBuilder
+
+      @module_name_method: UnboundMethod
+      @object_class: UnboundMethod
+
+      @todo_object: Todo?
+
+      include Helpers
+
+      attr_reader patterns: Array[String]
+
+      attr_reader env: Environment
+
+      attr_reader merge: bool
+
+      attr_reader todo: bool
+
+      attr_accessor outline: bool
+
+      attr_reader owners_included: Array[Module]
+
+      def initialize: (patterns: Array[String], env: Environment, merge: bool, ?todo: bool, ?owners_included: Array[Symbol]) -> void
+
+      def target?: (Module const) -> bool
+
+      def todo_object: () -> Todo?
+
+      def builder: () -> DefinitionBuilder
+
+      def parse: (String file) -> void
+
+      def decls: () -> Array[AST::Declarations::t]
+
+      def to_type_name: (String name, ?full_name: bool) -> TypeName
+
+      def each_mixined_module: (TypeName type_name, Module mod) { (TypeName, TypeName, mixin_class) -> void } -> void
+
+      def each_mixined_module_one: (TypeName type_name, Module mod) { (TypeName, TypeName, bool) -> void } -> void
+
+      def method_type: (UnboundMethod method) -> MethodType
+
+      def merge_rbs: [A] (TypeName module_name, Array[AST::Declarations::Class::member] members, singleton: Symbol) { () -> A } -> A?
+                   | [A] (TypeName module_name, Array[AST::Declarations::Class::member] members, instance: Symbol) { () -> A } -> A?
+
+      def target_method?: (Module mod, instance: Symbol) -> bool
+                        | (Module mod, singleton: Symbol) -> bool
+
+      def generate_methods: (Module mod, TypeName module_name, Array[AST::Declarations::Class::member] members) -> void
+
+      def generate_constants: (Module mod, Array[AST::Declarations::Class::member] decls) -> void
+
+      def generate_super_class: (Class mod) -> AST::Declarations::Class::Super?
+
+      def generate_class: (Class mod) -> void
+
+      def generate_module: (Module mod) -> void
+
+      # Generate/find outer module declarations
+      # This is broken down into another method to comply with `DRY`
+      # This generates/finds declarations in nested form & returns the last array of declarations
+      def ensure_outer_module_declarations: (Module mod) -> Array[AST::Declarations::Class::member]
+
+      # Returns the exact name & not compactly declared name
+      def only_name: (Module mod) -> String
+
+      def const_name: (Module const) -> String?
+
+      def const_name!: (Module const) -> String
+
+      def object_class: (untyped) -> untyped
+
+      def type_args: (TypeName type_name) -> Array[Types::t]
+
+      def block_from_ast_of: (UnboundMethod method) -> Types::Block?
+
+      def can_alias?: (Module, UnboundMethod) -> bool
+
+      def type_params: (Module) -> Array[AST::TypeParam]
+    end
+  end
+end

data/sig/rdoc/rbs.rbs

@@ -8,6 +8,10 @@ end
 module RBS
   module RDocPlugin
     class Parser
+      @top_level: RDoc::TopLevel
+
+      @content: String
+
       type allowed_decls = RBS::AST::Declarations::Class
                          | RBS::AST::Declarations::Module
                          | RBS::AST::Declarations::Constant

data/sig/shims/bundler.rbs

@@ -30,4 +30,9 @@ module Bundler
   def self.default_lockfile: () -> Pathname
 
   def self.definition: () -> Definition
+
+  module Source
+    class Gemspec
+    end
+  end
 end

data/sig/sorter.rbs

@@ -14,10 +14,28 @@ module RBS
 
     def run: () -> void
 
-    def group: (member member) -> Numeric
-
-    def key: (member member) -> String
-
-    def sort_decl!: (AST::Declarations::t decl) -> void
+    type partitioned = {
+      type_alias_decls: Array[AST::Declarations::TypeAlias],
+      constant_decls: Array[AST::Declarations::Constant],
+      class_decls: Array[AST::Declarations::Class | AST::Declarations::Module | AST::Declarations::Interface],
+      mixin_includes: Array[AST::Members::Include],
+      mixin_prepends: Array[AST::Members::Prepend],
+      mixin_extends: Array[AST::Members::Extend],
+      class_variables: Array[AST::Members::ClassVariable],
+      class_instance_variables: Array[AST::Members::ClassInstanceVariable],
+      instance_variables: Array[AST::Members::InstanceVariable],
+      singleton_attributes: Array[AST::Members::AttrAccessor | AST::Members::AttrWriter | AST::Members::AttrReader],
+      instance_attributes: Array[AST::Members::AttrAccessor | AST::Members::AttrWriter | AST::Members::AttrReader],
+      module_functions: Array[AST::Members::MethodDefinition],
+      singleton_new_methods: Array[AST::Members::MethodDefinition],
+      public_singleton_methods: Array[AST::Members::MethodDefinition | AST::Members::Alias],
+      private_singleton_methods: Array[AST::Members::MethodDefinition],
+      instance_initialize_methods: Array[AST::Members::MethodDefinition],
+      public_instance_methods: Array[AST::Members::MethodDefinition | AST::Members::Alias],
+      private_instance_methods: Array[AST::Members::MethodDefinition],
+      other_decls: Array[member]
+    }
+
+    def sort_decl!: (member decl) -> void
   end
 end

data/sig/types.rbs

@@ -41,6 +41,20 @@ module RBS
       # ```
       #
       def to_s: (?Integer level) -> String
+
+      # Returns `true` if it has `self` type
+      #
+      def has_self_type?: () -> bool
+
+      # Returns `true` if it has `instance` or `class` types
+      def has_classish_type?: () -> bool
+
+      # Returns `true` if it has `void` types other than *return* position
+      #
+      # * The function return type is a return position (`() -> void`)
+      # * Generic parameter is a return position (`Enumerator[Integer, void]`)
+      # 
+      def with_nonreturn_void?: () -> bool
     end
 
     # t represents union of all possible types.
@@ -97,6 +111,9 @@ module RBS
       end
 
       class Any < Base
+        @string: String?
+
+        def todo!: () -> self
       end
 
       class Nil < Base
@@ -191,6 +208,12 @@ module RBS
 
       def each_type: () { (t) -> void } -> void
                    | () -> Enumerator[t, void]
+
+      def has_self_type?: () -> bool
+
+      def has_classish_type?: () -> bool
+
+      def with_nonreturn_void?: () -> bool
     end
 
     class Interface
@@ -412,6 +435,12 @@ module RBS
       def amap: [A, B] (Array[A]) { (A) -> B } -> Array[B]
 
       def hmapv: [X, Y, Z] (Hash[X, Y]) { (Y) -> Z } -> Hash[X, Z]
+
+      def has_self_type?: () -> bool
+
+      def has_classish_type?: () -> bool
+
+      def with_nonreturn_void?: () -> bool
     end
 
     class Block

data/stdlib/benchmark/0/benchmark.rbs

@@ -146,7 +146,7 @@ module Benchmark
   #     >total:   2.930000   0.000000   2.930000 (  2.932889)
   #     >avg:     0.976667   0.000000   0.976667 (  0.977630)
   #
-  def self?.benchmark: (String caption, ?Integer? label_width, ?String? format, *String labels) { (Report report) -> (Array[Tms] | void) } -> Array[Tms]
+  def self?.benchmark: (String caption, ?Integer? label_width, ?String? format, *String labels) { (Report report) -> (Array[Tms] | untyped) } -> Array[Tms]
 
   # <!--
   #   rdoc-file=lib/benchmark.rb

data/stdlib/cgi/0/core.rbs

@@ -515,7 +515,7 @@ class CGI
   # This method does not perform charset conversion.
   #
   def http_header: (?String options) -> String
-                 | (?Hash[String | Symbol, untyped] header_hash) -> String
+                 | (?Hash[interned, untyped] header_hash) -> String
 
   def nph?: () -> untyped
 
@@ -586,7 +586,7 @@ class CGI
   #        # string
   #
   def out: (?String content_type_string) { () -> String } -> void
-         | (Hash[String | Symbol, untyped] headers_hash) { () -> String } -> void
+         | (Hash[interned, untyped] headers_hash) { () -> String } -> void
 
   # <!--
   #   rdoc-file=lib/cgi/core.rb

data/stdlib/did_you_mean/0/did_you_mean.rbs

@@ -266,14 +266,14 @@ module DidYouMean
     #   - new(dictionary:)
     # -->
     #
-    def initialize: (dictionary: Array[String | Symbol]) -> void
+    def initialize: (dictionary: Array[interned]) -> void
 
     # <!--
     #   rdoc-file=lib/did_you_mean/spell_checker.rb
     #   - correct(input)
     # -->
     #
-    def correct: (String | Symbol input) -> Array[String]
+    def correct: (interned input) -> Array[String]
   end
 
   # <!-- rdoc-file=lib/did_you_mean/tree_spell_checker.rb -->

data/stdlib/digest/0/digest.rbs

@@ -560,5 +560,5 @@ class Object
   #     Digest(:Foo)
   #     # => LoadError: library not found for class Digest::Foo -- digest/foo
   #
-  def Digest: (String | Symbol name) -> singleton(::Digest::Base)
+  def Digest: (interned name) -> singleton(::Digest::Base)
 end

data/stdlib/fileutils/0/fileutils.rbs

@@ -1507,7 +1507,7 @@ module FileUtils
   #
   # Related: [methods for deleting](rdoc-ref:FileUtils@Deleting).
   #
-  def self?.remove_file: (path path, ?void force) -> void
+  def self?.remove_file: (path path, ?boolish force) -> void
 
   # <!--
   #   rdoc-file=lib/fileutils.rb

data/stdlib/forwardable/0/forwardable.rbs

@@ -134,7 +134,7 @@ module Forwardable
   #     def_delegator :@records, :<<
   #     def_delegator :@records, :map
   #
-  def def_instance_delegators: (Symbol | String accessor, *Symbol methods) -> void
+  def def_instance_delegators: (interned accessor, *Symbol methods) -> void
 
   # <!--
   #   rdoc-file=lib/forwardable.rb
@@ -171,7 +171,7 @@ module Forwardable
   #     q.push 23  #=> NoMethodError
   #     q.to_i     #=> 1
   #
-  def def_instance_delegator: (Symbol | String accessor, Symbol method, ?Symbol ali) -> void
+  def def_instance_delegator: (interned accessor, Symbol method, ?Symbol ali) -> void
 
   # <!--
   #   rdoc-file=lib/forwardable.rb
@@ -240,7 +240,7 @@ module SingleForwardable
   #     def_delegator :@records, :<<
   #     def_delegator :@records, :map
   #
-  def def_single_delegators: (Symbol | String accessor, *Symbol methods) -> void
+  def def_single_delegators: (interned accessor, *Symbol methods) -> void
 
   # <!--
   #   rdoc-file=lib/forwardable.rb
@@ -257,7 +257,7 @@ module SingleForwardable
   # method of the same name in *accessor*).  If *new_name* is provided, it is used
   # as the name for the delegate method. Returns the name of the method defined.
   #
-  def def_single_delegator: (Symbol | String accessor, Symbol method, ?Symbol ali) -> void
+  def def_single_delegator: (interned accessor, Symbol method, ?Symbol ali) -> void
 
   # <!--
   #   rdoc-file=lib/forwardable.rb

data/stdlib/io-console/0/io-console.rbs

@@ -270,7 +270,7 @@ class IO
   #   - pressed?(p1)
   # -->
   #
-  def pressed?: (Integer | Symbol | String) -> bool
+  def pressed?: (Integer | interned) -> bool
 
   # <!--
   #   rdoc-file=ext/io/console/console.c

data/stdlib/json/0/json.rbs

@@ -1164,6 +1164,43 @@ JSON::VERSION_MAJOR: Integer
 
 JSON::VERSION_MINOR: Integer
 
+%a{annotate:rdoc:skip}
+module Kernel
+  private
+
+  # <!--
+  #   rdoc-file=ext/json/lib/json/common.rb
+  #   - j(*objs)
+  # -->
+  # Outputs *objs* to STDOUT as JSON strings in the shortest form, that is in one
+  # line.
+  #
+  def j: (*_ToJson) -> nil
+
+  # <!--
+  #   rdoc-file=ext/json/lib/json/common.rb
+  #   - jj(*objs)
+  # -->
+  # Outputs *objs* to STDOUT as JSON strings in a pretty format, with indentation
+  # and over many lines.
+  #
+  def jj: (*_ToJson) -> nil
+
+  # <!--
+  #   rdoc-file=ext/json/lib/json/common.rb
+  #   - JSON(object, *args)
+  # -->
+  # If *object* is string-like, parse the string and return the parsed result as a
+  # Ruby data structure. Otherwise, generate a JSON text from the Ruby data
+  # structure object and return it.
+  #
+  # The *opts* argument is passed through to generate/parse respectively. See
+  # generate and parse for their documentation.
+  #
+  def JSON: (string source, ?json_options opts) -> untyped
+          | (_ToJson obj, ?json_options opts) -> String
+end
+
 %a{annotate:rdoc:skip}
 class Object
   # Converts this object to a string (calling #to_s), converts

data/stdlib/logger/0/logger.rbs

@@ -640,7 +640,7 @@ class Logger
   #
   # Logger#sev_threshold= is an alias for Logger#level=.
   #
-  def level=: (Integer | String | Symbol severity) -> Integer
+  def level=: (Integer | interned severity) -> Integer
 
   # <!--
   #   rdoc-file=lib/logger.rb
@@ -796,7 +796,7 @@ class Logger
   #     periodic log file rotation; default is `'%Y%m%d'`. See [Periodic
   #     Rotation](rdoc-ref:Logger@Periodic+Rotation).
   #
-  def initialize: (logdev? logdev, ?Numeric | String shift_age, ?Integer shift_size, ?shift_period_suffix: String, ?binmode: boolish, ?datetime_format: String, ?formatter: _Formatter, ?progname: String, ?level: Integer | String | Symbol) -> void
+  def initialize: (logdev? logdev, ?Numeric | String shift_age, ?Integer shift_size, ?shift_period_suffix: String, ?binmode: boolish, ?datetime_format: String, ?formatter: _Formatter, ?progname: String, ?level: Integer | interned) -> void
 end
 
 Logger::ProgName: String

data/stdlib/net-http/0/manifest.yaml

@@ -1,3 +1,3 @@
 dependencies:
+  - name: net-protocol
   - name: uri
-  - name: timeout