steep 1.3.0.pre.2 → 1.4.0.dev.1

data/lib/steep/project/options.rb

@@ -1,7 +1,9 @@
 module Steep
   class Project
     class Options
-      PathOptions = Struct.new(:core_root, :stdlib_root, :repo_paths, keyword_init: true) do
+      PathOptions = _ = Struct.new(:core_root, :stdlib_root, :repo_paths, keyword_init: true) do
+        # @implements PathOptions
+        
         def customized_stdlib?
           stdlib_root != nil
         end

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_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.2"
+  VERSION = "1.4.0.dev.1"
 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

@@ -1,29 +1,18 @@
 ---
 sources:
-- name: ruby/gem_rbs_collection
+- type: git
+  name: ruby/gem_rbs_collection
+  revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
   remote: https://github.com/ruby/gem_rbs_collection.git
-  revision: main
   repo_dir: gems
 path: ".gem_rbs_collection"
 gems:
-- name: set
-  version: '0'
-  source:
-    type: stdlib
-- name: rbs
-  version: 2.8.0.pre.1
-  source:
-    type: rubygems
-- name: dbm
-  version: '0'
-  source:
-    type: stdlib
 - name: activesupport
   version: '6.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -31,23 +20,35 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: csv
   version: '0'
   source:
     type: stdlib
+- name: date
+  version: '0'
+  source:
+    type: stdlib
+- name: dbm
+  version: '0'
+  source:
+    type: stdlib
 - name: fileutils
   version: '0'
   source:
     type: stdlib
+- name: forwardable
+  version: '0'
+  source:
+    type: stdlib
 - name: i18n
   version: '1.10'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: json
@@ -59,7 +60,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: logger
@@ -70,51 +71,51 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: monitor
+  version: '0'
+  source:
+    type: stdlib
+- name: mutex_m
+  version: '0'
+  source:
+    type: stdlib
+- name: optparse
+  version: '0'
+  source:
+    type: stdlib
 - name: parallel
   version: '1.20'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: pathname
+  version: '0'
+  source:
+    type: stdlib
 - name: rainbow
   version: '3.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
-- name: securerandom
-  version: '0'
-  source:
-    type: stdlib
-- name: strscan
-  version: '0'
-  source:
-    type: stdlib
-- name: pathname
-  version: '0'
-  source:
-    type: stdlib
-- name: optparse
-  version: '0'
-  source:
-    type: stdlib
-- name: tsort
-  version: '0'
+- name: rbs
+  version: 3.0.0.dev.1
   source:
-    type: stdlib
+    type: rubygems
 - name: rdoc
   version: '0'
   source:
     type: stdlib
-- name: monitor
+- name: securerandom
   version: '0'
   source:
     type: stdlib
-- name: date
+- name: set
   version: '0'
   source:
     type: stdlib
@@ -122,7 +123,7 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: mutex_m
+- name: strscan
   version: '0'
   source:
     type: stdlib
@@ -130,7 +131,7 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: forwardable
+- name: tsort
   version: '0'
   source:
     type: stdlib

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,15 +6,15 @@ 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
 
@@ -22,7 +22,7 @@ module Steep
 
         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,15 +6,15 @@ 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
 
@@ -22,9 +22,9 @@ module Steep
 
         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,15 +6,15 @@ 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
 
@@ -22,7 +22,7 @@ module Steep
 
         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[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

@@ -7,9 +7,9 @@ module Steep
         end
 
         module NoFreeVariables
-          @fvs: Set[Symbol]
+          @fvs: Set[variable]
 
-          def free_variables: () -> Set[Symbol]
+          def free_variables: () -> Set[variable]
         end
 
         module NoChild

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

@@ -6,19 +6,20 @@ 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[Integer]
 

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: () -> 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,22 @@ 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
@@ -62,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
 
@@ -70,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
@@ -25,15 +27,17 @@ 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]
@@ -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,15 +6,15 @@ 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
 
@@ -22,9 +22,9 @@ module Steep
 
         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

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

@@ -22,18 +22,23 @@ module Steep
 
         def to_s: () -> ::String
 
-        def free_variables: () -> Set[Symbol]
+        @fvs: Set[variable]
+        def free_variables: () -> Set[variable]
 
         include Helper::ChildrenLevel
 
         def level: () -> Array[Integer]
 
-        def closed?: () -> bool
-
         def with_location: (untyped new_location) -> Proc
 
         def map_type: () { (AST::Types::t) -> AST::Types::t } -> Proc
 
+        # Returns true if the proc requires exactly one argument
+        #
+        # * One required argument,
+        # * No optional/rest argument, and
+        # * No keywords
+        #
         def one_arg?: () -> bool
 
         def back_type: () -> AST::Types::t