update to upstream

.envrc

@@ -3,3 +3,4 @@ export PATH="$PWD/javascript/packages/printer/bin:$PATH"
 export PATH="$PWD/javascript/packages/formatter/bin:$PATH"
 export PATH="$PWD/javascript/packages/language-server/bin:$PATH"
 export PATH="$PWD/javascript/packages/highlighter/bin:$PATH"
+export PATH="$PWD/javascript/packages/stimulus-lint/bin:$PATH"

.github/workflows/build-gems.yml

@@ -65,7 +65,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 
-on: [push]
+on: [push, pull_request]
 
 permissions:
   contents: read
@@ -18,7 +18,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies
@@ -57,13 +57,13 @@ jobs:
         run: ./run_herb_tests
 
       - name: clang-format version
-        run: clang-format-19 --version
+        run: clang-format-21 --version
 
       - name: Lint
         run: bin/lint
 
       - name: clang-tidy version
-        run: clang-tidy-19 --version
+        run: clang-tidy-21 --version
 
       - name: Tidy
         run: bin/tidy

.github/workflows/deploy.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies

.github/workflows/javascript.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Add LLVM apt Repo
         run: |-
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-19 main"
+          sudo add-apt-repository "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-21 main"
           sudo apt update
 
       - name: Install APT dependencies

Aptfile

@@ -1,7 +1,7 @@
 check
-clang-19
-clang-format-19
-clang-tidy-19
+clang-21
+clang-format-21
+clang-tidy-21
 emscripten
 doxygen
 xvfb

Brewfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 brew "check"
-brew "llvm@19" # for clang, clang-format and clang-tidy
+brew "llvm@21" # for clang, clang-format and clang-tidy
 brew "emscripten"
 brew "doxygen"

CONTRIBUTING.md

@@ -2,17 +2,17 @@
 
 Pull request, bug reports, and any other forms of contribution are welcomed and highly encouraged.
 
-If you encounter any issues when following along with this file please dont hesitate to reach out and file an issue!
+If you encounter any issues when following along with this file please don't hesitate to reach out and file an issue!
 
 ## Running Locally
 
 ### Requirements
 
 - [**Check**](https://libcheck.github.io/check/): For unit testing.
-- [**Clang 19**](https://clang.llvm.org): The compiler used to build this project.
-- [**Clang Format 19**](https://clang.llvm.org/docs/ClangFormat.html): For formatting the project.
-- [**Clang Tidy 19**](https://clang.llvm.org/extra/clang-tidy/): For linting the project.
-- [**Prism Ruby Parser v1.5.1**](https://github.com/ruby/prism/releases/tag/v1.5.1): We use Prism for Parsing the Ruby Source Code in the HTML+ERB files.
+- [**Clang 21**](https://clang.llvm.org): The compiler used to build this project.
+- [**Clang Format 21**](https://clang.llvm.org/docs/ClangFormat.html): For formatting the project.
+- [**Clang Tidy 21**](https://clang.llvm.org/extra/clang-tidy/): For linting the project.
+- [**Prism Ruby Parser v1.6.0**](https://github.com/ruby/prism/releases/tag/v1.6.0): We use Prism for Parsing the Ruby Source Code in the HTML+ERB files.
 - [**Ruby**](https://www.ruby-lang.org/en/): We need Ruby as a dependency for `bundler`.
 - [**Bundler**](https://bundler.io): We are using `bundler` to build [`prism`](https://github.com/ruby/prism) from source so we can build `herb` against it.
 - [**Emscripten**](https://emscripten.org): For the WebAssembly build of `libherb` so it can be used in the browser using the [`@herb-tools/browser`](https://github.com/marcoroth/herb/blob/main/javascript/packages/browser) package.
@@ -27,7 +27,7 @@ xargs sudo apt-get install < Aptfile
 or:
 
 ```bash
-sudo apt-get install check clang-19 clang-tidy-19 clang-format-19 emscripten doxygen
+sudo apt-get install check clang-21 clang-tidy-21 clang-format-21 emscripten doxygen
 ```
 
 ##### For macOS (using Homebrew)
@@ -38,7 +38,7 @@ brew bundle
 or:
 
 ```bash
-brew install check llvm@19 emscripten doxygen
+brew install check llvm@21 emscripten doxygen
 ```
 
 ### Building
@@ -73,7 +73,6 @@ The `herb` executable exposes a few commands for interacting with `.html.erb` fi
 Herb 🌿 Powerful and seamless HTML-aware ERB parsing and tooling.
 
 ./herb lex [file]      -  Lex a file
-./herb lex_json [file] -  Lex a file and return the result as json.
 ./herb parse [file]    -  Parse a file
 ./herb ruby [file]     -  Extract Ruby from a file
 ./herb html [file]     -  Extract HTML from a file

Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "prism", github: "ruby/prism", tag: "v1.5.1"
+gem "prism", github: "ruby/prism", tag: "v1.6.0"
 
 gem "actionview", "~> 8.0"
 gem "lz_string"

Gemfile.lock

@@ -9,15 +9,15 @@ GIT
 
 GIT
   remote: https://github.com/ruby/prism.git
-  revision: 23f16d31a7c57c4b927e1e3ec8f1281b45e7cb9f
-  tag: v1.5.1
+  revision: 2924f8f8832d57def7895cd7e2cc199ee58b3a3b
+  tag: v1.6.0
   specs:
-    prism (1.5.1)
+    prism (1.6.0)
 
 PATH
   remote: .
   specs:
-    herb (0.7.4)
+    herb (0.7.5)
 
 GEM
   remote: https://rubygems.org/

Makefile

@@ -61,16 +61,16 @@ shared_flags = $(production_flags) $(shared_library_flags) $(prism_flags)
 ifeq ($(os),Linux)
   test_cflags = $(test_flags) -I/usr/include/check
   test_ldflags = -L/usr/lib/x86_64-linux-gnu -lcheck -lm -lsubunit $(prism_ldflags)
-  cc = clang-19
-  clang_format = clang-format-19
-  clang_tidy = clang-tidy-19
+  cc = clang-21
+  clang_format = clang-format-21
+  clang_tidy = clang-tidy-21
 endif
 
 ifeq ($(os),Darwin)
   brew_prefix := $(shell brew --prefix check)
   test_cflags = $(test_flags) -I$(brew_prefix)/include
   test_ldflags = -L$(brew_prefix)/lib -lcheck -lm $(prism_ldflags)
-  llvm_path = $(shell brew --prefix llvm@19)
+  llvm_path = $(shell brew --prefix llvm@21)
   cc = $(llvm_path)/bin/clang
   clang_format = $(llvm_path)/bin/clang-format
   clang_tidy = $(llvm_path)/bin/clang-tidy

bin/leaks_parse

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ -z "$1" ]; then
-  echo "Usage: $0 <file>"
+  echo "Usage: $0 <file_or_directory>"
   exit 1
 fi
 
@@ -10,4 +10,13 @@ if [[ "$(uname)" != "Darwin" ]]; then
   exit 0
 fi
 
-leaks --atExit -- ./herb parse "$1"
+TARGET="$1"
+
+if [ -d "$TARGET" ]; then
+  while IFS= read -r -d '' file; do
+    echo "Checking $file for leaks..."
+    leaks --atExit -- ./herb parse "$file" --silent || exit 1
+  done < <(find "$TARGET" -name "*.html.erb" -type f -print0)
+else
+  leaks --atExit -- ./herb parse "$TARGET" --silent
+fi

bin/publish_packages

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -euo pipefail
+
+echo "Building all packages..."
+yarn nx run-many -t build --all
+
+echo "Running tests in all packages..."
+yarn nx run-many -t test --all
+
+for package_dir in javascript/packages/*; do
+  if [ -d "$package_dir" ] && [ -f "$package_dir/package.json" ]; then
+    package=$(basename "$package_dir")
+
+    if [ "$package" = "vscode" ]; then
+      echo "Skipping vscode package..."
+      continue
+    fi
+
+    echo "Publishing $package..."
+    (cd "$package_dir" && yarn publish)
+  fi
+done
+
+echo "All packages published successfully!"

bin/setup

@@ -2,5 +2,7 @@
 
 set -e  # Exit on error
 
-make prism
-make all
+bundle install
+bundle exec rake templates
+yarn install
+yarn build

config.yml

@@ -34,8 +34,8 @@ errors:
         arguments:
           - token_type_to_string(found->type)
           - token_type_to_string(expected_type)
-          - found->location->start->line
-          - found->location->start->column
+          - found->location.start.line
+          - found->location.start.column
 
       fields:
         - name: expected_type
@@ -49,8 +49,8 @@ errors:
         template: "Found closing tag `</%s>` at (%zu:%zu) without a matching opening tag."
         arguments:
           - closing_tag->value
-          - closing_tag->location->start->line
-          - closing_tag->location->start->column
+          - closing_tag->location.start.line
+          - closing_tag->location.start.column
 
       fields:
         - name: closing_tag
@@ -61,8 +61,8 @@ errors:
         template: "Opening tag `<%s>` at (%zu:%zu) doesn't have a matching closing tag `</%s>`."
         arguments:
           - opening_tag->value
-          - opening_tag->location->start->line
-          - opening_tag->location->start->column
+          - opening_tag->location.start.line
+          - opening_tag->location.start.column
           - opening_tag->value
 
       fields:
@@ -74,11 +74,11 @@ errors:
         template: "Opening tag `<%s>` at (%zu:%zu) closed with `</%s>` at (%zu:%zu)."
         arguments:
           - opening_tag->value
-          - opening_tag->location->start->line
-          - opening_tag->location->start->column
+          - opening_tag->location.start.line
+          - opening_tag->location.start.column
           - closing_tag->value
-          - closing_tag->location->start->line
-          - closing_tag->location->start->column
+          - closing_tag->location.start.line
+          - closing_tag->location.start.column
 
       fields:
         - name: opening_tag
@@ -93,8 +93,8 @@ errors:
         arguments:
           - opening_quote->value
           - closing_quote->value
-          - closing_quote->location->start->line
-          - closing_quote->location->start->column
+          - closing_quote->location.start.line
+          - closing_quote->location.start.column
 
       fields:
         - name: opening_quote
@@ -127,8 +127,8 @@ errors:
         template: "Tag `<%s>` opened at (%zu:%zu) was never closed before the end of document."
         arguments:
           - opening_tag->value
-          - opening_tag->location->start->line
-          - opening_tag->location->start->column
+          - opening_tag->location.start.line
+          - opening_tag->location.start.column
 
       fields:
         - name: opening_tag

docs/.vitepress/theme/components/GitHubContributors.vue

@@ -23,7 +23,10 @@ const error = ref(null)
 
 onMounted(async () => {
   try {
-    contributors.value = contributorsFile.slice(0, props.limit)
+    const excludedUsernames = ['marcoroth', 'dependabot[bot]']
+    const filteredContributors = contributorsFile.filter(contributor => !excludedUsernames.includes(contributor.login))
+    contributors.value = filteredContributors.slice(0, props.limit)
+
     loading.value = false
   } catch (err) {
     error.value = `Failed to load contributors data for ${props.owner}/${props.repo}. Make sure the data file exists.`

docs/.vitepress/transformers/herb-linter-transformer.mts

@@ -21,9 +21,9 @@ function createCustomTwoslashFunction(optionse) {
   return (code, lang, options) => {
     let fileName = undefined
 
-    // kinda of a hack to make sure we pass a `fileName` for the `erb-requires-trailing-newline` rule
+    // kind of a hack to make sure we pass a `fileName` for the `erb-require-trailing-newline` rule
     if (code.includes('▌')) {
-      fileName = "erb-requires-trailing-newline.html.erb"
+      fileName = "erb-require-trailing-newline.html.erb"
     }
 
     if (!lang || !['erb', 'html'].includes(lang)) {

docs/package.json

@@ -19,9 +19,9 @@
     "fetch:contributors": "mkdir -p .vitepress/data/ && gh api -X get https://api.github.com/repos/marcoroth/herb/contributors > .vitepress/data/contributors.json"
   },
   "dependencies": {
-    "@herb-tools/browser": "0.7.4",
-    "@herb-tools/core": "0.7.4",
-    "@herb-tools/node": "0.7.4"
+    "@herb-tools/browser": "0.7.5",
+    "@herb-tools/core": "0.7.5",
+    "@herb-tools/node": "0.7.5"
   },
   "devDependencies": {
     "@shikijs/vitepress-twoslash": "^3.4.2",

examples/block_comment.html.erb

@@ -0,0 +1,7 @@
+<%
+=begin %>
+  This, while unusual, is a legal form of commenting.
+<%
+=end %>
+
+<div>Content</div>

examples/case_in.html.erb

@@ -0,0 +1,6 @@
+<% case {} %>
+<% in {} %>
+  "matched"
+<% else %>
+  "not matched"
+<% end %>

examples/complete_erb.html.erb

@@ -0,0 +1 @@
+<%= hello %>

examples/incomplete_erb.invalid.html.erb

@@ -0,0 +1 @@
+<%= hello

ext/herb/extconf.rb

@@ -15,6 +15,7 @@
 prism_include_path = "#{prism_path}/include"
 
 $VPATH << "$(srcdir)/../../src"
+$VPATH << "$(srcdir)/../../src/util"
 $VPATH << prism_src_path
 $VPATH << "#{prism_src_path}/util"