tree-sitter-batch 0.4.1 → 0.5.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,5 +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];
 
 export default grammar({
   name: 'batch',
@@ -11,7 +12,7 @@ export default grammar({
       $.echo_off, $.comment, $.label, $.variable_assignment,
       $.if_stmt, $.goto_stmt, $.call_stmt, $.exit_stmt,
       $.setlocal_stmt, $.endlocal_stmt, $.for_stmt,
-      $.redirect_stmt, $.pipe_stmt, $.cond_exec,
+      $.redirect_stmt, $.pipe_stmt, $.cond_exec, $.command_sep,
       $.parenthesized, $.cmd,
     ),
     echo_off: () => prec(10, seq('@', kw('echo'), choice(kw('off'), kw('on')))),
@@ -95,9 +96,14 @@ export default grammar({
     redirect_target: () => token(choice(ci('nul'), ci('con'), /[^\s|&><\r\n]+/)),
     pipe_stmt: ($) => prec.left(3, seq(choice($.cmd, $.parenthesized), '|', choice($.cmd, $.parenthesized))),
     cond_exec: ($) => choice(
-      prec.left(1, seq(choice($.cond_exec, $.cmd, $.parenthesized), '&&', choice($.cmd, $.parenthesized))),
-      prec.left(1, seq(choice($.cond_exec, $.cmd, $.parenthesized), '||', choice($.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '&&', choice($.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '||', choice($.cmd, $.parenthesized))),
     ),
+    command_sep: ($) => prec.left(0, seq(
+      choice($.command_sep, ...operand($)),
+      '&',
+      choice(...operand($)),
+    )),
     variable_reference: () => token(choice(
       seq('%', /[a-zA-Z_][a-zA-Z0-9_]*/, '%'),
       seq('%~', /[a-zA-Z]*/, /[0-9]/),
@@ -113,7 +119,7 @@ export default grammar({
     _arg: ($) => choice($.string, $.variable_reference, $.command_option, $.paren_expression, $.argument_value),
     command_option: () => token(seq('/', /[a-zA-Z_?][a-zA-Z0-9_:]*/)),
     paren_expression: ($) => seq('(', repeat($._arg), ')'),
-    argument_value: () => /[^\s|&><"\r\n%!()][^\s|&><"\r\n()]*/,
+    argument_value: () => /(?:\^[&|<>^()]|[^\s|&><"\r\n%!()])(?:\^[&|<>^()]|[^\s|&><"\r\n()])*/,
     integer: () => /[0-9]+/,
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-batch",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "A Windows Batch/CMD grammar for tree-sitter",
   "type": "module",
   "repository": {

package/queries/highlights.scm

@@ -29,6 +29,10 @@
 ; 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

@@ -87,6 +87,10 @@
           "type": "SYMBOL",
           "name": "cond_exec"
         },
+        {
+          "type": "SYMBOL",
+          "name": "command_sep"
+        },
         {
           "type": "SYMBOL",
           "name": "parenthesized"
@@ -1475,6 +1479,10 @@
                     "type": "SYMBOL",
                     "name": "cond_exec"
                   },
+                  {
+                    "type": "SYMBOL",
+                    "name": "pipe_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1518,6 +1526,10 @@
                     "type": "SYMBOL",
                     "name": "cond_exec"
                   },
+                  {
+                    "type": "SYMBOL",
+                    "name": "pipe_stmt"
+                  },
                   {
                     "type": "SYMBOL",
                     "name": "cmd"
@@ -1550,6 +1562,65 @@
         }
       ]
     },
+    "command_sep": {
+      "type": "PREC_LEFT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "command_sep"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "cond_exec"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "pipe_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "cmd"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "parenthesized"
+              }
+            ]
+          },
+          {
+            "type": "STRING",
+            "value": "&"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "cond_exec"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "pipe_stmt"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "cmd"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "parenthesized"
+              }
+            ]
+          }
+        ]
+      }
+    },
     "variable_reference": {
       "type": "TOKEN",
       "content": {
@@ -1807,7 +1878,7 @@
     },
     "argument_value": {
       "type": "PATTERN",
-      "value": "[^\\s|&><\"\\r\\n%!()][^\\s|&><\"\\r\\n()]*"
+      "value": "(?:\\^[&|<>^()]|[^\\s|&><\"\\r\\n%!()])(?:\\^[&|<>^()]|[^\\s|&><\"\\r\\n()])*"
     },
     "integer": {
       "type": "PATTERN",

package/src/node-types.json

@@ -68,6 +68,37 @@
       ]
     }
   },
+  {
+    "type": "command_sep",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "cmd",
+          "named": true
+        },
+        {
+          "type": "command_sep",
+          "named": true
+        },
+        {
+          "type": "cond_exec",
+          "named": true
+        },
+        {
+          "type": "parenthesized",
+          "named": true
+        },
+        {
+          "type": "pipe_stmt",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "cond_exec",
     "named": true,
@@ -87,6 +118,10 @@
         {
           "type": "parenthesized",
           "named": true
+        },
+        {
+          "type": "pipe_stmt",
+          "named": true
         }
       ]
     }
@@ -266,6 +301,10 @@
           "type": "cmd",
           "named": true
         },
+        {
+          "type": "command_sep",
+          "named": true
+        },
         {
           "type": "comment",
           "named": true
@@ -361,6 +400,10 @@
           "type": "cmd",
           "named": true
         },
+        {
+          "type": "command_sep",
+          "named": true
+        },
         {
           "type": "comment",
           "named": true
@@ -498,6 +541,10 @@
     "type": "\"",
     "named": false
   },
+  {
+    "type": "&",
+    "named": false
+  },
   {
     "type": "&&",
     "named": false