Skip to content

Bump ast-merge from 1.0.0 to 1.1.0#3

Merged
pboling merged 1 commit intomainfrom
dependabot/bundler/ast-merge-1.1.0
Dec 22, 2025
Merged

Bump ast-merge from 1.0.0 to 1.1.0#3
pboling merged 1 commit intomainfrom
dependabot/bundler/ast-merge-1.1.0

Conversation

@dependabot
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Dec 22, 2025

Bumps ast-merge from 1.0.0 to 1.1.0.

Changelog

Sourced from ast-merge's changelog.

Changelog

SemVer 2.0.0 Keep-A-Changelog 1.0.0

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog, and this project adheres to Semantic Versioning, and yes, platform and engine support are part of the public API. Please file a bug if you notice a violation of semantic versioning.

[Unreleased]

Added

  • tree_haver Integration: Major architectural enhancement
    • Added tree_haver (~> 3.1) as a runtime dependency
    • Ast::Merge::AstNode now implements the TreeHaver::Node protocol for compatibility with tree_haver-based merge operations
      • Adds: type, kind, text, start_byte, end_byte, start_point, end_point, children, child_count, child(index), each, named?, structural?, has_error?, missing?, inner_node
      • Adds Point struct compatible with TreeHaver::Point
      • Adds SyntheticNode alias for clarity (synthetic = not backed by a real parser)
    • Comment::Line, Comment::Block, Comment::Empty now have explicit type methods
    • Text::LineNode and Text::WordNode now inherit from AstNode, gaining TreeHaver::Node protocol compliance
    • This enables *-merge gems to leverage tree_haver's cross-Ruby parsing capabilities (MRI, JRuby, TruffleRuby)
  • Documentation: Comprehensive updates across the gem family
    • Updated all vendor gem READMEs with standardized gem family tables
    • Added tree_haver as the foundation layer in architecture documentation
    • Clarified the two-layer architecture: tree_haver (parsing) → ast-merge (merge infrastructure)
    • Added detailed documentation to FencedCodeBlockDetector explaining when to use native AST nodes vs text-based detection
    • Updated markdown-merge documentation to highlight inner code block merging capabilities
  • Example Scripts: Added comprehensive examples demonstrating inner-merge capabilities
    • examples/markdown_code_merge.rb - Shows how markdown-merge delegates to language-specific parsers for semantic merging
    • Documentation proving that language-specific parsers create full ASTs of embedded code blocks

Changed

  • Architecture: Refactored to use tree_haver as the parsing foundation
    • All tree-sitter-based gems (bash-merge, json-merge, jsonc-merge, toml-merge) now use tree_haver
    • Parser-specific gems (prism-merge, psych-merge, markdown-merge, markly-merge, commonmarker-merge) use tree_haver backends
    • Provides unified API across different Ruby implementations and parsing backends
  • Documentation Structure: Standardized gem family tables across all 12 vendor gems
    • Changed from 3-column to 4-column format: Gem | Format | Parser Backend(s) | Description
    • All parser backends now annotated with "(via tree_haver)" where applicable

... (truncated)

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [ast-merge](https://github.com/kettle-rb/ast-merge) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/kettle-rb/ast-merge/releases)
- [Changelog](https://github.com/kettle-rb/ast-merge/blob/main/CHANGELOG.md)
- [Commits](kettle-rb/ast-merge@v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: ast-merge
  dependency-version: 1.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added dependencies Pull requests that update a dependency file ruby Pull requests that update ruby code labels Dec 22, 2025
@github-actions github-actions bot requested a review from pboling December 22, 2025 16:30
@pboling pboling merged commit 59ff6d9 into main Dec 22, 2025
18 of 21 checks passed
@pboling pboling deleted the dependabot/bundler/ast-merge-1.1.0 branch December 22, 2025 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file ruby Pull requests that update ruby code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant