orthoses 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843da9ba9bba3cf5c84ec56041836cb9469ad5faffd188f8edc13a3920ca499e
-  data.tar.gz: 791b0d87a885b327a41fff090f9dadce9b377712e9d7d51bd52fbaa997c98242
+  metadata.gz: 0bde1745c71d6d30b7b45ce7f956a1c02f0d44353932c3743211aa1c05f58d39
+  data.tar.gz: bbe5b95a7665d39faab82b5f53e18cffd22962df1913f1c52698ea51c6045e2c
 SHA512:
-  metadata.gz: 81438b5d94ce56d7164cdc781eaaa2c526cbba21cab147fc91d4e1b0c9b7992e31259d9bda2f5e2441a3dc59e3f7ec940c910e1cf63bbec6ef84ca4b046af0ee
-  data.tar.gz: ec0049000f94a194747974233adaa1c51a7759c0d78fb84a11e543877ee15d01f212b59ed63c5cadbd221701de4bfa9c84c0f6fcc5feffdab0f954b1fd63e2d0
+  metadata.gz: 496d255f99751ac854e5b05ecac69b1e0dc7dbb5fca53bf99d6d622e2dbb154af643de7bf8de8190dca15ff1933fac35c17735da9285532a8a3246d7002836cd
+  data.tar.gz: 56c77cf9074eeb75547c1be3868e9843b0d5337400d2248592879f76fd6cc14f99660d8dbbf593c1d66bac1152e1dafbaa4820ea45a49f5f47945027ce45d53a

data/Gemfile

@@ -8,4 +8,8 @@ gemspec
 gem "rbs"
 gem "rake", "~> 13.0"
 gem "rgot", "~> 1.1"
-gem "steep"
+gem "activesupport"
+
+group :steep do
+  gem "steep", "1.4.0.dev.2"
+end

data/Gemfile.lock

@@ -1,43 +1,44 @@
 PATH
   remote: .
   specs:
-    orthoses (1.5.0)
-      rbs (~> 2.0)
+    orthoses (1.6.0)
+      rbs (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     csv (3.2.6)
     ffi (1.15.5)
     fileutils (1.7.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    language_server-protocol (3.17.0.2)
-    listen (3.7.1)
+    language_server-protocol (3.17.0.3)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.5.2)
-    minitest (5.16.3)
+    logger (1.5.3)
+    minitest (5.18.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.1.1)
       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.1)
-    rgot (1.1.0)
-    securerandom (0.2.1)
-    steep (1.3.0)
+    rbs (3.0.4)
+    rgot (1.3.0)
+    securerandom (0.2.2)
+    steep (1.4.0.dev.2)
       activesupport (>= 5.1)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -47,27 +48,29 @@ GEM
       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)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 4)
-    strscan (3.0.5)
+    strscan (3.0.6)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   orthoses!
   rake (~> 13.0)
   rbs
   rgot (~> 1.1)
-  steep
+  steep (= 1.4.0.dev.2)
 
 BUNDLED WITH
-   2.3.9
+   2.4.8

data/lib/orthoses/call_tracer/lazy.rb

@@ -2,6 +2,18 @@
 
 module Orthoses
   class CallTracer
+    # CallTracer::Lazy is possible to perform a trace
+    # equivalent to CallTracer before method is defined.
+    #     scope = CallTracerLazy.new
+    #     scope.trace("ActiveRecord::Base#scope") do
+    #       require 'active_record/all'
+    #       @loader.call
+    #     end
+    #     scope.captures.each do |capture|
+    #       capture.argument[:name]
+    #       capture.argument[:body]
+    #       capture.argument[:block]
+    #     end
     class Lazy
       include Capturable
 

data/lib/orthoses/content/duplication_checker.rb

@@ -11,7 +11,7 @@ module Orthoses
         return unless @decl.respond_to?(:members)
         uniq_map = {}
         @decl.members.each do |member|
-          if member.instance_of?(RBS::AST::Members::MethodDefinition) && member.overload
+          if member.instance_of?(RBS::AST::Members::MethodDefinition) && member.overloading?
             # avoid to duplicate and keep order
             uniq_map[Object.new] = member
           else

data/lib/orthoses/content/environment.rb

@@ -7,7 +7,8 @@ module Orthoses
             paths.each do |path|
               Orthoses.logger.debug("Load #{path}")
               buffer = RBS::Buffer.new(name: path.to_s, content: File.read(path.to_s, encoding: "UTF-8"))
-              RBS::Parser.parse_signature(buffer).each do |decl|
+              _, _, decls = RBS::Parser.parse_signature(buffer)
+              decls.each do |decl|
                 env << decl
               end
             end

data/lib/orthoses/content/header_builder.rb

@@ -3,7 +3,7 @@ module Orthoses
     class HeaderBuilder
       def initialize(env:)
         @env = env
-        @resolver = RBS::TypeNameResolver.from_env(env)
+        @resolver = RBS::Resolver::TypeNameResolver.new(env)
       end
 
       def build(entry:, name_hint: nil)
@@ -66,11 +66,10 @@ module Orthoses
         "interface #{name_and_params(resolved_name.relative!, entry.decl.type_params)}"
       end
 
+      include RBS::Environment::ContextUtil
+
       def build_context(entry:)
-        context = entry.outer.length.times.map do |i|
-          entry.outer[0, i + 1].map(&:name).inject(:+).to_namespace.absolute!
-        end
-        context.push(RBS::Namespace.root)
+        calculate_context(entry.outer + [entry.decl])
       end
 
       def name_and_params(name, params)

data/lib/orthoses/content.rb

@@ -119,7 +119,7 @@ module Orthoses
         name: "orthoses/content.rb",
         content: original_rbs
       )
-      parsed_decls = RBS::Parser.parse_signature(buffer)
+      _, _, parsed_decls = RBS::Parser.parse_signature(buffer)
       unless parsed_decls.length == 1
         raise "expect decls.length == 1, but got #{parsed_decls.length}"
       end

data/lib/orthoses/trace/method.rb

@@ -169,8 +169,13 @@ module Orthoses
               kind: kind,
               location: nil,
               name: method_id,
-              overload: false,
-              types: types,
+              overloading: false,
+              overloads: types.map { |type|
+                RBS::AST::Members::MethodDefinition::Overload.new(
+                  annotations: [],
+                  method_type: type
+                )
+              },
               visibility: visibility
             )
           ]

data/lib/orthoses/utils.rb

@@ -50,28 +50,6 @@ module Orthoses
       RBS::Namespace.parse(name).to_type_name
     end
 
-    class << self
-      # Generated scripts are not always located in the root.
-      # By default, it follows the upper level directory from the current directory
-      # to find the rbs_collection.yaml file and set it to `rbs_collection_pathname`.
-      # It can be reconfigured if necessary.
-      attr_accessor :rbs_collection_pathname
-    end
-    # set default
-    self.rbs_collection_pathname = ->() {
-      begin
-        start = here = Dir.pwd
-        until ok = RBS::Collection::Config::PATH.exist?
-          Dir.chdir("..")
-          return nil if Dir.pwd == here
-          here = Dir.pwd
-        end
-        Pathname(here) + RBS::Collection::Config::PATH
-      ensure
-        Dir.chdir(start)
-      end
-    }.call
-
     def self.rbs_environment(library: nil, collection: true, cache: true)
       @env_cache ||= {}
       if cache && hit = @env_cache[[library, collection]]
@@ -80,9 +58,15 @@ module Orthoses
 
       loader = RBS::EnvironmentLoader.new
 
-      if collection && rbs_collection_pathname
-        config = RBS::Collection::Config.lockfile_of(rbs_collection_pathname) or raise
-        loader.add_collection(config)
+      if collection
+        config_path = RBS::Collection::Config.find_config_path || RBS::Collection::Config::PATH || raise("needs rbs_collection.yaml")
+        lock_path = RBS::Collection::Config.to_lockfile_path(config_path)
+        raise "needs rbs_collection.yaml file" unless lock_path.file?
+        lock = RBS::Collection::Config::Lockfile.from_lockfile(
+          lockfile_path: lock_path,
+          data: YAML.load_file(lock_path.to_s)
+        )
+        loader.add_collection(lock)
       end
 
       case library

data/lib/orthoses/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orthoses
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/orthoses.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rbs", "~> 2.0"
+  spec.add_dependency "rbs", "~> 3.0"
 end

data/sig/orthoses/call_tracer/lazy.rbs

@@ -2,5 +2,6 @@
 
 class Orthoses::CallTracer::Lazy
   def initialize: () -> void
-  def trace: (untyped name) ?{ () -> untyped } -> untyped
+  def trace: (String name) ?{ () -> untyped } -> untyped
+  attr_reader captures: Array[untyped]
 end

data/sig/orthoses/call_tracer.rbs

@@ -2,6 +2,6 @@
 
 class Orthoses::CallTracer
   def initialize: () -> void
-  def trace: [T] (Method | UnboundMethod) ?{ () -> T } -> T
+  def trace: (Method | UnboundMethod) ?{ () -> untyped } -> untyped
   attr_accessor captures: Array[Capture]
 end

data/sig/orthoses/content/header_builder.rbs

@@ -10,4 +10,5 @@ class Orthoses::Content::HeaderBuilder
   private def build_context: (entry: untyped) -> untyped
   private def name_and_params: (untyped name, untyped params) -> ::String
   private def name_and_args: (untyped name, untyped args) -> (::String | nil)
+  include RBS::Environment::ContextUtil
 end

data/sig/orthoses/lazy_trace_point.rbs

@@ -3,7 +3,7 @@
 class Orthoses::LazyTracePoint < ::TracePoint
   def method_added: (untyped id) -> untyped
   def singleton_method_added: (untyped id) -> untyped
-  def initialize: (*untyped events) ?{ () -> untyped } -> void
+  def initialize: (*untyped events) { () -> untyped } -> void
   def enable: (?target: untyped?, ?target_line: untyped?, ?target_thread: untyped?) ?{ () -> untyped } -> untyped
   private def trace_instance_method: () ?{ () -> untyped } -> untyped
   private def trace_singleton_method: () ?{ () -> untyped } -> untyped

data/sig/orthoses/utils.rbs

@@ -24,6 +24,4 @@ module Orthoses::Utils
   def self.new_store: () -> Orthoses::store
 
   UNBOUND_NAME_METHOD: UnboundMethod
-
-  attr_accessor self.rbs_collection_pathname: Pathname
 end

data/sig/orthoses.rbs

@@ -1,7 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses
-  VERSION: "1.5.0"
+  VERSION: "1.6.0"
 
   attr_accessor self.logger: ::Logger
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 description: Build RBS by Rack base architecture
 email:
 - co000ri@gmail.com
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Framework for Generate RBS