tree-sitter-batch 0.4.2 → 0.6.0

package/README.md

@@ -100,6 +100,17 @@ pip install tree-sitter-batch
 import tree_sitter_batch "github.com/wharflab/tree-sitter-batch/bindings/go"
 ```
 
+The root package also exports the bundled `queries/highlights.scm` via `go:embed`:
+
+```go
+import batch "github.com/wharflab/tree-sitter-batch"
+
+lang := batch.GetLanguage()
+query, _ := batch.GetHighlightsQuery()
+// or access the raw .scm source:
+// raw := batch.HighlightsQuery
+```
+
 ## Usage
 
 ### Node.js

package/grammar.js

@@ -1,6 +1,6 @@
 const ci = (word) => new RegExp(word.split('').map((c) => /[a-zA-Z]/.test(c) ? `[${c.toLowerCase()}${c.toUpperCase()}]` : c).join(''));
 const kw = (word) => token(prec(10, ci(word)));
-const operand = ($) => [$.cond_exec, $.pipe_stmt, $.cmd, $.parenthesized];
+const operand = ($) => [$.cond_exec, $.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized];
 
 export default grammar({
   name: 'batch',
@@ -83,21 +83,23 @@ export default grammar({
       kw('in'), '(', optional($.for_set), ')', kw('do'),
       choice($.parenthesized, $.cmd),
     )),
-    for_options: () => token(prec(10, choice(ci('/d'), seq(ci('/r'), optional(seq(/[ \t]+/, /[^\s]+/))), ci('/l'), seq(ci('/f'), optional(seq(/[ \t]+/, '"', /[^"]*/, '"')))))),
+    for_options: () => token(prec(10, choice(ci('/d'), seq(ci('/r'), optional(seq(/[ \t]+/, /(%[^\s%]|[^\s%])+%?/))), ci('/l'), seq(ci('/f'), optional(seq(/[ \t]+/, '"', /[^"]*/, '"')))))),
     for_variable: () => token(seq('%%', optional('~'), /[a-zA-Z]/)),
     for_set: () => /[^)\r\n]+/,
     parenthesized: ($) => seq('(', repeat(choice(seq($._stmt, /\r?\n/), /\r?\n/)), optional($._stmt), ')'),
-    redirect_stmt: ($) => prec.right(4, seq(choice($.cmd, $.parenthesized), $.redirection)),
-    redirection: ($) => prec.right(seq(
-      optional(/[0-2]/), $.redirect_op, $.redirect_target,
-      optional(seq(optional(/[0-2]/), $.redirect_op, $.redirect_target)),
-    )),
-    redirect_op: () => token(choice('2>&1', '>&1', '2>>', '2>', '>>', '>', '<')),
+    redirect_stmt: ($) => prec.right(4, seq(choice($.call_stmt, $.cmd, $.parenthesized), $.redirection)),
+    redirection: ($) => {
+      const file_redir = seq(optional(/[0-2]/), $.redirect_op, $.redirect_target);
+      const one_redir = choice(file_redir, $.fd_redirect);
+      return prec.right(repeat1(one_redir));
+    },
+    fd_redirect: () => token(choice('2>&1', '>&1')),
+    redirect_op: () => token(choice('2>>', '2>', '>>', '>', '<')),
     redirect_target: () => token(choice(ci('nul'), ci('con'), /[^\s|&><\r\n]+/)),
-    pipe_stmt: ($) => prec.left(3, seq(choice($.cmd, $.parenthesized), '|', choice($.cmd, $.parenthesized))),
+    pipe_stmt: ($) => prec.left(3, seq(choice($.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized), '|', choice($.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized))),
     cond_exec: ($) => choice(
-      prec.left(1, seq(choice(...operand($)), '&&', choice($.cmd, $.parenthesized))),
-      prec.left(1, seq(choice(...operand($)), '||', choice($.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '&&', choice($.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '||', choice($.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized))),
     ),
     command_sep: ($) => prec.left(0, seq(
       choice($.command_sep, ...operand($)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-batch",
-  "version": "0.4.2",
+  "version": "0.6.0",
   "description": "A Windows Batch/CMD grammar for tree-sitter",
   "type": "module",
   "repository": {
@@ -37,7 +37,8 @@
     "eslint": "^9.15.0",
     "eslint-config-treesitter": "^1.0.2",
     "prebuildify": "^6.0.1",
-    "tree-sitter-cli": "0.24.7"
+    "tree-sitter-cli": "0.24.7",
+    "tree-sitter-go-types": "^0.1.0"
   },
   "peerDependencies": {
     "tree-sitter": ">=0.25.0"
@@ -51,6 +52,7 @@
     "install": "node-gyp-build",
     "prestart": "tree-sitter build --wasm",
     "start": "tree-sitter playground",
+    "generate": "tree-sitter generate && tree-sitter-go-types",
     "lint": "eslint grammar.js",
     "test": "node --test bindings/node/*_test.js"
   }

package/queries/highlights.scm

@@ -25,10 +25,15 @@
 ; Operators
 (comparison_op) @operator
 (redirect_op) @operator
+(fd_redirect) @operator
 
 ; Commands
 (command_name) @function
 
+; CMD pseudo/dynamic environment variables
+((variable_reference) @variable.builtin
+  (#match? @variable.builtin "(?i)^[%!](CD|ERRORLEVEL|DATE|TIME|RANDOM|CMDCMDLINE|CMDEXTVERSION|HIGHESTNUMANODENUMBER|__APPDIR__|__CD__)[%!]$"))
+
 ; Variables
 (variable_reference) @variable
 

package/src/grammar.json

@@ -1141,7 +1141,7 @@
                         },
                         {
                           "type": "PATTERN",
-                          "value": "[^\\s]+"
+                          "value": "(%[^\\s%]|[^\\s%])+%?"
                         }
                       ]
                     },
@@ -1289,6 +1289,10 @@
           {
             "type": "CHOICE",
             "members": [
+              {
+                "type": "SYMBOL",
+                "name": "call_stmt"
+              },
               {
                 "type": "SYMBOL",
                 "name": "cmd"
@@ -1310,65 +1314,44 @@
       "type": "PREC_RIGHT",
       "value": 0,
       "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "PATTERN",
-                "value": "[0-2]"
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          },
-          {
-            "type": "SYMBOL",
-            "name": "redirect_op"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "redirect_target"
-          },
-          {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SEQ",
-                "members": [
-                  {
-                    "type": "CHOICE",
-                    "members": [
-                      {
-                        "type": "PATTERN",
-                        "value": "[0-2]"
-                      },
-                      {
-                        "type": "BLANK"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "redirect_op"
-                  },
-                  {
-                    "type": "SYMBOL",
-                    "name": "redirect_target"
-                  }
-                ]
-              },
-              {
-                "type": "BLANK"
-              }
-            ]
-          }
-        ]
+        "type": "REPEAT1",
+        "content": {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "PATTERN",
+                      "value": "[0-2]"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "redirect_op"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "redirect_target"
+                }
+              ]
+            },
+            {
+              "type": "SYMBOL",
+              "name": "fd_redirect"
+            }
+          ]
+        }
       }
     },
-    "redirect_op": {
+    "fd_redirect": {
       "type": "TOKEN",
       "content": {
         "type": "CHOICE",
@@ -1380,7 +1363,15 @@
           {
             "type": "STRING",
             "value": ">&1"
-          },
+          }
+        ]
+      }
+    },
+    "redirect_op": {
+      "type": "TOKEN",
+      "content": {
+        "type": "CHOICE",
+        "members": [
           {
             "type": "STRING",
             "value": "2>>"
@@ -1433,6 +1424,18 @@
           {
             "type": "CHOICE",
             "members": [
+              {
+                "type": "SYMBOL",
+                "name": "pipe_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "redirect_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "call_stmt"
+              },
               {
                 "type": "SYMBOL",
                 "name": "cmd"
@@ -1450,6 +1453,14 @@
           {
             "type": "CHOICE",
             "members": [
+              {
+                "type": "SYMBOL",
+                "name": "redirect_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "call_stmt"
+              },
               {
                 "type": "SYMBOL",
                 "name": "cmd"
@@ -1483,6 +1494,14 @@
                     "type": "SYMBOL",
                     "name": "pipe_stmt"
                   },
+                  {
+                    "type": "SYMBOL",
+                    "name": "redirect_stmt"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "call_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1500,6 +1519,18 @@
               {
                 "type": "CHOICE",
                 "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "pipe_stmt"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "redirect_stmt"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "call_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1530,6 +1561,14 @@
                     "type": "SYMBOL",
                     "name": "pipe_stmt"
                   },
+                  {
+                    "type": "SYMBOL",
+                    "name": "redirect_stmt"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "call_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1547,6 +1586,18 @@
               {
                 "type": "CHOICE",
                 "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "pipe_stmt"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "redirect_stmt"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "call_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1583,6 +1634,14 @@
                 "type": "SYMBOL",
                 "name": "pipe_stmt"
               },
+              {
+                "type": "SYMBOL",
+                "name": "redirect_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "call_stmt"
+              },
               {
                 "type": "SYMBOL",
                 "name": "cmd"
@@ -1608,6 +1667,14 @@
                 "type": "SYMBOL",
                 "name": "pipe_stmt"
               },
+              {
+                "type": "SYMBOL",
+                "name": "redirect_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "call_stmt"
+              },
               {
                 "type": "SYMBOL",
                 "name": "cmd"
@@ -1895,5 +1962,6 @@
   "precedences": [],
   "externals": [],
   "inline": [],
-  "supertypes": []
-}
+  "supertypes": [],
+  "reserved": {}
+}

package/src/node-types.json

@@ -76,6 +76,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "call_stmt",
+          "named": true
+        },
         {
           "type": "cmd",
           "named": true
@@ -95,6 +99,10 @@
         {
           "type": "pipe_stmt",
           "named": true
+        },
+        {
+          "type": "redirect_stmt",
+          "named": true
         }
       ]
     }
@@ -107,6 +115,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "call_stmt",
+          "named": true
+        },
         {
           "type": "cmd",
           "named": true
@@ -122,6 +134,10 @@
         {
           "type": "pipe_stmt",
           "named": true
+        },
+        {
+          "type": "redirect_stmt",
+          "named": true
         }
       ]
     }
@@ -372,6 +388,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "call_stmt",
+          "named": true
+        },
         {
           "type": "cmd",
           "named": true
@@ -379,6 +399,14 @@
         {
           "type": "parenthesized",
           "named": true
+        },
+        {
+          "type": "pipe_stmt",
+          "named": true
+        },
+        {
+          "type": "redirect_stmt",
+          "named": true
         }
       ]
     }
@@ -471,6 +499,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "call_stmt",
+          "named": true
+        },
         {
           "type": "cmd",
           "named": true
@@ -494,6 +526,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "fd_redirect",
+          "named": true
+        },
         {
           "type": "redirect_op",
           "named": true
@@ -589,6 +625,10 @@
     "type": "comparison_op",
     "named": true
   },
+  {
+    "type": "fd_redirect",
+    "named": true
+  },
   {
     "type": "for_options",
     "named": true