@willbooster/tree-sitter-javascript 1.0.19 → 1.0.21

package/grammar.js

@@ -137,6 +137,9 @@ module.exports = grammar({
     ['member', 'template_call', 'new', 'call', $.expression],
     ['declaration', 'literal'],
     [$.primary_expression, $.statement_block, 'object'],
+    // A `{` that may begin both a block and an object starts a statement or an arrow function's body, where ECMAScript
+    // reads it as a block, so `{a: 1}` there is a labeled statement in a block.
+    [$.labeled_statement, $._property_name],
     [$.meta_property, $.import],
     [$.import_statement, $.import],
     [$.export_statement, $.primary_expression],
@@ -159,7 +162,6 @@ module.exports = grammar({
     [$.object, $.object_pattern],
     [$.assignment_expression, $.pattern],
     [$.assignment_expression, $.object_assignment_pattern],
-    [$.labeled_statement, $._property_name],
     [$.computed_property_name, $.array],
     [$.binary_expression, $._initializer],
   ],
@@ -454,13 +456,10 @@ module.exports = grammar({
     empty_statement: () => ';',
 
     labeled_statement: ($) =>
-      prec.dynamic(
-        -1,
-        seq(
-          field('label', alias(choice($.identifier, $._reserved_identifier), $.statement_identifier)),
-          ':',
-          field('body', $.statement)
-        )
+      seq(
+        field('label', alias(choice($.identifier, $._reserved_identifier), $.statement_identifier)),
+        ':',
+        field('body', $.statement)
       ),
 
     //
@@ -500,7 +499,6 @@ module.exports = grammar({
         $.binary_expression,
         $.ternary_expression,
         $.update_expression,
-        $.new_expression,
         $.yield_expression
       ),
 
@@ -527,7 +525,9 @@ module.exports = grammar({
         $.generator_function,
         $.class,
         $.meta_property,
-        $.call_expression
+        $.call_expression,
+        $.new_expression,
+        alias($._argumentless_new_expression, $.new_expression)
       ),
 
     yield_expression: ($) =>
@@ -789,10 +789,7 @@ module.exports = grammar({
     call_expression: ($) =>
       choice(
         prec('call', seq(field('function', choice($.expression, $.import)), field('arguments', $.arguments))),
-        prec(
-          'template_call',
-          seq(field('function', choice($.primary_expression, $.new_expression)), field('arguments', $.template_string))
-        ),
+        prec('template_call', seq(field('function', $.primary_expression), field('arguments', $.template_string))),
         prec(
           'member',
           seq(
@@ -803,15 +800,15 @@ module.exports = grammar({
         )
       ),
 
+    // As in ECMAScript, a member access or index extends the nearest `new` with arguments, while an argument list fills
+    // the nearest `new` that still lacks one: `new new A().b` constructs `new A().b`, `new new A().b(2)` constructs
+    // `new A().b` with `2`, and `new new A()(2)` constructs `new A()`. The 'member' and 'new' precedences make the parser
+    // shift a `.`, `[`, or argument list after a constructor rather than end a `new` without arguments, so that form
+    // never takes one. Both forms are primary expressions, so a nested `new` matches the constructor field's type.
     new_expression: ($) =>
-      prec.right(
-        'new',
-        seq(
-          'new',
-          field('constructor', choice($.primary_expression, $.new_expression)),
-          field('arguments', optional(prec.dynamic(1, $.arguments)))
-        )
-      ),
+      prec('new', seq('new', field('constructor', $.primary_expression), field('arguments', $.arguments))),
+
+    _argumentless_new_expression: ($) => prec.right('new', seq('new', field('constructor', $.primary_expression))),
 
     await_expression: ($) => prec.dynamic(2, prec('unary_void', seq('await', $.expression))),
 

package/package.json

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

package/src/node-types.json

@@ -57,10 +57,6 @@
         "type": "jsx_self_closing_element",
         "named": true
       },
-      {
-        "type": "new_expression",
-        "named": true
-      },
       {
         "type": "primary_expression",
         "named": true
@@ -165,6 +161,10 @@
         "type": "meta_property",
         "named": true
       },
+      {
+        "type": "new_expression",
+        "named": true
+      },
       {
         "type": "null",
         "named": true
@@ -2236,10 +2236,6 @@
         "multiple": false,
         "required": true,
         "types": [
-          {
-            "type": "new_expression",
-            "named": true
-          },
           {
             "type": "primary_expression",
             "named": true

package/tree-sitter.json

@@ -24,7 +24,7 @@
     }
   ],
   "metadata": {
-    "version": "1.0.19",
+    "version": "1.0.21",
     "license": "MIT",
     "description": "JavaScript grammar for tree-sitter",
     "authors": [