parser_node_ext 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e485be85a8f56d3b4e733422f69f2d599a7eb9373fd5722e223ee66dec50e83d
-  data.tar.gz: 575f6097c6efdf2d1eb78b4034f27113a382f232ae26adfd894dd9d899069cd1
+  metadata.gz: 50b2c36e35c4dd8b37aa4d82eb72389f550aa9733f15f9f6254dd346b9fd0e2c
+  data.tar.gz: 879f64142437e5021fe5c3b4a5421085020ac7117c24c57c229bfd8ece65a757
 SHA512:
-  metadata.gz: dde07b7e09dd4c4fa15d951c64108e9c9b89d38b277fd9f2bad7c471cb3944cbecaa73965e9c0fa6287077050a61d99855d463412a96ef6b68d0186e9d6ba443
-  data.tar.gz: e8f1d5199bb2f1e74128ccda223c569b194d30e6d0f43d55fb9fec98ebb5bdd3a28de3ca760ae5a451157a30b3b81e7005b0f3d905ff563dd9fd573f7826c122
+  metadata.gz: 19cc544cc2cd288872940aab7dd8a82a2a4df11d25f8c0760068955ed12ea2cb7c28e6b2bc6b35ef887ad9a451e0ff0bcc88b3c8efcc533c73b55efa6e645194
+  data.tar.gz: 75762b11d8e7f6d82ba7c9b788b3ef87297ac656f623b707ba22b21eee48b7394f7030dc4c9a18517b7f4bc7c1b690e6138d11a707552ea99920f5948bfb1118

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.2.0 (2023-06-10)
+
+* Separate `kwsplats` from hash `pairs`
+
 ## 1.1.3 (2023-06-08)
 
 * `node_type` instead of `type` in `to_hash` output

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parser_node_ext (1.1.3)
+    parser_node_ext (1.2.0)
       parser
 
 GEM
@@ -9,8 +9,10 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.0)
     rake (13.0.6)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)

data/lib/parser_node_ext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ParserNodeExt
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/lib/parser_node_ext.rb

@@ -47,8 +47,8 @@ module ParserNodeExt
     forward_args: [],
     gvar: %i[name],
     gvasgn: %i[variable value],
-    hash: %i[pairs],
-    hash_pattern: %i[pairs],
+    hash: %i[pairs kwsplats],
+    hash_pattern: %i[pairs kwsplats],
     if: %i[expression if_statement else_statement],
     iflipflop: %i[begin end],
     if_guard: %i[expression],
@@ -318,7 +318,7 @@ module ParserNodeExt
       # @raise [MethodNotSupported] if calls on other node.
       def pairs
         if %i[hash hash_pattern].include?(type)
-          children
+          children.select { |child| child.type == :pair }
         else
           raise MethodNotSupported, "pairs is not supported for #{self}"
         end
@@ -331,8 +331,8 @@ module ParserNodeExt
       # @return [Array<Parser::AST::Node>] keys of node.
       # @raise [MethodNotSupported] if calls on other node.
       def keys
-        if :hash == type
-          children.map { |child| child.children[0] }
+        if %i[hash hash_pattern].include?(type)
+          pairs.map(&:key)
         else
           raise MethodNotSupported, "keys is not supported for #{self}"
         end
@@ -345,8 +345,8 @@ module ParserNodeExt
       # @return [Array<Parser::AST::Node>] values of node.
       # @raise [MethodNotSupported] if calls on other node.
       def values
-        if :hash == type
-          children.map { |child| child.children[1] }
+        if %i[hash hash_pattern].include?(type)
+          pairs.map(&:value)
         else
           raise MethodNotSupported, "keys is not supported for #{self}"
         end
@@ -360,8 +360,8 @@ module ParserNodeExt
       # @return [Boolean] true if specified key exists.
       # @raise [MethodNotSupported] if calls on other node.
       def key?(key)
-        if :hash == type
-          children.any? { |pair_node| pair_node.key.to_value == key }
+        if %i[hash hash_pattern].include?(type)
+          pairs.any? { |pair_node| pair_node.key.to_value == key }
         else
           raise MethodNotSupported, "key? is not supported for #{self}"
         end
@@ -375,8 +375,8 @@ module ParserNodeExt
       # @return [Parser::AST::Node] hash pair node.
       # @raise [MethodNotSupported] if calls on other node.
       def hash_pair(key)
-        if :hash == type
-          children.find { |pair_node| pair_node.key.to_value == key }
+        if %i[hash hash_pattern].include?(type)
+          pairs.find { |pair_node| pair_node.key.to_value == key }
         else
           raise MethodNotSupported, "hash_pair is not supported for #{self}"
         end
@@ -390,14 +390,28 @@ module ParserNodeExt
       # @return [Parser::AST::Node] hash value node.
       # @raise [MethodNotSupported] if calls on other node.
       def hash_value(key)
-        if :hash == type
-          value_node = children.find { |pair_node| pair_node.key.to_value == key }
+        if %i[hash hash_pattern].include?(type)
+          value_node = pairs.find { |pair_node| pair_node.key.to_value == key }
           value_node&.value
         else
           raise MethodNotSupported, "hash_value is not supported for #{self}"
         end
       end
 
+      # Get kwsplats of :hash and :hash_pattern node.
+      # @example
+      #   node s(:hash, s(:pair, s(:int, 1), s(:int, 2)), s(:kwsplat, s(:send, nil, :bar)), s(:pair, s(:sym, :baz), s(:int, 3)))
+      #   node.pairs # [s(:kwsplat, s(:send, nil, :bar))]
+      # @return [Array<Parser::AST::Node>] kwplats of node.
+      # @raise [MethodNotSupported] if calls on other node.
+      def kwsplats
+        if %i[hash hash_pattern].include?(type)
+          children.select { |child| child.type == :kwsplat }
+        else
+          raise MethodNotSupported, "kwsplats is not supported for #{self}"
+        end
+      end
+
       # Return the exact value of node.
       # It supports :array, :begin, :erange, :false, :float, :irange, :int, :str, :sym and :true nodes.
       # @example

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser_node_ext
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser