prism-merge 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae8f1b1cf1ae576917fae80dea44c38c181296c46f60f4dc70546d12ac0e6a90
-  data.tar.gz: 131295bf35a6da2038ea889f46ee9520f4a83a7daf9d983c2d0b91fb67644985
+  metadata.gz: a67c080bc59cb7303a0f2d3da1c3e5518cf57f20bc1e5b0a43e8e003db155209
+  data.tar.gz: 9ddc4c529df3107414dc7c325f230d9224a30d3b828053a4ef76f9c38d05ce1b
 SHA512:
-  metadata.gz: 82dcffd3874394148696583ee3cddbb6cde3e33f4136ccd43dbae01213e8252999216320192be3af51fc3fd1662a4d7a524a44722254a19513de84d57efbf048
-  data.tar.gz: 49ab9213cb3ac2e2d691d3460983d18502c7ceef28a594b1c93578c8c3a8fc44c583472f4920aa9482058cd3815fed2365b75951cdf7e4c52b6c1d37150c3ec9
+  metadata.gz: 6a88190811477660b57af41696a567ee899a76f04b918aa98d8e4c0ea45d5b0dca9b3eceb2abb8564dbb3912abdc35bf89b4a3736000b17d583d869e2f688fbd
+  data.tar.gz: 4cd9b298503649db46812dda1cfd2a04f37c0db776ff5dcc684ebe199fd81f6e469c13ed27ac375c7d23c6ae9e14a00afa2db5c8f8698a94ed080db595d8526d

data/CHANGELOG.md

@@ -30,6 +30,23 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.1.2] - 2025-12-04
+
+- TAG: [v1.1.2][1.1.2t]
+- COVERAGE: 96.66% -- 868/898 lines in 9 files
+- BRANCH COVERAGE: 82.84% -- 338/408 branches in 9 files
+- 100.00% documented
+
+### Added
+
+- `body_has_mergeable_statements?` private method to check if a block body contains statements that can be signature-matched
+- `mergeable_statement?` private method to determine if a node type can generate signatures for merging
+- `max_recursion_depth` option (defaults to `Float::INFINITY`) as a safety valve for edge cases
+
+### Fixed
+
+- **Fixed infinite recursion** when merging `CallNode` blocks (like `git_source`) that have matching signatures but non-mergeable body content (e.g., just string literals). The fix detects when a block body contains only literals/expressions with no signature-matchable statements and treats the node atomically instead of recursing.
+
 ## [1.1.1] - 2025-12-04
 
 - TAG: [v1.1.1][1.1.1t]
@@ -154,7 +171,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - Initial release
 
-[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/kettle-rb/prism-merge/compare/v1.1.2...HEAD
+[1.1.2]: https://github.com/kettle-rb/prism-merge/compare/v1.1.1...v1.1.2
+[1.1.2t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.2
 [1.1.1]: https://github.com/kettle-rb/prism-merge/compare/v1.1.0...v1.1.1
 [1.1.1t]: https://github.com/kettle-rb/prism-merge/releases/tag/v1.1.1
 [1.1.0]: https://github.com/kettle-rb/prism-merge/compare/v1.0.3...v1.1.0

data/README.md

@@ -298,6 +298,33 @@ merger = Prism::Merge::SmartMerger.new(
 # Result: Existing configs keep destination values, new configs added from template
 ```
 
+### Recursion Depth Limit
+
+Prism::Merge automatically detects when block bodies contain only literals or simple expressions (no mergeable statements) and treats them atomically. However, as a safety valve for edge cases, you can limit recursion depth:
+
+```ruby
+# Limit recursive merging to 3 levels deep
+merger = Prism::Merge::SmartMerger.new(
+  template,
+  destination,
+  max_recursion_depth: 3,
+)
+
+# Disable recursive merging entirely (treat all nodes atomically)
+merger = Prism::Merge::SmartMerger.new(
+  template,
+  destination,
+  max_recursion_depth: 0,
+)
+```
+
+**When to use:**
+
+- **`Float::INFINITY`** (default) - Normal operation, recursion terminates naturally based on content analysis.
+  - NOTE: If you get `stack level too deep (SystemStackError)`, please file a [bug](https://github.com/kettle-rb/prism-merge/issues)!
+- **Finite value** - Safety valve if you encounter edge cases with unexpected deep recursion
+- **`0`** - Disable recursive merging entirely; all matching nodes are treated atomically
+
 ### Custom Signature Generator
 
 By default, Prism::Merge uses intelligent structural signatures to match nodes. The signature determines how nodes are matched between template and destination files.
@@ -332,7 +359,7 @@ The following node types support **recursive body merging**, where nested conten
 - `ClassNode` - class bodies are recursively merged
 - `ModuleNode` - module bodies are recursively merged
 - `SingletonClassNode` - singleton class bodies are recursively merged
-- `CallNode` with block - block bodies are recursively merged (e.g., `configure do ... end`)
+- `CallNode` with block - block bodies are recursively merged **only when the body contains mergeable statements** (e.g., `describe do ... end` with nested `it` blocks). Blocks containing only literals or simple expressions (like `git_source(:github) { |repo| "https://..." }`) are treated atomically.
 - `BeginNode` - begin/rescue/ensure blocks are recursively merged
 
 #### Custom Signature Generator
@@ -1107,7 +1134,7 @@ Thanks for RTFM. ☺️
 [📌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.887-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.898-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: 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/prism/merge/smart_merger.rb

@@ -93,6 +93,12 @@ module Prism
       #   Default: "prism-merge" (looks for # prism-merge:freeze / # prism-merge:unfreeze)
       #   Freeze blocks preserve destination content unchanged during merge.
       #
+      # @param max_recursion_depth [Integer, Float] Maximum depth for recursive body merging.
+      #   Default: Float::INFINITY (no limit). This is a safety valve that users can set
+      #   if they encounter edge cases. Normal merging terminates naturally based on
+      #   body content analysis (blocks with non-mergeable content like literals are
+      #   not recursed into).
+      #
       # @raise [TemplateParseError] If template has syntax errors
       # @raise [DestinationParseError] If destination has syntax errors
       #
@@ -131,12 +137,14 @@ module Prism
       #     destination,
       #     signature_generator: sig_gen
       #   )
-      def initialize(template_content, dest_content, signature_generator: nil, signature_match_preference: :destination, add_template_only_nodes: false, freeze_token: FileAnalysis::DEFAULT_FREEZE_TOKEN)
+      def initialize(template_content, dest_content, signature_generator: nil, signature_match_preference: :destination, add_template_only_nodes: false, freeze_token: FileAnalysis::DEFAULT_FREEZE_TOKEN, max_recursion_depth: Float::INFINITY, current_depth: 0)
         @template_content = template_content
         @dest_content = dest_content
         @signature_match_preference = signature_match_preference
         @add_template_only_nodes = add_template_only_nodes
         @freeze_token = freeze_token
+        @max_recursion_depth = max_recursion_depth
+        @current_depth = current_depth
         @template_analysis = FileAnalysis.new(template_content, signature_generator: signature_generator, freeze_token: freeze_token)
         @dest_analysis = FileAnalysis.new(dest_content, signature_generator: signature_generator, freeze_token: freeze_token)
         @aligner = FileAligner.new(@template_analysis, @dest_analysis)
@@ -415,9 +423,14 @@ module Prism
       #   - Conditional nodes (if/unless) - treated as atomic units
       #   - Classes/modules/blocks containing freeze blocks - frozen content would be lost
       #   - Nodes of different types
+      #   - Blocks whose body contains only literals/expressions with no mergeable statements
+      #   - When max_recursion_depth has been reached (safety valve)
       def should_merge_recursively?(template_node, dest_node)
         return false unless template_node && dest_node
 
+        # Safety valve: stop recursion if max depth reached
+        return false if @current_depth >= @max_recursion_depth
+
         # Both nodes must be the same type
         return false unless template_node.class == dest_node.class
 
@@ -427,8 +440,10 @@ module Prism
           # Class/module definitions - merge their body contents
           true
         when Prism::CallNode
-          # Only merge if both have blocks
-          template_node.block && dest_node.block
+          # Only merge if both have blocks with mergeable content
+          template_node.block && dest_node.block &&
+            body_has_mergeable_statements?(template_node.block.body) &&
+            body_has_mergeable_statements?(dest_node.block.body)
         when Prism::BeginNode
           # begin/rescue/ensure blocks - merge statements
           template_node.statements && dest_node.statements
@@ -456,6 +471,45 @@ module Prism
         true
       end
 
+      # Check if a body (StatementsNode) contains statements that could be merged.
+      #
+      # Mergeable statements are those that can generate signatures and be
+      # independently matched between template and destination. This includes
+      # method definitions, class/module definitions, method calls, assignments, etc.
+      #
+      # Bodies containing only literals (strings, numbers, arrays, hashes) or
+      # simple expressions should not be recursively merged as there's nothing
+      # to align - they should be treated atomically.
+      #
+      # @param body [Prism::StatementsNode, nil] The body to check
+      # @return [Boolean] true if the body contains mergeable statements
+      # @api private
+      def body_has_mergeable_statements?(body)
+        return false unless body.is_a?(Prism::StatementsNode)
+        return false if body.body.empty?
+
+        body.body.any? { |stmt| mergeable_statement?(stmt) }
+      end
+
+      # Check if a statement is mergeable (can generate a signature).
+      #
+      # @param node [Prism::Node] The node to check
+      # @return [Boolean] true if this node type can be merged
+      # @api private
+      def mergeable_statement?(node)
+        case node
+        when Prism::CallNode, Prism::DefNode, Prism::ClassNode, Prism::ModuleNode,
+             Prism::SingletonClassNode, Prism::ConstantWriteNode, Prism::ConstantPathWriteNode,
+             Prism::LocalVariableWriteNode, Prism::InstanceVariableWriteNode,
+             Prism::ClassVariableWriteNode, Prism::GlobalVariableWriteNode,
+             Prism::MultiWriteNode, Prism::IfNode, Prism::UnlessNode, Prism::CaseNode,
+             Prism::BeginNode
+          true
+        else
+          false
+        end
+      end
+
       # Check if a node's body contains freeze block markers.
       #
       # @param node [Prism::Node] The node to check
@@ -512,6 +566,7 @@ module Prism
       # @note The nested merger is configured with:
       #   - Same signature_generator, signature_match_preference, and add_template_only_nodes
       #   - freeze_token: nil (freeze blocks not processed in nested context)
+      #   - Incremented current_depth to track recursion level
       #
       # @api private
       def merge_node_body_recursively(template_node, dest_node, anchor)
@@ -519,7 +574,7 @@ module Prism
         template_body = extract_node_body(template_node, @template_analysis)
         dest_body = extract_node_body(dest_node, @dest_analysis)
 
-        # Recursively merge the bodies
+        # Recursively merge the bodies with incremented depth
         body_merger = SmartMerger.new(
           template_body,
           dest_body,
@@ -527,6 +582,8 @@ module Prism
           signature_match_preference: @signature_match_preference,
           add_template_only_nodes: @add_template_only_nodes,
           freeze_token: nil,  # Don't process freeze blocks in nested context
+          max_recursion_depth: @max_recursion_depth,
+          current_depth: @current_depth + 1,
         )
         merged_body = body_merger.merge.rstrip
 

data/lib/prism/merge/version.rb

@@ -5,7 +5,7 @@ module Prism
     # Version information for Prism::Merge
     module Version
       # Current version of the prism-merge gem
-      VERSION = "1.1.1"
+      VERSION = "1.1.2"
     end
     VERSION = Version::VERSION # traditional location
   end

data/sig/prism/merge.rbs

@@ -323,7 +323,10 @@ module Prism
         String dest_content,
         ?signature_generator: (^(untyped) -> Array[untyped])?,
         ?signature_match_preference: Symbol,
-        ?add_template_only_nodes: bool
+        ?add_template_only_nodes: bool,
+        ?freeze_token: String?,
+        ?max_recursion_depth: (Integer | Float),
+        ?current_depth: Integer
       ) -> void
 
       def merge: () -> String
@@ -353,9 +356,19 @@ module Prism
       def find_node_at_line: (FileAnalysis analysis, Integer line_num) -> untyped?
 
       # Determine if two matching nodes should be recursively merged
-      # Returns true for ClassNode, ModuleNode, SingletonClassNode, CallNode with blocks, BeginNode
+      # Returns true for ClassNode, ModuleNode, SingletonClassNode, and CallNode/BeginNode
+      # with blocks that contain mergeable statements.
+      # Returns false if max_recursion_depth has been reached (safety valve).
       def should_merge_recursively?: (untyped? template_node, untyped? dest_node) -> bool
 
+      # Check if a body (StatementsNode) contains statements that could be merged
+      # Returns true if body contains CallNode, DefNode, ClassNode, assignments, etc.
+      def body_has_mergeable_statements?: (untyped? body) -> bool
+
+      # Check if a statement is mergeable (can generate a signature)
+      # Returns true for CallNode, DefNode, ClassNode, ModuleNode, assignments, conditionals, etc.
+      def mergeable_statement?: (untyped node) -> bool
+
       # Check if a node's body contains freeze block markers
       def node_contains_freeze_blocks?: (untyped node) -> bool
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-merge
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Peter H. Boling
@@ -265,10 +265,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://prism-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.1.1
-  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.1.1/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.1.2
+  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.1.2/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.1
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.1.2
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/prism-merge/wiki
   news_uri: https://www.railsbling.com/tags/prism-merge