@willbooster/tree-sitter-javascript 1.0.12 → 1.0.14

package/grammar.js

@@ -81,6 +81,7 @@ module.exports = grammar({
     $._line_break_after_binding,
     $._line_break_after_field,
     $._line_break_after_modifier,
+    $._line_break_before_attributes,
   ],
 
   extras: ($) => [$.comment, $.html_comment, /[\s\p{Zs}\uFEFF\u2028\u2029\u2060\u200B]/u],
@@ -179,9 +180,11 @@ module.exports = grammar({
         seq(
           'export',
           choice(
-            seq('*', $._from_clause),
-            seq($.namespace_export, $._from_clause),
-            seq($.export_clause, $._from_clause),
+            seq(
+              choice('*', $.namespace_export, $.export_clause),
+              $._from_clause,
+              optional(choice($.import_attribute, $._line_break_before_attributes))
+            ),
             alias($._local_export_clause, $.export_clause)
           ),
           $._semicolon
@@ -240,7 +243,7 @@ module.exports = grammar({
       seq(
         'import',
         choice(seq($.import_clause, $._from_clause), field('source', $.string)),
-        optional($.import_attribute),
+        optional(choice($.import_attribute, $._line_break_before_attributes)),
         $._semicolon
       ),
 
@@ -1109,7 +1112,8 @@ module.exports = grammar({
         choice(
           $.identifier,
           alias($.decorator_member_expression, $.member_expression),
-          alias($.decorator_call_expression, $.call_expression)
+          alias($.decorator_call_expression, $.call_expression),
+          $.parenthesized_expression
         )
       ),
 
@@ -1119,7 +1123,10 @@ module.exports = grammar({
         seq(
           field('object', choice($.identifier, alias($.decorator_member_expression, $.member_expression))),
           '.',
-          field('property', alias($.identifier, $.property_identifier))
+          field(
+            'property',
+            choice(reserved('properties', alias($.identifier, $.property_identifier)), $.private_property_identifier)
+          )
         )
       ),
 
@@ -1127,7 +1134,10 @@ module.exports = grammar({
       prec(
         'call',
         seq(
-          field('function', choice($.identifier, alias($.decorator_member_expression, $.member_expression))),
+          field(
+            'function',
+            choice($.identifier, alias($.decorator_member_expression, $.member_expression), $.parenthesized_expression)
+          ),
           field('arguments', $.arguments)
         )
       ),

package/package.json

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

package/src/node-types.json

@@ -1021,6 +1021,10 @@
         {
           "type": "member_expression",
           "named": true
+        },
+        {
+          "type": "parenthesized_expression",
+          "named": true
         }
       ]
     }
@@ -1166,13 +1170,17 @@
       }
     },
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
         {
           "type": "export_clause",
           "named": true
         },
+        {
+          "type": "import_attribute",
+          "named": true
+        },
         {
           "type": "namespace_export",
           "named": true

package/tree-sitter.json

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