json-merge 1.1.2 → 7.1.1

data/lib/json/merge/debug_logger.rb

@@ -15,23 +15,23 @@ module Json
       extend Ast::Merge::DebugLogger
 
       # Json-specific configuration
-      self.env_var_name = "JSON_MERGE_DEBUG"
-      self.log_prefix = "[Json::Merge]"
+      self.env_var_name = 'JSON_MERGE_DEBUG'
+      self.log_prefix = '[Json::Merge]'
 
       class << self
         # Override log_node to handle Json-specific node types.
         #
         # @param node [Object] Node to log information about
         # @param label [String] Label for the node
-        def log_node(node, label: "Node")
+        def log_node(node, label: 'Node')
           return unless enabled?
 
           info = case node
-          when Json::Merge::NodeWrapper
-            {type: node.type.to_s, lines: "#{node.start_line}..#{node.end_line}"}
-          else
-            extract_node_info(node)
-          end
+                 when Json::Merge::NodeWrapper
+                   { type: node.type.to_s, lines: "#{node.start_line}..#{node.end_line}" }
+                 else
+                   extract_node_info(node)
+                 end
 
           debug(label, info)
         end

data/lib/json/merge/emitter.rb

@@ -14,28 +14,36 @@ module Json
     #   emitter.emit_pair("key", '"value"')
     #   emitter.emit_object_end
     class Emitter < Ast::Merge::EmitterBase
+      include Ast::Merge::EmitterLineMetadataSupport
+
       # @return [Boolean] Whether next item needs a comma
       attr_reader :needs_comma
 
       # Initialize subclass-specific state (comma tracking for JSON)
-      def initialize_subclass_state(**options)
+      def initialize_subclass_state(**_options)
         @needs_comma = false
+        initialize_line_metadata_state
       end
 
       # Clear subclass-specific state
       def clear_subclass_state
         @needs_comma = false
+        clear_line_metadata_state
+      end
+
+      def emit_blank_line
+        append_line('')
       end
 
       # Emit a tracked comment from CommentTracker
       # @param comment [Hash] Comment with :text, :indent, :block
       def emit_tracked_comment(comment)
-        indent = " " * (comment[:indent] || 0)
-        @lines << if comment[:block]
-          "#{indent}/* #{comment[:text]} */"
-        else
-          "#{indent}// #{comment[:text]}"
-        end
+        indent = ' ' * (comment[:indent] || 0)
+        append_line(if comment[:block]
+                      "#{indent}/* #{comment[:text]} */"
+                    else
+                      "#{indent}// #{comment[:text]}"
+                    end)
       end
 
       # Emit a single-line comment
@@ -49,7 +57,7 @@ module Json
 
           @lines[-1] = "#{@lines[-1]} // #{text}"
         else
-          @lines << "#{current_indent}// #{text}"
+          append_line("#{current_indent}// #{text}")
         end
       end
 
@@ -57,42 +65,45 @@ module Json
       #
       # @param text [String] Comment text
       def emit_block_comment(text)
-        @lines << "#{current_indent}/* #{text} */"
+        append_line("#{current_indent}/* #{text} */")
       end
 
       # Emit object start
-      def emit_object_start
+      def emit_object_start(metadata: nil)
         add_comma_if_needed
-        @lines << "#{current_indent}{"
+        append_line("#{current_indent}{", metadata)
         indent
         @needs_comma = false
       end
 
       # Emit object end
-      def emit_object_end
+      def emit_object_end(metadata: nil)
         dedent
-        @lines << "#{current_indent}}"
+        append_line("#{current_indent}}", metadata)
         @needs_comma = true
       end
 
       # Emit array start
       #
       # @param key [String, nil] Key name if this array is a value in an object
-      def emit_array_start(key = nil)
+      # @param inline_comment [String, nil] Optional inline comment for the opening line
+      def emit_array_start(key = nil, inline_comment: nil, metadata: nil)
         add_comma_if_needed
-        @lines << if key
-          "#{current_indent}\"#{key}\": ["
-        else
-          "#{current_indent}["
-        end
+        line = if key
+                 "#{current_indent}\"#{key}\": ["
+               else
+                 "#{current_indent}["
+               end
+        line += " // #{inline_comment}" if inline_comment
+        append_line(line, metadata)
         indent
         @needs_comma = false
       end
 
       # Emit array end
-      def emit_array_end
+      def emit_array_end(metadata: nil)
         dedent
-        @lines << "#{current_indent}]"
+        append_line("#{current_indent}]", metadata)
         @needs_comma = true
       end
 
@@ -101,11 +112,11 @@ module Json
       # @param key [String] Key name (without quotes)
       # @param value [String] Value (already formatted, e.g., '"string"', '123', 'true')
       # @param inline_comment [String, nil] Optional inline comment
-      def emit_pair(key, value, inline_comment: nil)
+      def emit_pair(key, value, inline_comment: nil, metadata: nil)
         add_comma_if_needed
         line = "#{current_indent}\"#{key}\": #{value}"
         line += " // #{inline_comment}" if inline_comment
-        @lines << line
+        append_line(line, metadata)
         @needs_comma = true
       end
 
@@ -113,34 +124,57 @@ module Json
       #
       # @param value [String] Value (already formatted)
       # @param inline_comment [String, nil] Optional inline comment
-      def emit_array_element(value, inline_comment: nil)
+      def emit_array_element(value, inline_comment: nil, metadata: nil)
         add_comma_if_needed
         line = "#{current_indent}#{value}"
         line += " // #{inline_comment}" if inline_comment
-        @lines << line
+        append_line(line, metadata)
         @needs_comma = true
       end
 
       # Emit a key with opening brace for nested object
       # @param key [String] Key name
-      def emit_nested_object_start(key)
+      # @param inline_comment [String, nil] Optional inline comment for the opening line
+      def emit_nested_object_start(key, inline_comment: nil, metadata: nil)
         add_comma_if_needed
-        @lines << "#{current_indent}\"#{key}\": {"
+        line = "#{current_indent}\"#{key}\": {"
+        line += " // #{inline_comment}" if inline_comment
+        append_line(line, metadata)
         indent
         @needs_comma = false
       end
 
       # Emit closing brace for nested object
-      def emit_nested_object_end
+      def emit_nested_object_end(metadata: nil)
         dedent
-        @lines << "#{current_indent}}"
+        append_line("#{current_indent}}", metadata)
+        @needs_comma = true
+      end
+
+      def emit_raw_lines(raw_lines, metadata: nil)
+        raw_lines.each_with_index do |line, idx|
+          append_line(
+            line.chomp,
+            expanded_line_metadata(metadata, idx)
+          )
+        end
+      end
+
+      def emit_raw_fragment(fragment, metadata: nil)
+        add_comma_if_needed
+        fragment.to_s.lines(chomp: true).each_with_index do |line, idx|
+          append_line(
+            "#{current_indent}#{line}",
+            expanded_line_metadata(metadata, idx)
+          )
+        end
         @needs_comma = true
       end
 
       # Get the output as a JSON string
       #
       # @return [String]
-      def to_json
+      def to_json(*_args)
         to_s
       end
 
@@ -149,14 +183,44 @@ module Json
       def add_comma_if_needed
         return unless @needs_comma && @lines.any?
 
-        # Add comma to the previous line if it doesn't already have one
-        last_line = @lines.last
-        return if last_line.strip.empty?
-        return if last_line.rstrip.end_with?(",")
-        return if last_line.rstrip.end_with?("{")
-        return if last_line.rstrip.end_with?("[")
+        line_index = @lines.length - 1
+        while line_index >= 0
+          line = @lines[line_index]
+          stripped = line.strip
+          if stripped.empty? || comment_line?(stripped)
+            line_index -= 1
+            next
+          end
+
+          break
+        end
+
+        return if line_index.negative?
+
+        # Add comma to the previous structural line if it doesn't already have one
+        last_line = @lines[line_index]
+        @lines[line_index] = add_comma_to_line(last_line)
+      end
+
+      def comment_line?(stripped_line)
+        stripped_line.start_with?('//', '/*', '*', '*/')
+      end
+
+      def add_comma_to_line(line)
+        return line if line.strip.empty?
+
+        inline_match = line.match(%r{\A(?<content>.*?)(?<spacing>\s+)(?<comment>//.*)\z})
+        if inline_match
+          content = inline_match[:content].rstrip
+          return line if content.end_with?(',', '{', '[')
+
+          return "#{content}, #{inline_match[:comment]}"
+        end
+
+        stripped = line.rstrip
+        return line if stripped.end_with?(',', '{', '[')
 
-        @lines[-1] = "#{last_line},"
+        "#{line},"
       end
     end
   end