steep 1.3.0.pre.1 → 1.3.0

data/lib/steep/services/signature_service.rb

@@ -19,6 +19,10 @@ module Steep
             builder.env(last_builder.env)
           end
         end
+
+        def constant_resolver
+          @constant_resolver ||= RBS::Resolver::ConstantResolver.new(builder: last_builder)
+        end
       end
 
       class AncestorErrorStatus
@@ -37,6 +41,10 @@ module Steep
             builder.env(last_builder.env)
           end
         end
+
+        def constant_resolver
+          @constant_resolver ||= RBS::Resolver::ConstantResolver.new(builder: last_builder)
+        end
       end
 
       class LoadedStatus
@@ -61,6 +69,10 @@ module Steep
             builder.env(self.builder.env)
           end
         end
+
+        def constant_resolver
+          @constant_resolver ||= RBS::Resolver::ConstantResolver.new(builder: builder)
+        end
       end
 
       FileStatus = _ = Struct.new(:path, :content, :decls, keyword_init: true)
@@ -125,6 +137,10 @@ module Steep
         status.rbs_index
       end
 
+      def latest_constant_resolver
+        status.constant_resolver
+      end
+
       def current_subtyping
         if status.is_a?(LoadedStatus)
           status.subtyping

data/lib/steep/services/type_check_service.rb

@@ -280,7 +280,7 @@ module Steep
 
             if subtyping
               text = source_files[path].content
-              file = type_check_file(target: target, subtyping: subtyping, path: path, text: text)
+              file = type_check_file(target: target, subtyping: subtyping, path: path, text: text) { signature_service.latest_constant_resolver }
               yield [file.path, file.diagnostics]
               source_files[path] = file
             end
@@ -326,7 +326,7 @@ module Steep
       def type_check_file(target:, subtyping:, path:, text:)
         Steep.logger.tagged "#type_check_file(#{path}@#{target.name})" do
           source = Source.parse(text, path: path, factory: subtyping.factory)
-          typing = TypeCheckService.type_check(source: source, subtyping: subtyping)
+          typing = TypeCheckService.type_check(source: source, subtyping: subtyping, constant_resolver: yield)
           SourceFile.with_typing(path: path, content: text, node: source.node, typing: typing)
         end
       rescue AnnotationParser::SyntaxError => exn
@@ -342,7 +342,7 @@ module Steep
         SourceFile.no_data(path: path, content: text)
       end
 
-      def self.type_check(source:, subtyping:)
+      def self.type_check(source:, subtyping:, constant_resolver:)
         annotations = source.annotations(block: source.node, factory: subtyping.factory, context: nil)
 
         definition = subtyping.factory.definition_builder.build_instance(AST::Builtin::Object.module_name)
@@ -350,7 +350,7 @@ module Steep
         const_env = TypeInference::ConstantEnv.new(
           factory: subtyping.factory,
           context: nil,
-          resolver: RBS::Resolver::ConstantResolver.new(builder: subtyping.factory.definition_builder)
+          resolver: constant_resolver
         )
         type_env = TypeInference::TypeEnv.new(const_env)
         type_env = TypeInference::TypeEnvBuilder.new(

data/lib/steep/signature/validator.rb

@@ -270,9 +270,9 @@ module Steep
                 mixin_constraints(definition, ancestors.included_modules || raise, immediate_self_types: ancestors.self_types).each do |relation, ancestor|
                   checker.check(
                     relation,
-                    self_type: AST::Types::Self.new,
-                    instance_type: AST::Types::Instance.new,
-                    class_type: AST::Types::Class.new,
+                    self_type: AST::Types::Self.instance,
+                    instance_type: AST::Types::Instance.instance,
+                    class_type: AST::Types::Class.instance,
                     constraints: Subtyping::Constraints.empty
                   ).else do
                     raise if ancestor.source.is_a?(Symbol)
@@ -314,16 +314,16 @@ module Steep
                   relation = Subtyping::Relation.new(sub_type: var_type, super_type: parent_type)
                   result1 = checker.check(
                     relation,
-                    self_type: AST::Types::Self.new,
-                    instance_type: AST::Types::Instance.new,
-                    class_type: AST::Types::Class.new,
+                    self_type: AST::Types::Self.instance,
+                    instance_type: AST::Types::Instance.instance,
+                    class_type: AST::Types::Class.instance,
                     constraints: Subtyping::Constraints.empty
                   )
                   result2 = checker.check(
                     relation.flip,
-                    self_type: AST::Types::Self.new,
-                    instance_type: AST::Types::Instance.new,
-                    class_type: AST::Types::Class.new,
+                    self_type: AST::Types::Self.instance,
+                    instance_type: AST::Types::Instance.instance,
+                    class_type: AST::Types::Class.instance,
                     constraints: Subtyping::Constraints.empty
                   )
 
@@ -362,13 +362,13 @@ module Steep
               mixin_constraints(definition, ancestors.extended_modules, immediate_self_types: ancestors.self_types).each do |relation, ancestor|
                 checker.check(
                   relation,
-                  self_type: AST::Types::Self.new,
-                  instance_type: AST::Types::Instance.new,
-                  class_type: AST::Types::Class.new,
+                  self_type: AST::Types::Self.instance ,
+                  instance_type: AST::Types::Instance.instance,
+                  class_type: AST::Types::Class.instance,
                   constraints: Subtyping::Constraints.empty
                 ).else do
                   raise if ancestor.source.is_a?(Symbol)
-                  
+
                   @errors << Diagnostic::Signature::ModuleSelfTypeError.new(
                     name: name,
                     location: ancestor.source&.location || raise,

data/lib/steep/type_construction.rb

@@ -3216,12 +3216,15 @@ module Steep
     def type_method_call(node, method_name:, receiver_type:, method:, arguments:, block_params:, block_body:, tapp:)
       node_range = node.loc.expression.yield_self {|l| l.begin_pos..l.end_pos }
 
-      results = method.method_types.map do |method_type|
+      # @type var fails: Array[[TypeInference::MethodCall::t, TypeConstruction]]
+      fails = []
+
+      method.method_types.each do |method_type|
         Steep.logger.tagged method_type.to_s do
           typing.new_child(node_range) do |child_typing|
             constr = self.with_new_typing(child_typing)
 
-            constr.try_special_method(
+            call, constr = constr.try_special_method(
               node,
               receiver_type: receiver_type,
               method_name: method_name,
@@ -3239,30 +3242,32 @@ module Steep
               block_body: block_body,
               tapp: tapp
             )
+
+            if call.is_a?(TypeInference::MethodCall::Typed)
+              constr.typing.save!
+              return [
+                call,
+                update_type_env { constr.context.type_env }
+              ]
+            else
+              fails << [call, constr]
+            end
           end
         end
       end
 
-      case
-      when results.one?
-        # There is only one overload, use the type checking result
-        call, constr = results[0]
-      when (call, constr = results.find {|call, _| call.is_a?(TypeInference::MethodCall::Typed) })
-        # Successfully type checked with one of the overloads
-      else
-        # No suitable overload, more than one overlodas
-        return
-      end
-
-      constr or raise
-      call or raise
+      if fails.one?
+        call, constr = fails[0]
 
-      constr.typing.save!
+        constr.typing.save!
 
-      [
-        call,
-        update_type_env { constr.context.type_env }
-      ]
+        [
+          call,
+          update_type_env { constr.context.type_env }
+        ]
+      else
+        nil
+      end
     end
 
     def inspect

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -390,14 +390,14 @@ module Steep
           # 4. none of the above (example: T = String, K = Integer)
 
           relation = Subtyping::Relation.new(sub_type: type, super_type: instance_type)
-          if subtyping.check(relation, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.new, instance_type: AST::Types::Instance.new, class_type: AST::Types::Class.new).success?
+          if subtyping.check(relation, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.instance, instance_type: AST::Types::Instance.instance, class_type: AST::Types::Class.instance).success?
             # 1 or 2. Satisfies the condition, no narrowing because `type` is already more specific than/equals to `instance_type`
             [
               [type],
               []
             ]
           else
-            if subtyping.check(relation.flip, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.new, instance_type: AST::Types::Instance.new, class_type: AST::Types::Class.new).success?
+            if subtyping.check(relation.flip, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.instance, instance_type: AST::Types::Instance.instance, class_type: AST::Types::Class.instance).success?
               # 3. Satisfied the condition, narrows to `instance_type`, but cannot remove it from *falsy* list
               [
                 [instance_type],

data/lib/steep/version.rb

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

data/lib/steep.rb

@@ -93,7 +93,6 @@ require "steep/type_inference/type_env_builder"
 require "steep/type_inference/logic_type_interpreter"
 require "steep/type_inference/multiple_assignment"
 require "steep/type_inference/method_call"
-require "steep/ast/types"
 
 require "steep/index/rbs_index"
 require "steep/index/signature_symbol_provider"

data/rbs_collection.steep.lock.yaml

@@ -11,7 +11,7 @@ gems:
   source:
     type: stdlib
 - name: rbs
-  version: 2.8.0.pre.1
+  version: 2.8.0
   source:
     type: rubygems
 - name: dbm

data/sig/steep/ast/builtin.rbs

@@ -59,7 +59,7 @@ module Steep
 
       def self.top_type: () -> Types::Top
 
-      def self.optional: (Types::t `type`) -> Types::Union
+      def self.optional: (Types::t) -> Types::t
 
       def self.true_type: () -> Types::Literal
 

data/sig/steep/ast/types/any.rbs

@@ -6,23 +6,23 @@ module Steep
 
         def initialize: (?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> self
+        def subst: (Interface::Substitution s) -> Any
 
-        def to_s: () -> "untyped"
+        def to_s: () -> String
 
         include Helper::NoFreeVariables
 
         include Helper::NoChild
 
-        def level: () -> ::Array[1]
+        def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Any
       end
     end
   end

data/sig/steep/ast/types/boolean.rbs

@@ -6,25 +6,25 @@ module Steep
 
         def initialize: (?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> self
+        def subst: (Interface::Substitution) -> Boolean
 
-        def to_s: () -> "bool"
+        def to_s: () -> String
 
         include Helper::NoFreeVariables
 
         include Helper::NoChild
 
-        def level: () -> ::Array[0]
+        def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Boolean
 
-        def back_type: () -> untyped
+        def back_type: () -> t
       end
     end
   end

data/sig/steep/ast/types/bot.rbs

@@ -6,23 +6,23 @@ module Steep
 
         def initialize: (?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> self
+        def subst: (Interface::Substitution) -> Bot
 
-        def to_s: () -> "bot"
+        def to_s: () -> String
 
         include Helper::NoFreeVariables
 
         include Helper::NoChild
 
-        def level: () -> ::Array[2]
+        def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Bot
       end
     end
   end

data/sig/steep/ast/types/class.rbs

@@ -6,23 +6,24 @@ module Steep
 
         def initialize: (?location: untyped?) -> void
 
-        def to_s: () -> "class"
+        def to_s: () -> String
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> untyped
+        def subst: (Interface::Substitution s) -> t
 
-        def free_variables: () -> untyped
+        @@fvs: Set[variable]
+        def free_variables: () -> Set[variable]
 
         include Helper::NoChild
 
-        def level: () -> ::Array[0]
+        def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Class
 
         self.@instance: Class
         def self.instance: () -> Class

data/sig/steep/ast/types/helper.rbs

@@ -3,15 +3,18 @@ module Steep
     module Types
       module Helper
         module ChildrenLevel
-          def level_of_children: (untyped children) -> untyped
+          def level_of_children: (Array[t] children) -> Array[Integer]
         end
 
         module NoFreeVariables
-          def free_variables: () -> untyped
+          @fvs: Set[variable]
+
+          def free_variables: () -> Set[variable]
         end
 
         module NoChild
-          def each_child: () ?{ () -> untyped } -> (untyped | nil)
+          def each_child: () { (t) -> void } -> void
+                        | () -> Enumerator[t, void]
         end
       end
     end

data/sig/steep/ast/types/instance.rbs

@@ -6,21 +6,22 @@ module Steep
 
         def initialize: (?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> untyped
+        def subst: (Interface::Substitution s) -> t
 
-        def free_variables: () -> untyped
+        @@fvs: Set[variable]
+        def free_variables: () -> Set[variable]
 
         include Helper::NoChild
 
-        def to_s: () -> "instance"
+        def to_s: () -> String
 
-        def level: () -> ::Array[0]
+        def level: () -> Array[Integer]
 
         def with_location: (untyped new_location) -> untyped
 

data/sig/steep/ast/types/intersection.rbs

@@ -2,33 +2,36 @@ module Steep
   module AST
     module Types
       class Intersection
-        attr_reader types: untyped
+        attr_reader types: Array[t]
 
         attr_reader location: untyped
 
-        def initialize: (types: untyped, ?location: untyped?) -> void
+        def initialize: (types: Array[t], ?location: untyped?) -> void
 
         def self.build: (types: Array[t], ?location: untyped?) -> t
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        @hash: Integer
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> untyped
+        def subst: (Interface::Substitution s) -> t
 
-        def to_s: () -> ::String
+        def to_s: () -> String
 
-        def free_variables: () -> untyped
+        @fvs: Set[variable]
+        def free_variables: () -> Set[variable]
 
         include Helper::ChildrenLevel
 
-        def each_child: () ?{ () -> untyped } -> untyped
+        def each_child: () { (t) -> void } -> void
+                      | () -> Enumerator[t, void]
 
-        def level: () -> untyped
+        def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Intersection
       end
     end
   end

data/sig/steep/ast/types/literal.rbs

@@ -4,9 +4,11 @@ module Steep
       class Literal
         attr_reader location: untyped
 
-        attr_reader value: untyped
+        type value = Integer | String | Symbol | TrueClass | FalseClass
 
-        def initialize: (value: untyped, ?location: untyped?) -> void
+        attr_reader value: value
+
+        def initialize: (value: value, ?location: untyped?) -> void
 
         def ==: (untyped other) -> bool
 
@@ -14,7 +16,7 @@ module Steep
 
         alias eql? ==
 
-        def subst: (Interface::Substitution s) -> self
+        def subst: (Interface::Substitution s) -> Literal
 
         def to_s: () -> String
 
@@ -24,7 +26,7 @@ module Steep
 
         def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> self
+        def with_location: (untyped new_location) -> Literal
 
         def back_type: () -> AST::Types::Name::Instance
       end

data/sig/steep/ast/types/logic.rbs

@@ -2,24 +2,24 @@ module Steep
   module AST
     module Types
       module Logic
-        type loc = RBS::Location[untyped, untyped]
-
         class Base
           attr_reader location: untyped
 
-          def subst: (untyped s) -> self
+          def subst: (Interface::Substitution s) -> self
 
-          def free_variables: () -> untyped
+          include Helper::NoFreeVariables
 
           include Helper::NoChild
 
-          def hash: () -> untyped
+          def hash: () -> Integer
 
-          def ==: (untyped other) -> untyped
+          def ==: (untyped other) -> bool
 
           alias eql? ==
 
-          def to_s: () -> ::String
+          def to_s: () -> String
+
+          def level: () -> Array[Integer]
         end
 
         # A type for `!` (not) operator results.
@@ -60,7 +60,7 @@ module Steep
 
           attr_reader type: t
 
-          def initialize: (truthy: TypeInference::TypeEnv, falsy: TypeInference::TypeEnv, type: t, ?location: loc?) -> void
+          def initialize: (truthy: TypeInference::TypeEnv, falsy: TypeInference::TypeEnv, type: t, ?location: untyped) -> void
 
           def ==: (untyped other) -> bool
 
@@ -68,7 +68,7 @@ module Steep
 
           def hash: () -> Integer
 
-          def inspect: () -> ::String
+          def inspect: () -> String
 
           alias to_s inspect
         end

data/sig/steep/ast/types/name.rbs

@@ -1,6 +1,8 @@
 module Steep
   module AST
     module Types
+      # Types with names
+      #
       module Name
         class Base
           attr_reader location: untyped
@@ -13,7 +15,7 @@ module Steep
 
           def subst: (Steep::Interface::Substitution s) -> self
 
-          def level: () -> ::Array[0]
+          def level: () -> Array[Integer]
         end
 
         class Applying < Base
@@ -25,22 +27,24 @@ module Steep
 
           alias eql? ==
 
+          @hash: Integer
           def hash: () -> Integer
 
           def to_s: () -> ::String
 
-          def with_location: (untyped new_location) -> untyped
+          def with_location: (untyped new_location) -> self
 
           def subst: (Steep::Interface::Substitution s) -> self
 
-          def free_variables: () -> Set[Symbol]
+          @fvs: Set[variable]
+          def free_variables: () -> Set[variable]
 
           def each_child: () { (t) -> void } -> void
                         | () -> Enumerator[t, void]
 
           include Helper::ChildrenLevel
 
-          def level: () -> untyped
+          def level: () -> Array[Integer]
         end
 
         class Singleton < Base
@@ -52,7 +56,7 @@ module Steep
 
           def to_s: () -> ::String
 
-          def with_location: (untyped new_location) -> untyped
+          def with_location: (untyped new_location) -> Singleton
 
           include Helper::NoChild
         end

data/sig/steep/ast/types/nil.rbs

@@ -6,25 +6,25 @@ module Steep
 
         def initialize: (?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (untyped s) -> self
+        def subst: (Interface::Substitution s) -> Nil
 
-        def to_s: () -> "nil"
+        def to_s: () -> String
 
         include Helper::NoFreeVariables
 
         include Helper::NoChild
 
-        def level: () -> ::Array[0]
+        def level: () -> Array[Integer]
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Nil
 
-        def back_type: () -> untyped
+        def back_type: () -> Name::Instance
       end
     end
   end