@willbooster/tree-sitter-javascript 1.0.13 → 1.0.15

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
       ),
 
@@ -1189,9 +1192,9 @@ module.exports = grammar({
     // This negative dynamic precedence ensures that during error recovery,
     // unfinished constructs are generally treated as literal expressions,
     // not patterns.
-    pattern: ($) => prec.dynamic(-1, choice($._lhs_expression, $.rest_pattern)),
+    pattern: ($) => prec.dynamic(-1, choice($._lhs_expression, $.parenthesized_expression, $.rest_pattern)),
 
-    rest_pattern: ($) => prec.right(seq('...', $._lhs_expression)),
+    rest_pattern: ($) => prec.right(seq('...', choice($._lhs_expression, $.parenthesized_expression))),
 
     method_definition: ($) =>
       seq(

package/package.json

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

package/src/node-types.json

@@ -103,6 +103,10 @@
         "type": "object_pattern",
         "named": true
       },
+      {
+        "type": "parenthesized_expression",
+        "named": true
+      },
       {
         "type": "rest_pattern",
         "named": true
@@ -1170,13 +1174,17 @@
       }
     },
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": false,
       "types": [
         {
           "type": "export_clause",
           "named": true
         },
+        {
+          "type": "import_attribute",
+          "named": true
+        },
         {
           "type": "namespace_export",
           "named": true
@@ -2505,6 +2513,10 @@
           "type": "object_pattern",
           "named": true
         },
+        {
+          "type": "parenthesized_expression",
+          "named": true
+        },
         {
           "type": "subscript_expression",
           "named": true

package/tree-sitter.json

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