synvert-core 1.31.0 → 1.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3346883848c81ac9a130e077d0aae4eec34df1fcc365c95b9971b558b346f1a9
-  data.tar.gz: 15f5f83ef0d59c08edcf2cd076a36d0e057e94fee8d0435ca679c1a3e094dd01
+  metadata.gz: eba97ad9bc0ca05de1f79a1fcfeb5bca602d71117d1ec9bef2e540e0180cffb3
+  data.tar.gz: 92d790d50d7d11c4d726bf16e30de8de4874cfbfec00b1c28043190e888b4e3b
 SHA512:
-  metadata.gz: a24728c75868284ed17baa5cdc9b9ab1d0961ba560ea00f7a71eaf0fe4bf3a01f322435002a9911e934d87a51a744f77b1c21b54bb8126739d31e0a50a9a991c
-  data.tar.gz: 65505c1d4f55b82d789f119463d535a67c11c85f18cbcbb0d7311d572f23e42085b44477d7d70c14e4019511cf5db7c502ac2e7278f0481720aaf64da7031e1f
+  metadata.gz: 490772f30d18037ad305217bfa7ae5ddce828a8decdecac855c8666a52beb92e23786f1057f3f3528d93005eebe07d15cc550479c7116c8434e6b2f275248125
+  data.tar.gz: 92450dc3df3f69e664e1b95e98c17814a3ad9e1c700c5b73741703abb54fbc96a598f0e5cc4783331355f8fb153dbe08ef41bb098327520e5851724a6a103355

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 1.32.0 (2024-02-11)
+
+* Support `prism`
+* Update `node_mutation` to 1.23.0
+* Update `node_query` to 1.15.0
+
+## 1.31.1 (2024-01-30)
+
+* Update `node_mutation` to 1.22.4
+* Remove `redo_until_no_change` dsl
+
 ## 1.31.0 (2024-01-14)
 
 * Support `Configuration.test_result` in `add_file` and `remove_file` dsl

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.31.0)
+    synvert-core (1.32.0)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.21.6)
-      node_query (>= 1.13.12)
+      node_mutation (>= 1.23.0)
+      node_query (>= 1.15.0)
       parallel
       parser
-      parser_node_ext (>= 1.2.1)
+      parser_node_ext (>= 1.2.2)
+      prism
+      prism_ext (>= 0.2.2)
       syntax_tree
-      syntax_tree_ext (>= 0.6.4)
+      syntax_tree_ext (>= 0.7.1)
 
 GEM
   remote: https://rubygems.org/
@@ -22,7 +24,7 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     diff-lcs (1.5.0)
     fakefs (2.4.0)
     ffi (1.15.5)
@@ -48,20 +50,23 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.21.1)
+    minitest (5.22.2)
     nenv (0.3.0)
-    node_mutation (1.22.2)
-    node_query (1.14.1)
+    node_mutation (1.23.0)
+    node_query (1.15.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.24.0)
-    parser (3.3.0.3)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    parser_node_ext (1.2.1)
+    parser_node_ext (1.2.2)
       parser
     prettier_print (1.2.1)
+    prism (0.22.0)
+    prism_ext (0.2.2)
+      prism
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -86,12 +91,12 @@ GEM
     shellany (0.0.1)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.6.4)
+    syntax_tree_ext (0.7.1)
       syntax_tree
     thor (1.2.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

data/README.md

@@ -70,7 +70,6 @@ DSLs are as follows
 * [helper_method](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#helper_method-instance_method) - define a helper method
 * [add_snippet](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#add_snippet-instance_method) - call another rewriter
 * [call_helper](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#call_helper-instance_method) - call a shared rewriter
-* [redo_until_no_change](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#redo_until_no_change-instance_method) - run the snippet until no change
 
 Scopes:
 

data/lib/synvert/core/rewriter/instance.rb

@@ -4,6 +4,8 @@ require 'parser/current'
 require 'parser_node_ext'
 require 'syntax_tree'
 require 'syntax_tree_ext'
+require 'prism'
+require 'prism_ext'
 
 module Synvert::Core
   # Instance is an execution unit, it finds specified ast nodes,
@@ -490,8 +492,11 @@ module Synvert::Core
     # @param encoded_source [String] encoded source code
     # @return [Node] ast node for file
     def parse_code(file_path, encoded_source)
-      if @rewriter.parser == Synvert::SYNTAX_TREE_PARSER
+      case @rewriter.parser
+      when Synvert::SYNTAX_TREE_PARSER
         parse_code_by_syntax_tree(file_path, encoded_source)
+      when Synvert::PRISM_PARSER
+        parse_code_by_prism(file_path, encoded_source)
       else
         parse_code_by_parser(file_path, encoded_source)
       end
@@ -517,7 +522,16 @@ module Synvert::Core
     # @param encoded_source [String] encoded source code
     # @return [Node] ast node for file
     def parse_code_by_syntax_tree(_file_path, encoded_source)
-      SyntaxTree::Parser.new(encoded_source).parse.statements
+      SyntaxTree.parse(encoded_source).statements
+    end
+
+    # Parse code ast node by prism.
+    #
+    # @param file_path [String] file path
+    # @param encoded_source [String] encoded source code
+    # @return [Node] ast node for file
+    def parse_code_by_prism(_file_path, encoded_source)
+      Prism.parse(encoded_source).value.statements
     end
   end
 end

data/lib/synvert/core/rewriter.rb

@@ -119,7 +119,6 @@ module Synvert::Core
       @sub_snippets = []
       @warnings = []
       @affected_files = Set.new
-      @redo_until_no_change = false
       @options = DEFAULT_OPTIONS.dup
       @test_results = Hash.new { |h, k| h[k] = [] }
       self.class.register(@group, @name, self)
@@ -130,8 +129,6 @@ module Synvert::Core
     def process
       @affected_files = Set.new
       instance_eval(&@block)
-
-      process if !@affected_files.empty? && @redo_until_no_change # redo
     end
 
     # Process rewriter with sandbox mode.
@@ -146,9 +143,6 @@ module Synvert::Core
       @affected_files = Set.new
       instance_eval(&@block)
 
-      if !@affected_files.empty? && @redo_until_no_change # redo
-        test
-      end
       if Configuration.test_result == 'new_source'
         @test_results.values.flatten
       else
@@ -199,11 +193,11 @@ module Synvert::Core
     #   configure({ parser: Synvert::PARSER_PARSER })
     #   configure({ strategy: 'allow_insert_at_same_position' })
     # @param options [Hash]
-    # @option parser [String] Synvert::PARSER_PARSER or Synvert::SYNTAX_TREE_PARSER
+    # @option parser [String] Synvert::PARSER_PARSER, Synvert::SYNTAX_TREE_PARSER, or Synvert::PRISM_PARSER
     # @option strategy [String] 'allow_insert_at_same_position'
     def configure(options)
       @options = @options.merge(options)
-      if options[:parser] && ![Synvert::PARSER_PARSER, Synvert::SYNTAX_TREE_PARSER].include?(options[:parser])
+      if options[:parser] && ![Synvert::PARSER_PARSER, Synvert::SYNTAX_TREE_PARSER, Synvert::PRISM_PARSER].include?(options[:parser])
         raise Errors::ParserNotSupported.new("Parser #{options[:parser]} not supported")
       end
     end
@@ -406,15 +400,6 @@ module Synvert::Core
       @helpers << { name: name, block: block }
     end
 
-    # Rerun the snippet until no change.
-    # @example
-    #   Synvert::Rewriter.new 'ruby', 'nested_class_definition' do
-    #     redo_until_no_change
-    #   end
-    def redo_until_no_change
-      @redo_until_no_change = true
-    end
-
     private
 
     # Handle one file.

data/lib/synvert/core/utils.rb

@@ -16,7 +16,7 @@ module Synvert::Core
           uri = URI.parse(format_url(snippet_name))
           return uri.open.read if remote_snippet_exists?(uri)
 
-          raise Errors::SnippetNotFound.new("#{snippet_name} nout found")
+          raise Errors::SnippetNotFound.new("#{snippet_name} not found")
         elsif is_valid_file?(snippet_name)
           return File.read(snippet_name)
         else
@@ -26,7 +26,7 @@ module Synvert::Core
           snippet_uri = URI.parse(format_url(remote_snippet_url(snippet_name)))
           return snippet_uri.open.read if remote_snippet_exists?(snippet_uri)
 
-          raise Errors::SnippetNotFound.new("#{snippet_name} nout found")
+          raise Errors::SnippetNotFound.new("#{snippet_name} not found")
         end
       end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.31.0'
+    VERSION = '1.32.0'
   end
 end

data/lib/synvert/core.rb

@@ -75,4 +75,5 @@ module Synvert
 
   PARSER_PARSER = 'parser'
   SYNTAX_TREE_PARSER = 'syntax_tree'
+  PRISM_PARSER = 'prism'
 end

data/spec/synvert/core/rewriter_spec.rb

@@ -382,15 +382,6 @@ module Synvert::Core
       expect(instance.dynamic_helper('arg1', 'arg2')).to eq 'dynamic result'
     end
 
-    it 'parses redo_until_no_change' do
-      rewriter =
-        Rewriter.new 'group', 'name' do
-          redo_until_no_change
-        end
-      rewriter.process
-      expect(rewriter.instance_variable_get('@redo_until_no_change')).to be_truthy
-    end
-
     describe 'class methods' do
       before :each do
         Rewriter.clear

data/synvert-core-ruby.gemspec

@@ -20,11 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
-  spec.add_runtime_dependency "node_query", ">= 1.13.12"
-  spec.add_runtime_dependency "node_mutation", ">= 1.21.6"
+  spec.add_runtime_dependency "node_query", ">= 1.15.0"
+  spec.add_runtime_dependency "node_mutation", ">= 1.23.0"
   spec.add_runtime_dependency "parser"
-  spec.add_runtime_dependency "parser_node_ext", ">= 1.2.1"
+  spec.add_runtime_dependency "parser_node_ext", ">= 1.2.2"
   spec.add_runtime_dependency "syntax_tree"
-  spec.add_runtime_dependency "syntax_tree_ext", ">= 0.6.4"
+  spec.add_runtime_dependency "syntax_tree_ext", ">= 0.7.1"
+  spec.add_runtime_dependency "prism"
+  spec.add_runtime_dependency "prism_ext", ">= 0.2.2"
   spec.add_runtime_dependency "parallel"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.31.0
+  version: 1.32.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.12
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.12
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.6
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.21.6
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: syntax_tree
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: prism_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement