perf: bump string_wizard for better performance

hyf0 · hyf0 · commit 33669816e274 · 2023-11-16T21:58:15.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ serde_json     = "1.0.108"
 insta          = "1.34.0"
 testing_macros = "0.2.11"
 scoped-tls     = "1.0.1"
-string_wizard  = { version = "0.0.14" }
+string_wizard  = { version = "0.0.16" }
 async-trait    = "0.1.74"
 futures        = "0.3.29"
 thiserror      = "1.0.50"
diff --git a/crates/rolldown/examples/basic.rs b/crates/rolldown/examples/basic.rs
@@ -5,10 +5,11 @@ use sugar_path::SugarPathBuf;
 
 #[tokio::main]
 async fn main() -> Result<()> {
+  let _guard = rolldown_tracing::try_init_tracing_with_chrome_layer();
   let root = PathBuf::from(&std::env::var("CARGO_MANIFEST_DIR").unwrap());
   let cwd = root.join("./examples").into_normalize();
   let mut bundler = Bundler::new(InputOptions {
-    input: vec![InputItem { name: Some("basic".to_string()), import: "./index.js".to_string() }],
+    input: vec![InputItem { name: Some("basic".to_string()), import: "react-dom".to_string() }],
     cwd,
     ..Default::default()
   });
diff --git a/crates/rolldown/src/bundler/chunk/render_chunk_exports.rs b/crates/rolldown/src/bundler/chunk/render_chunk_exports.rs
@@ -17,7 +17,14 @@ impl Chunk {
       if matches!(linking_info.wrap_kind, WrapKind::Cjs) {
         match output_options.format {
           OutputFormat::Esm => {
-            let wrap_ref_name = &self.canonical_names[&linking_info.wrap_ref.unwrap()];
+            let wrap_ref_name =
+              &self.canonical_names.get(&linking_info.wrap_ref.unwrap()).unwrap_or_else(|| {
+                panic!(
+                  "Cannot find canonical name for wrap ref {:?} of {:?}",
+                  linking_info.wrap_ref.unwrap(),
+                  graph.modules[entry].resource_id()
+                )
+              });
             return Some(MagicString::new(format!("export default {wrap_ref_name}();\n")));
           }
         }
diff --git a/crates/rolldown/src/bundler/module/mod.rs b/crates/rolldown/src/bundler/module/mod.rs
@@ -72,6 +72,7 @@ impl Module {
     }
   }
 
+  #[tracing::instrument(skip_all)]
   pub fn render(&self, ctx: ModuleRenderContext) -> Option<MagicString<'_>> {
     match self {
       Self::Normal(m) => m.render(ctx),
diff --git a/crates/rolldown/src/bundler/module_loader/normal_module_task.rs b/crates/rolldown/src/bundler/module_loader/normal_module_task.rs
@@ -58,6 +58,7 @@ impl<'task, T: FileSystem + Default + 'static> NormalModuleTask<'task, T> {
     }
   }
 
+  #[tracing::instrument(skip_all)]
   pub async fn run(mut self) -> BatchedResult<()> {
     let mut builder = NormalModuleBuilder::default();
     tracing::trace!("process {:?}", self.path);
@@ -204,6 +205,7 @@ impl<'task, T: FileSystem + Default + 'static> NormalModuleTask<'task, T> {
     Ok(info)
   }
 
+  #[tracing::instrument(skip_all)]
   async fn resolve_dependencies(
     &mut self,
     dependencies: &IndexVec<ImportRecordId, RawImportRecord>,
diff --git a/crates/rolldown/src/bundler/module_loader/runtime_normal_module_task.rs b/crates/rolldown/src/bundler/module_loader/runtime_normal_module_task.rs
@@ -29,6 +29,7 @@ impl RuntimeNormalModuleTask {
     Self { module_id: id, tx, warnings: Vec::default() }
   }
 
+  #[tracing::instrument(skip_all)]
   pub fn run(self) {
     let mut builder = NormalModuleBuilder::default();
 
diff --git a/crates/rolldown/src/bundler/renderer/impl_visit.rs b/crates/rolldown/src/bundler/renderer/impl_visit.rs
@@ -11,6 +11,14 @@ use crate::bundler::{module::Module, renderer::RenderControl};
 use super::AstRenderer;
 
 impl<'ast, 'r> Visit<'ast> for AstRenderer<'r> {
+  #[tracing::instrument]
+  fn visit_program(&mut self, program: &ast::Program<'ast>) {
+    for directive in &program.directives {
+      self.visit_directive(directive);
+    }
+    self.visit_statements(&program.body);
+  }
+
   fn visit_binding_identifier(&mut self, ident: &oxc::ast::ast::BindingIdentifier) {
     self.render_binding_identifier(ident);
   }
diff --git a/crates/rolldown/src/bundler/stages/scan_stage.rs b/crates/rolldown/src/bundler/stages/scan_stage.rs
@@ -68,6 +68,7 @@ impl<Fs: FileSystem + Default + 'static> ScanStage<Fs> {
   }
 
   /// Resolve `InputOptions.input`
+  #[tracing::instrument(skip_all)]
   fn resolve_user_defined_entries(
     &self,
   ) -> BatchedResult<Vec<(Option<String>, ResolvedRequestInfo)>> {
diff --git a/crates/rolldown/src/bundler/visitors/scanner.rs b/crates/rolldown/src/bundler/visitors/scanner.rs
@@ -299,6 +299,7 @@ impl<'a> Scanner<'a> {
 }
 
 impl<'ast> Visit<'ast> for Scanner<'ast> {
+  #[tracing::instrument(skip_all)]
   fn visit_program(&mut self, program: &oxc::ast::ast::Program<'ast>) {
     for (idx, stmt) in program.body.iter().enumerate() {
       self.current_stmt_info.stmt_idx = Some(idx);
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "test:update": "yarn workspaces foreach run test:update",
     "prettier": "prettier . '!**/*.{js||ts|json|md|yml|yaml}' -w",
     "prettier:ci": "prettier . '!**/*.{js||ts|json|md|yml|yaml}' -c",
+    "bench": "yarn workspace bench run bench",
     "TODO(hyf0): #need to investigate following commands": "_",
     "build:ci:release": "run-s build:packages:ci build:ts build:binding:release",
     "build:ts": "tsc -b tsconfig.project.json"
diff --git a/packages/bench/package.json b/packages/bench/package.json
@@ -1,4 +1,5 @@
 {
+  "name": "bench",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
@@ -2985,9 +2985,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bench-f64382@workspace:packages/bench":
+"bench@workspace:packages/bench":
   version: 0.0.0-use.local
-  resolution: "bench-f64382@workspace:packages/bench"
+  resolution: "bench@workspace:packages/bench"
   dependencies:
     "@rolldown/node": "workspace:*"
     esbuild: ^0.19.5

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ impl Module {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
	`75`	`+ #[tracing::instrument(skip_all)]`
`75`	`76`	`pub fn render(&self, ctx: ModuleRenderContext) -> Option<MagicString<'_>> {`
`76`	`77`	`match self {`
`77`	`78`	`Self::Normal(m) => m.render(ctx),`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ impl<'task, T: FileSystem + Default + 'static> NormalModuleTask<'task, T> {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
	`61`	`+ #[tracing::instrument(skip_all)]`
`61`	`62`	`pub async fn run(mut self) -> BatchedResult<()> {`
`62`	`63`	`let mut builder = NormalModuleBuilder::default();`
`63`	`64`	`tracing::trace!("process {:?}", self.path);`
`@@ -204,6 +205,7 @@ impl<'task, T: FileSystem + Default + 'static> NormalModuleTask<'task, T> {`
`204`	`205`	`Ok(info)`
`205`	`206`	`}`
`206`	`207`
	`208`	`+ #[tracing::instrument(skip_all)]`
`207`	`209`	`async fn resolve_dependencies(`
`208`	`210`	`&mut self,`
`209`	`211`	`dependencies: &IndexVec<ImportRecordId, RawImportRecord>,`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ impl RuntimeNormalModuleTask {`
`29`	`29`	`Self { module_id: id, tx, warnings: Vec::default() }`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ #[tracing::instrument(skip_all)]`
`32`	`33`	`pub fn run(self) {`
`33`	`34`	`let mut builder = NormalModuleBuilder::default();`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ impl<Fs: FileSystem + Default + 'static> ScanStage<Fs> {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	/// Resolve `InputOptions.input`
	`71`	`+ #[tracing::instrument(skip_all)]`
`71`	`72`	`fn resolve_user_defined_entries(`
`72`	`73`	`&self,`
`73`	`74`	`) -> BatchedResult<Vec<(Option<String>, ResolvedRequestInfo)>> {`
Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ impl<'a> Scanner<'a> {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`impl<'ast> Visit<'ast> for Scanner<'ast> {`
	`302`	`+ #[tracing::instrument(skip_all)]`
`302`	`303`	`fn visit_program(&mut self, program: &oxc::ast::ast::Program<'ast>) {`
`303`	`304`	`for (idx, stmt) in program.body.iter().enumerate() {`
`304`	`305`	`self.current_stmt_info.stmt_idx = Some(idx);`