markdown-merge 7.1.7 → 7.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8e3b7c5faff298e87bab2c7d25c23b297b0c039dc6ae2853fcfdb0ead77709
-  data.tar.gz: 4ccf0286e5fd9ce0613f83dd85a5e42184dfd0335436813edc9b3cebeedc91db
+  metadata.gz: 817400fb73e8d4845d77677b66ef654ad7ac29f07352efe8b78f747d4c01f3a0
+  data.tar.gz: 4899c6fc0128fe1979c80c29f4b299d64563ec85592e7ae8f6f20a6b8c43ba75
 SHA512:
-  metadata.gz: 0a77751cfca527af217ac9850c75e408673673f00fd28257877f87fb985a1f4ed7a70ffb6cd2b54394e051b8b5f7ad2b9c0fa0b2ed195cc928dc24f2e3a3f0b0
-  data.tar.gz: 4724b5a5a7446f59fed4260e133d911752e6e76f2d3b5f4bdb9e19773dcdcc1e482f80bf41b91548ac3d6cdc1c40ea6107050a896f3ae64d488cb171522b273f
+  metadata.gz: db98d155c4ea0180d72bcf1467d06bad1a0aadf557d1e087629072349405520dd4dc22652401adcc8786cd9f579594eb7efd438831caad2803684239da5fc0d4
+  data.tar.gz: e59d2c04bd75eacb7c52679a743791725b36f5d1ece90caf385f51da51c42039a1d247a91183b95090d4bcc4dd8597b3dd0a10603ca3255768fc9232d0032390

data/lib/markdown/merge/rspec/shared_examples/source_preserving_provider.rb

@@ -143,6 +143,29 @@ RSpec.shared_examples 'Markdown::Merge::SourcePreservingProvider' do
     )
   end
 
+  it 'preserves current section customizations while inserting incoming-only sections in order' do
+    current = "# Title\n\ncurrent body\n\n# Last\n\ncurrent ending\n"
+    incoming = "# Title\n\ntemplate body\n\n# Added\n\nnew section\n\n# Last\n\ntemplate ending\n"
+    expected = "# Title\n\ncurrent body\n\n# Added\n\nnew section\n\n# Last\n\ncurrent ending\n"
+
+    result = provider.merge2(current_source: current, incoming_source: incoming)
+
+    expect(result).to include(ok: true, operation: :merge2, output: expected)
+    expect(result.fetch(:changes)).to contain_exactly(hash_including(change: :added))
+    expect(result.dig(:render_report, :provenance)).to contain_exactly(
+      hash_including(source_role: :current, copied_source: true),
+      hash_including(source_role: :incoming, copied_source: true),
+      hash_including(source_role: :current, copied_source: true)
+    )
+    expect(result.fetch(:verification)).to include(
+      output_reparsed: true,
+      semantic_match: true,
+      byte_provenance_verified: true,
+      delegated_backend_verified: true,
+      backend: provider_backend
+    )
+  end
+
   it 'localizes a same-section conflict to the parser-proven owner range' do
     result = provider.merge3(
       base_source: base,
@@ -174,16 +197,27 @@ RSpec.shared_examples 'Markdown::Merge::SourcePreservingProvider' do
       expect(result.dig(:render_report, :strategy)).to eq(:full_file_conflict)
     end
 
-    expect(provider.analyze(source: "# Alpha\n\n## Nested\n\ntext\n")).to include(
-      ok: false,
-      diagnostics: include(hash_including(category: :unsafe_source_range))
-    )
+    expect(provider.analyze(source: "# Alpha\n\n## Nested\n\ntext\n")).to include(ok: true)
     expect(provider.analyze(source: "headingless prose\n")).to include(
       ok: false,
       diagnostics: include(hash_including(category: :unsafe_source_range))
     )
   end
 
+  it 'merges independent nested leaf heading edits while preserving ancestor framing' do
+    result = provider.merge3(
+      base_source: "# Guide\n\n## Left\nOne.\n\n## Right\nOne.\n",
+      ours_source: "# Guide\n\n## Left\nTwo.\n\n## Right\nOne.\n",
+      theirs_source: "# Guide\n\n## Left\nOne.\n\n## Right\nTwo.\n"
+    )
+
+    expect(result).to include(
+      ok: true,
+      output: "# Guide\n\n## Left\nTwo.\n\n## Right\nTwo.\n"
+    )
+    expect(result.dig(:verification, :semantic_match)).to be(true)
+  end
+
   it 'fails closed for setext headings and non-whitespace prose outside sections' do
     expect(provider.analyze(source: "Alpha\n=====\n\ntext\n")).to include(
       ok: false,

data/lib/markdown/merge/source_preserving_provider.rb

@@ -198,14 +198,40 @@ module Markdown
       end
 
       def merge2(request)
-        merged = merge3(
-          request.merge(
-            base_source: request.fetch(:current_source),
-            ours_source: request.fetch(:current_source),
-            theirs_source: request.fetch(:incoming_source)
-          )
+        current = parse_document(:merge2, request, :current)
+        return current if provider_failure?(current)
+
+        incoming = parse_document(:merge2, request, :incoming)
+        return incoming if provider_failure?(incoming)
+
+        choices = current.owners.to_h { |owner| [owner.id, :current] }
+        incoming.owners.each { |owner| choices[owner.id] ||= :incoming }
+        decision = Decision.new(changes: [], conflicts: [], choices: choices.freeze)
+        documents = { current: current, incoming: incoming }.freeze
+        ordered = merged_order(documents, decision)
+        return unsafe_merge2_order_failure(request) unless ordered
+
+        fragments = ordered.map do |id|
+          role = decision.choices.fetch(id)
+          [documents.fetch(role).by_id.fetch(id), role]
+        end
+        output = composite_prefix(documents, :current) + fragments.map { |owner, _role| owner.source_text }.join
+        expected = fragments.map { |owner, _role| [owner.signature, owner.fingerprint] }
+        verification = verify_composite(output, expected)
+        unless verification[:semantic_match]
+          return render_failure(request, verification, :exact_markdown_composite, operation: :merge2)
+        end
+
+        output_document = parse_source(output, :output)
+        changes = diff_documents(current, output_document)
+        result(
+          :merge2,
+          request,
+          output: output,
+          changes: changes,
+          render_report: composite_render_report(fragments, output),
+          verification: verification
         )
-        merged.merge(operation: :merge2, verification: merged.fetch(:verification).except(:base_participated))
       end
 
       def merge3(request)
@@ -250,13 +276,17 @@ module Markdown
         headings = parsed.fetch(:headings)
         return { unsafe: :headingless_document, source_role: role } if headings.empty?
         return { unsafe: :setext_heading, source_role: role } unless headings.all? { |heading| heading.style == :atx }
-        return { unsafe: :nested_heading_hierarchy, source_role: role } unless headings.map(&:level).uniq.one?
+
+        headings = independently_ownable_headings(headings)
+        return { unsafe: :nested_heading_hierarchy, source_role: role } if headings.empty?
 
         starts = headings.map(&:start_line).map { |line| line_start_byte(source, line) }
         if starts.any?(&:nil?) || starts != starts.sort.uniq
           return { unsafe: :invalid_heading_start, source_role: role }
         end
-        return { unsafe: :source_before_first_section, source_role: role } unless starts.first.zero?
+        unless starts.first.zero? || heading_only_prefix?(source, parsed.fetch(:headings), starts.first)
+          return { unsafe: :source_before_first_section, source_role: role }
+        end
 
         owners = headings.each_with_index.map do |heading, index|
           signature = [heading.level, heading.text].freeze
@@ -288,6 +318,27 @@ module Markdown
         { parse_error: e.message, source_role: role }
       end
 
+      # A nested heading is ownable when it has no descendant headings. Ancestor
+      # headings remain unmanaged framing, so edits to them still fail closed.
+      def independently_ownable_headings(headings)
+        headings.each_with_index.reject do |heading, index|
+          headings[(index + 1)..].any? do |candidate|
+            candidate.level > heading.level &&
+              headings[(index + 1)..].take_while { |item| item.level > heading.level }.include?(candidate)
+          end
+        end.map(&:first)
+      end
+
+      def heading_only_prefix?(source, headings, first_owner_start)
+        prefix = source.byteslice(0...first_owner_start).to_s
+        heading_lines = headings.select { |heading| line_start_byte(source, heading.start_line) < first_owner_start }
+        heading_lines.any? && prefix.lines.all? do |line|
+          line.strip.empty? || heading_lines.any? do |heading|
+            line.strip.match?(/\A\#{1,6}\s+#{Regexp.escape(heading.text.to_s)}\s*\z/)
+          end
+        end
+      end
+
       def parse_exact_source(source, role)
         parsed = parse_ast(source, role)
         return parsed if provider_failure?(parsed)
@@ -517,7 +568,7 @@ module Markdown
           owner = role && documents.fetch(role).by_id[id]
           owner && [owner, role]
         end
-        output = fragments.map { |owner, _role| owner.source_text }.join
+        output = composite_prefix(documents) + fragments.map { |owner, _role| owner.source_text }.join
         expected = fragments.map { |owner, _role| [owner.signature, owner.fingerprint] }
         verification = verify_composite(output, expected)
         return render_failure(request, verification, :exact_markdown_composite, decision.changes) unless
@@ -615,6 +666,14 @@ module Markdown
         }
       end
 
+      def composite_prefix(documents, role = :ours)
+        document = documents.fetch(role)
+        first_owner = document.owners.first
+        return '' unless first_owner
+
+        document.source.byteslice(0...first_owner.start_byte).to_s
+      end
+
       def render_conflicts(request, documents, decision)
         localized = localized_conflict_output(request, documents, decision)
         strategy = localized ? :section_localized_conflict : :full_file_conflict
@@ -714,9 +773,20 @@ module Markdown
         )
       end
 
-      def render_failure(request, verification, strategy, changes = [])
+      def unsafe_merge2_order_failure(request)
         failure(
-          :merge3,
+          :merge2,
+          request,
+          category: :unsafe_source_range,
+          message: 'Markdown section order cannot be proven across current and incoming sources.',
+          conflicts: [{ category: :incompatible_section_order, path: '<document>' }],
+          render_report: { strategy: :no_output, provenance: :exact_source_bytes }
+        )
+      end
+
+      def render_failure(request, verification, strategy, changes = [], operation: :merge3)
+        failure(
+          operation,
           request,
           category: :render_failure,
           message: 'Markdown output failed backend reparse and ordered semantic verification.',

data/lib/markdown/merge/version.rb

@@ -5,7 +5,7 @@ module Markdown
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.7'
+      VERSION = '7.1.8'
     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: markdown-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.7
+  version: 7.1.8
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
 - !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.2
+        version: 3.2.3
   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.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -345,10 +345,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.7
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.7/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.8
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.8/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/markdown-merge/7.1.7
+  documentation_uri: https://www.rubydoc.info/gems/markdown-merge/7.1.8
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/markdown-merge