@willbooster/tree-sitter-javascript 1.0.6 → 1.0.8

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],
@@ -153,7 +157,7 @@ module.exports = grammar({
   rules: {
     program: ($) => seq(optional($.hash_bang_line), repeat($.statement)),
 
-    hash_bang_line: () => /#!.*/,
+    hash_bang_line: () => /#![^\n\r\u2028\u2029]*/,
 
     //
     // Export declarations
@@ -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(
@@ -547,15 +566,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))
         )
       ),
 
@@ -905,17 +927,7 @@ module.exports = grammar({
 
     escape_sequence: () =>
       token.immediate(
-        seq(
-          '\\',
-          choice(
-            /[^xu0-7]/,
-            /[0-7]{1,3}/,
-            /x[0-9a-fA-F]{2}/,
-            /u[0-9a-fA-F]{4}/,
-            /u\{[0-9a-fA-F]+\}/,
-            /[\r?][\n\u2028\u2029]/
-          )
-        )
+        seq('\\', choice(/[^xu0-7]/, /[0-7]{1,3}/, /x[0-9a-fA-F]{2}/, /u[0-9a-fA-F]{4}/, /u\{[0-9a-fA-F]+\}/, /\r\n/))
       ),
 
     // http://stackoverflow.com/questions/13014947/regex-to-match-a-c-style-multiline-comment/36328890#36328890
@@ -960,15 +972,15 @@ module.exports = grammar({
                 '[',
                 repeat(
                   choice(
-                    seq('\\', /./), // escaped character
-                    /[^\]\n\\]/ // any character besides ']' or '\n'
+                    seq('\\', /[^\n\r\u2028\u2029]/), // escaped character
+                    /[^\]\\\n\r\u2028\u2029]/ // any character besides ']', '\', or a line terminator
                   )
                 ),
                 ']'
               ), // square-bracket-delimited character class
-              seq('\\', /./), // escaped character
+              seq('\\', /[^\n\r\u2028\u2029]/), // escaped character
               // oxlint-disable-next-line no-useless-escape -- tree-sitter's regex parser rejects an unescaped `[` in a character class.
-              /[^/\\\[\n]/ // any character besides '[', '\', '/', '\n'
+              /[^/\\\[\n\r\u2028\u2029]/ // any character besides '[', '\', '/', or a line terminator
             )
           )
         )
@@ -1113,7 +1125,7 @@ module.exports = grammar({
     method_definition: ($) =>
       seq(
         repeat(field('decorator', $.decorator)),
-        optional(choice('static', alias(token(seq('static', /\s+/, 'get', /\s*\n/)), 'static get'))),
+        optional(choice('static', alias(token(seq('static', /\s+/, 'get', /\s*[\n\r\u2028\u2029]/)), 'static get'))),
         optional('async'),
         optional(choice('get', 'set', '*')),
         field('name', $._property_name),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-javascript",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "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
@@ -1727,10 +1719,6 @@
         "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "default",
-            "named": false
-          },
           {
             "type": "identifier",
             "named": true
@@ -2186,7 +2174,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "identifier",

package/tree-sitter.json

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