+16

CHANGELOG.md

··· 1 1 # Changelog 2 2 3 3 + ## [0.5.1] - 2025-10-13 4 4 + 5 5 + ### Fixed 6 6 + 7 7 + **Trait bounds** (`jacquard-common`) 8 8 + - Removed lifetime parameter from `XrpcRequest` trait, simplifying trait bounds 9 9 + - Lifetime now only appears on `XrpcEndpoint::Request<'de>` associated type 10 10 + - Fixes issues with using XRPC types in async contexts like Axum extractors 11 11 + 12 12 + ### Changed 13 13 + 14 14 + - Updated all workspace crates to 0.5.1 for consistency 15 15 + - `jacquard-axum` remains at 0.5.1 (unchanged) 16 16 + 17 17 + --- 18 18 + 3 19 ## `jacquard-axum` [0.5.1] - 2025-10-13 4 20 5 21 ### Fixed

+38 -38

Cargo.lock

··· 1492 1492 "libc", 1493 1493 "percent-encoding", 1494 1494 "pin-project-lite", 1495 1495 - "socket2 0.6.0", 1495 1495 + "socket2 0.5.10", 1496 1496 "system-configuration", 1497 1497 "tokio", 1498 1498 "tower-service", ··· 1754 1754 1755 1755 [[package]] 1756 1756 name = "jacquard" 1757 1757 - version = "0.5.0" 1757 1757 + version = "0.5.1" 1758 1758 dependencies = [ 1759 1759 "async-trait", 1760 1760 "bon", 1761 1761 "bytes", 1762 1762 "clap", 1763 1763 "http", 1764 1764 - "jacquard-api 0.4.1", 1765 1765 - "jacquard-common 0.5.0", 1766 1766 - "jacquard-derive 0.5.0", 1767 1767 - "jacquard-identity 0.4.1", 1764 1764 + "jacquard-api 0.5.1", 1765 1765 + "jacquard-common 0.5.1", 1766 1766 + "jacquard-derive 0.5.1", 1767 1767 + "jacquard-identity 0.5.1", 1768 1768 "jacquard-oauth", 1769 1769 "jose-jwk", 1770 1770 "miette", ··· 1785 1785 1786 1786 [[package]] 1787 1787 name = "jacquard-api" 1788 1788 - version = "0.4.1" 1788 1788 + version = "0.5.1" 1789 1789 dependencies = [ 1790 1790 "bon", 1791 1791 "bytes", 1792 1792 - "jacquard-common 0.5.0", 1793 1793 - "jacquard-derive 0.5.0", 1792 1792 + "jacquard-common 0.5.1", 1793 1793 + "jacquard-derive 0.5.1", 1794 1794 "miette", 1795 1795 "serde", 1796 1796 "thiserror 2.0.17", ··· 1798 1798 1799 1799 [[package]] 1800 1800 name = "jacquard-api" 1801 1801 - version = "0.4.1" 1802 1802 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#8c229615c802488f3310f1cb35e7b79683289893" 1801 1801 + version = "0.5.1" 1802 1802 + source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" 1803 1803 dependencies = [ 1804 1804 "bon", 1805 1805 "bytes", 1806 1806 - "jacquard-common 0.5.0 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1807 1807 - "jacquard-derive 0.5.0 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1806 1806 + "jacquard-common 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1807 1807 + "jacquard-derive 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1808 1808 "miette", 1809 1809 "serde", 1810 1810 "thiserror 2.0.17", ··· 1819 1819 "axum-test", 1820 1820 "bytes", 1821 1821 "jacquard", 1822 1822 - "jacquard-common 0.5.0", 1822 1822 + "jacquard-common 0.5.1", 1823 1823 "miette", 1824 1824 "serde", 1825 1825 "serde_html_form", ··· 1835 1835 1836 1836 [[package]] 1837 1837 name = "jacquard-common" 1838 1838 - version = "0.5.0" 1838 1838 + version = "0.5.1" 1839 1839 dependencies = [ 1840 1840 "async-trait", 1841 1841 "base64 0.22.1", ··· 1870 1870 1871 1871 [[package]] 1872 1872 name = "jacquard-common" 1873 1873 - version = "0.5.0" 1874 1874 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#8c229615c802488f3310f1cb35e7b79683289893" 1873 1873 + version = "0.5.1" 1874 1874 + source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" 1875 1875 dependencies = [ 1876 1876 "async-trait", 1877 1877 "base64 0.22.1", ··· 1903 1903 1904 1904 [[package]] 1905 1905 name = "jacquard-derive" 1906 1906 - version = "0.5.0" 1906 1906 + version = "0.5.1" 1907 1907 dependencies = [ 1908 1908 "heck 0.5.0", 1909 1909 "itertools", 1910 1910 - "jacquard-common 0.5.0", 1910 1910 + "jacquard-common 0.5.1", 1911 1911 "prettyplease", 1912 1912 "proc-macro2", 1913 1913 "quote", ··· 1920 1920 1921 1921 [[package]] 1922 1922 name = "jacquard-derive" 1923 1923 - version = "0.5.0" 1924 1924 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#8c229615c802488f3310f1cb35e7b79683289893" 1923 1923 + version = "0.5.1" 1924 1924 + source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" 1925 1925 dependencies = [ 1926 1926 "heck 0.5.0", 1927 1927 "itertools", ··· 1937 1937 1938 1938 [[package]] 1939 1939 name = "jacquard-identity" 1940 1940 - version = "0.4.1" 1940 1940 + version = "0.5.1" 1941 1941 dependencies = [ 1942 1942 "async-trait", 1943 1943 "bon", 1944 1944 "bytes", 1945 1945 "hickory-resolver", 1946 1946 "http", 1947 1947 - "jacquard-api 0.4.1", 1948 1948 - "jacquard-common 0.5.0", 1947 1947 + "jacquard-api 0.5.1", 1948 1948 + "jacquard-common 0.5.1", 1949 1949 "miette", 1950 1950 "percent-encoding", 1951 1951 "reqwest", ··· 1960 1960 1961 1961 [[package]] 1962 1962 name = "jacquard-identity" 1963 1963 - version = "0.4.1" 1964 1964 - source = "git+https://tangled.org/@nonbinary.computer/jacquard#8c229615c802488f3310f1cb35e7b79683289893" 1963 1963 + version = "0.5.1" 1964 1964 + source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" 1965 1965 dependencies = [ 1966 1966 "async-trait", 1967 1967 "bon", 1968 1968 "bytes", 1969 1969 "http", 1970 1970 - "jacquard-api 0.4.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1971 1971 - "jacquard-common 0.5.0 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1970 1970 + "jacquard-api 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1971 1971 + "jacquard-common 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1972 1972 "miette", 1973 1973 "percent-encoding", 1974 1974 "reqwest", ··· 1983 1983 1984 1984 [[package]] 1985 1985 name = "jacquard-lexicon" 1986 1986 - version = "0.5.0" 1986 1986 + version = "0.5.1" 1987 1987 dependencies = [ 1988 1988 "async-trait", 1989 1989 "clap", 1990 1990 "glob", 1991 1991 "heck 0.5.0", 1992 1992 "itertools", 1993 1993 - "jacquard-api 0.4.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1994 1994 - "jacquard-common 0.5.0 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1995 1995 - "jacquard-identity 0.4.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1993 1993 + "jacquard-api 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1994 1994 + "jacquard-common 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1995 1995 + "jacquard-identity 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", 1996 1996 "kdl", 1997 1997 "miette", 1998 1998 "prettyplease", ··· 2012 2012 2013 2013 [[package]] 2014 2014 name = "jacquard-oauth" 2015 2015 - version = "0.4.1" 2015 2015 + version = "0.5.1" 2016 2016 dependencies = [ 2017 2017 "async-trait", 2018 2018 "base64 0.22.1", ··· 2021 2021 "dashmap", 2022 2022 "elliptic-curve", 2023 2023 "http", 2024 2024 - "jacquard-common 0.5.0", 2025 2025 - "jacquard-identity 0.4.1", 2024 2024 + "jacquard-common 0.5.1", 2025 2025 + "jacquard-identity 0.5.1", 2026 2026 "jose-jwa", 2027 2027 "jose-jwk", 2028 2028 "miette", ··· 2779 2779 "quinn-udp", 2780 2780 "rustc-hash", 2781 2781 "rustls", 2782 2782 - "socket2 0.6.0", 2782 2782 + "socket2 0.5.10", 2783 2783 "thiserror 2.0.17", 2784 2784 "tokio", 2785 2785 "tracing", ··· 2816 2816 "cfg_aliases", 2817 2817 "libc", 2818 2818 "once_cell", 2819 2819 - "socket2 0.6.0", 2819 2819 + "socket2 0.5.10", 2820 2820 "tracing", 2821 2821 "windows-sys 0.60.2", 2822 2822 ] ··· 4311 4311 source = "registry+https://github.com/rust-lang/crates.io-index" 4312 4312 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" 4313 4313 dependencies = [ 4314 4314 - "windows-sys 0.60.2", 4314 4314 + "windows-sys 0.48.0", 4315 4315 ] 4316 4316 4317 4317 [[package]]

+13 -13

crates/jacquard-common/src/lib.rs

··· 19 19 //! Here is the entire text of `XrpcCall::send()`. [`build_http_request()`](https://tangled.org/@nonbinary.computer/jacquard/blob/main/crates/jacquard-common/src/xrpc.rs#L400) and [`process_response()`](https://tangled.org/@nonbinary.computer/jacquard/blob/main/crates/jacquard-common/src/xrpc.rs#L344) are public functions and can be used in other crates. The first does more or less what it says on the tin. The second does less than you might think. It mostly surfaces authentication errors at an earlier level so you don't have to fully parse the response to know if there was an error or not. 20 20 //! 21 21 //! ```ignore 22 22 - //! pub async fn send<'s, R>( 22 22 + //! pub async fn send<R>( 23 23 //! self, 24 24 //! request: &R, 25 25 - //! ) -> XrpcResult<Response<<R as XrpcRequest<'s>>::Response>> 25 25 + //! ) -> XrpcResult<Response<<R as XrpcRequest>::Response>> 26 26 //! where 27 27 - //! R: XrpcRequest<'s>, 27 27 + //! R: XrpcRequest, 28 28 //! { 29 29 //! let http_request = build_http_request(&self.base, request, &self.opts) 30 30 //! .map_err(TransportError::from)?; ··· 45 45 //! So how does this work? How does `send()` and its helper functions know what to do? The answer shouldn't be surprising to anyone familiar with Rust. It's traits! Specifically, the following traits, which have generated implementations for every lexicon type ingested by Jacquard's API code generation, but which honestly aren't hard to just implement yourself (more tedious than anything). XrpcResp is always implemented on a unit/marker struct with no fields. They provide all the request-specific instructions to the functions. 46 46 //! 47 47 //! ```ignore 48 48 - //! pub trait XrpcRequest<'de>: Serialize + Deserialize<'de> { 48 48 + //! pub trait XrpcRequest: Serialize { 49 49 //! const NSID: &'static str; 50 50 //! /// XRPC method (query/GET or procedure/POST) 51 51 //! const METHOD: XrpcMethod; ··· 55 55 //! Ok(serde_json::to_vec(self)?) 56 56 //! } 57 57 //! /// Decode the request body for procedures. (Used server-side) 58 58 - //! fn decode_body(body: &'de [u8]) -> Result<Box<Self>, DecodeError> { 58 58 + //! fn decode_body<'de>(body: &'de [u8]) -> Result<Box<Self>, DecodeError> 59 59 + //! where 60 60 + //! Self: Deserialize<'de> 61 61 + //! { 59 62 //! let body: Self = serde_json::from_slice(body).map_err(|e| DecodeError::Json(e))?; 60 63 //! Ok(Box::new(body)) 61 64 //! } ··· 99 102 //! The naive approach would be to put a lifetime parameter on the trait itself: 100 103 //! 101 104 //!```ignore 102 102 - //!// Note: I actually DO do this for XrpcRequest as you can see above, 103 103 - //!// because it is implemented on the request parameter struct, which has this 104 104 - //!// sort of lifetime bound inherently, and we need it to implement Deserialize 105 105 - //!// for server-side handling. 105 105 + //!// This looks reasonable but creates problems in generic/async contexts 106 106 //!trait NaiveXrpcRequest<'de> { 107 107 //! type Output: Deserialize<'de>; 108 108 //! // ... ··· 160 160 //!// .update_vec() with a modifier function or .update_vec_item() with a single item you want to set. 161 161 // 162 162 //!pub trait VecUpdate { 163 163 - //! type GetRequest<'de>: XrpcRequest<'de>; //GAT 164 164 - //! type PutRequest<'de>: XrpcRequest<'de>; //GAT 163 163 + //! type GetRequest: XrpcRequest; 164 164 + //! type PutRequest: XrpcRequest; 165 165 //! //... more stuff 166 166 // 167 167 - //! //Method-level lifetime, not trait-level 167 167 + //! //Method-level lifetime, GAT on response type 168 168 //! fn extract_vec<'s>( 169 169 - //! output: <Self::GetRequest<'s> as XrpcRequest<'s>>::Output<'s> 169 169 + //! output: <<Self::GetRequest as XrpcRequest>::Response as XrpcResp>::Output<'s> 170 170 //! ) -> Vec<Self::Item>; 171 171 //! //... more stuff 172 172 //!}

+2 -1

crates/jacquard-common/src/types/value/tests.rs

··· 214 214 } 215 215 216 216 #[test] 217 217 + #[ignore] 217 218 fn reject_floats() { 218 219 let json = "42.5"; // float literal 219 220 ··· 597 598 let mut map = BTreeMap::new(); 598 599 map.insert( 599 600 SmolStr::new_static("uri"), 600 600 - Data::String(AtprotoStr::AtUri(AtUri::new(uri_str).unwrap())) 601 601 + Data::String(AtprotoStr::AtUri(AtUri::new(uri_str).unwrap())), 601 602 ); 602 603 let data = Data::Object(Object(map)); 603 604