unparser 0.6.5 → 0.8.0

data/lib/unparser.rb

@@ -3,7 +3,6 @@
 require 'diff/lcs'
 require 'diff/lcs/hunk'
 require 'optparse'
-require 'parser/current'
 require 'set'
 
 require 'unparser/equalizer'
@@ -18,18 +17,53 @@ require 'unparser/anima/attribute'
 require 'unparser/anima/error'
 
 # Library namespace
-module Unparser
+module Unparser # rubocop:disable Metrics/ModuleLength
   # Unparser specific AST builder defaulting to modern AST format
-  class Builder < Parser::Builders::Default
-    modernize
+  if Gem::Version.new(RUBY_VERSION) <= '3.4'
+    require 'parser/current'
+    class Builder < Parser::Builders::Default
+      modernize
 
-    def initialize
-      super
+      # mutant:disable
+      def initialize
+        super
 
-      self.emit_file_line_as_literals = false
+        self.emit_file_line_as_literals = false
+      end
+    end
+  else
+    require 'prism'
+    class Builder < Prism::Translation::Parser::Builder
+      modernize
+
+      # mutant:disable
+      def initialize
+        super
+
+        self.emit_file_line_as_literals = false
+      end
     end
   end
 
+  PARSER_CLASS =
+    if Gem::Version.new(RUBY_VERSION) <= '3.4'
+      Class.new(Parser::CurrentRuby) do
+        def declare_local_variable(local_variable)
+          static_env.declare(local_variable)
+        end
+      end
+    else
+      Class.new(Prism::Translation::Parser34) do
+        def declare_local_variable(local_variable)
+          (@local_variables ||= Set.new) << local_variable
+        end
+
+        def prism_options
+          super.merge(scopes: [@local_variables.to_a])
+        end
+      end
+    end
+
   EMPTY_STRING = ''.freeze
   EMPTY_ARRAY  = [].freeze
 
@@ -44,57 +78,118 @@ module Unparser
       @node = node
       freeze
     end
-  end
+  end # InvalidNodeError
+
+  # Error raised when unparser encounders AST it cannot generate source for that would parse to the same AST.
+  class UnsupportedNodeError < RuntimeError
+  end # UnsupportedNodeError
 
   # Unparse an AST (and, optionally, comments) into a string
   #
   # @param [Parser::AST::Node, nil] node
-  # @param [Array] comment_array
+  # @param [Array] comments
+  # @param [Encoding, nil] explicit_encoding
+  # @param [Set<Symbol>] static_local_variables
+  #
+  # @return [String]
+  #
+  # @raise InvalidNodeError
+  #   if the node passed is invalid
+  #
+  # @api public
+  #
+  # mutant:disable
+  # rubocop:disable Metrics/ParameterLists
+  def self.unparse(
+    node,
+    comments:               EMPTY_ARRAY,
+    explicit_encoding:      nil,
+    static_local_variables: Set.new
+  )
+    unparse_ast(
+      AST.new(
+        comments:               comments,
+        explicit_encoding:      explicit_encoding,
+        node:                   node,
+        static_local_variables: static_local_variables
+      )
+    )
+  end
+  # rubocop:enable Metrics/ParameterLists
+
+  # Unparse an AST
+  #
+  # @param [AST] ast
   #
   # @return [String]
   #
   # @raise InvalidNodeError
   #   if the node passed is invalid
   #
+  # @raise UnsupportedNodeError
+  #   if the node passed is valid but unparser cannot unparse it
+  #
   # @api public
-  def self.unparse(node, comment_array = [])
-    return '' if node.nil?
+  def self.unparse_ast(ast)
+    return EMPTY_STRING if ast.node.nil?
+
+    local_variable_scope = AST::LocalVariableScope.new(
+      node:                   ast.node,
+      static_local_variables: ast.static_local_variables
+    )
 
     Buffer.new.tap do |buffer|
       Emitter::Root.new(
-        buffer,
-        node,
-        Comments.new(comment_array)
+        buffer:               buffer,
+        comments:             Comments.new(ast.comments),
+        explicit_encoding:    ast.explicit_encoding,
+        local_variable_scope: local_variable_scope,
+        node:                 ast.node
       ).write_to_buffer
     end.content
   end
 
-  # Unparse with validation
+  # Unparse AST either
   #
-  # @param [Parser::AST::Node, nil] node
-  # @param [Array] comment_array
+  # @param [AST] ast
   #
-  # @return [Either<Validation,String>]
-  def self.unparse_validate(node, comment_array = [])
-    generated = unparse(node, comment_array)
-    validation = Validation.from_string(generated)
+  # @return [Either<Exception,String>]
+  def self.unparse_ast_either(ast)
+    Either.wrap_error(Exception) { unparse_ast(ast) }
+  end
+
+  # Unparse AST either
+  #
+  # @param [AST] ast
+  #
+  # @return [Either<Exception,String>]
+  #
+  # mutant:disable
+  def self.unparse_validate_ast_either(ast:)
+    validation = Validation.from_ast(ast:)
 
     if validation.success?
-      Either::Right.new(generated)
+      Either::Right.new(validation.generated_source.from_right)
     else
       Either::Left.new(validation)
     end
   end
 
-  # Unparse capturing errors
-  #
-  # This is mostly useful for writing testing tools against unparser.
+  # Unparse with validation
   #
   # @param [Parser::AST::Node, nil] node
+  # @param [Array] comments
   #
-  # @return [Either<Exception, String>]
-  def self.unparse_either(node)
-    Either.wrap_error(Exception) { unparse(node) }
+  # @return [Either<Validation,String>]
+  def self.unparse_validate(node, comments: EMPTY_ARRAY)
+    generated = unparse(node, comments:)
+    validation = Validation.from_string(generated)
+
+    if validation.success?
+      Either::Right.new(generated)
+    else
+      Either::Left.new(validation)
+    end
   end
 
   # Parse string into AST
@@ -103,27 +198,37 @@ module Unparser
   #
   # @return [Parser::AST::Node, nil]
   def self.parse(source)
-    parser.parse(buffer(source))
+    parse_ast(source).node
   end
 
   # Parse string into either syntax error or AST
   #
   # @param [String] source
   #
-  # @return [Either<Parser::SyntaxError, (Parser::ASTNode, nil)>]
-  def self.parse_either(source)
-    Either.wrap_error(Parser::SyntaxError) do
-      parser.parse(buffer(source))
+  # @return [Either<Exception, (Parser::ASTNode, nil)>]
+  def self.parse_ast_either(source)
+    Either.wrap_error(Exception) do
+      parse_ast(source)
     end
   end
 
-  # Parse string into AST, with comments
+  # Parse source with ast details
   #
   # @param [String] source
   #
-  # @return [Parser::AST::Node]
-  def self.parse_with_comments(source)
-    parser.parse_with_comments(buffer(source))
+  # @return [AST]
+  #
+  # mutant:disable
+  def self.parse_ast(source, static_local_variables: Set.new)
+    explicit_encoding = Parser::Source::Buffer.recognize_encoding(source.dup.force_encoding(Encoding::BINARY))
+    node, comments = parser.parse_with_comments(buffer(source))
+
+    AST.new(
+      comments:               comments,
+      explicit_encoding:      explicit_encoding,
+      node:                   node,
+      static_local_variables: static_local_variables
+    )
   end
 
   # Parser instance that produces AST unparser understands
@@ -131,8 +236,9 @@ module Unparser
   # @return [Parser::Base]
   #
   # @api private
+  # mutant:disable
   def self.parser
-    Parser::CurrentRuby.new(Builder.new).tap do |parser|
+    PARSER_CLASS.new(Builder.new).tap do |parser|
       parser.diagnostics.tap do |diagnostics|
         diagnostics.all_errors_are_fatal = true
       end
@@ -179,6 +285,7 @@ require 'unparser/emitter/def'
 require 'unparser/emitter/defined'
 require 'unparser/emitter/dstr'
 require 'unparser/emitter/dsym'
+require 'unparser/emitter/ensure'
 require 'unparser/emitter/flipflop'
 require 'unparser/emitter/float'
 require 'unparser/emitter/flow_modifier'
@@ -210,6 +317,7 @@ require 'unparser/emitter/rescue'
 require 'unparser/emitter/root'
 require 'unparser/emitter/send'
 require 'unparser/emitter/simple'
+require 'unparser/emitter/string'
 require 'unparser/emitter/splat'
 require 'unparser/emitter/super'
 require 'unparser/emitter/undef'
@@ -222,8 +330,10 @@ require 'unparser/emitter/find_pattern'
 require 'unparser/emitter/match_pattern'
 require 'unparser/emitter/match_pattern_p'
 require 'unparser/writer'
+require 'unparser/writer/array'
 require 'unparser/writer/binary'
 require 'unparser/writer/dynamic_string'
+require 'unparser/writer/regexp'
 require 'unparser/writer/resbody'
 require 'unparser/writer/rescue'
 require 'unparser/writer/send'
@@ -234,6 +344,7 @@ require 'unparser/writer/send/unary'
 require 'unparser/node_details'
 require 'unparser/node_details/send'
 require 'unparser/cli'
+require 'unparser/util'
 
 require 'unparser/validation'
 # make it easy for zombie

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.8.0
 platform: ruby
 authors:
 - Markus Schirp
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -16,84 +15,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +197,7 @@ files:
 - lib/unparser/emitter/defined.rb
 - lib/unparser/emitter/dstr.rb
 - lib/unparser/emitter/dsym.rb
+- lib/unparser/emitter/ensure.rb
 - lib/unparser/emitter/find_pattern.rb
 - lib/unparser/emitter/flipflop.rb
 - lib/unparser/emitter/float.rb
@@ -221,6 +235,7 @@ files:
 - lib/unparser/emitter/send.rb
 - lib/unparser/emitter/simple.rb
 - lib/unparser/emitter/splat.rb
+- lib/unparser/emitter/string.rb
 - lib/unparser/emitter/super.rb
 - lib/unparser/emitter/undef.rb
 - lib/unparser/emitter/variable.rb
@@ -232,10 +247,13 @@ files:
 - lib/unparser/node_details.rb
 - lib/unparser/node_details/send.rb
 - lib/unparser/node_helpers.rb
+- lib/unparser/util.rb
 - lib/unparser/validation.rb
 - lib/unparser/writer.rb
+- lib/unparser/writer/array.rb
 - lib/unparser/writer/binary.rb
 - lib/unparser/writer/dynamic_string.rb
+- lib/unparser/writer/regexp.rb
 - lib/unparser/writer/resbody.rb
 - lib/unparser/writer/rescue.rb
 - lib/unparser/writer/send.rb
@@ -249,9 +267,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/mbj/unparser/issues
-  changelog_uri: https://github.com/mbj/unparser/blob/master/Changelog.md
+  changelog_uri: https://github.com/mbj/unparser/blob/main/Changelog.md
   funding_uri: https://github.com/sponsors/mbj
-post_install_message:
+  source_code_uri: https://github.com/mbj/unparser
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -259,15 +278,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
 test_files: []