Stringify specifier synchronously in case of dynamic specifier

babel · Sep 21, 2023 · 03e32f7 · 03e32f7
1 parent c48d8ca
commit 03e32f7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/packages/babel-plugin-proposal-import-wasm-source/src/index.ts b/packages/babel-plugin-proposal-import-wasm-source/src/index.ts
@@ -295,10 +295,23 @@ export default declare(api => {
     }
 
     buildFetchAsync ??= buildFetchSync;
-    const buildFetchAsyncWrapped: typeof buildFetchAsync = (expression, path) =>
-      template.expression.ast`
-        Promise.resolve().then(() => ${buildFetchAsync(expression, path)})
-      `;
+    const buildFetchAsyncWrapped: typeof buildFetchAsync = (
+      expression,
+      path,
+    ) => {
+      if (t.isStringLiteral(expression)) {
+        return template.expression.ast`
+          Promise.resolve().then(() => ${buildFetchAsync(expression, path)})
+        `;
+      } else {
+        return template.expression.ast`
+          Promise.resolve(\`\${${expression}}\`).then((s) => ${buildFetchAsync(
+            t.identifier("s"),
+            path,
+          )})
+        `;
+      }
+    };
 
     return {
       buildFetch: buildFetchSync || buildFetchAsync,

diff --git a/...-source/test/fixtures/browser-and-node-esm/import-expression-dynamic-specifier/output.mjs b/...-source/test/fixtures/browser-and-node-esm/import-expression-dynamic-specifier/output.mjs
@@ -1 +1 @@
-let promise = Promise.resolve().then(() => typeof process === "object" && process.versions.node ? import("fs").then(fs => fs.promises.readFile(new URL(import.meta.resolve(getSpecifier())))).then(WebAssembly.compile) : WebAssembly.compileStreaming(fetch(import.meta.resolve(getSpecifier()))));
+let promise = Promise.resolve(`${getSpecifier()}`).then(s => typeof process === "object" && process.versions.node ? import("fs").then(fs => fs.promises.readFile(new URL(import.meta.resolve(s)))).then(WebAssembly.compile) : WebAssembly.compileStreaming(fetch(import.meta.resolve(s))));
diff --git a/...l-import-wasm-source/test/fixtures/browser/import-expression-dynamic-specifier/output.mjs b/...l-import-wasm-source/test/fixtures/browser/import-expression-dynamic-specifier/output.mjs
@@ -1 +1 @@
-let promise = Promise.resolve().then(() => WebAssembly.compileStreaming(fetch(import.meta.resolve(getSpecifier()))));
+let promise = Promise.resolve(`${getSpecifier()}`).then(s => WebAssembly.compileStreaming(fetch(import.meta.resolve(s))));
diff --git a/...l-import-wasm-source/test/fixtures/node-cjs/import-expression-dynamic-specifier/output.js b/...l-import-wasm-source/test/fixtures/node-cjs/import-expression-dynamic-specifier/output.js
@@ -1,3 +1,3 @@
 "use strict";
 
-let promise = Promise.resolve().then(() => require("fs").promises.readFile(require.resolve(getSpecifier())).then(WebAssembly.compile));
+let promise = Promise.resolve(`${getSpecifier()}`).then(s => require("fs").promises.readFile(require.resolve(s)).then(WebAssembly.compile));
diff --git a/...-import-wasm-source/test/fixtures/node-esm/import-expression-dynamic-specifier/output.mjs b/...-import-wasm-source/test/fixtures/node-esm/import-expression-dynamic-specifier/output.mjs
@@ -1,2 +1,2 @@
 import { promises as _promises } from "fs";
-let promise = Promise.resolve().then(() => _promises.readFile(new URL(import.meta.resolve(getSpecifier()))).then(WebAssembly.compile));
+let promise = Promise.resolve(`${getSpecifier()}`).then(s => _promises.readFile(new URL(import.meta.resolve(s))).then(WebAssembly.compile));