node_mutation 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b66c8223045972f4f91cdae0b61a5589c04e7f53f3eedf66b1c0eebee9d66b1c
-  data.tar.gz: 64a47a10bce6886a876cd04b08ff37118e6094bcc40d1e909e861d6f25c37d43
+  metadata.gz: 42db0eff54a5fab0ba9fc766d59605e7afe0c3bcf1627e646f0ffeff71a540bf
+  data.tar.gz: 2db50e0b04dc537e51afa21930bdee0b968aecd0d57573da6497b2da740193c7
 SHA512:
-  metadata.gz: 12f5cd0bc631511de6d7b250dec14869ce1e19d5c311ac59e5722578f2fa15f51b17be600d5fc59a3ef5ffaa1607e209ccc6e611e2046f1a9005cffb693367a9
-  data.tar.gz: 7d3496c675ed29a8ddaa35d3fbf4b538677a44016696c40020e518afa62526fa5e7ad2abec2b7339732adabb820fa037795c3d8597b0149a2cd0502c23c95883
+  metadata.gz: eef2c42ddf5d778e1b3cac59f464ba0816377424a132de4d2d9e41a65a49c5ba2743c53ca4c7278d542a83e3de804d6596408d9b2c6d3281a848b9f911fe764f
+  data.tar.gz: f188c65ace72e059b5ee91d878389ebb95c34f9fe0d64a819dee355f7b4e2e855a3907ddf92bfd79ca459d618709dfdb2d7aaec73fae8d38a75834ca3907a512

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # NodeMutation
 
+## 1.6.0 (2022-10-19)
+
+* Raise `NodeMutation::MethodNotSupported` if not respond to child node name
+
+## 1.5.1 (2022-10-19)
+
+* Better error message for unknown code
+
 ## 1.5.0 (2022-10-17)
 
 * Remove `insert_after`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    node_mutation (1.5.0)
+    node_mutation (1.6.0)
       activesupport (< 7.0.0)
       erubis
 

data/lib/node_mutation/parser_adapter.rb

@@ -2,7 +2,12 @@
 
 class NodeMutation::ParserAdapter < NodeMutation::Adapter
   def get_source(node)
-    node.loc.expression.source
+    if node.is_a?(Array)
+      source = file_content(node.first)
+      source[node.first.loc.expression.begin_pos...node.last.loc.expression.end_pos]
+    else
+      node.loc.expression.source
+    end
   end
 
   def rewritten_source(node, code)
@@ -35,13 +40,11 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
           end
         when String, Symbol, Integer, Float
           evaluated
-        when NilClass
-          'nil'
         else
-          raise Synvert::Core::MethodNotSupported, "rewritten_source is not handled for #{evaluated.inspect}"
+          raise "can not parse \"#{code}\""
         end
       else
-        "{{#{old_code}}}"
+        raise "can not parse \"#{code}\""
       end
     end
   end
@@ -51,19 +54,23 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
   end
 
   def child_node_range(node, child_name)
+    direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
+
     if node.is_a?(Array)
-      direct_child_name, nested_child_name = child_name.split('.', 2)
-      child_node = direct_child_name =~ /\A\d+\z/ ? node[direct_child_name.to_i - 1] : node.send(direct_child_name)
-      if nested_child_name
-        return child_node_range(child_node, nested_child_name)
-      elsif child_node
-        return OpenStruct.new(
-          start: child_node.loc.expression.begin_pos,
-          end: child_node.loc.expression.end_pos
-        )
-      else
-        raise MethodNotSupported, "child_node_range is not handled for #{get_source(node)}, child_name: #{child_name}"
+      if direct_child_name =~ /\A\d+\z/
+        child_node = node[direct_child_name.to_i - 1]
+        raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless child_node
+        return child_node_range(child_node, nested_child_name) if nested_child_name
+        return OpenStruct.new(start: child_node.loc.expression.begin_pos, end: child_node.loc.expression.end_pos)
       end
+
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
+      child_node = node.send(direct_child_name)
+      return child_node_range(child_node, nested_child_name) if nested_child_name
+      return OpenStruct.new(
+        start: child_node.loc.expression.begin_pos,
+        end: child_node.loc.expression.end_pos
+      )
     end
 
     case [node.type, child_name.to_sym]
@@ -96,33 +103,32 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
         OpenStruct.new(start: node.loc.begin.begin_pos, end: node.loc.end.end_pos)
       end
     else
-      direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
-      if node.respond_to?(direct_child_name)
-        child_node = node.send(direct_child_name)
-
-        return child_node_range(child_node, nested_child_name) if nested_child_name
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
 
-        return nil if child_node.nil?
+      child_node = node.send(direct_child_name)
 
-        if child_node.is_a?(Parser::AST::Node)
-          return(
-            OpenStruct.new(
-              start: child_node.loc.expression.begin_pos,
-              end: child_node.loc.expression.end_pos
-            )
-          )
-        end
+      return child_node_range(child_node, nested_child_name) if nested_child_name
 
-        # arguments
-        return nil if child_node.empty?
+      return nil if child_node.nil?
 
+      if child_node.is_a?(Parser::AST::Node)
         return(
           OpenStruct.new(
-            start: child_node.first.loc.expression.begin_pos,
-            end: child_node.last.loc.expression.end_pos
+            start: child_node.loc.expression.begin_pos,
+            end: child_node.loc.expression.end_pos
           )
         )
       end
+
+      # arguments
+      return nil if child_node.empty?
+
+      return(
+        OpenStruct.new(
+          start: child_node.first.loc.expression.begin_pos,
+          end: child_node.last.loc.expression.end_pos
+        )
+      )
     end
   end
 
@@ -154,9 +160,17 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
     direct_child_name, nested_child_name = child_name.to_s.split('.', 2)
 
     if node.is_a?(Array)
-      child_direct_child_node = direct_child_name =~ /\A\d+\z/ ? node[direct_child_name.to_i - 1] : node.send(direct_child_name)
-      return child_node_by_name(child_direct_child_node, nested_child_name) if nested_child_name
-      return child_direct_child_node if child_direct_child_node
+      if direct_child_name =~ /\A\d+\z/
+        child_node = node[direct_child_name.to_i - 1]
+        raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless child_node
+        return child_node_by_name(child_node, nested_child_name) if nested_child_name
+        return child_node
+      end
+
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}" unless node.respond_to?(direct_child_name)
+      child_node = node.send(direct_child_name)
+      return child_node_by_name(child_node, nested_child_name) if nested_child_name
+      return child_node
     end
 
     if node.respond_to?(direct_child_name)
@@ -164,15 +178,11 @@ class NodeMutation::ParserAdapter < NodeMutation::Adapter
     elsif direct_child_name.include?('(') && direct_child_name.include?(')')
       child_node = eval("node.#{direct_child_name}")
     else
-      child_node = nil
+      raise NodeMutation::MethodNotSupported, "#{direct_child_name} is not supported for #{get_source(node)}"
     end
 
     return child_node_by_name(child_node, nested_child_name) if nested_child_name
 
-    return nil if child_node.nil?
-
-    return child_node if child_node.is_a?(Parser::AST::Node)
-
-    return child_node
+    child_node
   end
 end

data/lib/node_mutation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class NodeMutation
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: node_mutation
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport