orthoses 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd997f8aa90c6f1d49fdebe0a58c2de59d0df1e7146efa5c69d7d3614927c1b
-  data.tar.gz: 2f02a44951ad7b654e48d21c3b4100955997f102d616c494461bbbfeefdc7cc1
+  metadata.gz: d2799fba99407dbfe097d59c7fcd5238e5bc50b5e5c51bf6ac98402b0a67a8c0
+  data.tar.gz: 2c9f343a3d3aa78bbb00b72790105b3a54ec98a326b805ee08125033d2d60739
 SHA512:
-  metadata.gz: 2023496aaf266db6a0d5945a288891967fb3b61bf0b2851e270e56fc6e87398abd7bc761db2dd35dde313bd8f0c66cbfc9ede859d0b008356d4275bd9efa36fb
-  data.tar.gz: 622b6a3bd44b197620c5221998316d334bf47f5332a9e561df87226a8480fb4ebee1ab0ab50f7f7f5bed97fb24cc137ee5f427000004b469caadccc9987f40bb
+  metadata.gz: 4602f93d07de6f57cf37d48a26b37a9bcec04164a552fdb004e49255385b436d886718be415dda06ba4151fd68345e1cf48731cdbad2a5f1e0b676998cb7baa6
+  data.tar.gz: 7576d486cd86dd12674dfe97a71a2d64defbb289a5dca1fe762c4244a4e573f962c5d3f9585b1c469a8119a160e37cd7c8695e4e04e32cc51d7c2844fb6bf118

data/lib/orthoses/content/duplication_checker.rb

@@ -18,7 +18,9 @@ module Orthoses
         drop_known_method_definition
         drop_known_const_definition
 
-        @decl.members.replace(@uniq_map.values)
+        # HACK
+        new_members = @uniq_map.values
+        @decl.instance_eval { @members = new_members }
 
         @uniq_map.clear
       end

data/lib/orthoses/content.rb

@@ -68,7 +68,7 @@ module Orthoses
       require 'rbs/sorter'
       sorter = ::RBS::Sorter.new(nil, stdout: nil)
       decl = to_decl
-      sorter.sort_decl!(decl)
+      decl = sorter.sort_decl(decl)
       lines = decl_to_lines(decl)
       @body.replace(lines)
     end

data/lib/orthoses/trace/attribute.rb

@@ -23,9 +23,10 @@ module Orthoses
 
       include Targetable
 
-      def initialize(loader, patterns:)
+      def initialize(loader, patterns:, sort_union_types: true)
         @loader = loader
         @patterns = patterns
+        @sort_union_types = sort_union_types
 
         @captured_dict = Hash.new { |h, k| h[k] = Hash.new { |hh, kk| hh[kk] = [] } }
       end
@@ -45,6 +46,7 @@ module Orthoses
 
         @captured_dict.each do |mod_name, captures|
           captures.each do |(kind, prefix, name), types|
+            types.sort! if @sort_union_types
             injected = Utils::TypeList.new(types).inject
             store[mod_name] << "#{kind} #{prefix}#{name}: #{injected}"
           end

data/lib/orthoses/trace/method.rb

@@ -7,9 +7,10 @@ module Orthoses
       Info = Struct.new(:key, :op_name_types, :raised, keyword_init: true)
       include Targetable
 
-      def initialize(loader, patterns:)
+      def initialize(loader, patterns:, sort_union_types: true)
         @loader = loader
         @patterns = patterns
+        @sort_union_types = sort_union_types
 
         @stack = []
         @args_return_map = Hash.new { |h, k| h[k] = [] }
@@ -36,9 +37,7 @@ module Orthoses
           case tp.event
           when :call
             if tp.defined_class.singleton_class?
-              # e.g. `Minitest::Spec::DSL#to_s`` may return `nil` with `#to_s`
-              m = tp.defined_class.to_s&.match(/#<Class:([\w:]+)>/) or next
-              mod_name = m[1] or next
+              mod_name = Utils.attached_module_name(tp.defined_class) or next
               kind = :singleton
             else
               mod_name = Utils.module_name(tp.defined_class) or next
@@ -81,6 +80,7 @@ module Orthoses
 
         @args_return_map.map do |(mod_name, kind, visibility, method_id), type_samples|
           type_samples.uniq!
+          type_samples.sort! if @sort_union_types
           method_types = type_samples.map do |(op_name_types, return_type)|
             required_positionals = []
             optional_positionals = []

data/lib/orthoses/utils.rb

@@ -171,6 +171,17 @@ module Orthoses
       end
     end
 
+    def self.attached_module_name(mod)
+      if mod.respond_to?(:attached_object)
+        attached_object = mod.attached_object
+        (attached_object&.is_a?(Module) && attached_object.name) || nil
+      else
+        # e.g. `Minitest::Spec::DSL#to_s` may return `nil` with `#to_s`
+        m = mod.to_s&.match(/#<Class:([\w:]+)>/)
+        m && m[1]
+      end
+    end
+
     def self.known_type_params(name)
       type_name =
         case name

data/lib/orthoses/version.rb

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

data/sig/orthoses/trace.rbs

@@ -10,9 +10,10 @@ end
 class Orthoses::Trace::Attribute
   @loader: untyped
   @patterns: untyped
+  @sort_union_types: untyped
   @captured_dict: untyped
-  def initialize: (untyped loader, patterns: untyped) -> void
-  def call: () -> untyped
+  def initialize: (Orthoses::_Call loader, patterns: Array[String], ?sort_union_types: bool?) -> void
+  def call: () -> Orthoses::store
   private def build_trace_hook: () -> untyped
   include Orthoses::Trace::Targetable
 end
@@ -30,11 +31,12 @@ end
 class Orthoses::Trace::Method
   @loader: untyped
   @patterns: untyped
+  @sort_union_types: untyped
   @stack: untyped
   @args_return_map: untyped
   @alias_map: untyped
-  def initialize: (untyped loader, patterns: untyped) -> void
-  def call: () -> untyped
+  def initialize: (Orthoses::_Call loader, patterns: Array[String], ?sort_union_types: bool?) -> void
+  def call: () -> Orthoses::store
   private def build_trace_point: () -> untyped
   private def build_members: () -> untyped
   private def build_method_definitions: () -> untyped

data/sig/orthoses/utils.rbs

@@ -21,6 +21,8 @@ module Orthoses::Utils
 
   def self.module_to_type_name: (Module) -> RBS::TypeName?
 
+  def self.attached_module_name: (Module) -> String?
+
   def self.known_type_params: (Module | String) -> Array[RBS::AST::TypeParam]?
 
   def self.new_store: () -> Orthoses::store

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -124,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Framework for Generate RBS