prism-merge 7.1.3 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05162706e7a7aad556baf0781fb12f4b357235ecd8cfb7c97d4e78f3f09d5a15
-  data.tar.gz: e4599c75cf98de86668c0029d87e5556bbeaf42ee099bd466effc8a1949f261d
+  metadata.gz: 7d32fbdcd833e576a54414849501db40ddacd349498c05e4d233159f2e5521c1
+  data.tar.gz: 063f4adb55b355f984f09eb376652dded9e8a8d2451d993ebc4a954eb403ca0c
 SHA512:
-  metadata.gz: 302024d190da6a5d406bdd7107c7fd7b0ba566852d1043a58738cba02eb09b2a0501ceaa4c9a993ed076601919f49939f2bc93b103e66bfb98fde42bfb62e35a
-  data.tar.gz: 8f58d15fcd6dafb0392b5279fbd8fde3de0dc91f2a83ffd67cc827e4370c72d0cb402436bfd9e260c294f3b28e3e28470737ac1eba38eaae7e2a80241b57efc3
+  metadata.gz: 291ed360148759fb7f32d3c28da2d0c8da02733022b60b9ada62781cd0cfc61d0295164e43f84985816d2416f92f433862e04010ec2ac59c200f953918e8c540
+  data.tar.gz: 75c2f6a59e5910332a80945f0f12426d5a019872d4e128834cebabfc496db6c30d2ab389940a7bc10910a084694bf68d59e9bcd81281dbbc173857d86b6a59a5

data/README.md

@@ -1244,7 +1244,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.246-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.550-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/prism/merge/version.rb

@@ -5,7 +5,7 @@ module Prism
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.3'
+      VERSION = '7.1.4'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/prism/merge.rb

@@ -1,27 +1,19 @@
 # frozen_string_literal: true
 
 require 'prism'
+require 'ruby-merge'
 require 'ast/merge'
 require 'tree_haver'
-require_relative '../ruby/merge/block_directive_detector'
-require_relative '../ruby/merge/block_binding_support'
-require_relative '../ruby/merge/doc_comment_support'
-require_relative '../ruby/merge/gemspec_support'
-require_relative '../ruby/merge/magic_comment_support'
-require_relative '../ruby/merge/method_similarity'
-require_relative '../ruby/merge/nocov_node_base'
-require_relative '../ruby/merge/nocov_wrapper_base'
-require_relative '../ruby/merge/rescue_semantics'
-require_relative '../ruby/merge/scaffold_chunk_support'
-require_relative '../ruby/merge/signature_support'
 require_relative 'merge/version'
 
 module Prism
+  # This public facade keeps provider protocol and backend registration
+  # entrypoints together; implementation details live in autoloaded files.
+  # rubocop:disable Metrics/ModuleLength
   module Merge
     module_function
 
     PACKAGE_NAME = 'prism-merge'
-    DESTINATION_WINS_ARRAY_POLICY = { surface: 'array', name: 'destination_wins_array' }.freeze
     BACKEND_REFERENCE = TreeHaver::BackendReference.new(id: 'prism', family: 'native').freeze
     BACKEND_REGISTRY = Struct.new(:registered, :mutex).new(false, Mutex.new)
     TreeHaver::BackendRegistry.register(BACKEND_REFERENCE)
@@ -99,11 +91,7 @@ module Prism
     end
 
     def ruby_feature_profile
-      {
-        family: 'ruby',
-        supported_dialects: ['ruby'],
-        supported_policies: [DESTINATION_WINS_ARRAY_POLICY]
-      }
+      Ruby::Merge.ruby_feature_profile
     end
 
     def merge_provider
@@ -324,6 +312,8 @@ module Prism
       }
     end
 
+    # This projection mirrors the nested public schema intentionally.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def ruby_structured_edit_batch_report_projection
       content = "class App\n  # managed snippet\n  old_call\n\n  anchor_call\n\n  # obsolete snippet\n  obsolete_call\nend\n"
       {
@@ -465,7 +455,10 @@ module Prism
         )
       }
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
+    # Keep parser validation and diagnostics in one boundary method.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def parse_ruby(source, dialect, backend: nil)
       requested = backend.to_s.empty? ? BACKEND_REFERENCE.id : backend.to_s
       return unsupported_feature_result("Unsupported Ruby dialect #{dialect}.") unless dialect == 'ruby'
@@ -493,6 +486,7 @@ module Prism
         policies: []
       }
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def analyze_ruby_document(source, parse_result)
       normalized_source = prism_ruby_normalize_source(source)
@@ -509,6 +503,8 @@ module Prism
       }
     end
 
+    # Normalization builds the complete TreeHaver contract in one pass.
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
     def parse_ruby_normalized(source, dialect = 'ruby', backend: nil)
       requested = backend.to_s.empty? ? BACKEND_REFERENCE.id : backend.to_s
       return unsupported_feature_result("Unsupported Ruby dialect #{dialect}.") unless dialect == 'ruby'
@@ -590,7 +586,10 @@ module Prism
         metadata: prism_normalized_metadata
       ).to_h
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
+    # This adapter validates, edits, reparses, and reports one projection atomically.
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
     def apply_edit_projection(request)
       source = request.fetch(:source)
       provider_id = request.fetch(:provider_id)
@@ -662,9 +661,10 @@ module Prism
         []
       ).to_h
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     def match_ruby_owners(template, destination)
-      Ast::Merge::OwnerSelection.match_by_path(template, destination)
+      Ruby::Merge.match_ruby_owners(template, destination)
     end
 
     def merge_ruby(
@@ -699,7 +699,7 @@ module Prism
         ok: true,
         diagnostics: [],
         output: merger.merge.to_s,
-        policies: ruby_feature_profile.fetch(:supported_policies)
+        policies: Ruby::Merge.ruby_feature_profile.fetch(:supported_policies)
       }
     rescue Prism::Merge::ParseError => e
       {
@@ -745,6 +745,8 @@ module Prism
       end
     end
 
+    # Alias normalization intentionally handles the supported input shapes inline.
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
     def normalize_ruby_require_aliases(require_aliases)
       Array(require_aliases).each_with_object({}) do |entry, aliases|
         case entry
@@ -765,6 +767,7 @@ module Prism
         aliases[to] = canonical
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
 
     def ruby_dsl_call_node(node)
       return node if node.is_a?(::Prism::CallNode)
@@ -789,6 +792,8 @@ module Prism
       end
     end
 
+    # The reviewed merge boundary must retain all protocol roles for replay.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
     def merge_ruby_with_reviewed_nested_outputs(template_source, destination_source, dialect, review_state,
                                                 applied_children, backend: nil)
       requested = backend.to_s.empty? ? BACKEND_REFERENCE.id : backend.to_s
@@ -812,7 +817,7 @@ module Prism
           }
         },
         apply_resolved_outputs: lambda { |merged_output, operations, apply_plan, resolved_children|
-          apply_ruby_delegated_child_outputs(
+          Ruby::Merge.apply_ruby_delegated_child_outputs(
             merged_output,
             operations,
             apply_plan,
@@ -821,6 +826,7 @@ module Prism
         }
       )
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
 
     def merge_ruby_with_reviewed_nested_outputs_from_replay_bundle(template_source, destination_source, dialect,
                                                                    replay_bundle, backend: nil)
@@ -913,83 +919,15 @@ module Prism
     end
 
     def ruby_discovered_surfaces(analysis)
-      analysis[:discovered_surfaces] || []
+      Ruby::Merge.ruby_discovered_surfaces(analysis)
     end
 
     def ruby_delegated_child_operations(analysis, parent_operation_id: 'ruby-document-0')
-      surfaces = ruby_discovered_surfaces(analysis)
-      doc_operation_ids = {}
-      operations = []
-
-      surfaces.each_with_index do |surface, index|
-        next unless surface[:surface_kind] == 'ruby_doc_comment'
-
-        operation_id = "ruby-doc-comment-#{index}"
-        doc_operation_ids[surface[:address]] = operation_id
-        operations << Ast::Merge.delegated_child_operation(
-          operation_id: operation_id,
-          parent_operation_id: parent_operation_id,
-          requested_strategy: 'delegate_child_surface',
-          language_chain: ['ruby', surface[:effective_language]],
-          surface: surface
-        )
-      end
-
-      example_index = 0
-      surfaces.each do |surface|
-        next unless surface[:surface_kind] == 'yard_example_block'
-
-        operations << Ast::Merge.delegated_child_operation(
-          operation_id: "yard-example-#{example_index}",
-          parent_operation_id: doc_operation_ids.fetch(surface[:parent_address], parent_operation_id),
-          requested_strategy: 'delegate_child_surface',
-          language_chain: ['ruby', 'yard', surface[:effective_language]],
-          surface: surface
-        )
-        example_index += 1
-      end
-
-      operations
-    end
-
-    def apply_ruby_delegated_child_outputs(source, delegated_operations, apply_plan, applied_children)
-      lines = prism_ruby_normalize_source(source).split("\n")
-      operations_by_id = delegated_operations.to_h { |operation| [operation[:operation_id], operation] }
-      outputs_by_id = applied_children.to_h { |entry| [entry[:operation_id], entry[:output]] }
-
-      replacements = apply_plan[:entries].filter_map do |entry|
-        operation = operations_by_id[entry.dig(:delegated_group, :child_operation_id)]
-        output = outputs_by_id[entry.dig(:delegated_group, :child_operation_id)]
-        span = operation&.dig(:surface, :span)
-        next if operation.nil? || output.nil? || span.nil?
-
-        { start: span[:start_line] - 1, finish: span[:end_line] - 1, output: output }
-      end
-
-      replacements.sort_by { |entry| -entry[:start] }.each do |entry|
-        prefix = Ruby::Merge::DocCommentSupport.comment_prefix_for(lines[entry[:start]])
-        replacement_lines = if entry[:output].empty?
-                              []
-                            else
-                              entry[:output].sub(/\n\z/, '').split("\n").map { |line| "#{prefix}#{line}" }
-                            end
-        lines[entry[:start]..entry[:finish]] = replacement_lines
-      end
-
-      {
-        ok: true,
-        diagnostics: [],
-        output: "#{lines.join("\n").sub(/\n+\z/, '')}\n",
-        policies: [DESTINATION_WINS_ARRAY_POLICY]
-      }
+      Ruby::Merge.ruby_delegated_child_operations(analysis, parent_operation_id: parent_operation_id)
     end
 
     def unsupported_feature_result(message)
-      {
-        ok: false,
-        diagnostics: [{ severity: 'error', category: 'unsupported_feature', message: message }],
-        policies: []
-      }
+      Ruby::Merge.unsupported_feature_result(message)
     end
 
     def prism_ruby_analysis_owners(body)
@@ -1016,6 +954,8 @@ module Prism
       end.sort_by { |owner| owner[:path] }
     end
 
+    # Surface discovery intentionally keeps line ownership and comment state together.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def prism_ruby_discovered_surfaces(source, body)
       owners_by_line = body.filter_map do |node|
         name = prism_ruby_declaration_name(node)
@@ -1046,7 +986,10 @@ module Prism
 
       surfaces
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
+    # A surface record is assembled as one schema-shaped value.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def prism_ruby_surfaces_for_owner(owner_name, comment_entries)
       filtered_entries = comment_entries.filter { |entry| prism_ruby_doc_comment_content?(entry.fetch(:raw)) }
       return [] if filtered_entries.empty?
@@ -1071,7 +1014,10 @@ module Prism
 
       [doc_surface] + prism_ruby_example_surfaces(doc_surface)
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
+    # Example surfaces preserve the complete delegated-child metadata contract.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def prism_ruby_example_surfaces(surface)
       entries = Array(surface.dig(:metadata, :entries))
       Ruby::Merge::DocCommentSupport.example_blocks(entries).map do |block|
@@ -1096,6 +1042,7 @@ module Prism
         )
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def prism_ruby_declaration_name(node)
       case node
@@ -1254,6 +1201,8 @@ module Prism
       end
     end
 
+    # Comment nodes retain backend metadata in a single normalized schema value.
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def prism_comment_node(source, comment, index, magic_comment, parent_id:)
       directive = prism_comment_directive(
         source.byteslice(comment.location.start_offset...comment.location.end_offset), magic_comment
@@ -1284,6 +1233,7 @@ module Prism
         }
       )
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def prism_comment_directive(comment_text, magic_comment)
       if comment_text.strip.match?(/\A#\s*smorg:freeze\b/)
@@ -1422,6 +1372,7 @@ module Prism
       :source_span_for_location
     )
   end
+  # rubocop:enable Metrics/ModuleLength
 end
 
 Prism::Merge.register_backend!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: prism
   requirement: !ruby/object:Gem::Requirement
@@ -65,20 +65,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: ruby-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +122,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -118,7 +132,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +230,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
@@ -226,7 +240,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
@@ -236,7 +250,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
@@ -246,7 +260,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +304,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
@@ -300,7 +314,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "☯️ Prism-backed Ruby provider gem for the Structured Merge Ruby family."
 email:
 - floss@galtzo.com
@@ -354,17 +368,6 @@ files:
 - lib/prism/merge/top_level_merge_runner.rb
 - lib/prism/merge/version.rb
 - lib/prism/merge/wrapper_comment_support.rb
-- lib/ruby/merge/block_binding_support.rb
-- lib/ruby/merge/block_directive_detector.rb
-- lib/ruby/merge/doc_comment_support.rb
-- lib/ruby/merge/gemspec_support.rb
-- lib/ruby/merge/magic_comment_support.rb
-- lib/ruby/merge/method_similarity.rb
-- lib/ruby/merge/nocov_node_base.rb
-- lib/ruby/merge/nocov_wrapper_base.rb
-- lib/ruby/merge/rescue_semantics.rb
-- lib/ruby/merge/scaffold_chunk_support.rb
-- lib/ruby/merge/signature_support.rb
 - sig/prism/merge.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
 licenses:
@@ -372,10 +375,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.3
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/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/prism-merge/7.1.3
+  documentation_uri: https://www.rubydoc.info/gems/prism-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/prism-merge

data/lib/ruby/merge/block_binding_support.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Ruby
-  module Merge
-    # Parser-neutral naming policy for a block-local receiver.
-    module BlockBindingSupport
-      module_function
-
-      def effective_receiver(receiver, block_var, placeholder: :__block_binding__)
-        block_var && receiver == block_var ? placeholder : receiver
-      end
-
-      def preferred_block_var(template_var, destination_var)
-        template_var if template_var && destination_var && template_var != destination_var
-      end
-
-      def merged_block_var(var, preferred_var)
-        preferred_var || var
-      end
-    end
-  end
-end