rbs-merge 7.1.7 → 7.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c097eb6f739577b10418375f6ea52f1054e6347b5f9d3d56bdff42debec7fdf8
-  data.tar.gz: 90ed64b940cae88a5c188a62f71974f03118ea7faffbb7c27970b6bda604e62f
+  metadata.gz: 12a8609c7be9157285536e84ae81c325ab55b0dd08197827a15c711fab58f502
+  data.tar.gz: ef2c73cd839f30ceb61dc6a7ac00ec168c1567213292170387b6a3b45cfdbece
 SHA512:
-  metadata.gz: de2b06f3ee1c61a58185de491243075941dd7f2adb27fe51e4e68faa92a06063230d8a7c1fa0d00aee4c247b7f34f8cf9240a1b2233c5b5b5a35030a10baad91
-  data.tar.gz: e82a0c007245ba2b973edd21573f2706afe45ddf973c557f635957348a289be79e229345aa28d2ea169ab19b7dd967bfaa925e2e8e30bf53b3c7966af514acfe
+  metadata.gz: 21751b3837a50f050196ff6967e79ba4ddc21281df519eb21ed65598aa3a40affa2cdeb66a9325e2be6fd9801d5671c3fe0d609a0d2f5427ce400337422190b8
+  data.tar.gz: e0993267f337c11e3e84269fd543625170630f78e78ca7e27e476125a80bc254694c29d1cc28346873691a32fe4dcc4bde096528cfcc00f2638ec99ca4b3de4e

data/lib/rbs/merge/file_analysis.rb

@@ -360,11 +360,31 @@ module Rbs
 
         # Check for parse errors in the tree
         collect_parse_errors(@ast.root_node) if @ast&.root_node&.has_error?
+        validate_tree_sitter_document
 
         # Extract declarations from AST
         extract_tree_sitter_declarations
       end
 
+      def validate_tree_sitter_document
+        return unless @ast&.root_node
+
+        @ast.root_node.each do |child|
+          child_type = child.type.to_s
+          next if %w[comment decl use_directive].include?(child_type)
+
+          canonical = NodeTypeNormalizer.canonical_type(child_type, :tree_sitter)
+          next if NodeTypeNormalizer.declaration_type?(canonical)
+
+          @errors << {
+            type: child_type,
+            start_point: child.start_point,
+            end_point: child.end_point,
+            message: 'RBS merge requires document syntax; inline RBS syntax is unsupported'
+          }
+        end
+      end
+
       def collect_parse_errors(node)
         if node.type.to_s == 'ERROR' || node.missing?
           @errors << {

data/lib/rbs/merge/native_projection.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Rbs
+  module Merge
+    # Produces the stable, location-free projection used for native RBS
+    # semantic verification and provider contract extension evidence.
+    module NativeProjection
+      module_function
+
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength -- native RBS values require recursive type dispatch
+      def call(value)
+        case value
+        when Array
+          value.map { |item| call(item) }
+        when Hash
+          value.map { |key, item| [call(key), call(item)] }
+        when String, Symbol, Numeric, true, false, nil
+          value
+        else
+          attributes = value.instance_variables.reject { |name| %i[@location @comment].include?(name) }
+          [
+            value.class.name,
+            attributes.map { |name| [name, call(value.instance_variable_get(name))] }
+          ]
+        end
+      end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+    end
+  end
+end

data/lib/rbs/merge/node_wrapper.rb

@@ -243,8 +243,7 @@ module Rbs
         if @backend == :rbs
           @node.location&.start_line
         else
-          pos = @node.start_point
-          pos ? pos.row + 1 : nil
+          super
         end
       end
 
@@ -254,8 +253,7 @@ module Rbs
         if @backend == :rbs
           @node.location&.end_line
         else
-          pos = @node.end_point
-          pos ? pos.row + 1 : nil
+          super
         end
       end
 

data/lib/rbs/merge/provider.rb

@@ -5,13 +5,14 @@ require 'json'
 
 module Rbs
   module Merge
-    # Base-aware, source-preserving provider for native RBS declarations.
+    # Base-aware, source-preserving provider for normalized RBS declarations.
     # rubocop:disable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists, Metrics/PerceivedComplexity -- provider decisions, source plans, and verification form one boundary
     class Provider
       DEFAULT_PROFILE = :source_preserving
+      SUPPORTED_BACKENDS = %i[rbs tslp kreuzberg-language-pack].freeze
       Owner = Data.define(:id, :signature, :fingerprint, :start_line, :end_line, :role)
-      Document = Data.define(:source, :analysis, :owners, :by_id, :unmanaged_fingerprint)
-      ExactDocument = Data.define(:source, :analysis, :declarations, :issues, :role)
+      Document = Data.define(:source, :analysis, :owners, :by_id, :unmanaged_fingerprint, :backend)
+      ExactDocument = Data.define(:source, :analysis, :declarations, :issues, :role, :backend)
       Decision = Data.define(:changes, :conflicts, :choices)
 
       def provider_id = 'ruby.rbs'
@@ -21,9 +22,13 @@ module Rbs
         {
           operations: Ast::Merge::ProviderContract::OPERATIONS,
           dialects: %i[rbs],
-          backends: %i[rbs],
+          backends: SUPPORTED_BACKENDS,
           profiles: [DEFAULT_PROFILE],
           role: :workflow,
+          parser_requirements: {
+            allowed_backend_families: %w[rbs tree-sitter],
+            required_capabilities: %w[normalized-nodes exact-byte-spans]
+          },
           source_preservation: %i[exact_source declaration_fragments line_provenance reparse semantic_verification]
         }.freeze
       end
@@ -36,7 +41,7 @@ module Rbs
           :analyze,
           request,
           analysis: {
-            backend: 'rbs',
+            backend: document.backend.to_s,
             valid: true,
             declarations: document.owners.map { |owner| owner_description(owner) }
           },
@@ -62,16 +67,59 @@ module Rbs
       end
 
       def merge2(request)
-        merge3_request = request.merge(
-          base_source: request.fetch(:current_source),
-          ours_source: request.fetch(:current_source),
-          theirs_source: request.fetch(:incoming_source)
-        )
-        merged = merge3(merge3_request)
-        merged.merge(
-          operation: :merge2,
-          verification: merged.fetch(:verification).except(:base_participated)
+        incoming = parse_document(:merge2, request, :incoming)
+        return incoming if provider_failure?(incoming)
+
+        current = parse_document(:merge2, request, :current)
+        return current if provider_failure?(current)
+
+        merged = with_requested_backend(request) do
+          SmartMerger.new(
+            request.fetch(:incoming_source),
+            request.fetch(:current_source),
+            add_template_only_nodes: true
+          ).merge_result
+        end
+        output = merged.to_s
+        parsed = parse_source(output, :output, request)
+        return parse_failure(:merge2, request, :output, parsed) if provider_failure?(parsed)
+
+        planned_ids = current.owners.map(&:id) + incoming.owners.reject do |owner|
+          current.by_id.key?(owner.id)
+        end.map(&:id)
+        actual_ids = parsed.owners.map(&:id)
+        verification = {
+          output_reparsed: true,
+          semantic_match: actual_ids == planned_ids,
+          ordered_declaration_signatures_verified: actual_ids == planned_ids,
+          planned_declaration_count: planned_ids.length,
+          output_declaration_count: actual_ids.length
+        }
+        unless verification[:semantic_match]
+          return failure(
+            :merge2,
+            request,
+            category: :render_failure,
+            message: 'RBS two-way merge did not match the planned ordered declaration structure.',
+            verification: verification
+          )
+        end
+
+        changes = diff_documents(current, parsed)
+        result(
+          :merge2,
+          request,
+          output: output,
+          changes: changes,
+          render_report: {
+            strategy: :rbs_substrate,
+            decisions: merged.decisions,
+            summary: merged.summary
+          },
+          verification: verification
         )
+      rescue StandardError => e
+        failure(:merge2, request, category: :merge_failure, message: e.message)
       end
 
       def merge3(request)
@@ -92,7 +140,7 @@ module Rbs
       def parse_merge3_documents(request)
         %i[base ours theirs].each_with_object({}) do |role, documents|
           source = request.fetch(:"#{role}_source")
-          document = parse_source(source, role)
+          document = parse_source(source, role, request)
           if document.is_a?(Hash) && document[:parse_error]
             return parse_failure(:merge3, request, role, document)
           elsif provider_failure?(document)
@@ -105,32 +153,32 @@ module Rbs
 
       def parse_document(operation, request, role)
         source = request.fetch(role == :source ? :source : :"#{role}_source")
-        parsed = parse_source(source, role)
+        parsed = parse_source(source, role, request)
         return parse_failure(operation, request, role, parsed) if provider_failure?(parsed)
 
         parsed
       end
 
-      def parse_source(source, role)
-        analysis = TreeHaver.with_backend(:rbs) { FileAnalysis.new(source) }
-        unless analysis.errors.empty? && analysis.backend == :rbs
-          return { parse_error: analysis.errors.map(&:to_s).join('; '), source_role: role }
-        end
+      def parse_source(source, role, request)
+        analysis = with_requested_backend(request) { FileAnalysis.new(source) }
+        return { parse_error: analysis.errors.map(&:to_s).join('; '), source_role: role } unless analysis.errors.empty?
 
         owners = analysis.declarations.map do |declaration|
           wrapper = NodeWrapper.new(
             declaration,
             lines: source.split("\n", -1),
             source: source,
-            backend: :rbs
+            backend: analysis.backend
           )
-          return { unsafe_range: wrapper.signature, source_role: role } unless safe_range?(source, declaration.location)
+          unless safe_declaration_range?(source, declaration, wrapper, analysis.backend)
+            return { unsafe_range: wrapper.signature, source_role: role }
+          end
 
           signature = wrapper.signature
           Owner.new(
             id: owner_id(signature),
             signature: signature,
-            fingerprint: owner_fingerprint(source, declaration),
+            fingerprint: owner_fingerprint(source, declaration, wrapper, analysis.backend),
             start_line: wrapper.start_line,
             end_line: wrapper.end_line,
             role: role
@@ -145,26 +193,25 @@ module Rbs
           analysis: analysis,
           owners: owners.freeze,
           by_id: owners.to_h { |owner| [owner.id, owner] }.freeze,
-          unmanaged_fingerprint: unmanaged_fingerprint(source, owners)
+          unmanaged_fingerprint: unmanaged_fingerprint(source, owners),
+          backend: analysis.backend
         )
       rescue StandardError => e
         { parse_error: e.message, source_role: role }
       end
 
-      def parse_exact_source(source, role)
-        analysis = TreeHaver.with_backend(:rbs) { FileAnalysis.new(source) }
-        unless analysis.errors.empty? && analysis.backend == :rbs
-          return { parse_error: analysis.errors.map(&:to_s).join('; '), source_role: role }
-        end
+      def parse_exact_source(source, role, request)
+        analysis = with_requested_backend(request) { FileAnalysis.new(source) }
+        return { parse_error: analysis.errors.map(&:to_s).join('; '), source_role: role } unless analysis.errors.empty?
 
         declarations = analysis.declarations.map do |declaration|
           wrapper = NodeWrapper.new(
             declaration,
             lines: source.split("\n", -1),
             source: source,
-            backend: :rbs
+            backend: analysis.backend
           )
-          [wrapper.signature, semantic_attributes(declaration)]
+          [wrapper.signature, semantic_projection(declaration, wrapper, analysis.backend)]
         end.freeze
         duplicate = declarations.group_by(&:first).find { |_signature, matches| matches.length > 1 }
         issues = if duplicate
@@ -181,7 +228,8 @@ module Rbs
           analysis: analysis,
           declarations: declarations,
           issues: issues.freeze,
-          role: role
+          role: role,
+          backend: analysis.backend
         )
       rescue StandardError => e
         { parse_error: e.message, source_role: role }
@@ -197,6 +245,27 @@ module Rbs
         source.byteslice(location.end_pos...line_end).to_s.each_byte.all? { |byte| [9, 13, 32].include?(byte) }
       end
 
+      def safe_declaration_range?(source, declaration, wrapper, backend)
+        return safe_range?(source, declaration.location) if backend == :rbs
+        return false unless wrapper.start_line&.positive? && wrapper.end_line.to_i >= wrapper.start_line
+        return false unless declaration.respond_to?(:start_byte) && declaration.respond_to?(:end_byte)
+
+        start_byte = declaration.start_byte
+        end_byte = declaration.end_byte
+        return false unless start_byte && end_byte && start_byte >= 0 && end_byte <= source.bytesize
+        return false unless point_column(declaration.start_point) == 0
+
+        line_end = source.index("\n", end_byte) || source.bytesize
+        source.byteslice(end_byte...line_end).to_s.each_byte.all? { |byte| [9, 13, 32].include?(byte) }
+      end
+
+      def point_column(point)
+        return point.column if point.respond_to?(:column)
+        return point[:column] if point.respond_to?(:[])
+
+        nil
+      end
+
       def non_overlapping?(owners)
         owners.each_cons(2).all? { |left, right| left.end_line < right.start_line }
       end
@@ -210,27 +279,35 @@ module Rbs
         end.join
       end
 
-      def semantic_attributes(value)
-        case value
-        when Array
-          value.map { |item| semantic_attributes(item) }
-        when Hash
-          value.map { |key, item| [semantic_attributes(key), semantic_attributes(item)] }
-        when String, Symbol, Numeric, true, false, nil
-          value
-        else
-          attributes = value.instance_variables.reject { |name| %i[@location @comment].include?(name) }
-          [
-            value.class.name,
-            attributes.map { |name| [name, semantic_attributes(value.instance_variable_get(name))] }
-          ]
-        end
+      def owner_fingerprint(source, declaration, wrapper, backend)
+        exact_source = if backend == :rbs
+                         location = declaration.location
+                         source.byteslice(location.start_pos...location.end_pos)
+                       else
+                         source.byteslice(declaration.start_byte...declaration.end_byte)
+                       end
+        fingerprint_value = [semantic_projection(declaration, wrapper, backend), exact_source]
+        Digest::SHA256.hexdigest(JSON.generate(Ast::Merge.json_ready(fingerprint_value)))
       end
 
-      def owner_fingerprint(source, declaration)
-        location = declaration.location
-        exact_source = source.byteslice(location.start_pos...location.end_pos)
-        Digest::SHA256.hexdigest(JSON.generate(Ast::Merge.json_ready([semantic_attributes(declaration), exact_source])))
+      def semantic_projection(declaration, wrapper, backend)
+        return NativeProjection.call(declaration) if backend == :rbs
+
+        [wrapper.signature, tree_projection(declaration)]
+      end
+
+      def tree_projection(node)
+        children = []
+        node.each { |child| children << tree_projection(child) } if node.respond_to?(:each)
+        leaf_text = node.text.to_s if children.empty? && node.respond_to?(:text)
+        [node.type.to_s, leaf_text, children]
+      end
+
+      def with_requested_backend(request, &block)
+        backend = request[:backend]
+        return yield unless backend
+
+        TreeHaver.with_backend(backend, &block)
       end
 
       def owner_id(signature)
@@ -407,7 +484,7 @@ module Rbs
 
       def merge3_exact(request, role)
         documents = %i[base ours theirs].to_h do |source_role|
-          [source_role, parse_exact_source(request.fetch(:"#{source_role}_source"), source_role)]
+          [source_role, parse_exact_source(request.fetch(:"#{source_role}_source"), source_role, request)]
         end
         winner = documents.fetch(role)
         return parse_failure(:merge3, request, role, winner) if provider_failure?(winner)
@@ -418,7 +495,7 @@ module Rbs
       def render_exact(request, documents, role)
         winner = documents.fetch(role)
         rendered = render_plan(request, [whole_source_fragment(role, request.fetch(:"#{role}_source"))])
-        verification = verify_exact_rendered(rendered.content, winner)
+        verification = verify_exact_rendered(rendered.content, winner, request)
         unless verification[:semantic_match] && verification[:byte_exact]
           return failure(
             :merge3,
@@ -441,8 +518,8 @@ module Rbs
         )
       end
 
-      def verify_exact_rendered(output, expected)
-        parsed = parse_exact_source(output, :output)
+      def verify_exact_rendered(output, expected, request)
+        parsed = parse_exact_source(output, :output, request)
         if provider_failure?(parsed)
           return {
             output_reparsed: false,
@@ -495,7 +572,7 @@ module Rbs
         fragments = composite_fragments(documents, decision)
         rendered = render_plan(request, fragments)
         expected = expected_owners(documents, decision)
-        verification = verify_rendered(rendered.content, expected)
+        verification = verify_rendered(rendered.content, expected, request)
         unless verification[:semantic_match]
           return failure(
             :merge3,
@@ -615,8 +692,8 @@ module Rbs
         expected
       end
 
-      def verify_rendered(output, expected)
-        parsed = parse_source(output, :output)
+      def verify_rendered(output, expected, request)
+        parsed = parse_source(output, :output, request)
         if provider_failure?(parsed)
           return {
             output_reparsed: false,

data/lib/rbs/merge/rspec/provider_snapshot_extension.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rbs/merge'
+
+module Rbs
+  module Merge
+    module RSpec
+      # Native RBS evidence for Ast::Merge provider contract snapshots.
+      module ProviderSnapshotExtension
+        module_function
+
+        def call(tree:, **)
+          {
+            schema: 'structuredmerge.extension/ruby-rbs/v1',
+            namespace: 'ruby-rbs',
+            capabilities: %w[declaration-kinds method-types type-nodes],
+            payload: {
+              declarations: NativeProjection.call(tree.declarations),
+              directives: NativeProjection.call(tree.directives),
+              native_tree_visibility: 'provider_internal'
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/lib/rbs/merge/version.rb

@@ -5,7 +5,7 @@ module Rbs
     # 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

data/lib/rbs/merge.rb

@@ -75,6 +75,7 @@ module Rbs
     autoload :CommentTracker, 'rbs/merge/comment_tracker'
     autoload :FreezeNode, 'rbs/merge/freeze_node'
     autoload :MergeResult, 'rbs/merge/merge_result'
+    autoload :NativeProjection, 'rbs/merge/native_projection'
     autoload :NodeTypeNormalizer, 'rbs/merge/node_type_normalizer'
     autoload :NodeWrapper, 'rbs/merge/node_wrapper'
     autoload :FileAnalysis, 'rbs/merge/file_analysis'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbs-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.7
+  version: 7.1.8
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ 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: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -71,14 +71,14 @@ 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: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,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
@@ -118,7 +118,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
@@ -196,7 +196,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
@@ -206,7 +206,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
@@ -236,7 +236,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
@@ -246,7 +246,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
@@ -321,9 +321,11 @@ files:
 - lib/rbs/merge/file_analysis.rb
 - lib/rbs/merge/freeze_node.rb
 - lib/rbs/merge/merge_result.rb
+- lib/rbs/merge/native_projection.rb
 - lib/rbs/merge/node_type_normalizer.rb
 - lib/rbs/merge/node_wrapper.rb
 - lib/rbs/merge/provider.rb
+- lib/rbs/merge/rspec/provider_snapshot_extension.rb
 - lib/rbs/merge/smart_merger.rb
 - lib/rbs/merge/version.rb
 - sig/rbs/merge.rbs
@@ -333,10 +335,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/rbs-merge/7.1.7
+  documentation_uri: https://www.rubydoc.info/gems/rbs-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/rbs-merge