steep 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ec77465913e4b2146e068c58f63b7ae8b5c51fd2391f6eb2776dba8372a81c2
-  data.tar.gz: 7528dbaf4873d9eb77728521837ecb0fe43a2010036572be2c3dc017c5b903cc
+  metadata.gz: 5ddd53798b724f6fd1a93d869b03a3864db04bed448552a75dadeabe8d1bc51e
+  data.tar.gz: c85f6c58a010ed11dfc1041f8ba98007e0f557d7bda133222b94915dfed0d6ca
 SHA512:
-  metadata.gz: b0426373f8fb9e48ccec48d0676d70d5a674a389a83624df78dc3deacaba23840b02cc94becba92304de35f98c8d8bb3af12ef185161e4e6a6c37600cb61a82d
-  data.tar.gz: 5f3a32240541f116b6299c354fada0c8de398b6139b9d5e275e7b05490ccc401aa1b4f70978af5561e2ce9c6c7bb2587c1c8e43801276c0875000496ed332a5b
+  metadata.gz: 79a7742bdef0d368aa2dceaa528cf3e4bc74bccefafc0d6c366aa94994917e7d5560c8d4fd6f03adf0d50c3b8536d80d7e998bba3a9dc5cb872c7047c0079cba
+  data.tar.gz: 512b5bdf6efd6e465d5e3147de2df6cafb549fe68e05890efc13fffcc763b0cec1c48005a1734b6ade2cd120fa48059c435c20bad4b9998b1d15a0b4f557f615

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 0.35.0 (2020-11-14)
+
+* Support third party RBS repository ([#231](https://github.com/soutaro/steep/pull/231), [#254](https://github.com/soutaro/steep/pull/254), [#255](https://github.com/soutaro/steep/pull/255))
+* Boolean type semantics update ([#252](https://github.com/soutaro/steep/pull/252))
+* More flexible record typing ([#256](https://github.com/soutaro/steep/pull/256))
+
 ## 0.34.0 (2020-10-27)
 
 * Add `steep stats` command to show method call typing stats ([#246](https://github.com/soutaro/steep/pull/246))

data/lib/steep/cli.rb

@@ -16,7 +16,7 @@ module Steep
     end
 
     def self.available_commands
-      [:init, :check, :validate, :annotations, :version, :project, :watch, :langserver, :vendor, :stats]
+      [:init, :check, :validate, :annotations, :version, :project, :watch, :langserver, :stats]
     end
 
     def process_global_options
@@ -34,7 +34,7 @@ module Steep
 
     def setup_command
       @command = argv.shift&.to_sym
-      if CLI.available_commands.include?(@command) || @command == :worker
+      if CLI.available_commands.include?(@command) || @command == :worker || @command == :vendor
         true
       else
         stderr.puts "Unknown command: #{command}"

data/lib/steep/drivers/print_project.rb

@@ -47,6 +47,17 @@ module Steep
           target.options.libraries.each do |lib|
             stdout.puts "      - #{lib}"
           end
+          stdout.puts "    library dirs:"
+          Project::Target.construct_env_loader(options: target.options).tap do |loader|
+            loader.each_dir do |lib, path|
+              case lib
+              when :core
+                stdout.puts "      - core: #{path}"
+              else
+                stdout.puts "      - #{lib.name}: #{path}"
+              end
+            end
+          end
         end
 
         0

data/lib/steep/drivers/vendor.rb

@@ -18,26 +18,7 @@ module Steep
       end
 
       def run
-        stdout.puts "Vendoring into #{vendor_dir}..."
-
-        vendorer = RBS::Vendorer.new(vendor_dir: vendor_dir)
-
-        if clean_before
-          stdout.puts "  Cleaning directory..."
-          vendorer.clean!
-        end
-
-        stdout.puts "  Vendoring standard libraries..."
-        vendorer.stdlib!
-
-        if defined?(Bundler)
-          Bundler.locked_gems.specs.each do |spec|
-            if RBS::EnvironmentLoader.gem_sig_path(spec.name, spec.version.to_s).directory?
-              stdout.puts "  Vendoring rubygem: #{spec.full_name}..."
-              vendorer.gem! spec.name, spec.version.to_s
-            end
-          end
-        end
+        stdout.puts "`steep vendor` is deprecated. Use `rbs vendor` command directly"
 
         0
       end

data/lib/steep/project/dsl.rb

@@ -7,12 +7,12 @@ module Steep
         attr_reader :libraries
         attr_reader :signatures
         attr_reader :ignored_sources
-        attr_reader :no_builtin
         attr_reader :vendor_dir
         attr_reader :strictness_level
         attr_reader :typing_option_hash
+        attr_reader :repo_paths
 
-        def initialize(name, sources: [], libraries: [], signatures: [], ignored_sources: [])
+        def initialize(name, sources: [], libraries: [], signatures: [], ignored_sources: [], repo_paths: [])
           @name = name
           @sources = sources
           @libraries = libraries
@@ -21,6 +21,7 @@ module Steep
           @vendor_dir = nil
           @strictness_level = :default
           @typing_option_hash = {}
+          @repo_paths = []
         end
 
         def initialize_copy(other)
@@ -32,6 +33,7 @@ module Steep
           @vendor_dir = other.vendor_dir
           @strictness_level = other.strictness_level
           @typing_option_hash = other.typing_option_hash
+          @repo_paths = other.repo_paths.dup
         end
 
         def check(*args)
@@ -71,13 +73,14 @@ module Steep
 
         def vendor(dir = "vendor/sigs", stdlib: nil, gems: nil)
           if stdlib || gems
-            @vendor_dir = [
-              stdlib&.yield_self {|x| Pathname(x) },
-              gems&.yield_self {|x| Pathname(x) }
-            ]
-          else
-            @vendor_dir = Pathname(dir)
+            Steep.logger.warn { "#vendor with stdlib: or gems: keyword is deprecated." }
           end
+
+          @vendor_dir = Pathname(dir)
+        end
+
+        def repo_path(*paths)
+          @repo_paths.push(*paths.map {|s| Pathname(s) })
         end
       end
 
@@ -124,6 +127,8 @@ module Steep
           signature_patterns: target.signatures,
           options: Options.new.tap do |options|
             options.libraries.push(*target.libraries)
+            options.repository_paths.push(*target.repo_paths)
+            options.vendor_path = target.vendor_dir
 
             case target.strictness_level
             when :strict
@@ -133,15 +138,6 @@ module Steep
             end
 
             options.merge!(target.typing_option_hash)
-
-            case target.vendor_dir
-            when Array
-              options.vendored_stdlib_path = target.vendor_dir[0]
-              options.vendored_gems_path = target.vendor_dir[1]
-            when Pathname
-              options.vendored_stdlib_path = target.vendor_dir + "stdlib"
-              options.vendored_gems_path = target.vendor_dir + "gems"
-            end
           end
         ).tap do |target|
           project.targets << target

data/lib/steep/project/options.rb

@@ -5,16 +5,16 @@ module Steep
       attr_accessor :allow_missing_definitions
       attr_accessor :allow_unknown_constant_assignment
       attr_accessor :allow_unknown_method_calls
-      attr_accessor :vendored_stdlib_path
-      attr_accessor :vendored_gems_path
+      attr_accessor :vendor_path
       attr_reader :libraries
+      attr_reader :repository_paths
 
       def initialize
         apply_default_typing_options!
-        self.vendored_gems_path = nil
-        self.vendored_stdlib_path = nil
+        self.vendor_path = nil
 
         @libraries = []
+        @repository_paths = []
       end
 
       def apply_default_typing_options!

data/lib/steep/project/target.rb

@@ -114,18 +114,27 @@ module Steep
         end
       end
 
-      def environment
-        @environment ||= RBS::Environment.new().yield_self do |env|
-          stdlib_root = options.vendored_stdlib_path || RBS::EnvironmentLoader::STDLIB_ROOT
-          gem_vendor_path = options.vendored_gems_path
-          loader = RBS::EnvironmentLoader.new(stdlib_root: stdlib_root, gem_vendor_path: gem_vendor_path)
-          options.libraries.each do |lib|
-            loader.add(library: lib)
-          end
-          loader.load(env: env)
+      def self.construct_env_loader(options:)
+        repo = RBS::Repository.new(no_stdlib: options.vendor_path)
+        options.repository_paths.each do |path|
+          repo.add(path)
+        end
 
-          env.resolve_type_names
+        loader = RBS::EnvironmentLoader.new(
+          core_root: options.vendor_path ? nil : RBS::EnvironmentLoader::DEFAULT_CORE_ROOT,
+          repository: repo
+        )
+        loader.add(path: options.vendor_path) if options.vendor_path
+        options.libraries.each do |lib|
+          name, version = lib.split(/:/, 2)
+          loader.add(library: name, version: version)
         end
+
+        loader
+      end
+
+      def environment
+        @environment ||= RBS::Environment.from_loader(Target.construct_env_loader(options: options))
       end
 
       def load_signatures(validate:)

data/lib/steep/subtyping/check.rb

@@ -147,7 +147,23 @@ module Steep
             success(constraints: constraints)
 
           when relation.super_type.is_a?(AST::Types::Boolean)
-            success(constraints: constraints)
+            check(
+              Relation.new(sub_type: relation.sub_type, super_type: AST::Types::Union.build(types: [AST::Builtin.true_type, AST::Builtin.false_type])),
+              self_type: self_type,
+              assumption: assumption,
+              trace: trace,
+              constraints: constraints
+            )
+
+          when relation.sub_type.is_a?(AST::Types::Boolean)
+            check(
+              Relation.new(sub_type: AST::Types::Union.build(types: [AST::Builtin.true_type, AST::Builtin.false_type]),
+                           super_type: relation.super_type),
+              self_type: self_type,
+              assumption: assumption,
+              trace: trace,
+              constraints: constraints
+            )
 
           when relation.sub_type.is_a?(AST::Types::Self) && !self_type.is_a?(AST::Types::Self)
             check(
@@ -326,23 +342,21 @@ module Steep
                   constraints: constraints)
 
           when relation.sub_type.is_a?(AST::Types::Record) && relation.super_type.is_a?(AST::Types::Record)
-            if Set.new(relation.sub_type.elements.keys).superset?(Set.new(relation.super_type.elements.keys))
-              keys = relation.super_type.elements.keys
-              type_pairs = keys.map {|key| [relation.sub_type.elements[key], relation.super_type.elements[key]] }
-              results = type_pairs.flat_map do |t1, t2|
-                relation = Relation.new(sub_type: t1, super_type: t2)
-                [check(relation, self_type: self_type, assumption: assumption, trace: trace, constraints: constraints),
-                 check(relation.flip, self_type: self_type, assumption: assumption, trace: trace, constraints: constraints)]
-              end
+            keys = relation.super_type.elements.keys
+            relations = keys.map {|key|
+              Relation.new(
+                sub_type: relation.sub_type.elements[key] || AST::Builtin.nil_type,
+                super_type: relation.super_type.elements[key]
+              )
+            }
+            results = relations.map do |relation|
+              check(relation, self_type: self_type, assumption: assumption, trace: trace, constraints: constraints)
+            end
 
-              if results.all?(&:success?)
-                success(constraints: constraints)
-              else
-                results.find(&:failure?)
-              end
+            if results.all?(&:success?)
+              success(constraints: constraints)
             else
-              failure(error: Result::Failure::UnknownPairError.new(relation: relation),
-                      trace: trace)
+              results.find(&:failure?)
             end
 
           when relation.sub_type.is_a?(AST::Types::Record) && relation.super_type.is_a?(AST::Types::Name::Base)

data/lib/steep/type_construction.rb

@@ -2423,7 +2423,10 @@ module Steep
             errors: [error]
           )
 
-          constr = synthesize_children(node, skips: [receiver])
+          skips = [receiver]
+          skips << node.children[0] if node.type == :block
+
+          constr = synthesize_children(node, skips: skips)
           if block_params
             block_annotations = source.annotations(block: node, factory: checker.factory, current_module: current_namespace)
 
@@ -2433,7 +2436,7 @@ module Steep
               block_annotations: block_annotations,
               block_body: block_body
             ) do |error|
-              errors << error
+              constr.typing.add_error(error)
             end
           end
         end
@@ -3224,8 +3227,10 @@ module Steep
         end
       end
       expected_module_method_names = (module_context.module_definition&.methods || {}).each.with_object(Set[]) do |(name, method), set|
-        if method.implemented_in == module_context.module_definition.type_name
-          set << name
+        if name != :new
+          if method.implemented_in == module_context.module_definition.type_name
+            set << name
+          end
         end
       end
 
@@ -3486,6 +3491,8 @@ module Steep
     end
 
     def try_hash_type(node, hint)
+      hint = expand_alias(hint)
+
       case hint
       when AST::Types::Record
         typing.new_child(node.loc.expression.yield_self {|l| l.begin_pos..l.end_pos }) do |child_typing|

data/lib/steep/version.rb

@@ -1,3 +1,3 @@
 module Steep
-  VERSION = "0.34.0"
+  VERSION = "0.35.0"
 end

data/steep.gemspec

@@ -34,5 +34,5 @@ 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.0.1"
-  spec.add_runtime_dependency "rbs", "~> 0.14.0"
+  spec.add_runtime_dependency "rbs", "~> 0.17.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steep
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.17.0
 description: Gradual Typing for Ruby
 email:
 - matsumoto@soutaro.com