Ensure empty export-from specifier lists are transpiled.

standard-things · Sep 17, 2018 · 669b7e5 · 669b7e5
1 parent 82f4a8d
commit 669b7e5
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 21 deletions.
diff --git a/src/visitor/import-export.js b/src/visitor/import-export.js
@@ -118,10 +118,11 @@ function init() {
 
       const node = path.getValue()
       const { specifiers } = node
-      const lastIndex = specifiers.length - 1
+      const { length } = specifiers
+      const lastIndex = length - 1
       const specifierMap = createSpecifierMap(this, node)
 
-      let hoistedCode = specifiers.length
+      let hoistedCode = length
         ? (this.generateVarDeclarations ? "var " : "let ")
         : ""
 
@@ -341,16 +342,35 @@ function init() {
 
         const specifierName = source.value
 
-        addToDependencySpecifiers(this, specifierName)
-
         const fromNames =
           exportedFrom[specifierName] ||
           (exportedFrom[specifierName] = [])
 
+        const lastIndex = specifiers.length - 1
+
+        let hoistedCode = pad(
+          original,
+          runtimeName + '.w("' + specifierName + '"',
+          node.start,
+          source.start
+        )
+
+        let i = -1
+        let setterArgsList = ""
+
+        addToDependencySpecifiers(this, specifierName)
+
         for (const specifier of specifiers) {
           const exportedName = specifier.exported.name
           const localName = specifier.local.name
 
+          setterArgsList +=
+            '["' +
+            localName + '",null,' +
+            runtimeName + '.f("' + localName + '","' + exportedName +
+            '")]' +
+            (++i === lastIndex ? "" : ",")
+
           exportedNames.push(exportedName)
 
           if (exportedName === localName) {
@@ -359,21 +379,17 @@ function init() {
             fromNames.push([exportedName, localName])
           }
 
-          const hoistedCode = pad(
-            original,
-            runtimeName + '.w("' + specifierName + '"',
-            node.start,
-            source.start
-          ) + pad(
-            original,
-            ',[["' + localName + '",null,' + runtimeName + '.f("' + localName + '","' + exportedName + '")]]);',
-            source.end,
-            node.end
-          )
-
           addToDependencySpecifiers(this, specifierName, localName)
-          hoistImports(this, node, hoistedCode)
         }
+
+        hoistedCode += pad(
+          original,
+          ",[" + setterArgsList + "]);",
+          source.end,
+          node.end
+        )
+
+        hoistImports(this, node, hoistedCode)
       }
     }
 

diff --git a/test/test262.mjs b/test/test262.mjs
@@ -7,7 +7,6 @@ import globby from "globby"
 import path from "path"
 import test262Parser from "test262-parser"
 
-const isAppVeyor = Reflect.has(process.env, "APPVEYOR")
 const isChakra = Reflect.has(process.versions, "chakracore")
 
 const fixturePath = path.resolve("test262")
@@ -160,9 +159,8 @@ describe("test262 tests", function () {
           } else {
             assert.strictEqual(name, expected)
           }
-        } else if (skipped &&
-            ! isAppVeyor) {
-          assert.fail("Expected skipped test to fail")
+        } else if (skipped) {
+          this.skip()
         }
       })
     })