steep 1.3.0.pre.1 → 1.3.0

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

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

@@ -2,15 +2,13 @@ module Steep
   module AST
     module Types
       class Record
-        type loc = RBS::Location[untyped, untyped]
-
         type key = Symbol | String | Integer
 
-        attr_reader location: loc?
+        attr_reader location: untyped
 
         attr_reader elements: Hash[key, t]
 
-        def initialize: (elements: Hash[key, t], ?location: loc?) -> void
+        def initialize: (elements: Hash[key, t], ?location: untyped) -> void
 
         def ==: (untyped other) -> bool
 
@@ -18,20 +16,21 @@ module Steep
 
         alias eql? ==
 
-        def subst: (Interface::Substitution s) -> self
+        def subst: (Interface::Substitution s) -> Record
 
-        def to_s: () -> ::String
+        def to_s: () -> String
 
-        def free_variables: () -> Set[Symbol]
+        @fvs: Set[variable]
+        def free_variables: () -> Set[variable]
 
         include Helper::ChildrenLevel
 
         def each_child: () { (t) -> void } -> void
                       | () -> Enumerator[t, void]
 
-        def level: () -> Integer
+        def level: () -> Array[Integer]
 
-        def with_location: (loc new_location) -> self
+        def with_location: (untyped new_location) -> Record
       end
     end
   end

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

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

data/sig/steep/ast/types/top.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) -> Top
 
-        def to_s: () -> "top"
+        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) -> Top
       end
     end
   end

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

@@ -4,9 +4,9 @@ module Steep
       class Tuple
         attr_reader types: Array[t]
 
-        attr_reader location: RBS::Location[untyped, untyped]?
+        attr_reader location: untyped
 
-        def initialize: (types: Array[t], ?location: RBS::Location[untyped, untyped]?) -> void
+        def initialize: (types: Array[t], ?location: untyped) -> void
 
         def ==: (untyped other) -> bool
 
@@ -18,16 +18,17 @@ module Steep
 
         def to_s: () -> ::String
 
-        def free_variables: () -> Set[Symbol]
+        @fvs: Set[variable]
+        def free_variables: () -> Set[variable]
 
         include Helper::ChildrenLevel
 
         def each_child: () { (t) -> void } -> void
                       | () -> Enumerator[t, void]
 
-        def level: () -> untyped
+        def level: () -> Array[Integer]
 
-        def with_location: (RBS::Location[untyped, untyped] new_location) -> Tuple
+        def with_location: (untyped new_location) -> Tuple
       end
     end
   end

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

@@ -4,34 +4,34 @@ module Steep
       class Union
         attr_reader types: Array[t]
 
-        type loc = RBS::Location[untyped, untyped]
+        attr_reader location: untyped
 
-        attr_reader location: loc?
+        def initialize: (types: Array[t], ?location: untyped) -> void
 
-        def initialize: (types: Array[t], ?location: loc?) -> void
-
-        def self.build: (types: Array[t], ?location: loc?) -> t
+        def self.build: (types: Array[t], ?location: untyped) -> t
 
         def ==: (untyped other) -> bool
 
+        @hash: Integer
         def hash: () -> Integer
 
         alias eql? ==
 
-        def subst: (Interface::Substitution s) -> Union
+        def subst: (Interface::Substitution s) -> t
 
         def to_s: () -> ::String
 
-        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: () -> Integer
+        def level: () -> Array[Integer]
 
-        def with_location: (loc new_location) -> Union
+        def with_location: (untyped new_location) -> Union
       end
     end
   end

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

@@ -1,36 +1,41 @@
 module Steep
   module AST
     module Types
+      # Type variables
       class Var
-        attr_reader name: untyped
+        attr_reader name: Symbol
 
         attr_reader location: untyped
 
-        def initialize: (name: untyped, ?location: untyped?) -> void
+        def initialize: (name: Symbol, ?location: untyped?) -> void
 
-        def ==: (untyped other) -> untyped
+        def ==: (untyped other) -> bool
 
-        def hash: () -> untyped
+        def hash: () -> Integer
 
         alias eql? ==
 
-        def self.fresh_name: (untyped name) -> untyped
+        self.@mutex: Thread::Mutex
+        self.@max: Integer
+
+        def self.fresh_name: (Symbol name) -> Symbol
 
         def self.fresh: (Symbol name, ?location: untyped?) -> Var
 
-        def to_s: () -> untyped
+        def to_s: () -> String
 
-        def subst: (untyped s) -> (untyped | self)
+        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 update: (?name: untyped, ?location: untyped) -> untyped
+        def update: (?name: Symbol, ?location: untyped) -> Var
 
-        def with_location: (untyped new_location) -> untyped
+        def with_location: (untyped new_location) -> Var
       end
     end
   end

data/sig/steep/ast/types/void.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) -> Void
 
-        def to_s: () -> "void"
+        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) -> Void
       end
     end
   end

data/sig/steep/ast/types.rbs

@@ -5,33 +5,12 @@ module Steep
            | Class | Instance | Self
            | Intersection  | Record | Tuple | Union
            | Name::Alias | Name::Instance | Name::Interface | Name::Singleton
-           | Proc | Var | Logic::Base
+           | Proc | Var
+           | Logic::Not | Logic::ReceiverIsNil | Logic::ReceiverIsNotNil | Logic::ReceiverIsArg | Logic::ArgIsReceiver | Logic::ArgEqualsReceiver | Logic::Env
 
-      class Masked
-        attr_reader location: untyped
-
-        attr_reader type: untyped
-
-        attr_reader mask: untyped
-
-        def initialize: (type: untyped, mask: untyped, location: untyped) -> void
-
-        def ==: (untyped other) -> untyped
-
-        alias eql? ==
-
-        def hash: () -> untyped
-
-        def to_json: (*untyped a) -> untyped
-
-        def to_s: (?::Integer level) -> ::String
-
-        def free_variables: () -> untyped
-
-        def each_type: () { (untyped) -> untyped } -> untyped
-
-        def sub: (untyped s) -> untyped
-      end
+      # Variables and special types that is subject for substitution
+      #
+      type variable = Symbol | Class | Instance | Self
     end
   end
 end

data/sig/steep/drivers/utils/jobs_option.rbs

@@ -15,8 +15,6 @@ module Steep
         def default_jobs_count: () -> Integer
 
         def jobs_count_value: () -> Integer
-
-        def steep_command_value: () -> String
       end
     end
   end

data/sig/steep/interface/substitution.rbs

@@ -2,28 +2,28 @@ module Steep
   module Interface
     class Substitution
       class InvalidSubstitutionError < StandardError
-        attr_reader vars_size: untyped
+        attr_reader vars_size: Integer
 
-        attr_reader types_size: untyped
+        attr_reader types_size: Integer
 
-        def initialize: (vars_size: untyped, types_size: untyped) -> void
+        def initialize: (vars_size: Integer, types_size: Integer) -> void
       end
 
       attr_reader dictionary: Hash[Symbol, AST::Types::t]
 
-      attr_reader instance_type: AST::Types::t
+      attr_reader instance_type: AST::Types::t?
 
-      attr_reader module_type: AST::Types::t
+      attr_reader module_type: AST::Types::t?
 
-      attr_reader self_type: AST::Types::t
+      attr_reader self_type: AST::Types::t?
 
-      def initialize: (dictionary: Hash[Symbol, AST::Types::t], instance_type: AST::Types::t, module_type: AST::Types::t, self_type: AST::Types::t) -> void
+      def initialize: (dictionary: Hash[Symbol, AST::Types::t], instance_type: AST::Types::t?, module_type: AST::Types::t?, self_type: AST::Types::t?) -> void
 
       def self.empty: () -> instance
 
       def empty?: () -> bool
 
-      def domain: () -> Set[AST::Types::t | Symbol]
+      def domain: () -> Set[AST::Types::variable]
 
       def to_s: () -> ::String
 
@@ -31,7 +31,7 @@ module Steep
 
       def key?: (Symbol var) -> bool
 
-      def self.build: (Array[Symbol] vars, ?Array[AST::Types::t]? types, ?instance_type: AST::Types::t, ?module_type: AST::Types::t, ?self_type: AST::Types::t) -> Substitution
+      def self.build: (Array[Symbol] vars, ?Array[AST::Types::t]? types, ?instance_type: AST::Types::t?, ?module_type: AST::Types::t?, ?self_type: AST::Types::t?) -> Substitution
 
       def except: (Array[Symbol] vars) -> Substitution
 

data/sig/steep/server/worker_process.rbs

@@ -48,7 +48,7 @@ module Steep
         worker_type `type`,
         name: String,
         steepfile: Pathname,
-        ?steep_command: ::String,
+        steep_command: String?,
         ?patterns: Array[String],
         ?delay_shutdown: bool,
         ?index: [Integer, Integer]?
@@ -76,7 +76,7 @@ module Steep
       def self.start_typecheck_workers: (
         steepfile: Pathname,
         args: Array[String],
-        ?steep_command: ::String,
+        steep_command: ::String?,
         ?count: Integer,
         ?delay_shutdown: bool
       ) -> Array[WorkerProcess]

data/sig/steep/services/signature_service.rbs

@@ -16,9 +16,13 @@ module Steep
 
         @rbs_index: Index::RBSIndex?
 
+        @constant_resolver: RBS::Resolver::ConstantResolver?
+
         def initialize: (files: Hash[Pathname, FileStatus], changed_paths: Set[Pathname], diagnostics: Array[Diagnostic::Signature::Base], last_builder: RBS::DefinitionBuilder) -> void
 
         def rbs_index: () -> Index::RBSIndex
+
+        def constant_resolver: () -> RBS::Resolver::ConstantResolver
       end
 
       class AncestorErrorStatus
@@ -32,9 +36,13 @@ module Steep
 
         @rbs_index: Index::RBSIndex?
 
+        @constant_resolver: RBS::Resolver::ConstantResolver?
+
         def initialize: (files: Hash[Pathname, FileStatus], changed_paths: Set[Pathname], diagnostics: Array[Diagnostic::Signature::Base], last_builder: RBS::DefinitionBuilder) -> void
 
         def rbs_index: () -> Index::RBSIndex
+
+        def constant_resolver: () -> RBS::Resolver::ConstantResolver
       end
 
       class LoadedStatus
@@ -46,11 +54,15 @@ module Steep
 
         @subtyping: Subtyping::Check?
 
+        @constant_resolver: RBS::Resolver::ConstantResolver?
+
         def initialize: (files: Hash[Pathname, FileStatus], builder: RBS::DefinitionBuilder) -> void
 
         def subtyping: () -> Subtyping::Check
 
         def rbs_index: () -> Index::RBSIndex
+
+        def constant_resolver: () -> RBS::Resolver::ConstantResolver
       end
 
       class FileStatus
@@ -88,6 +100,8 @@ module Steep
 
       def latest_rbs_index: () -> Index::RBSIndex
 
+      def latest_constant_resolver: () -> RBS::Resolver::ConstantResolver
+
       def current_subtyping: () -> Subtyping::Check?
 
       def apply_changes: (Hash[Pathname, FileStatus] files, Server::ChangeBuffer::changes changes) -> Hash[Pathname, FileStatus]

data/sig/steep/services/type_check_service.rbs

@@ -91,9 +91,9 @@ module Steep
 
       def update_sources: (changes: Server::ChangeBuffer::changes, requests: Hash[Project::Target, TargetRequest]) -> void
 
-      def type_check_file: (target: Project::Target, subtyping: Subtyping::Check, path: Pathname, text: String) -> SourceFile
+      def type_check_file: (target: Project::Target, subtyping: Subtyping::Check, path: Pathname, text: String) { () -> RBS::Resolver::ConstantResolver } -> SourceFile
 
-      def self.type_check: (source: Source, subtyping: Subtyping::Check) -> Typing
+      def self.type_check: (source: Source, subtyping: Subtyping::Check, constant_resolver: RBS::Resolver::ConstantResolver) -> Typing
 
       def source_file?: (Pathname path) -> Project::Target?
 

data/sig/steep.rbs

@@ -1,4 +1,6 @@
 module Steep
+  VERSION: String
+
   def self.logger: () -> (Logger & ActiveSupport::TaggedLogging)
 
   def self.new_logger: (untyped output, untyped prev_level) -> untyped

data/steep.gemspec

@@ -33,7 +33,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", ">= 2.8.0.pre"
+  spec.add_runtime_dependency "rbs", ">= 2.8.0"
   spec.add_runtime_dependency "parallel", ">= 1.0.0"
   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.3.0.pre.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0.pre
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0.pre
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,6 @@ files:
 - lib/steep/ast/node/type_application.rb
 - lib/steep/ast/node/type_assertion.rb
 - lib/steep/ast/type_params.rb
-- lib/steep/ast/types.rb
 - lib/steep/ast/types/any.rb
 - lib/steep/ast/types/boolean.rb
 - lib/steep/ast/types/bot.rb
@@ -764,9 +763,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key:

data/lib/steep/ast/types.rb

@@ -1,62 +0,0 @@
-module Steep
-  module AST
-    module Types
-      class Masked
-        attr_reader :location
-        attr_reader :type
-        attr_reader :mask
-
-        def initialize(type:, mask:, location:)
-          @type = type
-          @mask = mask
-          @location = location
-        end
-
-        def ==(other)
-          other.is_a?(Masked) &&
-            other.type == type &&
-            other.mask == mask
-        end
-
-        alias eql? ==
-
-        def hash
-          self.class.hash ^ type.hash ^ mask.hash
-        end
-
-        def to_json(*a)
-          { class: :masked,
-            type: type,
-            mask: mask,
-            location: location }.to_json(*a)
-        end
-
-        def to_s(level = 0)
-          "masked(#{type}|#{mask})"
-        end
-
-        def free_variables
-          @fvs ||= Set.new.tap do |set|
-            set.merge(type.free_variables)
-            set.merge(mask.free_variables)
-          end
-        end
-
-        def each_type(&block)
-          if block_given?
-            yield type
-            yield mask
-          else
-            enum_for :each_type
-          end
-        end
-
-        def sub(s)
-          self.class.new(type: type.sub(s),
-                         mask: mask.sub(s),
-                         location: location)
-        end
-      end
-    end
-  end
-end