module: use sync cjs when importing cts

marco-ippolito · targos · commit dbeee558245c · 2025-10-06T16:24:41.000+02:00
PR-URL: #60072 Fixes: #59963 Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
@@ -504,7 +504,9 @@ class ModuleLoader {
     const loadResult = this.#loadSync(url, { format, importAttributes });
 
     // Use the synchronous commonjs translator which can deal with cycles.
-    const finalFormat = loadResult.format === 'commonjs' ? 'commonjs-sync' : loadResult.format;
+    const finalFormat =
+      loadResult.format === 'commonjs' ||
+      loadResult.format === 'commonjs-typescript' ? 'commonjs-sync' : loadResult.format;
 
     if (finalFormat === 'wasm') {
       assert.fail('WASM is currently unsupported by require(esm)');
diff --git a/test/es-module/test-typescript-commonjs.mjs b/test/es-module/test-typescript-commonjs.mjs
@@ -174,3 +174,13 @@ test('expect failure of a .cts file requiring esm in node_modules', async () =>
   match(result.stderr, /ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING/);
   strictEqual(result.code, 1);
 });
+
+test('cts -> require mts -> import cts', async () => {
+  const result = await spawnPromisified(process.execPath, [
+    fixtures.path('typescript/cts/issue-59963/a.cts'),
+  ]);
+
+  strictEqual(result.stderr, '');
+  strictEqual(result.stdout, 'Hello from c.cts\n');
+  strictEqual(result.code, 0);
+});
diff --git a/test/es-module/test-typescript-module.mjs b/test/es-module/test-typescript-module.mjs
@@ -98,3 +98,14 @@ test('execute .ts file importing a module', async () => {
   strictEqual(result.stdout, 'Hello, TypeScript!\n');
   strictEqual(result.code, 0);
 });
+
+test('mts -> import cts -> require mts', async () => {
+  const result = await spawnPromisified(process.execPath, [
+    '--no-warnings',
+    fixtures.path('typescript/mts/issue-59963/a.mts'),
+  ]);
+
+  strictEqual(result.stderr, '');
+  strictEqual(result.stdout, 'Hello from c.mts\n');
+  strictEqual(result.code, 0);
+});
diff --git a/test/fixtures/typescript/cts/issue-59963/a.cts b/test/fixtures/typescript/cts/issue-59963/a.cts
@@ -0,0 +1,3 @@
+const { message } = require("./b.mts");
+interface Foo {};
+console.log(message);
diff --git a/test/fixtures/typescript/cts/issue-59963/b.mts b/test/fixtures/typescript/cts/issue-59963/b.mts
@@ -0,0 +1,2 @@
+interface Foo {};
+export { message } from "./c.cts";
diff --git a/test/fixtures/typescript/cts/issue-59963/c.cts b/test/fixtures/typescript/cts/issue-59963/c.cts
@@ -0,0 +1,2 @@
+const message: string = "Hello from c.cts";
+module.exports = { message };
diff --git a/test/fixtures/typescript/mts/issue-59963/a.mts b/test/fixtures/typescript/mts/issue-59963/a.mts
@@ -0,0 +1,3 @@
+import { message } from "./b.cts";
+interface Foo {};
+console.log(message);
diff --git a/test/fixtures/typescript/mts/issue-59963/b.cts b/test/fixtures/typescript/mts/issue-59963/b.cts
@@ -0,0 +1,3 @@
+const { message } = require("./c.mts");
+interface Foo {};
+module.exports = { message };
diff --git a/test/fixtures/typescript/mts/issue-59963/c.mts b/test/fixtures/typescript/mts/issue-59963/c.mts
@@ -0,0 +1 @@
+export const message: string = "Hello from c.mts";

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const { message } = require("./b.mts");`
	`2`	`+interface Foo {};`
	`3`	`+console.log(message);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+interface Foo {};`
	`2`	`+export { message } from "./c.cts";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+const message: string = "Hello from c.cts";`
	`2`	`+module.exports = { message };`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { message } from "./b.cts";`
	`2`	`+interface Foo {};`
	`3`	`+console.log(message);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const { message } = require("./c.mts");`
	`2`	`+interface Foo {};`
	`3`	`+module.exports = { message };`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const message: string = "Hello from c.mts";`