rust-merge 7.0.0 → 7.1.3

data/lib/rust/merge/version.rb

@@ -2,10 +2,12 @@
 
 module Rust
   module Merge
+    # Version namespace for this gem.
     module Version
-      VERSION = "7.0.0"
+      # Current gem version.
+      VERSION = '7.1.3'
     end
-
-    VERSION = Version::VERSION
+    # Current gem version exposed at the traditional constant location.
+    VERSION = Version::VERSION # Traditional Constant Location
   end
 end

data/lib/rust/merge.rb

@@ -1,26 +1,44 @@
 # frozen_string_literal: true
 
-require "tree_haver"
+require 'tree_haver'
+require 'ast/merge'
+require_relative 'merge/version'
 
 module Rust
   module Merge
-    PACKAGE_NAME = "rust-merge"
+    PACKAGE_NAME = 'rust-merge'
     TREE_SITTER_BACKEND = TreeHaver::KREUZBERG_LANGUAGE_PACK_BACKEND
-    DESTINATION_WINS_ARRAY_POLICY = { surface: "array", name: "destination_wins_array" }.freeze
+    DESTINATION_WINS_ARRAY_POLICY = { surface: 'array', name: 'destination_wins_array' }.freeze
+    BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new)
 
     module_function
 
+    def register_backend!
+      BACKEND_REGISTRY.mutex.synchronize do
+        return if BACKEND_REGISTRY.registered
+
+        TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND)
+
+        grammar_finder = TreeHaver::GrammarFinder.new(:rust)
+        grammar_finder.register! if grammar_finder.available?
+
+        BACKEND_REGISTRY.registered = true
+      end
+    end
+
     def rust_feature_profile
-      { family: "rust", supported_dialects: ["rust"], supported_policies: [DESTINATION_WINS_ARRAY_POLICY] }
+      { family: 'rust', supported_dialects: ['rust'], supported_policies: [DESTINATION_WINS_ARRAY_POLICY] }
     end
 
     def available_rust_backends
-      [TREE_SITTER_BACKEND]
+      rust_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : []
     end
 
     def rust_backend_feature_profile(backend: nil)
-      requested = backend.to_s.empty? ? TREE_SITTER_BACKEND.id : backend.to_s
-      return unsupported_feature_result("Unsupported Rust backend #{requested}.") unless requested == TREE_SITTER_BACKEND.id
+      requested = requested_tree_sitter_backend_id(backend)
+      unless rust_backend_available_for_analysis?(requested)
+        return unsupported_feature_result("Unsupported Rust backend #{requested}.")
+      end
 
       rust_feature_profile.merge(
         backend: requested,
@@ -44,81 +62,172 @@ module Rust
     end
 
     def parse_rust(source, dialect)
-      return analyze_rust_module(source) if dialect == "rust"
+      unless rust_backend_available_for_analysis?(nil)
+        diagnostic_backend = TreeHaver.current_backend_id || 'tree-sitter'
+        return unsupported_feature_result("Unsupported Rust backend #{diagnostic_backend}.")
+      end
+
+      return analyze_rust_module(source) if dialect == 'rust'
+
+      { ok: false,
+        diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: "Unsupported Rust dialect #{dialect}." }], policies: [] }
+    end
+
+    def rust_backend_available_for_analysis?(backend_id)
+      register_backend!
+
+      if backend_id.to_s.empty?
+        TreeHaver.parser_for(:rust, backend_type: :tree_sitter)
+      else
+        TreeHaver.with_backend(backend_id) { TreeHaver.parser_for(:rust, backend_type: :tree_sitter) }
+      end
+      true
+    rescue TreeHaver::Error, ArgumentError
+      false
+    end
 
-      { ok: false, diagnostics: [{ severity: "error", category: "unsupported_feature", message: "Unsupported Rust dialect #{dialect}." }], policies: [] }
+    def requested_tree_sitter_backend_id(backend)
+      return backend.to_s unless backend.to_s.empty?
+
+      contextual = TreeHaver.current_backend_id || ENV['TREE_HAVER_BACKEND']
+      contextual.to_s.empty? || contextual.to_s == 'auto' ? TREE_SITTER_BACKEND.id : contextual.to_s
     end
+    private_class_method :requested_tree_sitter_backend_id
 
     def match_rust_owners(template, destination)
-      destination_paths = destination[:owners].to_h { |owner| [owner[:path], true] }
-      template_paths = template[:owners].to_h { |owner| [owner[:path], true] }
-      {
-        matched: template[:owners].filter { |owner| destination_paths[owner[:path]] }.map { |owner| { template_path: owner[:path], destination_path: owner[:path] } },
-        unmatched_template: template[:owners].map { |owner| owner[:path] }.reject { |path| destination_paths[path] },
-        unmatched_destination: destination[:owners].map { |owner| owner[:path] }.reject { |path| template_paths[path] }
-      }
+      Ast::Merge::OwnerSelection.match_by_path(template, destination)
     end
 
     def merge_rust(template_source, destination_source, dialect)
       template = parse_rust(template_source, dialect)
       return { ok: false, diagnostics: template[:diagnostics], policies: [] } unless template[:ok]
+
       destination = parse_rust(destination_source, dialect)
       unless destination[:ok]
         return {
           ok: false,
-          diagnostics: destination[:diagnostics].map { |diagnostic| diagnostic[:category] == "parse_error" ? diagnostic.merge(category: "destination_parse_error") : diagnostic },
+          diagnostics: destination[:diagnostics].map do |diagnostic|
+            diagnostic[:category] == 'parse_error' ? diagnostic.merge(category: 'destination_parse_error') : diagnostic
+          end,
           policies: []
         }
       end
 
       destination_declarations = destination.dig(:analysis, :declarations).to_h { |item| [item[:path], item] }
       merged_declaration_texts = destination.dig(:analysis, :declarations).map { |item| item[:text] } +
-        template.dig(:analysis, :declarations).reject { |item| destination_declarations[item[:path]] }.map { |item| item[:text] }
+                                 template.dig(:analysis, :declarations).reject do |item|
+                                   destination_declarations[item[:path]]
+                                 end.map { |item| item[:text] }
       import_block = destination.dig(:analysis, :imports).map { |item| item[:text] }.join
       declaration_block = merged_declaration_texts.join("\n").rstrip
       sections = [import_block.rstrip, declaration_block].reject(&:empty?)
-      { ok: true, diagnostics: [], output: "#{sections.join("\n\n").rstrip}\n", policies: [DESTINATION_WINS_ARRAY_POLICY] }
+      { ok: true, diagnostics: [], output: "#{sections.join("\n\n").rstrip}\n",
+        policies: [DESTINATION_WINS_ARRAY_POLICY] }
     end
 
     def analyze_rust_module(source)
-      parsed = TreeHaver.parse_with_language_pack(TreeHaver::ParserRequest.new(source: source, language: "rust", dialect: "rust"))
-      return { ok: false, diagnostics: parsed[:diagnostics], policies: [] } unless parsed[:ok]
-      processed = TreeHaver.process_with_language_pack(TreeHaver::ProcessRequest.new(source: source, language: "rust"))
-      return { ok: false, diagnostics: processed[:diagnostics], policies: [] } unless processed[:ok]
-
-      imports = processed[:analysis].imports.each_with_index.map do |item, index|
-        { path: "/imports/#{index}", match_key: normalize_rust_import_path(item.source), text: import_text(source, item.span) }
+      parser = TreeHaver.parser_for(:rust, backend_type: :tree_sitter)
+      tree = parser.parse(source)
+      collect_parse_errors(tree.root_node)
+
+      imports = []
+      declarations = []
+      tree.root_node.children.each do |node|
+        case node.type
+        when 'use_declaration'
+          import_source = line_anchored_slice(source, node)
+          imports << {
+            path: "/imports/#{imports.length}",
+            owner_kind: 'import',
+            match_key: normalize_rust_import_path(import_source),
+            text: import_text(source, node)
+          }
+        when 'function_item', 'struct_item', 'enum_item', 'trait_item', 'impl_item', 'const_item', 'static_item',
+             'type_item', 'mod_item'
+          name = first_named_descendant_text(source, node, %w[identifier type_identifier])
+          next unless name
+
+          declarations << {
+            path: "/declarations/#{name}",
+            owner_kind: 'declaration',
+            match_key: name,
+            text: declaration_text(source, node)
+          }
+        end
       end
-      declarations = processed[:analysis].structure
-        .select { |item| item.name }
-        .map { |item| { path: "/declarations/#{item.name}", match_key: item.name, text: declaration_text(source, item.span) } }
-        .sort_by { |item| item[:path] }
 
       {
         ok: true,
         diagnostics: [],
         analysis: {
-          kind: "rust",
-          dialect: "rust",
-          source: source,
-          owners: imports.map { |item| { path: item[:path], owner_kind: "import", match_key: item[:match_key] } } +
-            declarations.map { |item| { path: item[:path], owner_kind: "declaration", match_key: item[:match_key] } },
+          kind: 'rust',
+          dialect: 'rust',
           imports: imports,
-          declarations: declarations
+          declarations: declarations,
+          owners: owner_views(imports + declarations)
         },
         policies: []
       }
+    rescue TreeHaver::Error, StandardError => e
+      parse_failure_result(e)
     end
     private_class_method :analyze_rust_module
 
+    def collect_parse_errors(node)
+      raise TreeHaver::NotAvailable, 'Rust parse returned no root node' unless node
+      return unless node.respond_to?(:has_error?) && node.has_error?
+
+      raise TreeHaver::NotAvailable,
+            'Rust parse contains syntax errors'
+    end
+    private_class_method :collect_parse_errors
+
+    def parse_failure_result(error)
+      { ok: false,
+        diagnostics: [{ severity: 'error', category: 'parse_error', message: error.message }],
+        policies: [] }
+    end
+    private_class_method :parse_failure_result
+
+    def unsupported_feature_result(message)
+      {
+        ok: false,
+        diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: message }],
+        policies: []
+      }
+    end
+    private_class_method :unsupported_feature_result
+
     def normalize_rust_import_path(import_source)
-      import_source.sub(/\Ause\s+/, "").sub(/;\z/, "").strip
+      import_source.sub(/\Ause\s+/, '').sub(/;\z/, '').strip
     end
     private_class_method :normalize_rust_import_path
 
+    def first_named_descendant_text(source, node, types)
+      return slice_span(source, node) if types.include?(node.type)
+
+      node.children.each do |child|
+        value = first_named_descendant_text(source, child, types)
+        return value if value && !value.empty?
+      end
+      nil
+    end
+    private_class_method :first_named_descendant_text
+
+    def owner_view(item)
+      item.slice(:path, :owner_kind, :match_key)
+    end
+    private_class_method :owner_view
+
+    def owner_views(items)
+      items.map { |item| owner_view(item) }
+    end
+    private_class_method :owner_views
+
     def import_text(source, span) = "#{slice_span(source, span)}\n"
     def declaration_text(source, span) = "#{line_anchored_slice(source, span)}\n"
     def slice_span(source, span) = source[span.start_byte...span.end_byte].strip
+
     def line_anchored_slice(source, span)
       line_start = source.rindex("\n", [span.start_byte - 1, 0].max)
       line_start = line_start ? line_start + 1 : 0
@@ -127,3 +236,7 @@ module Rust
     private_class_method :import_text, :declaration_text, :slice_span, :line_anchored_slice
   end
 end
+
+Rust::Merge.register_backend!
+require_relative 'merge/provider'
+Rust::Merge.register_provider!

data/lib/rust-merge.rb

@@ -1,3 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "rust/merge"
+require_relative 'rust/merge'
+require 'version_gem'
+require_relative 'rust/merge/version'
+
+Rust::Merge::Version.class_eval do
+  extend VersionGem::Basic
+end

data/sig/rust/merge.rbs

@@ -0,0 +1,55 @@
+module Rust
+  module Merge
+    class NodeWrapper
+      DECLARATION_TYPES: Array[String]
+      NAMED_ITEMS: Hash[String, [Symbol, Array[String]]]
+      COMMENT_TYPES: Array[String]
+      ATTRIBUTE_TYPES: Array[String]
+
+      attr_reader node: untyped
+      attr_reader source: String
+      attr_reader leading_comments: Array[untyped]
+      attr_reader trailing_comments: Array[untyped]
+
+      def initialize: (untyped node, source: String, ?leading_comments: Array[untyped]) -> void
+      def signature: () -> Array[untyped]
+      def membership_signature: () -> Array[untyped]
+      def compound?: () -> bool
+      def start_byte: () -> Integer
+      def end_byte: () -> Integer
+      def start_line: () -> Integer
+      def end_line: () -> Integer
+      def source_text: () -> String
+      def semantic_tree: () -> Array[untyped]
+      def attach_trailing_comment!: (untyped comment) -> untyped
+    end
+
+    class FileAnalysis
+      attr_reader source: String
+      attr_reader root_node: untyped
+      attr_reader declarations: Array[NodeWrapper]
+      attr_reader errors: Array[StandardError]
+      attr_reader backend: Symbol
+
+      def initialize: (String source) -> void
+    end
+
+    class Provider
+      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
+
+    def self.merge_provider: () -> Provider
+    def self.register_provider!: (?replace: bool) -> untyped
+
+    module Version
+      VERSION: String
+    end
+    VERSION: String
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: rust-merge
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.3
 platform: ruby
 authors:
 - Peter H. Boling
-bindir: bin
+bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -43,54 +43,293 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0
-description: Portable Rust module owner analysis and merge behavior for Structured
-  Merge.
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: version_gem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.15
+- !ruby/object:Gem::Dependency
+  name: kettle-dev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: require_bench
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: anonymous_loader
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: appraisal2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: kettle-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.19
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.19
+- !ruby/object:Gem::Dependency
+  name: turbo_tests2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: stone_checksums
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+- !ruby/object:Gem::Dependency
+  name: gitmoji-regex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.11
+description: "☯️ Portable Rust module owner analysis and merge behavior for Structured
+  Merge."
 email:
-- info@structuredmerge.org
+- floss@galtzo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
+- README.md
 - lib/rust-merge.rb
 - lib/rust/merge.rb
+- lib/rust/merge/file_analysis.rb
+- lib/rust/merge/node_wrapper.rb
+- lib/rust/merge/provider.rb
 - lib/rust/merge/version.rb
+- sig/rust/merge.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
 licenses:
 - AGPL-3.0-only
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.0.0
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.0.0/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.3
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/rust-merge/7.0.0
+  documentation_uri: https://www.rubydoc.info/gems/rust-merge/7.1.3
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
+  news_uri: https://www.railsbling.com/tags/rust-merge
   discord_uri: https://discord.gg/3qme4XHNKN
+  mailing_list_uri: https://www.rubyforum.org/tag/structuredmerge
   rubygems_mfa_required: 'true'
-rdoc_options: []
+rdoc_options:
+- "--title"
+- rust-merge - ☯️ Structured Merge Rust module analysis and merge for Ruby
+- "--main"
+- README.md
+- "--exclude"
+- "^sig/"
+- "--line-numbers"
+- "--inline-source"
+- "--quiet"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -104,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.17
 specification_version: 4
-summary: Structured Merge Rust module analysis and merge for Ruby
+summary: "☯️ Structured Merge Rust module analysis and merge for Ruby"
 test_files: []