@willbooster/tree-sitter-javascript 1.0.7 → 1.0.9

package/grammar.js

@@ -8,6 +8,46 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#reserved_words
+const RESERVED_WORDS = [
+  'break',
+  'case',
+  'catch',
+  'class',
+  'const',
+  'continue',
+  'debugger',
+  'default',
+  'delete',
+  'do',
+  'else',
+  'export',
+  'extends',
+  'false',
+  'finally',
+  'for',
+  'function',
+  'if',
+  'import',
+  'in',
+  'instanceof',
+  'new',
+  'null',
+  'return',
+  'super',
+  'switch',
+  'this',
+  'throw',
+  'true',
+  'try',
+  'typeof',
+  'var',
+  'void',
+  'while',
+  'with',
+];
+const NAMED_RESERVED_WORDS = new Set(['this', 'super', 'true', 'false', 'null']);
+
 // oxlint-disable-next-line unicorn/prefer-module -- This package is CommonJS, so tree-sitter loads grammar.js as CommonJS.
 module.exports = grammar({
   name: 'javascript',
@@ -34,44 +74,7 @@ module.exports = grammar({
   extras: ($) => [$.comment, $.html_comment, /[\s\p{Zs}\uFEFF\u2028\u2029\u2060\u200B]/u],
 
   reserved: {
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#reserved_words
-    global: () => [
-      'break',
-      'case',
-      'catch',
-      'class',
-      'const',
-      'continue',
-      'debugger',
-      'default',
-      'delete',
-      'do',
-      'else',
-      'export',
-      'extends',
-      'false',
-      'finally',
-      'for',
-      'function',
-      'if',
-      'import',
-      'in',
-      'instanceof',
-      'new',
-      'null',
-      'return',
-      'super',
-      'switch',
-      'this',
-      'throw',
-      'true',
-      'try',
-      'typeof',
-      'var',
-      'void',
-      'while',
-      'with',
-    ],
+    global: () => RESERVED_WORDS,
     properties: () => [],
   },
 
@@ -129,6 +132,7 @@ module.exports = grammar({
   ],
 
   conflicts: ($) => [
+    [$._local_export_specifier, $._module_export_name],
     [$.primary_expression, $._property_name],
     [$.primary_expression, $.await_expression],
     [$.primary_expression, $.await_expression, $._property_name],
@@ -167,7 +171,7 @@ module.exports = grammar({
             seq('*', $._from_clause),
             seq($.namespace_export, $._from_clause),
             seq($.export_clause, $._from_clause),
-            $.export_clause
+            alias($._local_export_clause, $.export_clause)
           ),
           $._semicolon
         ),
@@ -188,7 +192,22 @@ module.exports = grammar({
     export_specifier: ($) =>
       seq(field('name', $._module_export_name), optional(seq('as', field('alias', $._module_export_name)))),
 
-    _module_export_name: ($) => choice($.identifier, $.string, 'default'),
+    // Without a `from` clause, each name refers to a local binding, which cannot be a reserved word.
+    _local_export_clause: ($) =>
+      seq('{', commaSep(alias($._local_export_specifier, $.export_specifier)), optional(','), '}'),
+
+    _local_export_specifier: ($) =>
+      seq(field('name', choice($.identifier, $.string)), optional(seq('as', field('alias', $._module_export_name)))),
+
+    // Reserved words are listed as keywords rather than allowed through the property word set, because the word set
+    // would also apply to the local bindings that share these positions until `as` or `from` (e.g. `import { if }`).
+    _module_export_name: ($) =>
+      choice(
+        $.identifier,
+        $.string,
+        // `this`, `super`, `true`, `false`, and `null` are named rules, and a bare string would make them non-terminals.
+        alias(choice(...RESERVED_WORDS.map((word) => (NAMED_RESERVED_WORDS.has(word) ? $[word] : word))), $.identifier)
+      ),
 
     declaration: ($) =>
       choice(
@@ -273,7 +292,14 @@ module.exports = grammar({
       seq(field('kind', choice('let', 'const')), commaSep1($.variable_declarator), $._semicolon),
 
     using_declaration: ($) =>
-      seq(field('kind', choice('using', seq('await', 'using'))), commaSep1($.variable_declarator), $._semicolon),
+      seq(
+        field('kind', choice('using', seq('await', 'using'))),
+        commaSep1(alias($._using_declarator, $.variable_declarator)),
+        $._semicolon
+      ),
+
+    _using_declarator: ($) =>
+      seq(field('name', choice($.identifier, alias('of', $.identifier))), optional($._initializer)),
 
     variable_declarator: ($) =>
       seq(
@@ -301,31 +327,46 @@ module.exports = grammar({
       seq(
         'for',
         '(',
-        choice(
-          field(
-            'initializer',
-            choice(
-              alias($.for_lexical_declaration, $.lexical_declaration),
-              alias($.for_variable_declaration, $.variable_declaration)
-            )
-          ),
-          seq(field('initializer', $._expressions), ';'),
-          field('initializer', $.empty_statement)
-        ),
-        field('condition', choice(seq($._expressions, ';'), $.empty_statement)),
+        $._for_initializer,
+        $._for_condition,
         field('increment', optional($._expressions)),
         ')',
         field('body', $.statement)
       ),
 
+    // Extracted into rules because tree-sitter expands a `choice` written inline in the `seq` above into one production
+    // per alternative, each repeating the parse states of the rest of the header (about 30 KB of Wasm). They are hidden
+    // so that `initializer` and `condition` stay fields of `for_statement` and no node type is added.
+    _for_initializer: ($) =>
+      choice(
+        field(
+          'initializer',
+          choice(
+            alias($.for_lexical_declaration, $.lexical_declaration),
+            alias($.for_variable_declaration, $.variable_declaration),
+            alias($._for_using_declaration, $.using_declaration)
+          )
+        ),
+        seq(field('initializer', $._expressions), ';'),
+        field('initializer', $.empty_statement)
+      ),
+
+    _for_condition: ($) => field('condition', choice(seq($._expressions, ';'), $.empty_statement)),
+
     // ECMAScript inserts no semicolon inside a for header, so these declarations end only with `;`. Accepting an
     // automatic semicolon there made `for (let x\n of y)` ambiguous until `of`, and an incremental reparse could
-    // reuse a declaration built when that ambiguity was resolved differently. The rules are visible and only used
-    // through aliases: a hidden rule would make `for_statement` inherit their `kind` field.
+    // reuse a declaration built when that ambiguity was resolved differently.
     for_lexical_declaration: ($) => seq(field('kind', choice('let', 'const')), commaSep1($.variable_declarator), ';'),
 
     for_variable_declaration: ($) => seq('var', commaSep1($.variable_declarator), ';'),
 
+    _for_using_declaration: ($) =>
+      seq(
+        field('kind', choice('using', seq('await', 'using'))),
+        commaSep1(alias($._using_declarator, $.variable_declarator)),
+        ';'
+      ),
+
     for_in_statement: ($) => seq('for', optional('await'), $._for_header, field('body', $.statement)),
 
     _for_header: ($) =>
@@ -344,7 +385,7 @@ module.exports = grammar({
           ),
           seq(
             field('kind', choice('using', seq('await', 'using'))),
-            field('left', choice($.identifier, alias('of', $.identifier), $._destructuring_pattern))
+            field('left', choice($.identifier, alias('of', $.identifier)))
           )
         ),
         field('operator', choice('in', 'of')),
@@ -547,15 +588,18 @@ module.exports = grammar({
 
     jsx_identifier: () => /[a-zA-Z_$][a-zA-Z\d_$]*-[a-zA-Z\d_$-]*/,
 
-    _jsx_identifier: ($) => choice(alias($.jsx_identifier, $.identifier), $.identifier),
+    _jsx_identifier: ($) => choice(alias($.jsx_identifier, $.identifier), reserved('properties', $.identifier)),
 
     nested_identifier: ($) =>
       prec(
         'member',
         seq(
-          field('object', choice($.identifier, alias($.nested_identifier, $.member_expression))),
+          field(
+            'object',
+            choice(reserved('properties', $.identifier), alias($.nested_identifier, $.member_expression))
+          ),
           '.',
-          field('property', alias($.identifier, $.property_identifier))
+          field('property', alias(reserved('properties', $.identifier), $.property_identifier))
         )
       ),
 
@@ -1130,7 +1174,7 @@ module.exports = grammar({
 
     computed_property_name: ($) => seq('[', $.expression, ']'),
 
-    _reserved_identifier: () => choice('get', 'set', 'async', 'await', 'static', 'export', 'let'),
+    _reserved_identifier: () => choice('get', 'set', 'async', 'await', 'static', 'export', 'let', 'using'),
 
     _semicolon: ($) => choice($._automatic_semicolon, ';'),
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-javascript",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "JavaScript grammar for tree-sitter",
   "keywords": [
     "incremental",

package/queries/highlights.scm

@@ -202,3 +202,17 @@
   "with"
   "yield"
 ] @keyword
+
+; `default` as a module export name is an identifier node.
+(export_specifier
+  name: (identifier) @keyword
+  (#eq? @keyword "default"))
+(export_specifier
+  alias: (identifier) @keyword
+  (#eq? @keyword "default"))
+(import_specifier
+  name: (identifier) @keyword
+  (#eq? @keyword "default"))
+(namespace_export
+  (identifier) @keyword
+  (#eq? @keyword "default"))

package/src/node-types.json

@@ -1094,10 +1094,6 @@
         "multiple": false,
         "required": false,
         "types": [
-          {
-            "type": "default",
-            "named": false
-          },
           {
             "type": "identifier",
             "named": true
@@ -1112,10 +1108,6 @@
         "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "default",
-            "named": false
-          },
           {
             "type": "identifier",
             "named": true
@@ -1459,6 +1451,10 @@
             "type": "sequence_expression",
             "named": true
           },
+          {
+            "type": "using_declaration",
+            "named": true
+          },
           {
             "type": "variable_declaration",
             "named": true
@@ -1727,10 +1723,6 @@
         "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "default",
-            "named": false
-          },
           {
             "type": "identifier",
             "named": true
@@ -2186,7 +2178,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",

package/tree-sitter.json

@@ -16,7 +16,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.7",
+    "version": "1.0.9",
     "license": "MIT",
     "description": "JavaScript grammar for tree-sitter",
     "authors": [