Merge remote-tracking branch 'origin/master'

.github/workflows/typos.yml

@@ -0,0 +1,16 @@
+name: Typos
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  typos:
+    name: Check for typos
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: crate-ci/typos@v1.19.0

.typos.toml

@@ -0,0 +1,9 @@
+[default]
+extend-ignore-re = [
+    "ff32ba0",
+]
+
+[files]
+extend-exclude = [
+    "crates/aide/res/**/*.js",
+]

crates/aide/Cargo.toml

@@ -17,7 +17,6 @@ serde_json = "1"
 thiserror = "1"
 tracing = "0"
 aide-macros = { version = "0.7.0", path = "../aide-macros", optional = true }
-derive_more = "0.99.17"
 
 bytes = { version = "1", optional = true }
 http = { version = "1.0.0", optional = true }

crates/aide/src/axum/mod.rs

@@ -713,7 +713,7 @@ mod private {
     pub trait Sealed {}
 }
 
-/// A trait that extens [`axum::handler::Handler`] with API operation
+/// A trait that extends [`axum::handler::Handler`] with API operation
 /// details.
 ///
 /// Just like axum's `Handler`, it is automatically implemented

crates/aide/src/gen.rs

@@ -76,7 +76,7 @@ pub fn infer_responses(infer: bool) {
     });
 }
 
-/// Output all theoretically possbile error responses
+/// Output all theoretically possible error responses
 /// including framework-specific ones.
 ///
 /// This is disabled by default.

crates/aide/src/helpers/no_api.rs

@@ -1,33 +1,19 @@
-use derive_more::{AsMut, AsRef, Deref, DerefMut, From};
+use std::ops::{Deref, DerefMut};
+
 use serde::{Deserialize, Serialize};
 
 use crate::{OperationInput, OperationOutput};
 
-/// Allows non [`OperationInput`] or [`OperationOutput`] types to be used in aide handlers with a default empty documentation.  
+/// Allows non [`OperationInput`] or [`OperationOutput`] types to be used in aide handlers with a default empty documentation.
+///
 /// For types that already implement [`OperationInput`] or [`OperationOutput`] it overrides the documentation and hides it.
 /// ```ignore
 /// pub async fn my_sqlx_tx_endpoint(
 ///     NoApi(mut tx): NoApi<Tx<sqlx::Any>> // allows usage of the TX
 /// ) -> NoApi<Json<YourResult>> // Hides the API of the return type
 /// # {}
 /// ```
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Ord,
-    PartialOrd,
-    Eq,
-    PartialEq,
-    Hash,
-    Serialize,
-    Deserialize,
-    Deref,
-    DerefMut,
-    AsRef,
-    AsMut,
-    From,
-)]
+#[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
 pub struct NoApi<T>(pub T);
 
 impl<T> NoApi<T> {
@@ -37,6 +23,38 @@ impl<T> NoApi<T> {
     }
 }
 
+impl<T> Deref for NoApi<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T> DerefMut for NoApi<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<T> AsRef<T> for NoApi<T> {
+    fn as_ref(&self) -> &T {
+        &self.0
+    }
+}
+
+impl<T> AsMut<T> for NoApi<T> {
+    fn as_mut(&mut self) -> &mut T {
+        &mut self.0
+    }
+}
+
+impl<T> From<T> for NoApi<T> {
+    fn from(value: T) -> Self {
+        Self(value)
+    }
+}
+
 impl<T> OperationInput for NoApi<T> {}
 
 impl<T> OperationOutput for NoApi<T> {

crates/aide/src/helpers/use_api.rs

@@ -1,6 +1,8 @@
-use std::marker::PhantomData;
+use std::{
+    marker::PhantomData,
+    ops::{Deref, DerefMut},
+};
 
-use derive_more::{AsMut, AsRef, Deref, DerefMut};
 use serde::{Deserialize, Serialize};
 
 use crate::gen::GenContext;
@@ -24,37 +26,10 @@ impl<T> IntoApi for T {
 }
 
 /// Allows non [`OperationInput`] or [`OperationOutput`] types to be used in aide handlers with the api documentation of [A].
+///
 /// For types that already implement [`OperationInput`] or [`OperationOutput`] it overrides the documentation with the provided one.
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Ord,
-    PartialOrd,
-    Eq,
-    PartialEq,
-    Hash,
-    Serialize,
-    Deserialize,
-    Deref,
-    DerefMut,
-    AsRef,
-    AsMut,
-)]
-pub struct UseApi<T, A>(
-    #[as_ref]
-    #[as_mut]
-    #[deref]
-    #[deref_mut]
-    pub T,
-    pub PhantomData<A>,
-);
-
-impl<T, A> From<T> for UseApi<T, A> {
-    fn from(value: T) -> Self {
-        Self(value, Default::default())
-    }
-}
+#[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
+pub struct UseApi<T, A>(pub T, pub PhantomData<A>);
 
 impl<T, A> UseApi<T, A> {
     /// Unwraps [Self] into its inner type
@@ -63,6 +38,38 @@ impl<T, A> UseApi<T, A> {
     }
 }
 
+impl<T, A> Deref for UseApi<T, A> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T, A> DerefMut for UseApi<T, A> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<T, A> AsRef<T> for UseApi<T, A> {
+    fn as_ref(&self) -> &T {
+        &self.0
+    }
+}
+
+impl<T, A> AsMut<T> for UseApi<T, A> {
+    fn as_mut(&mut self) -> &mut T {
+        &mut self.0
+    }
+}
+
+impl<T, A> From<T> for UseApi<T, A> {
+    fn from(value: T) -> Self {
+        Self(value, Default::default())
+    }
+}
+
 impl<T, A> OperationInput for UseApi<T, A>
 where
     A: OperationInput,

crates/aide/src/helpers/with_api.rs

@@ -1,13 +1,16 @@
-use std::marker::PhantomData;
+use std::{
+    marker::PhantomData,
+    ops::{Deref, DerefMut},
+};
 
-use derive_more::{AsMut, AsRef, Deref, DerefMut};
 use serde::{Deserialize, Serialize};
 
 use crate::gen::GenContext;
 use crate::openapi::{Operation, Response};
 use crate::{OperationInput, OperationOutput};
 
 /// Trait that allows implementing a custom Api definition for any type.
+///
 /// Two approaches are possible:
 ///
 /// 1. Simple Type override for concrete types
@@ -58,37 +61,16 @@ use crate::{OperationInput, OperationOutput};
 /// }
 /// ```
 pub trait ApiOverride {
-    /// The type that is being overriden
+    /// The type that is being overridden
     type Target;
 }
 
-/// Allows non [`OperationInput`] or [`OperationOutput`] types to be used in aide handlers with a provided documentation.  
+/// Allows non [`OperationInput`] or [`OperationOutput`] types to be used in aide handlers with a provided documentation.
+///
 /// For types that already implement [`OperationInput`] or [`OperationOutput`] it overrides the documentation with the provided one.
 /// See [`ApiOverride`] on how to implement such an override
-#[derive(
-    Copy,
-    Clone,
-    Debug,
-    Ord,
-    PartialOrd,
-    Eq,
-    PartialEq,
-    Hash,
-    Serialize,
-    Deserialize,
-    Deref,
-    DerefMut,
-    AsRef,
-    AsMut,
-)]
-pub struct WithApi<T>(
-    #[as_ref]
-    #[as_mut]
-    #[deref]
-    #[deref_mut]
-    pub T::Target,
-    pub PhantomData<T>,
-)
+#[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
+pub struct WithApi<T>(pub T::Target, pub PhantomData<T>)
 where
     T: ApiOverride;
 
@@ -102,6 +84,44 @@ where
     }
 }
 
+impl<T> Deref for WithApi<T>
+where
+    T: ApiOverride,
+{
+    type Target = T::Target;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T> DerefMut for WithApi<T>
+where
+    T: ApiOverride,
+{
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<T> AsRef<T::Target> for WithApi<T>
+where
+    T: ApiOverride,
+{
+    fn as_ref(&self) -> &T::Target {
+        &self.0
+    }
+}
+
+impl<T> AsMut<T::Target> for WithApi<T>
+where
+    T: ApiOverride,
+{
+    fn as_mut(&mut self) -> &mut T::Target {
+        &mut self.0
+    }
+}
+
 impl<T> OperationInput for WithApi<T>
 where
     T: OperationInput + ApiOverride,

crates/axum-jsonschema/src/lib.rs

@@ -185,7 +185,7 @@ impl From<JsonSchemaRejection> for JsonSchemaErrorResponse {
                 error: "deserialization failed".to_string(),
                 extra: AdditionalError::Deserialization(DeserializationResponse {
                     deserialization_error: VecDeque::from([PathError {
-                        // keys and index seperated by a '/'
+                        // keys and index separated by a '/'
                         // enum is ignored because it doesn't exist in json
                         instance_location: std::iter::once(String::new())
                             .chain(s.path().iter().map(|s| match s {