Merge pull request #159 from tree-sitter/exports

Extend export syntax, piggybacking on javascript grammar

Author: mjambon

common/corpus/declarations.txt

@@ -265,15 +265,15 @@ export async function readFile(filename: string): Promise<Buffer>
 
 (program
   (export_statement
-    (function
+    (function_declaration
       (identifier)
       (formal_parameters
         (required_parameter (identifier) (type_annotation (predefined_type)))
         (required_parameter (identifier) (type_annotation (predefined_type))))
       (statement_block
         (return_statement (object (shorthand_property_identifier) (shorthand_property_identifier))))))
   (comment)
-  (export_statement (class (type_identifier) (class_body)))
+  (export_statement (class_declaration (type_identifier) (class_body)))
   (export_statement (function_signature
     (identifier)
     (formal_parameters (required_parameter (identifier) (type_annotation (predefined_type))))
@@ -858,3 +858,22 @@ let a!: b;
       (identifier)
       (type_annotation
       (type_identifier)))))
+
+====================================
+Top-level exports
+====================================
+
+export default abstract class C { }
+export default class C { }
+export class C { }
+export default interface I { }
+export interface I { }
+
+---
+
+(program
+  (export_statement (abstract_class_declaration (type_identifier) (class_body)))
+  (export_statement (class_declaration (type_identifier) (class_body)))
+  (export_statement (class_declaration (type_identifier) (class_body)))
+  (export_statement (interface_declaration (type_identifier) (object_type)))
+  (export_statement (interface_declaration (type_identifier) (object_type))))

common/define-grammar.js

@@ -255,8 +255,7 @@ module.exports = function defineGrammar(dialect) {
         previous,
         seq('export', 'type', $.export_clause),
         seq('export', '=', $.identifier, $._semicolon),
-        seq('export', 'as', 'namespace', $.identifier, $._semicolon),
-        seq('export', 'default', $.function_signature)
+        seq('export', 'as', 'namespace', $.identifier, $._semicolon)
       ),
 
       non_null_expression: $ => prec.left('unary', seq(

package.json

@@ -15,7 +15,7 @@
   "main": "./bindings/node",
   "devDependencies": {
     "tree-sitter-cli": "^0.19.1",
-    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#v0.19.0"
+    "tree-sitter-javascript": "github:tree-sitter/tree-sitter-javascript#40a1427"
   },
   "scripts": {
     "build": "npm run build-typescript && npm run build-tsx",

tsx/src/grammar.json

@@ -134,16 +134,34 @@
                           "value": "default"
                         },
                         {
-                          "type": "FIELD",
-                          "name": "value",
-                          "content": {
-                            "type": "SYMBOL",
-                            "name": "expression"
-                          }
-                        },
-                        {
-                          "type": "SYMBOL",
-                          "name": "_semicolon"
+                          "type": "CHOICE",
+                          "members": [
+                            {
+                              "type": "FIELD",
+                              "name": "declaration",
+                              "content": {
+                                "type": "SYMBOL",
+                                "name": "declaration"
+                              }
+                            },
+                            {
+                              "type": "SEQ",
+                              "members": [
+                                {
+                                  "type": "FIELD",
+                                  "name": "value",
+                                  "content": {
+                                    "type": "SYMBOL",
+                                    "name": "expression"
+                                  }
+                                },
+                                {
+                                  "type": "SYMBOL",
+                                  "name": "_semicolon"
+                                }
+                              ]
+                            }
+                          ]
                         }
                       ]
                     }
@@ -215,23 +233,6 @@
               "name": "_semicolon"
             }
           ]
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "export"
-            },
-            {
-              "type": "STRING",
-              "value": "default"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "function_signature"
-            }
-          ]
         }
       ]
     },

tsx/src/node-types.json

@@ -1969,10 +1969,6 @@
           "type": "export_clause",
           "named": true
         },
-        {
-          "type": "function_signature",
-          "named": true
-        },
         {
           "type": "identifier",
           "named": true