support cli usage

Author: noamzaks

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-description = "A Tauri App"
+description = "A LyX-like experience for Typst"
 authors = ["Noam Zaks", "Myriad-Dreamin", "TyX Developers"]
 version = "0.1.0"
 rust-version = "1.88.0"
@@ -9,7 +9,6 @@ license = "MIT"
 homepage = "https://tyx-editor.com/"
 repository = "https://github.com/tyx-editor/TyX"
 
-
 [workspace]
 resolver = "2"
 members = ["crates/*", "src-tauri"]
@@ -20,20 +19,15 @@ opt-level = 3
 panic = "abort"
 
 [workspace.dependencies]
-
 cmark-writer = { version = "0.6.3", features = ["gfm"] }
 ecow = { version = "0.2", features = ["serde"] }
-
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-
 insta = "1"
-
 tyx-schema = { path = "crates/tyx-schema", version = "0.1.0" }
 tyx-converters = { path = "crates/tyx-converters", version = "0.1.0" }
 tyx-to-typst = { path = "crates/tyx-to-typst", version = "0.1.0" }
 typst-to-tyx = { path = "crates/typst-to-tyx", version = "0.1.0" }
-
 tinymist-project = "0.14.0"
 tinymist-std = "0.14.0"
 tinymist-task = "0.14.0"
@@ -49,7 +43,6 @@ broken_intra_doc_links = "warn"
 
 [workspace.lints.rust]
 missing_docs = "warn"
-
 unexpected_cfgs = { level = "allow", check-cfg = [
     'cfg(wasm_bindgen_unstable_test_coverage)',
     'cfg(noop)',
@@ -74,7 +67,6 @@ ignore-hidden = false
 extend-exclude = ["/.git", "fixtures"]
 
 [patch.crates-io]
-
 # todo: remove these typst patch?
 # A regular build MUST use `tag` or `rev` to specify the version of the patched crate to ensure stability.
 typst = { git = "https://github.com/Myriad-Dreamin/typst.git", tag = "tinymist/v0.14.0-rc1" }

Cargo.toml

@@ -365,7 +365,7 @@ fn tyx_document_settings_to_typst(settings: &Option<TyXDocumentSettings>) -> Str
     }
     if let Some(language) = &settings.language {
         result += &format!(
-            "#set page(lang: {})\n",
+            "#set text(lang: {})\n",
             serde_json::to_string(language).unwrap()
         );
     }

crates/tyx-to-typst/src/lib.rs

@@ -18,6 +18,8 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
 tauri-build = { version = "2", features = [] }
+serde.workspace = true
+serde_json.workspace = true
 
 [dependencies]
 serde.workspace = true
@@ -35,6 +37,7 @@ url = "2.5.4"
 open = "5"
 base64 = "0.22"
 dunce = "1.0.5"
+clap = "4.5.53"
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-updater = "2"

src-tauri/Cargo.toml

@@ -1,3 +1,13 @@
 fn main() {
+    let config = std::fs::read_to_string("tauri.conf.json").expect("tauri.conf.json not found");
+    let version = serde_json::from_str::<serde_json::Value>(&config)
+        .ok()
+        .and_then(|json| json.get("version")?.as_str().map(|s| s.to_string()))
+        .expect("version not found in tauri.conf.json");
+    std::fs::write(
+        "src/version.rs",
+        format!("pub(crate) const VERSION: &str = \"{version}\";"),
+    )
+    .unwrap();
     tauri_build::build()
 }

src-tauri/build.rs

@@ -12,13 +12,33 @@ use tauri::{
     menu::{AboutMetadata, MenuBuilder, MenuItemBuilder, SubmenuBuilder},
 };
 
+use clap::{Parser, ValueEnum};
 use tauri_plugin_dialog::DialogExt;
 use tinymist_project::{
     CompileFontArgs, CompileOnceArgs, EntryReader, TaskInputs, WorldProvider, base::ShadowApi,
 };
 use typst_pdf::PdfOptions;
 use typstyle_core::Typstyle;
 
+mod version;
+
+#[derive(Debug, Clone, ValueEnum)]
+enum OutputFormat {
+    Typst,
+    PDF,
+}
+
+/// Simple program to greet a person
+#[derive(Parser, Debug)]
+#[command(version = version::VERSION, about, long_about = None, display_name="TyX")]
+struct Args {
+    /// Files to open or export.
+    files: Vec<String>,
+    /// Export as this file format.
+    #[arg(short, long)]
+    export: Option<OutputFormat>,
+}
+
 #[tauri::command]
 fn save(filename: &str, content: &str, format: bool) {
     let mut content = String::from(content);
@@ -43,13 +63,14 @@ fn saveas(handle: tauri::AppHandle) {
         .add_filter("TyX", &["tyx"])
         .save_file(move |f| {
             if let Some(f) = f
-                && let Some(path) = f.as_path() {
-                    let mut path = path.to_str().unwrap().to_string();
-                    if !path.ends_with(".tyx") {
-                        path += ".tyx";
-                    }
-                    h.emit("saveas", (path,)).unwrap();
+                && let Some(path) = f.as_path()
+            {
+                let mut path = path.to_str().unwrap().to_string();
+                if !path.ends_with(".tyx") {
+                    path += ".tyx";
                 }
+                h.emit("saveas", (path,)).unwrap();
+            }
         });
 }
 
@@ -110,9 +131,10 @@ fn open(handle: tauri::AppHandle, filename: &str) {
         .add_filter("Typst", &["typ"])
         .pick_file(move |f| {
             if let Some(f) = f
-                && let Some(path) = f.as_path() {
-                    openfile(&h, path, true);
-                }
+                && let Some(path) = f.as_path()
+            {
+                openfile(&h, path, true);
+            }
         });
 }
 
@@ -131,9 +153,10 @@ fn newfromtemplate(handle: tauri::AppHandle) {
         .set_directory(settings_path)
         .pick_file(move |f| {
             if let Some(f) = f
-                && let Some(path) = f.as_path() {
-                    openfile(&h, path, false);
-                }
+                && let Some(path) = f.as_path()
+            {
+                openfile(&h, path, false);
+            }
         });
 }
 
@@ -190,6 +213,57 @@ fn readimage(filename: &str, image: &str) -> String {
     String::from("data:") + mimetype + ";base64," + STANDARD.encode(&bytes).as_str()
 }
 
+fn typst_to_pdf(
+    filename: &str,
+    content: &str,
+    root_path: PathBuf,
+    font_paths: Vec<PathBuf>,
+) -> Result<Vec<u8>, String> {
+    let filename_path = PathBuf::from(&filename);
+    if !filename_path.is_file() {
+        File::create(&filename_path).unwrap();
+    }
+    let filename_path = dunce::canonicalize(filename_path).unwrap();
+    let universe = CompileOnceArgs {
+        root: Some(dunce::canonicalize(&root_path).unwrap()),
+        input: Some(filename_path.to_str().unwrap().to_string()),
+        font: CompileFontArgs {
+            font_paths,
+            ..CompileFontArgs::default()
+        },
+        ..CompileOnceArgs::default()
+    }
+    .resolve()
+    .unwrap();
+    let entry = match universe
+        .entry_state()
+        .try_select_path_in_workspace(&filename_path)
+    {
+        Ok(entry) => entry,
+        Err(_e) => {
+            return Err("Invalid root directory, couldn't select the file itself!".into());
+        }
+    };
+    let mut world = universe.snapshot_with(Some(TaskInputs {
+        entry,
+        ..TaskInputs::default()
+    }));
+    let main = world.main_id().unwrap();
+    let _ = world.map_shadow_by_id(
+        main,
+        typst::foundations::Bytes::from_string(content.to_owned()),
+    );
+    let doc = match typst::compile(&world).output {
+        Ok(doc) => doc,
+        Err(e) => {
+            return Err(e[0].message.to_string());
+        }
+    };
+    let pdf = typst_pdf::pdf(&doc, &PdfOptions::default()).unwrap();
+
+    Ok(pdf)
+}
+
 #[tauri::command]
 fn preview(
     handle: tauri::AppHandle,
@@ -237,51 +311,16 @@ fn preview(
             dunce::canonicalize(&p).unwrap()
         })
         .collect::<Vec<PathBuf>>();
+
     font_paths.insert(0, tyx_fonts_path);
-    let filename_path = PathBuf::from(&filename);
-    if !filename_path.is_file() {
-        File::create(&filename_path).unwrap();
-    }
-    let filename_path = dunce::canonicalize(filename_path).unwrap();
-    let universe = CompileOnceArgs {
-        root: Some(dunce::canonicalize(&root_path).unwrap()),
-        input: Some(filename_path.to_str().unwrap().to_string()),
-        font: CompileFontArgs {
-            font_paths,
-            ..CompileFontArgs::default()
-        },
-        ..CompileOnceArgs::default()
-    }
-    .resolve()
-    .unwrap();
-    let entry = match universe
-        .entry_state()
-        .try_select_path_in_workspace(&filename_path)
-    {
-        Ok(entry) => entry,
-        Err(_e) => {
-            return String::from("Invalid root directory, couldn't select the file itself!");
-        }
-    };
-    let mut world = universe.snapshot_with(Some(TaskInputs {
-        entry,
-        ..TaskInputs::default()
-    }));
-    let main = world.main_id().unwrap();
-    let _ = world.map_shadow_by_id(
-        main,
-        typst::foundations::Bytes::from_string(content.to_owned()),
-    );
-    let doc = match typst::compile(&world).output {
-        Ok(doc) => doc,
+
+    let pdf = match typst_to_pdf(&filename, content, root_path, font_paths) {
+        Ok(pdf) => pdf,
         Err(e) => {
-            if e.is_empty() {
-                return String::new();
-            }
-            return e[0].message.to_string();
+            return e;
         }
     };
-    let pdf = typst_pdf::pdf(&doc, &PdfOptions::default()).unwrap();
+
     let mut f = File::create(&pdf_file).unwrap();
     f.write_all(&pdf).unwrap();
 
@@ -308,13 +347,14 @@ fn insertimage(handle: tauri::AppHandle, filename: &str) {
         .add_filter("Image", &["png", "jpg", "jpeg", "gif", "svg"])
         .pick_file(move |f| {
             if let Some(f) = f
-                && let Some(path) = f.as_path() {
-                    h.emit(
-                        "insertImage",
-                        (path.strip_prefix(dirname).unwrap_or(path).to_str().unwrap(),),
-                    )
-                    .unwrap();
-                }
+                && let Some(path) = f.as_path()
+            {
+                h.emit(
+                    "insertImage",
+                    (path.strip_prefix(dirname).unwrap_or(path).to_str().unwrap(),),
+                )
+                .unwrap();
+            }
         });
 }
 
@@ -354,6 +394,38 @@ pub fn run() {
 
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 pub fn run() {
+    let args = Args::parse();
+
+    if let Some(format) = args.export {
+        for file in args.files {
+            let file_base = match file.strip_suffix(".tyx") {
+                Some(file) => file,
+                None => {
+                    println!("warning: file {file} might not be a TyX document!");
+                    &file
+                }
+            };
+            let dirname = Path::new(&file).parent().unwrap().to_str().unwrap();
+            let contents = std::fs::read_to_string(&file).unwrap();
+            let result = match format {
+                OutputFormat::Typst => {
+                    tyx_converters::serialized_tyx_to_typst(&contents).into_bytes()
+                }
+                OutputFormat::PDF => {
+                    let contents = tyx_converters::serialized_tyx_to_typst(&contents);
+                    typst_to_pdf(&file, &contents, PathBuf::from(dirname), vec![]).unwrap()
+                }
+            };
+            let file_extension = match format {
+                OutputFormat::Typst => ".typ",
+                OutputFormat::PDF => ".pdf",
+            };
+
+            std::fs::write(String::from(file_base) + file_extension, result).unwrap();
+        }
+        return;
+    }
+
     tauri::Builder::default()
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_updater::Builder::new().build())

src-tauri/src/lib.rs

@@ -0,0 +1 @@
+pub(crate) const VERSION: &str = "0.2.15";