json-merge 7.1.6 → 7.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c831f4fec35d4c3db916ae782c5d8cb003ce2833048801bb06224ca56926d5f8
-  data.tar.gz: b1435a3f064913631757213e1b169268bcf42e3501f93c3fde38609bce86c8e8
+  metadata.gz: cfec64cce61554a44c1b1aad9493f582f3480d0234b750b7181fe3abde10b038
+  data.tar.gz: ce6035cd086c2b89c02299818e3b608d1581e23d4945d798202a228717d27dd6
 SHA512:
-  metadata.gz: 90f80a0d33d02bfbdeeeae0b593067f5eed9987f3200662465caf54e49c641a69d52af0be191e5c2ee730377c9ad1e5da44a5f576079e92a726e759ea72b50d5
-  data.tar.gz: '0518c8d411f1515448e9a44000d823aa66beea3079b92446e2eeaecb2b7508c88261c46cd8449e78ae3c91c7ba9af916f968f6c69284e2d2c6e2195ad78f1b4e'
+  metadata.gz: 1954aab0c8c2a8bcdc83613e594a1ead63343cbb1cb0f1c3b99c53ba9b387582545d0e1a5bb7afef27048d66a18e9fd52e5622339f2556941127b4842c525458
+  data.tar.gz: 6011cfacce9dd817811928eba2e0c3ae5d77a00a54b9c0f2eaebd77548abefa2f930f385ba165ff2bc4b83a6577df7503559a2631e09b98bf43fa3616d739fde

data/lib/json/merge/conflict_resolver.rb

@@ -105,7 +105,7 @@ module Json
       # @param dest_nodes [Array<NodeWrapper>] Destination nodes
       # @param template_analysis [FileAnalysis] Template analysis for line access
       # @param dest_analysis [FileAnalysis] Destination analysis for line access
-      def merge_node_lists_to_emitter(template_nodes, dest_nodes, template_analysis, dest_analysis, dest_owners: nil)
+      def merge_node_lists_to_emitter(template_nodes, dest_nodes, template_analysis, dest_analysis)
         # Build signature maps for matching
         template_by_sig = build_signature_map(template_nodes, template_analysis)
         dest_by_sig = build_signature_map(dest_nodes, dest_analysis)
@@ -154,6 +154,8 @@ module Json
 
           # Check for signature match
           if dest_sig && template_by_sig[dest_sig]
+            emit_retained_gap_before_destination_node(dest_node, dest_analysis, owners: dest_nodes)
+
             # Find the next unconsumed template node with this signature
             candidates = template_by_sig[dest_sig]
             cursor = sig_cursor[dest_sig]
@@ -172,8 +174,7 @@ module Json
               template_node = template_info[:node]
 
               # Both have this node - merge them (recursively if containers)
-              merge_matched_nodes_to_emitter(template_node, dest_node, template_analysis, dest_analysis,
-                                             dest_owners: dest_nodes)
+              merge_matched_nodes_to_emitter(template_node, dest_node, template_analysis, dest_analysis)
 
               consumed_template_indices << template_info[:index]
               sig_cursor[dest_sig] = cursor + 1
@@ -182,6 +183,8 @@ module Json
               emit_atomic_node(dest_node, dest_analysis)
             end
           elsif refined_dest_to_template.key?(dest_node)
+            emit_retained_gap_before_destination_node(dest_node, dest_analysis, owners: dest_nodes)
+
             # Found refined match
             template_node = refined_dest_to_template[dest_node]
             template_sig = template_analysis.generate_signature(template_node)
@@ -197,12 +200,12 @@ module Json
             end
 
             # Merge matched nodes
-            merge_matched_nodes_to_emitter(template_node, dest_node, template_analysis, dest_analysis,
-                                           dest_owners: dest_nodes)
+            merge_matched_nodes_to_emitter(template_node, dest_node, template_analysis, dest_analysis)
           elsif @remove_template_missing_nodes
             emit_removed_destination_node_comments(dest_node, dest_analysis)
           else
             # Destination-only node - always keep
+            emit_retained_gap_before_destination_node(dest_node, dest_analysis, owners: dest_nodes)
             emit_atomic_node(dest_node, dest_analysis)
           end
 
@@ -239,11 +242,7 @@ module Json
       # @param dest_node [NodeWrapper] Destination node
       # @param template_analysis [FileAnalysis] Template analysis
       # @param dest_analysis [FileAnalysis] Destination analysis
-      def merge_matched_nodes_to_emitter(template_node, dest_node, template_analysis, dest_analysis, dest_owners: nil)
-        if preference_for_pair(template_node, dest_node) == :template
-          emit_retained_gap_before_matched_template_node(dest_node, dest_analysis, owners: dest_owners)
-        end
-
+      def merge_matched_nodes_to_emitter(template_node, dest_node, template_analysis, dest_analysis)
         if dest_node.container? && template_node.container?
           # Both are containers - recursively merge their children
           merge_container_to_emitter(template_node, dest_node, template_analysis, dest_analysis)
@@ -305,8 +304,7 @@ module Json
                   template_value.mergeable_children,
                   dest_value.mergeable_children,
                   template_analysis,
-                  dest_analysis,
-                  dest_owners: dest_value.mergeable_children
+                  dest_analysis
                 )
 
                 emit_container_trailing_lines(trailing_source_node, trailing_source_analysis)
@@ -363,7 +361,7 @@ module Json
         end
       end
 
-      def emit_retained_gap_before_matched_template_node(dest_node, dest_analysis, owners: nil)
+      def emit_retained_gap_before_destination_node(dest_node, dest_analysis, owners: nil)
         gap_lines = retained_owner_leading_gap_lines_for(dest_node, dest_analysis, owners: owners)
         return if gap_lines.empty?
         return if @emitter.blank_lines?(gap_lines) && @emitter.ends_with_blank_line?

data/lib/json/merge/version.rb

@@ -5,7 +5,7 @@ module Json
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.6'
+      VERSION = '7.1.7'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.6
+  version: 7.1.7
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.6
+        version: 7.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.6
+        version: 7.1.7
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.6
+        version: 7.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.6
+        version: 7.1.7
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -320,10 +320,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.6
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.6/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.7
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.7/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/json-merge/7.1.6
+  documentation_uri: https://www.rubydoc.info/gems/json-merge/7.1.7
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/json-merge