orthoses 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a88a402248539e68e824aeb28c7a47a17b2b8c8920c454dbec4fe87305a5999
-  data.tar.gz: 1c9e0aa222e72261b5b5fd09649023c61eff09043823a4eb3e98d909aff93fc7
+  metadata.gz: c0818d6847c70769b9111a99016d92dff5d4b369485ec5df1752ac847895c077
+  data.tar.gz: d7b7866d290d31836a4fa860662b7abd44da2a4dd79ae0e8f0be4a3aa127cd86
 SHA512:
-  metadata.gz: b825842ed1899b7e51ee40376845a4e869563c2fbe66e56a16ebe62672291acdb2a9e9e66a29bf4a7a8d0e3644fb6d2848b268cc2a09fbbe9adc3f85ef955872
-  data.tar.gz: 21bfe767137adea2246fcbb1f6883266f0b76aa1c367faafe773fcf902184374cda1ee175d4b62eee99435714dfc1bec7b1403d20db4dab5de3faabc4df98754
+  metadata.gz: ae990a63a96d5d6e4c7a0053203695564451fb709fbcc139cce1d4c6dc8962a10c9bb7b78667be1eccf5dd8ccd69447da97cd011bb58beaa9cacf3dbb951e3ec
+  data.tar.gz: 137f461a5286b3dc9d30c9c71d91fc61f6d948d743f9151b5e9b150dd47cecbe43d6d10073eb29de633bd51f12b3d43afed8ffccf29d52278a035ecbb2757c33

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in orthoses.gemspec
 gemspec
 
+gem "rbs"
 gem "rake", "~> 13.0"
 gem "rgot", "~> 1.1"
 gem "steep"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orthoses (0.9.0)
+    orthoses (0.10.0)
       rbs (~> 2.0)
 
 GEM
@@ -21,7 +21,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.15.0)
+    minitest (5.16.1)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
@@ -30,14 +30,14 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (2.5.0)
+    rbs (2.6.0)
     rgot (1.1.0)
-    steep (1.0.0)
+    steep (1.0.1)
       activesupport (>= 5.1)
       language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
       parallel (>= 1.0.0)
-      parser (>= 3.0)
+      parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
       rbs (>= 2.3.2)
       terminal-table (>= 2, < 4)
@@ -54,6 +54,7 @@ DEPENDENCIES
   activesupport
   orthoses!
   rake (~> 13.0)
+  rbs
   rgot (~> 1.1)
   steep
 

data/README.md

@@ -45,10 +45,6 @@ end.call
 
 `Orthoses::Utils` is a collection of useful methods.
 
-### Orthoses::Utils.unautoload!
-
-Load all const by recursive.
-
 ### Orthoses::Utils.each_const_recursive
 
 Yield const by recursive.
@@ -151,11 +147,19 @@ Run `rbs prototype rb` command process to `paths` option files.
 `content_filter` option could filter with content decl.
 `mixin_filter` option could filter with mixin(include, extend, prepend) decl.
 
+### Orthoses::RBSPrototypeRuntime
+
+Run `rbs prototype runtime` command process with `patterns` option string.
+
 ### Orthoses::AvoidRecursiveAncestorError
 
 Mixin a module into an Object class raises `RBS::RecursiveAncestorError` when validation.
 Please add this middleware then.
 
+### Orthoses::Autoload
+
+Force load const defined by `autoload`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/orthoses/attribute.rb

@@ -40,8 +40,6 @@ module Orthoses
         end
       end
 
-      store["Module"].body.delete("prepend Orthoses::Attribute::Hook")
-
       attr.captures.each do |capture|
         m = capture.method.receiver.to_s.match(/#<Class:([\w:]+)>/)
         if m && m[1]

data/lib/orthoses/autoload.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Orthoses
+  class Autoload
+    module Hook
+      def autoload(name, path)
+        super
+      end
+    end
+
+    def initialize(loader)
+      @loader = loader
+    end
+
+    def call
+      ::Module.prepend(Hook)
+
+      autoload = CallTracer.new
+
+      store = autoload.trace(Hook.instance_method(:autoload)) do
+        @loader.call
+      end
+
+      autoload.captures.each do |capture|
+        base_mod = capture.method.receiver
+        name = capture.argument[:name]
+        begin
+          base_mod.const_get(name)
+        rescue NameError, LoadError, ArgumentError => e
+          Orthoses.logger.warn("[Orthoses::Autoload] raise `#{e.message} (#{e.class})` when try to unautoload `#{base_mod}::#{name}`")
+        end
+      end
+
+      store
+    end
+  end
+end

data/lib/orthoses/content/header_builder.rb

@@ -43,7 +43,7 @@ module Orthoses
       end
 
       def build_super_class(primary)
-        return nil if primary.decl.super_class.then { |s| s.nil? || s.name.relative!.to_s.then { |n| n == "Object" || n == "Random::Base" } }
+        return nil if primary.decl.super_class.then { |s| s.nil? || s.name.relative!.to_s.then { |n| n == "Object" || n == "Random::Base" || n.start_with?("RBS::Unnamed") } }
 
         context = build_context(entry: primary)
         super_class_name = @resolver.resolve(primary.decl.super_class.name, context: context) || primary.decl.super_class.name

data/lib/orthoses/load_rbs.rb

@@ -11,7 +11,9 @@ module Orthoses
 
     def call
       @loader.call.tap do |store|
-        env = Content::Environment.load_from_paths(@paths)
+        paths = @paths
+        paths = paths.call if paths.instance_of?(Proc)
+        env = Content::Environment.load_from_paths(paths.to_a)
         env.write_to(store: store)
       end
     end

data/lib/orthoses/mixin.rb

@@ -34,8 +34,6 @@ module Orthoses
         end
       end
 
-      store["Module"].body.delete("prepend Orthoses::Mixin::Hook")
-
       collect_definitions(store, include, :include)
       collect_definitions(store, extend, :extend)
       collect_definitions(store, prepend, :prepend)
@@ -58,6 +56,8 @@ module Orthoses
           mod_name = Utils.module_name(mod)
           next unless mod_name
 
+          next if mod_name.start_with?("Orthoses")
+
           known_type_params = Utils.known_type_params(mod)
           next unless known_type_params.nil? || known_type_params.empty?
 

data/lib/orthoses/path_helper.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Helper for find best version dir.
+#   Orthoses::PathHelper.best_version_paths(
+#     ::ActiveSupport::VERSION::STRING,
+#     "known_sig/activesupport")
+module Orthoses
+  class PathHelper
+    class << self
+      def best_version_paths(current, base_dir)
+        new(current, base_dir).best_version_paths
+      end
+    end
+
+    def initialize(current, base_dir)
+      @current = current
+      @base_dir = base_dir
+    end
+
+    def best_version_paths
+      best_version = find_best_version
+      Dir.glob("#{@base_dir}/#{best_version}/**/*.rbs")
+    end
+
+    def find_best_version
+      current_v = Gem::Version.new(@current)
+      versions = version_dir
+      versions.reverse.bsearch { |v| v <= current_v } || versions.first
+    end
+
+    def version_dir
+      Dir.glob("#{@base_dir}/*")
+        .map(&File.method(:basename))
+        .map(&Gem::Version.method(:new))
+        .sort
+    end
+  end
+end

data/lib/orthoses/rbs_prototype_runtime.rb

@@ -0,0 +1,32 @@
+module Orthoses
+  # Call `rbs prototype runtime` and add to store
+  #     use Orthoses::RBSPrototypeRuntime,
+  #       patterns: ['Foo::*']
+  class RBSPrototypeRuntime
+    def initialize(loader, patterns:)
+      @loader = loader
+      @patterns = patterns
+    end
+
+    def call
+      @loader.call.tap do |store|
+        content_env = Orthoses::Content::Environment.new
+
+        patterns = @patterns
+        env = RBS::Environment.new
+        merge = true
+        owners_included = []
+        RBS::Prototype::Runtime.new(
+          patterns: patterns,
+          env: env,
+          merge: merge,
+          owners_included: owners_included,
+        ).decls.each do |decl|
+          content_env << decl
+        end
+
+        content_env.write_to(store: store)
+      end
+    end
+  end
+end

data/lib/orthoses/utils.rb

@@ -3,13 +3,14 @@
 module Orthoses
   module Utils
     def self.unautoload!
+      warn "`Orthoses::Utils.unautoload!` is deprecated. please use `Orthoses::Autoload` middleware instead."
       ObjectSpace.each_object(Module) do |mod|
         each_const_recursive(mod)
       end
     end
 
     def self.each_const_recursive(root, cache: {}, on_error: nil, &block)
-      root.constants(false).each do |const|
+      root.constants(false).sort.each do |const|
         val = root.const_get(const)
         next if cache[const].equal?(val)
         cache[const] = val

data/lib/orthoses/version.rb

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

data/lib/orthoses.rb

@@ -15,10 +15,13 @@ require_relative 'orthoses/filter'
 require_relative 'orthoses/mixin'
 require_relative 'orthoses/load_rbs'
 require_relative 'orthoses/object_space_all'
+require_relative 'orthoses/path_helper'
 require_relative 'orthoses/pp'
 require_relative 'orthoses/rbs_prototype_rb'
+require_relative 'orthoses/rbs_prototype_runtime'
 require_relative 'orthoses/store'
 require_relative 'orthoses/tap'
+require_relative 'orthoses/autoload'
 require_relative 'orthoses/utils'
 require_relative 'orthoses/version'
 require_relative 'orthoses/walk'

data/sig/orthoses/autoload/hook.rbs

@@ -0,0 +1,5 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+module Orthoses::Autoload::Hook
+  def autoload: (untyped name, untyped path) -> untyped
+end

data/sig/orthoses/autoload.rbs

@@ -0,0 +1,6 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::Autoload
+  def initialize: (untyped loader) -> void
+  def call: () -> untyped
+end

data/sig/orthoses/load_rbs.rbs

@@ -1,8 +1,9 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 class Orthoses::LoadRBS
-  def initialize: (Orthoses::_Call loader, paths: Array[_ToS]) -> void
+  def initialize: (Orthoses::_Call loader, paths: paths) -> void
   def call: () -> Orthoses::store
+  type paths = Array[String] | ^() -> Array[String]
   @loader: Orthoses::_Call
-  @paths: Array[_ToS]
+  @paths: paths
 end

data/sig/orthoses/path_helper.rbs

@@ -0,0 +1,9 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::PathHelper
+  def self.best_version_paths: (untyped current, untyped base_dir) -> untyped
+  def initialize: (untyped current, untyped base_dir) -> void
+  def best_version_paths: () -> untyped
+  def find_best_version: () -> untyped
+  def version_dir: () -> untyped
+end

data/sig/orthoses/rbs_prototype_runtime.rbs

@@ -0,0 +1,6 @@
+# THIS IS GENERATED CODE from `$ rake generate_self_sig`
+
+class Orthoses::RBSPrototypeRuntime
+  def initialize: (untyped loader, patterns: untyped) -> void
+  def call: () -> untyped
+end

data/sig/orthoses/utils.rbs

@@ -1,7 +1,7 @@
 # THIS IS GENERATED CODE from `$ rake generate_self_sig`
 
 module Orthoses::Utils
-  def self.unautoload!: () -> void
+  def self.unautoload!: () -> untyped
 
   def self.each_const_recursive: (Module root, ?cache: Hash[untyped, true], ?on_error: ^(Orthoses::ConstLoadError) -> void) ?{ (Module, Symbol, untyped) -> void } -> void
 

data/sig/orthoses.rbs

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -41,6 +41,7 @@ files:
 - examples/simple_middleware.rbs
 - lib/orthoses.rb
 - lib/orthoses/attribute.rb
+- lib/orthoses/autoload.rb
 - lib/orthoses/avoid_recursive_ancestor_error.rb
 - lib/orthoses/builder.rb
 - lib/orthoses/call_tracer.rb
@@ -55,8 +56,10 @@ files:
 - lib/orthoses/load_rbs.rb
 - lib/orthoses/mixin.rb
 - lib/orthoses/object_space_all.rb
+- lib/orthoses/path_helper.rb
 - lib/orthoses/pp.rb
 - lib/orthoses/rbs_prototype_rb.rb
+- lib/orthoses/rbs_prototype_runtime.rb
 - lib/orthoses/store.rb
 - lib/orthoses/tap.rb
 - lib/orthoses/utils.rb
@@ -69,6 +72,8 @@ files:
 - sig/orthoses/_middle_ware.rbs
 - sig/orthoses/attribute.rbs
 - sig/orthoses/attribute/hook.rbs
+- sig/orthoses/autoload.rbs
+- sig/orthoses/autoload/hook.rbs
 - sig/orthoses/avoid_recursive_ancestor_error.rbs
 - sig/orthoses/builder.rbs
 - sig/orthoses/builder/call_logable.rbs
@@ -89,8 +94,10 @@ files:
 - sig/orthoses/mixin/hook.rbs
 - sig/orthoses/name_space_error.rbs
 - sig/orthoses/object_space_all.rbs
+- sig/orthoses/path_helper.rbs
 - sig/orthoses/pp.rbs
 - sig/orthoses/rbs_prototype_rb.rbs
+- sig/orthoses/rbs_prototype_runtime.rbs
 - sig/orthoses/store.rbs
 - sig/orthoses/tap.rbs
 - sig/orthoses/utils.rbs
@@ -117,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Framework for Generate RBS