Add support for web assembly output

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - name: Test
-        run: cargo test
+        run: cargo test --all
   format:
     name: Cargo format (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
@@ -56,11 +56,11 @@ jobs:
     name: Nix build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v25
-      with:
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
-        nix_path: nixpkgs=channel:nixos-unstable
-    - uses: DeterminateSystems/magic-nix-cache-action@v2
-    - run: nix build
-    - run: nix flake check --all-systems
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v25
+        with:
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: DeterminateSystems/magic-nix-cache-action@v2
+      - run: nix build
+      - run: nix flake check --all-systems

.gitignore

@@ -1,4 +1,5 @@
 /debug/
+tex-fmt-lib/tests/target
 /target/
 **/*.rs.bk
 *.pdb
@@ -11,3 +12,4 @@ perf.data*
 *.pdf
 *.png
 cachegrind.out
+tex-fmt-wasm/pkg

Cargo.toml

@@ -1,5 +1,15 @@
+[workspace]
+members = [
+    "tex-fmt-lib", 
+    ".",
+    "tex-fmt-wasm",
+]
+
 [package]
 name = "tex-fmt"
+edition = "2021"
+
+[workspace.package]
 version = "0.4.7"
 authors = ["William George Underwood"]
 license = "MIT"
@@ -10,14 +20,15 @@ keywords = ["latex", "formatter"]
 categories = ["command-line-utilities", "development-tools"]
 exclude = ["tests/*", "extra/*", "*.nix", ".github/*"]
 
+[[bin]]
+name = "bin"
+path = "src/main.rs"
+
 [dependencies]
-clap = { version = "4.5.21", features = ["derive"] }
-colored = "2.1.0"
-env_logger = "0.11.5"
-lazy_static = "1.5.0"
-log = "0.4.22"
-regex = "1.11.1"
-similar = "2.6.0"
+tex-fmt-lib = { path = "./tex-fmt-lib" }
+
+[workspace.dependencies]
+fs = "0.0.5"
 
 [profile.release]
 codegen-units = 1

justfile

@@ -13,7 +13,7 @@ build:
   @cargo build -r
 
 test:
-  @cargo test
+  @cargo test --all
 
 doc:
   @cargo doc

src/main.rs

@@ -1,81 +1,10 @@
 //! tex-fmt
 //! An extremely fast LaTeX formatter written in Rust
 
-#![warn(missing_docs)]
-#![warn(clippy::nursery)]
-#![warn(clippy::cargo)]
-#![warn(clippy::missing_docs_in_private_items)]
-#![warn(clippy::pedantic)]
-#![allow(clippy::wildcard_imports)]
-#![allow(clippy::multiple_crate_versions)]
-#![allow(clippy::struct_excessive_bools)]
-#![allow(clippy::module_name_repetitions)]
+#[warn(unused_imports)]
 
-use clap::Parser;
-use std::fs;
-use std::process::ExitCode;
-
-mod cli;
-mod comments;
-mod format;
-mod ignore;
-mod indent;
-mod logging;
-mod read;
-mod regexes;
-mod subs;
-mod verbatim;
-mod wrap;
-mod write;
-use crate::cli::*;
-use crate::format::*;
-use crate::logging::*;
-use crate::read::*;
-use crate::write::*;
-
-#[cfg(test)]
-mod tests;
-
-#[cfg(target_family = "unix")]
-/// Line ending for unix
-const LINE_END: &str = "\n";
-
-#[cfg(target_family = "windows")]
-/// Line ending for Windows
-const LINE_END: &str = "\r\n";
-
-fn main() -> ExitCode {
-    let mut args = Cli::parse();
-    init_logger(args.log_level());
-
-    let mut logs = Vec::<Log>::new();
-    let mut exit_code = args.resolve(&mut logs);
-
-    if exit_code == 0 {
-        if args.stdin {
-            // TODO combine the read and read_stdin functions to simplify this
-            if let Some((file, text)) = read_stdin(&mut logs) {
-                let new_text = format_file(&text, &file, &args, &mut logs);
-                exit_code = process_output(
-                    &args, &file, &text, &new_text, exit_code, &mut logs,
-                );
-            } else {
-                exit_code = 1;
-            }
-        } else {
-            for file in &args.files {
-                if let Some((file, text)) = read(file, &mut logs) {
-                    let new_text = format_file(&text, &file, &args, &mut logs);
-                    exit_code = process_output(
-                        &args, &file, &text, &new_text, exit_code, &mut logs,
-                    );
-                } else {
-                    exit_code = 1;
-                };
-            }
-        }
-    }
-
-    print_logs(&mut logs);
-    ExitCode::from(exit_code)
-}
+fn main() -> std::process::ExitCode {
+    let mut output: Option<String> = None;
+    let exit_code = tex_fmt_lib::run(None, &mut output);
+    std::process::ExitCode::from(exit_code)
+}

tex-fmt-lib/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "tex-fmt-lib"
+description = "tex-fmt compiled to web assembly"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
+edition.workspace = true
+keywords.workspace = true
+categories.workspace = true
+exclude.workspace = true
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+clap = { version = "4.5.21", features = ["derive"] }
+colored = "2.1.0"
+env_logger = "0.11.5"
+lazy_static = "1.5.0"
+log = "0.4.22"
+regex = "1.11.1"
+similar = "2.6.0"
+wasm-bindgen = "0.2"
+web-time = "1.1.0"
+
+[dependencies.web-sys]
+version = "0.3"
+features = ["console"]

src/cli.rs → tex-fmt-lib/src/cli.rs

@@ -61,6 +61,7 @@ impl Cli {
 
     /// Ensure the provided arguments are consistent
     pub fn resolve(&mut self, logs: &mut Vec<Log>) -> u8 {
+
         let mut exit_code = 0;
         self.verbose |= self.trace;
         self.print |= self.stdin;

src/format.rs → tex-fmt-lib/src/format.rs

@@ -19,6 +19,7 @@ pub fn format_file(
     args: &Cli,
     logs: &mut Vec<Log>,
 ) -> String {
+
     record_file_log(logs, Info, file, "Formatting started.");
 
     // Clean the source file and zip its lines with line numbers