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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 639a97319d661c777702365209eaf5a6ea2632723a509331a03f6f1ef3926148
-  data.tar.gz: fb6061b52a09fb97c907abff4f69d6c9267eef1c9a3af52fa87fffda9de5d1f0
+  metadata.gz: bdccb93c5fd95bbc2e6af98021d0beadfb7aab30f3b398cb9e8414d5ea0e6f38
+  data.tar.gz: 6dfab6ba13555e6a6c37c69950383e1e7608c21bc26eacf1a695de91a5fe6293
 SHA512:
-  metadata.gz: 232ec5b779c018aa9824318e003cd60e3ec3691297903337bb414fff87e757daaacfda2d94fb0c751538dcad194763ad6cb5b072156686bd450d5292d490a2e6
-  data.tar.gz: b322f5568a1fe5cbc0693a01a7be50d9860e056a9f69325e6c55a9322f2d32f7d1d0889d19e45576ca6f3f9afde9649747d9d02a0e251702f94cd27bf5fae27c
+  metadata.gz: c09f6cd8780f428305edc405885c4080816470c05815515c8005e368532146b1e99e939699b3ff835d6909a2beeae074e38b79a1c8e2121652d008fc2f759316
+  data.tar.gz: a579bca90d0a7cd5a689068e7de97ca2d5ac9d7d40ccd291d2b61df57f519997bbf8c3e376904b4369c256aac75b62a5ee89915940436ded62c68212a4926e50

data/.github/workflows/ruby-windows.yml

@@ -14,6 +14,7 @@ jobs:
         - "2.7"
         - "3.0"
         - "3.1"
+        - "3.2"
         task:
         - test
         # - test:output  Ignored because the order of diagnostics changes somehow

data/.github/workflows/ruby.yml

@@ -11,10 +11,10 @@ jobs:
     strategy:
       matrix:
         container_tag:
-        - "2.6"
         - "2.7"
         - "3.0"
         - "3.1"
+        - "3.2"
         - "master-nightly-focal"
         task:
         - test
@@ -25,10 +25,6 @@ jobs:
       image: rubylang/ruby:${{ matrix.container_tag }}
     steps:
     - uses: actions/checkout@v3
-    - name: Reset bundler
-      run: |
-        rm Gemfile.lock Gemfile.steep.lock
-      if: contains(matrix.container_tag, '2.6')
     - name: Run test
       run: |
         git config --global --add safe.directory /__w/steep/steep

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 1.3.0 (2022-11-25)
+
+### Type checker core
+
+* Type check types ([#676](https://github.com/soutaro/steep/pull/676))
+
 ## 1.3.0.pre.2 (2022-11-23)
 
 ### Type checker core

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in steep.gemspec
 gemspec
 
+gem "rbs", "~>3.0.0.dev"
+
 gem "rake"
 gem "minitest", "~> 5.16"
 gem "minitest-hooks"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steep (1.3.0.pre.2)
+    steep (1.4.0.dev.1)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -11,8 +11,9 @@ PATH
       logger (>= 1.3.0)
       parallel (>= 1.0.0)
       parser (>= 3.1)
+      pathname (>= 0.2.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.8.0.pre)
+      rbs (>= 2.8.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -27,44 +28,45 @@ GEM
       tzinfo (~> 2.0)
     ast (2.4.2)
     concurrent-ruby (1.1.10)
-    csv (3.2.5)
+    csv (3.2.6)
     debase (0.2.5.beta2)
       debase-ruby_core_source (>= 0.10.12)
-    debase-ruby_core_source (0.10.16)
+    debase-ruby_core_source (3.2.0)
     ffi (1.15.5)
-    fileutils (1.6.0)
+    fileutils (1.7.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    language_server-protocol (3.17.0.1)
+    json (2.6.3)
+    language_server-protocol (3.17.0.2)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.5.1)
+    logger (1.5.3)
     minitest (5.16.3)
     minitest-hooks (1.5.0)
       minitest (> 5.3)
     minitest-slow_test (0.2.0)
       minitest (>= 5.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
+    pathname (0.2.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.8.0.pre.1)
+    rbs (3.0.0.dev.1)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
-    securerandom (0.2.0)
-    stackprof (0.2.22)
-    strscan (3.0.4)
+    securerandom (0.2.2)
+    stackprof (0.2.23)
+    strscan (3.0.5)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -75,6 +77,7 @@ DEPENDENCIES
   minitest-hooks
   minitest-slow_test
   rake
+  rbs (~> 3.0.0.dev)
   ruby-debug-ide
   stackprof
   steep!

data/Gemfile.steep

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem 'steep', '~> 1.2.0'
-gem "rbs", '~> 2.8.0.pre'
+gem 'steep', '~> 1.3.0'
+gem "rbs", "~> 3.0.0.dev"

data/Gemfile.steep.lock

@@ -27,9 +27,9 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.8.0.pre.1)
+    rbs (3.0.0.dev.1)
     securerandom (0.2.0)
-    steep (1.2.1)
+    steep (1.3.0)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -40,7 +40,7 @@ GEM
       parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.7.0)
+      rbs (>= 2.8.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -55,8 +55,8 @@ PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
-  rbs (~> 2.8.0.pre)
-  steep (~> 1.2.0)
+  rbs (~> 3.0.0.dev)
+  steep (~> 1.3.0)
 
 BUNDLED WITH
    2.3.15

data/bin/rbs

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+BINSTUB_DIR=$(cd $(dirname $0); pwd)
+GEMFILE=$(readlink -f ${BINSTUB_DIR}/../Gemfile.steep)
+COLLECTION=$(readlink -f ${BINSTUB_DIR}/../rbs_collection.steep.yaml)
+ROOT_DIR=$(readlink -f ${BINSTUB_DIR}/..)
+
+RBS="bundle exec --gemfile=${GEMFILE} rbs --collection=${COLLECTION}"
+
+if type "rbenv" > /dev/null 2>&1; then
+  RBS="rbenv exec ${RBS}"
+else
+  if type "rvm" > /dev/null 2>&1; then
+    if [ -e ${ROOT_DIR}/.ruby-version ]; then
+      RBS="rvm ${ROOT_DIR} do ${RBS}"
+    fi
+  fi
+fi
+
+exec $RBS $@
+

data/bin/setup

@@ -6,4 +6,4 @@ set -vx
 bundle install
 
 bundle install --gemfile=Gemfile.steep
-bundle exec --gemfile=Gemfile.steep rbs --collection=rbs_collection.steep.yaml collection install
+bin/rbs collection install

data/lib/steep/ast/types/class.rb

@@ -27,11 +27,17 @@ module Steep
         alias eql? ==
 
         def subst(s)
-          s.module_type or raise "Unexpected substitution: #{inspect}"
+          if s.module_type
+            s.module_type
+          else
+            self
+          end
         end
 
-        def free_variables()
-          @fvs = Set.new([self])
+        @@fvs = Set[instance]
+
+        def free_variables
+          @@fvs
         end
 
         include Helper::NoChild

data/lib/steep/ast/types/factory.rb

@@ -204,7 +204,7 @@ module Steep
           when Logic::Base
             RBS::Types::Bases::Bool.new(location: type.location)
           else
-            raise "Unexpected type given: #{type} (#{type.class})"
+            __skip__ = raise "Unexpected type given: #{type} (#{type.class})"
           end
         end
 
@@ -248,7 +248,14 @@ module Steep
           RBS::AST::TypeParam.new(
             name: type_param.name,
             variance: type_param.variance,
-            upper_bound: type_param.upper_bound&.yield_self {|u| type_1(u) },
+            upper_bound: type_param.upper_bound&.yield_self {|u|
+              case u_ = type_1(u)
+              when RBS::Types::ClassInstance, RBS::Types::ClassSingleton, RBS::Types::Interface
+                u_
+              else
+                raise "`#{u_}` cannot be type parameter upper bound"
+              end
+            },
             location: type_param.location
           ).unchecked!(type_param.unchecked)
         end

data/lib/steep/ast/types/instance.rb

@@ -23,11 +23,16 @@ module Steep
         alias eql? ==
 
         def subst(s)
-          s.instance_type or raise "Unexpected substitution: #{inspect}"
+          if s.instance_type
+            s.instance_type
+          else
+            self
+          end
         end
 
-        def free_variables()
-          @fvs = Set.new([self])
+        @@fvs = Set[instance]
+        def free_variables
+          @@fvs
         end
 
         include Helper::NoChild

data/lib/steep/ast/types/intersection.rb

@@ -35,7 +35,7 @@ module Steep
             when 0
               AST::Types::Top.new(location: location)
             when 1
-              tys.first
+              tys.first || raise
             else
               new(types: dups.to_a, location: location)
             end
@@ -73,7 +73,11 @@ module Steep
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         def level

data/lib/steep/ast/types/literal.rb

@@ -54,7 +54,7 @@ module Steep
                   when false
                     Builtin::FalseClass
                   else
-                    raise "Unexpected literal type: #{value.inspect}"
+                    raise "Unexpected literal type: #{(_ = value).inspect}"
                   end
 
           Name::Instance.new(name: klass.module_name, args: [], location: location)

data/lib/steep/ast/types/logic.rb

@@ -9,9 +9,7 @@ module Steep
             self
           end
 
-          def free_variables
-            @fvs ||= Set[]
-          end
+          include Helper::NoFreeVariables
 
           include Helper::NoChild
 

data/lib/steep/ast/types/name.rb

@@ -51,14 +51,16 @@ module Steep
           end
 
           def with_location(new_location)
-            self.class.new(name: name, args: args, location: new_location)
+            _ = self.class.new(name: name, args: args, location: new_location)
           end
 
           def subst(s)
             if free_variables.intersect?(s.domain)
-              self.class.new(location: location,
-                             name: name,
-                             args: args.map {|a| a.subst(s) })
+              _ = self.class.new(
+                location: location,
+                name: name,
+                args: args.map {|a| a.subst(s) }
+              )
             else
               self
             end
@@ -73,7 +75,11 @@ module Steep
           end
 
           def each_child(&block)
-            args.each(&block)
+            if block
+              args.each(&block)
+            else
+              args.each
+            end
           end
 
           include Helper::ChildrenLevel

data/lib/steep/ast/types/proc.rb

@@ -68,10 +68,6 @@ module Steep
           [0] + level_of_children(children)
         end
 
-        def closed?
-          type.closed? && (block.nil? || block.closed?) &&  (self_type ? self_type.closed? : false)
-        end
-
         def with_location(new_location)
           self.class.new(location: new_location, block: block, type: type, self_type: self_type)
         end
@@ -103,7 +99,11 @@ module Steep
         end
 
         def block_required?
-          block && !block.optional?
+          if block
+            !block.optional?
+          else
+            false
+          end
         end
 
         def each_child(&block)

data/lib/steep/ast/types/record.rb

@@ -43,7 +43,11 @@ module Steep
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          elements.each_value(&block)
+          if block
+            elements.each_value(&block)
+          else
+            elements.each_value
+          end
         end
 
         def level

data/lib/steep/ast/types/self.rb

@@ -29,11 +29,17 @@ module Steep
         include Helper::NoChild
 
         def subst(s)
-          s.self_type or raise "Unexpected substitution: #{inspect}"
+          if s.self_type
+            s.self_type
+          else
+            self
+          end
         end
 
+        @@fvs = Set[instance]
+
         def free_variables
-          @fvs ||= Set.new([self])
+          @@fvs
         end
 
         def level

data/lib/steep/ast/types/tuple.rb

@@ -31,17 +31,19 @@ module Steep
         end
 
         def free_variables()
-          @fvs ||= Set.new.tap do |set|
-            types.each do |type|
-              set.merge(type.free_variables)
-            end
+          @fvs ||= each_child.with_object(Set[]) do |type, set| #$ Set[variable]
+            set.merge(type.free_variables)
           end
         end
 
         include Helper::ChildrenLevel
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         def level

data/lib/steep/ast/types/union.rb

@@ -12,7 +12,9 @@ module Steep
 
         def self.build(types:, location: nil)
           return AST::Types::Bot.new if types.empty?
-          return types.first if types.size == 1
+          if types.size == 1
+            return types.first || raise
+          end
 
           types.flat_map do |type|
             if type.is_a?(Union)
@@ -36,7 +38,7 @@ module Steep
             when 0
               AST::Types::Bot.new
             when 1
-              tys.first
+              tys.first || raise
             else
               new(types: tys, location: location)
             end
@@ -49,7 +51,7 @@ module Steep
         end
 
         def hash
-          @hash ||= types.inject(self.class.hash) {|c, type| type.hash ^ c }
+          @hash ||= types.inject(self.class.hash) {|c, type| type.hash ^ c } #$ Integer
         end
 
         alias eql? ==
@@ -71,7 +73,11 @@ module Steep
         end
 
         def each_child(&block)
-          types.each(&block)
+          if block
+            types.each(&block)
+          else
+            types.each
+          end
         end
 
         include Helper::ChildrenLevel

data/lib/steep/ast/types/var.rb

@@ -22,7 +22,7 @@ module Steep
         alias eql? ==
 
         def self.fresh_name(name)
-          @mutex ||= Mutex.new
+          @mutex ||= Thread::Mutex.new
 
           @mutex.synchronize do
             @max ||= 0

data/lib/steep/index/rbs_index.rb

@@ -148,7 +148,7 @@ module Steep
       end
 
       def each_entry(&block)
-        if block_given?
+        if block
           type_index.each_value(&block)
           method_index.each_value(&block)
           const_index.each_value(&block)
@@ -176,7 +176,7 @@ module Steep
 
       def each_declaration(type_name: nil, method_name: nil, const_name: nil, global_name: nil, &block)
         if block
-          entry = entry(type_name: type_name, method_name: method_name, const_name: const_name, global_name: global_name)
+          entry = __skip__ = entry(type_name: type_name, method_name: method_name, const_name: const_name, global_name: global_name)
           entry.declarations.each(&block)
         else
           enum_for(:each_declaration, type_name: type_name, method_name: method_name, const_name: const_name, global_name: global_name)
@@ -187,9 +187,12 @@ module Steep
         entry(type_name: type_name).add_reference(ref)
       end
 
-      def each_reference(type_name: nil, &block)
+      def each_reference(type_name:, &block)
         if block
-          entry(type_name: type_name).references.each(&block)
+          case
+          when type_name
+            entry(type_name: type_name).references.each(&block)
+          end
         else
           enum_for(:each_reference, type_name: type_name)
         end
@@ -205,8 +208,8 @@ module Steep
         def member(type_name, member)
           case member
           when RBS::AST::Members::MethodDefinition
-            member.types.each do |method_type|
-              method_type.each_type do |type|
+            member.overloads.each do |overload|
+              overload.method_type.each_type do |type|
                 type_reference type, from: member
               end
             end
@@ -230,6 +233,8 @@ module Steep
                               InstanceMethodName.new(type_name: type_name, method_name: member.name)
                             when :singleton
                               SingletonMethodName.new(type_name: type_name, method_name: member.name)
+                            else
+                              raise
                             end
               index.add_method_declaration(method_name, member)
             end
@@ -240,6 +245,8 @@ module Steep
                               InstanceMethodName.new(type_name: type_name, method_name: "#{member.name}=".to_sym)
                             when :singleton
                               SingletonMethodName.new(type_name: type_name, method_name: "#{member.name}=".to_sym)
+                            else
+                              raise
                             end
               index.add_method_declaration(method_name, member)
             end

data/lib/steep/interface/substitution.rb

@@ -6,7 +6,7 @@ module Steep
         attr_reader :types_size
 
         def initialize(vars_size:, types_size:)
-          @var_size = vars_size
+          @vars_size = vars_size
           @types_size = types_size
 
           super "Invalid substitution: vars.size=#{vars_size}, types.size=#{types_size}"
@@ -43,15 +43,15 @@ module Steep
         set = Set.new
 
         set.merge(dictionary.keys)
-        set << AST::Types::Instance.instance unless instance_type.is_a?(AST::Types::Instance)
-        set << AST::Types::Class.instance unless instance_type.is_a?(AST::Types::Class)
-        set << AST::Types::Instance.instance unless instance_type.is_a?(AST::Types::Self)
+        set << AST::Types::Self.instance if self_type
+        set << AST::Types::Class.instance if module_type
+        set << AST::Types::Instance.instance if instance_type
 
         set
       end
 
       def to_s
-        a = []
+        a = [] #: Array[String]
 
         dictionary.each do |x, ty|
           a << "#{x} -> #{ty}"
@@ -87,12 +87,13 @@ module Steep
         end
       end
 
-      def self.build(vars, types = nil, instance_type: AST::Types::Instance.instance, module_type: AST::Types::Class.instance, self_type: AST::Types::Self.instance)
+      def self.build(vars, types = nil, instance_type: nil, module_type: nil, self_type: nil)
         types ||= vars.map {|var| AST::Types::Var.fresh(var) }
 
         raise InvalidSubstitutionError.new(vars_size: vars.size, types_size: types.size) unless vars.size == types.size
 
-        dic = vars.zip(types).each.with_object({}) do |(var, type), d|
+        dic = vars.zip(types).each.with_object({}) do |(var, type), d| #$ Hash[Symbol, AST::Types::t]
+          type or raise
           d[var] = type
         end
 
@@ -130,9 +131,9 @@ module Steep
           end
         end
 
-        @instance_type = instance_type.subst(s)
-        @module_type = module_type.subst(s)
-        @self_type = self_type.subst(s)
+        @instance_type = instance_type.subst(s) if instance_type
+        @module_type = module_type.subst(s) if module_type
+        @self_type = self_type.subst(s) if self_type
 
         self
       end

data/lib/steep/project/dsl.rb

@@ -172,8 +172,12 @@ module Steep
           yield code_diagnostics_config if block_given?
         end
 
+        def project!
+          project or raise "TargetDSL doesn't have project (#{name})"
+        end
+
         def collection_config(path)
-          @collection_config_path = project.absolute_path(path)
+          @collection_config_path = project!.absolute_path(path)
         end
 
         def disable_collection
@@ -196,7 +200,6 @@ module Steep
 
       def initialize(project:)
         @project = project
-        @global_signatures = []
       end
 
       def self.register_template(name, target)
@@ -218,13 +221,18 @@ module Steep
                  end
 
         Steep.logger.tagged "target=#{name}" do
-          target.instance_eval(&block) if block_given?
+          target.instance_eval(&block) if block
         end
 
         source_pattern = Pattern.new(patterns: target.sources, ignores: target.ignored_sources, ext: ".rb")
         signature_pattern = Pattern.new(patterns: target.signatures, ext: ".rbs")
 
-        collection_lock = target.collection_config_path&.then { |p| RBS::Collection::Config.lockfile_of(p) }
+
+        if config_path = target.collection_config_path
+          lockfile_path = RBS::Collection::Config.to_lockfile_path(config_path)
+          content = YAML.load_file(lockfile_path.to_s)
+          collection_lock = RBS::Collection::Config::Lockfile.from_lockfile(lockfile_path: lockfile_path, data: content)
+        end
 
         Project::Target.new(
           name: target.name,