bash-merge 7.1.1 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8c10612883ee3b2218483ddde5232e2facdb105fa9246b97501a186bcff828a
-  data.tar.gz: '08672c8444e3b98a710ad6fcb7e02c220413abe470deaebad741efe4084baa0d'
+  metadata.gz: 3e3f73ff82048635caccf19c960791ce05565f83e3c393b6dc175d4d2d16b417
+  data.tar.gz: 96404acb74336004facfe0222183882909c23bc1de2c5ec827769c769de4b6f8
 SHA512:
-  metadata.gz: bebbff49479397116a97b31333e815ef906345c3ce1f592716021a9ec842b9110b89932ce5ef236edac43e36bfde1462060477c003a3d4b3d4bc54dda48fe439
-  data.tar.gz: 1dcbae759052e304d3be6e5709ac4efbbf2120ea985bb5bcff242d4f9ec090b24e0d6d204b00816642ecec9c8c00c1787b667440585b00a4c0e81fc459debb3d
+  metadata.gz: 1abeafbfc3c7485a49ca9f4f45853f888f95040dd895b7df7fea1f6584fb08565711abeb41dbd4e4abae9d0b13b6166fb2f973fd6ca531838d6e9865bc1b63d9
+  data.tar.gz: 2eab528d0568ae00321490ad534bf41ac3bcbd2aab46355be98b034f6238a869648a03f9c89f5d81990706acec19c12fe3f15cacd29a57bb6292058f60144e18

data/README.md

@@ -85,7 +85,7 @@ File.write("merged.sh", result.to_bash)
 
 ### Compatibility
 
-Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
+Compatible with MRI Ruby 4.0.0+, JRuby, and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -258,20 +258,12 @@ See [SECURITY.md][🔐security].
 ## 🤝 Contributing
 
 If you need some ideas of where to help, you could work on adding more code coverage,
-or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
-or use the gem and think about how it could be better.
+check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
 
 We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
 
 See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
 
-### Code Coverage
-
-<details markdown="1">
-<summary>Coverage service badges</summary>
-
-</details>
-
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
@@ -411,7 +403,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.810-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-1.305-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/bash/merge/node_wrapper.rb

@@ -19,6 +19,8 @@ module Bash
     #
     # @see Ast::Merge::NodeWrapperBase
     class NodeWrapper < Ast::Merge::NodeWrapperBase
+      attr_reader :node
+
       # Check if this is a function definition
       # @return [Boolean]
       def function_definition?
@@ -107,6 +109,18 @@ module Bash
         nil
       end
 
+      def start_byte = node.start_byte
+      def end_byte = node.end_byte
+      def source_text = @source.byteslice(start_byte...end_byte).to_s
+
+      def semantic_tree
+        semantic_node(node)
+      end
+
+      def heredoc?
+        descendant_type?(node, %w[heredoc_redirect heredoc_body])
+      end
+
       # Find a child by field name
       # @param field_name [String] Field name to look for
       # @return [TreeSitter::Node, nil]
@@ -193,6 +207,19 @@ module Bash
 
       private
 
+      def semantic_node(value)
+        children = value.children
+        return [value.type.to_s, @source.byteslice(value.start_byte...value.end_byte).to_s] if children.empty?
+
+        [value.type.to_s, children.select(&:named?).map { |child| semantic_node(child) }]
+      end
+
+      def descendant_type?(value, types)
+        return true if types.include?(value.type.to_s)
+
+        value.children.any? { |child| descendant_type?(child, types) }
+      end
+
       def extract_command_signature_context(node)
         # Extract additional context like redirections
         redirections = []