✨ Toml::Merge::Emitter

### Added

- **Emitter**
  - based on `Ast::Merge::EmitterBase`
  - autoloaded via `autoload :Emitter, "toml/merge/emitter"`

### Removed

- **Obsolete Tests**: Removed 3 obsolete tests
  - Tests for `add_node_to_result` and `merge_matched_nodes` methods
  - These methods don't exist in the `:batch` strategy (ConflictResolver now uses Emitter)
  - Tests were for old `:node` strategy pattern

Author: pboling

.rubocop_rspec.yml

@@ -31,6 +31,7 @@ RSpec/DescribeClass:
 
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
+
 RSpec/SpecFilePathSuffix:
   Exclude:
     - 'spec/README.md'
@@ -46,3 +47,8 @@ RSpec/MultipleDescribes:
 RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/README.md'
+
+RSpec/Output:
+  Exclude:
+    - 'spec/support/**/*'
+    - 'spec/config/**/*'

.tool-versions

@@ -1 +1 @@
-ruby jruby
+ruby latest

CHANGELOG.md

@@ -20,6 +20,10 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Added
 
+- **Emitter autoload** - Added `Emitter` to module autoload list
+  - Previously missing, causing `NameError: uninitialized constant Emitter` in ConflictResolver
+  - Now properly autoloaded via `autoload :Emitter, "toml/merge/emitter"`
+
 ### Changed
 
 - **Test suite now explicitly tests all available backend modes** - Tests previously ran with

Gemfile.lock

@@ -35,8 +35,8 @@ PATH
   remote: .
   specs:
     toml-merge (2.0.0)
-      ast-merge (~> 3.0, >= 3.0.0)
-      tree_haver (~> 3.2, >= 3.2.3)
+      ast-merge (~> 3.1, >= 3.1.0)
+      tree_haver (~> 4.0, >= 4.0.0)
       version_gem (~> 1.1, >= 1.1.9)
 
 GEM
@@ -50,8 +50,8 @@ GEM
       rake (>= 10)
       thor (>= 0.14)
     ast (2.4.3)
-    ast-merge (3.0.0)
-      tree_haver (~> 3.2, >= 3.2.5)
+    ast-merge (3.1.0)
+      tree_haver (~> 4.0, >= 4.0.0)
       version_gem (~> 1.1, >= 1.1.9)
     backports (3.25.3)
     benchmark (0.5.0)
@@ -183,7 +183,7 @@ GEM
     racc (1.8.1-java)
     rainbow (3.1.1)
     rake (13.3.1)
-    rbs (3.10.0)
+    rbs (3.10.2)
       logger
     rdoc (6.17.0)
       erb
@@ -264,7 +264,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-ruby3_2 (2.0.7)
@@ -303,7 +303,7 @@ GEM
     simplecov-rcov (0.3.7)
       simplecov (>= 0.4.1)
     simplecov_json_formatter (0.1.4)
-    sorbet-runtime (0.6.12874)
+    sorbet-runtime (0.6.12878)
     standard (1.52.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
@@ -337,7 +337,7 @@ GEM
     toml-rb (4.1.0)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_haver (3.2.6)
+    tree_haver (4.0.0)
       version_gem (~> 1.1, >= 1.1.9)
     tsort (0.2.0)
     ttfunk (1.8.0)
@@ -416,7 +416,7 @@ CHECKSUMS
   ansi (1.5.0) sha256=5408253274e33d9d27d4a98c46d2998266fd51cba58a7eb9d08f50e57ed23592
   appraisal2 (3.0.0) sha256=f1b4e742cf8ebef5e9fbb76c416a8c16edfe0727964a5a17b44adfc37b701aed
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
-  ast-merge (3.0.0) sha256=63664b465a854a7bcec56dbf99223b9d30f14a401a7c433d1d62983254781290
+  ast-merge (3.1.0) sha256=b4bffa3536385d30b280193c705c003f9a1dd4e43c9fb4146a2f56dda01746ee
   backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218
@@ -481,7 +481,7 @@ CHECKSUMS
   racc (1.8.1-java) sha256=54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
-  rbs (3.10.0) sha256=e75b5f1313c71c9ee0fcea68bf97d3e5fe8ec7a641d4b5cd18bbc28c94ddf298
+  rbs (3.10.2) sha256=bd8a5dc4c62f229f020146b61844a31f9c79e649449d212904a474eb79c846fc
   rdoc (6.17.0) sha256=0f50d4e568fc98195f9bb155a9e8dff6c7feabfb515fb22ef6df1d12ad5a02b7
   reek (6.5.0) sha256=d26d3a492773b2bbc228888067a21afe33ac07954a17dbd64cdeae42c4c69be1
   regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
@@ -506,7 +506,7 @@ CHECKSUMS
   rubocop-packaging (0.6.0) sha256=fb92bd0fb48e6f8cdb1648d2249b0cd51c2497dcc87340132d22f01edbf558a7
   rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
-  rubocop-rspec (3.8.0) sha256=28440dccb3f223a9938ca1f946bd3438275b8c6c156dab909e2cb8bc424cab33
+  rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
   rubocop-ruby3_2 (2.0.7) sha256=2f067d18ca3c9ce40b4c9f8c4aea3e1036328229edc5cb556b230b128bab7ad0
   rubocop-shopify (2.18.0) sha256=dafa25e5617ce4600ff86b1de3d5b78e43ab3d58cc5729df38e492b8e10294eb
   rubocop-thread_safety (0.7.3) sha256=067cdd52fbf5deffc18995437e45b5194236eaff4f71de3375a1f6052e48f431
@@ -523,7 +523,7 @@ CHECKSUMS
   simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd
   simplecov-rcov (0.3.7) sha256=372f50bf6df6b6350b7d0c840f2f8bdabe021861a43c26877b747c9ac96139fc
   simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
-  sorbet-runtime (0.6.12874) sha256=53e69e89c7550ce97a23286da6d4ce73917f3edf7ce882353c4fe5be80d17332
+  sorbet-runtime (0.6.12878) sha256=e1efa4b73f6d111025d9978a63b6c0f31ab7603027ce272591449d10888c83c9
   standard (1.52.0) sha256=ec050e63228e31fabe40da3ef96da7edda476f7acdf3e7c2ad47b6e153f6a076
   standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
   standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2
@@ -537,7 +537,7 @@ CHECKSUMS
   timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9
   toml-merge (2.0.0)
   toml-rb (4.1.0) sha256=14456ec4549e4703881bf04b83a56f3264ef99884880092d83c98a2058d95846
-  tree_haver (3.2.6) sha256=0c7a07a260bcbaea05a61671af84e36b8e6166379b6abae5def154f643487d4e
+  tree_haver (4.0.0) sha256=f2e2c05273dbe606c4a0c1ddb8c6c95945032ccd9c1a9227069733ed59614ce3
   tree_stump (0.1.0)
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
   ttfunk (1.8.0) sha256=a7cbc7e489cc46e979dde04d34b5b9e4f5c8f1ee5fc6b1a7be39b829919d20ca

bin/kettle-soup-cover

@@ -277,7 +277,7 @@ if @show_lines
   if line_results.empty?
     puts "All files fully covered (lines)!"
   else
-    puts "Files with uncovered (-d to expand) lines (-n=#{max_details}; use n=0 for unlimited):"
+    puts "Files with uncovered (-d to expand) lines (-n #{max_details}; use n 0 for unlimited):"
     puts "-" * 70
     line_results.each do |r|
       puts format("%3d uncovered | %5.1f%% | %s", r[:uncovered], r[:pct], r[:path])
@@ -317,7 +317,7 @@ if @show_branches
   if branch_results.empty?
     puts "All files fully covered (branches)!"
   else
-    puts "Files with uncovered (-d to expand) branches (-n=#{max_details}; use n=0 for unlimited):"
+    puts "Files with uncovered (-d to expand) branches (-n #{max_details}; use n 0 for unlimited):"
     puts "-" * 70
     branch_results.each do |r|
       puts format("%3d uncovered | %5.1f%% | %s", r[:uncovered], r[:pct], r[:path])

docs/Toml/Merge.html

@@ -1,183 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>
-  Module: Toml::Merge
-  
-    &mdash; Documentation by YARD 0.9.38
-  
-</title>
-
-  <link rel="stylesheet" href="../css/style.css" type="text/css" />
-
-  <link rel="stylesheet" href="../css/common.css" type="text/css" />
-
-<script type="text/javascript">
-  pathId = "Toml::Merge";
-  relpath = '../';
-</script>
-
-
-  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
-
-  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
-
-
-  </head>
-  <body>
-    <div class="nav_wrap">
-      <iframe id="nav" src="../class_list.html?1"></iframe>
-      <div id="resizer"></div>
-    </div>
-
-    <div id="main" tabindex="-1">
-      <div id="header">
-        <div id="menu">
-  
-    <a href="../_index.html">Index (M)</a> &raquo;
-    <span class='title'><span class='object_link'><a href="../Toml.html" title="Toml (module)">Toml</a></span></span>
-     &raquo; 
-    <span class="title">Merge</span>
-  
-</div>
-
-        <div id="search">
-  
-    <a class="full_list_link" id="class_list_link"
-        href="../class_list.html">
-
-        <svg width="24" height="24">
-          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
-          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
-        </svg>
-    </a>
-  
-</div>
-        <div class="clear"></div>
-      </div>
-
-      <div id="content"><h1>Module: Toml::Merge
-  
-  
-  
-</h1>
-<div class="box_info">
-  
-
-  
-  
-  
-  
-  
-
-  
-
-  
-  <dl>
-    <dt>Defined in:</dt>
-    <dd>lib/toml/merge.rb<span class="defines">,<br />
-  lib/toml/merge/version.rb,<br /> lib/toml/merge/debug_logger.rb,<br /> lib/toml/merge/merge_result.rb,<br /> lib/toml/merge/node_wrapper.rb,<br /> lib/toml/merge/smart_merger.rb,<br /> lib/toml/merge/file_analysis.rb,<br /> lib/toml/merge/conflict_resolver.rb,<br /> lib/toml/merge/table_match_refiner.rb,<br /> lib/toml/merge/node_type_normalizer.rb</span>
-</dd>
-  </dl>
-  
-</div>
-
-<h2>Overview</h2><div class="docstring">
-  <div class="discussion">
-    <p>Smart merge system for TOML files using tree-sitter AST analysis.<br />
-Provides intelligent merging by understanding TOML structure<br />
-rather than treating files as plain text.</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-  <p class="tag_title">See Also:</p>
-  <ul class="see">
-    
-      <li><span class='object_link'><a href="Merge/SmartMerger.html" title="Toml::Merge::SmartMerger (class)">Main entry point for merge operations</a></span></li>
-    
-      <li><span class='object_link'><a href="Merge/FileAnalysis.html" title="Toml::Merge::FileAnalysis (class)">Analyzes TOML structure</a></span></li>
-    
-      <li><span class='object_link'><a href="Merge/ConflictResolver.html" title="Toml::Merge::ConflictResolver (class)">Resolves content conflicts</a></span></li>
-    
-  </ul>
-
-</div><h2>Defined Under Namespace</h2>
-<p class="children">
-  
-    
-      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Merge/DebugLogger.html" title="Toml::Merge::DebugLogger (module)">DebugLogger</a></span>, <span class='object_link'><a href="Merge/NodeTypeNormalizer.html" title="Toml::Merge::NodeTypeNormalizer (module)">NodeTypeNormalizer</a></span>, <span class='object_link'><a href="Merge/Version.html" title="Toml::Merge::Version (module)">Version</a></span>
-    
-  
-    
-      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Merge/ConflictResolver.html" title="Toml::Merge::ConflictResolver (class)">ConflictResolver</a></span>, <span class='object_link'><a href="Merge/DestinationParseError.html" title="Toml::Merge::DestinationParseError (class)">DestinationParseError</a></span>, <span class='object_link'><a href="Merge/Error.html" title="Toml::Merge::Error (class)">Error</a></span>, <span class='object_link'><a href="Merge/FileAnalysis.html" title="Toml::Merge::FileAnalysis (class)">FileAnalysis</a></span>, <span class='object_link'><a href="Merge/MergeResult.html" title="Toml::Merge::MergeResult (class)">MergeResult</a></span>, <span class='object_link'><a href="Merge/NodeWrapper.html" title="Toml::Merge::NodeWrapper (class)">NodeWrapper</a></span>, <span class='object_link'><a href="Merge/ParseError.html" title="Toml::Merge::ParseError (class)">ParseError</a></span>, <span class='object_link'><a href="Merge/SmartMerger.html" title="Toml::Merge::SmartMerger (class)">SmartMerger</a></span>, <span class='object_link'><a href="Merge/TableMatchRefiner.html" title="Toml::Merge::TableMatchRefiner (class)">TableMatchRefiner</a></span>, <span class='object_link'><a href="Merge/TemplateParseError.html" title="Toml::Merge::TemplateParseError (class)">TemplateParseError</a></span>
-    
-  
-</p>
-
-  
-    <h2>
-      Constant Summary
-      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
-    </h2>
-
-    <dl class="constants">
-      
-        <dt id="VERSION-constant" class="">VERSION =
-          <div class="docstring">
-  <div class="discussion">
-    <p>traditional location</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div>
-        </dt>
-        <dd><pre class="code"><span class='const'><span class='object_link'><a href="Merge/Version.html" title="Toml::Merge::Version (module)">Version</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Merge/Version.html#VERSION-constant" title="Toml::Merge::Version::VERSION (constant)">VERSION</a></span></span></pre></dd>
-      
-        <dt id="NodeTypingNormalizer-constant" class="">NodeTypingNormalizer =
-          <div class="docstring">
-  <div class="discussion">
-    <p>Alias for the shared normalizer module from ast-merge</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div>
-        </dt>
-        <dd><pre class="code"><span class='const'>Ast</span><span class='op'>::</span><span class='const'>Merge</span><span class='op'>::</span><span class='const'>NodeTyping</span><span class='op'>::</span><span class='const'>Normalizer</span></pre></dd>
-      
-    </dl>
-  
-
-
-
-
-
-
-
-
-
-</div>
-
-      <div id="footer">
-  Generated on Fri Jan  2 06:07:01 2026 by
-  <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.38 (ruby-4.0.0).
-</div>
-
-    </div>
-  </body>
-</html>