fix: assets with query (#975)

crates/mako/src/ast_2/file.rs

@@ -190,15 +190,15 @@ impl File {
     }
 
     pub fn get_file_size(&self) -> Result<u64> {
-        let metadata = std::fs::metadata(&self.path)?;
+        let metadata = std::fs::metadata(&self.pathname)?;
         Ok(metadata.len())
     }
 
     pub fn get_base64(&self) -> Result<String> {
-        let content = std::fs::read(&self.path)?;
+        let content = std::fs::read(&self.pathname)?;
         let engine = engine::GeneralPurpose::new(&STANDARD, engine::general_purpose::PAD);
         let content = engine.encode(content);
-        let guess = mime_guess::from_path(&self.path);
+        let guess = mime_guess::from_path(&self.pathname);
         if let Some(mime) = guess.first() {
             Ok(format!(
                 "data:{};base64,{}",
@@ -213,7 +213,7 @@ impl File {
     }
 
     pub fn get_content_hash(&self) -> Result<String> {
-        let file = std::fs::File::open(&self.path)?;
+        let file = std::fs::File::open(&self.pathname)?;
         let len = file.metadata()?.len();
         // Decide on a reasonable buffer size (1MB in this case, fastest will depend on hardware)
         let buf_len = len.min(1_000_000) as usize;

crates/mako/src/load.rs

@@ -196,7 +196,7 @@ export function moduleToDom(css) {
                 file.extname
             );
             context.emit_assets(
-                file.path.to_string_lossy().to_string(),
+                file.pathname.to_string_lossy().to_string(),
                 final_file_name.clone(),
             );
             return Ok(Content::Js(format!(
@@ -238,10 +238,11 @@ export function moduleToDom(css) {
         inject_public_path: bool,
         context: Arc<Context>,
     ) -> Result<String> {
-        let path = file.path.to_string_lossy().to_string();
         let file_size = file
             .get_file_size()
-            .map_err(|_| LoadError::ReadFileSizeError { path })?;
+            .map_err(|_| LoadError::ReadFileSizeError {
+                path: file.path.to_string_lossy().to_string(),
+            })?;
         let emit_assets = || -> Result<String> {
             let final_file_name = Self::emit_asset(file, context.clone());
             if inject_public_path {
@@ -270,7 +271,7 @@ export function moduleToDom(css) {
     }
 
     pub fn emit_asset(file: &File, context: Arc<Context>) -> String {
-        let path = file.path.to_string_lossy().to_string();
+        let path = file.pathname.to_string_lossy().to_string();
         let final_file_name = format!(
             "{}.{}.{}",
             file.get_file_stem(),

e2e/fixtures/assets.with-query/expect.js

@@ -0,0 +1,14 @@
+const assert = require("assert");
+const { parseBuildResult, moduleReg } = require("../../../scripts/test-utils");
+const { files } = parseBuildResult(__dirname);
+
+assert(
+  Object.keys(files).find((file) => /xx.[0-9a-zA-z]*.schema/.test(file)),
+  "add file of unsupported mime to assets"
+);
+
+const content = files["index.js"];
+assert(
+  content.includes(`"src/xx.schema?a=1":`),
+  "assets with query should be handled correctly"
+);

e2e/fixtures/assets.with-query/mako.config.json

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

e2e/fixtures/assets.with-query/src/index.ts

@@ -0,0 +1,3 @@
+import xx from "./xx.schema?a=1";
+
+console.log(xx);

e2e/fixtures/assets.with-query/src/xx.schema

@@ -0,0 +1 @@
+Object() {}