@marko/tree-sitter 0.2.0 → 0.3.0

package/README.md

@@ -40,9 +40,9 @@ parser.setLanguage(Marko);
 Building from a checkout:
 
 ```sh
-npm install
-npm run build        # tree-sitter generate && node-gyp rebuild
-npm run build:wasm   # tree-sitter-marko.wasm (the CLI fetches wasi-sdk itself)
+pnpm install
+pnpm run build        # tree-sitter generate && node-gyp rebuild
+pnpm run build:wasm   # tree-sitter-marko.wasm (the CLI fetches wasi-sdk itself)
 ```
 
 For editors, the grammar ships ready-to-use queries: `queries/highlights.scm`
@@ -61,9 +61,9 @@ in the host tool like any other language.
 From this directory:
 
 ```sh
-npx tree-sitter playground            # interactive tree in the browser
-npx tree-sitter parse file.marko      # print the syntax tree
-npx tree-sitter highlight file.marko  # ANSI highlighting (--html for a page)
+pnpm exec tree-sitter playground            # interactive tree in the browser
+pnpm exec tree-sitter parse file.marko      # print the syntax tree
+pnpm exec tree-sitter highlight file.marko  # ANSI highlighting (--html for a page)
 ```
 
 `highlight` resolves the injected languages through the CLI config: run
@@ -82,7 +82,7 @@ and start treesitter for the filetype:
 ```sh
 # from this directory
 mkdir -p ~/.local/share/nvim/site/parser ~/.local/share/nvim/site/queries
-npx tree-sitter build -o ~/.local/share/nvim/site/parser/marko.so
+pnpm exec tree-sitter build -o ~/.local/share/nvim/site/parser/marko.so
 cp -R queries ~/.local/share/nvim/site/queries/marko
 ```
 
@@ -262,7 +262,7 @@ split without lookahead the scanner doesn't have.
 
 Marko's parser is [htmljs-parser](https://github.com/marko-js/htmljs-parser);
 this grammar's external scanner reimplements its state machine, and the test
-suite (`npm test`, Node 22) asserts the tree reproduces the parser's event
+suite (`pnpm test`, Node 22) asserts the tree reproduces the parser's event
 stream with byte-precise ranges across the parser's full fixture suite, plus
 thousands of templates from the Marko ecosystem during development.
 

package/grammar.js

@@ -70,6 +70,7 @@ module.exports = grammar({
     $._types_close, // ">"
     $._attr_group_open, // "[" (concise mode)
     $._attr_group_close, // "]"
+    $.attr_method_async, // "async" before a shorthand method
     $.attr_name,
     $.attr_eq, // "="
     $.attr_bound_eq, // ":="
@@ -151,6 +152,7 @@ module.exports = grammar({
         $.type_args,
         $.type_params,
         $.attr_group,
+        $.attr_method_async,
         $.attr_name,
         $.attr_value,
         $.attr_bound_value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/tree-sitter",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Tree-sitter grammar for the Marko templating language",
   "keywords": [
     "incremental",
@@ -44,7 +44,7 @@
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.11.16",
     "degit": "^2.8.4",
-    "htmljs-parser": "^5.10.2",
+    "htmljs-parser": "^5.14.0",
     "mocha": "^10.2.0",
     "node-gyp": "^11.0.0",
     "prebuildify": "^6.0.1",
@@ -61,6 +61,15 @@
       "optional": true
     }
   },
+  "tree-sitter": [
+    {
+      "scope": "source.marko",
+      "file-types": [
+        "marko"
+      ],
+      "injection-regex": "^marko$"
+    }
+  ],
   "scripts": {
     "build": "tree-sitter generate && node-gyp rebuild",
     "change": "changeset add",
@@ -72,15 +81,6 @@
     "prebuild": "prebuildify --napi --strip",
     "build:wasm": "tree-sitter build --wasm -o tree-sitter-marko.wasm",
     "test:wasm": "tsx tools/check-wasm.mts",
-    "version": "changeset version && node tools/sync-tree-sitter-version.mjs && npm install --package-lock-only"
-  },
-  "tree-sitter": [
-    {
-      "scope": "source.marko",
-      "file-types": [
-        "marko"
-      ],
-      "injection-regex": "^marko$"
-    }
-  ]
-}
+    "version": "changeset version && node tools/sync-tree-sitter-version.mjs && pnpm install --lockfile-only"
+  }
+}

package/src/grammar.json

@@ -278,6 +278,10 @@
           "type": "SYMBOL",
           "name": "attr_group"
         },
+        {
+          "type": "SYMBOL",
+          "name": "attr_method_async"
+        },
         {
           "type": "SYMBOL",
           "name": "attr_name"
@@ -994,6 +998,10 @@
       "type": "SYMBOL",
       "name": "_attr_group_close"
     },
+    {
+      "type": "SYMBOL",
+      "name": "attr_method_async"
+    },
     {
       "type": "SYMBOL",
       "name": "attr_name"

package/src/node-types.json

@@ -69,6 +69,10 @@
           "type": "attr_group_open",
           "named": true
         },
+        {
+          "type": "attr_method_async",
+          "named": true
+        },
         {
           "type": "attr_name",
           "named": true
@@ -241,6 +245,10 @@
           "type": "attr_group",
           "named": true
         },
+        {
+          "type": "attr_method_async",
+          "named": true
+        },
         {
           "type": "attr_name",
           "named": true
@@ -749,6 +757,10 @@
     "type": "attr_group_open",
     "named": true
   },
+  {
+    "type": "attr_method_async",
+    "named": true
+  },
   {
     "type": "attr_name",
     "named": true