Merge branch 'main' into fix-erb-trimming

Author: joelhawksley

.clang-format-ignore

@@ -8,5 +8,6 @@ src/errors.c
 src/include/ast_nodes.h
 src/include/ast_pretty_print.h
 src/include/errors.h
+src/include/util/hb_foreach.h
 src/parser_match_tags.c
 src/visitor.c

.rubocop.yml

@@ -58,7 +58,9 @@ Metrics/CyclomaticComplexity:
     - lib/herb/ast/nodes.rb
     - lib/herb/cli.rb
     - lib/herb/engine.rb
+    - lib/herb/prism_inspect.rb
     - lib/herb/engine/**/*.rb
+    - templates/template.rb
 
 Metrics/MethodLength:
   Max: 20
@@ -68,6 +70,7 @@ Metrics/MethodLength:
     - lib/herb/project.rb
     - lib/herb/engine.rb
     - lib/herb/engine/**/*.rb
+    - lib/herb/prism_inspect.rb
     - templates/template.rb
     - test/fork_helper.rb
     - test/snapshot_utils.rb
@@ -83,6 +86,7 @@ Metrics/AbcSize:
     - lib/herb/engine.rb
     - lib/herb/engine/**/*.rb
     - lib/herb/token.rb
+    - lib/herb/prism_inspect.rb
     - templates/template.rb
     - test/fork_helper.rb
     - test/snapshot_utils.rb
@@ -98,6 +102,7 @@ Metrics/ClassLength:
     - lib/herb/engine/**/*.rb
     - lib/herb/project.rb
     - lib/herb/visitor.rb
+    - lib/herb/ast/nodes.rb
     - test/**/*_test.rb
 
 Metrics/ModuleLength:
@@ -121,14 +126,17 @@ Metrics/ParameterLists:
   Exclude:
     - lib/herb/ast/node.rb
     - lib/herb/ast/nodes.rb
-    - lib/herb/errors.rb
     - lib/herb/engine/validators/security_validator.rb
+    - lib/herb/errors.rb
+    - lib/herb/parser_options.rb
+    - lib/herb/prism_inspect.rb
 
 Metrics/PerceivedComplexity:
   Exclude:
     - lib/herb/ast/nodes.rb
     - lib/herb/cli.rb
     - lib/herb/project.rb
+    - lib/herb/prism_inspect.rb
     - lib/herb/engine.rb
     - lib/herb/engine/**/*.rb
     - templates/template.rb

Makefile

@@ -1,8 +1,8 @@
 exec = herb
 test_exec = run_herb_tests
 
-sources = $(wildcard src/*.c) $(wildcard src/**/*.c)
-headers = $(wildcard src/*.h) $(wildcard src/**/*.h)
+sources = $(shell find src -name '*.c')
+headers = $(shell find src -name '*.h')
 objects = $(sources:.c=.o)
 
 extension_sources = $(wildcard ext/**/*.c)

README.md

@@ -4,7 +4,7 @@
 
 <h2 align="center">Herb</h2>
 
-<h4 align="center">The HTML+ERB Toolchain</h4>
+<h4 align="center">The modern HTML+ERB Toolchain</h4>
 
 <div align="center">An ecosystem of powerful and seamless developer tools for HTML+ERB (HTML + Embedded Ruby) templates.</div><br/>
 

config.yml

@@ -369,6 +369,12 @@ nodes:
           type: array
           kind: Node
 
+        - name: prism_context
+          type: prism_context
+
+        - name: prism_node
+          type: prism_node
+
     - name: LiteralNode
       fields:
         - name: content
@@ -426,13 +432,19 @@ nodes:
         - name: tag_name
           type: token
 
+    - name: HTMLVirtualCloseTagNode
+      fields:
+        - name: tag_name
+          type: token
+
     - name: HTMLElementNode
       fields:
         - name: open_tag
           type: node
           kind:
             - HTMLOpenTagNode
             - HTMLConditionalOpenTagNode
+            - ERBOpenTagNode
 
         - name: tag_name
           type: token
@@ -446,6 +458,8 @@ nodes:
           kind:
             - HTMLCloseTagNode
             - HTMLOmittedCloseTagNode
+            - HTMLVirtualCloseTagNode
+            - ERBEndNode
 
         - name: is_void
           type: boolean
@@ -526,6 +540,37 @@ nodes:
           type: node
           kind: HTMLAttributeValueNode
 
+    - name: RubyLiteralNode
+      fields:
+        - name: content
+          type: string
+
+    - name: RubyHTMLAttributesSplatNode
+      fields:
+        - name: content
+          type: string
+
+        - name: prefix
+          type: string
+
+    - name: ERBOpenTagNode
+      fields:
+        - name: tag_opening
+          type: token
+
+        - name: content
+          type: token
+
+        - name: tag_closing
+          type: token
+
+        - name: tag_name
+          type: token
+
+        - name: children
+          type: array
+          kind: Node
+
     - name: HTMLTextNode
       fields:
         - name: content
@@ -604,6 +649,9 @@ nodes:
         - name: valid
           type: boolean
 
+        - name: prism_node
+          type: prism_node
+
     - name: ERBEndNode
       fields:
         - name: tag_opening
@@ -647,6 +695,9 @@ nodes:
         # - name: predicate
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: statements
           type: array
           kind: Node
@@ -678,6 +729,9 @@ nodes:
         # - name: opener
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: body
           type: array
           kind: Node
@@ -726,6 +780,9 @@ nodes:
         # - name: predicate
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: conditions
           type: array
           kind: ERBWhenNode
@@ -756,6 +813,9 @@ nodes:
         # - name: predicate
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: conditions
           type: array
           kind: ERBInNode
@@ -782,6 +842,9 @@ nodes:
         # - name: predicate
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: statements
           type: array
           kind: Node
@@ -804,6 +867,9 @@ nodes:
         # - name: predicate
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: statements
           type: array
           kind: Node
@@ -829,6 +895,9 @@ nodes:
         # - name: collection
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: statements
           type: array
           kind: Node
@@ -889,6 +958,9 @@ nodes:
         - name: tag_closing
           type: token
 
+        - name: prism_node
+          type: prism_node
+
         - name: statements
           type: array
           kind: Node
@@ -926,6 +998,9 @@ nodes:
         # - name: predicate
         #   type: prism_node
 
+        - name: prism_node
+          type: prism_node
+
         - name: statements
           type: array
           kind: Node

docs/.gitignore

@@ -2,4 +2,5 @@ dist/
 cache/
 docs/public/assets
 docs/public/playground-embed.html
+docs/public/playground-prism-embed.html
 .vitepress/data/contributors.json

docs/.vitepress/config/theme.mts

@@ -134,7 +134,13 @@ export function createThemeConfig() {
       { text: "Home", link: "/" },
       { text: "Blog", link: "/blog/whats-new-in-herb-v0-8" },
       { text: "Documentation", link: "/overview" },
-      { text: "Playground", link: "/playground" },
+      {
+        text: "Playground",
+        items: [
+          { text: "Herb Playground", link: "/playground/" },
+          { text: "Prism Playground", link: "/playground/prism" },
+        ],
+      },
     ],
     outline: [2, 4],
     search: {

docs/docs/index.md

@@ -2,11 +2,11 @@
 # https://vitepress.dev/reference/default-theme-home-page
 layout: home
 
-title: "Herb - The HTML+ERB Toolchain"
+title: "Herb - The modern HTML+ERB Toolchain"
 
 hero:
   name: "Herb"
-  text: "The HTML+ERB Toolchain"
+  text: "The modern HTML+ERB Toolchain"
   tagline: "An ecosystem of powerful and seamless developer tools for HTML+ERB templates."
 
   image:

docs/docs/playground.md docs/docs/playground/index.mddocs/docs/playground.md renamed to docs/docs/playground/index.md

@@ -0,0 +1,8 @@
+---
+title: Prism Playground
+layout: page
+sidebar: false
+footer: false
+---
+
+<iframe src="/playground-prism-embed.html" style="width: 100%; height: calc(100vh - var(--vp-nav-height)); border: 0px;"></iframe>