Major refactor

.github/workflows/current.yml

@@ -112,7 +112,6 @@ jobs:
         working-directory: ${{ matrix.gem }}
         env:
           K_JEM_TEMPLATING: true
-          SMORG_RB_DEV: ${{ github.workspace }}/gems
           STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems
         run: |
           gem install nomono -v 1.0.8 --source https://gem.coop --source https://rubygems.org
@@ -124,7 +123,6 @@ jobs:
         env:
           K_JEM_TEMPLATING: true
           K_SOUP_COV_DO: false
-          SMORG_RB_DEV: ${{ github.workspace }}/gems
           STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems
         run: timeout 12m bundle exec kettle-test
 
@@ -163,12 +161,46 @@ jobs:
             abort "RBS validation failed for #{failures.length} gem(s)" unless failures.empty?
           '
 
+  tslp-cold-cache:
+    name: TSLP cold cache
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314.0
+        with:
+          ruby-version: ruby
+          bundler-cache: false
+      - name: Install dependencies
+        working-directory: gems/tree_haver
+        env:
+          K_JEM_TEMPLATING: true
+          STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems
+        run: |
+          gem install nomono -v 1.0.8 --source https://gem.coop --source https://rubygems.org
+          bundle config set path vendor/bundle
+          bundle config set frozen false
+          bundle install --jobs 4
+      - name: Run cold-cache TSLP checks
+        working-directory: gems/tree_haver
+        env:
+          K_JEM_TEMPLATING: true
+          K_SOUP_COV_DO: false
+          STRUCTUREDMERGE_DEV: ${{ github.workspace }}/gems
+        run: |
+          set -euo pipefail
+          export TREE_SITTER_LANGUAGE_PACK_CACHE_DIR
+          TREE_SITTER_LANGUAGE_PACK_CACHE_DIR="$(mktemp -d "${RUNNER_TEMP}/tslp-cold-cache.XXXXXX")"
+          bundle exec rspec spec/grammar_finder_spec.rb spec/backends/tslp_spec.rb --format progress
+
   check:
     name: Check
     needs:
       - detect
       - gem-suite
       - rbs
+      - tslp-cold-cache
     if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:
@@ -179,19 +211,24 @@ jobs:
           DETECT_RESULT: ${{ needs.detect.result }}
           GEM_SUITE_RESULT: ${{ needs.gem-suite.result }}
           RBS_RESULT: ${{ needs.rbs.result }}
+          TSLP_COLD_CACHE_RESULT: ${{ needs.tslp-cold-cache.result }}
         run: |
           set -euo pipefail
           echo "Selected gem suites: ${SELECTED_GEMS}"
           echo "Detect result: ${DETECT_RESULT}"
           echo "Gem suite result: ${GEM_SUITE_RESULT}"
           echo "RBS result: ${RBS_RESULT}"
+          echo "TSLP cold cache result: ${TSLP_COLD_CACHE_RESULT}"
 
           if [[ "${DETECT_RESULT}" != "success" ]]; then
             exit 1
           fi
           if [[ "${RBS_RESULT}" != "success" ]]; then
             exit 1
           fi
+          if [[ "${TSLP_COLD_CACHE_RESULT}" != "success" ]]; then
+            exit 1
+          fi
 
           case "${GEM_SUITE_RESULT}" in
             success|skipped)

.gitignore

@@ -4,9 +4,10 @@
 /.yardoc/
 **/.yardoc/
 **/_yardoc/
-/coverage/
+**/coverage/
 /log/
 /pkg/
+**/results/
 /tmp/
 /vendor/bundle/
 .env.local
@@ -15,3 +16,4 @@
 *.rbc
 *.rspec_status
 /.DS_Store
+TREE_HAVER_PLAN.md

.kettle-family.yml

@@ -115,7 +115,7 @@ release:
   env:
     GALTZO_FLOSS_DEV: false
     KETTLE_RB_DEV: false
-    SMORG_RB_DEV: false
+    STRUCTUREDMERGE_DEV: false
     TSLP_DEV: ""
   family_changelog:
     enabled: true

CHANGELOG.md

@@ -42,6 +42,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Gems that use `tree_sitter_language_pack` now resolve it through the
   StructuredMerge Ruby 4-compatible fork branch in their development Gemfiles
   until an upstream Ruby 4-compatible release is available.
+- Structured merge gems now fail closed when no registered TreeHaver backend is
+  available instead of falling back to direct parser-library paths outside the
+  TreeHaver and ast-merge stack.
 
 ### Deprecated
 

Gemfile

@@ -2,6 +2,18 @@ kettle_rb_dev = ENV.fetch("KETTLE_RB_DEV", "false")
 
 source "https://rubygems.org"
 
+tslp_dev = ENV.fetch("TSLP_DEV", nil)
+if tslp_dev.to_s.empty?
+  gem(
+    "tree_sitter_language_pack",
+    git: "https://github.com/structuredmerge/tree-sitter-language-pack.git",
+    branch: "fix/ruby-parser-api-methods",
+    glob: "packages/ruby/*.gemspec",
+  )
+else
+  gem "tree_sitter_language_pack", path: tslp_dev
+end
+
 unless kettle_rb_dev.casecmp("false").zero?
   require "nomono/bundler"
 

Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/structuredmerge/tree-sitter-language-pack.git
+  revision: 85cac7836bb2f8cfcd3041a191b7bd11bf10924a
+  branch: fix/ruby-parser-api-methods
+  glob: packages/ruby/*.gemspec
+  specs:
+    tree_sitter_language_pack (1.12.5)
+      rb_sys (>= 0.9, < 0.9.128)
+      sorbet-runtime (~> 0.5)
+
 PATH
   remote: gems/ast-crispr-markdown-markly
   specs:
@@ -11,7 +21,7 @@ PATH
   specs:
     ast-crispr-ruby-prism (7.1.0)
       ast-crispr (= 7.1.0)
-      prism (>= 1.0)
+      prism-merge (= 7.1.0)
       version_gem (~> 1.1, >= 1.1.9)
 
 PATH
@@ -27,6 +37,7 @@ PATH
   specs:
     ast-merge-git (7.1.0)
       ast-merge (= 7.1.0)
+      json-merge (= 7.1.0)
       version_gem (~> 1.1, >= 1.1.9)
 
 PATH
@@ -269,7 +280,7 @@ GEM
   specs:
     addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
-    appraisal2 (3.1.4)
+    appraisal2 (3.2.0)
       bundler (>= 1.17.3)
       rake (>= 10)
       thor (>= 0.14)
@@ -298,7 +309,7 @@ GEM
     gitmoji-regex (2.0.4)
       version_gem (~> 1.1, >= 1.1.13)
     io-console (0.8.2)
-    kettle-dev (2.3.6)
+    kettle-dev (2.3.7)
       emoji_regex (>= 15.0)
       kettle-rb (~> 0.1, >= 0.1.2)
       kettle-test (~> 2.0, >= 2.0.4)
@@ -339,6 +350,9 @@ GEM
     public_suffix (7.0.5)
     racc (1.8.1)
     rake (13.4.2)
+    rake-compiler-dock (1.12.0)
+    rb_sys (0.9.127)
+      rake-compiler-dock (= 1.12.0)
     rbs (4.0.3)
       logger
       prism (>= 1.6.0)
@@ -394,10 +408,8 @@ GEM
     toml-rb (4.2.0)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
-    tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux)
-      sorbet-runtime (~> 0.5)
     tsort (0.2.0)
-    turbo_tests2 (3.1.14)
+    turbo_tests2 (3.2.0)
       parallel_tests (>= 3.3.0, < 6)
       rspec (>= 3.10)
       version_gem (~> 1.1, >= 1.1.14)
@@ -451,14 +463,15 @@ DEPENDENCIES
   toml-merge!
   toml-rb (~> 4.1)
   tree_haver!
-  turbo_tests2 (~> 3.1, >= 3.1.14)
+  tree_sitter_language_pack!
+  turbo_tests2 (~> 3.2, ~> 3.1, >= 3.2.0, >= 3.1.14)
   typescript-merge!
   yaml-merge!
   zip-merge!
 
 CHECKSUMS
   addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
-  appraisal2 (3.1.4) sha256=f88c27e600adf4bd5bf06c0ab0afd1de6ce4361497760ce35e86e782036286f4
+  appraisal2 (3.2.0) sha256=ccd0b767ac4060cd7af6d16747459b6990f49c39c7b4fb1f7d1146b1e97c492f
   ast-crispr (7.1.0)
   ast-crispr-markdown-markly (7.1.0)
   ast-crispr-ruby-prism (7.1.0)
@@ -489,7 +502,7 @@ CHECKSUMS
   go-merge (7.1.0)
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   json-merge (7.1.0)
-  kettle-dev (2.3.6) sha256=955b01e8aca46438365332d1b4413f22cb58dabfeab5cba04d71237c53cc70ae
+  kettle-dev (2.3.7) sha256=eb370113cd030d03cbe2d33b31c99858951017e5ad21a17e9ed89dc3770028ee
   kettle-drift (1.0.5) sha256=07094e80140a049164142820bdd327c30fcd855bb00697a0a430600a2b5144a2
   kettle-family (1.0.0) sha256=4c1c158fede8c4e369b6e5576cb540ad38891011cfc7721aea0ade813b13e3c1
   kettle-jem (7.1.0)
@@ -513,6 +526,8 @@ CHECKSUMS
   public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  rake-compiler-dock (1.12.0) sha256=f13205c2738f3d2053afcd03491a9e4541b22a59a0bfc53fc8bc883bd8188023
+  rb_sys (0.9.127) sha256=e9f90df3bb0577472d26d96127d5b5774b98f44de881e7d36aeefd28d6337847
   rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14
   rbs-merge (7.1.0)
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
@@ -545,9 +560,9 @@ CHECKSUMS
   toml-merge (7.1.0)
   toml-rb (4.2.0) sha256=10a48c91613e20cf63483a7a776767dfb3cd7d70e9327c0237443da601e13776
   tree_haver (7.1.0)
-  tree_sitter_language_pack (1.9.0.pre.rc.40-x86_64-linux) sha256=ad6743a373eeac954c1b659b17af3aff1c82918b3ce9c9dc572a7c70ff843cdd
+  tree_sitter_language_pack (1.12.5)
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
-  turbo_tests2 (3.1.14) sha256=cc29d5b36bdbba67a83eee09a9546880d0926edfbbe50d99633fc0b5763ee94c
+  turbo_tests2 (3.2.0) sha256=8b35421548399d1923567b177970f42671c65695b93cdd134d78fbcbab85dff0
   typescript-merge (7.1.0)
   version_gem (1.1.14) sha256=6b7306c7e9416d06067561981ab3444e2cecb844f26cc325ae3c27b44cf85613
   yaml-merge (7.1.0)

README.md

@@ -93,8 +93,8 @@ merge gems.
 | Gem | Provides | Runtime notes |
 | --- | --- | --- |
 | [`psych-merge`][ruby-psych-merge] | YAML provider | Uses Ruby's [Psych][psych] parser and emitter. |
-| [`citrus-toml-merge`][ruby-citrus-toml-merge] | TOML provider | Uses a [Citrus][citrus] grammar and pure-Ruby parser path, commonly paired with [`toml-rb`][toml-rb] style TOML data handling. |
-| [`parslet-toml-merge`][ruby-parslet-toml-merge] | TOML provider | Uses [Parslet][parslet] and pure-Ruby parser path, commonly paired with [`toml`][toml] style TOML data handling. |
+| [`citrus-toml-merge`][ruby-citrus-toml-merge] | TOML provider | Registers a TreeHaver TOML backend backed by a [Citrus][citrus] grammar, commonly paired with [`toml-rb`][toml-rb] style TOML data handling. |
+| [`parslet-toml-merge`][ruby-parslet-toml-merge] | TOML provider | Registers a TreeHaver TOML backend backed by [Parslet][parslet], commonly paired with [`toml`][toml] style TOML data handling. |
 | [`commonmarker-merge`][ruby-commonmarker-merge] | Markdown provider | Uses [CommonMarker][commonmarker] for CommonMark-oriented Markdown parsing. |
 | [`kramdown-merge`][ruby-kramdown-merge] | Markdown provider | Uses [Kramdown][kramdown] for Ruby-native Markdown parsing. |
 | [`markly-merge`][ruby-markly-merge] | Markdown provider | Uses [Markly][markly] for cmark-gfm-backed Markdown parsing and README templating support. |
@@ -118,7 +118,7 @@ tags are capability names, not package preferences.
 | [Psych][psych] | `yaml-merge`, `psych-merge` | Ruby standard YAML parser/emitter path. |
 | [RBS][rbs] | `rbs-merge` | Ruby signature parser path. |
 | [CommonMarker][commonmarker], [Markly][markly], [Kramdown][kramdown] | `markdown-merge` providers | Markdown parser families with different CommonMark/GFM/Ruby-native tradeoffs. |
-| [Citrus][citrus], [Parslet][parslet] | `toml-merge` providers | Pure-Ruby TOML parser families used as provider-specific backend paths. |
+| [Citrus][citrus], [Parslet][parslet] | `toml-merge` providers | Pure-Ruby TOML parser families exposed as provider-specific TreeHaver backend paths. |
 | [Kaitai Struct][kaitai] | `binary-merge` | Schema-oriented binary parsing support for structured binary work. |
 
 #### Backend Platform Compatibility

gems/ast-crispr-markdown-markly/.gitattributes

@@ -1,5 +1,5 @@
 # <<structuredmerge:git-drivers>> do not edit below this line
-*.rb diff=smorg-ruby
+*.rb diff=smorg-rb
 *.go diff=smorg-go
 *.rs diff=smorg-rs
 # <</structuredmerge:git-drivers>>