From 826e42a5b5880c974ae019a7a21aade6a718062c Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Fri, 1 Nov 2024 12:27:00 -0400
Subject: fix: improved support for cjs and cts modules (#26558)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* cts support
* better cjs/cts type checking
* deno compile cjs/cts support
* More efficient detect cjs (going towards stabilization)
* Determination of whether .js, .ts, .jsx, or .tsx is cjs or esm is only
done after loading
* Support `import x = require(...);`

Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>
---
 tests/specs/compile/detect_cjs/__test__.jsonc | 11 +++++++----
 tests/specs/compile/detect_cjs/add.js         |  2 +-
 tests/specs/compile/detect_cjs/compile.out    |  1 -
 tests/specs/compile/detect_cjs/output.out     |  3 +--
 tests/specs/compile/detect_cjs/package.json   |  5 ++++-
 tests/specs/compile/detect_cjs/subtract.ts    |  2 ++
 6 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 tests/specs/compile/detect_cjs/subtract.ts

(limited to 'tests/specs/compile/detect_cjs')

diff --git a/tests/specs/compile/detect_cjs/__test__.jsonc b/tests/specs/compile/detect_cjs/__test__.jsonc
index 32bebb7a5..0abf121f0 100644
--- a/tests/specs/compile/detect_cjs/__test__.jsonc
+++ b/tests/specs/compile/detect_cjs/__test__.jsonc
@@ -1,24 +1,27 @@
 {
   "tempDir": true,
   "steps": [{
+    "args": "install",
+    "output": "[WILDCARD]"
+  }, {
     "if": "unix",
-    "args": "compile --allow-read --output main main.js",
+    "args": "compile --output main main.js",
     "output": "compile.out"
   }, {
     "if": "unix",
     "commandName": "./main",
     "args": [],
     "output": "output.out",
-    "exitCode": 1
+    "exitCode": 0
   }, {
     "if": "windows",
-    "args": "compile --allow-read --output main.exe main.js",
+    "args": "compile --output main.exe main.js",
     "output": "compile.out"
   }, {
     "if": "windows",
     "commandName": "./main.exe",
     "args": [],
     "output": "output.out",
-    "exitCode": 1
+    "exitCode": 0
   }]
 }
diff --git a/tests/specs/compile/detect_cjs/add.js b/tests/specs/compile/detect_cjs/add.js
index 2a886fbc1..94b0263f0 100644
--- a/tests/specs/compile/detect_cjs/add.js
+++ b/tests/specs/compile/detect_cjs/add.js
@@ -1,3 +1,3 @@
 module.exports.add = function (a, b) {
-  return a + b;
+  return require("./subtract.ts").subtract(a, -b);
 };
diff --git a/tests/specs/compile/detect_cjs/compile.out b/tests/specs/compile/detect_cjs/compile.out
index 6509b7f29..913e363c3 100644
--- a/tests/specs/compile/detect_cjs/compile.out
+++ b/tests/specs/compile/detect_cjs/compile.out
@@ -1,3 +1,2 @@
-Warning --unstable-detect-cjs is not properly supported in deno compile. The compiled executable may encounter runtime errors.
 Check file:///[WILDLINE]/main.js
 Compile file:///[WILDLINE]
diff --git a/tests/specs/compile/detect_cjs/output.out b/tests/specs/compile/detect_cjs/output.out
index e1c27b8dc..00750edc0 100644
--- a/tests/specs/compile/detect_cjs/output.out
+++ b/tests/specs/compile/detect_cjs/output.out
@@ -1,2 +1 @@
-error: Uncaught SyntaxError: The requested module './add.js' does not provide an export named 'add'
-    at <anonymous> (file:///[WILDLINE])
+3
diff --git a/tests/specs/compile/detect_cjs/package.json b/tests/specs/compile/detect_cjs/package.json
index 5bbefffba..6e65b32ed 100644
--- a/tests/specs/compile/detect_cjs/package.json
+++ b/tests/specs/compile/detect_cjs/package.json
@@ -1,3 +1,6 @@
 {
-  "type": "commonjs"
+  "type": "commonjs",
+  "dependencies": {
+    "@types/node": "*"
+  }
 }
diff --git a/tests/specs/compile/detect_cjs/subtract.ts b/tests/specs/compile/detect_cjs/subtract.ts
new file mode 100644
index 000000000..e4f6760b7
--- /dev/null
+++ b/tests/specs/compile/detect_cjs/subtract.ts
@@ -0,0 +1,2 @@
+/// <reference types="npm:@types/node" />
+module.exports.subtract = (a: number, b: number) => a - b;
-- 
cgit v1.2.3