steep 1.2.0.pre.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16805860000461131410384bf4faece6263672c4e3378ecfe464e0f710322f61
-  data.tar.gz: 3c3bd23ed01ae1fc56f4ecb683e5ef1f6dfdba3ff131be88c93bd43f87b621b2
+  metadata.gz: 350eb85d965ebe0f830b76a4866e2380fbc03d19bdafb5c683e5cf426fff35f4
+  data.tar.gz: 6be02c8f8628ea4a4c3f701fb4066d678a0237c3079245e2738380a41975dff0
 SHA512:
-  metadata.gz: 73c14bad856adc3a5bfbd4f10604a6e42ce73fc338e8891a50de91d86e971a42195aff504fb9c1d9eee41ef39bed8ec05d0622a5208403a2e4d219f3f8a3e85d
-  data.tar.gz: 2c94b001a204c73498532062c14db1c01fb67b0562f18c815be5ca3dd99ceeea44e65ea13f17909dc6d7f3a00a885810ab0ec3d9d58f9a734913c06566712a42
+  metadata.gz: 8d18a11bf1ee0e927651727dde99a9db70e99669c91b37e361b0c4cf1dff6d0b4aab914a63480a4db8477fe49694ab4ba74e99aad4b27f6df64e664ec3d53ca2
+  data.tar.gz: 0cf526b1068660ffc759b41f1f197bf85b4f1590619bd2198b6f5fb5e770d26a2c617d53d00aa475cdacfd154eab1fcc1de5ff394da4ef804873b29f5fd9794a

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## master
 
+## 1.2.1 (2022-10-22)
+
+### Type checker core
+
+* Fix type narrowing on case-when ([#662](https://github.com/soutaro/steep/pull/662))
+
+## 1.2.0 (2022-10-08)
+
+### Commandline tool
+
+* Refactor `--jobs` and `--steep-command` option handling ([#654](https://github.com/soutaro/steep/pull/654))
+
+### Miscellaneous
+
+* Delete debug prints ([#653](https://github.com/soutaro/steep/pull/653))
+* Update RBS to 2.7.0 ([#655](https://github.com/soutaro/steep/pull/655))
+
 ## 1.2.0.pre.1 (2022-10-06)
 
 ### Type checker core
@@ -9,8 +26,7 @@
 * Support type checking block/proc self type binding ([#637](https://github.com/soutaro/steep/pull/637))
 * Type check multiple assignment on block parameters ([#641](https://github.com/soutaro/steep/pull/641), [#643](https://github.com/soutaro/steep/pull/643))
 * Make more multiple assignments type check ([#630](https://github.com/soutaro/steep/pull/630))
-* Refactor *shape* calculation ([#635](https://github.com/soutaro/steep/pull/635), [#649
-](https://github.com/soutaro/steep/pull/649))
+* Refactor *shape* calculation ([#635](https://github.com/soutaro/steep/pull/635), [#649](https://github.com/soutaro/steep/pull/649))
 * Report type errors if argument mismatch on yield ([#640](https://github.com/soutaro/steep/pull/640))
 * Relax caching requirements to cache more results ([#651](https://github.com/soutaro/steep/pull/651))
 

data/Gemfile.lock

@@ -1,15 +1,20 @@
 PATH
   remote: .
   specs:
-    steep (1.2.0.pre.1)
+    steep (1.2.1)
       activesupport (>= 5.1)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
+      logger (>= 1.3.0)
       parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.7.0.pre)
+      rbs (>= 2.7.0)
       securerandom (>= 0.1)
+      strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
 
 GEM
@@ -22,16 +27,20 @@ GEM
       tzinfo (~> 2.0)
     ast (2.4.2)
     concurrent-ruby (1.1.10)
+    csv (3.2.5)
     debase (0.2.5.beta2)
       debase-ruby_core_source (>= 0.10.12)
     debase-ruby_core_source (0.10.16)
     ffi (1.15.5)
+    fileutils (1.6.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.2)
     language_server-protocol (3.17.0.1)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.5.1)
     minitest (5.16.3)
     minitest-hooks (1.5.0)
       minitest (> 5.3)
@@ -45,11 +54,12 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.7.0.pre.3)
+    rbs (2.7.0)
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     securerandom (0.2.0)
     stackprof (0.2.21)
+    strscan (3.0.4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.5)

data/Gemfile.steep

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem 'steep', '~> 1.1.0'
-gem "rbs", "~> 2.7.pre"
+gem 'steep', '~> 1.2.0'
+gem "rbs"

data/Gemfile.steep.lock

@@ -23,15 +23,17 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.7.0.pre.2)
-    steep (1.1.1)
+    rbs (2.7.0)
+    securerandom (0.2.0)
+    steep (1.2.0)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 2.3.2)
+      rbs (>= 2.7.0)
+      securerandom (>= 0.1)
       terminal-table (>= 2, < 4)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -43,8 +45,8 @@ PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
-  rbs (~> 2.7.pre)
-  steep (~> 1.1.0)
+  rbs
+  steep (~> 1.2.0)
 
 BUNDLED WITH
    2.3.15

data/Steepfile

@@ -1,28 +1,28 @@
+D = Steep::Diagnostic
+
 target :app do
   check "lib"
   signature "sig"
 
   collection_config "rbs_collection.steep.yaml"
 
+  configure_code_diagnostics do |hash|             # You can setup everything yourself
+    hash[D::Ruby::MethodDefinitionMissing] = :hint
+  end
+
   signature "../rbs/sig", "../rbs/stdlib/rdoc/0"
   library(
     "set",
     "pathname",
-    "json",
-    "logger",
     "monitor",
     "tsort",
     "uri",
     'yaml',
-    'dbm',
     'pstore',
     'singleton',
     'shellwords',
-    'fileutils',
     'find',
     'digest',
-    "strscan",
-    "rubygems",
     "optparse",
     "securerandom"
   )

data/lib/steep/cli.rb

@@ -43,7 +43,9 @@ module Steep
     end
 
     def setup_command
-      @command = argv.shift&.to_sym
+      return false unless command = argv.shift&.to_sym
+      @command = command
+
       if CLI.available_commands.include?(@command) || @command == :worker || @command == :vendor
         true
       else
@@ -74,16 +76,13 @@ module Steep
       end
     end
 
-    def handle_jobs_option(command, opts, modifier = 0)
-      default = physical_processor_count + modifier
-      command.jobs_count = default
-      opts.on("-j N", "--jobs=N", "Specify the number of type check workers (defaults: #{default})") do |count|
-        command.jobs_count = Integer(count) if Integer(count) > 0
+    def handle_jobs_option(option, opts)
+      opts.on("-j N", "--jobs=N", "Specify the number of type check workers (defaults: #{option.default_jobs_count})") do |count|
+        option.jobs_count = Integer(count) if Integer(count) > 0
       end
 
-      command.steep_command = "steep"
       opts.on("--steep-command=COMMAND", "Specify command to exec Steep CLI for worker (defaults: steep)") do |cmd|
-        command.steep_command = cmd
+        option.steep_command = cmd
       end
     end
 
@@ -115,7 +114,7 @@ module Steep
           opts.on("--severity-level=LEVEL", /^error|warning|information|hint$/, "Specify the minimum diagnostic severity to be recognized as an error (defaults: warning): error, warning, information, or hint") do |level|
             check.severity_level = level.to_sym
           end
-          handle_jobs_option check, opts
+          handle_jobs_option check.jobs_option, opts
           handle_logging_options opts
         end.parse!(argv)
 
@@ -138,7 +137,7 @@ module Steep
               check.stdin_input[Pathname(object[:path])] = object[:content]
             end
           end
-          handle_jobs_option check, opts
+          handle_jobs_option check.jobs_option, opts
           handle_logging_options opts
         end.parse!(argv)
 
@@ -153,7 +152,7 @@ module Steep
 
           opts.on("--steepfile=PATH") {|path| check.steepfile = Pathname(path) }
           opts.on("--format=FORMAT", "Specify output format: csv, table") {|format| check.format = format }
-          handle_jobs_option check, opts
+          handle_jobs_option check.jobs_option, opts
           handle_logging_options opts
         end.parse!(argv)
 
@@ -197,7 +196,7 @@ module Steep
           opts.on("--severity-level=LEVEL", /^error|warning|information|hint$/, "Specify the minimum diagnostic severity to be recognized as an error (defaults: warning): error, warning, information, or hint") do |level|
             command.severity_level = level.to_sym
           end
-          handle_jobs_option command, opts
+          handle_jobs_option command.jobs_option, opts
           handle_logging_options opts
         end.parse!(argv)
 
@@ -210,7 +209,7 @@ module Steep
       Drivers::Langserver.new(stdout: stdout, stderr: stderr, stdin: stdin).tap do |command|
         OptionParser.new do |opts|
           opts.on("--steepfile=PATH") {|path| command.steepfile = Pathname(path) }
-          handle_jobs_option command, opts, -1
+          handle_jobs_option command.jobs_option, opts
           handle_logging_options opts
         end.parse!(argv)
       end.run

data/lib/steep/drivers/check.rb

@@ -9,15 +9,16 @@ module Steep
       attr_accessor :with_expectations_path
       attr_accessor :save_expectations_path
       attr_accessor :severity_level
+      attr_reader :jobs_option
 
       include Utils::DriverHelper
-      include Utils::JobsCount
 
       def initialize(stdout:, stderr:)
         @stdout = stdout
         @stderr = stderr
         @command_line_patterns = []
         @severity_level = :warning
+        @jobs_option = Utils::JobsOption.new()
       end
 
       def run
@@ -39,8 +40,8 @@ module Steep
           steepfile: project.steepfile_path,
           args: command_line_patterns,
           delay_shutdown: true,
-          steep_command: steep_command,
-          count: jobs_count
+          steep_command: jobs_option.steep_command_value,
+          count: jobs_option.jobs_count_value
         )
 
         master = Server::Master.new(

data/lib/steep/drivers/checkfile.rb

@@ -8,9 +8,9 @@ module Steep
       attr_reader :command_line_args
       attr_accessor :all_ruby, :all_rbs
       attr_reader :stdin_input
+      attr_reader :jobs_option
 
       include Utils::DriverHelper
-      include Utils::JobsCount
 
       def initialize(stdout:, stderr:)
         @stdout = stdout
@@ -20,6 +20,8 @@ module Steep
         @all_rbs = false
         @all_ruby = false
         @stdin_input = {}
+
+        @jobs_option = Utils::JobsOption.new()
       end
 
       def run
@@ -88,10 +90,13 @@ module Steep
         files = target_paths + signature_paths
 
         count =
-          if files.size >= jobs_count
-            jobs_count
+          if jobs_option.jobs_count
+            jobs_option.jobs_count
           else
-            files.size + 2
+            [
+              files.size + 2,
+              jobs_option.default_jobs_count
+            ].min || raise
           end
 
         Steep.logger.info { "Starting #{count} workers for #{files.size} files..." }
@@ -100,7 +105,7 @@ module Steep
           steepfile: project.steepfile_path,
           args: [],
           delay_shutdown: true,
-          steep_command: steep_command,
+          steep_command: jobs_option.steep_command_value,
           count: count
         )
 

data/lib/steep/drivers/langserver.rb

@@ -4,15 +4,12 @@ module Steep
       attr_reader :stdout
       attr_reader :stderr
       attr_reader :stdin
-      attr_reader :latest_update_version
       attr_reader :write_mutex
       attr_reader :type_check_queue
       attr_reader :type_check_thread
+      attr_reader :jobs_option
 
       include Utils::DriverHelper
-      include Utils::JobsCount
-
-      TypeCheckRequest = Struct.new(:version, keyword_init: true)
 
       def initialize(stdout:, stderr:, stdin:)
         @stdout = stdout
@@ -20,6 +17,7 @@ module Steep
         @stdin = stdin
         @write_mutex = Mutex.new
         @type_check_queue = Queue.new
+        @jobs_option = Utils::JobsOption.new(jobs_count_modifier: -1)
       end
 
       def writer
@@ -37,8 +35,8 @@ module Steep
       def run
         @project = load_config()
 
-        interaction_worker = Server::WorkerProcess.spawn_worker(:interaction, name: "interaction", steepfile: project.steepfile_path, steep_command: steep_command)
-        typecheck_workers = Server::WorkerProcess.spawn_typecheck_workers(steepfile: project.steepfile_path, args: [], steep_command: steep_command, count: jobs_count)
+        interaction_worker = Server::WorkerProcess.spawn_worker(:interaction, name: "interaction", steepfile: project.steepfile_path, steep_command: jobs_option.steep_command_value)
+        typecheck_workers = Server::WorkerProcess.spawn_typecheck_workers(steepfile: project.steepfile_path, args: [], steep_command: jobs_option.steep_command_value, count: jobs_option.jobs_count_value)
 
         master = Server::Master.new(
           project: project,

data/lib/steep/drivers/stats.rb

@@ -100,14 +100,15 @@ module Steep
       attr_reader :stderr
       attr_reader :command_line_patterns
       attr_accessor :format
+      attr_reader :jobs_option
 
       include Utils::DriverHelper
-      include Utils::JobsCount
 
       def initialize(stdout:, stderr:)
         @stdout = stdout
         @stderr = stderr
         @command_line_patterns = []
+        @jobs_option = Utils::JobsOption.new()
       end
 
       def run
@@ -129,8 +130,8 @@ module Steep
           steepfile: project.steepfile_path,
           delay_shutdown: true,
           args: command_line_patterns,
-          steep_command: steep_command,
-          count: jobs_count
+          steep_command: jobs_option.steep_command_value,
+          count: jobs_option.jobs_count_value
         )
 
         master = Server::Master.new(

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

@@ -0,0 +1,27 @@
+module Steep
+  module Drivers
+    module Utils
+      class JobsOption
+        attr_accessor :jobs_count, :steep_command, :jobs_count_modifier
+
+        include Parallel::ProcessorCount
+
+        def initialize(jobs_count_modifier: 0)
+          @jobs_count_modifier = jobs_count_modifier
+        end
+
+        def default_jobs_count
+          physical_processor_count + jobs_count_modifier
+        end
+
+        def jobs_count_value
+          jobs_count || default_jobs_count
+        end
+
+        def steep_command_value
+          steep_command || "steep"
+        end
+      end
+    end
+  end
+end

data/lib/steep/drivers/watch.rb

@@ -6,9 +6,9 @@ module Steep
       attr_reader :stderr
       attr_reader :queue
       attr_accessor :severity_level
+      attr_reader :jobs_option
 
       include Utils::DriverHelper
-      include Utils::JobsCount
 
       LSP = LanguageServer::Protocol
 
@@ -18,6 +18,7 @@ module Steep
         @stderr = stderr
         @queue = Thread::Queue.new
         @severity_level = :warning
+        @jobs_option = Utils::JobsOption.new()
       end
 
       def watching?(changed_path, files:, dirs:)
@@ -41,7 +42,7 @@ module Steep
         server_reader = LanguageServer::Protocol::Transport::Io::Reader.new(server_read)
         server_writer = LanguageServer::Protocol::Transport::Io::Writer.new(server_write)
 
-        typecheck_workers = Server::WorkerProcess.spawn_typecheck_workers(steepfile: project.steepfile_path, args: dirs.map(&:to_s), steep_command: steep_command, count: jobs_count)
+        typecheck_workers = Server::WorkerProcess.spawn_typecheck_workers(steepfile: project.steepfile_path, args: dirs.map(&:to_s), steep_command: jobs_option.steep_command_value, count: jobs_option.jobs_count_value)
 
         master = Server::Master.new(
           project: project,
@@ -51,7 +52,7 @@ module Steep
           typecheck_workers: typecheck_workers
         )
         master.typecheck_automatically = false
-        master.commandline_args.push(*dirs)
+        master.commandline_args.push(*dirs.map(&:to_s))
 
         main_thread = Thread.start do
           master.start()
@@ -99,6 +100,7 @@ module Steep
             end
 
             removed.each do |path|
+              p = Pathname(path)
               if watching?(p, files: file_paths, dirs: dir_paths)
                 client_writer.write(
                   method: "textDocument/didChange",
@@ -112,7 +114,7 @@ module Steep
           end
 
           client_writer.write(method: "$/typecheck", params: { guid: nil })
-          
+
           stdout.puts Rainbow("done!").bold
         end.tap(&:start)
 
@@ -124,8 +126,7 @@ module Steep
           client_reader.read do |response|
             case response[:method]
             when "textDocument/publishDiagnostics"
-              uri = URI.parse(response[:params][:uri])
-              path = project.relative_path(Pathname(uri.path))
+              path = PathHelper.to_pathname(response[:params][:uri]) or break
               buffer = RBS::Buffer.new(content: path.read, name: path)
               printer = DiagnosticPrinter.new(stdout: stdout, buffer: buffer)
 

data/lib/steep/source.rb

@@ -73,8 +73,6 @@ module Steep
 
       if node
         construct_mapping(node: node, annotations: annotations, mapping: mapping)
-      else
-        Steep.logger.fatal { "#{path} is empty source code" }
       end
 
       annotations.each do |annot|

data/lib/steep/subtyping/check.rb

@@ -194,7 +194,6 @@ module Steep
           fvs = relation.sub_type.free_variables + relation.super_type.free_variables
           cached = cache[relation, @self_type, @instance_type, @class_type, bounds]
           if cached && fvs.none? {|var| constraints.unknown?(var) }
-            Steep.logger.fatal { { cached: relation.to_s }.inspect }
             cached
           else
             if assumptions.member?(relation)

data/lib/steep/type_inference/logic_type_interpreter.rb

@@ -373,17 +373,41 @@ module Steep
           ]
 
         else
+          # There are four possible relations between `type` and `instance_type`
+          #
+          # ```ruby
+          # case object      # object: T
+          # when K           # K: singleton(K)
+          # when ...
+          # end
+          # ````
+          #
+          # 1. T <: K && K <: T (T == K, T = Integer, K = Numeric)
+          # 2. T <: K           (example: T = Integer, K = Numeric)
+          # 3. K <: T           (example: T = Numeric, K = Integer)
+          # 4. none of the above (example: T = String, K = Integer)
+
           relation = Subtyping::Relation.new(sub_type: type, super_type: instance_type)
           if subtyping.check(relation, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.new, instance_type: AST::Types::Instance.new, class_type: AST::Types::Class.new).success?
+            # 1 or 2. Satisfies the condition, no narrowing because `type` is already more specific than/equals to `instance_type`
             [
               [type],
               []
             ]
           else
-            [
-              [],
-              [type]
-            ]
+            if subtyping.check(relation.flip, constraints: Subtyping::Constraints.empty, self_type: AST::Types::Self.new, instance_type: AST::Types::Instance.new, class_type: AST::Types::Class.new).success?
+              # 3. Satisfied the condition, narrows to `instance_type`, but cannot remove it from *falsy* list
+              [
+                [instance_type],
+                [type]
+              ]
+            else
+              # 4
+              [
+                [],
+                [type]
+              ]
+            end
           end
         end
       end

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "1.2.0.pre.1"
+  VERSION = "1.2.1"
 end

data/lib/steep.rb

@@ -125,7 +125,7 @@ require "steep/project/dsl"
 
 require "steep/expectations"
 require "steep/drivers/utils/driver_helper"
-require "steep/drivers/utils/jobs_count"
+require "steep/drivers/utils/jobs_option"
 require "steep/drivers/check"
 require "steep/drivers/checkfile"
 require "steep/drivers/stats"

data/rbs_collection.steep.lock.yaml

@@ -10,12 +10,16 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: dbm
+  version: '0'
+  source:
+    type: stdlib
 - name: activesupport
   version: '6.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: dc7059ea0cdf67f486ca9cea2b01d53f04724652
+    revision: 84a7431af1db405ef827bfdd171a37a1416f6099
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -23,25 +27,41 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: dc7059ea0cdf67f486ca9cea2b01d53f04724652
+    revision: 84a7431af1db405ef827bfdd171a37a1416f6099
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: csv
+  version: '0'
+  source:
+    type: stdlib
+- name: fileutils
+  version: '0'
+  source:
+    type: stdlib
 - name: i18n
   version: '1.10'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: dc7059ea0cdf67f486ca9cea2b01d53f04724652
+    revision: 84a7431af1db405ef827bfdd171a37a1416f6099
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: json
+  version: '0'
+  source:
+    type: stdlib
 - name: listen
   version: '3.2'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: dc7059ea0cdf67f486ca9cea2b01d53f04724652
+    revision: 84a7431af1db405ef827bfdd171a37a1416f6099
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: logger
+  version: '0'
+  source:
+    type: stdlib
 - name: minitest
   version: '0'
   source:
@@ -51,7 +71,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: dc7059ea0cdf67f486ca9cea2b01d53f04724652
+    revision: 84a7431af1db405ef827bfdd171a37a1416f6099
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rainbow
@@ -59,26 +79,26 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: dc7059ea0cdf67f486ca9cea2b01d53f04724652
+    revision: 84a7431af1db405ef827bfdd171a37a1416f6099
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: securerandom
   version: '0'
   source:
     type: stdlib
-- name: monitor
+- name: strscan
   version: '0'
   source:
     type: stdlib
-- name: date
+- name: monitor
   version: '0'
   source:
     type: stdlib
-- name: singleton
+- name: date
   version: '0'
   source:
     type: stdlib
-- name: logger
+- name: singleton
   version: '0'
   source:
     type: stdlib
@@ -94,3 +114,7 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: forwardable
+  version: '0'
+  source:
+    type: stdlib

data/rbs_collection.steep.yaml

@@ -18,3 +18,4 @@ gems:
     ignore: true
   - name: with_steep_types
     ignore: true
+  - name: dbm

data/sig/shims/parallel.rbs

@@ -0,0 +1,5 @@
+module Parallel
+  module ProcessorCount
+    def physical_processor_count: () -> Integer
+  end
+end

data/sig/steep/cli.rbs

@@ -0,0 +1,55 @@
+module Steep
+  class CLI
+    attr_reader argv: Array[String]
+
+    attr_reader stdout: IO
+
+    attr_reader stdin: IO
+
+    attr_reader stderr: IO
+
+    attr_reader command: Symbol
+
+    include Parallel::ProcessorCount
+
+    def initialize: (stdout: IO, stdin: IO, stderr: IO, argv: Array[String]) -> void
+
+    def self.available_commands: () -> ::Array[Symbol]
+
+    def process_global_options: () -> bool
+
+    def setup_command: () -> bool
+
+    def run: () -> Integer
+
+    def handle_logging_options: (OptionParser opts) -> void
+
+    def handle_jobs_option: (Drivers::Utils::JobsOption jobs_option, OptionParser opts) -> void
+
+    def process_init: () -> Integer
+
+    def process_check: () -> Integer
+
+    def process_checkfile: () -> Integer
+
+    def process_stats: () -> Integer
+
+    def process_validate: () -> Integer
+
+    def process_annotations: () -> Integer
+
+    def process_project: () -> Integer
+
+    def process_watch: () -> Integer
+
+    def process_langserver: () -> Integer
+
+    def process_vendor: () -> Integer
+
+    def process_binstub: () -> Integer
+
+    def process_version: () -> Integer
+
+    def process_worker: () -> Integer
+  end
+end

data/sig/steep/drivers/check.rbs

@@ -15,9 +15,9 @@ module Steep
 
       attr_accessor severity_level: untyped
 
-      include Utils::DriverHelper
+      attr_reader jobs_option: Utils::JobsOption
 
-      include Utils::JobsCount
+      include Utils::DriverHelper
 
       def initialize: (stdout: untyped, stderr: untyped) -> void
 

data/sig/steep/drivers/checkfile.rbs

@@ -10,7 +10,6 @@ module Steep
       attr_reader command_line_args: Array[String]
 
       include Utils::DriverHelper
-      include Utils::JobsCount
 
       attr_accessor all_rbs: bool
 
@@ -18,6 +17,8 @@ module Steep
 
       attr_reader stdin_input: Hash[Pathname, String]
 
+      attr_reader jobs_option: Utils::JobsOption
+
       def initialize: (stdout: IO, stderr: IO) -> void
 
       def run: () -> Integer

data/sig/steep/drivers/langserver.rbs

@@ -1,35 +1,36 @@
 module Steep
   module Drivers
     class Langserver
-      attr_reader stdout: untyped
+      attr_reader stdout: IO
 
-      attr_reader stderr: untyped
+      attr_reader stderr: IO
 
-      attr_reader stdin: untyped
+      attr_reader stdin: IO
 
-      attr_reader latest_update_version: untyped
+      attr_reader write_mutex: Thread::Mutex
 
-      attr_reader write_mutex: untyped
+      attr_reader type_check_queue: Thread::Queue
 
-      attr_reader type_check_queue: untyped
+      attr_reader type_check_thread: Thread
 
-      attr_reader type_check_thread: untyped
+      attr_reader jobs_option: Utils::JobsOption
 
       include Utils::DriverHelper
 
-      include Utils::JobsCount
+      def initialize: (stdout: untyped, stderr: untyped, stdin: untyped) -> void
 
-      TypeCheckRequest: untyped
+      @writer: LanguageServer::Protocol::Transport::Io::Writer?
 
-      def initialize: (stdout: untyped, stderr: untyped, stdin: untyped) -> void
+      def writer: () -> LanguageServer::Protocol::Transport::Io::Writer
 
-      def writer: () -> untyped
+      @reader: LanguageServer::Protocol::Transport::Io::Reader?
 
-      def reader: () -> untyped
+      def reader: () -> LanguageServer::Protocol::Transport::Io::Reader
 
-      def project: () -> untyped
+      @project: Project
+      def project: () -> Project
 
-      def run: () -> 0
+      def run: () -> Integer
     end
   end
 end

data/sig/steep/drivers/stats.rbs

@@ -1,35 +1,45 @@
 module Steep
   module Drivers
     class Stats
+      type file_stats = {
+        type: String,
+        target: String,
+        path: String,
+        type: String,
+        typed_calls: Integer,
+        untyped_calls: Integer,
+        total_calls: Integer
+      }
+
       class CSVPrinter
-        attr_reader io: untyped
+        attr_reader io: IO
 
-        def initialize: (io: untyped) -> void
+        def initialize: (io: IO) -> void
 
-        def print: (untyped stats_result) -> untyped
+        def print: (Array[file_stats] stats_result) -> void
       end
 
       class TablePrinter
-        attr_reader io: untyped
+        attr_reader io: IO
 
-        def initialize: (io: untyped) -> void
+        def initialize: (io: IO) -> void
 
-        def print: (untyped stats_result) -> untyped
+        def print: (Array[file_stats] stats_result) -> void
       end
 
-      attr_reader stdout: untyped
+      attr_reader stdout: IO
 
-      attr_reader stderr: untyped
+      attr_reader stderr: IO
 
-      attr_reader command_line_patterns: untyped
+      attr_reader command_line_patterns: Array[String]
 
-      attr_accessor format: untyped
+      attr_accessor format: "csv" | "table" | nil
 
-      include Utils::DriverHelper
+      attr_reader jobs_option: Utils::JobsOption
 
-      include Utils::JobsCount
+      include Utils::DriverHelper
 
-      def initialize: (stdout: untyped, stderr: untyped) -> void
+      def initialize: (stdout: IO, stderr: IO) -> void
 
       def run: () -> 0
     end

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

@@ -0,0 +1,23 @@
+module Steep
+  module Drivers
+    module Utils
+      class JobsOption
+        attr_accessor jobs_count: Integer?
+
+        attr_accessor steep_command: String?
+
+        attr_reader jobs_count_modifier: Integer
+
+        include Parallel::ProcessorCount
+
+        def initialize: (?jobs_count_modifier: Integer) -> void
+
+        def default_jobs_count: () -> Integer
+
+        def jobs_count_value: () -> Integer
+
+        def steep_command_value: () -> String
+      end
+    end
+  end
+end

data/sig/steep/drivers/watch.rbs

@@ -1,27 +1,27 @@
 module Steep
   module Drivers
     class Watch
-      attr_reader dirs: untyped
+      attr_reader dirs: Array[Pathname]
 
-      attr_reader stdout: untyped
+      attr_reader stdout: IO
 
-      attr_reader stderr: untyped
+      attr_reader stderr: IO
 
-      attr_reader queue: untyped
+      attr_reader queue: Thread::Queue
 
-      attr_accessor severity_level: untyped
+      attr_accessor severity_level: Symbol
 
-      include Utils::DriverHelper
+      attr_reader jobs_option: Utils::JobsOption
 
-      include Utils::JobsCount
+      include Utils::DriverHelper
 
-      LSP: untyped
+      LSP: singleton(LanguageServer::Protocol)
 
-      def initialize: (stdout: untyped, stderr: untyped) -> void
+      def initialize: (stdout: IO, stderr: IO) -> void
 
-      def watching?: (untyped changed_path, files: untyped, dirs: untyped) -> untyped
+      def watching?: (Pathname changed_path, files: Set[Pathname], dirs: Set[Pathname]) -> bool
 
-      def run: () -> (1 | 0)
+      def run: () -> Integer
     end
   end
 end

data/sig/steep/path_helper.rbs

@@ -1,7 +1,13 @@
 module Steep
   module PathHelper
+    # Receives a String that represents a *file* URI and returns a Pathname
+    #
+    # Returns `nil` when the schema of given URI is not `file://`.
+    #
     def self?.to_pathname: (String uri, ?dosish: bool) -> Pathname?
 
+    # Receives a Pathname and returns a *file* URI
+    # 
     def self?.to_uri: (Pathname path, ?dosish: bool) -> URI::File
   end
 end

data/steep.gemspec

@@ -33,8 +33,13 @@ 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.7.0.pre"
+  spec.add_runtime_dependency "rbs", ">= 2.7.0"
   spec.add_runtime_dependency "parallel", ">= 1.0.0"
   spec.add_runtime_dependency "terminal-table", ">= 2", "< 4"
   spec.add_runtime_dependency "securerandom", ">= 0.1"
+  spec.add_runtime_dependency "json", ">= 2.1.0"
+  spec.add_runtime_dependency "logger", ">= 1.3.0"
+  spec.add_runtime_dependency "fileutils", ">= 1.1.0"
+  spec.add_runtime_dependency "strscan", ">= 1.0.0"
+  spec.add_runtime_dependency "csv", ">= 3.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.pre
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0.pre
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +154,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: fileutils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: strscan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
@@ -225,7 +295,7 @@ files:
 - lib/steep/drivers/print_project.rb
 - lib/steep/drivers/stats.rb
 - lib/steep/drivers/utils/driver_helper.rb
-- lib/steep/drivers/utils/jobs_count.rb
+- lib/steep/drivers/utils/jobs_option.rb
 - lib/steep/drivers/validate.rb
 - lib/steep/drivers/vendor.rb
 - lib/steep/drivers/watch.rb
@@ -303,6 +373,7 @@ files:
 - sample/sig/conference.rbs
 - sample/sig/length.rbs
 - sig/shims/language-server_protocol.rbs
+- sig/shims/parallel.rbs
 - sig/shims/parser.rbs
 - sig/shims/parser/source/map.rbs
 - sig/shims/parser/source/range.rbs
@@ -333,6 +404,7 @@ files:
 - sig/steep/ast/types/union.rbs
 - sig/steep/ast/types/var.rbs
 - sig/steep/ast/types/void.rbs
+- sig/steep/cli.rbs
 - sig/steep/diagnostic/deprecated/unknown_constant_assigned.rbs
 - sig/steep/diagnostic/helper.rbs
 - sig/steep/diagnostic/lsp_formatter.rbs
@@ -347,7 +419,7 @@ files:
 - sig/steep/drivers/print_project.rbs
 - sig/steep/drivers/stats.rbs
 - sig/steep/drivers/utils/driver_helper.rbs
-- sig/steep/drivers/utils/jobs_count.rbs
+- sig/steep/drivers/utils/jobs_option.rbs
 - sig/steep/drivers/validate.rbs
 - sig/steep/drivers/vendor.rbs
 - sig/steep/drivers/watch.rbs
@@ -682,11 +754,11 @@ 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.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Gradual Typing for Ruby

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

@@ -1,9 +0,0 @@
-module Steep
-  module Drivers
-    module Utils
-      module JobsCount
-        attr_accessor :jobs_count, :steep_command
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Steep
-  module Drivers
-    module Utils
-      module JobsCount
-        attr_accessor jobs_count: Integer
-
-        attr_accessor steep_command: String
-      end
-    end
-  end
-end