From db294eab51eddbbcc8bdd9555fa6f087f633958f Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 23 Dec 2024 14:17:55 +0800
Subject: [PATCH 1/2] build: bump typstfmt to v0.12.0

---
 Cargo.lock                         | 161 +++++++++++++++--------------
 Cargo.toml                         |   2 +-
 crates/tinymist/Cargo.toml         |   2 +-
 crates/tinymist/src/init.rs        |  10 +-
 crates/tinymist/src/task/format.rs |  12 +--
 5 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b3ae676b..d1c326798 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -600,23 +600,13 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
-[[package]]
-name = "comemo"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4"
-dependencies = [
- "comemo-macros 0.3.1",
- "siphasher 1.0.1",
-]
-
 [[package]]
 name = "comemo"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df6916408a724339aa77b18214233355f3eb04c42eb895e5f8909215bd8a7a91"
 dependencies = [
- "comemo-macros 0.4.0",
+ "comemo-macros",
  "once_cell",
  "parking_lot",
  "siphasher 1.0.1",
@@ -624,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "comemo-macros"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095"
+checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -634,14 +624,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "comemo-macros"
-version = "0.4.0"
+name = "confy"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db"
+checksum = "e37668cb35145dcfaa1931a5f37fde375eeae8068b4c0d2f289da28a270b2d2c"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
+ "directories",
+ "serde",
+ "thiserror 1.0.69",
+ "toml 0.5.11",
 ]
 
 [[package]]
@@ -865,13 +856,22 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "directories"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
 [[package]]
 name = "dirs"
 version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.4.1",
 ]
 
 [[package]]
@@ -884,6 +884,17 @@ dependencies = [
  "dirs-sys-next",
 ]
 
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.4.1"
@@ -924,15 +935,6 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
-[[package]]
-name = "ecow"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "ecow"
 version = "0.2.3"
@@ -2001,6 +2003,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "lexopt"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"
+
 [[package]]
 name = "libc"
 version = "0.2.167"
@@ -2744,9 +2752,9 @@ source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=1b6e29c650ad6d3095
 dependencies = [
  "base64",
  "bitvec",
- "comemo 0.4.0",
+ "comemo",
  "dashmap",
- "ecow 0.2.3",
+ "ecow",
  "fxhash",
  "instant",
  "parking_lot",
@@ -2768,8 +2776,8 @@ version = "0.5.1"
 source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=1b6e29c650ad6d3095e5ea18d93a2428c1ae77b9#1b6e29c650ad6d3095e5ea18d93a2428c1ae77b9"
 dependencies = [
  "codespan-reporting",
- "comemo 0.4.0",
- "ecow 0.2.3",
+ "comemo",
+ "ecow",
  "futures",
  "fxhash",
  "indexmap 2.7.0",
@@ -2806,7 +2814,7 @@ version = "0.5.1"
 source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=1b6e29c650ad6d3095e5ea18d93a2428c1ae77b9#1b6e29c650ad6d3095e5ea18d93a2428c1ae77b9"
 dependencies = [
  "bitvec",
- "comemo 0.4.0",
+ "comemo",
  "crossbeam-queue",
  "dashmap",
  "flate2",
@@ -2831,7 +2839,7 @@ version = "0.5.1"
 source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=1b6e29c650ad6d3095e5ea18d93a2428c1ae77b9#1b6e29c650ad6d3095e5ea18d93a2428c1ae77b9"
 dependencies = [
  "base64",
- "comemo 0.4.0",
+ "comemo",
  "log",
  "reflexo",
  "reflexo-typst2vec",
@@ -2859,9 +2867,9 @@ source = "git+https://github.com/Myriad-Dreamin/typst.ts/?rev=1b6e29c650ad6d3095
 dependencies = [
  "chrono",
  "codespan-reporting",
- "comemo 0.4.0",
+ "comemo",
  "dirs",
- "ecow 0.2.3",
+ "ecow",
  "flate2",
  "fontdb",
  "hex",
@@ -3832,7 +3840,7 @@ dependencies = [
  "clap_complete_nushell",
  "clap_mangen",
  "codespan-reporting",
- "comemo 0.4.0",
+ "comemo",
  "crossbeam-channel",
  "dhat",
  "dirs",
@@ -3877,7 +3885,7 @@ dependencies = [
  "typst-shim",
  "typst-svg",
  "typst-timing",
- "typstfmt_lib",
+ "typstfmt",
  "typstyle-core",
  "unicode-script",
  "vergen",
@@ -3889,8 +3897,8 @@ name = "tinymist-analysis"
 version = "0.12.12"
 dependencies = [
  "base64",
- "comemo 0.4.0",
- "ecow 0.2.3",
+ "comemo",
+ "ecow",
  "insta",
  "log",
  "regex",
@@ -3927,10 +3935,10 @@ dependencies = [
  "base64",
  "biblatex",
  "chrono",
- "comemo 0.4.0",
+ "comemo",
  "dashmap",
  "dirs",
- "ecow 0.2.3",
+ "ecow",
  "ena",
  "hashbrown 0.14.5",
  "hex",
@@ -3991,7 +3999,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "clap",
- "comemo 0.4.0",
+ "comemo",
  "dirs",
  "flate2",
  "log",
@@ -4098,6 +4106,15 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml"
 version = "0.7.8"
@@ -4273,8 +4290,8 @@ version = "0.12.12"
 dependencies = [
  "base64",
  "clap",
- "comemo 0.4.0",
- "ecow 0.2.3",
+ "comemo",
+ "ecow",
  "insta",
  "regex",
  "tinymist-analysis",
@@ -4295,9 +4312,9 @@ dependencies = [
  "bumpalo",
  "chinese-number",
  "ciborium",
- "comemo 0.4.0",
+ "comemo",
  "csv",
- "ecow 0.2.3",
+ "ecow",
  "flate2",
  "fontdb",
  "hayagriva",
@@ -4392,8 +4409,8 @@ dependencies = [
  "arrayvec 0.7.6",
  "base64",
  "bytemuck",
- "comemo 0.4.0",
- "ecow 0.2.3",
+ "comemo",
+ "ecow",
  "image",
  "indexmap 2.7.0",
  "miniz_oxide",
@@ -4416,7 +4433,7 @@ name = "typst-preview"
 version = "0.12.12"
 dependencies = [
  "clap",
- "comemo 0.4.0",
+ "comemo",
  "env_logger",
  "futures",
  "indexmap 2.7.0",
@@ -4438,7 +4455,7 @@ version = "0.12.0"
 source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9"
 dependencies = [
  "bytemuck",
- "comemo 0.4.0",
+ "comemo",
  "image",
  "pixglyph",
  "resvg",
@@ -4466,8 +4483,8 @@ version = "0.12.0"
 source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9"
 dependencies = [
  "base64",
- "comemo 0.4.0",
- "ecow 0.2.3",
+ "comemo",
+ "ecow",
  "flate2",
  "ttf-parser",
  "typst",
@@ -4477,30 +4494,14 @@ dependencies = [
  "xmlwriter",
 ]
 
-[[package]]
-name = "typst-syntax"
-version = "0.7.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9"
-dependencies = [
- "comemo 0.3.1",
- "ecow 0.1.2",
- "once_cell",
- "serde",
- "tracing",
- "unicode-ident",
- "unicode-math-class",
- "unicode-segmentation",
- "unscanny",
-]
-
 [[package]]
 name = "typst-syntax"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3db69f2f41613b1ff6edbec44fd7dc524137f099ee36c46f560cedeaadb40c4"
 dependencies = [
- "comemo 0.4.0",
- "ecow 0.2.3",
+ "comemo",
+ "ecow",
  "once_cell",
  "serde",
  "unicode-ident",
@@ -4515,7 +4516,7 @@ name = "typst-syntax"
 version = "0.12.0"
 source = "git+https://github.com/Myriad-Dreamin/typst.git?tag=tinymist-v0.12.0#58426a90a7ef721738a01be09793d33e55eb75a9"
 dependencies = [
- "ecow 0.2.3",
+ "ecow",
  "once_cell",
  "serde",
  "toml 0.8.19",
@@ -4551,18 +4552,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "typstfmt_lib"
-version = "0.2.7"
-source = "git+https://github.com/astrale-sharp/typstfmt?tag=0.2.7#46b4ec34b4726c3c6541012f433c68c22d9e509c"
+name = "typstfmt"
+version = "0.12.0"
+source = "git+https://github.com/Myriad-Dreamin/typstfmt?tag=v0.12.0#6def255a6d966dc6055e059225832263e9273f01"
 dependencies = [
+ "confy",
  "globmatch",
  "itertools 0.10.5",
+ "lexopt",
  "regex",
  "serde",
  "toml 0.7.8",
  "tracing",
- "typst-syntax 0.7.0",
- "unicode-segmentation",
+ "typst-syntax 0.12.0",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -4571,7 +4574,7 @@ version = "0.12.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ab4ca4a1cc62f670b3cf96d37b1d5284ab9137418f476610847d79d5f3a7b8b"
 dependencies = [
- "ecow 0.2.3",
+ "ecow",
  "itertools 0.13.0",
  "pretty",
  "rustc-hash 2.1.0",
diff --git a/Cargo.toml b/Cargo.toml
index c900c9889..2cb11d85b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -111,7 +111,7 @@ typst-render = "0.12.0"
 typst-pdf = "0.12.0"
 typst-syntax = "0.12.0"
 typst-assets = "0.12.0"
-typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", tag = "0.2.7" }
+typstfmt = { git = "https://github.com/Myriad-Dreamin/typstfmt", tag = "v0.12.0" }
 typstyle-core = { version = "=0.12.13", default-features = false }
 typlite = { path = "./crates/typlite" }
 typst-shim = { path = "./crates/typst-shim", features = ["nightly"] }
diff --git a/crates/tinymist/Cargo.toml b/crates/tinymist/Cargo.toml
index 63061dccd..0a095f7a8 100644
--- a/crates/tinymist/Cargo.toml
+++ b/crates/tinymist/Cargo.toml
@@ -54,7 +54,7 @@ typst-timing.workspace = true
 typst-assets.workspace = true
 
 typstyle-core.workspace = true
-typstfmt_lib.workspace = true
+typstfmt.workspace = true
 
 reflexo.workspace = true
 reflexo-typst.workspace = true
diff --git a/crates/tinymist/src/init.rs b/crates/tinymist/src/init.rs
index ec3a68779..8d687c658 100644
--- a/crates/tinymist/src/init.rs
+++ b/crates/tinymist/src/init.rs
@@ -403,12 +403,10 @@ impl Config {
                 FormatterMode::Typstyle => FormatterConfig::Typstyle(Box::new(
                     typstyle_core::PrinterConfig::new_with_width(formatter_print_width),
                 )),
-                FormatterMode::Typstfmt => {
-                    FormatterConfig::Typstfmt(Box::new(typstfmt_lib::Config {
-                        max_line_length: formatter_print_width,
-                        ..typstfmt_lib::Config::default()
-                    }))
-                }
+                FormatterMode::Typstfmt => FormatterConfig::Typstfmt(Box::new(typstfmt::Config {
+                    max_line_length: formatter_print_width,
+                    ..typstfmt::Config::default()
+                })),
                 FormatterMode::Disable => FormatterConfig::Disable,
             },
             position_encoding: self.const_config.position_encoding,
diff --git a/crates/tinymist/src/task/format.rs b/crates/tinymist/src/task/format.rs
index 4546ed657..b797de67f 100644
--- a/crates/tinymist/src/task/format.rs
+++ b/crates/tinymist/src/task/format.rs
@@ -12,7 +12,7 @@ use super::SyncTaskFactory;
 #[derive(Debug, Clone)]
 pub enum FormatterConfig {
     Typstyle(Box<typstyle_core::PrinterConfig>),
-    Typstfmt(Box<typstfmt_lib::Config>),
+    Typstfmt(Box<typstfmt::Config>),
     Disable,
 }
 
@@ -26,11 +26,7 @@ impl FormatterConfig {
                     && a.chain_width_ratio == b.chain_width_ratio
                     && a.blank_lines_upper_bound == b.blank_lines_upper_bound
             }
-            (Self::Typstfmt(a), Self::Typstfmt(b)) => {
-                let a = serde_json::to_value(a).ok();
-                let b = serde_json::to_value(b).ok();
-                a == b
-            }
+            (Self::Typstfmt(a), Self::Typstfmt(b)) => a == b,
             (Self::Disable, Self::Disable) => true,
             _ => false,
         }
@@ -75,9 +71,7 @@ impl FormatTask {
                         .pretty_print()
                         .ok()
                 }
-                FormatterConfig::Typstfmt(config) => {
-                    Some(typstfmt_lib::format(src.text(), **config))
-                }
+                FormatterConfig::Typstfmt(config) => Some(typstfmt::format(src.text(), **config)),
                 FormatterConfig::Disable => None,
             };
 

From adc770e5be35e8433c9daaa3c6d176441126da8a Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 23 Dec 2024 14:27:24 +0800
Subject: [PATCH 2/2] build: bump typstfmt to 0.12.1

---
 Cargo.lock | 112 ++++++++++++-----------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 25 insertions(+), 89 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1c326798..32bddce28 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -625,14 +625,14 @@ dependencies = [
 
 [[package]]
 name = "confy"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37668cb35145dcfaa1931a5f37fde375eeae8068b4c0d2f289da28a270b2d2c"
+checksum = "45b1f4c00870f07dc34adcac82bb6a72cc5aabca8536ba1797e01df51d2ce9a0"
 dependencies = [
  "directories",
  "serde",
  "thiserror 1.0.69",
- "toml 0.5.11",
+ "toml",
 ]
 
 [[package]]
@@ -858,11 +858,11 @@ dependencies = [
 
 [[package]]
 name = "directories"
-version = "4.0.1"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
 dependencies = [
- "dirs-sys 0.3.7",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -871,7 +871,7 @@ version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys 0.4.1",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -884,17 +884,6 @@ dependencies = [
  "dirs-sys-next",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
 [[package]]
 name = "dirs-sys"
 version = "0.4.1"
@@ -1296,12 +1285,11 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "globmatch"
-version = "0.2.5"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3755076379cc2b2bbf53855fe718e1eed3093cfb769ebf5d290f617fa9cc09a0"
+checksum = "c5d4150c6e70e3bce79303d8959fbb11533398b883464f71b5d8db8e880a20d8"
 dependencies = [
  "globset",
- "log",
  "walkdir",
 ]
 
@@ -1924,15 +1912,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -3850,7 +3829,7 @@ dependencies = [
  "hyper",
  "hyper-tungstenite",
  "hyper-util",
- "itertools 0.13.0",
+ "itertools",
  "log",
  "lsp-server",
  "lsp-types",
@@ -3873,7 +3852,7 @@ dependencies = [
  "tinymist-world",
  "tokio",
  "tokio-util",
- "toml 0.8.19",
+ "toml",
  "ttf-parser",
  "typlite",
  "typst",
@@ -3903,7 +3882,7 @@ dependencies = [
  "log",
  "regex",
  "tinymist-world",
- "toml 0.8.19",
+ "toml",
  "typst",
  "typst-svg",
  "typst-syntax 0.12.0",
@@ -3945,7 +3924,7 @@ dependencies = [
  "if_chain",
  "indexmap 2.7.0",
  "insta",
- "itertools 0.13.0",
+ "itertools",
  "log",
  "lsp-types",
  "once_cell",
@@ -3969,7 +3948,7 @@ dependencies = [
  "tinymist-analysis",
  "tinymist-derive",
  "tinymist-world",
- "toml 0.8.19",
+ "toml",
  "triomphe",
  "ttf-parser",
  "typlite",
@@ -4106,27 +4085,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.19"
@@ -4136,7 +4094,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.22",
+ "toml_edit",
 ]
 
 [[package]]
@@ -4148,19 +4106,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.7.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.22.22"
@@ -4171,7 +4116,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.20",
+ "winnow",
 ]
 
 [[package]]
@@ -4350,7 +4295,7 @@ dependencies = [
  "stacker",
  "syntect",
  "time",
- "toml 0.8.19",
+ "toml",
  "ttf-parser",
  "two-face 0.4.0",
  "typed-arena",
@@ -4519,7 +4464,7 @@ dependencies = [
  "ecow",
  "once_cell",
  "serde",
- "toml 0.8.19",
+ "toml",
  "typst-utils",
  "unicode-ident",
  "unicode-math-class",
@@ -4553,19 +4498,19 @@ dependencies = [
 
 [[package]]
 name = "typstfmt"
-version = "0.12.0"
-source = "git+https://github.com/Myriad-Dreamin/typstfmt?tag=v0.12.0#6def255a6d966dc6055e059225832263e9273f01"
+version = "0.12.1"
+source = "git+https://github.com/Myriad-Dreamin/typstfmt?tag=v0.12.1#c1fd45a4594b916b6e37e3257a69dbcdf25fe339"
 dependencies = [
  "confy",
  "globmatch",
- "itertools 0.10.5",
+ "itertools",
  "lexopt",
  "regex",
  "serde",
- "toml 0.7.8",
+ "toml",
  "tracing",
  "typst-syntax 0.12.0",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -4575,7 +4520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ab4ca4a1cc62f670b3cf96d37b1d5284ab9137418f476610847d79d5f3a7b8b"
 dependencies = [
  "ecow",
- "itertools 0.13.0",
+ "itertools",
  "pretty",
  "rustc-hash 2.1.0",
  "typst-syntax 0.12.0",
@@ -5183,15 +5128,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.6.20"
diff --git a/Cargo.toml b/Cargo.toml
index 2cb11d85b..36c3de5e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -111,7 +111,7 @@ typst-render = "0.12.0"
 typst-pdf = "0.12.0"
 typst-syntax = "0.12.0"
 typst-assets = "0.12.0"
-typstfmt = { git = "https://github.com/Myriad-Dreamin/typstfmt", tag = "v0.12.0" }
+typstfmt = { git = "https://github.com/Myriad-Dreamin/typstfmt", tag = "v0.12.1" }
 typstyle-core = { version = "=0.12.13", default-features = false }
 typlite = { path = "./crates/typlite" }
 typst-shim = { path = "./crates/typst-shim", features = ["nightly"] }