chore: rename to typstyle

.github/workflows/gh-pages.yml

@@ -40,7 +40,7 @@ jobs:
       - run: |
           cd web
           yarn
-          yarn build --base=/typst-geshihua
+          yarn build --base=/typstyle
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
         uses: codecov/[email protected]
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          slug: Enter-tainer/typst-geshihua
+          slug: Enter-tainer/typstyle
 
   build:
     needs: [pre_build, test]
@@ -117,54 +117,54 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install gcc-arm-linux-gnueabihf
-      - name: Build typst-geshihua binary
+      - name: Build typstyle binary
         shell: pwsh
         run: |
           cargo build --release --target ${{ matrix.rust-target }}
       - name: Rename debug symbols for windows
         if: matrix.platform == 'win32'
         run: |
           cd target/${{ matrix.rust-target }}/release
-          cp typst_geshihua.pdb typst_geshihua-${{ env.target }}.pdb
+          cp typstyle.pdb typstyle-${{ env.target }}.pdb
       - name: Upload split debug symbols for windows
         if: matrix.platform == 'win32'
         uses: actions/upload-artifact@v4
         with:
-          name: typst_geshihua-${{ env.target }}.pdb
-          path: target/${{ matrix.rust-target }}/release/typst_geshihua-${{ env.target }}.pdb
+          name: typstyle-${{ env.target }}.pdb
+          path: target/${{ matrix.rust-target }}/release/typstyle-${{ env.target }}.pdb
       - name: Split debug symbols for linux
         if: matrix.platform == 'linux'
         run: |
           cd target/${{ matrix.rust-target }}/release
-          llvm-objcopy --compress-debug-sections --only-keep-debug "typst-geshihua" "typst-geshihua-${{ env.target }}.debug"
-          llvm-objcopy --strip-debug --add-gnu-debuglink="typst-geshihua-${{ env.target }}.debug" "typst-geshihua"
+          llvm-objcopy --compress-debug-sections --only-keep-debug "typstyle" "typstyle-${{ env.target }}.debug"
+          llvm-objcopy --strip-debug --add-gnu-debuglink="typstyle-${{ env.target }}.debug" "typstyle"
       - name: Upload split debug symbols for linux
         if: matrix.platform == 'linux'
         uses: actions/upload-artifact@v4
         with:
-          name: typst-geshihua-${{ env.target }}.debug
-          path: target/${{ matrix.rust-target }}/release/typst-geshihua-${{ env.target }}.debug
+          name: typstyle-${{ env.target }}.debug
+          path: target/${{ matrix.rust-target }}/release/typstyle-${{ env.target }}.debug
           compression-level: 0
       - name: Collect debug symbols for mac
         if: matrix.platform == 'darwin'
         run: |
-          dsymutil -f "target/${{ matrix.rust-target }}/release/typst-geshihua"
-          mv "target/${{ matrix.rust-target }}/release/typst-geshihua.dwarf" "target/${{ matrix.rust-target }}/release/typst-geshihua-${{ env.target }}.dwarf"
+          dsymutil -f "target/${{ matrix.rust-target }}/release/typstyle"
+          mv "target/${{ matrix.rust-target }}/release/typstyle.dwarf" "target/${{ matrix.rust-target }}/release/typstyle-${{ env.target }}.dwarf"
       - name: Upload split debug symbols for mac
         if: matrix.platform == 'darwin'
         uses: actions/upload-artifact@v4
         with:
-          name: typst-geshihua-${{ env.target }}.dwarf
-          path: target/${{ matrix.rust-target }}/release/typst-geshihua-${{ env.target }}.dwarf
+          name: typstyle-${{ env.target }}.dwarf
+          path: target/${{ matrix.rust-target }}/release/typstyle-${{ env.target }}.dwarf
       - name: Copy binary to output directory
         shell: pwsh
         run: |
-          cp "target/${{ matrix.rust-target }}/release/typst-geshihua$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )" "typst-geshihua-${{ env.target }}$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )"
+          cp "target/${{ matrix.rust-target }}/release/typstyle$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )" "typstyle-${{ env.target }}$(If ('${{ matrix.platform }}' -eq 'win32') { '.exe' } else { '' } )"
       - name: Upload binary artifact
         uses: actions/upload-artifact@v4
         with:
-          name: typst-geshihua-${{ env.target }}
-          path: typst-geshihua-${{ env.target }}${{ fromJSON('["", ".exe"]')[matrix.platform == 'win32'] }}
+          name: typstyle-${{ env.target }}
+          path: typstyle-${{ env.target }}${{ fromJSON('["", ".exe"]')[matrix.platform == 'win32'] }}
 
   build_alpine:
     needs: [pre_build, test]
@@ -187,27 +187,27 @@ jobs:
           submodules: recursive
       - name: Run sccache-cache
         uses: mozilla-actions/[email protected]
-      - name: Build typst-geshihua binary
+      - name: Build typstyle binary
         run: |
           cargo build --release --target $RUST_TARGET
       - name: Split debug symbols
         run: |
           cd target/$RUST_TARGET/release
-          objcopy --compress-debug-sections --only-keep-debug "typst-geshihua" "typst-geshihua-${{ env.target }}.debug"
-          objcopy --strip-debug --add-gnu-debuglink="typst-geshihua-${{ env.target }}.debug" "typst-geshihua"
+          objcopy --compress-debug-sections --only-keep-debug "typstyle" "typstyle-${{ env.target }}.debug"
+          objcopy --strip-debug --add-gnu-debuglink="typstyle-${{ env.target }}.debug" "typstyle"
       - name: Upload split debug symbols
         uses: actions/upload-artifact@v4
         with:
-          name: typst-geshihua-${{ env.target }}.debug
-          path: target/${{ env.RUST_TARGET }}/release/typst-geshihua-${{ env.target }}.debug
+          name: typstyle-${{ env.target }}.debug
+          path: target/${{ env.RUST_TARGET }}/release/typstyle-${{ env.target }}.debug
       - name: Copy binary to output directory
         run: |
-          cp "target/${{ env.RUST_TARGET }}/release/typst-geshihua" "typst-geshihua-${{ env.target }}"
+          cp "target/${{ env.RUST_TARGET }}/release/typstyle" "typstyle-${{ env.target }}"
       - name: Upload binary artifact
         uses: actions/upload-artifact@v4
         with:
-          name: typst-geshihua-${{ env.target }}
-          path: typst-geshihua-${{ env.target }}
+          name: typstyle-${{ env.target }}
+          path: typstyle-${{ env.target }}
 
   release:
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,16 +1,16 @@
 [package]
-name = "typst-geshihua"
+name = "typstyle"
 version = "0.11.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [[bin]]
-name = "typst-geshihua"
+name = "typstyle"
 path = "src/main.rs"
 
 [lib]
-name = "typst_geshihua"
+name = "typstyle"
 path = "src/lib.rs"
 crate-type = ["cdylib", "lib"]
 

README.md

@@ -1,10 +1,10 @@
-# typst-geshihua
+# typstyle
 
-[![codecov](https://codecov.io/gh/Enter-tainer/typst-geshihua/graph/badge.svg?token=Y2SuYfwd7y)](https://codecov.io/gh/Enter-tainer/typst-geshihua)
+[![codecov](https://codecov.io/gh/Enter-tainer/typstyle/graph/badge.svg?token=Y2SuYfwd7y)](https://codecov.io/gh/Enter-tainer/typstyle)
 
 Usage: 
 ```
-Usage: typst-geshihua [OPTIONS] <INPUT>
+Usage: typstyle [OPTIONS] <INPUT>
 
 Arguments:
   <INPUT>  Path to the input file
@@ -20,9 +20,9 @@ Options:
 
 ## Escape Route
 
-If you find typst-geshihua is not working as expected, you can use `// @geshihua off` or `/* @geshihua off */` to disable the formatter on the next node of code.
+If you find typstyle is not working as expected, you can use `// @typstyle off` or `/* @typstyle off */` to disable the formatter on the next node of code.
 
-And please let us know the issue by creating an issue on the [GitHub repository](https://github.com/Enter-tainer/typst-geshihua)
+And please let us know the issue by creating an issue on the [GitHub repository](https://github.com/Enter-tainer/typstyle)
 
 ## Test
 

examples/pretty_test.rs

@@ -1,5 +1,5 @@
 use pretty::BoxDoc;
-use typst_geshihua::util::pretty_items;
+use typstyle::util::pretty_items;
 
 fn main() {
     let strs = ["123", "12345", "1234", "1234567"];
@@ -11,7 +11,7 @@ fn main() {
         BoxDoc::text(","),
         (BoxDoc::text("["), BoxDoc::text("]")),
         false,
-        typst_geshihua::util::FoldStyle::Fit,
+        typstyle::util::FoldStyle::Fit,
     );
 
     let res_10 = outer.pretty(10).to_string();

src/cli.rs

@@ -4,7 +4,7 @@ use clap::Parser;
 use once_cell::sync::Lazy;
 
 #[derive(Debug, Clone, Parser)]
-#[clap(name = "typst-geshihua", author, version, about, long_version(LONG_VERSION.as_str()))]
+#[clap(name = "typstyle", author, version, about, long_version(LONG_VERSION.as_str()))]
 pub struct CliArguments {
     /// Path to the input file
     pub input: PathBuf,

src/main.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use typst_geshihua::{prop::get_no_format_nodes, PrettyPrinter};
+use typstyle::{prop::get_no_format_nodes, PrettyPrinter};
 use typst_syntax::parse;
 
 use crate::cli::CliArguments;

src/prop.rs

@@ -18,7 +18,7 @@ fn get_no_format_nodes_impl(node: SyntaxNode, map: &mut HashSet<SyntaxNode>) {
     let mut no_format = false;
     for child in node.children() {
         if child.kind() == SyntaxKind::LineComment || child.kind() == SyntaxKind::BlockComment {
-            if child.text().contains("@geshihua off") {
+            if child.text().contains("@typstyle off") {
                 no_format = true;
                 map.insert(child.clone());
             }

tests/assets.rs

@@ -1,7 +1,7 @@
 extern crate libtest_mimic;
 
 use libtest_mimic::{Arguments, Failed, Trial};
-use typst_geshihua::pretty_print;
+use typstyle::pretty_print;
 
 use std::{env, error::Error, ffi::OsStr, fs, path::Path};
 

tests/assets/unit/off/code-block.typ

@@ -1,14 +1,14 @@
 #let alert(body, fill: red) = {
   set text(white)
   set align(center)
-  // @geshihua off
+  // @typstyle off
   rect(
     fill: fill,
         inset: 8pt,
     radius: 4pt, [*Warning:\ #body*],
   )
 }
 
-// @geshihua off
+// @typstyle off
 #alert[
   Danger is imminent!]

tests/assets/unit/off/content-func-call.typ

@@ -1,13 +1,13 @@
 
 #table(
-  columns: /* @geshihua off */ (1fr, 
+  columns: /* @typstyle off */ (1fr, 
 auto, auto),
   inset: 10pt, align: horizon,[], 
       [*Area*],
            [*Parameters*],
   [Some image],
   $ pi h (D^2 - d^2) / 4 $,
-  /* @geshihua off */ [
+  /* @typstyle off */ [
       $h$: height \
     $D$: outer radius \
          $d$: inner radius

tests/snapshots/assets__check_file@unit-off-code-block.typ-120.snap

@@ -6,14 +6,14 @@ input_file: tests/assets/unit/off/code-block.typ
 #let alert(body, fill: red) = {
   set text(white)
   set align(center)
-  // @geshihua off
+  // @typstyle off
   rect(
     fill: fill,
         inset: 8pt,
     radius: 4pt, [*Warning:\ #body*],
   )
 }
 
-// @geshihua off
+// @typstyle off
 #alert[
   Danger is imminent!]

tests/snapshots/assets__check_file@unit-off-code-block.typ-40.snap

@@ -6,14 +6,14 @@ input_file: tests/assets/unit/off/code-block.typ
 #let alert(body, fill: red) = {
   set text(white)
   set align(center)
-  // @geshihua off
+  // @typstyle off
   rect(
     fill: fill,
         inset: 8pt,
     radius: 4pt, [*Warning:\ #body*],
   )
 }
 
-// @geshihua off
+// @typstyle off
 #alert[
   Danger is imminent!]

tests/snapshots/assets__check_file@unit-off-code-block.typ-80.snap

@@ -6,14 +6,14 @@ input_file: tests/assets/unit/off/code-block.typ
 #let alert(body, fill: red) = {
   set text(white)
   set align(center)
-  // @geshihua off
+  // @typstyle off
   rect(
     fill: fill,
         inset: 8pt,
     radius: 4pt, [*Warning:\ #body*],
   )
 }
 
-// @geshihua off
+// @typstyle off
 #alert[
   Danger is imminent!]

tests/snapshots/assets__check_file@unit-off-content-func-call.typ-120.snap

@@ -4,14 +4,14 @@ expression: doc_string
 input_file: tests/assets/unit/off/content-func-call.typ
 ---
 #table(
-  columns: /* @geshihua off */ (1fr, 
+  columns: /* @typstyle off */ (1fr, 
 auto, auto),
   inset: 10pt, align: horizon,[], 
       [*Area*],
            [*Parameters*],
   [Some image],
   $ pi h (D^2 - d^2) / 4 $,
-  /* @geshihua off */ [
+  /* @typstyle off */ [
       $h$: height \
     $D$: outer radius \
          $d$: inner radius

tests/snapshots/assets__check_file@unit-off-content-func-call.typ-40.snap

@@ -4,14 +4,14 @@ expression: doc_string
 input_file: tests/assets/unit/off/content-func-call.typ
 ---
 #table(
-  columns: /* @geshihua off */ (1fr, 
+  columns: /* @typstyle off */ (1fr, 
 auto, auto),
   inset: 10pt, align: horizon,[], 
       [*Area*],
            [*Parameters*],
   [Some image],
   $ pi h (D^2 - d^2) / 4 $,
-  /* @geshihua off */ [
+  /* @typstyle off */ [
       $h$: height \
     $D$: outer radius \
          $d$: inner radius