prism-merge 1.0.0

data/sig/prism/merge.rbs

@@ -0,0 +1,265 @@
+module Prism
+  module Merge
+    VERSION: String
+
+    module Version
+      VERSION: String
+    end
+
+    class Error < StandardError
+    end
+
+    class ParseError < Error
+      attr_reader content: String
+      attr_reader parse_result: untyped
+
+      def initialize: (String message, content: String, parse_result: untyped) -> void
+    end
+
+    class TemplateParseError < ParseError
+    end
+
+    class DestinationParseError < ParseError
+    end
+
+    class FileAnalysis
+      FREEZE_START: Regexp
+      FREEZE_END: Regexp
+      FREEZE_BLOCK: Regexp
+
+      type freeze_block = {
+        range: Range[Integer],
+        line_range: Range[Integer],
+        text: String,
+        start_marker: String?
+      }
+
+      type node_info = {
+        node: untyped,
+        index: Integer,
+        leading_comments: Array[untyped],
+        inline_comments: Array[untyped],
+        signature: Array[untyped]?,
+        line_range: Range[Integer]
+      }
+
+      attr_reader content: String
+      attr_reader parse_result: untyped
+      attr_reader lines: Array[String]
+      attr_reader statements: Array[untyped]
+      attr_reader freeze_blocks: Array[freeze_block]
+
+      def initialize: (String content, ?signature_generator: (^(untyped) -> Array[untyped])?) -> void
+
+      def valid?: () -> bool
+
+      def extract_statements: () -> Array[untyped]
+
+      def extract_freeze_blocks: () -> Array[freeze_block]
+
+      def line_to_node_map: () -> Hash[Integer, Array[untyped]]
+
+      def node_to_line_map: () -> Hash[untyped, Range[Integer]]
+
+      def nodes_with_comments: () -> Array[node_info]
+
+      def comment_map: () -> Hash[Integer, Array[untyped]]
+
+      def signature_at: (Integer index) -> Array[untyped]?
+
+      def generate_signature: (untyped node) -> Array[untyped]?
+
+      def in_freeze_block?: (Integer line_num) -> bool
+
+      def freeze_block_at: (Integer line_num) -> freeze_block?
+
+      def normalized_line: (Integer line_num) -> String?
+
+      def line_at: (Integer line_num) -> String?
+
+      private
+
+      def build_line_to_node_map: () -> Hash[Integer, Array[untyped]]
+
+      def build_node_to_line_map: () -> Hash[untyped, Range[Integer]]
+
+      def extract_nodes_with_comments: () -> Array[node_info]
+
+      def find_leading_comments: (untyped current_stmt, untyped? prev_stmt, untyped body_node) -> Array[untyped]
+
+      def inline_comments_for_node: (untyped stmt) -> Array[untyped]
+
+      def build_comment_map: () -> Hash[Integer, Array[untyped]]
+
+      def default_signature: (untyped node) -> Array[untyped]
+    end
+
+    class FileAligner
+      class Anchor < Struct[untyped]
+        attr_accessor template_start: Integer
+        attr_accessor template_end: Integer
+        attr_accessor dest_start: Integer
+        attr_accessor dest_end: Integer
+        attr_accessor match_type: Symbol
+        attr_accessor score: Integer
+
+        def template_range: () -> Range[Integer]
+
+        def dest_range: () -> Range[Integer]
+
+        def length: () -> Integer
+      end
+
+      class Boundary < Struct[untyped]
+        attr_accessor template_range: Range[Integer]?
+        attr_accessor dest_range: Range[Integer]?
+        attr_accessor prev_anchor: Anchor?
+        attr_accessor next_anchor: Anchor?
+
+        def template_lines: () -> Array[Integer]
+
+        def dest_lines: () -> Array[Integer]
+      end
+
+      attr_reader template_analysis: FileAnalysis
+      attr_reader dest_analysis: FileAnalysis
+      attr_reader anchors: Array[Anchor]
+      attr_reader boundaries: Array[Boundary]
+
+      def initialize: (FileAnalysis template_analysis, FileAnalysis dest_analysis) -> void
+
+      def align: () -> Array[Boundary]
+
+      private
+
+      def find_anchors: () -> void
+
+      def build_line_map: (FileAnalysis analysis) -> Hash[Integer, String]
+
+      def find_exact_line_matches: (Hash[Integer, String] template_map, Hash[Integer, String] dest_map) -> Array[Hash[Symbol, untyped]]
+
+      def merge_consecutive_matches: (Array[Hash[Symbol, untyped]] matches) -> Array[Anchor]
+
+      def add_node_signature_anchors: () -> void
+
+      def add_freeze_block_anchors: () -> void
+
+      def compute_boundaries: () -> void
+
+      def ranges_overlap?: (Range[Integer]? range1, Range[Integer]? range2) -> bool
+    end
+
+    class MergeResult
+      DECISION_KEPT_TEMPLATE: Symbol
+      DECISION_KEPT_DEST: Symbol
+      DECISION_APPENDED: Symbol
+      DECISION_REPLACED: Symbol
+      DECISION_FREEZE_BLOCK: Symbol
+
+      type line_metadata = {
+        decision: Symbol,
+        template_line: Integer?,
+        dest_line: Integer?,
+        comment: String?,
+        result_line: Integer
+      }
+
+      attr_reader lines: Array[String]
+      attr_reader line_metadata: Array[line_metadata]
+
+      def initialize: () -> void
+
+      def add_line: (String content, decision: Symbol, ?template_line: Integer?, ?dest_line: Integer?, ?comment: String?) -> void
+
+      def add_lines_from: (Array[String] source_lines, decision: Symbol, source: Symbol, start_line: Integer, ?comment: String?) -> void
+
+      def add_node: (FileAnalysis::node_info node_info, decision: Symbol, source: Symbol, ?source_analysis: FileAnalysis?) -> void
+
+      def to_s: () -> String
+
+      def statistics: () -> Hash[Symbol, Integer]
+
+      def lines_by_decision: (Symbol decision) -> Array[line_metadata]
+
+      def debug_output: () -> String
+    end
+
+    class ConflictResolver
+      type boundary_content = {
+        lines: Array[String],
+        nodes: Array[FileAnalysis::node_info],
+        has_freeze_block: bool,
+        line_range: Range[Integer]?
+      }
+
+      attr_reader template_analysis: FileAnalysis
+      attr_reader dest_analysis: FileAnalysis
+      attr_reader signature_match_preference: Symbol
+      attr_reader add_template_only_nodes: bool
+
+      def initialize: (FileAnalysis template_analysis, FileAnalysis dest_analysis, ?signature_match_preference: Symbol, ?add_template_only_nodes: bool) -> void
+
+      def resolve: (FileAligner::Boundary boundary, MergeResult result) -> void
+
+      private
+
+      def extract_boundary_content: (FileAnalysis analysis, Range[Integer]? line_range) -> boundary_content
+
+      def ranges_overlap?: (Range[Integer] range1, Range[Integer] range2) -> bool
+
+      def add_content_to_result: (boundary_content content, MergeResult result, Symbol source, Symbol decision) -> void
+
+      def merge_boundary_content: (boundary_content template_content, boundary_content dest_content, FileAligner::Boundary boundary, MergeResult result) -> void
+
+      def build_signature_map: (Array[FileAnalysis::node_info] nodes) -> Hash[Array[untyped], Array[FileAnalysis::node_info]]
+
+      def add_line_safe: (MergeResult result, String content, **untyped kwargs) -> void
+
+      def handle_orphan_lines: (boundary_content template_content, boundary_content dest_content, MergeResult result) -> void
+
+      def find_orphan_lines: (FileAnalysis analysis, Range[Integer]? line_range, Array[FileAnalysis::node_info] nodes) -> Array[Integer]
+    end
+
+    class SmartMerger
+      attr_reader template_analysis: FileAnalysis
+      attr_reader dest_analysis: FileAnalysis
+      attr_reader aligner: FileAligner
+      attr_reader resolver: ConflictResolver
+      attr_reader result: MergeResult
+
+      type merge_debug_result = {
+        content: String,
+        debug: String,
+        statistics: Hash[Symbol, Integer]
+      }
+
+      def initialize: (
+        String template_content,
+        String dest_content,
+        ?signature_generator: (^(untyped) -> Array[untyped])?,
+        ?signature_match_preference: Symbol,
+        ?add_template_only_nodes: bool
+      ) -> void
+
+      def merge: () -> String
+
+      def merge_with_debug: () -> merge_debug_result
+
+      private
+
+      def process_merge: (Array[FileAligner::Boundary] boundaries) -> void
+
+      def build_timeline: (Array[FileAligner::Boundary] boundaries) -> Array[Hash[Symbol, untyped]]
+
+      def process_anchor: (FileAligner::Anchor anchor) -> void
+
+      def add_freeze_block_from_dest: (FileAligner::Anchor anchor) -> void
+
+      def add_signature_match_from_dest: (FileAligner::Anchor anchor) -> void
+
+      def add_exact_match_from_template: (FileAligner::Anchor anchor) -> void
+
+      def process_boundary: (FileAligner::Boundary boundary) -> void
+    end
+  end
+end

data.tar.gz.sig

@@ -0,0 +1,6 @@
+���0&H7E�q6פ�GWx�q���Le�VA\�����
+�����|]�{r�]T�Ol5h@���lt`���)��бH2Hx�q�5K՟�B���
+W�N	'���/�=�Q:���L�Ai{� 1=^�gD:�����u;���;B�e�(�nIc��I�搢������iu�N�ȤL����=�U� X/pH�x[��iH*>Y�n%
+�5�D'�]���B*mn!�2��I]j���"�Pb4\�y�3�9�<3dBH��pK�~ ��=W�>���7�����qg�m�&D��>�jn�'��8��4s|���_"
++����m��o���3�x��6a�RW��zXI�2�۲��
+G����*�[r}K

metadata

@@ -0,0 +1,303 @@
+--- !ruby/object:Gem::Specification
+name: prism-merge
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+platform: ruby
+authors:
+- Peter H. Boling
+bindir: exe
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEgDCCAuigAwIBAgIBATANBgkqhkiG9w0BAQsFADBDMRUwEwYDVQQDDAxwZXRl
+  ci5ib2xpbmcxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkW
+  A2NvbTAeFw0yNTA1MDQxNTMzMDlaFw00NTA0MjkxNTMzMDlaMEMxFTATBgNVBAMM
+  DHBldGVyLmJvbGluZzEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPy
+  LGQBGRYDY29tMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAruUoo0WA
+  uoNuq6puKWYeRYiZekz/nsDeK5x/0IEirzcCEvaHr3Bmz7rjo1I6On3gGKmiZs61
+  LRmQ3oxy77ydmkGTXBjruJB+pQEn7UfLSgQ0xa1/X3kdBZt6RmabFlBxnHkoaGY5
+  mZuZ5+Z7walmv6sFD9ajhzj+oIgwWfnEHkXYTR8I6VLN7MRRKGMPoZ/yvOmxb2DN
+  coEEHWKO9CvgYpW7asIihl/9GMpKiRkcYPm9dGQzZc6uTwom1COfW0+ZOFrDVBuV
+  FMQRPswZcY4Wlq0uEBLPU7hxnCL9nKK6Y9IhdDcz1mY6HZ91WImNslOSI0S8hRpj
+  yGOWxQIhBT3fqCBlRIqFQBudrnD9jSNpSGsFvbEijd5ns7Z9ZMehXkXDycpGAUj1
+  to/5cuTWWw1JqUWrKJYoifnVhtE1o1DZ+LkPtWxHtz5kjDG/zR3MG0Ula0UOavlD
+  qbnbcXPBnwXtTFeZ3C+yrWpE4pGnl3yGkZj9SMTlo9qnTMiPmuWKQDatAgMBAAGj
+  fzB9MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQE8uWvNbPVNRXZ
+  HlgPbc2PCzC4bjAhBgNVHREEGjAYgRZwZXRlci5ib2xpbmdAZ21haWwuY29tMCEG
+  A1UdEgQaMBiBFnBldGVyLmJvbGluZ0BnbWFpbC5jb20wDQYJKoZIhvcNAQELBQAD
+  ggGBAJbnUwfJQFPkBgH9cL7hoBfRtmWiCvdqdjeTmi04u8zVNCUox0A4gT982DE9
+  wmuN12LpdajxZONqbXuzZvc+nb0StFwmFYZG6iDwaf4BPywm2e/Vmq0YG45vZXGR
+  L8yMDSK1cQXjmA+ZBKOHKWavxP6Vp7lWvjAhz8RFwqF9GuNIdhv9NpnCAWcMZtpm
+  GUPyIWw/Cw/2wZp74QzZj6Npx+LdXoLTF1HMSJXZ7/pkxLCsB8m4EFVdb/IrW/0k
+  kNSfjtAfBHO8nLGuqQZVH9IBD1i9K6aSs7pT6TW8itXUIlkIUI2tg5YzW6OFfPzq
+  QekSkX3lZfY+HTSp/o+YvKkqWLUV7PQ7xh1ZYDtocpaHwgxe/j3bBqHE+CUPH2vA
+  0V/FwdTRWcwsjVoOJTrYcff8pBZ8r2MvtAc54xfnnhGFzeRHfcltobgFxkAXdE6p
+  DVjBtqT23eugOqQ73umLcYDZkc36vnqGxUBSsXrzY9pzV5gGr2I8YUxMqf6ATrZt
+  L9nRqA==
+  -----END CERTIFICATE-----
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !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.9
+  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.9
+- !ruby/object:Gem::Dependency
+  name: kettle-dev
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.60
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.60
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !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: appraisal2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: kettle-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  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.6
+- !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.2
+  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.2
+- !ruby/object:Gem::Dependency
+  name: gitmoji-regex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  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.3
+description: "☯️ Intelligently merge two versions of a Ruby file using Prism AST analysis,
+  similar to a smart 'git merge' specifically designed for Ruby code."
+email:
+- peter.boling@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files:
+- CHANGELOG.md
+- CITATION.cff
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- FUNDING.md
+- LICENSE.txt
+- README.md
+- REEK
+- RUBOCOP.md
+- SECURITY.md
+files:
+- CHANGELOG.md
+- CITATION.cff
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- FUNDING.md
+- LICENSE.txt
+- README.md
+- REEK
+- RUBOCOP.md
+- SECURITY.md
+- lib/prism-merge.rb
+- lib/prism/merge.rb
+- lib/prism/merge/conflict_resolver.rb
+- lib/prism/merge/file_aligner.rb
+- lib/prism/merge/file_analysis.rb
+- lib/prism/merge/merge_result.rb
+- lib/prism/merge/smart_merger.rb
+- lib/prism/merge/version.rb
+- sig/prism/merge.rbs
+homepage: https://github.com/kettle-rb/prism-merge
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://prism-merge.galtzo.com/
+  source_code_uri: https://github.com/kettle-rb/prism-merge/tree/v1.0.0
+  changelog_uri: https://github.com/kettle-rb/prism-merge/blob/v1.0.0/CHANGELOG.md
+  bug_tracker_uri: https://github.com/kettle-rb/prism-merge/issues
+  documentation_uri: https://www.rubydoc.info/gems/prism-merge/1.0.0
+  funding_uri: https://github.com/sponsors/pboling
+  wiki_uri: https://github.com/kettle-rb/prism-merge/wiki
+  news_uri: https://www.railsbling.com/tags/prism-merge
+  discord_uri: https://discord.gg/3qme4XHNKN
+  rubygems_mfa_required: 'true'
+rdoc_options:
+- "--title"
+- prism-merge - ☯️ Intelligently merge two versions of a Ruby file using Prism AST
+  analysis, useful in templating
+- "--main"
+- README.md
+- "--exclude"
+- "^sig/"
+- "--line-numbers"
+- "--inline-source"
+- "--quiet"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.7.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.7.2
+specification_version: 4
+summary: "☯️ Intelligently merge two versions of a Ruby file using Prism AST analysis,
+  useful in templating"
+test_files: []