Merge branch 'master' into expose-requires

lexer.js

@@ -51,6 +51,8 @@ module.exports = function parseCJS (source, name = '@') {
     e.loc = pos;
     throw e;
   }
+  if (lastExportsAssignSpecifier)
+    reexports.add(lastExportsAssignSpecifier);
   const result = { exports: [..._exports], reexports: [...reexports], requires };
   resetState();
   return result;
@@ -655,8 +657,16 @@ function tryParseRequire (requireType) {
         ch = commentWhitespace();
         if (ch === 41/*)*/) {
           requires.push({ s: reexportStart, e: reexportEnd });
-          if (directStarExport) {
-            reexports.add(source.slice(reexportStart, reexportEnd));
+          switch (requireType) {
+            case ExportAssign:
+              lastExportsAssignSpecifier = source.slice(reexportStart, reexportEnd);
+              return true;
+            case ExportStar:
+              reexports.add(source.slice(reexportStart, reexportEnd));
+              return true;
+            default:
+              lastStarExportSpecifier = source.slice(reexportStart, reexportEnd);
+              return true;
           }
         }
       }
@@ -666,8 +676,16 @@ function tryParseRequire (requireType) {
         ch = commentWhitespace();
         if (ch === 41/*)*/) {
           requires.push({ s: reexportStart, e: reexportEnd });
-          if (directStarExport) {
-            reexports.add(source.slice(reexportStart, reexportEnd));
+          switch (requireType) {
+            case ExportAssign:
+              lastExportsAssignSpecifier = source.slice(reexportStart, reexportEnd);
+              return true;
+            case ExportStar:
+              reexports.add(source.slice(reexportStart, reexportEnd));
+              return true;
+            default:
+              lastStarExportSpecifier = source.slice(reexportStart, reexportEnd);
+              return true;
           }
         }
       }

src/lexer.c

@@ -680,8 +680,18 @@ bool tryParseRequire (enum RequireType requireType) {
         ch = commentWhitespace();
         if (ch == ')') {
           addRequire(reexportStart, reexportEnd);
-          if (directStarExport) {
-            addReexport(reexportStart, reexportEnd);
+          switch (requireType) {
+            case ExportStar:
+              addReexport(reexportStart, reexportEnd);
+              return true;
+            case ExportAssign:
+              reexportAssignStart = reexportStart;
+              reexportAssignEnd = reexportEnd;
+              return true;
+            default:
+              starExportStack->specifier_start = reexportStart;
+              starExportStack->specifier_end = reexportEnd;
+              return true;
           }
         }
       }
@@ -691,12 +701,18 @@ bool tryParseRequire (enum RequireType requireType) {
         ch = commentWhitespace();
         if (ch == ')') {
           addRequire(reexportStart, reexportEnd);
-          if (directStarExport) {
-            addReexport(reexportStart, reexportEnd);
-          }
-          else {
-            starExportStack->specifier_start = reexportStart;
-            starExportStack->specifier_end = reexportEnd;
+          switch (requireType) {
+            case ExportStar:
+              addReexport(reexportStart, reexportEnd);
+              return true;
+            case ExportAssign:
+              reexportAssignStart = reexportStart;
+              reexportAssignEnd = reexportEnd;
+              return true;
+            default:
+              starExportStack->specifier_start = reexportStart;
+              starExportStack->specifier_end = reexportEnd;
+              return true;
           }
           return true;
         }