tree-sitter-batch 0.8.0 → 0.10.1

package/README.md

@@ -6,10 +6,11 @@ Parses `.bat` and `.cmd` files into a concrete syntax tree for syntax highlighti
 
 ## Features
 
-- **Control flow** — `IF`/`ELSE` (EXIST, DEFINED, ERRORLEVEL, comparison with NOT), `FOR` (/D /R /L /F), `GOTO`, `CALL`
-- **Variables** — `SET` (plain, `/A` arithmetic, `/P` prompt), `%VAR%`, `!VAR!`, `%%i`, `%~dp0`, `%VAR:old=new%`
-- **Operators** — pipes `|`, redirects `>` `>>` `2>` `2>&1`, conditional `&&` `||`
-- **Structure** — labels `:name`, comments `REM` `::`, parenthesized blocks, `@ECHO OFF`
+- **Control flow** — `IF`/`ELSE` (EXIST, DEFINED, ERRORLEVEL, comparison with NOT), `FOR` (/D /R /L /F), `GOTO`, `CALL`, `EXIT /B`
+- **Variables** — `SET` (plain, `/A` arithmetic, `/P` prompt), `%VAR%`, `!VAR!`, `%%i`, `%~dp0`, `%VAR:old=new%`, escaped forms `%%VAR%%` `%%%%i`
+- **Echo** — free-form text with literal `(` `)` `!` `%`, inline strings, and variable references
+- **Operators** — pipes `|`, redirects `>` `>>` `2>` `2>&1`, conditional `&&` `||`, separator `&`
+- **Structure** — labels `:name`, comments `REM` `::`, parenthesized blocks, `@ECHO OFF`, macro invocations
 - **Scope** — `SETLOCAL`/`ENDLOCAL` with `ENABLEDELAYEDEXPANSION`
 - **Case-insensitive** — all keywords match regardless of casing
 
@@ -51,20 +52,20 @@ Parsed tree:
   (variable_assignment
     (set_keyword) (variable_name) (assignment_value))
   (variable_assignment
-    (set_keyword) (set_option) (variable_name) (assignment_value))
+    (set_keyword) (arithmetic_assignment (set_option) (arithmetic_expression)))
   (if_stmt
     (string)
     (parenthesized
       (cmd (command_name) (argument_list (argument_value)))))
   (for_stmt
     (for_variable)
-    (for_set)
+    (for_set (for_set_literal))
     (parenthesized
       (cmd (command_name) (argument_list (string) (string)))))
   (if_stmt
     (variable_reference)
     (comparison_op)
-    (integer)
+    (argument_value)
     (parenthesized
       (cmd (command_name) (argument_list (argument_value) (argument_value))))
     (else_clause

package/grammar.js

@@ -1,5 +1,23 @@
 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 varRefChoice = () => choice(
+  seq('%%', /[$@a-zA-Z_][$@a-zA-Z0-9_.#()\[\]]*/, '%%'),
+  seq('%', /[$@a-zA-Z_][$@a-zA-Z0-9_.#()\[\]]*/, '%'),
+  seq('%~', /[a-zA-Z]*/, /[0-9]/),
+  seq('%', /[0-9]/),
+  '%*',
+  seq('%%%%%%', optional('~'), /[a-zA-Z0-9]/),
+  seq('%%%%', optional('~'), /[a-zA-Z0-9]/),
+  seq('%%', optional('~'), /[a-zA-Z]/),
+  seq('%%', /[0-9]/),
+  seq('!', /[$%a-zA-Z_][$a-zA-Z0-9_.#]*/, '!'),
+  seq('%', /[$@a-zA-Z_][$@a-zA-Z0-9_.#()\[\]]*/, ':', /[^%\r\n]+/, '%'),
+  seq('%', /[^%=\s\r\n]/, '%'),
+  seq('!', /[%$a-zA-Z_][%$a-zA-Z0-9_.#()\[\]]*/, /:[^!\r\n]+/, '!'),
+  seq('%', /[<>\/]+[@a-zA-Z_0-9.]*/, '%'),
+  seq('%', /\\[@a-zA-Z_0-9.]+/, '%'),
+  seq('%', /"[^"%\r\n]+"/, '%'),
+);
 const operand = ($) => [
   $.cond_exec, $.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized,
   $.variable_assignment, $.goto_stmt, $.exit_stmt, $.setlocal_stmt, $.endlocal_stmt,
@@ -93,11 +111,11 @@ export default grammar({
     ))),
     if_stmt: ($) => prec.right(8, seq(
       optional('@'), kw('if'),
-      optional(alias(ci('/i'), $.if_option)),
+      optional(alias(token(prec(2, ci('/i'))), $.if_option)),
       optional(kw('not')),
       choice(
-        seq(kw('exist'), choice($.string, $.variable_reference, $.argument_value)),
-        seq(kw('defined'), choice(/[$a-zA-Z_][$a-zA-Z0-9_.]*/, $.string, $.variable_reference)),
+        seq(kw('exist'), $._if_operand),
+        seq(kw('defined'), choice(/[$a-zA-Z_][$a-zA-Z0-9_.]*/, $._if_operand)),
         seq(kw('errorlevel'), $.integer),
         seq(
           $._if_operand,
@@ -122,10 +140,17 @@ export default grammar({
       $.redirect_stmt, $.pipe_stmt, $.comment,
     ),
     _if_operand: ($) => choice(
-      $.string, $.variable_reference, $.integer, $.bracketed_value,
-      alias($._if_word, $.argument_value),
+      $.string, $.bracketed_value, $.paren_expression,
+      prec.right(seq(
+        choice($.variable_reference, alias($._if_word, $.argument_value), $.integer),
+        repeat(choice(
+          alias($._variable_reference_immediate, $.variable_reference),
+          alias($._if_word_rest, $.argument_value),
+        )),
+      )),
     ),
-    _if_word: () => token(prec(-1, /[^=<>\s\[\]"|&()][^=<>\s"|&()]*/)),
+    _if_word: () => token(prec(1, /[^=<>\s\[\]"|&()%!][^=<>\s"|&()%!]*/)),
+    _if_word_rest: () => token.immediate(/[^=<>\s\[\]"|&()%!][^=<>\s"|&()%!]*/),
     comparison_op: () => token(prec(10, choice('==', ci('equ'), ci('neq'), ci('lss'), ci('leq'), ci('gtr'), ci('geq')))),
     goto_stmt: ($) => prec(8, seq(
       optional('@'), kw('goto'),
@@ -202,23 +227,20 @@ export default grammar({
       '&',
       choice(...operand($), $.comment),
     )),
-    variable_reference: () => token(choice(
-      seq('%', /[$@a-zA-Z_][$@a-zA-Z0-9_.#()\[\]]*/, '%'),
-      seq('%~', /[a-zA-Z]*/, /[0-9]/),
-      seq('%', /[0-9]/),
-      '%*',
-      seq('%%', optional('~'), /[a-zA-Z]/),
-      seq('!', /[$%a-zA-Z_][$a-zA-Z0-9_.#]*/, '!'),
-      seq('%', /[$@a-zA-Z_][$@a-zA-Z0-9_.#()\[\]]*/, ':', /[^%\r\n]+/, '%'),
-      seq('%', /[^%=\s\r\n]/, '%'),
-      seq('!', /[%$a-zA-Z_][%$a-zA-Z0-9_.#()\[\]]*/, /:[^!\r\n]+/, '!'),
-      seq('%', /[<>\/]+[@a-zA-Z_0-9.]*/, '%'),
-      seq('%', /\\[@a-zA-Z_0-9.]+/, '%'),
-      seq('%', /"[^"%\r\n]+"/, '%'),
-    )),
+    variable_reference: () => token(varRefChoice()),
+    _variable_reference_immediate: () => token.immediate(varRefChoice()),
     string: () => token(seq('"', /[^"\r\n]*/, '"')),
     bracketed_value: ($) => seq('[', repeat(choice($.variable_reference, alias(token(/[^%!\[\]\r\n]+/), $.bracketed_literal))), ']'),
-    cmd: ($) => prec.right(5, seq(optional('@'), choice($.command_name, $.variable_reference), optional($.argument_list))),
+    cmd: ($) => prec.right(5, choice(
+      seq(optional('@'), alias(kw('echo'), $.command_name), optional(alias($._echo_text, $.argument_list))),
+      seq(optional('@'), choice($.command_name, $.variable_reference), optional($.argument_list)),
+    )),
+    _echo_text: ($) => prec.right(repeat1(choice(
+      $.variable_reference,
+      $.string,
+      alias($._echo_literal, $.argument_value),
+    ))),
+    _echo_literal: () => token(/(?:\^[&|<>^()]|[^\s|&><"\r\n%!()])+|[()!%]/),
     macro_invocation: ($) => prec.right(6, seq($.variable_reference, $.parenthesized, optional($.else_clause))),
     command_name: () => /[$a-zA-Z_][$a-zA-Z0-9_.#-]*/,
     argument_list: ($) => prec.right(repeat1($._arg)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-batch",
-  "version": "0.8.0",
+  "version": "0.10.1",
   "description": "A Windows Batch/CMD grammar for tree-sitter",
   "type": "module",
   "repository": {
@@ -34,12 +34,16 @@
     "node-gyp-build": "^4.8.4"
   },
   "devDependencies": {
-    "eslint": "^9.15.0",
+    "eslint": "^10.2.0",
     "eslint-config-treesitter": "^1.0.2",
+    "globals": "^17.5.0",
     "prebuildify": "^6.0.1",
-    "tree-sitter-cli": "0.24.7",
+    "tree-sitter-cli": "0.26.8",
     "tree-sitter-go-types": "^0.1.0"
   },
+  "overrides": {
+    "eslint-plugin-jsdoc": "^62.9.0"
+  },
   "peerDependencies": {
     "tree-sitter": ">=0.25.0"
   },
@@ -52,7 +56,7 @@
     "install": "node-gyp-build",
     "prestart": "tree-sitter build --wasm",
     "start": "tree-sitter playground",
-    "generate": "tree-sitter generate && tree-sitter-go-types",
+    "generate": "tree-sitter generate --abi 14 && tree-sitter-go-types",
     "lint": "eslint grammar.js",
     "test": "node --test bindings/node/*_test.js"
   }