rbs-trace 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f76be342e771b3dc3ea9ae507fce861475310bc8c093e91999e802516114a7
-  data.tar.gz: a8a78314b1ba4ab837318e0b4f555e7898a1d16f938f2d8bd58c0e57cc5b5076
+  metadata.gz: e581815794d8c52a9561fb7ff53b65c1a55e724f344755a62425e819c9f13026
+  data.tar.gz: f47c3e52cd245fda6baa8fa5f551e0522959e22cfb955f51eaaab80eb206250d
 SHA512:
-  metadata.gz: ef51d01034f05ac60091ed78956bd01923735aa6692b32e74e973a4eb598b27f46ebeaf60a33bd842a9d9ae4c1f8310e85de75d60cff3859c9c8a20329ba7ec9
-  data.tar.gz: b78f4dbb9aca347a74a5f2461a553870b11509405569a1bee5464147b417bd894f51cbbe70678cd3b5ed906af1cdcea4c0e9a756a18072e496492ce4c44a0077
+  metadata.gz: 0fc4e5b0ab08a35732431a76003dfe6b2d11ded93552a84da005f16304714cdaa18e69a94615118373b22885b60e54dc1aa056f5416c6804155fefa305f94eb7
+  data.tar.gz: 3ae37b7e9b5e99bfa44bbfad481db06bf5c567d9d7852a8b868b7003a752d8df03464e58f56d6c90bd2baba11b095b7ccc31c65168599a0182c70082e5f776d5

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.2.0] - 2024-09-11
+
+- feat: Support Union type
+- feat: Support Optional type
+- fix: Fix a bug that generated invalid RBS
+- fix: Fix errors to parse methods with anonymous arguments
+- fix: Consider the case where the caller cannot be found
+- fix: Ignore a method generated by `class_eval`
+
 ## [0.1.0] - 2024-09-07
 
 - Initial release

data/lib/rbs/trace/declaration.rb

@@ -6,6 +6,7 @@ module RBS
       METHOD_KINDS = %i[req opt rest keyreq key keyrest].freeze
       private_constant :METHOD_KINDS
 
+      attr_reader :parameters, :void
       attr_accessor :return_type
 
       def initialize(parameters, void: false)
@@ -14,17 +15,24 @@ module RBS
       end
 
       def to_rbs
-        ret = if @void
-                "void"
-              elsif @return_type == NilClass
-                "nil"
-              elsif @return_type == TrueClass || @return_type == FalseClass
-                "bool"
-              else
-                @return_type
-              end
+        return_rbs = void ? "void" : convert_type(return_type)
 
-        "(#{parameters_rbs}) -> #{ret}"
+        "(#{parameters_rbs}) -> #{return_rbs}"
+      end
+
+      def merge(other) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        new_parameters = @parameters.map.with_index do |parameter, index|
+          kind = parameter[0]
+          name = parameter[1]
+          klass = parameter[2]
+          other_klass = other.parameters[index][2]
+
+          merged_klass = (klass + other_klass).uniq
+          [kind, name, merged_klass]
+        end
+        Declaration.new(new_parameters, void: void && other.void).tap do |decl|
+          decl.return_type = (return_type + other.return_type).uniq
+        end
       end
 
       private
@@ -45,19 +53,46 @@ module RBS
       end
 
       def convert(kind, name, klass) # rubocop:disable Metrics/MethodLength
+        type = convert_type(klass)
         case kind
         when :req
-          klass
+          type
         when :opt
-          "?#{klass}"
+          "?#{type}"
         when :rest
-          "*#{klass.join("|")}"
+          "*#{type}"
         when :keyreq
-          "#{name}: #{klass}"
+          "#{name}: #{type}"
         when :key
-          "?#{name}: #{klass}"
+          "?#{name}: #{type}"
         when :keyrest
-          "**#{klass.join("|")}"
+          "**#{type}"
+        end
+      end
+
+      def convert_type(klass) # rubocop:disable Metrics
+        optional = klass.any? { |k| k == NilClass }
+        types = klass.filter_map do |k|
+          if k == NilClass
+            nil
+          elsif [TrueClass, FalseClass].include?(k)
+            "bool"
+          elsif k == Object
+            "untyped"
+          else
+            k.name
+          end
+        end.uniq
+        type = types.join("|")
+
+        if types.size > 1 && optional
+          "(#{type})?"
+        elsif types.empty?
+          "nil"
+        elsif optional
+          "#{type}?"
+        else
+          type
         end
       end
     end

data/lib/rbs/trace/definition.rb

@@ -20,8 +20,7 @@ module RBS
       end
 
       def rbs
-        # TODO: merge multiple decls
-        @decls.first.to_rbs
+        @decls.inject { |result, decl| result.merge(decl) }.to_rbs
       end
     end
   end

data/lib/rbs/trace/method_tracing.rb

@@ -72,18 +72,19 @@ module RBS
         logger.debug(e)
       end
 
-      def call_event(tp) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        parameters = tp.parameters.map do |kind, name|
-          value = tp.binding.local_variable_get(name)
+      def call_event(tp) # rubocop:disable Metrics
+        parameters = tp.parameters.filter_map do |kind, name|
+          value = tp.binding.local_variable_get(name) unless %i[* ** &].include?(name)
           klass = case kind
                   when :rest
-                    value.map(&:class).uniq
+                    value ? value.map(&:class).uniq : [Object]
                   when :keyrest
-                    value.map { |_, v| v.class }.uniq
+                    value ? value.map { |_, v| v.class }.uniq : [Object]
                   when :block
                     # TODO: support block argument
+                    next
                   else
-                    value.class
+                    [value.class]
                   end
           [kind, name, klass]
         end
@@ -95,7 +96,7 @@ module RBS
         # TODO: check usecase where decl is nil
         return unless decl
 
-        decl.return_type = tp.event == :return ? tp.return_value.class : nil
+        decl.return_type = tp.event == :return ? [tp.return_value.class] : [nil]
         definition.decls << decl
       end
 
@@ -104,17 +105,20 @@ module RBS
         ruby_lib_path = RbConfig::CONFIG["rubylibdir"]
 
         path.start_with?("<internal") ||
+          path.start_with?("(eval") ||
           path.start_with?(bundle_path) ||
           path.start_with?(ruby_lib_path) ||
           path.start_with?(__FILE__)
       end
 
-      def assign_return_value?(path, method_id) # rubocop:disable Metrics/AbcSize
+      def assign_return_value?(path, method_id) # rubocop:disable Metrics
         is_initialize = method_id == :initialize
         return false if is_initialize
 
         i = caller_locations.index { |loc| loc.path == path && loc.label == method_id.to_s }
-        loc = caller_locations[i + 1]
+        loc = caller_locations[i + 1] if i
+        # If the caller is not found, assume the return value is used.
+        return true unless loc
 
         node = parsed_nodes(loc.path)
         method_name = is_initialize ? :new : method_id

data/lib/rbs/trace/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   module Trace
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs-trace
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Takumi Shotoku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -54,8 +54,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/sinsoku/rbs-trace
-  source_code_uri: https://github.com/sinsoku/rbs-trace/blob/v0.1.0/CHANGELOG.md
-  changelog_uri: https://github.com/sinsoku/rbs-trace/tree/v0.1.0
+  source_code_uri: https://github.com/sinsoku/rbs-trace/blob/v0.2.0/CHANGELOG.md
+  changelog_uri: https://github.com/sinsoku/rbs-trace/tree/v0.2.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []