From cf854793ab92f5f7fddab7cc4ae54d9ad5b92be3 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguz.kocer@automattic.com>
Date: Wed, 8 Oct 2025 20:27:05 -0400
Subject: [PATCH] Don't generate uniffi bindings for Request Builders

---
 wp_api/src/api_client.rs                      | 13 ----------
 wp_api/src/jetpack/client.rs                  | 26 -------------------
 wp_api/src/request/endpoint/media_endpoint.rs |  1 -
 wp_api/src/wp_com/client.rs                   | 15 -----------
 wp_derive_request_builder/src/generate.rs     |  2 --
 5 files changed, 57 deletions(-)

diff --git a/wp_api/src/api_client.rs b/wp_api/src/api_client.rs
index dfd553096..d7efbdb53 100644
--- a/wp_api/src/api_client.rs
+++ b/wp_api/src/api_client.rs
@@ -44,11 +44,6 @@ use crate::{
 };
 use std::sync::Arc;
 
-#[derive(uniffi::Object)]
-struct UniffiWpApiRequestBuilder {
-    inner: WpApiRequestBuilder,
-}
-
 pub struct WpApiRequestBuilder {
     api_root: Arc<ApiRootRequestBuilder>,
     application_passwords: Arc<ApplicationPasswordsRequestBuilder>,
@@ -239,14 +234,6 @@ api_client_generate_endpoint_impl!(WpApi, wp_site_health_tests);
 macro_rules! api_client_generate_endpoint_impl {
     ($client_name_prefix: ident, $feature:ident) => {
         paste::paste! {
-            #[uniffi::export]
-
-            impl [<Uniffi $client_name_prefix RequestBuilder>] {
-                fn $feature(&self) -> Arc<[<$feature:camel RequestBuilder>]> {
-                    self.inner.$feature.clone()
-                }
-            }
-
             impl [<$client_name_prefix RequestBuilder>] {
                 pub fn $feature(&self) -> &[<$feature:camel RequestBuilder>] {
                     self.$feature.as_ref()
diff --git a/wp_api/src/jetpack/client.rs b/wp_api/src/jetpack/client.rs
index 20e6bda4e..9ee567a86 100644
--- a/wp_api/src/jetpack/client.rs
+++ b/wp_api/src/jetpack/client.rs
@@ -8,32 +8,6 @@ use crate::{
 };
 use std::sync::Arc;
 
-#[derive(uniffi::Object)]
-struct UniffiJetpackApiRequestBuilder {
-    inner: JetpackApiRequestBuilder,
-}
-
-#[uniffi::export]
-impl UniffiJetpackApiRequestBuilder {
-    #[uniffi::constructor]
-    pub fn new(
-        api_url_resolver: Arc<dyn ApiUrlResolver>,
-        auth_provider: Arc<WpAuthenticationProvider>,
-    ) -> Self {
-        Self {
-            inner: JetpackApiRequestBuilder::new(api_url_resolver, auth_provider),
-        }
-    }
-
-    #[uniffi::constructor]
-    pub fn with_api_root_url(
-        api_root_url: Arc<ParsedUrl>,
-        auth_provider: Arc<WpAuthenticationProvider>,
-    ) -> Self {
-        Self::new(jetpack_api_url_resolver(api_root_url), auth_provider)
-    }
-}
-
 pub struct JetpackApiRequestBuilder {
     connection: Arc<ConnectionRequestBuilder>,
 }
diff --git a/wp_api/src/request/endpoint/media_endpoint.rs b/wp_api/src/request/endpoint/media_endpoint.rs
index 72844035b..d5b507b2d 100644
--- a/wp_api/src/request/endpoint/media_endpoint.rs
+++ b/wp_api/src/request/endpoint/media_endpoint.rs
@@ -154,7 +154,6 @@ impl NetworkRequestAccessor for MediaUploadRequest {
     }
 }
 
-#[uniffi::export]
 impl MediaRequestBuilder {
     pub fn create(
         &self,
diff --git a/wp_api/src/wp_com/client.rs b/wp_api/src/wp_com/client.rs
index af40faac9..b5250c6f7 100644
--- a/wp_api/src/wp_com/client.rs
+++ b/wp_api/src/wp_com/client.rs
@@ -20,21 +20,6 @@ use crate::{
 };
 use std::sync::Arc;
 
-#[derive(uniffi::Object)]
-struct UniffiWpComApiRequestBuilder {
-    inner: WpComApiRequestBuilder,
-}
-
-#[uniffi::export]
-impl UniffiWpComApiRequestBuilder {
-    #[uniffi::constructor]
-    pub fn new(auth_provider: Arc<WpAuthenticationProvider>) -> Self {
-        Self {
-            inner: WpComApiRequestBuilder::new(auth_provider),
-        }
-    }
-}
-
 pub struct WpComApiRequestBuilder {
     followers: Arc<FollowersRequestBuilder>,
     jetpack_connection: Arc<JetpackConnectionRequestBuilder>,
diff --git a/wp_derive_request_builder/src/generate.rs b/wp_derive_request_builder/src/generate.rs
index 81a2eb056..4ba0b5600 100644
--- a/wp_derive_request_builder/src/generate.rs
+++ b/wp_derive_request_builder/src/generate.rs
@@ -296,7 +296,6 @@ fn generate_request_builder(config: &Config, parsed_enum: &ParsedEnum) -> TokenS
     });
 
     quote! {
-        #[derive(uniffi::Object)]
         pub struct #generated_request_builder_ident {
             endpoint: #generated_endpoint_ident,
             inner: #static_inner_request_builder_type,
@@ -309,7 +308,6 @@ fn generate_request_builder(config: &Config, parsed_enum: &ParsedEnum) -> TokenS
                 }
             }
         }
-        #[uniffi::export]
         impl #generated_request_builder_ident {
             #(#functions)*
         }