steep 1.3.0 → 1.4.0.dev.2

data/lib/steep/services/signature_service.rb

@@ -75,7 +75,7 @@ module Steep
         end
       end
 
-      FileStatus = _ = Struct.new(:path, :content, :decls, keyword_init: true)
+      FileStatus = _ = Struct.new(:path, :content, :signature, keyword_init: true)
 
       def initialize(env:)
         builder = RBS::DefinitionBuilder.new(env: env)
@@ -150,7 +150,7 @@ module Steep
       def apply_changes(files, changes)
         Steep.logger.tagged "#apply_changes" do
           Steep.measure2 "Applying change" do |sampler|
-            changes.each.with_object({}) do |pair, update|
+            changes.each.with_object({}) do |pair, update|  # $ Hash[Pathname, FileStatus]
               path, cs = pair
               sampler.sample "#{path}" do
                 old_text = files[path]&.content
@@ -158,17 +158,18 @@ module Steep
 
                 buffer = RBS::Buffer.new(name: path, content: content)
 
-                update[path] = begin
-                                 FileStatus.new(path: path, content: content, decls: RBS::Parser.parse_signature(buffer))
-                               rescue ArgumentError => exn
-                                 error = Diagnostic::Signature::UnexpectedError.new(
-                                   message: exn.message,
-                                   location: RBS::Location.new(buffer: buffer, start_pos: 0, end_pos: content.size)
-                                 )
-                                 FileStatus.new(path: path, content: content, decls: error)
-                               rescue RBS::ParsingError => exn
-                                 FileStatus.new(path: path, content: content, decls: exn)
-                               end
+                update[path] =
+                  begin
+                    FileStatus.new(path: path, content: content, signature: RBS::Parser.parse_signature(buffer))
+                  rescue ArgumentError => exn
+                    error = Diagnostic::Signature::UnexpectedError.new(
+                      message: exn.message,
+                      location: RBS::Location.new(buffer: buffer, start_pos: 0, end_pos: content.size)
+                    )
+                    FileStatus.new(path: path, content: content, signature: error)
+                  rescue RBS::ParsingError => exn
+                    FileStatus.new(path: path, content: content, signature: exn)
+                  end
               end
             end
           end
@@ -181,16 +182,16 @@ module Steep
           paths = Set.new(updates.each_key)
           paths.merge(pending_changed_paths)
 
-          if updates.each_value.any? {|file| !file.decls.is_a?(Array) }
-            diagnostics = []
+          if updates.each_value.any? {|file| !file.signature.is_a?(Array) }
+            diagnostics = [] #: Array[Diagnostic::Signature::Base]
 
             updates.each_value do |file|
-              unless file.decls.is_a?(Array)
-                diagnostic = if file.decls.is_a?(Diagnostic::Signature::Base)
-                               file.decls
+              unless file.signature.is_a?(Array)
+                diagnostic = if file.signature.is_a?(Diagnostic::Signature::Base)
+                               file.signature
                              else
                                # factory is not used here because the error is a syntax error.
-                               Diagnostic::Signature.from_rbs_error(file.decls, factory: _ = nil)
+                               Diagnostic::Signature.from_rbs_error(file.signature, factory: _ = nil)
                              end
                 diagnostics << diagnostic
               end
@@ -204,9 +205,7 @@ module Steep
             )
           else
             files = self.files.merge(updates)
-            updated_files = paths.each_with_object({}) do |path, hash|
-              hash[path] = files[path]
-            end
+            updated_files = files.slice(*paths.to_a)
             result =
               Steep.measure "#update_env with updated #{paths.size} files" do
                 update_env(updated_files, paths: paths)
@@ -229,33 +228,29 @@ module Steep
       end
 
       def update_env(updated_files, paths:)
+
         Steep.logger.tagged "#update_env" do
-          # @type var errors: Array[RBS::BaseError]
-          errors = []
-          new_decls = Set[].compare_by_identity
+          errors = [] #: Array[RBS::BaseError]
+          new_decls = Set[].compare_by_identity #: Set[RBS::AST::Declarations::t]
 
           env =
             Steep.measure "Deleting out of date decls" do
-              latest_env.reject do |decl|
-                if decl.location
-                  paths.include?(decl.location.buffer.name)
-                end
-              end
+              bufs = latest_env.buffers.select {|buf| paths.include?(buf.name) }
+              latest_env.unload(Set.new(bufs))
             end
 
           Steep.measure "Loading new decls" do
             updated_files.each_value do |content|
-              case decls = content.decls
-              when RBS::BaseError
-                errors << decls
+              case content.signature
+              when RBS::ParsingError
+                errors << content.signature
               when Diagnostic::Signature::UnexpectedError
-                return [decls]
+                return [content.signature]
               else
                 begin
-                  decls.each do |decl|
-                    env << decl
-                    new_decls << decl
-                  end
+                  buffer, dirs, decls = content.signature
+                  env.add_signature(buffer: buffer, directives: dirs, decls: decls)
+                  new_decls.merge(decls)
                 rescue RBS::LoadingError => exn
                   errors << exn
                 end
@@ -375,8 +370,10 @@ module Steep
               type_name_from_decl(member, set: set)
             end
           end
-        when RBS::AST::Declarations::Alias
+        when RBS::AST::Declarations::TypeAlias
           set << decl.name
+        when RBS::AST::Declarations::ClassAlias, RBS::AST::Declarations::ModuleAlias
+          set << decl.new_name
         end
       end
 

data/lib/steep/signature/validator.rb

@@ -36,7 +36,7 @@ module Steep
       end
 
       def type_name_resolver
-        @type_name_resolver ||= RBS::TypeNameResolver.from_env(env)
+        @type_name_resolver ||= RBS::Resolver::TypeNameResolver.new(env)
       end
 
       def validator
@@ -112,7 +112,7 @@ module Steep
               type.args
             ]
           when RBS::Types::Alias
-            entry = env.alias_decls[type.name]
+            entry = env.type_alias_decls[type.name]
 
             [
               type.name,
@@ -135,7 +135,7 @@ module Steep
       def validate_type(type)
         Steep.logger.debug "#{Location.to_string type.location}: Validating #{type}..."
 
-        validator.validate_type type, context: [RBS::Namespace.root]
+        validator.validate_type(type, context: nil)
         validate_type_application(type)
       end
 
@@ -235,7 +235,7 @@ module Steep
         end
       end
 
-      def validate_one_class(name)
+      def validate_one_class_decl(name)
         rescue_validation_errors(name) do
           Steep.logger.debug { "Validating class definition `#{name}`..." }
 
@@ -390,6 +390,17 @@ module Steep
         end
       end
 
+      def validate_one_class(name)
+        entry = env.constant_entry(name)
+
+        case entry
+        when RBS::Environment::ClassEntry, RBS::Environment::ModuleEntry
+          validate_one_class_decl(name)
+        when RBS::Environment::ClassAliasEntry, RBS::Environment::ModuleAliasEntry
+          validate_one_class_alias(name, entry)
+        end
+      end
+
       def validate_ancestor_application(name, ancestor)
         unless ancestor.args.empty?
           definition =
@@ -465,6 +476,10 @@ module Steep
           validate_one_class(name)
         end
 
+        env.class_alias_decls.each do |name, entry|
+          validate_one_class_alias(name, entry)
+        end
+
         env.interface_decls.each_key do |name|
           validate_one_interface(name)
         end
@@ -497,7 +512,7 @@ module Steep
         end
       end
 
-      def validate_one_alias(name, entry = env.alias_decls[name])
+      def validate_one_alias(name, entry = env.type_alias_decls[name])
         rescue_validation_errors(name) do
           Steep.logger.debug "Validating alias `#{name}`..."
           upper_bounds = entry.decl.type_params.each.with_object({}) do |param, bounds|
@@ -512,8 +527,15 @@ module Steep
         end
       end
 
+      def validate_one_class_alias(name, entry)
+        rescue_validation_errors(name) do
+          Steep.logger.debug "Validating class/module alias `#{name}`..."
+          validator.validate_class_alias(entry: entry)
+        end
+      end
+
       def validate_alias
-        env.alias_decls.each do |name, entry|
+        env.type_alias_decls.each do |name, entry|
           validate_one_alias(name, entry)
         end
       end

data/lib/steep/subtyping/check.rb

@@ -619,7 +619,7 @@ module Steep
           return true
         end
 
-        relation.sub_type == relation.super_type
+        builder.factory.normalize_type(relation.sub_type) == builder.factory.normalize_type(relation.super_type)
       end
 
       def check_interface(relation)

data/lib/steep/type_construction.rb

@@ -135,8 +135,8 @@ module Steep
         checker.check(
           relation,
           self_type: self_type,
-          instance_type: module_context.instance_type,
-          class_type: module_context.module_type,
+          instance_type: module_context!.instance_type,
+          class_type: module_context!.module_type,
           constraints: constraints
         )
       end
@@ -295,10 +295,12 @@ module Steep
       else
         name = module_name || super_name
 
-        if name && entry = checker.factory.env.class_decls[name]
+        if name && checker.factory.env.module_name?(name)
+          definition = checker.factory.definition_builder.build_instance(name)
+
           AST::Annotation::Implements::Module.new(
             name: name,
-            args: entry.type_params.each.map(&:name)
+            args: definition.type_params
           )
         end
       end
@@ -338,7 +340,7 @@ module Steep
     end
 
     def for_module(node, new_module_name)
-      new_nesting = [nesting, new_module_name || false]
+      new_nesting = [nesting, new_module_name || false] #: RBS::Resolver::context
 
       annots = source.annotations(block: node, factory: checker.factory, context: new_nesting)
 
@@ -353,9 +355,7 @@ module Steep
       end
 
       if implement_module_name
-        module_entry = checker.factory.definition_builder.env.class_decls[implement_module_name.name]
-
-        raise unless module_entry.is_a?(RBS::Environment::ModuleEntry)
+        module_entry = checker.factory.definition_builder.env.normalized_module_entry(implement_module_name.name) or raise
 
         module_context = module_context.update(
           instance_type: AST::Types::Intersection.build(
@@ -566,10 +566,10 @@ module Steep
                     when AST::Types::Name::Singleton
                       type_name = instance_type.name
 
-                      case checker.factory.env.class_decls[type_name]
-                      when RBS::Environment::ModuleEntry
+                      case checker.factory.env.constant_entry(type_name)
+                      when RBS::Environment::ModuleEntry, RBS::Environment::ModuleAliasEntry
                         AST::Builtin::Module.instance_type
-                      when RBS::Environment::ClassEntry
+                      when RBS::Environment::ClassEntry, RBS::Environment::ClassAliasEntry
                         AST::Builtin::Class.instance_type
                       else
                         raise
@@ -2399,7 +2399,7 @@ module Steep
             if type = as_type.type?(module_context!.nesting, checker.factory, [])
               actual_type, constr = synthesize(asserted_node, hint: type)
 
-              if result = no_subtyping?(sub_type: type, super_type: actual_type)
+              if no_subtyping?(sub_type: type, super_type: actual_type) && no_subtyping?(sub_type: actual_type, super_type: type)
                 typing.add_error(
                   Diagnostic::Ruby::FalseAssertion.new(
                     node: node,
@@ -4098,7 +4098,8 @@ module Steep
 
     def validate_method_definitions(node, module_name)
       module_name_1 = module_name.name
-      member_decl_count = checker.factory.env.class_decls[module_name_1].decls.count {|d| d.decl.each_member.count > 0 }
+      module_entry = checker.factory.env.normalized_module_class_entry(module_name_1) or raise
+      member_decl_count = module_entry.decls.count {|d| d.decl.each_member.count > 0 }
 
       return unless member_decl_count == 1
 
@@ -4267,7 +4268,8 @@ module Steep
     def to_instance_type(type, args: nil)
       args = args || case type
                      when AST::Types::Name::Singleton
-                       checker.factory.env.class_decls[type.name].type_params.each.map { AST::Builtin.any_type }
+                       decl = checker.factory.env.normalized_module_class_entry(type.name) or raise
+                       decl.type_params.each.map { AST::Builtin.any_type }
                      else
                        raise "unexpected type to to_instance_type: #{type}"
                      end

data/lib/steep/type_inference/constant_env.rb

@@ -6,7 +6,6 @@ module Steep
       attr_reader :resolver
 
       def initialize(factory:, context:, resolver:)
-        @cache = {}
         @factory = factory
         @context = context
         @resolver = resolver
@@ -25,7 +24,8 @@ module Steep
       end
 
       def constants
-        resolver.constants(context).transform_values {|c| decompose_constant(c) }
+        cs = resolver.constants(context) or raise
+        cs.transform_values {|c| decompose_constant!(c) }
       end
 
       def resolve_child(module_name, constant_name)
@@ -35,7 +35,11 @@ module Steep
       end
 
       def children(module_name)
-        resolver.children(module_name).transform_values {|c| decompose_constant(c) }
+        resolver.children(module_name).transform_values {|c| decompose_constant!(c) }
+      end
+
+      def decompose_constant!(constant)
+        decompose_constant(constant) || raise
       end
 
       def decompose_constant(constant)

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.3.0"
+  VERSION = "1.4.0.dev.2"
 end

data/rbs_collection.steep.lock.yaml

@@ -1,29 +1,18 @@
 ---
 sources:
-- name: ruby/gem_rbs_collection
+- type: git
+  name: ruby/gem_rbs_collection
+  revision: c42c09528dd99252db98f0744181a6de54ec2f55
   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
-  source:
-    type: rubygems
-- name: dbm
-  version: '0'
-  source:
-    type: stdlib
 - name: activesupport
-  version: '6.0'
+  version: '7.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -31,23 +20,43 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: concurrent-ruby
+  version: '1.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     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: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: json
@@ -59,7 +68,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: logger
@@ -70,51 +79,43 @@ 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: c42c09528dd99252db98f0744181a6de54ec2f55
     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: c42c09528dd99252db98f0744181a6de54ec2f55
     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'
-  source:
-    type: stdlib
-- name: rdoc
-  version: '0'
-  source:
-    type: stdlib
-- name: monitor
-  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,8 +131,4 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: forwardable
-  version: '0'
-  source:
-    type: stdlib
 gemfile_lock_path: Gemfile.steep.lock

data/rbs_collection.steep.yaml

@@ -2,7 +2,7 @@
 sources:
   - name: ruby/gem_rbs_collection
     remote: https://github.com/ruby/gem_rbs_collection.git
-    revision: main
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     repo_dir: gems
 
 # A directory to install the downloaded RBSs
@@ -15,6 +15,8 @@ gems:
     ignore: true
   - name: set
   - name: rbs
+    ignore: true
   - name: with_steep_types
     ignore: true
   - name: dbm
+  - name: optparse

data/sample/lib/conference.rb

@@ -10,3 +10,13 @@ class Conference
 end
 
 Conference.new()
+
+
+Konference
+
+Konference.new()
+
+
+# @type var foo: Konference
+
+foo = Conference.new

data/sample/sig/conference.rbs

@@ -1,3 +1,5 @@
+use Object as Foo
+
 class Conference
   attr_reader title: String
   attr_reader year: Integer
@@ -12,3 +14,24 @@ end
 class Object
   def must: () -> self
 end
+
+# Test data
+class Konference = Conference
+
+class Allay = ::Array
+
+module Hoge = Bazzz
+
+module Bazzz = Hoge
+
+class Foo < Konference
+  class OBH = String
+
+  type a = Integer
+end
+
+type foo = [Conference, Konference]
+
+
+type b = ::Foo::OBH
+

data/sig/steep/annotation_parser.rbs

@@ -19,7 +19,8 @@ module Steep
 
       attr_reader location: RBS::Location[untyped, untyped]
 
-      def initialize: (source: String, location: RBS::Location[untyped, untyped], ?exn: Exception?) -> void
+      def initialize: (source: String, location: RBS::Location[untyped, untyped], exn: Exception) -> void
+                    | (source: String, location: RBS::Location[untyped, untyped], message: String) -> void
     end
 
     TYPE: Regexp
@@ -30,7 +31,7 @@ module Steep
 
     TYPE_PARAMS: Regexp
 
-    def parse_type: (String) -> AST::Types::t
+    def parse_type: (MatchData, ?Symbol, location: RBS::Location[untyped, untyped]) -> AST::Types::t
 
     # ```
     # @type ${keyword} ${name}: ${type}

data/sig/steep/ast/annotation/collection.rbs

@@ -26,7 +26,7 @@ module Steep
 
         attr_reader module_type_annotation: untyped
 
-        attr_reader implement_module_annotation: untyped
+        attr_reader implement_module_annotation: Implements?
 
         attr_reader dynamic_annotations: untyped
 

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

@@ -74,6 +74,8 @@ module Steep
         def try_singleton_type: (t) -> t?
 
         def try_instance_type: (t) -> t?
+
+        def normalize_type: (t) -> t
       end
     end
   end

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

@@ -16,6 +16,8 @@ module Steep
           def subst: (Steep::Interface::Substitution s) -> self
 
           def level: () -> Array[Integer]
+
+          def map_type: () { (t) -> t } -> self
         end
 
         class Applying < Base
@@ -45,6 +47,8 @@ module Steep
           include Helper::ChildrenLevel
 
           def level: () -> Array[Integer]
+
+          def map_type: () { (t) -> t } -> self
         end
 
         class Singleton < Base