synvert-core 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5f40c698306314082157a4b976ff37e9adf84bb81e1915b7ffd319cbac227a
-  data.tar.gz: 326fd1445561b81a70c9ed88ccd710c9103985f31e3349dccbc12688734b6630
+  metadata.gz: 4b4d94b7a468dff6d9a4d67bd45cef5414c764bc6b600dc9721f41195826d4f9
+  data.tar.gz: 201884db7550acfda6b6c3d29fa64b1e19109b65cc2efda03f10c2505a489a89
 SHA512:
-  metadata.gz: a296c2ea8fa640b117d409361dd7148bffaf63bf5ac7e7d90f636a83b40f6d32b2294a3bfd185b86bdc6a242179eed0ebf8325e78e9c6b90965932f97ed8358a
-  data.tar.gz: 5bfd5bf3f26f8a13dd595bb4428fa6c6a76a04e4d148cb1b45b286d2a437ca93ba608075edcafa8355f88fec7d7483e19ea0a312157c22bb007d320a0a50fb15
+  metadata.gz: 675fdcfbc851c74fa5e4e3b93aefeabe2d762c88fc70a1871e270b1dc18950388f19a80b1674145d34cdd96516e49aa67a265ccf7145d734002a2c58c7a26710
+  data.tar.gz: c0075e8fa2c2fa313b22a0db9021d4ea7cb31794beb9a5d913be9161eff9e120e7a8b76d33dbf68afbad4c00c6f564e1613d5e820069b5d0ae71ec8997c174c0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.0.1 (2024-05-04)
+
+* Rescue Prism and SyntaxTree parser error
+* Unlock activesupport version
+
 ## 2.0.0 (2024-04-28)
 
 * Add instance variable `Instance#current_parser`

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    synvert-core (2.0.0)
-      activesupport (< 7.0.0)
+    synvert-core (2.0.1)
+      activesupport
       node_mutation (>= 1.24.4)
       node_query (>= 1.15.2)
       node_visitor (>= 1.0.1)
@@ -17,20 +17,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.7)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
-    diff-lcs (1.5.0)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
     fakefs (2.4.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     formatador (1.1.0)
-    guard (2.18.0)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -46,12 +54,13 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    listen (3.7.1)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
     minitest (5.22.3)
+    mutex_m (0.2.0)
     nenv (0.3.0)
     node_mutation (1.24.4)
     node_query (1.15.2)
@@ -66,39 +75,38 @@ GEM
     parser_node_ext (1.3.2)
       parser
     prettier_print (1.2.1)
-    prism (0.27.0)
+    prism (0.28.0)
     prism_ext (0.3.2)
       prism
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.7.3)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.2)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     shellany (0.0.1)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
     syntax_tree_ext (0.8.2)
       syntax_tree
-    thor (1.2.1)
+    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

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

@@ -73,7 +73,7 @@ module Synvert::Core
             write_source(absolute_file_path, result.new_source)
           end
           break unless result.conflicted?
-        rescue Parser::SyntaxError => e
+        rescue Parser::SyntaxError, Prism::ParseError, SyntaxTree::Parser::ParseError => e
           if ENV['DEBUG'] == 'true'
             puts "[Warn] file #{file_path} was not parsed correctly."
             puts e.message
@@ -104,7 +104,7 @@ module Synvert::Core
         result = Configuration.test_result == 'new_source' ? @current_mutation.process : @current_mutation.test
         result.file_path = file_path
         result
-      rescue Parser::SyntaxError => e
+      rescue Parser::SyntaxError, Prism::ParseError, SyntaxTree::Parser::ParseError => e
         if ENV['DEBUG'] == 'true'
           puts "[Warn] file #{file_path} was not parsed correctly."
           puts e.message
@@ -114,7 +114,7 @@ module Synvert::Core
 
     # Gets current node, it allows to get current node in block code.
     #
-    # @return [Parser::AST::Node]
+    # @return [Node]
     def node
       @current_node
     end
@@ -128,7 +128,7 @@ module Synvert::Core
 
     # Set current_node to node and process.
     #
-    # @param node [Parser::AST::Node] node set to current_node
+    # @param node [Node] node set to current_node
     # @yield process
     def process_with_node(node)
       self.current_node = node
@@ -138,7 +138,7 @@ module Synvert::Core
 
     # Set current_node properly, process and set current_node back to original current_node.
     #
-    # @param node [Parser::AST::Node] node set to other_node
+    # @param node [Node] node set to other_node
     # @yield process
     def process_with_other_node(node)
       original_node = current_node
@@ -168,7 +168,7 @@ module Synvert::Core
     # @yield run on the matching nodes.
     def within_node(nql_or_rules, options = {}, &block)
       Rewriter::WithinScope.new(self, nql_or_rules, options, &block).process
-    rescue NodeQueryLexer::ScanError, Racc::ParseError => e
+    rescue NodeQueryLexer::ScanError, Racc::ParseError
       raise NodeQuery::Compiler::ParseError, "Invalid query string: #{nql_or_rules}"
     end
 
@@ -536,7 +536,10 @@ module Synvert::Core
     # @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
+      result = Prism.parse(encoded_source)
+      return result.value.statements if result.errors.empty?
+
+      raise result.errors.last
     end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/synvert-core-ruby.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", "< 7.0.0"
+  spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "node_query", ">= 1.15.2"
   spec.add_runtime_dependency "node_mutation", ">= 1.24.4"
   spec.add_runtime_dependency "node_visitor", ">= 1.0.1"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: node_query
   requirement: !ruby/object:Gem::Requirement