steep 1.4.0.dev.1 → 1.4.0.dev.2

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

data/rbs_collection.steep.lock.yaml

@@ -2,17 +2,17 @@
 sources:
 - type: git
   name: ruby/gem_rbs_collection
-  revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
+  revision: c42c09528dd99252db98f0744181a6de54ec2f55
   remote: https://github.com/ruby/gem_rbs_collection.git
   repo_dir: gems
 path: ".gem_rbs_collection"
 gems:
 - name: activesupport
-  version: '6.0'
+  version: '7.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -20,7 +20,15 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
+    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
@@ -48,7 +56,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: json
@@ -60,7 +68,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: logger
@@ -88,7 +96,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: pathname
@@ -100,17 +108,9 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
+    revision: c42c09528dd99252db98f0744181a6de54ec2f55
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
-- name: rbs
-  version: 3.0.0.dev.1
-  source:
-    type: rubygems
-- name: rdoc
-  version: '0'
-  source:
-    type: stdlib
 - name: securerandom
   version: '0'
   source:
@@ -131,8 +131,4 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: tsort
-  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

data/sig/steep/diagnostic/signature.rbs

@@ -146,23 +146,11 @@ module Steep
       class ModuleSelfTypeError < Base
         attr_reader name: RBS::TypeName
 
-        attr_reader ancestor: RBS::DefinitionBuilder::AncestorBuilder::OneAncestors
+        attr_reader ancestor: RBS::Definition::Ancestor::Instance
 
         attr_reader relation: Subtyping::Relation[AST::Types::t]
 
-        def initialize: (name: RBS::TypeName, ancestor: RBS::DefinitionBuilder::AncestorBuilder::OneAncestors, relation: Subtyping::Relation[AST::Types::t], location: location?) -> void
-
-        def header_line: () -> String
-      end
-
-      class ClassVariableDuplicationError < Base
-        attr_reader class_name: RBS::TypeName
-
-        attr_reader other_class_name: RBS::TypeName
-
-        attr_reader variable_name: Symbol
-
-        def initialize: (class_name: RBS::TypeName, other_class_name: RBS::TypeName, variable_name: Symbol, location: RBS::Location[untyped, untyped]) -> void
+        def initialize: (name: RBS::TypeName, ancestor: RBS::Definition::Ancestor::Instance, relation: Subtyping::Relation[AST::Types::t], location: location?) -> void
 
         def header_line: () -> String
       end
@@ -242,6 +230,22 @@ module Steep
         def header_line: () -> String
       end
 
+      class InconsistentClassModuleAliasError < Base
+        attr_reader decl: RBS::AST::Declarations::ModuleAlias | RBS::AST::Declarations::ClassAlias
+
+        def initialize: (decl: RBS::AST::Declarations::ModuleAlias | RBS::AST::Declarations::ClassAlias) -> void
+
+        def header_line: () -> String
+      end
+
+      class CyclicClassAliasDefinitionError < Base
+        attr_reader decl: RBS::AST::Declarations::ModuleAlias | RBS::AST::Declarations::ClassAlias
+
+        def initialize: (decl: RBS::AST::Declarations::ModuleAlias | RBS::AST::Declarations::ClassAlias) -> void
+
+        def header_line: () -> String
+      end
+
       def self.from_rbs_error: (RBS::BaseError error, factory: AST::Types::Factory) -> Base
     end
   end

data/sig/steep/index/rbs_index.rbs

@@ -7,7 +7,9 @@ module Steep
         type decl = RBS::AST::Declarations::Class
                   | RBS::AST::Declarations::Module
                   | RBS::AST::Declarations::Interface
-                  | RBS::AST::Declarations::Alias
+                  | RBS::AST::Declarations::TypeAlias
+                  | RBS::AST::Declarations::ClassAlias
+                  | RBS::AST::Declarations::ModuleAlias
 
         type ref = RBS::AST::Members::MethodDefinition
                  | RBS::AST::Members::AttrWriter
@@ -22,7 +24,9 @@ module Steep
                  | RBS::AST::Declarations::Class
                  | RBS::AST::Declarations::Constant
                  | RBS::AST::Declarations::Global
-                 | RBS::AST::Declarations::Alias
+                 | RBS::AST::Declarations::TypeAlias
+                 | RBS::AST::Declarations::ClassAlias
+                 | RBS::AST::Declarations::ModuleAlias
 
         attr_reader declarations: Set[decl]
 

data/sig/steep/project/target.rbs

@@ -1,9 +1,9 @@
 module Steep
   class Project
     class Target
-      attr_reader name: untyped
+      attr_reader name: Symbol
 
-      attr_reader options: untyped
+      attr_reader options: Options
 
       attr_reader source_pattern: Pattern
 
@@ -11,15 +11,15 @@ module Steep
 
       attr_reader code_diagnostics_config: untyped
 
-      def initialize: (name: untyped, options: untyped, source_pattern: untyped, signature_pattern: untyped, code_diagnostics_config: untyped) -> void
+      def initialize: (name: Symbol, options: Options, source_pattern: Pattern, signature_pattern: Pattern, code_diagnostics_config: untyped) -> void
 
-      def possible_source_file?: (untyped path) -> untyped
+      def possible_source_file?: (Pathname path) -> bool
 
-      def possible_signature_file?: (untyped path) -> untyped
+      def possible_signature_file?: (Pathname path) -> bool
 
-      def new_env_loader: (project: untyped) -> untyped
+      def new_env_loader: (project: Project) -> RBS::EnvironmentLoader
 
-      def self.construct_env_loader: (options: untyped, project: untyped) -> untyped
+      def self.construct_env_loader: (options: Options, project: Project) -> RBS::EnvironmentLoader
     end
   end
 end

data/sig/steep/server/interaction_worker.rbs

@@ -23,11 +23,11 @@ module Steep
 
       def process_completion: (untyped job) -> untyped
 
-      def format_completion_item_for_rbs: (untyped sig_service, untyped type_name, untyped context, untyped job, untyped prefix) -> (nil | untyped)
+      def format_completion_item_for_rbs: (Services::SignatureService sig_service, untyped type_name, untyped context, untyped job, untyped prefix) -> (nil | untyped)
 
       def format_comment: (untyped comment) -> (untyped | nil)
 
-      def format_comments: (untyped comments) -> (untyped | nil)
+      def format_comments: (Array[RBS::AST::Comment] comments) -> untyped?
 
       def format_completion_item: (untyped item) -> untyped
 

data/sig/steep/server/lsp_formatter.rbs

@@ -28,8 +28,10 @@ module Steep
       type summarizable_decl = ::RBS::AST::Declarations::Class
                              | ::RBS::AST::Declarations::Module
                              | ::RBS::AST::Declarations::Interface
-                             | ::RBS::AST::Declarations::Alias
-                             
+                             | ::RBS::AST::Declarations::TypeAlias
+                             | ::RBS::AST::Declarations::ClassAlias
+                             | ::RBS::AST::Declarations::ModuleAlias
+
       def self?.declaration_summary: (summarizable_decl) -> String
     end
   end

data/sig/steep/services/completion_provider.rbs

@@ -51,6 +51,12 @@ module Steep
         attr_reader full_name: RBS::TypeName
 
         def initialize: (env: RBS::Environment, identifier: Symbol, range: Range, type: AST::Types::t, full_name: RBS::TypeName) -> void
+
+        def class?: () -> bool
+
+        def module?: () -> bool
+
+        def comments: () -> Array[RBS::AST::Comment]
       end
 
       class MethodNameItem

data/sig/steep/services/hover_provider/rbs.rbs

@@ -5,17 +5,19 @@ module Steep
         class TypeAliasContent
           attr_reader location: ::RBS::Location[untyped, untyped]
 
-          attr_reader decl: ::RBS::AST::Declarations::Alias
+          attr_reader decl: ::RBS::AST::Declarations::TypeAlias
 
-          def initialize: (location: ::RBS::Location[untyped, untyped], decl: ::RBS::AST::Declarations::Alias) -> void
+          def initialize: (location: ::RBS::Location[untyped, untyped], decl: ::RBS::AST::Declarations::TypeAlias) -> void
         end
 
         class ClassContent
           attr_reader location: ::RBS::Location[untyped, untyped]
 
-          attr_reader decl: ::RBS::AST::Declarations::Class | ::RBS::AST::Declarations::Module
+          type decl = ::RBS::AST::Declarations::Class | ::RBS::AST::Declarations::Module | ::RBS::AST::Declarations::ClassAlias | ::RBS::AST::Declarations::ModuleAlias
 
-          def initialize: (location: ::RBS::Location[untyped, untyped], decl: ::RBS::AST::Declarations::Class | ::RBS::AST::Declarations::Module) -> void
+          attr_reader decl: decl
+
+          def initialize: (location: ::RBS::Location[untyped, untyped], decl: decl) -> void
         end
 
         class InterfaceContent

data/sig/steep/services/hover_provider/ruby.rbs

@@ -82,23 +82,27 @@ module Steep
 
           type decl = ::RBS::Environment::ClassEntry
                     | ::RBS::Environment::ModuleEntry
-                    | ::RBS::Environment::SingleEntry[::RBS::TypeName, ::RBS::AST::Declarations::Constant]
+                    | ::RBS::Environment::ClassAliasEntry
+                    | ::RBS::Environment::ModuleAliasEntry
+                    | ::RBS::Environment::ConstantEntry
 
           attr_reader decl: decl
 
           attr_reader class_decl(): ::RBS::Environment::ClassEntry | ::RBS::Environment::ModuleEntry | nil
 
-          attr_reader constant_decl(): ::RBS::Environment::SingleEntry[::RBS::TypeName, ::RBS::AST::Declarations::Constant]?
+          attr_reader class_alias(): ::RBS::Environment::ClassAliasEntry | ::RBS::Environment::ModuleAliasEntry | nil
+
+          attr_reader constant_decl(): ::RBS::Environment::ConstantEntry?
 
           def initialize: (location: Parser::Source::Range, full_name: ::RBS::TypeName, type: AST::Types::t, decl: decl) -> void
 
           def comments: () -> Array[::RBS::AST::Comment]
 
           # Returns true if `decl` is a class/module definition
-          def class_or_module?: () -> (::RBS::Environment::ClassEntry | ::RBS::Environment::ModuleEntry | nil)
+          def class_or_module?: () -> bool
 
           # Returns true if `decl` is a constant definition
-          def constant?: () -> ::RBS::Environment::SingleEntry[::RBS::TypeName, ::RBS::AST::Declarations::Constant]?
+          def constant?: () -> bool
         end
 
         type content = TypeContent | VariableContent | MethodCallContent | DefinitionContent | ConstantContent | TypeAssertionContent

data/sig/steep/services/signature_service.rbs

@@ -1,5 +1,12 @@
 module Steep
   module Services
+    # SignatureService takes care of two sets of RBS files.
+    #
+    # 1. RBS files loaded from `EnvironmentLoader` -- usually type signatures of libraries
+    # 2. RBS files managed in editors -- usually type signatures of the development target (app or gem)
+    #
+    # The files in #2 are managed throuth `#status` and the changes are tracked.
+    #
     class SignatureService
       type status = SyntaxErrorStatus | AncestorErrorStatus | LoadedStatus
 
@@ -65,17 +72,25 @@ module Steep
         def constant_resolver: () -> RBS::Resolver::ConstantResolver
       end
 
+      # A file has one of the three states:
+      #
+      # 1. The parsing succeeded and loaded a list of declarations
+      # 2. The content has a syntax error and parsing failed
+      # 3. Other unexpected error
+      #
       class FileStatus
         attr_reader path: Pathname
 
         attr_reader content: String
 
-        attr_reader decls: Array[RBS::AST::Declarations::t] | Diagnostic::Signature::UnexpectedError | RBS::ParsingError
+        type signature = [RBS::Buffer, Array[RBS::AST::Directives::t], Array[RBS::AST::Declarations::t]]
+
+        attr_reader signature: signature | Diagnostic::Signature::UnexpectedError | RBS::ParsingError
 
         def initialize: (
           path: Pathname,
           content: String,
-          decls: Array[RBS::AST::Declarations::t] | Diagnostic::Signature::UnexpectedError | RBS::ParsingError
+          signature: signature | Diagnostic::Signature::UnexpectedError | RBS::ParsingError
         ) -> void
       end
 
@@ -85,11 +100,17 @@ module Steep
 
       @env_rbs_paths: Set[Pathname]?
 
+      # All RBS paths in environment, both dependency RBS and target RBS
+      #
       def env_rbs_paths: () -> Set[Pathname]
 
+      # Yield all RBS paths in the environment, both dependency RBS and target RBS
+      #
       def each_rbs_path: () { (Pathname) -> void } -> void
                        | () -> Enumerator[Pathname, void]
 
+      # The Target files
+      #
       def files: () -> Hash[Pathname, FileStatus]
 
       def pending_changed_paths: () -> Set[Pathname]
@@ -106,10 +127,13 @@ module Steep
 
       def apply_changes: (Hash[Pathname, FileStatus] files, Server::ChangeBuffer::changes changes) -> Hash[Pathname, FileStatus]
 
+      # The entry point to apply the edit to the signatures
+      #
       def update: (Server::ChangeBuffer::changes changes) -> void
 
       def update_env: (
-        Hash[Pathname, FileStatus] updated_files, paths: Set[Pathname]
+        Hash[Pathname, FileStatus] updated_files,
+        paths: Set[Pathname]
       ) -> (RBS::DefinitionBuilder::AncestorBuilder | Array[Diagnostic::Signature::Base])
 
       def rescue_rbs_error: (Array[RBS::BaseError] errors) { () -> void } -> void

data/sig/steep/signature/validator.rbs

@@ -9,7 +9,7 @@ module Steep
 
       @errors: Array[Diagnostic::Signature::Base]
 
-      @type_name_resolver: RBS::TypeNameResolver?
+      @type_name_resolver: RBS::Resolver::TypeNameResolver?
 
       @validator: RBS::Validator?
 
@@ -26,7 +26,7 @@ module Steep
 
       def builder: () -> RBS::DefinitionBuilder
 
-      def type_name_resolver: () -> RBS::TypeNameResolver
+      def type_name_resolver: () -> RBS::Resolver::TypeNameResolver
 
       def validator: () -> RBS::Validator
 
@@ -60,13 +60,17 @@ module Steep
 
       def validate_const: () -> void
 
-      def validate_one_constant: (RBS::TypeName name, RBS::Environment::SingleEntry[RBS::TypeName, RBS::AST::Declarations::Constant] entry) -> void
+      def validate_one_constant: (RBS::TypeName name, RBS::Environment::ConstantEntry entry) -> void
 
       def validate_global: () -> void
 
-      def validate_one_global: (Symbol name, RBS::Environment::SingleEntry[Symbol, RBS::AST::Declarations::Global]) -> void
+      def validate_one_global: (Symbol name, RBS::Environment::GlobalEntry) -> void
 
-      def validate_one_alias: (RBS::TypeName name, ?RBS::Environment::SingleEntry[RBS::TypeName, RBS::AST::Declarations::Alias] entry) -> void
+      def validate_one_alias: (RBS::TypeName name, ?RBS::Environment::TypeAliasEntry entry) -> void
+
+      def validate_one_class_decl: (RBS::TypeName) -> void
+                                 
+      def validate_one_class_alias: (RBS::TypeName, RBS::Environment::ClassAliasEntry | RBS::Environment::ModuleAliasEntry) -> void
 
       def validate_alias: () -> void
 

data/sig/steep/type_construction.rbs

@@ -80,7 +80,7 @@ module Steep
 
     def with_method_constr: (untyped method_name, untyped node, args: untyped, self_type: untyped, definition: untyped) { (untyped) -> untyped } -> untyped
 
-    def implement_module: (module_name: untyped, annotations: untyped, ?super_name: untyped?) -> untyped
+    def implement_module: (module_name: RBS::TypeName, annotations: AST::Annotation::Collection, ?super_name: RBS::TypeName?) -> AST::Annotation::Implements::Module?
 
     def default_module_context: (untyped implement_module_name, nesting: untyped) -> untyped