Fix: allow reserved words as property identifiers after optional chaining

.github/workflows/ci.yml

@@ -43,6 +43,7 @@ jobs:
         with:
           test-rust: true
           test-node: true
+          node-version: 22
           test-python: true
           test-go: true
           test-swift: true

grammar.js

@@ -8,6 +8,20 @@
 /// <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 CONTEXTUAL_KEYWORDS = [
+  'get', 'set', 'async', 'await', 'static', 'export', 'let',
+];
+
 module.exports = grammar({
   name: 'javascript',
 
@@ -31,44 +45,7 @@ module.exports = grammar({
   ],
 
   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: $ => [],
   },
 
@@ -95,6 +72,7 @@ module.exports = grammar({
     $._jsx_attribute_value,
     $._jsx_identifier,
     $._lhs_expression,
+    $._keyword_identifier,
   ],
 
   precedences: $ => [
@@ -886,7 +864,10 @@ module.exports = grammar({
       choice('.', field('optional_chain', $.optional_chain)),
       field('property', choice(
         $.private_property_identifier,
-        reserved('properties', alias($.identifier, $.property_identifier)),
+        reserved('properties', alias(
+          choice($.identifier, $._keyword_identifier),
+          $.property_identifier,
+        )),
       )),
     )),
 
@@ -1287,15 +1268,9 @@ module.exports = grammar({
       ']',
     ),
 
-    _reserved_identifier: _ => choice(
-      'get',
-      'set',
-      'async',
-      'await',
-      'static',
-      'export',
-      'let',
-    ),
+    _reserved_identifier: _ => choice(...CONTEXTUAL_KEYWORDS),
+
+    _keyword_identifier: _ => choice(...RESERVED_WORDS, ...CONTEXTUAL_KEYWORDS),
 
     _semicolon: $ => choice($._automatic_semicolon, ';'),
   },