bash-merge 2.0.6 → 7.1.3

data/lib/bash/merge/version.rb

@@ -2,11 +2,12 @@
 
 module Bash
   module Merge
-    # Version information for Bash::Merge
+    # Version namespace for this gem.
     module Version
-      # Current version of the bash-merge gem
-      VERSION = "2.0.6"
+      # Current gem version.
+      VERSION = '7.1.3'
     end
-    VERSION = Version::VERSION # traditional location
+    # Current gem version exposed at the traditional constant location.
+    VERSION = Version::VERSION # Traditional Constant Location
   end
 end

data/lib/bash/merge.rb

@@ -1,30 +1,27 @@
 # frozen_string_literal: true
 
 # std libs
-require "set"
 
 # External gems
 # TreeHaver provides a unified cross-Ruby interface to tree-sitter.
-# It handles grammar discovery and backend selection automatically
-# via parser_for(:bash). No manual registration needed.
+# Bash::Merge registers its TreeHaver grammar bootstrap when loaded so
+# parser_for(:bash) can resolve a registered grammar consistently.
 #
 # BACKEND COMPATIBILITY for Bash:
 # - FFI: Most portable and reliable with bash grammar (recommended)
 # - MRI: Has ABI incompatibility with bash grammar
+require_relative 'merge/version'
 # - Rust: Has version mismatch with bash grammar
 #
 # Set TREE_HAVER_BACKEND=ffi (or mri/rust) to control backend selection.
 # When MRI loads a grammar first, FFI gets incompatible pointers (symbol conflict).
 # MRI statically links tree-sitter, FFI dynamically links libtree-sitter.so.
-require "tree_haver"
-
-require "version_gem"
+require 'tree_haver'
 
 # Shared merge infrastructure
-require "ast/merge"
+require 'ast/merge'
 
 # This gem
-require_relative "merge/version"
 
 # Bash::Merge provides a generic Bash script smart merge system using tree-sitter AST analysis.
 # It intelligently merges template and destination Bash scripts by identifying matching
@@ -48,8 +45,20 @@ module Bash
   #
   # @see SmartMerger Main entry point for merge operations
   # @see FileAnalysis Analyzes Bash structure
-  # @see ConflictResolver Resolves content conflicts
   module Merge
+    TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND
+    BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new)
+    Availability = Struct.new(
+      :grammar_path,
+      :node_parser,
+      :diagnostics,
+      keyword_init: true
+    ) do
+      def available?
+        node_parser == true
+      end
+    end
+
     # Base error class for Bash::Merge
     # Inherits from Ast::Merge::Error for consistency across merge gems.
     class Error < Ast::Merge::Error; end
@@ -101,30 +110,116 @@ module Bash
     #   end
     class DestinationParseError < ParseError; end
 
-    autoload :CommentTracker, "bash/merge/comment_tracker"
-    autoload :DebugLogger, "bash/merge/debug_logger"
-    autoload :Emitter, "bash/merge/emitter"
-    autoload :FreezeNode, "bash/merge/freeze_node"
-    autoload :FileAnalysis, "bash/merge/file_analysis"
-    autoload :MergeResult, "bash/merge/merge_result"
-    autoload :NodeWrapper, "bash/merge/node_wrapper"
-    autoload :ConflictResolver, "bash/merge/conflict_resolver"
-    autoload :SmartMerger, "bash/merge/smart_merger"
+    class CorruptionDetectedError < Error; end
+
+    autoload :CommentTracker, 'bash/merge/comment_tracker'
+    autoload :DebugLogger, 'bash/merge/debug_logger'
+    autoload :Emitter, 'bash/merge/emitter'
+    autoload :FreezeNode, 'bash/merge/freeze_node'
+    autoload :FileAnalysis, 'bash/merge/file_analysis'
+    autoload :MergeResult, 'bash/merge/merge_result'
+    autoload :NodeWrapper, 'bash/merge/node_wrapper'
+    autoload :Provider, 'bash/merge/provider'
+    autoload :SmartMerger, 'bash/merge/smart_merger'
+
+    class << self
+      def register_backend!
+        BACKEND_REGISTRY.mutex.synchronize do
+          return if BACKEND_REGISTRY.registered
+
+          TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND)
+
+          grammar_finder = TreeHaver::GrammarFinder.new(:bash)
+          grammar_finder.register! if grammar_finder.available?
+
+          BACKEND_REGISTRY.registered = true
+        end
+      end
+
+      def available_bash_backends
+        bash_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : []
+      end
+
+      def available?(source: "#!/usr/bin/env bash\necho hello\n")
+        availability(source: source).available?
+      end
+
+      def availability(source: "#!/usr/bin/env bash\necho hello\n")
+        diagnostics = []
+        grammar_path = bash_grammar_path(diagnostics)
+        Availability.new(
+          grammar_path: grammar_path,
+          node_parser: node_parser_available_for?(source, grammar_path, diagnostics),
+          diagnostics: diagnostics
+        )
+      end
+
+      private
+
+      def bash_grammar_path(diagnostics)
+        TreeHaver::GrammarFinder.new(:bash).find_library_path
+      rescue TreeHaver::Error => e
+        diagnostics << { kind: 'bash_grammar_unavailable', message: e.message }
+        nil
+      end
+
+      def node_parser_available_for?(source, grammar_path, diagnostics)
+        register_backend!
+        parser = if grammar_path
+                   TreeHaver.with_language_registration(
+                     :bash,
+                     :tree_sitter,
+                     path: grammar_path,
+                     symbol: TreeHaver::GrammarFinder.new(:bash).symbol_name
+                   ) { TreeHaver.parser_for(:bash, backend_type: :tree_sitter) }
+                 else
+                   TreeHaver.parser_for(:bash, backend_type: :tree_sitter)
+                 end
+        tree = parser.parse(source)
+        !tree.nil? && !tree.root_node.nil?
+      rescue TreeHaver::Error => e
+        diagnostics << { kind: 'bash_node_parser_unavailable', message: e.message }
+        false
+      rescue StandardError => e
+        diagnostics << { kind: 'bash_node_parser_unavailable', message: e.message }
+        false
+      end
+
+      def bash_backend_available_for_analysis?(backend_id)
+        register_backend!
+
+        if backend_id.to_s.empty?
+          TreeHaver.parser_for(:bash, backend_type: :tree_sitter)
+        else
+          TreeHaver.with_backend(backend_id) { TreeHaver.parser_for(:bash, backend_type: :tree_sitter) }
+        end
+        true
+      rescue TreeHaver::Error, ArgumentError
+        false
+      end
+    end
   end
 end
 
+Bash::Merge.register_backend!
+
+# Register grammar availability with TreeHaver so shared RSpec dependency tags
+# can exclude Bash grammar examples when no parser and grammar are available.
+TreeHaver::BackendRegistry.register_tag(:bash_grammar, category: :grammar, backend_name: :bash_grammar) do
+  Bash::Merge.available?
+end
+
+require_relative 'merge/provider'
+Bash::Merge.register_provider!
+
 # Register with ast-merge's MergeGemRegistry for RSpec dependency tags
 # Only register if MergeGemRegistry is loaded (i.e., in test environment)
 if defined?(Ast::Merge::RSpec::MergeGemRegistry)
   Ast::Merge::RSpec::MergeGemRegistry.register(
     :bash_merge,
-    require_path: "bash/merge",
-    merger_class: "Bash::Merge::SmartMerger",
+    require_path: 'bash/merge',
+    merger_class: 'Bash::Merge::SmartMerger',
     test_source: "#!/bin/bash\necho hello",
-    category: :code,
+    category: :code
   )
 end
-
-Bash::Merge::Version.class_eval do
-  extend VersionGem::Basic
-end

data/lib/bash-merge.rb

@@ -3,4 +3,10 @@
 # For technical reasons, if we move to Zeitwerk, this cannot be require_relative.
 #   See: https://github.com/fxn/zeitwerk#for_gem_extension
 # Hook for other libraries to load this library (e.g. via bundler)
-require "bash/merge"
+require 'bash/merge'
+require 'version_gem'
+require_relative 'bash/merge/version'
+
+Bash::Merge::Version.class_eval do
+  extend VersionGem::Basic
+end

data/sig/bash/merge.rbs

@@ -1,260 +1,30 @@
-# Type signatures for bash-merge gem
-# Smart merge for Bash scripts using tree-sitter AST analysis
-
 module Bash
   module Merge
-    VERSION: String
-
-    # Base error class for bash-merge errors
-    class Error < StandardError
-    end
-
-    # Error raised when template Bash file has syntax errors
-    class TemplateParseError < Error
-      attr_reader errors: Array[untyped]
-      attr_reader content: String?
-
-      def initialize: (?String? message, ?errors: Array[untyped], ?content: String?) -> void
-    end
-
-    # Error raised when destination Bash file has syntax errors
-    class DestinationParseError < Error
-      attr_reader errors: Array[untyped]
-      attr_reader content: String?
-
-      def initialize: (?String? message, ?errors: Array[untyped], ?content: String?) -> void
-    end
-
-    # Debug logging utility for Bash::Merge
-    module DebugLogger
-      extend Ast::Merge::DebugLogger
-
-      def self.env_var_name: () -> String
-      def self.env_var_name=: (String name) -> String
-      def self.log_prefix: () -> String
-      def self.log_prefix=: (String prefix) -> String
-      def self.enabled?: () -> bool
-      def self.debug: (String message, ?Hash[Symbol, untyped] context) -> void
-      def self.info: (String message) -> void
-      def self.warning: (String message) -> void
-      def self.time: [T] (String operation) { () -> T } -> T
-      def self.extract_node_info: (untyped node) -> Hash[Symbol, untyped]
-    end
-
-    # Freeze block node for Bash scripts
-    class FreezeNode < Ast::Merge::FreezeNode
-      InvalidStructureError: singleton(Ast::Merge::FreezeNode::InvalidStructureError)
-      Location: singleton(Ast::Merge::FreezeNode::Location)
-
-      attr_reader lines: Array[String]
-
-      def initialize: (
-        start_line: Integer,
-        end_line: Integer,
-        lines: Array[String],
-        ?start_marker: String?,
-        ?end_marker: String?,
-        ?pattern_type: Symbol
-      ) -> void
-
-      def signature: () -> Array[Symbol | String]
-      def function_definition?: () -> bool
-      def variable_assignment?: () -> bool
-      def command?: () -> bool
-      def slice: () -> String?
-      def inspect: () -> String
-
-      private
-
-      def validate_structure!: () -> void
-    end
-
-    # Wrapper for tree-sitter Bash nodes
     class NodeWrapper
       attr_reader node: untyped
-      attr_reader start_line: Integer
-      attr_reader end_line: Integer
-      attr_reader source: String
-      attr_reader analysis: FileAnalysis?
-
-      def initialize: (
-        untyped node,
-        String source,
-        ?analysis: FileAnalysis?
-      ) -> void
-
-      def location: () -> Ast::Merge::FreezeNode::Location
-      def signature: () -> Array[untyped]
-      def freeze_node?: () -> bool
-      def function_definition?: () -> bool
-      def variable_assignment?: () -> bool
-      def command?: () -> bool
-      def comment?: () -> bool
-      def name: () -> String?
-      def value: () -> String?
-      def slice: () -> String?
-      def text: () -> String
-      def type: () -> Symbol
-      def inspect: () -> String
-    end
-
-    # Comment tracker for Bash files
-    class CommentTracker
-      attr_reader comments: Array[Hash[Symbol, untyped]]
-      attr_reader source: String
-      attr_reader lines: Array[String]
-
-      def initialize: (String source) -> void
-
-      def extract_comments: () -> Array[Hash[Symbol, untyped]]
-      def comments_for_line: (Integer line) -> Array[Hash[Symbol, untyped]]
-      def leading_comments_for: (Integer line) -> Array[Hash[Symbol, untyped]]
-      def trailing_comment_for: (Integer line) -> Hash[Symbol, untyped]?
-      def shebang?: (String line) -> bool
-    end
-
-    # File analysis for Bash scripts
-    class FileAnalysis
-      include Ast::Merge::FileAnalysisBase
-
-      DEFAULT_FREEZE_TOKEN: String
-      PARSER_SEARCH_PATHS: Array[String]
-
-      attr_reader source: String
-      attr_reader lines: Array[String]
-      attr_reader ast: untyped
-      attr_reader statements: Array[NodeWrapper | FreezeNode]
-      attr_reader freeze_blocks: Array[FreezeNode]
-      attr_reader freeze_token: String
-      attr_reader signature_generator: (^(untyped) -> Array[untyped]?)?
-      attr_reader comment_tracker: CommentTracker
-      attr_reader errors: Array[untyped]
-
-      def self.find_parser_path: () -> String?
-
-      def initialize: (
-        String source,
-        ?freeze_token: String,
-        ?signature_generator: (^(untyped) -> Array[untyped]?)?,
-        ?parser_path: String?
-      ) -> void
-
-      def valid?: () -> bool
-      def nodes: () -> Array[NodeWrapper | FreezeNode]
-      def line_at: (Integer line_num) -> String?
-      def normalized_line: (Integer line_num) -> String?
-      def in_freeze_block?: (Integer line_num) -> bool
-      def freeze_block_at: (Integer line_num) -> FreezeNode?
-      def signature_at: (Integer index) -> Array[untyped]?
-      def generate_signature: (untyped node) -> Array[untyped]?
-      def compute_node_signature: (untyped node) -> Array[untyped]?
-
-      private
-
-      def parse_bash: () -> void
-      def extract_nodes: (untyped tree_node) -> Array[NodeWrapper]
-      def extract_freeze_blocks: () -> Array[FreezeNode]
-      def integrate_nodes_and_freeze_blocks: () -> Array[NodeWrapper | FreezeNode]
-    end
-
-    # Result of a Bash merge operation
-    class MergeResult < Ast::Merge::MergeResult
-      DECISION_KEPT_TEMPLATE: Symbol
-      DECISION_KEPT_DEST: Symbol
-      DECISION_MERGED: Symbol
-      DECISION_ADDED: Symbol
-      DECISION_FREEZE_BLOCK: Symbol
-
-      attr_reader lines: Array[Hash[Symbol, untyped]]
-      attr_reader decisions: Array[Hash[Symbol, untyped]]
-      attr_reader statistics: Hash[Symbol, Integer]
-
-      def initialize: (
-        ?template_analysis: FileAnalysis?,
-        ?dest_analysis: FileAnalysis?,
-        ?conflicts: Array[Hash[Symbol, untyped]],
-        ?frozen_blocks: Array[FreezeNode],
-        ?stats: Hash[Symbol, untyped]
-      ) -> void
-
-      def add_line: (
-        String line,
-        decision: Symbol,
-        source: Symbol,
-        ?original_line: Integer?
-      ) -> void
-
-      def add_lines: (
-        Array[String] lines,
-        decision: Symbol,
-        source: Symbol,
-        ?start_line: Integer?
-      ) -> void
-
-      def add_blank_line: (?decision: Symbol, ?source: Symbol) -> void
-      def add_freeze_block: (FreezeNode freeze_node) -> void
-      def to_bash: () -> String
-      def content: () -> Array[Hash[Symbol, untyped]]
-      def content_string: () -> String
-      def empty?: () -> bool
-
-      private
-
-      def track_statistics: (Symbol decision, Symbol source) -> void
-    end
-
-    # Smart merger for Bash scripts
-    class SmartMerger
-      include Ast::Merge::MergerConfig
-
-      attr_reader template_analysis: FileAnalysis
-      attr_reader dest_analysis: FileAnalysis
-      attr_reader signature_match_preference: (Symbol | Hash[Symbol, Symbol])
-      attr_reader add_template_only_nodes: bool
-
-      def initialize: (
-        String template_content,
-        String dest_content,
-        ?signature_match_preference: (Symbol | Hash[Symbol, Symbol]),
-        ?add_template_only_nodes: bool,
-        ?freeze_token: String,
-        ?signature_generator: (^(untyped) -> Array[untyped]?)?,
-        ?node_splitter: Hash[Symbol, untyped]?,
-        ?parser_path: String?
-      ) -> void
-
-      def merge: () -> MergeResult
-
-      private
-
-      def perform_merge: () -> MergeResult
-      def merge_nodes: (MergeResult result) -> void
+      def start_byte: () -> Integer
+      def end_byte: () -> Integer
+      def source_text: () -> String
+      def semantic_tree: () -> Array[untyped]
+      def heredoc?: () -> bool
     end
 
-    # Conflict resolver for Bash merges
-    class ConflictResolver
-      attr_reader template_analysis: FileAnalysis
-      attr_reader dest_analysis: FileAnalysis
-      attr_reader signature_match_preference: (Symbol | Hash[Symbol, Symbol])
-      attr_reader add_template_only_nodes: bool
-
-      def initialize: (
-        FileAnalysis template_analysis,
-        FileAnalysis dest_analysis,
-        ?signature_match_preference: (Symbol | Hash[Symbol, Symbol]),
-        ?add_template_only_nodes: bool
-      ) -> void
-
-      def resolve: (untyped boundary, MergeResult result) -> void
+    class Provider
+      def provider_id: () -> String
+      def family: () -> String
+      def capabilities: () -> Hash[Symbol, untyped]
+      def analyze: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def diff2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge3: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
     end
 
-    # Emitter for reconstructing Bash output
-    class Emitter
-      attr_reader result: MergeResult
-
-      def initialize: (MergeResult result) -> void
+    def self.merge_provider: () -> Provider
+    def self.register_provider!: (?replace: bool) -> untyped
 
-      def emit: () -> String
+    module Version
+      VERSION: String
     end
+    VERSION: String
   end
 end

data.tar.gz.sig

@@ -1 +1,3 @@
-�O�q���������]*Ꙩ	�w�Hq)�x��q
+_W}�=��:���"]$����"�'J`�rj�S--����)�
+���޾V�
+k�E�؀`P$@�u���di�[�{xՠ~Q֓�;�Sj�����I��Kd�.
��:A3�x�H�Q���EA�EpV�+�b���CjU�2��@�� �ijc��e�X�U�a_7­м%S#�Ί�-��8��=妌UC���S���kBpBF_є�G6�H]wa���'�-q�W�M��>���j��ĵ(����q�Q�썬�T�r��XZ���Ѻp����{md>R��f�n�o���h	����2�m#����jա`1�ze\2