diff --git a/crates/radicle-tauri/src/commands/diff.rs b/crates/radicle-tauri/src/commands/diff.rs index 6e4c34444..c2eae9b8b 100644 --- a/crates/radicle-tauri/src/commands/diff.rs +++ b/crates/radicle-tauri/src/commands/diff.rs @@ -9,7 +9,7 @@ use crate::AppState; pub async fn get_diff( ctx: tauri::State<'_, AppState>, rid: identity::RepoId, - options: radicle_types::cobs::diff::Options, + options: radicle_types::cobs::diff::DiffOptions, ) -> Result { ctx.get_diff(rid, options) } diff --git a/crates/radicle-types/bindings/cob/DiffOptions.ts b/crates/radicle-types/bindings/cob/DiffOptions.ts new file mode 100644 index 000000000..ef000d073 --- /dev/null +++ b/crates/radicle-types/bindings/cob/DiffOptions.ts @@ -0,0 +1,8 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type DiffOptions = { + base: string; + head: string; + unified: number | null; + highlight: boolean | null; +}; diff --git a/crates/radicle-types/src/cobs/diff.rs b/crates/radicle-types/src/cobs/diff.rs index f137cd53f..cb982db56 100644 --- a/crates/radicle-types/src/cobs/diff.rs +++ b/crates/radicle-types/src/cobs/diff.rs @@ -1,9 +1,14 @@ use radicle::git; use serde::{Deserialize, Serialize}; +use ts_rs::TS; -#[derive(Serialize, Deserialize)] -pub struct Options { +#[derive(TS, Serialize, Deserialize)] +#[ts(export)] +#[ts(export_to = "cob/")] +pub struct DiffOptions { + #[ts(as = "String")] pub base: git::Oid, + #[ts(as = "String")] pub head: git::Oid, pub unified: Option, pub highlight: Option, diff --git a/crates/radicle-types/src/traits/repo.rs b/crates/radicle-types/src/traits/repo.rs index 7e96c5cab..448f7353b 100644 --- a/crates/radicle-types/src/traits/repo.rs +++ b/crates/radicle-types/src/traits/repo.rs @@ -182,7 +182,11 @@ pub trait Repo: Profile { }) } - fn get_diff(&self, rid: identity::RepoId, options: cobs::diff::Options) -> Result { + fn get_diff( + &self, + rid: identity::RepoId, + options: cobs::diff::DiffOptions, + ) -> Result { let unified = options.unified.unwrap_or(5); let highlight = options.highlight.unwrap_or(true); let profile = self.profile(); diff --git a/crates/test-http-api/src/api.rs b/crates/test-http-api/src/api.rs index b89ab6e8d..1f7a882fb 100644 --- a/crates/test-http-api/src/api.rs +++ b/crates/test-http-api/src/api.rs @@ -165,7 +165,7 @@ async fn diff_stats_handler( #[derive(Serialize, Deserialize)] struct DiffBody { pub rid: identity::RepoId, - pub options: types::cobs::diff::Options, + pub options: types::cobs::diff::DiffOptions, } async fn diff_handler( diff --git a/package-lock.json b/package-lock.json index 80e441efb..fda07aa1f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,6 +44,7 @@ "hast-util-to-dom": "^4.0.1", "keyux": "^0.11.1", "lodash": "^4.17.21", + "lru-cache": "^11.1.0", "marked": "^15.0.7", "marked-emoji": "^2.0.0", "marked-footnote": "^1.2.4", @@ -3388,6 +3389,16 @@ "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==", "dev": true }, + "node_modules/lru-cache": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz", + "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==", + "dev": true, + "license": "ISC", + "engines": { + "node": "20 || >=22" + } + }, "node_modules/magic-string": { "version": "0.30.17", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", diff --git a/package.json b/package.json index bff7d28a6..120e44ca0 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ "hast-util-to-dom": "^4.0.1", "keyux": "^0.11.1", "lodash": "^4.17.21", + "lru-cache": "^11.1.0", "marked": "^15.0.7", "marked-emoji": "^2.0.0", "marked-footnote": "^1.2.4", diff --git a/src/components/Changes.svelte b/src/components/Changes.svelte index c4760eab5..22ae70c70 100644 --- a/src/components/Changes.svelte +++ b/src/components/Changes.svelte @@ -1,10 +1,8 @@