rbs 4.0.0.dev.4 → 4.0.0.dev.5

data/lib/rbs/resolver/type_name_resolver.rb

@@ -5,17 +5,28 @@ module RBS
     class TypeNameResolver
       attr_reader :all_names
       attr_reader :cache
-      attr_reader :env
+      attr_reader :aliases
 
-      def initialize(env)
-        @all_names = Set[]
+      def initialize(all_names, aliases)
+        @all_names = all_names
+        @aliases = aliases
         @cache = {}
-        @env = env
+      end
+
+      def self.build(env)
+        all_names = Set.new #: Set[TypeName]
 
         all_names.merge(env.class_decls.keys)
         all_names.merge(env.interface_decls.keys)
         all_names.merge(env.type_alias_decls.keys)
-        all_names.merge(env.class_alias_decls.keys)
+
+        aliases = {} #: Hash[TypeName, [TypeName, context]]
+
+        env.class_alias_decls.each do |name, entry|
+          aliases[name] = [entry.decl.old_name, entry.context]
+        end
+
+        new(all_names, aliases)
       end
 
       def try_cache(query)
@@ -26,64 +37,131 @@ module RBS
       end
 
       def resolve(type_name, context:)
-        if type_name.absolute?
+        if type_name.absolute? && has_type_name?(type_name)
           return type_name
         end
 
         try_cache([type_name, context]) do
-          head, tail = partition(type_name)
+          if type_name.class?
+            resolve_namespace0(type_name, context, Set.new) || nil
+          else
+            namespace = type_name.namespace
 
-          head = resolve_in(head, context)
-
-          if head
-            if tail
-              absolute_name = tail.with_prefix(head.to_namespace)
-              if env.normalize_type_name?(absolute_name)
-                absolute_name
-              end
+            if namespace.empty?
+              resolve_type_name(type_name.name, context)
             else
-              head
+              if namespace = resolve_namespace0(namespace.to_type_name, context, Set.new)
+                type_name = TypeName.new(name: type_name.name, namespace: namespace.to_namespace)
+                has_type_name?(type_name)
+              end
             end
           end
         end
       end
 
-      def partition(type_name)
-        if type_name.namespace.empty?
-          head = type_name.name
-          tail = nil
-        else
-          head, *tail = type_name.namespace.path
+      def resolve_namespace(type_name, context:)
+        if type_name.absolute? && has_type_name?(type_name)
+          return type_name
+        end
 
-          head or raise
+        unless type_name.class?
+          raise "Type name must be a class name: #{type_name}"
+        end
 
-          tail = TypeName.new(
-            name: type_name.name,
-            namespace: Namespace.new(absolute: false, path: tail)
-          )
+        try_cache([type_name, context]) do
+          ns = resolve_namespace0(type_name, context, Set.new) or return ns
         end
+      end
 
-        [head, tail]
+      def has_type_name?(full_name)
+        if all_names.include?(full_name)
+          full_name
+        end
       end
 
-      def resolve_in(head, context)
+      def aliased_name?(type_name)
+        if aliases.key?(type_name)
+          type_name
+        end
+      end
+
+      def resolve_type_name(type_name, context)
         if context
-          parent, child = context
-          case child
+          outer, inner = context
+          case inner
           when false
-            resolve_in(head, parent)
+            resolve_type_name(type_name, outer)
+          else
+            has_type_name?(inner) or raise "Context must be normalized: #{inner.inspect}"
+            has_type_name?(TypeName.new(name: type_name, namespace: inner.to_namespace)) || resolve_type_name(type_name, outer)
+          end
+        else
+          type_name = TypeName.new(name: type_name, namespace: Namespace.root)
+          has_type_name?(type_name)
+        end
+      end
+
+      def resolve_head_namespace(head, context)
+        if context
+          outer, inner = context
+          case inner
+          when false
+            resolve_head_namespace(head, outer)
           when TypeName
-            name = TypeName.new(name: head, namespace: child.to_namespace)
-            has_name?(name) || resolve_in(head, parent)
+            has_type_name?(inner) or raise "Context must be normalized: #{inner.inspect}"
+            type_name = TypeName.new(name: head, namespace: inner.to_namespace)
+            has_type_name?(type_name) || aliased_name?(type_name) || resolve_head_namespace(head, outer)
           end
         else
-          has_name?(TypeName.new(name: head, namespace: Namespace.root))
+          type_name = TypeName.new(name: head, namespace: Namespace.root)
+          has_type_name?(type_name) || aliased_name?(type_name)
         end
       end
 
-      def has_name?(full_name)
-        if all_names.include?(full_name)
-          full_name
+      def normalize_namespace(type_name, rhs, context, visited)
+        if visited.include?(type_name)
+          # Cycle detected
+          return false
+        end
+
+        visited << type_name
+
+        begin
+          resolve_namespace0(rhs, context, visited)
+        ensure
+          visited.delete(type_name)
+        end
+      end
+
+      def resolve_namespace0(type_name, context, visited)
+        head, *tail = [*type_name.namespace.path, type_name.name]
+
+        head = head #: Symbol
+
+        head =
+          if type_name.absolute?
+            root_name = TypeName.new(name: head, namespace: Namespace.root)
+            has_type_name?(root_name) || aliased_name?(root_name)
+          else
+            resolve_head_namespace(head, context)
+          end
+
+        if head
+          if (rhs, context = aliases.fetch(head, nil))
+            head = normalize_namespace(head, rhs, context, visited) or return head
+          end
+
+          tail.inject(head) do |namespace, name|
+            type_name = TypeName.new(name: name, namespace: namespace.to_namespace)
+            case
+            when has_type_name?(type_name)
+              type_name
+            when (rhs, context = aliases.fetch(type_name, nil))
+              m = normalize_namespace(type_name, rhs, context, visited) or return m
+            else
+              return nil
+            end
+          end
         end
       end
     end

data/lib/rbs/subtractor.rb

@@ -107,7 +107,9 @@ module RBS
       each_member(owner).any? do |m|
         case m
         when AST::Members::InstanceVariable
-          m.name == name
+          m.name == name && kind == :instance
+        when AST::Members::ClassInstanceVariable
+          m.name == name && kind == :singleton
         when AST::Members::Attribute
           ivar_name = m.ivar_name == false ? nil : m.ivar_name || :"@#{m.name}"
           ivar_name == name && m.kind == kind

data/lib/rbs/test/type_check.rb

@@ -245,7 +245,7 @@ module RBS
         when Types::Bases::Any
           true
         when Types::Bases::Bool
-          val.is_a?(TrueClass) || val.is_a?(FalseClass)
+          Test.call(val, IS_AP, TrueClass) || Test.call(val, IS_AP, FalseClass)
         when Types::Bases::Top
           true
         when Types::Bases::Bottom
@@ -288,6 +288,19 @@ module RBS
                   values << args
                   nil
                 end
+              when nil
+                values = []
+                count = 10_000
+
+                ret = val.each do |*args|
+                  count -= 1
+                  values << args
+                  break if count <= 0
+                end
+
+                if count == 0
+                  ret = self
+                end
               else
                 values = []
                 ret = val.each do |*args|
@@ -323,7 +336,7 @@ module RBS
                             rescue TypeError
                               return false
                             end
-          val.is_a?(singleton_class)
+          Test.call(val, IS_AP, singleton_class)
         when Types::Interface
           if (definition = builder.build_interface(type.name.absolute!))
             definition.methods.each.all? do |method_name, method|
@@ -351,6 +364,7 @@ module RBS
           value(val, builder.expand_alias2(type.name.absolute!, type.args))
         when Types::Tuple
           Test.call(val, IS_AP, ::Array) &&
+            type.types.length == val.length &&
             type.types.map.with_index {|ty, index| value(val[index], ty) }.all?
         when Types::Record
           Test::call(val, IS_AP, ::Hash) &&

data/lib/rbs/type_name.rb

@@ -36,7 +36,7 @@ module RBS
       "#{namespace.to_s}#{name}"
     end
 
-    def to_json(state = _ = nil)
+    def to_json(state = nil)
       to_s.to_json(state)
     end
 

data/lib/rbs/types.rb

@@ -61,7 +61,7 @@ module RBS
         include EmptyEachType
         include NoTypeName
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           klass = to_s.to_sym
           { class: klass, location: location }.to_json(state)
         end
@@ -157,7 +157,7 @@ module RBS
         end
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :variable, name: name, location: location }.to_json(state)
       end
 
@@ -221,7 +221,7 @@ module RBS
       include NoFreeVariables
       include NoSubst
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :class_singleton, name: name, location: location }.to_json(state)
       end
 
@@ -303,7 +303,7 @@ module RBS
             # `void` in immediate generics parameter is allowed
             false
           else
-            type.with_nonreturn_void?
+            type.with_nonreturn_void? # steep:ignore DeprecatedReference
           end
         end
       end
@@ -320,7 +320,7 @@ module RBS
         @location = location
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :interface, name: name, args: args, location: location }.to_json(state)
       end
 
@@ -364,7 +364,7 @@ module RBS
         @location = location
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :class_instance, name: name, args: args, location: location }.to_json(state)
       end
 
@@ -408,7 +408,7 @@ module RBS
         @location = location
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :alias, name: name, args: args, location: location }.to_json(state)
       end
 
@@ -466,7 +466,7 @@ module RBS
         end
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :tuple, types: types, location: location }.to_json(state)
       end
 
@@ -520,7 +520,7 @@ module RBS
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? }
+        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
       end
     end
 
@@ -573,7 +573,7 @@ module RBS
         end
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :record, fields: fields, optional_fields: optional_fields, location: location }.to_json(state)
       end
 
@@ -638,7 +638,7 @@ module RBS
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? }
+        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
       end
     end
 
@@ -665,7 +665,7 @@ module RBS
         type.free_variables(set)
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :optional, type: type, location: location }.to_json(state)
       end
 
@@ -724,7 +724,7 @@ module RBS
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? }
+        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
       end
     end
 
@@ -755,7 +755,7 @@ module RBS
         end
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :union, types: types, location: location }.to_json(state)
       end
 
@@ -815,7 +815,7 @@ module RBS
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? }
+        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
       end
     end
 
@@ -846,7 +846,7 @@ module RBS
         end
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :intersection, types: types, location: location }.to_json(state)
       end
 
@@ -898,7 +898,7 @@ module RBS
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? }
+        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
       end
     end
 
@@ -932,7 +932,7 @@ module RBS
           end
         end
 
-        def to_json(state = _ = nil)
+        def to_json(state = nil)
           { type: type, name: name }.to_json(state)
         end
 
@@ -1091,7 +1091,7 @@ module RBS
         end
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         {
           required_positionals: required_positionals,
           optional_positionals: optional_positionals,
@@ -1226,13 +1226,13 @@ module RBS
       end
 
       def with_nonreturn_void?
-        if each_param.any? {|param| param.type.with_nonreturn_void? }
+        if each_param.any? {|param| param.type.with_nonreturn_void? } # steep:ignore DeprecatedReference
           true
         else
           if return_type.is_a?(Bases::Void)
             false
           else
-            return_type.with_nonreturn_void?
+            return_type.with_nonreturn_void? # steep:ignore DeprecatedReference
           end
         end
       end
@@ -1279,7 +1279,7 @@ module RBS
         end
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         {
           return_type: return_type
         }.to_json(state)
@@ -1355,7 +1355,7 @@ module RBS
           other.self_type == self_type
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         {
           type: type,
           required: required,
@@ -1424,7 +1424,7 @@ module RBS
         set
       end
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         {
           class: :proc,
           type: type,
@@ -1505,11 +1505,11 @@ module RBS
       end
 
       def with_nonreturn_void?
-        if type.with_nonreturn_void? || self_type&.with_nonreturn_void?
+        if type.with_nonreturn_void? || self_type&.with_nonreturn_void? # steep:ignore DeprecatedReference
           true
         else
           if block = block()
-            block.type.with_nonreturn_void? || block.self_type&.with_nonreturn_void? || false
+            block.type.with_nonreturn_void? || block.self_type&.with_nonreturn_void? || false # steep:ignore DeprecatedReference
           else
             false
           end
@@ -1541,7 +1541,7 @@ module RBS
       include EmptyEachType
       include NoTypeName
 
-      def to_json(state = _ = nil)
+      def to_json(state = nil)
         { class: :literal, literal: literal.inspect, location: location }.to_json(state)
       end
 

data/lib/rbs/validator.rb

@@ -127,8 +127,8 @@ module RBS
       # @type var each_child: ^(Symbol) { (Symbol) -> void } -> void
       each_child = -> (name, &block) do
         if param = params.find {|p| p.name == name }
-          if b = param.upper_bound_type
-            b.free_variables.each do |tv|
+          [param.upper_bound_type, param.lower_bound_type].compact.each do |bound|
+            bound.free_variables.each do |tv|
               block[tv]
             end
           end

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "4.0.0.dev.4"
+  VERSION = "4.0.0.dev.5"
 end

data/lib/rbs.rb

@@ -4,7 +4,7 @@ require "rbs/version"
 
 require "set"
 require "json"
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require "pp"
 require "ripper"
 require "logger"

data/lib/rdoc/discover.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 begin
-  gem 'rdoc', '~> 6.13'
+  gem 'rdoc', '>= 6.16'
   require 'rdoc_plugin/parser'
   module RDoc
     class Parser

data/lib/rdoc_plugin/parser.rb

@@ -76,7 +76,7 @@ module RBS
         method.visibility = decl.visibility
         method.call_seq = decl.overloads.map {|overload| "#{decl.name.to_s}#{overload.method_type.to_s}" }.join("\n")
         if loc = decl.location
-          method.start_collecting_tokens
+          method.start_collecting_tokens(:ruby)
           method.add_token({ line_no: 1, char_no: 1, kind: :on_comment, text: "# File #{@top_level.relative_name}, line(s) #{loc.start_line}:#{loc.end_line}\n" })
           method.add_token({ line_no: 1, char_no: 1, text: loc.source })
           method.line = loc.start_line

data/rbs.gemspec

@@ -38,13 +38,14 @@ Gem::Specification.new do |spec|
   spec.extensions = %w{ext/rbs_extension/extconf.rb}
 
   if false
-    spec.required_ruby_version = ">= 3.3"
+    spec.required_ruby_version = ">= 3.4"
   end
 
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 3.1"
+  spec.required_ruby_version = ">= 3.2"
   spec.add_dependency "logger"
   spec.add_dependency "prism", ">= 1.3.0"
+  spec.add_dependency "tsort"
 end

data/schema/typeParam.json

@@ -28,9 +28,25 @@
         }
       ]
     },
+    "lower_bound": {
+      "oneOf": [
+        {
+          "$ref": "types.json#/definitions/classInstance"
+        },
+        {
+          "$ref": "types.json#/definitions/classSingleton"
+        },
+        {
+          "$ref": "types.json#/definitions/interface"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
     "location": {
       "$ref": "location.json"
     }
   },
-  "required": ["name", "variance", "unchecked", "upper_bound", "location"]
+  "required": ["name", "variance", "unchecked", "upper_bound", "lower_bound", "location"]
 }