unparser 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e776dd7b47efb62b8ad18d7262d247362944f28ea67edb7e518d8a94c74649
-  data.tar.gz: 759ec6fb240c4c62835bd8c789877fc26fc974563d2566687a63b2c0dec1072f
+  metadata.gz: c9a2bc4c065381b615f71cb36770c6edc2633ce160540426d28ebb6ccda689d8
+  data.tar.gz: c0952ffb8269388f5de64ea68719d785a59dd7f9869907c69df623aeb10d9006
 SHA512:
-  metadata.gz: 11fe99943d2575e00ca2fc150a78cad1f2f830b3249f3692f473da7e520775fc9423b254fb2f7613e4b6811f03dd3d2af0d4bba1d0f2f143e048ab65281771ff
-  data.tar.gz: f08db4117aa2ebba9c5ac7a9e057ca7ddc9fc0613170752ac10cc7515058f491fe756b880db73629e2e7a8328cc979872b4c682197c061de39da52a44796587f
+  metadata.gz: f0151e34f94305994a4e6fac9ea360fb5918b114e3e1f2ab9e1a6a6b5359134baa972d27a5c09410406185a1c91b5424590eb33ce1d343e928a4eb09bdbfa4e3
+  data.tar.gz: 0fe83efcc1cc934e3d045530c06f1addac19bf30bc101740bf56d8c4129ef2c5c7989498797d5098858b946094ec8962aecf55fa42bba866774ef34fc323fcf7

data/lib/unparser/ast/local_variable_scope.rb

@@ -107,8 +107,8 @@ module Unparser
       end
 
       # Enumerate each node with its local variable scope
-      def self.each(node:, stack:, &block)
-        new(stack: stack).each(node: node, &block)
+      def self.each(node:, stack:, &)
+        new(stack: stack).each(node: node, &)
       end
 
       # Enumerate local variable scope scope
@@ -121,8 +121,8 @@ module Unparser
       #
       # @api private
       #
-      def each(node:, &block)
-        visit(node, &block)
+      def each(node:, &)
+        visit(node, &)
       end
 
     private

data/lib/unparser/cli.rb

@@ -63,8 +63,8 @@ module Unparser
     # @api private
     #
     # mutant:disable
-    def self.run(*arguments)
-      new(*arguments).exit_status
+    def self.run(*)
+      new(*).exit_status
     end
 
     # Initialize object

data/lib/unparser/comments.rb

@@ -15,8 +15,8 @@ module Unparser
     #
     # @api private
     #
-    def source_range(*arguments)
-      self.class.source_range(*arguments)
+    def source_range(*)
+      self.class.source_range(*)
     end
 
     # Initialize object

data/lib/unparser/emitter/block.rb

@@ -51,7 +51,7 @@ module Unparser
           emit_send_target
         when :lambda
           visit(target)
-          emit_lambda_arguments unless node.type.equal?(:numblock)
+          emit_lambda_arguments
         else
           visit(target)
         end
@@ -63,7 +63,11 @@ module Unparser
         target_writer.emit_arguments_without_heredoc_body
       end
 
+      # NOTE: mutant fails on Ruby < 3.4
+      # mutant:disable
       def emit_lambda_arguments
+        return if node.type.equal?(:numblock) || itblock?
+
         parentheses { writer_with(Args, node: arguments).emit_lambda_arguments }
       end
 

data/lib/unparser/emitter.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module Unparser
-  UnknownNodeError = Class.new(ArgumentError)
+  class UnknownNodeError < ArgumentError
+  end
 
   # Emitter base class
   class Emitter

data/lib/unparser/util.rb

@@ -4,7 +4,8 @@ module Unparser
   # Original code before vendoring and reduction from: https://github.com/mbj/mutant/blob/main/lib/mutant/util.rb
   module Util
     # Error raised by `Util.one` if size is not exactly one
-    SizeError = Class.new(IndexError)
+    class SizeError < IndexError
+    end
 
     # Return only element in array if it contains exactly one member
     #

data/lib/unparser/validation.rb

@@ -145,7 +145,7 @@ module Unparser
     # mutant:disable
     def report_exception(phase_exception)
       if phase_exception
-        [phase_exception.inspect].concat(phase_exception.backtrace.take(20))
+        [phase_exception.inspect].concat(phase_exception.backtrace&.take(20) || [])
       else
         %w[undefined]
       end

data/lib/unparser/writer/dynamic_string.rb

@@ -26,42 +26,41 @@ module Unparser
       #
       # mutant:disable
       def dispatch
-        if heredoc?
-          write(HEREDOC_HEADER)
-          buffer.push_heredoc(heredoc_body)
-        elsif round_tripping_segmented_source
-          write(round_tripping_segmented_source)
-        else
-          fail UnsupportedNodeError, "Unparser cannot round trip this node: #{node.inspect}"
-        end
+        # Try predictable patterns first before exhaustive search
+
+        # Pattern 1: HEREDOC for large dstr (>= 8 children, preserve readability)
+        return write_heredoc if children.length >= HEREDOC_THRESHOLD && round_trips_heredoc?
+
+        # Pattern 2: Limited search (prevent exponential blowup)
+        source = limited_search_segmented_source
+        return write(source) if source
+
+        # Pattern 3: HEREDOC fallback (last resort if segmentation fails)
+        return write_heredoc if round_trips_heredoc?
+
+        fail UnsupportedNodeError, "Unparser cannot round trip this node: #{node.inspect}"
       end
 
     private
 
-      def heredoc?
-        if children.length >= HEREDOC_THRESHOLD
-          round_trips_heredoc?
-        else
-          round_tripping_segmented_source.nil? # && round_trips_heredoc?
-        end
+      def write_heredoc
+        write(HEREDOC_HEADER)
+        buffer.push_heredoc(heredoc_body)
       end
-      memoize :heredoc?
 
       def round_trips_heredoc?
         round_trips?(source: heredoc_source)
       end
       memoize :round_trips_heredoc?
 
-      def round_tripping_segmented_source
+      def limited_search_segmented_source
         each_segments(children) do |segments|
-
           source = segmented_source(segments: segments)
-
           return source if round_trips?(source: source)
         end
+
         nil
       end
-      memoize :round_tripping_segmented_source
 
       def each_segments(array)
         yield [array]

data/lib/unparser.rb

@@ -3,7 +3,6 @@
 require 'diff/lcs'
 require 'diff/lcs/hunk'
 require 'optparse'
-require 'set'
 
 require 'unparser/equalizer'
 require 'unparser/adamantium'
@@ -53,7 +52,14 @@ module Unparser # rubocop:disable Metrics/ModuleLength
         end
       end
     else
-      Class.new(Prism::Translation::Parser34) do
+      prism_translation_parser =
+        if Gem::Version.new(RUBY_VERSION) >= '4.0'
+          Prism::Translation::Parser40
+        else
+          Prism::Translation::Parser34
+        end
+
+      Class.new(prism_translation_parser) do
         def declare_local_variable(local_variable)
           (@local_variables ||= Set.new) << local_variable
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Markus Schirp
@@ -13,16 +13,22 @@ dependencies:
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -43,84 +49,110 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -278,14 +310,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
 test_files: []