dotenv-merge 1.0.0 → 1.0.1

data/lib/dotenv/merge/env_line.rb

@@ -6,7 +6,8 @@ module Dotenv
     # Parses and categorizes lines as assignments, comments, blank lines, or invalid.
     #
     # Inherits from Ast::Merge::AstNode for a normalized API across all ast-merge
-    # content nodes. This provides #slice, #location, #unwrap, and other standard methods.
+    # content nodes. This provides TreeHaver::Node protocol compatibility including
+    # #slice, #location, #unwrap, #type, #text, and other standard methods.
     #
     # Dotenv files follow a simple format where each line is one of:
     # - `KEY=value` - Environment variable assignment
@@ -46,7 +47,7 @@ module Dotenv
       attr_reader :line_number
 
       # @return [Symbol, nil] The line type (:assignment, :comment, :blank, :invalid)
-      attr_reader :type
+      attr_reader :line_type
 
       # @return [String, nil] The environment variable key (for assignments)
       attr_reader :key
@@ -64,7 +65,7 @@ module Dotenv
       def initialize(raw, line_number)
         @raw = raw
         @line_number = line_number
-        @type = nil
+        @line_type = nil
         @key = nil
         @value = nil
         @export = false
@@ -80,11 +81,17 @@ module Dotenv
         super(slice: @raw, location: location)
       end
 
+      # TreeHaver::Node protocol: type
+      # @return [String] "env_line"
+      def type
+        "env_line"
+      end
+
       # Generate a unique signature for this line (used for merge matching)
       #
       # @return [Array<Symbol, String>, nil] Signature array [:env, key] for assignments, nil otherwise
       def signature
-        return unless @type == :assignment
+        return unless @line_type == :assignment
 
         [:env, @key]
       end
@@ -93,28 +100,28 @@ module Dotenv
       #
       # @return [Boolean] true if the line is a valid KEY=value assignment
       def assignment?
-        @type == :assignment
+        @line_type == :assignment
       end
 
       # Check if this line is a comment
       #
       # @return [Boolean] true if the line starts with #
       def comment?
-        @type == :comment
+        @line_type == :comment
       end
 
       # Check if this line is blank (empty or whitespace only)
       #
       # @return [Boolean] true if the line is blank
       def blank?
-        @type == :blank
+        @line_type == :blank
       end
 
       # Check if this line is invalid (unparseable)
       #
       # @return [Boolean] true if the line could not be parsed
       def invalid?
-        @type == :invalid
+        @line_type == :invalid
       end
 
       # Check if this line has the export prefix
@@ -144,20 +151,20 @@ module Dotenv
       #
       # @return [String] A debug representation of this EnvLine
       def inspect
-        "#<#{self.class.name} line=#{@line_number} type=#{@type} key=#{@key.inspect}>"
+        "#<#{self.class.name} line=#{@line_number} line_type=#{@line_type} key=#{@key.inspect}>"
       end
 
       private
 
-      # Parse the raw line content and set type, key, value, and export
+      # Parse the raw line content and set line_type, key, value, and export
       #
       # @return [void]
       def parse!
         stripped = @raw.strip
         if stripped.empty?
-          @type = :blank
+          @line_type = :blank
         elsif stripped.start_with?("#")
-          @type = :comment
+          @line_type = :comment
         else
           parse_assignment!(stripped)
         end
@@ -178,14 +185,14 @@ module Dotenv
           key_part, value_part = line.split("=", 2)
           key_part = key_part.strip
           if valid_key?(key_part)
-            @type = :assignment
+            @line_type = :assignment
             @key = key_part
             @value = unquote(value_part || "")
           else
-            @type = :invalid
+            @line_type = :invalid
           end
         else
-          @type = :invalid
+          @line_type = :invalid
         end
       end
 

data/lib/dotenv/merge/file_analysis.rb

@@ -33,10 +33,12 @@ module Dotenv
       # @param source [String] Dotenv source code to analyze
       # @param freeze_token [String] Token for freeze block markers (default: "dotenv-merge")
       # @param signature_generator [Proc, nil] Custom signature generator
-      def initialize(source, freeze_token: DEFAULT_FREEZE_TOKEN, signature_generator: nil)
+      # @param options [Hash] Additional options (forward compatibility - ignored by FileAnalysis)
+      def initialize(source, freeze_token: DEFAULT_FREEZE_TOKEN, signature_generator: nil, **options)
         @source = source
         @freeze_token = freeze_token
         @signature_generator = signature_generator
+        # **options captures any additional parameters (e.g., node_typing) for forward compatibility
 
         # Parse all lines
         @lines = parse_lines(source)

data/lib/dotenv/merge/merge_result.rb

@@ -35,8 +35,9 @@ module Dotenv
       # Initialize a new merge result
       # @param template_analysis [FileAnalysis] Analysis of the template file
       # @param dest_analysis [FileAnalysis] Analysis of the destination file
-      def initialize(template_analysis, dest_analysis)
-        super(template_analysis: template_analysis, dest_analysis: dest_analysis)
+      # @param options [Hash] Additional options for forward compatibility
+      def initialize(template_analysis, dest_analysis, **options)
+        super(template_analysis: template_analysis, dest_analysis: dest_analysis, **options)
       end
 
       # Add content from the template at the given statement index

data/lib/dotenv/merge/smart_merger.rb

@@ -19,78 +19,108 @@ module Dotenv
     #     add_template_only_nodes: true,
     #   )
     #   result = merger.merge
-    class SmartMerger
-      # @return [FileAnalysis] Analysis of template file
-      attr_reader :template_analysis
-
-      # @return [FileAnalysis] Analysis of destination file
-      attr_reader :dest_analysis
-
+    #
+    # @example With node_typing for per-node-type preferences
+    #   merger = SmartMerger.new(template, dest,
+    #     node_typing: { "EnvLine" => ->(n) { NodeTyping.with_merge_type(n, :secret) } },
+    #     preference: { default: :destination, secret: :template })
+    class SmartMerger < ::Ast::Merge::SmartMergerBase
       # Initialize a new SmartMerger
       #
       # @param template_content [String] Content of the template dotenv file
       # @param dest_content [String] Content of the destination dotenv file
-      # @param preference [Symbol] Which version to prefer on match
-      #   (:template or :destination, default: :destination)
+      # @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 template-only env vars
       #   (default: false)
       # @param freeze_token [String] Token for freeze block markers
       #   (default: "dotenv-merge")
-      # @param signature_generator [Proc, nil] Custom signature generator
+      # @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
       def initialize(
         template_content,
         dest_content,
+        signature_generator: nil,
         preference: :destination,
         add_template_only_nodes: false,
-        freeze_token: FileAnalysis::DEFAULT_FREEZE_TOKEN,
-        signature_generator: nil
+        freeze_token: nil,
+        match_refiner: nil,
+        regions: nil,
+        region_placeholder: nil,
+        node_typing: nil,
+        **options
       )
-        @preference = preference
-        @add_template_only_nodes = add_template_only_nodes
-
-        # Parse template
-        @template_analysis = FileAnalysis.new(
+        super(
           template_content,
-          freeze_token: freeze_token,
-          signature_generator: signature_generator,
-        )
-
-        # Parse destination
-        @dest_analysis = FileAnalysis.new(
           dest_content,
-          freeze_token: freeze_token,
           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
         )
+      end
+
+      protected
 
-        @result = MergeResult.new(@template_analysis, @dest_analysis)
+      # @return [Class] The analysis class for dotenv files
+      def analysis_class
+        FileAnalysis
       end
 
-      # Perform the merge operation
-      #
-      # @return [String] The merged content as a string
-      def merge
-        merge_result.to_s
+      # @return [String] The default freeze token
+      def default_freeze_token
+        "dotenv-merge"
+      end
+
+      # @return [Class, nil] No separate resolver class for dotenv
+      def resolver_class
+        nil
+      end
+
+      # @return [Class, nil] Result class (built with analysis args)
+      def result_class
+        nil
+      end
+
+      # Build the result with required analysis arguments
+      def build_result
+        MergeResult.new(@template_analysis, @dest_analysis)
       end
 
-      # Perform the merge operation and return the full result object
+      # @return [Class] The template parse error class for dotenv
+      def template_parse_error_class
+        ParseError
+      end
+
+      # @return [Class] The destination parse error class for dotenv
+      def destination_parse_error_class
+        ParseError
+      end
+
+      # Perform the dotenv-specific merge with custom alignment logic
       #
-      # @return [MergeResult] The merge result containing merged content
-      def merge_result
-        return @merge_result if @merge_result
-
-        @merge_result = DebugLogger.time("SmartMerger#merge") do
-          alignment = align_statements
-
-          DebugLogger.debug("Alignment complete", {
-            total_entries: alignment.size,
-            matches: alignment.count { |e| e[:type] == :match },
-            template_only: alignment.count { |e| e[:type] == :template_only },
-            dest_only: alignment.count { |e| e[:type] == :dest_only },
-          })
-
-          process_alignment(alignment)
-          @result
-        end
+      # @return [MergeResult] The merge result
+      def perform_merge
+        alignment = align_statements
+
+        DebugLogger.debug("Alignment complete", {
+          total_entries: alignment.size,
+          matches: alignment.count { |e| e[:type] == :match },
+          template_only: alignment.count { |e| e[:type] == :template_only },
+          dest_only: alignment.count { |e| e[:type] == :dest_only },
+        })
+
+        process_alignment(alignment)
+        @result
       end
 
       private
@@ -211,8 +241,10 @@ module Dotenv
           return
         end
 
-        # Apply preference
-        case @preference
+        # Resolve preference (handles both Symbol and Hash preferences)
+        resolved_pref = resolve_preference(entry[:template_stmt], entry[:dest_stmt])
+
+        case resolved_pref
         when :template
           @result.add_from_template(entry[:template_index], decision: MergeResult::DECISION_TEMPLATE)
         when :destination
@@ -222,6 +254,47 @@ module Dotenv
         end
       end
 
+      # Resolve preference for a matched pair
+      # @param template_stmt [Object] Template statement
+      # @param dest_stmt [Object] Destination statement
+      # @return [Symbol] :template or :destination
+      def resolve_preference(template_stmt, dest_stmt)
+        return @preference if @preference.is_a?(Symbol)
+
+        # Hash preference - check for node_typing-based merge_types
+        if @preference.is_a?(Hash)
+          # Apply node_typing if configured
+          typed_template = apply_node_typing(template_stmt)
+          apply_node_typing(dest_stmt)
+
+          # Check template merge_type first
+          if Ast::Merge::NodeTyping.typed_node?(typed_template)
+            merge_type = typed_template.merge_type
+            return @preference[merge_type] if @preference.key?(merge_type)
+          end
+
+          # Fall back to default
+          return @preference[:default] || :destination
+        end
+
+        :destination
+      end
+
+      # Apply node typing to a statement if node_typing is configured
+      # @param stmt [Object] The statement
+      # @return [Object] The statement, possibly wrapped with merge_type
+      def apply_node_typing(stmt)
+        return stmt unless @node_typing
+        return stmt unless stmt
+
+        # Check by class name
+        type_key = stmt.class.name&.split("::")&.last
+        callable = @node_typing[type_key] || @node_typing[type_key&.to_sym]
+        return callable.call(stmt) if callable
+
+        stmt
+      end
+
       # Process a template-only entry
       # @param entry [Hash] Alignment entry
       # @return [void]

data/lib/dotenv/merge/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenv-merge
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -266,10 +272,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://dotenv-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/dotenv-merge/tree/v1.0.0
-  changelog_uri: https://github.com/kettle-rb/dotenv-merge/blob/v1.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-rb/dotenv-merge/tree/v1.0.1
+  changelog_uri: https://github.com/kettle-rb/dotenv-merge/blob/v1.0.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-rb/dotenv-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/dotenv-merge/1.0.0
+  documentation_uri: https://www.rubydoc.info/gems/dotenv-merge/1.0.1
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-rb/dotenv-merge/wiki
   news_uri: https://www.railsbling.com/tags/dotenv-merge
@@ -298,7 +304,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: "☯️ Intelligent .env file merging using structured parsing"
 test_files: []