steep 1.8.0.pre.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c87015f545300c9c126b0121aa9534db083c157fbd791b7117006b6683bdc05d
-  data.tar.gz: 6bb606ac1b4cc9cdd6364745c02f878714cdf2ca2d61079376a3ea50fbf4b9ba
+  metadata.gz: 298dd973658fa586efbf59424298b54eb540a3e8f5b5c423f10ede9ae83d0d65
+  data.tar.gz: f9a21241e44c10744d3305111b9afe499855931acda999b8671a2276ade4b2d9
 SHA512:
-  metadata.gz: 4787c76c6049f2e1a2a9856d26dd0157419a2f4258a185559d0fe676500380089d75b30f916e353836f0e6af4eab16e2d977a9be5798bcfae1d13f8902d21491
-  data.tar.gz: 462bb7747747fd5a34bf3205cd71d94f22beb4efd4407e5e59fbc31c049583b8350cdac262591319ad2ed09d802d94e3ff42d2f9c54ba0addff5547c7258f898
+  metadata.gz: e110b36e04ba367ba26ce2f2a74b7aa6be20bb25df742af696803be795f7b372a92948f923c4b30548ad4c78657b0dcb19702a602721ef80136eb4f9d4e9daa1
+  data.tar.gz: 2a4e44c76e29539b8692e31aa5cdd3f438715b978ef5d4e264d26191f634ff3c0ff58488d0334816ca8e6e6b1ff0ce3d0a35140c51e1dea78d7e3b56a31a3fdd

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 1.8.0 (2024-09-30)
+
+### Type checker core
+
+* RBS validation ([#1239](https://github.com/soutaro/steep/pull/1239))
+* Add special path for `Kernel#class` method ([#1229](https://github.com/soutaro/steep/pull/1229))
+
+## 1.8.0.pre.2 (2024-09-18)
+
+### Type checker core
+
+* Support non symbol record keys ([#1227](https://github.com/soutaro/steep/pull/1227))
+
 ## 1.8.0.pre.1 (2024-09-17)
 
 ### Type checker core

data/lib/steep/ast/builtin.rb

@@ -65,6 +65,7 @@ module Steep
       Regexp = Type.new("::Regexp")
       NilClass = Type.new("::NilClass")
       Proc = Type.new("::Proc")
+      Kernel = Type.new("::Kernel")
 
       def self.nil_type
         AST::Types::Nil.instance

data/lib/steep/ast/types/record.rb

@@ -27,7 +27,7 @@ module Steep
         end
 
         def to_s
-          strings = elements.keys.sort.map do |key|
+          strings = elements.keys.sort_by(&:to_s).map do |key|
             if optional?(key)
               "?#{key.inspect} => #{elements[key]}"
             else

data/lib/steep/diagnostic/result_printer2.rb

@@ -0,0 +1,48 @@
+module Steep
+  module Diagnostic
+    module ResultPrinter2
+      def result_line(result)
+        case result
+        when Subtyping::Result::Failure
+          case result.error
+          when Subtyping::Result::Failure::UnknownPairError
+            nil
+          when Subtyping::Result::Failure::UnsatisfiedConstraints
+            "Unsatisfied constraints: #{result.relation}"
+          when Subtyping::Result::Failure::MethodMissingError
+            "Method `#{result.error.name}` is missing"
+          when Subtyping::Result::Failure::BlockMismatchError
+            "Incomaptible block: #{result.relation}"
+          when Subtyping::Result::Failure::ParameterMismatchError
+            if result.relation.params?
+              "Incompatible arity: #{result.relation.super_type} and #{result.relation.sub_type}"
+            else
+              "Incompatible arity: #{result.relation}"
+            end
+          when Subtyping::Result::Failure::PolyMethodSubtyping
+            "Unsupported polymorphic method comparison: #{result.relation}"
+          when Subtyping::Result::Failure::SelfBindingMismatch
+            "Incompatible block self type: #{result.relation}"
+          end
+        else
+          result.relation.to_s
+        end
+      end
+
+      def detail_lines
+        lines = StringIO.new.tap do |io|
+          failure_path = result.failure_path || []
+          failure_path.reverse_each.filter_map do |result|
+            result_line(result)
+          end.each.with_index(1) do |message, index|
+            io.puts "#{"  " * (index)}#{message}"
+          end
+        end.string.chomp
+
+        unless lines.empty?
+          lines
+        end
+      end
+    end
+  end
+end

data/lib/steep/diagnostic/ruby.rb

@@ -61,51 +61,6 @@ module Steep
         end
       end
 
-      module ResultPrinter2
-        def result_line(result)
-          case result
-          when Subtyping::Result::Failure
-            case result.error
-            when Subtyping::Result::Failure::UnknownPairError
-              nil
-            when Subtyping::Result::Failure::UnsatisfiedConstraints
-              "Unsatisfied constraints: #{result.relation}"
-            when Subtyping::Result::Failure::MethodMissingError
-              "Method `#{result.error.name}` is missing"
-            when Subtyping::Result::Failure::BlockMismatchError
-              "Incomaptible block: #{result.relation}"
-            when Subtyping::Result::Failure::ParameterMismatchError
-              if result.relation.params?
-                "Incompatible arity: #{result.relation.super_type} and #{result.relation.sub_type}"
-              else
-                "Incompatible arity: #{result.relation}"
-              end
-            when Subtyping::Result::Failure::PolyMethodSubtyping
-              "Unsupported polymorphic method comparison: #{result.relation}"
-            when Subtyping::Result::Failure::SelfBindingMismatch
-              "Incompatible block self type: #{result.relation}"
-            end
-          else
-            result.relation.to_s
-          end
-        end
-
-        def detail_lines
-          lines = StringIO.new.tap do |io|
-            failure_path = result.failure_path || []
-            failure_path.reverse_each.filter_map do |result|
-              result_line(result)
-            end.each.with_index(1) do |message, index|
-              io.puts "#{"  " * (index)}#{message}"
-            end
-          end.string.chomp
-
-          unless lines.empty?
-            lines
-          end
-        end
-      end
-
       class IncompatibleAssignment < Base
         attr_reader :lhs_type
         attr_reader :rhs_type

data/lib/steep/diagnostic/signature.rb

@@ -105,12 +105,16 @@ module Steep
         attr_reader :type_name
         attr_reader :type_arg
         attr_reader :type_param
+        attr_reader :result
 
-        def initialize(type_name:, type_arg:, type_param:, location:)
+        include ResultPrinter2
+
+        def initialize(type_name:, type_arg:, type_param:, result:, location:)
           super(location: location)
           @type_name = type_name
           @type_arg = type_arg
           @type_param = type_param
+          @result = result
         end
 
         def header_line
@@ -248,14 +252,20 @@ module Steep
       class ModuleSelfTypeError < Base
         attr_reader :name
         attr_reader :ancestor
-        attr_reader :relation
+        attr_reader :result
+
+        include ResultPrinter2
 
-        def initialize(name:, ancestor:, relation:, location:)
+        def initialize(name:, ancestor:, result:, location:)
           super(location: location)
 
           @name = name
           @ancestor = ancestor
-          @relation = relation
+          @result = result
+        end
+
+        def relation
+          result.relation
         end
 
         def header_line
@@ -417,6 +427,40 @@ module Steep
         end
       end
 
+      class TypeParamDefaultReferenceError < Base
+        attr_reader :type_param
+
+        def initialize(type_param, location:)
+          super(location: location)
+          @type_param = type_param
+        end
+
+        def header_line
+          "The default type of `#{type_param.name}` cannot depend on optional type parameters"
+        end
+      end
+
+      class UnsatisfiableGenericsDefaultType < Base
+        attr_reader :param_name, :result
+
+        include ResultPrinter2
+
+        def initialize(param_name, result, location:)
+          super(location: location)
+          @param_name = param_name
+          @result = result
+        end
+
+        def relation
+          result.relation
+        end
+
+        def header_line
+          "The default type of `#{param_name}` doesn't satisfy upper bound constarint: #{relation}"
+        end
+      end
+
+
       def self.from_rbs_error(error, factory:)
         case error
         when RBS::ParsingError
@@ -515,6 +559,8 @@ module Steep
           Diagnostic::Signature::InconsistentClassModuleAliasError.new(decl: error.alias_entry.decl)
         when RBS::CyclicClassAliasDefinitionError
           Diagnostic::Signature::CyclicClassAliasDefinitionError.new(decl: error.alias_entry.decl)
+        when RBS::TypeParamDefaultReferenceError
+          Diagnostic::Signature::TypeParamDefaultReferenceError.new(error.type_param, location: error.location)
         else
           raise error
         end

data/lib/steep/interface/builder.rb

@@ -281,6 +281,7 @@ module Steep
                 method_name = method_name_for(type_def, name)
                 method_type = factory.method_type(type_def.type)
                 method_type = replace_primitive_method(method_name, type_def, method_type)
+                method_type = replace_kernel_class(method_name, type_def, method_type) { AST::Builtin::Class.instance_type }
                 Shape::MethodOverload.new(method_type, [type_def])
               end
 
@@ -311,6 +312,9 @@ module Steep
                 method_name = method_name_for(type_def, name)
                 method_type = factory.method_type(type_def.type)
                 method_type = replace_primitive_method(method_name, type_def, method_type)
+                if type_name.class?
+                  method_type = replace_kernel_class(method_name, type_def, method_type) { AST::Types::Name::Singleton.new(name: type_name) }
+                end
                 Shape::MethodOverload.new(method_type, [type_def])
               end
 
@@ -748,7 +752,7 @@ module Steep
                     return_type: AST::Types::Logic::ReceiverIsNil.instance()
                   )
                 )
-            end
+              end
             end
 
           when :!
@@ -801,6 +805,23 @@ module Steep
 
         method_type
       end
+
+      def replace_kernel_class(method_name, method_def, method_type)
+        defined_in = method_def.defined_in
+        member = method_def.member
+
+        if member.is_a?(RBS::AST::Members::MethodDefinition)
+          case method_name.method_name
+          when :class
+            case defined_in
+            when AST::Builtin::Kernel.module_name
+              return method_type.with(type: method_type.type.with(return_type: yield))
+            end
+          end
+        end
+
+        method_type
+      end
     end
   end
 end

data/lib/steep/signature/validator.rb

@@ -104,6 +104,7 @@ module Steep
                     unchecked: param.unchecked?,
                     default_type: factory.type_opt(param.default_type)
                   ),
+                  result: result,
                   location: location
                 )
               end
@@ -252,6 +253,39 @@ module Steep
         end
       end
 
+      def validate_type_params(type_name, type_params)
+        if error_type_params = RBS::AST::TypeParam.validate(type_params)
+          error_type_params.each do |type_param|
+            default_type = type_param.default_type or raise
+            @errors << Diagnostic::Signature::TypeParamDefaultReferenceError.new(type_param, location: default_type.location)
+          end
+        end
+
+        upper_bounds = type_params.each.with_object({}) do |param, bounds| #$ Hash[Symbol, AST::Types::t?]
+          bounds[param.name] = factory.type_opt(param.upper_bound_type)
+        end
+
+        checker.push_variable_bounds(upper_bounds) do
+          type_params.each do |type_param|
+            param = checker.factory.type_param(type_param)
+
+            default_type = param.default_type or next
+            upper_bound = param.upper_bound or next
+
+            relation = Subtyping::Relation.new(sub_type: default_type, super_type: upper_bound)
+            result = checker.check(relation, self_type: nil, instance_type: nil, class_type: nil, constraints: Subtyping::Constraints.empty)
+
+            if result.failure?
+              @errors << Diagnostic::Signature::UnsatisfiableGenericsDefaultType.new(
+                type_param.name,
+                result,
+                location: (type_param.default_type || raise).location
+              )
+            end
+          end
+        end
+      end
+
       def validate_one_class_decl(name, entry)
         rescue_validation_errors(name) do
           Steep.logger.debug { "Validating class definition `#{name}`..." }
@@ -310,7 +344,7 @@ module Steep
                         name: name,
                         location: ancestor.source&.location || raise,
                         ancestor: ancestor,
-                        relation: relation
+                        result: _1
                       )
                     end
                   end
@@ -405,7 +439,7 @@ module Steep
                       name: name,
                       location: ancestor.source&.location || raise,
                       ancestor: ancestor,
-                      relation: relation
+                      result: _1
                     )
                   end
                 end
@@ -419,6 +453,8 @@ module Steep
                 validate_definition_type(definition)
               end
             end
+
+            validate_type_params(name, entry.type_params)
           end
         end
       end
@@ -480,6 +516,8 @@ module Steep
           Steep.logger.tagged "#{name}" do
             definition = builder.build_interface(name)
 
+            validate_type_params(name, definition.type_params_decl)
+
             upper_bounds = definition.type_params_decl.each.with_object({}) do |param, bounds|
               bounds[param.name] = factory.type_opt(param.upper_bound_type)
             end
@@ -575,6 +613,8 @@ module Steep
               builder.validate_type_name(outer, entry.decl.location&.aref(:name))
             end
 
+            validate_type_params(name, entry.decl.type_params)
+
             upper_bounds = entry.decl.type_params.each.with_object({}) do |param, bounds|
               bounds[param.name] = factory.type_opt(param.upper_bound_type)
             end

data/lib/steep/type_construction.rb

@@ -2657,34 +2657,11 @@ module Steep
     def synthesize_sendish(node, hint:, tapp:)
       case node.type
       when :send
-        yield_self do
-          if self_class?(node)
-            module_type = expand_alias(module_context.module_type)
-            type = if module_type.is_a?(AST::Types::Name::Singleton)
-                     AST::Types::Name::Singleton.new(name: module_type.name)
-                   else
-                     module_type
-                   end
-
-            add_typing(node, type: type)
-          else
-            type_send(node, send_node: node, block_params: nil, block_body: nil, tapp: tapp, hint: hint)
-          end
-        end
+        type_send(node, send_node: node, block_params: nil, block_body: nil, tapp: tapp, hint: hint)
       when :csend
         yield_self do
           send_type, constr =
-            if self_class?(node)
-              module_type = expand_alias(module_context.module_type)
-              type = if module_type.is_a?(AST::Types::Name::Singleton)
-                       AST::Types::Name::Singleton.new(name: module_type.name)
-                     else
-                       module_type
-                     end
-              add_typing(node, type: type).to_ary
-            else
-              type_send(node, send_node: node, block_params: nil, block_body: nil, unwrap: true, tapp: tapp, hint: hint).to_ary
-            end
+            type_send(node, send_node: node, block_params: nil, block_body: nil, unwrap: true, tapp: tapp, hint: hint).to_ary
 
           constr
             .update_type_env { context.type_env.join(constr.context.type_env, context.type_env) }
@@ -4687,10 +4664,6 @@ module Steep
       add_typing node, type: AST::Builtin.any_type
     end
 
-    def self_class?(node)
-      node.type == :send && node.children[0]&.type == :self && node.children[1] == :class
-    end
-
     def namespace_module?(node)
       # @type var nodes: Array[Parser::AST::Node]
       nodes =
@@ -4962,11 +4935,11 @@ module Steep
       each_child_node(hash_node) do |child|
         if child.type == :pair
           case child.children[0].type
-          when :sym
+          when :sym, :int, :str, :true, :false
             key_node = child.children[0] #: Parser::AST::Node
             value_node = child.children[1] #: Parser::AST::Node
 
-            key = key_node.children[0] #: String | Symbol | Integer
+            key = key_node.children[0] #: AST::Types::Record::key
 
             _, constr = constr.synthesize(key_node, hint: AST::Types::Literal.new(value: key))
 

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.8.0.pre.1"
+  VERSION = "1.8.0"
 end

data/lib/steep.rb

@@ -75,6 +75,7 @@ require "steep/subtyping/constraints"
 require "steep/subtyping/variable_variance"
 
 require "steep/diagnostic/helper"
+require "steep/diagnostic/result_printer2"
 require "steep/diagnostic/ruby"
 require "steep/diagnostic/signature"
 require "steep/diagnostic/lsp_formatter"

data/sample/sig/generics.rbs

@@ -0,0 +1,15 @@
+module LocationHelper : _WithLocation
+  interface _WithLocation
+    def location_method: () -> String
+  end
+
+  def hello: () -> void
+end
+
+class StringGeneric[X < Integer, Y < Integer = String]
+  def location_method: () -> Integer
+
+  include LocationHelper
+  extend LocationHelper
+end
+

data/steep.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rainbow", ">= 2.2.2", "< 4.0"
   spec.add_runtime_dependency "listen", "~> 3.0"
   spec.add_runtime_dependency "language_server-protocol", ">= 3.15", "< 4.0"
-  spec.add_runtime_dependency "rbs", "~> 3.6.0.dev"
+  spec.add_runtime_dependency "rbs", "~> 3.6.0"
   spec.add_runtime_dependency "concurrent-ruby", ">= 1.1.10"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
   spec.add_runtime_dependency "securerandom", ">= 0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-17 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0.dev
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0.dev
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -291,6 +291,7 @@ files:
 - lib/steep/diagnostic/deprecated/unknown_constant_assigned.rb
 - lib/steep/diagnostic/helper.rb
 - lib/steep/diagnostic/lsp_formatter.rb
+- lib/steep/diagnostic/result_printer2.rb
 - lib/steep/diagnostic/ruby.rb
 - lib/steep/diagnostic/signature.rb
 - lib/steep/drivers/annotations.rb
@@ -384,6 +385,7 @@ files:
 - sample/lib/conference.rb
 - sample/lib/length.rb
 - sample/sig/conference.rbs
+- sample/sig/generics.rbs
 - sample/sig/length.rbs
 - steep.gemspec
 homepage: https://github.com/soutaro/steep
@@ -408,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Gradual Typing for Ruby