markdown-merge 7.1.1 → 7.1.4

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.1'
+      VERSION = '7.1.4'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/markdown/merge.rb

@@ -54,6 +54,8 @@ module Markdown
     autoload :OutputBuilder, 'markdown/merge/output_builder'
     autoload :PartialTemplateMerger, 'markdown/merge/partial_template_merger'
     autoload :PreservationSupport, 'markdown/merge/preservation_support'
+    autoload :ProviderBackend, 'markdown/merge/source_preserving_provider'
+    autoload :SourcePreservingProvider, 'markdown/merge/source_preserving_provider'
     autoload :SmartMerger, 'markdown/merge/smart_merger'
     autoload :SmartMergerBase, 'markdown/merge/smart_merger_base'
     autoload :TableMatchAlgorithm, 'markdown/merge/table_match_algorithm'
@@ -61,6 +63,40 @@ module Markdown
     autoload :WhitespaceNormalizer, 'markdown/merge/whitespace_normalizer'
     autoload :WrapperSupport, 'markdown/merge/wrapper_support'
 
+    # Default acyclic Markdown workflow provider backed by the language pack.
+    class Provider < SourcePreservingProvider
+      # rubocop:disable Metrics/MethodLength -- constructor declares the complete provider boundary
+      def initialize
+        super(
+          provider_id: 'ruby.markdown',
+          role: :workflow,
+          backend: ProviderBackend.new(
+            id: :'kreuzberg-language-pack',
+            package: PACKAGE_NAME,
+            dialects: %i[markdown],
+            parser: lambda { |source|
+              Markdown::Merge.register_backend!
+              TreeHaver.with_backend('kreuzberg-language-pack') { TreeHaver.parser_for(:markdown).parse(source) }
+            },
+            headings: ProviderBackend.method(:tree_sitter_headings)
+          )
+        )
+      end
+      # rubocop:enable Metrics/MethodLength
+    end
+
+    class << self
+      def merge_provider
+        @merge_provider ||= Provider.new
+      end
+
+      def register_provider!(replace: false)
+        return unless Ast::Merge.respond_to?(:register_provider)
+
+        Ast::Merge.register_provider(merge_provider, replace: replace)
+      end
+    end
+
     def register_backend!
       BACKEND_REGISTRY.mutex.synchronize do
         return if BACKEND_REGISTRY.registered
@@ -675,6 +711,8 @@ module Markdown
   end
 end
 
+Markdown::Merge.register_provider!
+
 %w[
   commonmarker/merge/backend
   markly/merge/backend

data/sig/markdown/merge.rbs

@@ -4,5 +4,59 @@ module Markdown
       VERSION: String
     end
     VERSION: String
+
+    class ProviderBackend
+      attr_reader id: Symbol
+      attr_reader package: String
+      attr_reader dialects: Array[Symbol]
+
+      def initialize: (
+        id: Symbol | String,
+        package: String,
+        dialects: Array[Symbol | String],
+        parser: Proc,
+        headings: Proc
+      ) -> void
+      def parse: (String source) -> [untyped, Array[ProviderBackend::Heading]]
+
+      def self.native_headings: (untyped root, String source, ?kramdown: bool) -> Array[ProviderBackend::Heading]
+      def self.tree_sitter_headings: (untyped root, String source) -> Array[ProviderBackend::Heading]
+
+      class Heading
+        attr_reader level: Integer
+        attr_reader text: String
+        attr_reader start_line: Integer
+        attr_reader end_line: Integer
+        attr_reader style: Symbol
+
+        def initialize: (
+          level: Integer,
+          text: String,
+          start_line: Integer,
+          end_line: Integer,
+          style: Symbol
+        ) -> void
+      end
+    end
+
+    class SourcePreservingProvider
+      attr_reader backend: ProviderBackend
+
+      def initialize: (provider_id: String, role: Symbol, backend: ProviderBackend) -> void
+      def provider_id: () -> String
+      def family: () -> String
+      def capabilities: () -> Hash[Symbol, untyped]
+      def analyze: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def diff2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge3: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+    end
+
+    class Provider < SourcePreservingProvider
+      def initialize: () -> void
+    end
+
+    def self.merge_provider: () -> Provider
+    def self.register_provider!: (?replace: bool) -> untyped
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
 - !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.0
+        version: 3.2.2
   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.0
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
   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.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "☯️ Portable Markdown owner analysis and matching behavior for Structured
   Merge."
 email:
@@ -329,8 +329,10 @@ files:
 - lib/markdown/merge/output_builder.rb
 - lib/markdown/merge/partial_template_merger.rb
 - lib/markdown/merge/preservation_support.rb
+- lib/markdown/merge/rspec/shared_examples/source_preserving_provider.rb
 - lib/markdown/merge/smart_merger.rb
 - lib/markdown/merge/smart_merger_base.rb
+- lib/markdown/merge/source_preserving_provider.rb
 - lib/markdown/merge/table_match_algorithm.rb
 - lib/markdown/merge/table_match_refiner.rb
 - lib/markdown/merge/version.rb
@@ -343,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.1
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.4
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/markdown-merge/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/markdown-merge/7.1.4
   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