rbs 0.10.0 → 0.13.0

data/lib/rbs/prototype/rbi.rb

@@ -16,7 +16,7 @@ module RBS
           tokens.each.with_object({}) do |token, hash|
             if token[1] == :on_comment
               line = token[0][0]
-              body = token[2][2..]
+              body = token[2][2..-1]
 
               body = "\n" if body.empty?
 
@@ -173,7 +173,6 @@ module RBS
               types: types,
               kind: :singleton,
               comment: comment,
-              attributes: [],
               overload: false
             )
           end
@@ -194,7 +193,6 @@ module RBS
               types: types,
               kind: :instance,
               comment: comment,
-              attributes: [],
               overload: false
             )
           end
@@ -502,7 +500,6 @@ module RBS
         else
           type_node.type == :CALL && proc_type?(type_node.children[0])
         end
-
       end
 
       def call_node?(node, name:, receiver: -> (node) { node.type == :CONST && node.children[0] == :T }, args: -> (node) { true })

data/lib/rbs/prototype/runtime.rb

@@ -154,7 +154,6 @@ module RBS
                 location: nil,
                 comment: method.comments[0],
                 annotations: method.annotations,
-                attributes: method.attributes,
                 overload: false
               )
               return
@@ -193,7 +192,6 @@ module RBS
                 location: nil,
                 comment: nil,
                 annotations: [],
-                attributes: [],
                 overload: false
               )
             end
@@ -227,7 +225,6 @@ module RBS
                   location: nil,
                   comment: nil,
                   annotations: [],
-                  attributes: [],
                   overload: false
                 )
               end
@@ -262,7 +259,6 @@ module RBS
                   location: nil,
                   comment: nil,
                   annotations: [],
-                  attributes: [],
                   overload: false
                 )
               end

data/lib/rbs/substitution.rb

@@ -31,10 +31,11 @@ module RBS
     def apply(ty)
       case ty
       when Types::Variable
+        # @type var ty: Types::Variable
         mapping[ty.name] || ty
       when Types::Bases::Instance
-        if instance_type
-          instance_type
+        if t = instance_type
+          t
         else
           ty
         end
@@ -44,7 +45,7 @@ module RBS
     end
 
     def without(*vars)
-      self.class.new.tap do |subst|
+      Substitution.new.tap do |subst|
         subst.mapping.merge!(mapping)
         vars.each do |var|
           subst.mapping.delete(var)

data/lib/rbs/test/setup.rb

@@ -13,6 +13,8 @@ begin
   skips = (ENV['RBS_TEST_SKIP'] || '').split(',').map! { |e| e.strip }
   RBS.logger_level = (ENV["RBS_TEST_LOGLEVEL"] || "info")
   sample_size = get_sample_size(ENV['RBS_TEST_SAMPLE_SIZE'] || '')
+  double_class = to_double_class(ENV['RBS_TEST_DOUBLE_SUITE'])
+  unchecked_classes = (ENV['RBS_TEST_UNCHECKED_CLASSES'] || '').split(',').map! { |unchecked_class| unchecked_class.strip }.push(*double_class)
 rescue InvalidSampleSizeError => exception
   RBS.logger.error exception.message
   exit 1
@@ -25,6 +27,8 @@ if filter.empty?
   STDERR.puts "  [OPTIONAL] RBS_TEST_OPT: options for signatures (`-r` for libraries or `-I` for signatures)"
   STDERR.puts "  [OPTIONAL] RBS_TEST_LOGLEVEL: one of debug|info|warn|error|fatal (defaults to info)"
   STDERR.puts "  [OPTIONAL] RBS_TEST_SAMPLE_SIZE: sets the amount of values in a collection to be type-checked (Set to `ALL` to type check all the values)"
+  STDERR.puts "  [OPTIONAL] RBS_TEST_DOUBLE_SUITE: sets the double suite in use (currently supported: minitest | rspec)"
+  STDERR.puts "  [OPTIONAL] RBS_TEST_UNCHECKED_CLASSES: sets the classes that would not be checked"
   exit 1
 end
 
@@ -60,7 +64,7 @@ TracePoint.trace :end do |tp|
     if filter.any? {|f| match(to_absolute_typename(f).to_s, class_name.to_s) } && skips.none? {|f| match(f, class_name.to_s) }
       if env.class_decls.key?(class_name)
         logger.info "Setting up hooks for #{class_name}"
-        tester.install!(tp.self, sample_size: sample_size)
+        tester.install!(tp.self, sample_size: sample_size, unchecked_classes: unchecked_classes)
       end
     end
   end

data/lib/rbs/test/setup_helper.rb

@@ -24,6 +24,21 @@ module RBS
           int_size
         end
       end
+
+      def to_double_class(double_suite)
+        return nil unless double_suite
+
+        case double_suite.downcase.strip
+        when 'rspec'
+          ['::RSpec::Mocks::Double']
+        when 'minitest'
+          ['::Minitest::Mock'] 
+        else
+          RBS.logger.warn "Unknown test suite - defaults to nil"
+          nil
+        end
+      end
+
     end
   end
 end

data/lib/rbs/test/tester.rb

@@ -37,7 +37,7 @@ module RBS
         end
       end
 
-      def install!(klass, sample_size:)
+      def install!(klass, sample_size:, unchecked_classes:)
         RBS.logger.info { "Installing runtime type checker in #{klass}..." }
 
         type_name = factory.type_name(klass.name).absolute!
@@ -45,7 +45,7 @@ module RBS
         builder.build_instance(type_name).tap do |definition|
           instance_key = new_key(type_name, "InstanceChecker")
           tester, set = instance_testers[klass] ||= [
-            MethodCallTester.new(klass, builder, definition, kind: :instance, sample_size: sample_size),
+            MethodCallTester.new(klass, builder, definition, kind: :instance, sample_size: sample_size, unchecked_classes: unchecked_classes),
             Set[]
           ]
           Observer.register(instance_key, tester)
@@ -68,7 +68,7 @@ module RBS
         builder.build_singleton(type_name).tap do |definition|
           singleton_key = new_key(type_name, "SingletonChecker")
           tester, set = singleton_testers[klass] ||= [
-            MethodCallTester.new(klass.singleton_class, builder, definition, kind: :singleton, sample_size: sample_size),
+            MethodCallTester.new(klass.singleton_class, builder, definition, kind: :singleton, sample_size: sample_size, unchecked_classes: unchecked_classes),
             Set[]
           ]
           Observer.register(singleton_key, tester)
@@ -111,13 +111,15 @@ module RBS
         attr_reader :builder
         attr_reader :kind
         attr_reader :sample_size
+        attr_reader :unchecked_classes
 
-        def initialize(self_class, builder, definition, kind:, sample_size:)
+        def initialize(self_class, builder, definition, kind:, sample_size:, unchecked_classes:)
           @self_class = self_class
           @definition = definition
           @builder = builder
           @kind = kind
           @sample_size = sample_size
+          @unchecked_classes = unchecked_classes
         end
 
         def env
@@ -125,7 +127,7 @@ module RBS
         end
 
         def check
-          @check ||= TypeCheck.new(self_class: self_class, builder: builder, sample_size: sample_size)
+          @check ||= TypeCheck.new(self_class: self_class, builder: builder, sample_size: sample_size, unchecked_classes: unchecked_classes)
         end
 
         def format_method_name(name)

data/lib/rbs/test/type_check.rb

@@ -4,15 +4,17 @@ module RBS
       attr_reader :self_class
       attr_reader :builder
       attr_reader :sample_size
+      attr_reader :unchecked_classes
 
       attr_reader :const_cache
 
       DEFAULT_SAMPLE_SIZE = 100
 
-      def initialize(self_class:, builder:, sample_size:)
+      def initialize(self_class:, builder:, sample_size:, unchecked_classes:)
         @self_class = self_class
         @builder = builder
         @sample_size = sample_size
+        @unchecked_classes = unchecked_classes.uniq
         @const_cache = {}
       end
 
@@ -203,7 +205,16 @@ module RBS
         const_cache[type_name] ||= Object.const_get(type_name.to_s)
       end
 
+      def is_double?(value)
+        unchecked_classes.any? { |unchecked_class| Test.call(value, IS_AP, Object.const_get(unchecked_class))}
+      end
+
       def value(val, type)
+        if is_double?(val)
+          RBS.logger.info("A double (#{val.inspect}) is detected!")
+          return true 
+        end
+
         case type
         when Types::Bases::Any
           true
@@ -295,7 +306,8 @@ module RBS
           Test.call(val, IS_AP, ::Array) &&
             type.types.map.with_index {|ty, index| value(val[index], ty) }.all?
         when Types::Record
-          Test::call(val, IS_AP, ::Hash)
+          Test::call(val, IS_AP, ::Hash) && 
+            type.fields.map {|key, type| value(val[key], type) }.all?
         when Types::Proc
           Test::call(val, IS_AP, ::Proc)
         else

data/lib/rbs/type_name.rb

@@ -1,3 +1,4 @@
+
 module RBS
   class TypeName
     attr_reader :namespace
@@ -14,13 +15,15 @@ module RBS
                 :alias
               when "_"
                 :interface
+              else
+                raise
               end
     end
 
     def ==(other)
       other.is_a?(self.class) && other.namespace == namespace && other.name == name
     end
-
+    
     alias eql? ==
 
     def hash
@@ -68,3 +71,17 @@ module RBS
     end
   end
 end
+
+module Kernel
+  def TypeName(string)
+    absolute = string.start_with?("::")
+
+    *path, name = string.delete_prefix("::").split("::").map(&:to_sym)
+    raise unless name
+
+    RBS::TypeName.new(
+      name: name,
+      namespace: RBS::Namespace.new(path: path, absolute: absolute)
+    )
+  end
+end

data/lib/rbs/type_name_resolver.rb

@@ -1,6 +1,6 @@
 module RBS
   class TypeNameResolver
-    Query = Struct.new(:type_name, :context, keyword_init: true)
+    Query = _ = Struct.new(:type_name, :context, keyword_init: true)
 
     attr_reader :all_names
     attr_reader :cache
@@ -36,15 +36,22 @@ module RBS
       query = Query.new(type_name: type_name, context: context)
       try_cache(query) do
         path_head, *path_tail = type_name.to_namespace.path
+        raise unless path_head
+
         name_head = TypeName.new(name: path_head, namespace: Namespace.empty)
 
-        absolute_head = context.each.find do |namespace|
+        absolute_head = context.find do |namespace|
+          # @type break: TypeName
           full_name = name_head.with_prefix(namespace)
           has_name?(full_name) and break full_name
         end
 
-        if absolute_head
+        case absolute_head
+        when TypeName
           has_name?(Namespace.new(path: absolute_head.to_namespace.path.push(*path_tail), absolute: true).to_type_name)
+        when Namespace
+          # This cannot happen because the `context.find` doesn't return a Namespace.
+          raise
         end
       end
     end

data/lib/rbs/types.rb

@@ -1,3 +1,4 @@
+
 module RBS
   module Types
     module NoFreeVariables
@@ -77,7 +78,7 @@ module RBS
           when Types::Bases::Class
             'class'
           else
-            raise "Unexpected base type: #{type.inspect}"
+            raise "Unexpected base type: #{inspect}"
           end
         end
       end
@@ -138,8 +139,6 @@ module RBS
           new(name: v, location: nil)
         when Array
           v.map {|x| new(name: x, location: nil) }
-        else
-          raise
         end
       end
 
@@ -227,7 +226,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           args.each(&block)
         else
           enum_for :each_type
@@ -380,7 +379,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           types.each(&block)
         else
           enum_for :each_type
@@ -445,7 +444,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           fields.each_value(&block)
         else
           enum_for :each_type
@@ -492,11 +491,15 @@ module RBS
       end
 
       def to_s(level = 0)
-        if type.is_a?(RBS::Types::Literal) && type.literal.is_a?(Symbol)
-          "#{type.to_s(1)} ?"
-        else
-          "#{type.to_s(1)}?"
+        case t = type
+        when RBS::Types::Literal
+          case t.literal
+          when Symbol
+            return "#{type.to_s(1)} ?"
+          end
         end
+
+        "#{type.to_s(1)}?"
       end
 
       def each_type
@@ -560,7 +563,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           types.each(&block)
         else
           enum_for :each_type
@@ -568,7 +571,7 @@ module RBS
       end
 
       def map_type(&block)
-        if block_given?
+        if block
           Union.new(types: types.map(&block), location: location)
         else
           enum_for :map_type
@@ -629,7 +632,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           types.each(&block)
         else
           enum_for :each_type
@@ -637,7 +640,7 @@ module RBS
       end
 
       def map_type(&block)
-        if block_given?
+        if block
           Intersection.new(types: types.map(&block), location: location)
         else
           enum_for :map_type
@@ -672,8 +675,8 @@ module RBS
           self.class.hash ^ type.hash ^ name.hash
         end
 
-        def map_type
-          if block_given?
+        def map_type(&block)
+          if block
             Param.new(name: name, type: yield(type))
           else
             enum_for :map_type
@@ -772,7 +775,7 @@ module RBS
       end
 
       def map_type(&block)
-        if block_given?
+        if block
           Function.new(
             required_positionals: required_positionals.map {|param| param.map_type(&block) },
             optional_positionals: optional_positionals.map {|param| param.map_type(&block) },
@@ -810,7 +813,7 @@ module RBS
       end
 
       def each_param(&block)
-        if block_given?
+        if block
           required_positionals.each(&block)
           optional_positionals.each(&block)
           rest_positionals&.yield_self(&block)
@@ -891,7 +894,9 @@ module RBS
       end
 
       def param_to_s
+        # @type var params: Array[String]
         params = []
+
         params.push(*required_positionals.map(&:to_s))
         params.push(*optional_positionals.map {|p| "?#{p}"})
         params.push("*#{rest_positionals}") if rest_positionals
@@ -927,8 +932,9 @@ module RBS
       def drop_tail
         case
         when !trailing_positionals.empty?
+          last = trailing_positionals.last or raise
           [
-            trailing_positionals.last,
+            last,
             update(trailing_positionals: trailing_positionals.take(trailing_positionals.size - 1))
           ]
         else
@@ -960,7 +966,7 @@ module RBS
         self.class.hash ^ type.hash
       end
 
-      def free_variables(set)
+      def free_variables(set = Set[])
         type.free_variables(set)
       end
 
@@ -977,7 +983,7 @@ module RBS
       end
 
       def each_type(&block)
-        if block_given?
+        if block
           type.each_type(&block)
         else
           enum_for :each_type