From 0d43a63636c97886c10c6b8ce05fdb67cd2d8b91 Mon Sep 17 00:00:00 2001
From: mash-graz <mash-graz@users.noreply.github.com>
Date: Wed, 20 Mar 2024 04:42:22 +0100
Subject: fix(ext/node): worker_threads ESM handling (#22841)

Fixes #22840
Fixes #22964
---
 .../unit_node/testdata/worker_module/cjs-file.cjs  | 23 ++++++++++++++++++++++
 tests/unit_node/testdata/worker_module/index.js    |  2 +-
 .../testdata/worker_module/nested/index.js         |  3 +++
 .../testdata/worker_module/other_cjs_file.cjs      |  5 +++++
 .../unit_node/testdata/worker_module/other_file.js |  7 ++++++-
 ...201\316\262\316\261\317\201\316\277\316\271.js" |  9 +++++++++
 6 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit_node/testdata/worker_module/cjs-file.cjs
 create mode 100644 tests/unit_node/testdata/worker_module/nested/index.js
 create mode 100644 tests/unit_node/testdata/worker_module/other_cjs_file.cjs
 create mode 100644 "tests/unit_node/testdata/worker_module/\316\262\316\254\317\201\316\262\316\261\317\201\316\277\316\271.js"

(limited to 'tests/unit_node/testdata')

diff --git a/tests/unit_node/testdata/worker_module/cjs-file.cjs b/tests/unit_node/testdata/worker_module/cjs-file.cjs
new file mode 100644
index 000000000..af2e21c35
--- /dev/null
+++ b/tests/unit_node/testdata/worker_module/cjs-file.cjs
@@ -0,0 +1,23 @@
+const { add } = require("./other_cjs_file.cjs");
+
+const missing_toplevel_async = async () => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve;
+    }, 500);
+  });
+};
+
+async function main() {
+  /// async code doesn't seem to work within this CJS wrapper :(
+  //const p = await missing_toplevel_async();
+
+  const sum = add(2, 3);
+  if (sum != 5) {
+    throw ("Bad calculator!");
+  }
+
+  postMessage("hallo");
+}
+
+main();
diff --git a/tests/unit_node/testdata/worker_module/index.js b/tests/unit_node/testdata/worker_module/index.js
index a3e976b65..cbb433986 100644
--- a/tests/unit_node/testdata/worker_module/index.js
+++ b/tests/unit_node/testdata/worker_module/index.js
@@ -1,3 +1,3 @@
 import { myFunction } from "./other_file.js";
 
-myFunction().then(() => {});
+await myFunction();
diff --git a/tests/unit_node/testdata/worker_module/nested/index.js b/tests/unit_node/testdata/worker_module/nested/index.js
new file mode 100644
index 000000000..b77376a16
--- /dev/null
+++ b/tests/unit_node/testdata/worker_module/nested/index.js
@@ -0,0 +1,3 @@
+import { myFunction } from "../other_file.js";
+
+await myFunction();
diff --git a/tests/unit_node/testdata/worker_module/other_cjs_file.cjs b/tests/unit_node/testdata/worker_module/other_cjs_file.cjs
new file mode 100644
index 000000000..45ae337bf
--- /dev/null
+++ b/tests/unit_node/testdata/worker_module/other_cjs_file.cjs
@@ -0,0 +1,5 @@
+module.exports = {
+  add: (a, b) => {
+    return a + b;
+  },
+};
diff --git a/tests/unit_node/testdata/worker_module/other_file.js b/tests/unit_node/testdata/worker_module/other_file.js
index 41789dfe8..6bb9b6b83 100644
--- a/tests/unit_node/testdata/worker_module/other_file.js
+++ b/tests/unit_node/testdata/worker_module/other_file.js
@@ -1,3 +1,8 @@
 export async function myFunction() {
-  await new Promise((resolve) => setTimeout(resolve, 100));
+  await new Promise((resolve) =>
+    setTimeout(() => {
+      postMessage("hallo");
+      resolve;
+    }, 100)
+  );
 }
diff --git "a/tests/unit_node/testdata/worker_module/\316\262\316\254\317\201\316\262\316\261\317\201\316\277\316\271.js" "b/tests/unit_node/testdata/worker_module/\316\262\316\254\317\201\316\262\316\261\317\201\316\277\316\271.js"
new file mode 100644
index 000000000..cee92889c
--- /dev/null
+++ "b/tests/unit_node/testdata/worker_module/\316\262\316\254\317\201\316\262\316\261\317\201\316\277\316\271.js"
@@ -0,0 +1,9 @@
+export async function myFunction() {
+  await new Promise((resolve) =>
+    setTimeout(() => {
+      postMessage("hallo");
+      resolve;
+    }, 100)
+  );
+}
+await myFunction();
-- 
cgit v1.2.3