fix(parser): improved module code parsing

meriyah · Nov 6, 2019 · 9ecef95 · 9ecef95
1 parent 01db03c
commit 9ecef95
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meriyah",
-  "version": "1.8.7",
+  "version": "1.9.0",
   "description": "A 100% compliant, self-hosted javascript parser with high focus on both performance and stability",
   "main": "dist/meriyah.umd.js",
   "module": "dist/meriyah.esm.js",

diff --git a/src/meriyah.ts b/src/meriyah.ts
@@ -26,4 +26,4 @@ export function parse(source: string, options?: Options): ESTree.Program {
 export { Options, ESTree };
 
 // Current version
-export const version = '1.8.7';
+export const version = '1.9.0';
diff --git a/src/parser.ts b/src/parser.ts
@@ -2878,7 +2878,9 @@ function parseExportDeclaration(
 
       nextToken(parser, context); // Skips: '*'
 
-      if (consumeOpt(parser, context, Token.AsKeyword)) {
+      const isNamedDeclaration = consumeOpt(parser, context, Token.AsKeyword);
+
+      if (isNamedDeclaration) {
         if (scope) declareUnboundVariable(parser, parser.tokenValue);
         specifiers.push(
           finishNode(parser, context, parser.tokenPos, parser.linePos, parser.colPos, {
@@ -2896,11 +2898,16 @@ function parseExportDeclaration(
 
       matchOrInsertSemicolon(parser, context | Context.AllowRegExp);
 
-      return finishNode(parser, context, start, line, column, {
-        type: 'ExportNamedDeclaration',
-        source,
-        specifiers
-      } as any);
+      return isNamedDeclaration
+        ? finishNode(parser, context, start, line, column, {
+            type: 'ExportNamedDeclaration',
+            source,
+            specifiers
+          } as any)
+        : finishNode(parser, context, start, line, column, {
+            type: 'ExportAllDeclaration',
+            source
+          } as any);
     }
     case Token.LeftBrace: {
       // ExportClause :

diff --git a/test/parser/module/export.ts b/test/parser/module/export.ts
@@ -962,7 +962,7 @@ describe('Module - Export', () => {
             },
             specifiers: [],
             start: 0,
-            type: 'ExportNamedDeclaration'
+            type: 'ExportAllDeclaration'
           }
         ],
         end: 17,