steep 1.9.0.dev.1 → 1.9.0.dev.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37bf13501b4d8d6e4b6fa5b0702e0a978a6488e674832e36168070788c1b3367
-  data.tar.gz: 6184ef95ab4f594841ee4d7ef775a68df571bb21b981beff18e0a7cddd53ae7e
+  metadata.gz: 89c207623c288c2142cdcf7d7de7f404da4d160b5bc40c84210116a721ec4029
+  data.tar.gz: dfd95e726115676f4d293d312bd1f06afa6ea89336911e9887c8e4b5ee1167ff
 SHA512:
-  metadata.gz: b1d51f5e77be8d2ea4ddb45982e2e4515afcb16453784feef442ec618ea9584bf75a52f12654ef63283367dc1d5a3cd5e10be71cd3e02f9cde71566402f86ed0
-  data.tar.gz: 92e5a0e27efbf0cfc629ed7fbce8576e8a8657c6abd5abc8b11f4e51c7087d2ca2d36c6ba7415ce9d1d53ea994e42068a857cbabb7a64940ec476321346a2829
+  metadata.gz: c9800ef17d4108ff391642510701e12a0ec4e63035c74765ed1203fa9b62d964be10441d60890ab3c643dc8d0295dd2a68be5285126307f3cb401f517eaa799f
+  data.tar.gz: 3ef2c5d7bac4dd2d492df8e5c60322de6c06d9c33cec21e2a97e4608f235e41729f0383e0817cfd324213853cad4c34308b14f5a582eedda71d36828545d6840

data/Steepfile

@@ -1,28 +1,51 @@
 D = Steep::Diagnostic
 
+FileUtils.mkpath("tmp")
+tmp_rbs_dir = Pathname("tmp/rbs-sig")
+
+definition = Bundler::Definition.build(Pathname("Gemfile"), Pathname("Gemfile.lock"), nil)
+rbs_dep = definition.dependencies.find {|dep| dep.name == "rbs" }
+if (source = rbs_dep&.source).is_a?(Bundler::Source::Path)
+  unless tmp_rbs_dir.directory?
+    FileUtils.ln_s(Pathname.pwd + source.path + "sig", tmp_rbs_dir.to_s, force: true)
+  end
+else
+  FileUtils.rm_f(tmp_rbs_dir)
+  library "rbs"
+end
+
 target :app do
+  collection_config "rbs_collection.steep.yaml"
+
   check "lib"
   ignore "lib/steep/shims"
 
   signature "sig"
-
-  collection_config "rbs_collection.steep.yaml"
+  ignore_signature "sig/test"
 
   configure_code_diagnostics(D::Ruby.strict) do |hash|
   end
 
-  FileUtils.mkpath("tmp")
-  tmp_rbs_dir = File.join("tmp", "rbs-sig")
+  if tmp_rbs_dir.directory?
+    signature tmp_rbs_dir.to_s
+  else
+    library "rbs"
+  end
+end
+
+target :test do
+  collection_config "rbs_collection.steep.yaml"
+
+  unreferenced!
+
+  check "test"
+  signature "sig/test"
+
+  configure_code_diagnostics(D::Ruby.lenient)
 
-  definition = Bundler::Definition.build(Pathname("Gemfile"), Pathname("Gemfile.lock"), nil)
-  rbs_dep = definition.dependencies.find {|dep| dep.name == "rbs" }
-  if (source = rbs_dep&.source).is_a?(Bundler::Source::Path)
-    unless Pathname(tmp_rbs_dir).exist?
-      FileUtils.ln_s(Pathname.pwd + source.path + "sig", tmp_rbs_dir, force: true)
-    end
-    signature tmp_rbs_dir
+  if tmp_rbs_dir.directory?
+    signature tmp_rbs_dir.to_s
   else
-    FileUtils.rm_f(tmp_rbs_dir)
     library "rbs"
   end
 end

data/bin/rbs-inline

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

data/lib/steep/cli.rb

@@ -138,31 +138,22 @@ module Steep
             command.type_check_code = v ? true : false
           end
 
-          opts.on("--validate=OPTION", ["skip", "group", "target", "project", "library"], "Validation levels of signatures (default: group, options: skip,group,target,project,library)") do |level|
+          opts.on("--validate=OPTION", ["skip", "group", "project", "library"], "Validation levels of signatures (default: group, options: skip,group,project,library)") do |level|
             case level
             when "skip"
               command.validate_group_signatures = false
-              command.validate_target_signatures = false
               command.validate_project_signatures = false
               command.validate_library_signatures = false
             when "group"
               command.validate_group_signatures = true
-              command.validate_target_signatures = false
-              command.validate_project_signatures = false
-              command.validate_library_signatures = false
-            when "target"
-              command.validate_group_signatures = true
-              command.validate_target_signatures = true
               command.validate_project_signatures = false
               command.validate_library_signatures = false
             when "project"
               command.validate_group_signatures = true
-              command.validate_target_signatures = true
               command.validate_project_signatures = true
               command.validate_library_signatures = false
             when "library"
               command.validate_group_signatures = true
-              command.validate_target_signatures = true
               command.validate_project_signatures = true
               command.validate_library_signatures = true
             end

data/lib/steep/diagnostic/ruby.rb

@@ -917,6 +917,13 @@ module Steep
         end
       end
 
+      class UnannotatedEmptyCollection < Base
+        def header_line
+          node or raise
+          "Empty #{node.type} doesn't have type annotation"
+        end
+      end
+
       ALL = ObjectSpace.each_object(Class).with_object([]) do |klass, array|
         if klass < Base
           array << klass
@@ -963,6 +970,7 @@ module Steep
             SetterReturnTypeMismatch => :information,
             SyntaxError => :hint,
             TypeArgumentMismatchError => :hint,
+            UnannotatedEmptyCollection => :warning,
             UnexpectedBlockGiven => :warning,
             UnexpectedDynamicMethod => :hint,
             UnexpectedError => :hint,
@@ -1019,6 +1027,7 @@ module Steep
             SetterReturnTypeMismatch => :error,
             SyntaxError => :hint,
             TypeArgumentMismatchError => :error,
+            UnannotatedEmptyCollection => :error,
             UnexpectedBlockGiven => :error,
             UnexpectedDynamicMethod => :information,
             UnexpectedError => :information,
@@ -1075,6 +1084,7 @@ module Steep
             SetterReturnTypeMismatch => nil,
             SyntaxError => :hint,
             TypeArgumentMismatchError => nil,
+            UnannotatedEmptyCollection => :hint,
             UnexpectedBlockGiven => :hint,
             UnexpectedDynamicMethod => nil,
             UnexpectedError => :hint,

data/lib/steep/drivers/check.rb

@@ -14,7 +14,6 @@ module Steep
       attr_reader :active_group_names
       attr_accessor :type_check_code
       attr_accessor :validate_group_signatures
-      attr_accessor :validate_target_signatures
       attr_accessor :validate_project_signatures
       attr_accessor :validate_library_signatures
 
@@ -29,7 +28,6 @@ module Steep
         @active_group_names = []
         @type_check_code = true
         @validate_group_signatures = true
-        @validate_target_signatures = false
         @validate_project_signatures = false
         @validate_library_signatures = false
       end
@@ -217,19 +215,17 @@ module Steep
             params[:signature_paths] << [target.name.to_s, target.project.absolute_path(path).to_s]
           end
         end
-        if validate_target_signatures
-          if group.is_a?(Project::Group)
-            files.each_target_signature_path(target, group) do |path|
-              params[:signature_paths] << [target.name.to_s, target.project.absolute_path(path).to_s]
-            end
-          end
-        end
         if validate_project_signatures
           files.each_project_signature_path(target) do |path|
             if path_target = files.signature_path_target(path)
               params[:signature_paths] << [path_target.name.to_s, target.project.absolute_path(path).to_s]
             end
           end
+          if group.is_a?(Project::Group)
+            files.each_target_signature_path(target, group) do |path|
+              params[:signature_paths] << [target.name.to_s, target.project.absolute_path(path).to_s]
+            end
+          end
         end
         if validate_library_signatures
           files.each_library_path(target) do |path|

data/lib/steep/drivers/utils/driver_helper.rb

@@ -3,6 +3,7 @@ module Steep
     module Utils
       module DriverHelper
         attr_accessor :steepfile
+        attr_accessor :disable_install_collection
 
         def load_config(path: steepfile || Pathname("Steepfile"))
           if path.file?
@@ -25,17 +26,47 @@ module Steep
               case result = target.options.load_collection_lock
               when nil, RBS::Collection::Config::Lockfile
                 # ok
-              else
+              when Pathname
+                # File is missing
                 if result == target.options.collection_config_path
-                  Steep.ui_logger.error { "rbs-collection setup is broken: `#{result}` is missing" }
+                  # Config file is missing
+                  Steep.ui_logger.error { "rbs-collection configuration is missing: `#{result}`" }
                 else
-                  Steep.ui_logger.error { "Run `rbs collection install` to install type definitions" }
+                  # Lockfile is missing
+                  Steep.ui_logger.error { "Run `rbs collection install` to generate missing lockfile: `#{result}`" }
+                end
+              when YAML::SyntaxError
+                # File is broken
+                Steep.ui_logger.error { "rbs-collection setup is broken:\nsyntax error #{result.inspect}" }
+              when RBS::Collection::Config::CollectionNotAvailable
+                unless disable_install_collection
+                  install_collection(target, target.options.collection_config_path || raise)
+                else
+                  Steep.ui_logger.error { "Run `rbs collection install` to set up RBS files for gems" }
                 end
               end
             end
           end
         end
 
+        def install_collection(target, config_path)
+          Steep.ui_logger.info { "Installing RBS files for collection: #{config_path}" }
+          lockfile_path = RBS::Collection::Config.to_lockfile_path(config_path)
+          io = StringIO.new
+          begin
+            RBS::Collection::Installer.new(lockfile_path: lockfile_path, stdout: io).install_from_lockfile()
+            target.options.load_collection_lock(force: true)
+            Steep.ui_logger.debug { "Finished setting up RBS collection: " + io.string }
+
+            result = target.options.load_collection_lock(force: true)
+            unless result.is_a?(RBS::Collection::Config::Lockfile)
+              raise "Failed to set up RBS collection: #{result.inspect}"
+            end
+          rescue => exn
+            Steep.ui_logger.error { "Failed to set up RBS collection: #{exn.inspect}" }
+          end
+        end
+
         def request_id
           SecureRandom.alphanumeric(10)
         end

data/lib/steep/project/pattern.rb

@@ -50,6 +50,10 @@ module Steep
         patterns.any? {|pat| File.fnmatch(pat, string, File::FNM_PATHNAME) } ||
           prefixes.any? {|prefix| File.fnmatch("#{prefix}**/*#{ext}", string, File::FNM_PATHNAME) }
       end
+
+      def empty?
+        patterns.empty?
+      end
     end
   end
 end

data/lib/steep/server/custom_methods.rb

@@ -29,6 +29,14 @@ module Steep
         end
       end
 
+      module TypeCheckGroups
+        METHOD = "$/steep/typecheck/groups"
+
+        def self.notification(params)
+          { method: METHOD, params: params }
+        end
+      end
+
       module TypeCheck__Start
         METHOD = "$/steep/typecheck/start"
 
@@ -56,6 +64,14 @@ module Steep
           { id: id, result: result }
         end
       end
+
+      module Groups
+        METHOD = "$/steep/groups"
+
+        def self.response(id, result)
+          { id: id, result: result }
+        end
+      end
     end
   end
 end

data/lib/steep/server/master.rb

@@ -382,7 +382,11 @@ module Steep
                       declaration_provider: false,
                       implementation_provider: true,
                       type_definition_provider: true
-                    )
+                    ),
+                    server_info: {
+                      name: "steep",
+                      version: VERSION
+                    }
                   )
                 }
               )
@@ -657,6 +661,18 @@ module Steep
 
           start_type_check(request: request, last_request: nil)
 
+        when CustomMethods::TypeCheckGroups::METHOD
+          params = message[:params] #: CustomMethods::TypeCheckGroups::params
+
+          groups = params.fetch(:groups)
+
+          progress = work_done_progress(SecureRandom.uuid)
+          progress.begin("Type checking #{groups.empty? ? "project" : groups.join(", ")}", request_id: fresh_request_id)
+
+          request = controller.make_group_request(groups, progress: progress)
+          request.needs_response = false
+          start_type_check(request: request, last_request: current_type_check_request, report_progress_threshold: 0)
+
         when "$/ping"
           enqueue_write_job SendMessageJob.to_client(
             message: {
@@ -665,6 +681,25 @@ module Steep
             }
           )
 
+        when CustomMethods::Groups::METHOD
+          groups = [] #: Array[String]
+
+          project.targets.each do |target|
+            unless target.source_pattern.empty? && target.signature_pattern.empty?
+              groups << target.name.to_s
+            end
+
+            target.groups.each do |group|
+              unless group.source_pattern.empty? && group.signature_pattern.empty?
+                groups << "#{target.name}.#{group.name}"
+              end
+            end
+          end
+
+          enqueue_write_job(SendMessageJob.to_client(
+            message: CustomMethods::Groups.response(message[:id], groups)
+          ))
+
         when "shutdown"
           start_type_checking_queue.cancel
 

data/lib/steep/server/type_check_controller.rb

@@ -254,6 +254,50 @@ module Steep
         end
       end
 
+      def make_group_request(groups, progress:)
+        TypeCheckController::Request.new(guid: progress.guid, progress: progress).tap do |request|
+          if groups.empty?
+            files.signature_paths.each do |path, target_group|
+              target_group = target_group.target if target_group.is_a?(Project::Group)
+              request.signature_paths << [target_group.name, path]
+            end
+            files.source_paths.each do |path, target_group|
+              target_group = target_group.target if target_group.is_a?(Project::Group)
+              request.code_paths << [target_group.name, path]
+            end
+          else
+            group_set = groups.map do |group_name|
+              target_name, group_name = group_name.split(".", 2)
+              target_name or raise
+
+              target_name = target_name.to_sym
+              group_name = group_name.to_sym if group_name
+
+              if group_name
+                if target = project.targets.find {|target| target.name == target_name }
+                  target.groups.find {|group| group.name == group_name }
+                end
+              else
+                project.targets.find {|target| target.name == target_name }
+              end
+            end.compact.to_set
+
+            files.signature_paths.each do |path, target_group|
+              if group_set.include?(target_group)
+                target_group = target_group.target if target_group.is_a?(Project::Group)
+                request.signature_paths << [target_group.name, path]
+              end
+            end
+            files.source_paths.each do |path, target_group|
+              if group_set.include?(target_group)
+                target_group = target_group.target if target_group.is_a?(Project::Group)
+                request.code_paths << [target_group.name, path]
+              end
+            end
+          end
+        end
+      end
+
       def make_request(guid: SecureRandom.uuid, include_unchanged: false, progress:)
         TypeCheckController::Request.new(guid: guid, progress: progress).tap do |request|
           if include_unchanged

data/lib/steep/type_construction.rb

@@ -1436,7 +1436,7 @@ module Steep
                 # ok
               else
                 unless hint == pair.type
-                  pair.constr.typing.add_error Diagnostic::Ruby::FallbackAny.new(node: node)
+                  pair.constr.typing.add_error Diagnostic::Ruby::UnannotatedEmptyCollection.new(node: node)
                 end
               end
             end
@@ -1704,7 +1704,7 @@ module Steep
                   add_typing node, type: array
                 end
               else
-                typing.add_error Diagnostic::Ruby::FallbackAny.new(node: node)
+                typing.add_error Diagnostic::Ruby::UnannotatedEmptyCollection.new(node: node)
                 add_typing node, type: AST::Builtin::Array.instance_type(AST::Builtin.any_type)
               end
             else
@@ -4763,6 +4763,15 @@ module Steep
 
     def try_tuple_type!(node, hint: nil)
       if node.type == :array
+        if node.children.size == 1 && node.children[0]&.type == :splat
+          # Skip the array construct
+          splat_node = node.children[0] or raise
+          splat_value = splat_node.children[0] or raise
+
+          type, constr = try_tuple_type!(splat_value, hint: hint)
+          _, constr = constr.add_typing(splat_node, type: AST::Types::Any.instance)
+          return constr.add_typing(node, type: type)
+        end
         if hint.nil? || hint.is_a?(AST::Types::Tuple)
           typing.new_child() do |child_typing|
             if pair = with_new_typing(child_typing).try_tuple_type(node, hint)

data/lib/steep/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.9.0.dev.1
+  version: 1.9.0.dev.2
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -245,6 +245,7 @@ files:
 - bin/output_rebaseline.rb
 - bin/output_test.rb
 - bin/rbs
+- bin/rbs-inline
 - bin/setup
 - bin/stackprof_test.rb
 - bin/steep
@@ -412,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Gradual Typing for Ruby