From e6869d7fa668017bacf23ad80a52a4168f562e7b Mon Sep 17 00:00:00 2001
From: David Sherret <dsherret@users.noreply.github.com>
Date: Sat, 21 Dec 2024 10:00:18 -0500
Subject: [PATCH] fix(node): handle cjs exports with escaped chars (#27438)

Closes https://github.com/denoland/deno/issues/27422
---
 resolvers/node/analyze.rs                     | 26 +++++++++++--------
 .../cjs_key_escaped_whitespace/__test__.jsonc |  4 +++
 .../node/cjs_key_escaped_whitespace/main.js   |  2 ++
 .../cjs_key_escaped_whitespace/module.cjs     |  6 +++++
 .../cjs_key_escaped_whitespace/output.out     |  7 +++++
 5 files changed, 34 insertions(+), 11 deletions(-)
 create mode 100644 tests/specs/node/cjs_key_escaped_whitespace/__test__.jsonc
 create mode 100644 tests/specs/node/cjs_key_escaped_whitespace/main.js
 create mode 100644 tests/specs/node/cjs_key_escaped_whitespace/module.cjs
 create mode 100644 tests/specs/node/cjs_key_escaped_whitespace/output.out

diff --git a/resolvers/node/analyze.rs b/resolvers/node/analyze.rs
index a444f4d923..9e6219b082 100644
--- a/resolvers/node/analyze.rs
+++ b/resolvers/node/analyze.rs
@@ -162,7 +162,7 @@ impl<TCjsCodeAnalyzer: CjsCodeAnalyzer, TNodeResolverEnv: NodeResolverEnv>
         add_export(
           &mut source,
           export,
-          &format!("mod[\"{}\"]", escape_for_double_quote_string(export)),
+          &format!("mod[{}]", to_double_quote_string(export)),
           &mut temp_var_count,
         );
       }
@@ -561,8 +561,8 @@ fn add_export(
       "const __deno_export_{temp_var_count}__ = {initializer};"
     ));
     source.push(format!(
-      "export {{ __deno_export_{temp_var_count}__ as \"{}\" }};",
-      escape_for_double_quote_string(name)
+      "export {{ __deno_export_{temp_var_count}__ as {} }};",
+      to_double_quote_string(name)
     ));
   } else {
     source.push(format!("export const {name} = {initializer};"));
@@ -620,14 +620,9 @@ fn not_found(path: &str, referrer: &Path) -> AnyError {
   std::io::Error::new(std::io::ErrorKind::NotFound, msg).into()
 }
 
-fn escape_for_double_quote_string(text: &str) -> Cow<str> {
-  // this should be rare, so doing a scan first before allocating is ok
-  if text.chars().any(|c| matches!(c, '"' | '\\')) {
-    // don't bother making this more complex for perf because it's rare
-    Cow::Owned(text.replace('\\', "\\\\").replace('"', "\\\""))
-  } else {
-    Cow::Borrowed(text)
-  }
+fn to_double_quote_string(text: &str) -> String {
+  // serde can handle this for us
+  serde_json::to_string(text).unwrap()
 }
 
 #[cfg(test)]
@@ -665,4 +660,13 @@ mod tests {
       Some(("@some-package/core".to_string(), "./actions".to_string()))
     );
   }
+
+  #[test]
+  fn test_to_double_quote_string() {
+    assert_eq!(to_double_quote_string("test"), "\"test\"");
+    assert_eq!(
+      to_double_quote_string("\r\n\t\"test"),
+      "\"\\r\\n\\t\\\"test\""
+    );
+  }
 }
diff --git a/tests/specs/node/cjs_key_escaped_whitespace/__test__.jsonc b/tests/specs/node/cjs_key_escaped_whitespace/__test__.jsonc
new file mode 100644
index 0000000000..ebaae5bfd6
--- /dev/null
+++ b/tests/specs/node/cjs_key_escaped_whitespace/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+  "args": "run -A main.js",
+  "output": "output.out"
+}
diff --git a/tests/specs/node/cjs_key_escaped_whitespace/main.js b/tests/specs/node/cjs_key_escaped_whitespace/main.js
new file mode 100644
index 0000000000..9d4f2ee26c
--- /dev/null
+++ b/tests/specs/node/cjs_key_escaped_whitespace/main.js
@@ -0,0 +1,2 @@
+const bang = await import("./module.cjs");
+console.log("imported:", bang);
diff --git a/tests/specs/node/cjs_key_escaped_whitespace/module.cjs b/tests/specs/node/cjs_key_escaped_whitespace/module.cjs
new file mode 100644
index 0000000000..5accc6196a
--- /dev/null
+++ b/tests/specs/node/cjs_key_escaped_whitespace/module.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+  "\nx": "test",
+  "\ty": "test",
+  "\rz": "test",
+  '"a': "test",
+};
diff --git a/tests/specs/node/cjs_key_escaped_whitespace/output.out b/tests/specs/node/cjs_key_escaped_whitespace/output.out
new file mode 100644
index 0000000000..49e92abdec
--- /dev/null
+++ b/tests/specs/node/cjs_key_escaped_whitespace/output.out
@@ -0,0 +1,7 @@
+imported: [Module: null prototype] {
+  "\ty": "test",
+  "\nx": "test",
+  "\rz": "test",
+  '"a': "test",
+  default: { "\nx": "test", "\ty": "test", "\rz": "test", '"a': "test" }
+}