fix: path should be unescaped (#958)

* fix: path should be unescaped

* chore: code style

crates/mako/Cargo.toml

@@ -11,15 +11,16 @@ path = "src/main.rs"
 test = false
 
 [dependencies]
-cached       = { workspace = true }
-glob-match   = "0.2.1"
-mako_core    = { path = "../core" }
-miette       = { version = "5.10.0", features = ["fancy"] }
-oxc_resolver = "1.5.4"
-serde        = { workspace = true }
-serde_json   = { workspace = true }
-swc_core     = { workspace = true, features = ["swc_ecma_quote_macros"] }
-url          = { version = "2.5.0" }
+cached           = { workspace = true }
+glob-match       = "0.2.1"
+mako_core        = { path = "../core" }
+miette           = { version = "5.10.0", features = ["fancy"] }
+oxc_resolver     = "1.5.4"
+percent-encoding = { version = "2.3.1" }
+serde            = { workspace = true }
+serde_json       = { workspace = true }
+swc_core         = { workspace = true, features = ["swc_ecma_quote_macros"] }
+url              = { version = "2.5.0" }
 
 [target.'cfg(not(target_os = "linux"))'.dependencies]
 mimalloc-rust = { workspace = true }

crates/mako/src/ast_2/file.rs

@@ -12,6 +12,7 @@ use mako_core::regex::Regex;
 use mako_core::thiserror::Error;
 use mako_core::twox_hash::XxHash64;
 use mako_core::{md5, mime_guess};
+use percent_encoding::percent_decode_str;
 use url::Url;
 
 use crate::compiler::Context;
@@ -262,5 +263,8 @@ fn parse_path(path: &str) -> Result<(PathName, Search, Params, Fragment)> {
         .query_pairs()
         .map(|(k, v)| (k.to_string(), v.to_string()))
         .collect();
+    // dir or filename may contains space or other special characters
+    // so we need to decode it, e.g. "a%20b" -> "a b"
+    let path = percent_decode_str(&path).decode_utf8()?;
     Ok((path.to_string(), search, query_vec, fragment))
 }

e2e/fixtures/resolve.unescape-path/expect.js

@@ -0,0 +1,8 @@
+const assert = require("assert");
+const { parseBuildResult, trim, moduleReg } = require("../../../scripts/test-utils");
+const { files } = parseBuildResult(__dirname);
+
+const content = files["index.js"];
+
+assert(content.includes(`console.log('中');`), "should contain 中");
+assert(content.includes(`console.log('a b');`), "should contain a b");

e2e/fixtures/resolve.unescape-path/mako.config.json

@@ -0,0 +1,3 @@
+{
+  "minify": false
+}

e2e/fixtures/resolve.unescape-path/src/a b.js

@@ -0,0 +1 @@
+console.log('a b');

e2e/fixtures/resolve.unescape-path/src/index.tsx

@@ -0,0 +1,2 @@
+import './a b';
+import './中';

e2e/fixtures/resolve.unescape-path/src/中.js

@@ -0,0 +1 @@
+console.log('中');

scripts/benchmark.ts

@@ -3,7 +3,8 @@ import 'zx/globals';
 (async () => {
   const baseline = argv.baseline || 'master';
   const multiChunks = argv.multiChunks;
-  const casePath = argv.case || multiChunks ? './tmp/three10x/multiChunks' : './tmp/three10x';
+  const casePath =
+    argv.case || multiChunks ? './tmp/three10x/multiChunks' : './tmp/three10x';
 
   const currentBranch = (
     await $`git rev-parse --abbrev-ref HEAD`