json-merge 7.1.15 → 7.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a729eb90a493d94c36f73092734cc382b65dd1721d3f958fb5dafdcea0bcfca0
-  data.tar.gz: 03bd24ffa4089b992ed5684c0caab7e03d8387995f448ffff7851fb686a3c55e
+  metadata.gz: 89491deadad83570cf1cdc75e5bd1b38b961db15ed9d75baece541a5fd595821
+  data.tar.gz: e01828afce16e8a6427430e77d7360be38125d69438abbac3b3dc6d93ab932bc
 SHA512:
-  metadata.gz: dceead6dbc82d65083c4ca5e231763282b2c6e0b982348385702c299626b910e8628ddda149d66d780a3e0bf79be3cdeea30ce6d8ad1051cb5c35682324abeaa
-  data.tar.gz: a536d44ba2430d51f1c03e74cbe634d484a43c928f82e0b42d573f1e9b8bdec621106aea6dc50bdb01ecc87319efca8bcd8b2b09946a7f71d255bf820ddd8cd0
+  metadata.gz: d3dbfbd3820cae781ef47301837f4156f66b23c31c00dcc09d43c8121b09f62ff4bb1822537d19f32b6c5a921539a9f30401b94e71e7eabe9d85d25c7914ea36
+  data.tar.gz: 91a148b8deac41f8783e132dcf485f20a88ee0f0954aa94e8d88e1b6f2a44e3685bf51c82aa26836bef1f5fe1b4da8ab909be7a4f1e4380c01ee29ac9d927e2e

data/lib/json/merge/provider.rb

@@ -195,9 +195,41 @@ module Json
         exact = render_exact_composite(request, decision)
         return exact if exact
 
+        planned = render_planned_value(request, decision)
+        return planned if planned
+
         composite_failure(request, 'JSON family renderers did not reproduce the planned three-way value.')
       end
 
+      def render_planned_value(request, decision)
+        output = "#{JSON.pretty_generate(decision.value)}\n"
+        verification = verify_rendered(output, decision.value, request)
+        return unless verification[:semantic_match]
+
+        rendered = render_plan(
+          request,
+          [
+            Ast::Merge::SourceRender::SynthesizedFragment.new(
+              content: output,
+              reason: :planned_value_emission,
+              producer: provider_id
+            )
+          ]
+        )
+        {
+          output: rendered.content,
+          render_report: render_report(rendered, strategy: :planned_value_emission),
+          fallbacks: [
+            {
+              from: :exact_owner_composite,
+              to: :planned_value_emission,
+              reason: :owner_not_whole_line_addressable
+            }
+          ],
+          verification: verification
+        }
+      end
+
       def verified_family_composite(candidate, request, decision)
         return unless candidate[:ok]
 
@@ -275,8 +307,7 @@ module Json
         replacements.sort_by { |item| item.fetch(:ours).start_line }.each do |item|
           ours_range = item.fetch(:ours)
           fragments << source_range_fragment(:ours, cursor, ours_range.start_line - 1) if cursor < ours_range.start_line
-          theirs_range = item[:theirs]
-          fragments << source_range_fragment(:theirs, theirs_range.start_line, theirs_range.end_line) if theirs_range
+          fragments << theirs_replacement_fragment(request, item) if item[:theirs]
           cursor = ours_range.end_line + 1
         end
         final_line = request.fetch(:ours_source).lines.length
@@ -284,6 +315,53 @@ module Json
         fragments
       end
 
+      # A theirs pair spliced into ours' object must carry the trailing comma
+      # of the position it lands in: a pair copied from the end of theirs'
+      # object has no comma, but the ours pair it replaces may be followed by
+      # more pairs (and vice versa). Copy verbatim when the comma context
+      # already matches; synthesize comma-aligned content otherwise.
+      def theirs_replacement_fragment(request, item)
+        theirs_range = item.fetch(:theirs)
+        ours_range = item.fetch(:ours)
+        ours_lines = request.fetch(:ours_source).lines[(ours_range.start_line - 1)..(ours_range.end_line - 1)]
+        theirs_lines = request.fetch(:theirs_source).lines[(theirs_range.start_line - 1)..(theirs_range.end_line - 1)]
+        if trailing_comma?(ours_lines) == trailing_comma?(theirs_lines)
+          return source_range_fragment(:theirs, theirs_range.start_line, theirs_range.end_line)
+        end
+
+        Ast::Merge::SourceRender::SynthesizedFragment.new(
+          content: comma_aligned_lines(theirs_lines, with_comma: trailing_comma?(ours_lines)),
+          reason: :comma_context_alignment,
+          producer: provider_id,
+          metadata: { source_role: :theirs, copied_source: true }
+        )
+      end
+
+      def trailing_comma?(lines)
+        lines.last.to_s.rstrip.end_with?(',')
+      end
+
+      def comma_aligned_lines(lines, with_comma:)
+        adjusted = lines.dup
+        last = adjusted.fetch(-1)
+        newline =
+          if last.end_with?("\r\n")
+            "\r\n"
+          elsif last.end_with?("\n")
+            "\n"
+          else
+            ''
+          end
+        body = last.delete_suffix("\r\n").delete_suffix("\n")
+        adjusted[-1] =
+          if with_comma
+            "#{body.rstrip},#{newline}"
+          else
+            "#{body.sub(/,\s*\z/, '')}#{newline}"
+          end
+        adjusted.join
+      end
+
       def render_conflict(request, decision)
         localized = localized_conflict_plan(request, decision)
         return localized if localized

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.15'
+      VERSION = '7.1.16'
     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.15
+  version: 7.1.16
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.15
+        version: 7.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.15
+        version: 7.1.16
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.15
+        version: 7.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.15
+        version: 7.1.16
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.19
+        version: 3.1.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.19
+        version: 3.1.21
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -322,10 +322,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.15
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.15/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.16
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.16/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/json-merge/7.1.15
+  documentation_uri: https://www.rubydoc.info/gems/json-merge/7.1.16
   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