rbs-trace 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7d9ae59c5c4d3427c486422dcda9158bb65b1d5054d0ab5713a9714de9f39c
-  data.tar.gz: fc377a935ef972ac2e153d40f336154c03cb1e42b88dc732132f2e71bba83047
+  metadata.gz: 4040f1116ab68a5b072e7a847480080c778b1ff87c37a0a47d1ee3b923f61ffb
+  data.tar.gz: b262f219610e463cdccfa5d7e3442526963f118d2ea1386ff442919920b9053f
 SHA512:
-  metadata.gz: e3ff05d28fbef44e66500377dd38e74a0a3890da197d00bbf61b461358d404fef1933d43e30655a5dffce3850f1a71b4d535b88db8e209d2d1100ba7c1f502e9
-  data.tar.gz: 446d6c0d49e72fae943708bc146bf80365cd107bac3d9c509950a0184611f19982dc244f0398964ff50d4d462756a3004ce73e5d5d0488a1ae9e41257555a447
+  metadata.gz: e3e1eea5dc319b4eafd62e62ffc1dc10ccc3301ffa603ddd8696f9b0a9a8f16a7604037873595fd91291211264e79622e8f1eba05a22dd02e78133466ae35e7d
+  data.tar.gz: 30f08d4582741295df623ab8ddf1f87c97723eeea0a8217e39a6ae4bcd12dd6a1ee88623256d96e29a83a410687ec8e3fa89a3ce95a72973dc5ad1002846481d

data/.rubocop.yml

@@ -1,6 +1,7 @@
 require:
   - rubocop-rake
   - rubocop-rspec
+  - rubocop-performance
 
 AllCops:
   TargetRubyVersion: 3.1

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.4.1] - 2025-02-24
+
+- fix: Ensure class names are referenced
+- fix: Prefer other types over void and untyped
+- fix: Fix process to guess return value as void
+- fix: Do not parse if the caller is not Ruby
+- chore: Auto correct with rubocop-performance
+
 ## [0.4.0] - 2025-02-23
 
 - feat: Implement the function to save as RBS files

data/lib/rbs/trace/builder.rb

@@ -2,9 +2,13 @@
 
 module RBS
   class Trace
-    class Builder
+    class Builder # rubocop:disable Metrics/ClassLength
       include Helpers
 
+      UNBOUND_CLASS_METHOD = Object.instance_method(:class)
+      UNBOUND_NAME_METHOD = Class.instance_method(:name)
+      private_constant :UNBOUND_CLASS_METHOD, :UNBOUND_NAME_METHOD
+
       GENERICS_SIZE = {
         Array => 1,
         Range => 1,
@@ -12,12 +16,14 @@ module RBS
       }.freeze
       private_constant :GENERICS_SIZE
 
-      # @rbs (bind: Binding, parameters: Array[__todo__], void: bool) -> void
+      # @rbs (bind: Binding, parameters: Array[__todo__], void: bool) -> Array[__todo__]
       def method_call(bind:, parameters:, void:)
         method_type = parse_parameters(bind, parameters)
         return_type = type_void if void
 
-        stack_traces << [method_type, return_type]
+        [method_type, return_type].tap do |types|
+          stack_traces << types
+        end
       end
 
       # @rbs (__todo__) -> AST::Members::MethodDefinition::Overload
@@ -101,16 +107,17 @@ module RBS
 
       # @rbs (untyped) -> Types::t
       def parse_class(klass) # rubocop:disable Metrics/MethodLength
+        class_name = UNBOUND_NAME_METHOD.bind_call(klass)
         if [TrueClass, FalseClass].include?(klass)
           type_bool
         elsif klass == NilClass
           type_nil
-        elsif klass == Object || klass.name.nil?
+        elsif klass == Object || class_name.nil?
           type_untyped
         else
           size = GENERICS_SIZE[klass].to_i
           args = Array.new(size) { type_untyped }
-          Types::ClassInstance.new(name: TypeName.parse(klass.name), args:, location: nil)
+          Types::ClassInstance.new(name: TypeName.parse(class_name), args:, location: nil)
         end
       end
 
@@ -119,6 +126,11 @@ module RBS
         klass = obj_to_class(object)
         parse_class(klass)
       end
+
+      # @rbs (BasicObject) -> Class
+      def obj_to_class(obj)
+        UNBOUND_CLASS_METHOD.bind_call(obj)
+      end
     end
   end
 end

data/lib/rbs/trace/helpers.rb

@@ -3,9 +3,6 @@
 module RBS
   class Trace
     module Helpers
-      UNBOUND_CLASS_METHOD = Object.instance_method(:class)
-      private_constant :UNBOUND_CLASS_METHOD
-
       # @rbs (name: TypeName) -> AST::Declarations::Module
       def new_module_decl(name:)
         AST::Declarations::Module.new(
@@ -46,11 +43,6 @@ module RBS
         )
       end
 
-      # @rbs (BasicObject) -> Class
-      def obj_to_class(obj)
-        UNBOUND_CLASS_METHOD.bind_call(obj)
-      end
-
       # @rbs () -> Types::Bases::Void
       def type_void
         @type_void = Types::Bases::Void.new(location: nil)

data/lib/rbs/trace/overload_compact.rb

@@ -72,14 +72,22 @@ module RBS
 
       # @rbs (Array[Types::t]) -> Types::t
       def merge_types(types)
+        types = compact_types(types)
         return types.first if types.one?
 
-        optional = types.any? { |type| type.is_a?(Types::Bases::Nil) }
+        optional = types.any?(Types::Bases::Nil)
         types = types.reject { |type| type.is_a?(Types::Bases::Nil) }
         type = types.one? ? types.first : Types::Union.new(types:, location: nil) #: Types::t
 
         optional ? Types::Optional.new(type:, location: nil) : type
       end
+
+      # @rbs (Array[Types::t]) -> Array[Types::t]
+      def compact_types(types)
+        types = types.reject { |t| t.is_a?(Types::Bases::Void) } if types.any? { |t| !t.is_a?(Types::Bases::Void) }
+        types.reject! { |t| t.is_a?(Types::Bases::Any) } if types.any? { |t| !t.is_a?(Types::Bases::Any) }
+        types
+      end
     end
   end
 end

data/lib/rbs/trace/return_value_visitor.rb

@@ -38,7 +38,7 @@ module RBS
       # @rbs (Prism::CallNode) -> void
       def visit_call_node(node)
         key = [node.location.start_line, node.name]
-        @void_types[key] = !use_return_value?(node)
+        @void_types[key] = void?(node)
 
         visit_child_nodes(node)
       end
@@ -50,13 +50,16 @@ module RBS
       private
 
       # @rbs (Prism::CallNode) -> bool
-      def use_return_value?(_node)
-        parent_type = @parents[-1]&.type
-        next_parent_type = @parents[-2]&.type
+      def void?(node)
+        parent_node = @parents[-1]
+        next_parent_node = @parents[-2]
+        return true if parent_node.nil? || next_parent_node.nil?
 
-        parent_type.end_with?("write_node") ||
-          parent_type == :call_node ||
-          (parent_type == :statements_node && next_parent_type == :embedded_statements_node)
+        if next_parent_node.type == :program_node
+          parent_node.type == :statements_node
+        else
+          parent_node.type == :statements_node && parent_node.child_nodes[-1] != node
+        end
       end
     end
   end

data/lib/rbs/trace/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   class Trace
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/rbs/trace.rb

@@ -151,6 +151,9 @@ module RBS
       # Returns true if the file does not exist (eval, etc.)
       return true unless ::File.exist?(caller_path)
 
+      # If the file is not Ruby, assume the return value is used. (erb, haml, etc.)
+      return false if ::File.extname(caller_path) != ".rb"
+
       @return_value_visitors ||= {} #: Hash[String, ReturnValueVisitor]
       v = @return_value_visitors.fetch(caller_path) { ReturnValueVisitor.parse_file(caller_path) }
       v.void_type?(loc.lineno, method_id)

data/sig/generated/rbs/trace/builder.rbs

@@ -5,10 +5,14 @@ module RBS
     class Builder
       include Helpers
 
+      UNBOUND_CLASS_METHOD: untyped
+
+      UNBOUND_NAME_METHOD: untyped
+
       GENERICS_SIZE: untyped
 
-      # @rbs (bind: Binding, parameters: Array[__todo__], void: bool) -> void
-      def method_call: (bind: Binding, parameters: Array[__todo__], void: bool) -> void
+      # @rbs (bind: Binding, parameters: Array[__todo__], void: bool) -> Array[__todo__]
+      def method_call: (bind: Binding, parameters: Array[__todo__], void: bool) -> Array[__todo__]
 
       # @rbs (__todo__) -> AST::Members::MethodDefinition::Overload
       def method_return: (__todo__) -> AST::Members::MethodDefinition::Overload
@@ -28,6 +32,9 @@ module RBS
 
       # @rbs (BasicObject) -> Types::t
       def parse_object: (BasicObject) -> Types::t
+
+      # @rbs (BasicObject) -> Class
+      def obj_to_class: (BasicObject) -> Class
     end
   end
 end

data/sig/generated/rbs/trace/helpers.rbs

@@ -3,8 +3,6 @@
 module RBS
   class Trace
     module Helpers
-      UNBOUND_CLASS_METHOD: untyped
-
       # @rbs (name: TypeName) -> AST::Declarations::Module
       def new_module_decl: (name: TypeName) -> AST::Declarations::Module
 
@@ -14,9 +12,6 @@ module RBS
       # @rbs (name: Symbol, kind: (:singleton | :instance)) -> AST::Members::MethodDefinition
       def new_method_definition: (name: Symbol, kind: :singleton | :instance) -> AST::Members::MethodDefinition
 
-      # @rbs (BasicObject) -> Class
-      def obj_to_class: (BasicObject) -> Class
-
       # @rbs () -> Types::Bases::Void
       def type_void: () -> Types::Bases::Void
 

data/sig/generated/rbs/trace/overload_compact.rbs

@@ -16,6 +16,9 @@ module RBS
 
       # @rbs (Array[Types::t]) -> Types::t
       def merge_types: (Array[Types::t]) -> Types::t
+
+      # @rbs (Array[Types::t]) -> Array[Types::t]
+      def compact_types: (Array[Types::t]) -> Array[Types::t]
     end
   end
 end

data/sig/generated/rbs/trace/return_value_visitor.rbs

@@ -21,7 +21,7 @@ module RBS
       private
 
       # @rbs (Prism::CallNode) -> bool
-      def use_return_value?: (Prism::CallNode) -> bool
+      def void?: (Prism::CallNode) -> bool
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs-trace
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Takumi Shotoku
@@ -88,8 +88,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/sinsoku/rbs-trace
-  source_code_uri: https://github.com/sinsoku/rbs-trace/tree/v0.4.0
-  changelog_uri: https://github.com/sinsoku/rbs-trace/blob/v0.4.0/CHANGELOG.md
+  source_code_uri: https://github.com/sinsoku/rbs-trace/tree/v0.4.1
+  changelog_uri: https://github.com/sinsoku/rbs-trace/blob/v0.4.1/CHANGELOG.md
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: