Fix exporting async functions in ESM modules

Add mjs file matching to regression test script

Author: matetokodi

src/parser/esprima_cpp/esprima.cpp

@@ -6811,7 +6811,7 @@ class Parser {
                 this->throwUnexpectedToken(this->lookahead);
             }
             this->consumeSemicolon();
-        } else if (this->lookahead.type == Token::KeywordToken) {
+        } else if (this->lookahead.type == Token::KeywordToken || this->matchAsyncFunction()) {
             // export var f = 1;
             auto oldNameCallback = this->nameDeclaredCallback;
             AtomicStringVector declaredNames;
@@ -6827,19 +6827,24 @@ class Parser {
             }
             AtomicStringVector declaredName;
             ASTNode declaration = nullptr;
-            switch (this->lookahead.valueKeywordKind) {
-            case KeywordKind::LetKeyword:
-            case KeywordKind::ConstKeyword:
-                declaration = this->parseLexicalDeclaration(builder, false);
-                break;
-            case KeywordKind::VarKeyword:
-            case KeywordKind::ClassKeyword:
-            case KeywordKind::FunctionKeyword:
-                declaration = this->parseStatementListItem(builder);
-                break;
-            default:
-                this->throwUnexpectedToken(this->lookahead);
-                break;
+
+            if (this->lookahead.type == Token::KeywordToken) {
+                switch (this->lookahead.valueKeywordKind) {
+                case KeywordKind::LetKeyword:
+                case KeywordKind::ConstKeyword:
+                    declaration = this->parseLexicalDeclaration(builder, false);
+                    break;
+                case KeywordKind::VarKeyword:
+                case KeywordKind::ClassKeyword:
+                case KeywordKind::FunctionKeyword:
+                    declaration = this->parseStatementListItem(builder);
+                    break;
+                default:
+                    this->throwUnexpectedToken(this->lookahead);
+                    break;
+                }
+            } else {
+                declaration = this->parseFunctionDeclaration(builder);
             }
 
             for (size_t i = 0; i < declaredNames.size(); i++) {
@@ -6852,9 +6857,6 @@ class Parser {
             }
             exportDeclaration = this->finalize(node, builder.createExportNamedDeclarationNode(declaration, ASTNodeList(), nullptr));
             this->nameDeclaredCallback = oldNameCallback;
-        } else if (this->matchAsyncFunction()) {
-            ASTNode declaration = this->parseFunctionDeclaration(builder);
-            exportDeclaration = this->finalize(node, builder.createExportNamedDeclarationNode(declaration, ASTNodeList(), nullptr));
         } else {
             ASTNodeList specifiers;
             ASTNode source = nullptr;

tools/run-tests.py

@@ -447,11 +447,11 @@ def run_regression_tests(engine, arch, extra_arg):
     REGRESSION_ASSERT_JS = join(REGRESSION_DIR, 'assert.js')
 
     print('Running regression tests:')
-    xpass = glob(join(REGRESSION_DIR, 'issue-*.js'))
+    xpass = glob(join(REGRESSION_DIR, 'issue-*.js')) + glob(join(REGRESSION_DIR, 'issue-*.mjs'))
     xpass_result = _run_regression_tests(engine, REGRESSION_ASSERT_JS, xpass, False)
 
     print('Running regression tests expected to fail:')
-    xfail = glob(join(REGRESSION_XFAIL_DIR, 'issue-*.js'))
+    xfail = glob(join(REGRESSION_XFAIL_DIR, 'issue-*.js')) + glob(join(REGRESSION_XFAIL_DIR, 'issue-*.mjs'))
     xfail_result = _run_regression_tests(engine, REGRESSION_ASSERT_JS, xfail, True)
 
     tests_total = len(xpass) + len(xfail)