toml-merge 1.0.0 → 2.0.0

data/lib/toml/merge/smart_merger.rb

@@ -5,11 +5,25 @@ module Toml
     # High-level merger for TOML content.
     # Orchestrates parsing, analysis, and conflict resolution.
     #
+    # Extends SmartMergerBase with backend-agnostic parsing via tree_haver.
+    # Supports both tree-sitter and Citrus/toml-rb backends (auto-selected by TreeHaver).
+    #
     # @example Basic usage
     #   merger = SmartMerger.new(template_content, dest_content)
     #   result = merger.merge
     #   File.write("merged.toml", result.output)
     #
+    # @example Force Citrus backend via environment
+    #   # Set TREE_HAVER_BACKEND=citrus before requiring toml/merge
+    #   merger = SmartMerger.new(template, dest)
+    #   result = merger.merge
+    #
+    # @example Force Citrus backend via TreeHaver
+    #   TreeHaver.with_backend(:citrus) do
+    #     merger = SmartMerger.new(template, dest)
+    #     result = merger.merge
+    #   end
+    #
     # @example With options
     #   merger = SmartMerger.new(template, dest,
     #     preference: :template,
@@ -23,33 +37,55 @@ module Toml
     #   merger = SmartMerger.new(template, dest,
     #     regions: [{ detector: SomeDetector.new, merger_class: SomeMerger }])
     class SmartMerger < ::Ast::Merge::SmartMergerBase
+      # @return [Symbol] The AST format being used (:tree_sitter or :citrus)
+      attr_reader :backend
+
       # Creates a new SmartMerger
       #
       # @param template_content [String] Template TOML content
       # @param dest_content [String] Destination TOML content
-      # @param preference [Symbol] :destination or :template
+      # @param signature_generator [Proc, nil] Custom signature generator
+      # @param preference [Symbol, Hash] :destination, :template, or per-type Hash
       # @param add_template_only_nodes [Boolean] Whether to add nodes only found in template
+      # @param freeze_token [String, nil] Token for freeze block markers
       # @param match_refiner [#call, nil] Match refiner for fuzzy matching
       # @param regions [Array<Hash>, nil] Region configurations for nested merging
       # @param region_placeholder [String, nil] Custom placeholder for regions
+      # @param node_typing [Hash{Symbol,String => #call}, nil] Node typing configuration
+      #   for per-node-type merge preferences
+      # @param options [Hash] Additional options for forward compatibility
+      #
+      # @note To force a specific backend, use TreeHaver.with_backend or TREE_HAVER_BACKEND env var.
+      #   TreeHaver handles backend selection, auto-detection, and fallback.
       def initialize(
         template_content,
         dest_content,
+        signature_generator: nil,
         preference: :destination,
         add_template_only_nodes: false,
+        freeze_token: nil,
         match_refiner: nil,
         regions: nil,
-        region_placeholder: nil
+        region_placeholder: nil,
+        node_typing: nil,
+        **options
       )
         super(
           template_content,
           dest_content,
+          signature_generator: signature_generator,
           preference: preference,
           add_template_only_nodes: add_template_only_nodes,
+          freeze_token: freeze_token,
           match_refiner: match_refiner,
           regions: regions,
           region_placeholder: region_placeholder,
+          node_typing: node_typing,
+          **options
         )
+
+        # Capture the resolved backend from template analysis (for NodeTypeNormalizer)
+        @backend = @template_analysis.backend
       end
 
       # Backward-compatible options hash
@@ -127,9 +163,11 @@ module Toml
 
       private
 
-      # TOML FileAnalysis only accepts signature_generator, not freeze_token
+      # TOML FileAnalysis accepts signature_generator
       def build_full_analysis_options
-        {signature_generator: @signature_generator}
+        {
+          signature_generator: @signature_generator,
+        }
       end
     end
   end

data/lib/toml/merge/table_match_refiner.rb

@@ -90,8 +90,10 @@ module Toml
       def table_node?(node)
         return false unless node.respond_to?(:type)
 
-        type = node.type.to_s
-        type == "table" || type == "table_array_element"
+        # Use node's backend if available (NodeWrapper), otherwise default
+        backend = node.respond_to?(:backend) ? node.backend : nil
+        canonical = backend ? NodeTypeNormalizer.canonical_type(node.type, backend) : NodeTypeNormalizer.canonical_type(node.type)
+        NodeTypeNormalizer.table_type?(canonical)
       end
 
       # Compute similarity score between two tables.

data/lib/toml/merge/version.rb

@@ -5,7 +5,7 @@ module Toml
     # Version information for Toml::Merge
     module Version
       # Current version of the toml-merge gem
-      VERSION = "1.0.0"
+      VERSION = "2.0.0"
     end
     VERSION = Version::VERSION # traditional location
   end

data/lib/toml/merge.rb

@@ -1,41 +1,14 @@
 # frozen_string_literal: true
 
+# std libs
+require "set"
+
 # External gems
-# TreeHaver provides a unified cross-Ruby interface to tree-sitter and Citrus
+# TreeHaver provides a unified cross-Ruby interface to tree-sitter.
+# It handles grammar discovery, backend selection, and Citrus fallback automatically
+# via parser_for(:toml). No manual registration needed.
 require "tree_haver"
-
-# Register tree-sitter grammar (preferred, fast)
-tree_sitter_finder = TreeHaver::GrammarFinder.new(:toml)
-tree_sitter_available = tree_sitter_finder.available?
-tree_sitter_finder.register! if tree_sitter_available
-
-# Register Citrus grammar (fallback, pure Ruby)
-citrus_finder = TreeHaver::CitrusGrammarFinder.new(
-  language: :toml,
-  gem_name: "toml-rb",
-  grammar_const: "TomlRB::Document",
-  require_path: "toml-rb",  # Explicit require path (gem uses "toml-rb.rb" not "toml/rb.rb")
-)
-citrus_available = citrus_finder.available?
-citrus_finder.register! if citrus_available
-
-# Ensure at least one grammar is available
-unless tree_sitter_available || citrus_available
-  raise TreeHaver::NotAvailable,
-    "No TOML parser available. Install either:\n  " \
-      "- tree-sitter-toml (fast): #{tree_sitter_finder.not_found_message}\n  " \
-      "- toml-rb gem (pure Ruby): #{citrus_finder.not_found_message}"
-end
-
-# Warn if Citrus backend is forced but toml-rb not available
-if TreeHaver.backend == :citrus && !citrus_available && tree_sitter_available
-  warn "WARNING: TREE_HAVER_BACKEND=citrus but toml-rb not installed. " \
-    "Using tree-sitter backend instead. Install toml-rb: gem install toml-rb"
-  TreeHaver.backend = :auto
-end
-
 require "version_gem"
-require "set"
 
 # Shared merge infrastructure
 require "ast/merge"
@@ -119,8 +92,10 @@ module Toml
     class DestinationParseError < ParseError; end
 
     autoload :DebugLogger, "toml/merge/debug_logger"
+    autoload :Emitter, "toml/merge/emitter"
     autoload :FileAnalysis, "toml/merge/file_analysis"
     autoload :MergeResult, "toml/merge/merge_result"
+    autoload :NodeTypeNormalizer, "toml/merge/node_type_normalizer"
     autoload :NodeWrapper, "toml/merge/node_wrapper"
     autoload :ConflictResolver, "toml/merge/conflict_resolver"
     autoload :SmartMerger, "toml/merge/smart_merger"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toml-merge
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter H. Boling
@@ -38,26 +38,35 @@ cert_chain:
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: toml-rb
+  name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
-  name: tree_haver
+  name: ast-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -65,20 +74,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: ast-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -282,8 +280,10 @@ files:
 - lib/toml/merge.rb
 - lib/toml/merge/conflict_resolver.rb
 - lib/toml/merge/debug_logger.rb
+- lib/toml/merge/emitter.rb
 - lib/toml/merge/file_analysis.rb
 - lib/toml/merge/merge_result.rb
+- lib/toml/merge/node_type_normalizer.rb
 - lib/toml/merge/node_wrapper.rb
 - lib/toml/merge/smart_merger.rb
 - lib/toml/merge/table_match_refiner.rb
@@ -294,10 +294,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://toml-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/toml-merge/tree/v1.0.0
-  changelog_uri: https://github.com/kettle-rb/toml-merge/blob/v1.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/toml-merge/tree/v2.0.0
+  changelog_uri: https://github.com/kettle-rb/toml-merge/blob/v2.0.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/toml-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/toml-merge/1.0.0
+  documentation_uri: https://www.rubydoc.info/gems/toml-merge/2.0.0
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/toml-merge/wiki
   news_uri: https://www.railsbling.com/tags/toml-merge
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.1
+rubygems_version: 4.0.3
 specification_version: 4
 summary: "☯️ TOML file smart merge using tree-sitter AST analysis"
 test_files: []