rbs 0.15.0 → 0.19.0

data/lib/rbs/test/hook.rb

@@ -27,26 +27,28 @@ module RBS
         :>> => "rshift",
         :~ => "tilda"
       }
-      def self.alias_names(target)
+      def self.alias_names(target, random)
+        suffix = "#{RBS::Test.suffix}_#{random}"
+
         case target
         when *OPERATORS.keys
           name = OPERATORS[target]
           [
-            "#{name}____with__#{Test.suffix}",
-            "#{name}____without__#{Test.suffix}"
+            "#{name}____with__#{suffix}",
+            "#{name}____without__#{suffix}"
           ]
         else
           aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
 
           [
-            "#{aliased_target}__with__#{Test.suffix}#{punctuation}",
-            "#{aliased_target}__without__#{Test.suffix}#{punctuation}"
+            "#{aliased_target}__with__#{suffix}#{punctuation}",
+            "#{aliased_target}__without__#{suffix}#{punctuation}"
           ]
         end
       end
 
-      def self.setup_alias_method_chain(klass, target)
-        with_method, without_method = alias_names(target)
+      def self.setup_alias_method_chain(klass, target, random:)
+        with_method, without_method = alias_names(target, random)
 
         RBS.logger.debug "alias name: #{target}, #{with_method}, #{without_method}"
 
@@ -65,12 +67,12 @@ module RBS
         end
       end
 
-      def self.hook_method_source(prefix, method_name, key)
-        with_name, without_name = alias_names(method_name)
+      def self.hook_method_source(prefix, method_name, key, random:)
+        with_name, without_name = alias_names(method_name, random)
         full_method_name = "#{prefix}#{method_name}"
 
         [__LINE__ + 1, <<RUBY]
-def #{with_name}(*args)
+def #{with_name}(*args, &block)
   ::RBS.logger.debug { "#{full_method_name} with arguments: [" + args.map(&:inspect).join(", ") + "]" }
 
   begin
@@ -78,11 +80,17 @@ def #{with_name}(*args)
     block_calls = []
 
     if block_given?
+      receiver = self
       result = __send__(:"#{without_name}", *args) do |*block_args|
         return_from_block = false
 
         begin
-          block_result = yield(*block_args)
+          block_result = if receiver.equal?(self)
+                           yield(*block_args)
+                         else
+                           instance_exec(*block_args, &block)
+                         end
+
           return_from_block = true
         ensure
           exn = $!
@@ -154,17 +162,19 @@ RUBY
       end
 
       def self.hook_instance_method(klass, method, key:)
-        line, source = hook_method_source("#{klass}#", method, key)
+        random = SecureRandom.hex(4)
+        line, source = hook_method_source("#{klass}#", method, key, random: random)
 
         klass.module_eval(source, __FILE__, line)
-        setup_alias_method_chain klass, method
+        setup_alias_method_chain klass, method, random: random
       end
 
       def self.hook_singleton_method(klass, method, key:)
-        line, source = hook_method_source("#{klass}.",method, key)
+        random = SecureRandom.hex(4)
+        line, source = hook_method_source("#{klass}.",method, key, random: random)
 
         klass.singleton_class.module_eval(source, __FILE__, line)
-        setup_alias_method_chain klass.singleton_class, method
+        setup_alias_method_chain klass.singleton_class, method, random: random
       end
     end
   end

data/lib/rbs/test/setup.rb

@@ -2,6 +2,7 @@ require "rbs"
 require "rbs/test"
 require "optparse"
 require "shellwords"
+require "rbs/cli"
 
 include RBS::Test::SetupHelper
 
@@ -32,12 +33,13 @@ if filter.empty?
   exit 1
 end
 
-loader = RBS::EnvironmentLoader.new
+options = RBS::CLI::LibraryOptions.new()
+
 OptionParser.new do |opts|
-  opts.on("-r [LIB]") do |name| loader.add(library: name) end
-  opts.on("-I [DIR]") do |dir| loader.add(path: Pathname(dir)) end
+  options.setup_library_options(opts)
 end.parse!(opts)
 
+loader = options.loader
 env = RBS::Environment.from_loader(loader).resolve_type_names
 
 def match(filter, name)

data/lib/rbs/test/type_check.rb

@@ -288,7 +288,12 @@ module RBS
           end
         when Types::ClassSingleton
           klass = get_class(type.name) or return false
-          val == klass
+          singleton_class = begin
+                              klass.singleton_class
+                            rescue TypeError
+                              return false
+                            end
+          val.is_a?(singleton_class)
         when Types::Interface
           methods = Set.new(Test.call(val, METHODS))
           if (definition = builder.build_interface(type.name))

data/lib/rbs/type_name.rb

@@ -16,7 +16,8 @@ module RBS
               when "_"
                 :interface
               else
-                raise
+                # Defaults to :class
+                :class
               end
     end
 

data/lib/rbs/vendorer.rb

@@ -1,9 +1,11 @@
 module RBS
   class Vendorer
     attr_reader :vendor_dir
+    attr_reader :loader
 
-    def initialize(vendor_dir:)
+    def initialize(vendor_dir:, loader:)
       @vendor_dir = vendor_dir
+      @loader = loader
     end
 
     def ensure_dir
@@ -21,27 +23,47 @@ module RBS
       end
     end
 
-    def stdlib!()
-      ensure_dir do
-        RBS.logger.info "Vendoring stdlib: #{EnvironmentLoader::STDLIB_ROOT} => #{vendor_dir + "stdlib"}..."
-        FileUtils.copy_entry EnvironmentLoader::STDLIB_ROOT, vendor_dir + "stdlib"
+    def copy!
+      # @type var paths: Set[[Pathname, Pathname]]
+      paths = Set[]
+
+      if core_root = loader.core_root
+        RBS.logger.info "Vendoring core RBSs in #{vendor_dir + "core"}..."
+        loader.each_file(core_root, immediate: false, skip_hidden: true) do |file_path|
+          paths << [file_path, Pathname("core") + file_path.relative_path_from(core_root)]
+        end
       end
-    end
 
-    def gem!(name, version)
-      ensure_dir do
-        sig_path = EnvironmentLoader.gem_sig_path(name, version)
-        RBS.logger.debug "Checking gem signature path: name=#{name}, version=#{version}, path=#{sig_path}"
+      loader.libs.each do |lib|
+        case
+        when (spec, path = EnvironmentLoader.gem_sig_path(lib.name, lib.version))
+          dest_dir = Pathname("#{lib.name}-#{spec.version}")
+
+          RBS.logger.info "Vendoring #{lib.name}(#{spec.version}) RBSs in #{vendor_dir + dest_dir}..."
 
-        if sig_path&.directory?
-          gems_dir = vendor_dir + "gems"
-          gems_dir.mkpath unless gems_dir.directory?
+          loader.each_file(path, skip_hidden: true, immediate: false) do |file_path|
+            paths << [file_path, dest_dir + file_path.relative_path_from(path)]
+          end
 
-          gem_dir = gems_dir + name
-          RBS.logger.info "Vendoring gem(#{name}:#{version}): #{sig_path} => #{gem_dir}..."
-          FileUtils.copy_entry sig_path, gem_dir
+        when (rbs, path = loader.repository.lookup_path(lib.name, lib.version))
+          dest_dir = Pathname("#{rbs.name}-#{path.version}")
+
+          RBS.logger.info "Vendoring #{lib.name}(#{path.version}) RBSs in #{vendor_dir + dest_dir}..."
+
+          loader.each_file(path.path, skip_hidden: true, immediate: false) do |file_path|
+            paths << [file_path, dest_dir + file_path.relative_path_from(path.path)]
+          end
+        else
+          RBS.logger.error "Couldn't find RBSs for #{lib.name} (#{lib.version}); skipping..."
         end
       end
+
+      paths.each do |from, to|
+        dest = vendor_dir + to
+        dest.parent.mkpath unless dest.parent.directory?
+
+        FileUtils.copy_file(from.to_s, dest.to_s)
+      end
     end
   end
 end

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "0.15.0"
+  VERSION = "0.19.0"
 end

data/sig/cli.rbs

@@ -0,0 +1,58 @@
+module RBS
+  class CLI
+    class LibraryOptions
+      attr_accessor core_root: Pathname?
+
+      attr_reader libs: Array[String]
+      attr_reader dirs: Array[String]
+      attr_reader repos: Array[String]
+
+      def initialize: () -> void
+                    
+      def loader: () -> EnvironmentLoader
+    end
+
+    attr_reader stdout: IO
+    attr_reader stderr: IO
+
+    def initialize: (stdout: IO, stderr: IO) -> void
+                  
+    COMMANDS: Array[Symbol]
+
+    def library_parse: (OptionParser, options: LibraryOptions) -> void
+                     
+    def parse_logging_options: (OptionParser) -> void
+                             
+    def has_parser?: () -> bool
+                   
+    def run: (Array[String] args) -> void
+           
+    def run_ast: (Array[String], LibraryOptions) -> void
+               
+    def run_list: (Array[String], LibraryOptions) -> void
+                
+    def run_ancestors: (Array[String], LibraryOptions) -> void
+                     
+    def run_methods: (Array[String], LibraryOptions) -> void
+                   
+    def run_method: (Array[String], LibraryOptions) -> void
+                  
+    def run_validate: (Array[String], LibraryOptions) -> void
+                    
+    def run_constant: (Array[String], LibraryOptions) -> void
+                    
+    def run_paths: (Array[String], LibraryOptions) -> void
+                 
+    def run_prototype: (Array[String], LibraryOptions) -> void
+                     
+    def run_prototype_file: (String format, Array[String]) -> void
+                          
+    def run_vendor: (Array[String], LibraryOptions) -> void
+                  
+    def run_parse: (Array[String], LibraryOptions) -> void
+                 
+    def run_test: (Array[String], LibraryOptions) -> void
+                
+    def test_opt: (LibraryOptions) -> String?
+  end
+end

data/sig/definition.rbs

@@ -21,13 +21,13 @@ module RBS
         attr_reader defined_in: TypeName
         attr_reader implemented_in: TypeName?
 
-        def initialize: (type: MethodType, member: method_member, defined_in: TypeName?, implemented_in: TypeName?) -> void
+        def initialize: (type: MethodType, member: method_member, defined_in: TypeName, implemented_in: TypeName?) -> void
 
         def comment: () -> AST::Comment?
 
         def annotations: () -> Array[AST::Annotation]
 
-        def update: (?type: MethodType, ?member: method_member, ?defined_in: TypeName?, ?implemented_in: TypeName?) -> TypeDef
+        def update: (?type: MethodType, ?member: method_member, ?defined_in: TypeName, ?implemented_in: TypeName?) -> TypeDef
 
         def overload?: () -> bool
       end
@@ -42,8 +42,13 @@ module RBS
       attr_reader comments: Array[AST::Comment]
       attr_reader annotations: Array[AST::Annotation]
       attr_reader members: Array[method_member]
+      attr_reader alias_of: Method?
 
-      def initialize: (super_method: Method?, defs: Array[TypeDef], accessibility: accessibility, ?annotations: Array[AST::Annotation]) -> void
+      def initialize: (super_method: Method?,
+                       defs: Array[TypeDef],
+                       accessibility: accessibility,
+                       alias_of: Method?,
+                       ?annotations: Array[AST::Annotation]) -> void
 
       def public?: () -> bool
 

data/sig/definition_builder.rbs

@@ -61,6 +61,8 @@ module RBS
 
     def ensure_namespace!: (Namespace, location: Location?) -> void
 
+    def build_singleton: (TypeName) -> Definition
+
     def build_instance: (TypeName) -> Definition
 
     def build_interface: (TypeName) -> Definition
@@ -69,11 +71,12 @@ module RBS
 
     def build_one_singleton: (TypeName) -> Definition
 
+    type ancestors = Definition::InstanceAncestors | Definition::SingletonAncestors | nil
     def merge_definitions: (TypeName,
                             Array[[Definition::Ancestor::t, Definition]],
                             entry: Environment::ModuleEntry | Environment::ClassEntry,
                             self_type: Definition::self_type,
-                            ancestors: Array[Definition::Ancestor::t]) -> Definition
+                            ancestors: ancestors) -> Definition
 
     type method_kind = :instance | :singleton
     def merge_method: (TypeName, Hash[Symbol, Definition::Method], Symbol, Definition::Method, Substitution, kind: method_kind) -> void

data/sig/environment_loader.rbs

@@ -1,58 +1,104 @@
 module RBS
+  # EnvironmentLoader is an object to load RBS files from filesystem.
+  # 
+  # Set up your configuration through repository and `#add` method.
+  # 
+  #   # Set up the repository to load library RBSs from.
+  #   repo = RBS::Repository.default
+  #   repo.add(Pathname("vendor/rbs/gem-rbs"))
+  #   repo.add(Pathname("vendor/rbs/internal-rbs"))
+  # 
+  #   loader = RBS::EnvironmentLoader.new(repository: repo)
+  # 
+  #   # Add libraries to load RBS files.
+  #   loader.add(library: "minitest")
+  #   loader.add(library: "rbs", version: "1.0.0")
+  # 
+  #   # Add dirs to load RBS files from.
+  #   loader.add(path: Pathname("sig"))
+  # 
+  #   # Load RBSs into an environment.
+  #   environment = RBS::Environment.new()
+  #   loader.load(env: environment)
+  # 
   class EnvironmentLoader
-    class UnknownLibraryNameError < StandardError
-      attr_reader name: String
-
-      def initialize: (name: String) -> void
-    end
-
-    class LibraryPath
-      attr_reader name: String
-      attr_reader path: Pathname
+    class UnknownLibraryError < StandardError
+      attr_reader library: Library
 
-      def initialize: (name: String, path: Pathname) -> void
+      def initialize: (lib: Library) -> void
     end
 
-    class GemPath
+    class Library < Struct[String | String?]
       attr_reader name: String
       attr_reader version: String?
-      attr_reader path: Pathname
 
-      def initialize: (name: String, version: String?, path: Pathname) -> void
+      def initialize: (name: String, version: String?) -> void
     end
 
-    STDLIB_ROOT: Pathname
-
-    type path = Pathname | LibraryPath | GemPath
-
-    attr_reader paths: Array[path]
-    attr_reader stdlib_root: Pathname
-    attr_reader gem_vendor_path: Pathname?
-
-    def self.gem_sig_path: (String, String?) -> Pathname?
-
-    def initialize: (?stdlib_root: Pathname, ?gem_vendor_path: Pathname?) -> void
-
-    def add: (path: Pathname?) -> void
-           | (library: String?) -> void
-
-    def self.parse_library: (String) -> [String, String?]
-
-    def stdlib?: (String) -> Pathname?
-
-    def gem?: (String, String?) -> Pathname?
-
-    def each_signature: (Pathname, ?immediate: boolish) { (Pathname) -> void } -> void
-                      | (Pathname, ?immediate: boolish) -> Enumerator[Pathname, void]
-
-    def each_library_path: { (path, Pathname) -> void } -> void
-
-    def no_builtin!: (?boolish) -> self
-
-    def no_builtin?: () -> bool
-
-    def each_decl: () { (AST::Declarations::t, Buffer, Pathname, path | :stdlib) -> void } -> void
-
-    def load: (env: Environment) -> Array[[AST::Declarations::t, Pathname, path | :stdlib]]
+    DEFAULT_CORE_ROOT: Pathname
+
+    attr_reader core_root: Pathname?
+    attr_reader repository: Repository
+
+    attr_reader libs: Array[Library]
+    attr_reader dirs: Array[Pathname]
+
+    # The source where the RBS comes from.
+    # 
+    # `:core` means it is part of core library.
+    # `Library` means it is from library.
+    # `Pathname` means it is loaded from a directory.
+    # 
+    type source = :core
+                | Library
+                | Pathname
+
+    # Accepts two optional keyword arguments.
+    # 
+    # `core_root` is the path to the directory with RBSs for core classes.
+    # The default value is the core library included in RBS gem. (EnvironmentLoader::DEFAULT_CORE_ROOT)
+    # Passing `nil` means it skips loading core class definitions.
+    # 
+    # `repository` is the repository for library classes.
+    # The default value is repository only with stdlib classes. (Repository.new)
+    # 
+    def initialize: (?core_root: Pathname?, ?repository: Repository) -> void
+    
+    # Add a path or library to load RBSs from.
+    # 
+    # `path` can be a file or a directory.
+    # All `.rbs` files from the given directory will be loaded.
+    # Specifying a file will load the file regardless the extension of the file is.
+    # 
+    # `library` can be a name of a gem.
+    # Specifying `nil` to `version` will load any version available.
+    # It first tries to load RBS files from gem with specified version.
+    # If RBS files cannot be found in the gem, it tries to load RBSs from repository.
+    # 
+    def add: (path: Pathname) -> void
+           | (library: String, version: String?) -> void
+
+    # This is helper function to test if RBS for a library is available or not.
+    # 
+    def has_library?: (library: String, version: String?) -> bool
+
+    # Add all declarations to environment.
+    # 
+    # Raises `UnknownLibraryError` if RBS cannot be loaded from a library.
+    # 
+    # Returns an array of tuples of the declaration, path to the file, and the source.
+    # 
+    def load: (env: Environment) -> Array[[AST::Declarations::t, Pathname, source]]
+
+    # Returns a pair of spec and path for a gem with RBS.
+    # Returns nil if the gem is not installed, or the gem doesn't provide RBS.
+    # 
+    def self.gem_sig_path: (String name, String? version) -> [Gem::Specification, Pathname]?
+
+    def each_decl: () { (AST::Declarations::t, Buffer, source, Pathname) -> void } -> void
+                 
+    def each_dir: { (source, Pathname) -> void } -> void
+                
+    def each_file: (Pathname path, immediate: boolish, skip_hidden: boolish) { (Pathname) -> void } -> void
   end
 end