steep 1.3.0 → 1.4.0.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f878620b37610ff6bb38ba9f71c8275ebebf1a119969acca92dae226e9e82371
-  data.tar.gz: e5cfe0950b4cfe16d3ac2aeb0992601b5a0b43315736b637cae05792b0774bb9
+  metadata.gz: bdccb93c5fd95bbc2e6af98021d0beadfb7aab30f3b398cb9e8414d5ea0e6f38
+  data.tar.gz: 6dfab6ba13555e6a6c37c69950383e1e7608c21bc26eacf1a695de91a5fe6293
 SHA512:
-  metadata.gz: c81207ff4dd7893ccc4680b4d6bc1c74b36a59badbfac8c08f02f7ecb6e17f887bc440f40c2dcfe840f219df003c384d0365f54b55340c2ddce771492945b232
-  data.tar.gz: bca9c65b22080f4d8e4f8cf162146a7868f520f4f13e34c22e79a95e5ba81f186b914f422afb89918c6d095d896badcd07832a731d8dd0cd152a908a6f7a71ad
+  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/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)
+    steep (1.4.0.dev.1)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -11,6 +11,7 @@ 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)
       securerandom (>= 0.1)
@@ -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)
+    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,3 +1,4 @@
 source "https://rubygems.org"
 
-gem 'steep', '~> 1.3.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)
+    rbs (3.0.0.dev.1)
     securerandom (0.2.0)
-    steep (1.3.0.pre.2)
+    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.8.0.pre)
+      rbs (>= 2.8.0)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
@@ -55,7 +55,8 @@ PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
-  steep (~> 1.3.0.pre)
+  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/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/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,

data/lib/steep/project/options.rb

@@ -1,7 +1,9 @@
 module Steep
   class Project
     class Options
-      PathOptions = Struct.new(:core_root, :stdlib_root, :repo_paths, keyword_init: true) do
+      PathOptions = _ = Struct.new(:core_root, :stdlib_root, :repo_paths, keyword_init: true) do
+        # @implements PathOptions
+        
         def customized_stdlib?
           stdlib_root != nil
         end

data/lib/steep/version.rb

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

data/rbs_collection.steep.lock.yaml

@@ -1,29 +1,18 @@
 ---
 sources:
-- name: ruby/gem_rbs_collection
+- type: git
+  name: ruby/gem_rbs_collection
+  revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
   remote: https://github.com/ruby/gem_rbs_collection.git
-  revision: main
   repo_dir: gems
 path: ".gem_rbs_collection"
 gems:
-- name: set
-  version: '0'
-  source:
-    type: stdlib
-- name: rbs
-  version: 2.8.0
-  source:
-    type: rubygems
-- name: dbm
-  version: '0'
-  source:
-    type: stdlib
 - name: activesupport
   version: '6.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: ast
@@ -31,23 +20,35 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: csv
   version: '0'
   source:
     type: stdlib
+- name: date
+  version: '0'
+  source:
+    type: stdlib
+- name: dbm
+  version: '0'
+  source:
+    type: stdlib
 - name: fileutils
   version: '0'
   source:
     type: stdlib
+- name: forwardable
+  version: '0'
+  source:
+    type: stdlib
 - name: i18n
   version: '1.10'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: json
@@ -59,7 +60,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: logger
@@ -70,51 +71,51 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: monitor
+  version: '0'
+  source:
+    type: stdlib
+- name: mutex_m
+  version: '0'
+  source:
+    type: stdlib
+- name: optparse
+  version: '0'
+  source:
+    type: stdlib
 - name: parallel
   version: '1.20'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: pathname
+  version: '0'
+  source:
+    type: stdlib
 - name: rainbow
   version: '3.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 94fcc911186b127cffdfd7a378b5e0b511196089
+    revision: 6f9f54a753a78c505e63e7f31a48b3f71f1b510d
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
-- name: securerandom
-  version: '0'
-  source:
-    type: stdlib
-- name: strscan
-  version: '0'
-  source:
-    type: stdlib
-- name: pathname
-  version: '0'
-  source:
-    type: stdlib
-- name: optparse
-  version: '0'
-  source:
-    type: stdlib
-- name: tsort
-  version: '0'
+- name: rbs
+  version: 3.0.0.dev.1
   source:
-    type: stdlib
+    type: rubygems
 - name: rdoc
   version: '0'
   source:
     type: stdlib
-- name: monitor
+- name: securerandom
   version: '0'
   source:
     type: stdlib
-- name: date
+- name: set
   version: '0'
   source:
     type: stdlib
@@ -122,7 +123,7 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: mutex_m
+- name: strscan
   version: '0'
   source:
     type: stdlib
@@ -130,7 +131,7 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: forwardable
+- name: tsort
   version: '0'
   source:
     type: stdlib

data/sig/steep/index/rbs_index.rbs

@@ -2,89 +2,135 @@ module Steep
   module Index
     class RBSIndex
       class TypeEntry
-        attr_reader type_name: untyped
+        attr_reader type_name: RBS::TypeName
 
-        attr_reader declarations: untyped
+        type decl = RBS::AST::Declarations::Class
+                  | RBS::AST::Declarations::Module
+                  | RBS::AST::Declarations::Interface
+                  | RBS::AST::Declarations::Alias
 
-        attr_reader references: untyped
+        type ref = RBS::AST::Members::MethodDefinition
+                 | RBS::AST::Members::AttrWriter
+                 | RBS::AST::Members::AttrReader
+                 | RBS::AST::Members::AttrAccessor
+                 | RBS::AST::Members::Include
+                 | RBS::AST::Members::Extend
+                 | RBS::AST::Members::InstanceVariable
+                 | RBS::AST::Members::ClassVariable
+                 | RBS::AST::Members::ClassInstanceVariable
+                 | RBS::AST::Declarations::Module
+                 | RBS::AST::Declarations::Class
+                 | RBS::AST::Declarations::Constant
+                 | RBS::AST::Declarations::Global
+                 | RBS::AST::Declarations::Alias
 
-        def initialize: (type_name: untyped) -> void
+        attr_reader declarations: Set[decl]
 
-        def add_declaration: (untyped decl) -> untyped
+        attr_reader references: Set[ref]
 
-        def add_reference: (untyped ref) -> untyped
+        def initialize: (type_name: RBS::TypeName) -> void
+
+        def add_declaration: (decl decl) -> self
+
+        def add_reference: (ref) -> self
       end
 
       class MethodEntry
-        attr_reader method_name: untyped
+        attr_reader method_name: method_name
+
+        type decl = RBS::AST::Members::MethodDefinition
+                  | RBS::AST::Members::Alias
+                  | RBS::AST::Members::AttrWriter
+                  | RBS::AST::Members::AttrReader
+                  | RBS::AST::Members::AttrAccessor
 
-        attr_reader declarations: untyped
+        type ref = RBS::AST::Members::Alias
 
-        attr_reader references: untyped
+        attr_reader declarations: Set[decl]
 
-        def initialize: (method_name: untyped) -> void
+        attr_reader references: Set[ref]
 
-        def add_declaration: (untyped decl) -> untyped
+        def initialize: (method_name: method_name) -> void
+
+        def add_declaration: (decl) -> self
       end
 
       class ConstantEntry
-        attr_reader const_name: untyped
+        attr_reader const_name: RBS::TypeName
+
+        type decl = RBS::AST::Declarations::Constant
 
-        attr_reader declarations: untyped
+        attr_reader declarations: Set[decl]
 
-        def initialize: (const_name: untyped) -> void
+        def initialize: (const_name: RBS::TypeName) -> void
 
-        def add_declaration: (untyped decl) -> untyped
+        def add_declaration: (decl) -> self
       end
 
       class GlobalEntry
-        attr_reader global_name: untyped
+        attr_reader global_name: Symbol
+
+        type decl = RBS::AST::Declarations::Global
 
-        attr_reader declarations: untyped
+        attr_reader declarations: Set[decl]
 
-        def initialize: (global_name: untyped) -> void
+        def initialize: (global_name: Symbol) -> void
 
-        def add_declaration: (untyped decl) -> untyped
+        def add_declaration: (decl) -> self
       end
 
-      attr_reader type_index: untyped
+      attr_reader type_index: Hash[RBS::TypeName, TypeEntry]
 
-      attr_reader method_index: untyped
+      attr_reader method_index: Hash[method_name, MethodEntry]
 
-      attr_reader const_index: untyped
+      attr_reader const_index: Hash[RBS::TypeName, ConstantEntry]
 
-      attr_reader global_index: untyped
+      attr_reader global_index: Hash[Symbol, GlobalEntry]
 
       def initialize: () -> void
 
-      def entry: (?type_name: untyped?, ?method_name: untyped?, ?const_name: untyped?, ?global_name: untyped?) -> untyped
+      def entry: (type_name: RBS::TypeName) -> TypeEntry
+               | (method_name: method_name) -> MethodEntry
+               | (const_name: RBS::TypeName) -> ConstantEntry
+               | (global_name: Symbol) -> GlobalEntry
 
-      def each_entry: () { () -> untyped } -> untyped
+      def each_entry: () { (TypeEntry | MethodEntry | ConstantEntry | GlobalEntry) -> void } -> void
+                    | () -> Enumerator[TypeEntry | MethodEntry | ConstantEntry | GlobalEntry, void]
 
-      def add_type_declaration: (untyped type_name, untyped declaration) -> untyped
+      def add_type_declaration: (RBS::TypeName type_name, TypeEntry::decl declaration) -> TypeEntry
 
-      def add_method_declaration: (untyped method_name, untyped member) -> untyped
+      def add_method_declaration: (method_name, MethodEntry::decl member) -> MethodEntry
 
-      def add_constant_declaration: (untyped const_name, untyped decl) -> untyped
+      def add_constant_declaration: (RBS::TypeName const_name, ConstantEntry::decl decl) -> ConstantEntry
 
-      def add_global_declaration: (untyped global_name, untyped decl) -> untyped
+      def add_global_declaration: (Symbol global_name, GlobalEntry::decl decl) -> GlobalEntry
 
-      def each_declaration: (?type_name: untyped?, ?method_name: untyped?, ?const_name: untyped?, ?global_name: untyped?) { () -> untyped } -> untyped
+      def each_declaration: (type_name: RBS::TypeName) { (TypeEntry) -> void } -> void
+                          | (type_name: RBS::TypeName) -> Enumerator[TypeEntry, void]
+                          | (method_name: method_name) { (MethodEntry) -> void } -> void
+                          | (method_name: method_name) -> Enumerator[MethodEntry, void]
+                          | (const_name: RBS::TypeName) { (ConstantEntry) -> void } -> void
+                          | (const_name: RBS::TypeName) -> Enumerator[ConstantEntry, void]
+                          | (global_name: Symbol) { (GlobalEntry) -> void } -> void
+                          | (global_name: Symbol) -> Enumerator[GlobalEntry, void]
 
-      def add_type_reference: (untyped type_name, untyped ref) -> untyped
+      # `type_name` is referred from `ref`
+      #
+      def add_type_reference: (RBS::TypeName type_name, TypeEntry::ref ref) -> TypeEntry
 
-      def each_reference: (?type_name: untyped?) { () -> untyped } -> untyped
+      def each_reference: (type_name: RBS::TypeName) { (TypeEntry::ref) -> void } -> void
+                        | (type_name: RBS::TypeName) -> Enumerator[TypeEntry::ref, void]
 
       class Builder
-        attr_reader index: untyped
+        attr_reader index: RBSIndex
 
-        def initialize: (index: untyped) -> void
+        def initialize: (index: RBSIndex) -> void
 
-        def member: (untyped type_name, untyped member) -> untyped
+        def member: (RBS::TypeName type_name, RBS::AST::Members::t | RBS::AST::Declarations::t member) -> void
 
-        def type_reference: (untyped `type`, from: untyped) -> untyped
+        def type_reference: (RBS::Types::t, from: TypeEntry::ref) -> void
 
-        def env: (untyped env) -> untyped
+        def env: (RBS::Environment env) -> void
       end
     end
   end

data/sig/steep/project/dsl.rbs

@@ -2,53 +2,55 @@ module Steep
   class Project
     class DSL
       class TargetDSL
-        attr_reader name: untyped
+        attr_reader name: Symbol
 
-        attr_reader sources: untyped
+        attr_reader sources: Array[String]
 
-        attr_reader libraries: untyped
+        attr_reader libraries: Array[String]
 
-        attr_reader signatures: untyped
+        attr_reader signatures: Array[String]
 
-        attr_reader ignored_sources: untyped
+        attr_reader ignored_sources: Array[String]
 
-        attr_reader stdlib_root: untyped
+        attr_reader stdlib_root: Pathname?
 
-        attr_reader core_root: untyped
+        attr_reader core_root: Pathname?
 
-        attr_reader repo_paths: untyped
+        attr_reader repo_paths: Array[Pathname]
 
         attr_reader code_diagnostics_config: untyped
 
-        attr_reader project: untyped
+        attr_reader project: Project?
 
-        attr_reader collection_config_path: untyped
+        attr_reader collection_config_path: Pathname?
 
         NONE: untyped
 
-        def initialize: (untyped name, ?sources: untyped, ?libraries: untyped, ?signatures: untyped, ?ignored_sources: untyped, ?repo_paths: untyped, ?code_diagnostics_config: ::Hash[untyped, untyped], ?project: untyped?, ?collection_config_path: untyped) -> void
+        def project!: () -> Project
 
-        def initialize_copy: (untyped other) -> untyped
+        def initialize: (Symbol name, ?sources: Array[String], ?libraries: Array[String], ?signatures: Array[String], ?ignored_sources: Array[String], ?repo_paths: Array[Pathname], ?code_diagnostics_config: ::Hash[untyped, untyped], ?project: Project?, ?collection_config_path: Pathname?) -> void
 
-        def check: (*untyped args) -> untyped
+        def initialize_copy: (instance other) -> void
 
-        def ignore: (*untyped args) -> untyped
+        def check: (*String args) -> void
 
-        def library: (*untyped args) -> untyped
+        def ignore: (*String args) -> void
 
-        def typing_options: (?untyped? level, **untyped hash) -> untyped
+        def library: (*String args) -> void
 
-        def signature: (*untyped args) -> untyped
+        def typing_options: (?untyped level, **untyped hash) -> void
 
-        def update: (?name: untyped, ?sources: untyped, ?libraries: untyped, ?ignored_sources: untyped, ?signatures: untyped, ?project: untyped) -> untyped
+        def signature: (*String args) -> void
 
-        def no_builtin!: (?bool value) -> untyped
+        def update: (?name: Symbol, ?sources: Array[String], ?libraries: Array[String], ?signatures: Array[String], ?ignored_sources: Array[String], ?project: Project?) -> TargetDSL
 
-        def vendor: (?::String dir, ?stdlib: untyped?, ?gems: untyped?) -> untyped
+        def no_builtin!: (?bool value) -> void
 
-        def stdlib_path: (core_root: untyped, stdlib_root: untyped) -> untyped
+        def vendor: (?::String dir, ?stdlib: untyped?, ?gems: untyped?) -> void
 
-        def repo_path: (*untyped paths) -> untyped
+        def stdlib_path: (core_root: String, stdlib_root: String) -> void
+
+        def repo_path: (*String paths) -> void
 
         # Configure the code diagnostics printing setup.
         #
@@ -71,24 +73,27 @@ module Steep
         # configure_code_diagnostics(D::Ruby.lenient)
         # ```
         #
-        def configure_code_diagnostics: (?untyped? hash) { (untyped) -> untyped } -> untyped
+        def configure_code_diagnostics: (Hash[untyped, untyped] hash) -> void
+                                      | () { (Hash[untyped, untyped]) -> void } -> void
 
-        def collection_config: (untyped path) -> untyped
+        def collection_config: (Pathname path) -> void
 
-        def disable_collection: () -> untyped
+        def disable_collection: () -> void
       end
 
       attr_reader project: untyped
 
-      def self.templates: () -> untyped
+      @@templates: Hash[Symbol, TargetDSL]
+
+      def self.templates: () -> Hash[Symbol, TargetDSL]
 
-      def initialize: (project: untyped) -> void
+      def initialize: (project: Project) -> void
 
-      def self.register_template: (untyped name, untyped target) -> untyped
+      def self.register_template: (Symbol name, TargetDSL target) -> void
 
-      def self.parse: (untyped project, untyped code, ?filename: ::String) -> untyped
+      def self.parse: (Project project, String code, ?filename: String) -> void
 
-      def target: (untyped name, ?template: untyped?) ?{ () -> untyped } -> untyped
+      def target: (Symbol name, ?template: Symbol?) ?{ (TargetDSL) [self: TargetDSL] -> void } -> void
     end
   end
 end

data/sig/steep/project/options.rbs

@@ -1,13 +1,25 @@
 module Steep
   class Project
     class Options
-      PathOptions: untyped
+      class PathOptions
+        attr_reader core_root: Pathname?
 
-      attr_reader libraries: untyped
+        attr_reader stdlib_root: Pathname?
 
-      attr_accessor paths: untyped
+        attr_reader repo_paths: Array[Pathname]
 
-      attr_accessor collection_lock: untyped
+        def initialize: (?core_root: Pathname?, ?stdlib_root: Pathname?, ?repo_paths: Array[Pathname]) -> void
+
+        def customized_stdlib?: () -> bool
+
+        def customized_core?: () -> bool
+      end
+
+      attr_reader libraries: Array[String]
+
+      attr_accessor paths: PathOptions
+
+      attr_accessor collection_lock: RBS::Collection::Config::Lockfile
 
       def initialize: () -> void
     end

data/smoke/diagnostics-rbs/test_expectations.yml

@@ -54,7 +54,7 @@
         character: 22
       end:
         line: 1
-        character: -1
+        character: 28
     severity: ERROR
     message: Cannot inherit from a module `::Kernel`
     code: RBS::InheritModuleError

data/steep.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_runtime_dependency "parser", ">= 3.1"
   spec.add_runtime_dependency "activesupport", ">= 5.1"
@@ -42,4 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "fileutils", ">= 1.1.0"
   spec.add_runtime_dependency "strscan", ">= 1.0.0"
   spec.add_runtime_dependency "csv", ">= 3.0.9"
+  spec.add_runtime_dependency "pathname", ">= 0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0.dev.1
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -224,6 +224,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: pathname
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com
@@ -249,6 +263,7 @@ files:
 - bin/console
 - bin/output_rebaseline.rb
 - bin/output_test.rb
+- bin/rbs
 - bin/setup
 - bin/steep
 - bin/steep-prof
@@ -760,14 +775,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Gradual Typing for Ruby