Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: stats still follow webpack specs #829

Merged
merged 1 commit into from
Dec 27, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 33 additions & 21 deletions crates/mako/src/stats.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::cell::RefCell;
use std::cmp::Ordering;
use std::collections::HashMap;
use std::fs;
use std::path::PathBuf;
use std::rc::Rc;
Expand Down Expand Up @@ -67,25 +68,20 @@ pub struct StatsJsonModuleItem {
pub chunk_id: String,
}
#[derive(Serialize, Debug)]
#[serde(untagged)]
pub enum StatsJsonChunkEntry {
/**
* only can be `false`, internal logic so omit deserialize fn
*/
False(bool),
Name(String),
}
#[derive(Serialize, Debug)]
pub struct StatsJsonChunkItem {
#[serde(flatten)]
pub chunk_type: StatsJsonType,
pub chunk_id: String,
pub dependencies: Vec<String>,
pub files: Vec<String>,
pub entry: StatsJsonChunkEntry,
pub entry: bool,
pub modules: Vec<StatsJsonModuleItem>,
}
#[derive(Serialize, Debug)]
pub struct StatsJsonEntryItem {
pub name: String,
pub chunks: Vec<String>,
}
#[derive(Serialize, Debug)]
pub struct StatsJsonMap {
hash: u64,
time: u128,
Expand All @@ -95,6 +91,7 @@ pub struct StatsJsonMap {
assets: Vec<StatsJsonAssetsItem>,
modules: Vec<StatsJsonModuleItem>,
chunks: Vec<StatsJsonChunkItem>,
entrypoints: HashMap<String, StatsJsonEntryItem>,
}

impl StatsJsonMap {
Expand All @@ -108,6 +105,7 @@ impl StatsJsonMap {
assets: vec![],
modules: vec![],
chunks: vec![],
entrypoints: HashMap::new(),
}
}
}
Expand Down Expand Up @@ -206,10 +204,7 @@ pub fn create_stats_info(compile_time: u128, compiler: &Compiler) -> StatsJsonMa
.iter()
.map(|chunk| {
let modules = chunk.get_modules();
let entry = match &chunk.chunk_type {
ChunkType::Entry(_, name, _) => StatsJsonChunkEntry::Name(name.clone()),
_ => StatsJsonChunkEntry::False(false),
};
let entry = matches!(chunk.chunk_type, ChunkType::Entry(_, _, _));
let id = chunk.id.id.clone();
let chunk_modules: Vec<StatsJsonModuleItem> = modules
.iter()
Expand Down Expand Up @@ -245,22 +240,39 @@ pub fn create_stats_info(compile_time: u128, compiler: &Compiler) -> StatsJsonMa
.filter(|asset| asset.chunk_id == id)
.map(|asset| asset.name.clone())
.collect();
let dependencies = chunk_graph
.entry_dependencies_chunk(&chunk.id)
.into_iter()
.map(|id| id.id)
.collect::<Vec<_>>();

StatsJsonChunkItem {
chunk_type: StatsJsonType::Chunk("chunk".to_string()),
chunk_id: id,
dependencies,
files,
entry,
modules: chunk_modules,
}
})
.collect();
stats_map.entrypoints = chunks
.iter()
.filter_map(|chunk| match &chunk.chunk_type {
ChunkType::Entry(_, name, _) => {
let mut chunks = chunk_graph
.entry_dependencies_chunk(&chunk.id)
.into_iter()
.map(|id| id.id)
.collect::<Vec<_>>();

chunks.push(chunk.id.id.clone());

Some((
name.clone(),
StatsJsonEntryItem {
name: name.clone(),
chunks,
},
))
}
_ => None,
})
.collect::<HashMap<_, _>>();

// 获取 modules
let modules: Vec<StatsJsonModuleItem> = modules_vec.borrow().iter().cloned().collect();
Expand Down