Adds prelude mods for wp_api & wp_api_integration_tests (#751)

* Make the following mods public: `api_client`, `api_error`, `parsed_url`, `ssl` & `uuid`

* Adds `prelude` mods for `wp_api` & `wp_api_integration_tests`

Author: oguzkocer

wp_api/src/jetpack/client.rs

@@ -1,8 +1,9 @@
 use super::endpoint::connection_endpoint::{ConnectionRequestBuilder, ConnectionRequestExecutor};
 use crate::{
-    ParsedUrl, WpApiClientDelegate, api_client_generate_api_client,
-    api_client_generate_endpoint_impl,
+    api_client::WpApiClientDelegate,
+    api_client_generate_api_client, api_client_generate_endpoint_impl,
     auth::WpAuthenticationProvider,
+    parsed_url::ParsedUrl,
     request::endpoint::{ApiUrlResolver, WpOrgSiteApiUrlResolver},
 };
 use std::sync::Arc;

wp_api/src/jetpack/connection.rs

@@ -1,7 +1,9 @@
 use crate::{
-    ParsedUrl, WpApiClientDelegate, WpApiError, WpErrorCode,
+    api_client::WpApiClientDelegate,
+    api_error::{WpApiError, WpErrorCode},
     auth::{WpAuthentication, WpAuthenticationProvider},
     jetpack::client::JetpackApiClient,
+    parsed_url::ParsedUrl,
     users::UserId,
     wp_com::{
         WpComSiteId, client::WpComApiClient, jetpack_connection::JetpackRemoteConnectionParams,

wp_api/src/lib.rs

@@ -1,29 +1,15 @@
-pub use api_client::{
-    IsWpApiClientDelegate, WpApiClient, WpApiClientDelegate, WpApiRequestBuilder,
-};
-pub use api_error::{
-    InvalidSslErrorReason, MaybeWpError, MediaUploadRequestExecutionError, ParsedRequestError,
-    RequestExecutionError, RequestExecutionErrorReason, WpApiError, WpError, WpErrorCode,
-};
-pub use parsed_url::{ParseUrlError, ParsedUrl};
 use plugins::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use users::*;
-pub use uuid::{WpUuid, WpUuidParseError};
 use wp_localization::{MessageBundle, WpMessages, WpSupportsLocalization};
 use wp_localization_macro::WpDeriveLocalizable;
 
-mod api_client; // re-exported relevant types
-mod api_error; // re-exported relevant types
-mod parsed_url; // re-exported relevant types
-mod ssl; // re-exported relevant types
-mod uniffi_serde;
-mod uuid; // re-exported relevant types
-
 pub mod jetpack;
 pub mod wp_com;
 
+pub mod api_client;
+pub mod api_error;
 pub mod application_passwords;
 pub mod auth;
 pub mod categories;
@@ -32,21 +18,27 @@ pub mod date;
 pub mod login;
 pub mod media;
 pub mod middleware;
+pub mod parsed_url;
 pub mod plugins;
 pub mod post_types;
 pub mod posts;
+pub mod prelude;
 pub mod request;
 pub mod search_results;
 pub mod site_settings;
+pub mod ssl;
 pub mod tags;
 pub mod taxonomies;
 pub mod templates;
 pub mod themes;
 pub mod url_query;
 pub mod users;
+pub mod uuid;
 pub mod wordpress_org;
 pub mod wp_site_health_tests;
 
+mod uniffi_serde;
+
 #[cfg(feature = "reqwest-request-executor")]
 pub mod reqwest_request_executor;
 

wp_api/src/login.rs

@@ -1,16 +1,11 @@
+use crate::{
+    login::url_discovery::is_local_dev_environment_url, parsed_url::ParsedUrl, uuid::WpUuid,
+};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::str;
-use std::sync::Arc;
-use wp_localization::MessageBundle;
-use wp_localization::{WpMessages, WpSupportsLocalization};
+use std::{collections::HashMap, str, sync::Arc};
+use wp_localization::{MessageBundle, WpMessages, WpSupportsLocalization};
 use wp_localization_macro::WpDeriveLocalizable;
-use wp_serde_helper::deserialize_false_or_string;
-use wp_serde_helper::deserialize_offset;
-
-use crate::ParsedUrl;
-use crate::WpUuid;
-use crate::login::url_discovery::is_local_dev_environment_url;
+use wp_serde_helper::{deserialize_false_or_string, deserialize_offset};
 
 const KEY_APPLICATION_PASSWORDS: &str = "application-passwords";
 

wp_api/src/login/login_client.rs

@@ -9,8 +9,9 @@ use super::{
     },
 };
 use crate::{
-    ParsedUrl, RequestExecutionError, WpError,
+    api_error::{RequestExecutionError, WpError},
     middleware::{PerformsRequests, WpApiMiddlewarePipeline},
+    parsed_url::ParsedUrl,
     request::{
         RequestExecutor, RequestMethod, ResponseBodyType, WpNetworkHeaderMap, WpNetworkRequest,
         WpNetworkRequestBody, WpNetworkResponse,
@@ -490,7 +491,7 @@ impl PerformsRequests for WpLoginClient {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{WpErrorCode, unit_test_common::wp_network_response_from_json};
+    use crate::{api_error::WpErrorCode, unit_test_common::wp_network_response_from_json};
 
     #[test]
     fn test_parse_api_details_wp_error_rest_forbidden() {

wp_api/src/login/url_discovery.rs

@@ -1,7 +1,8 @@
 use super::WpApiDetails;
 use crate::{
-    ParseUrlError, ParsedUrl, RequestExecutionError, RequestExecutionErrorReason, WpErrorCode,
+    api_error::{RequestExecutionError, RequestExecutionErrorReason, WpErrorCode},
     login::KnownAuthenticationBlockingPlugin,
+    parsed_url::{ParseUrlError, ParsedUrl},
     request::{ResponseBodyType, WpRedirect},
 };
 use itertools::Itertools;

wp_api/src/middleware.rs

@@ -1,5 +1,6 @@
 use crate::{
-    IsWpApiClientDelegate, RequestExecutionError, RequestExecutionErrorReason,
+    api_client::IsWpApiClientDelegate,
+    api_error::{RequestExecutionError, RequestExecutionErrorReason},
     request::{RequestExecutor, WpNetworkRequest, WpNetworkResponse},
 };
 use std::{fmt::Debug, sync::Arc, time::Duration};
@@ -235,7 +236,7 @@ mod tests {
 
     mod api_discovery_authentication_middleware {
         use crate::{
-            MediaUploadRequestExecutionError,
+            api_error::MediaUploadRequestExecutionError,
             request::{
                 WpNetworkHeaderMap,
                 endpoint::{WpEndpointUrl, media_endpoint::MediaUploadRequest},
@@ -371,7 +372,7 @@ mod tests {
     mod retry_after_middleware {
         use super::*;
         use crate::{
-            MediaUploadRequestExecutionError,
+            api_error::MediaUploadRequestExecutionError,
             request::{
                 WpNetworkHeaderMap,
                 endpoint::{WpEndpointUrl, media_endpoint::MediaUploadRequest},

wp_api/src/prelude.rs

@@ -0,0 +1,23 @@
+pub use crate::{
+    WpApiParamOrder, WpAppNotifier, WpContext,
+    api_client::{IsWpApiClientDelegate, WpApiClient, WpApiClientDelegate, WpApiRequestBuilder},
+    api_error::{
+        InvalidSslErrorReason, MaybeWpError, MediaUploadRequestExecutionError, ParsedRequestError,
+        RequestExecutionError, RequestExecutionErrorReason, WpApiError, WpError, WpErrorCode,
+    },
+    auth::{WpAuthentication, WpAuthenticationProvider},
+    date::WpGmtDateTime,
+    generate,
+    login::login_client::WpLoginClient,
+    middleware::WpApiMiddlewarePipeline,
+    parsed_url::{ParseUrlError, ParsedUrl},
+    request::{
+        NetworkRequestAccessor, RequestExecutor, WpNetworkHeaderMap, WpNetworkRequest,
+        WpNetworkResponse,
+        endpoint::{ApiUrlResolver, WpOrgSiteApiUrlResolver, media_endpoint::MediaUploadRequest},
+    },
+    uuid::{WpUuid, WpUuidParseError},
+};
+
+#[cfg(feature = "reqwest-request-executor")]
+pub use crate::reqwest_request_executor::ReqwestRequestExecutor;

wp_api/src/request.rs

@@ -1,25 +1,31 @@
 use self::endpoint::WpEndpointUrl;
 use crate::{
-    RequestExecutionErrorReason, WpApiError, WpErrorCode,
-    api_error::{MediaUploadRequestExecutionError, ParsedRequestError, RequestExecutionError},
+    api_error::{
+        MediaUploadRequestExecutionError, ParsedRequestError, RequestExecutionError,
+        RequestExecutionErrorReason, WpApiError, WpErrorCode,
+    },
     auth::WpAuthenticationProvider,
     url_query::{FromUrlQueryPairs, UrlQueryPairsMap},
 };
 use base64::Engine;
 use chrono::{DateTime, Utc};
-use endpoint::{ApiEndpointUrl, media_endpoint::MediaUploadRequest};
 use endpoint::{
-    ApiUrlResolver,
+    ApiEndpointUrl, ApiUrlResolver,
     application_passwords_endpoint::{
         ApplicationPasswordsRequestBuilder,
         ApplicationPasswordsRequestRetrieveCurrentWithEditContextResponse,
     },
+    media_endpoint::MediaUploadRequest,
 };
 use http::{HeaderMap, HeaderName, HeaderValue};
 use regex::Regex;
 use serde::{Deserialize, Serialize, de::DeserializeOwned};
-use std::str::{FromStr, Utf8Error};
-use std::{collections::HashMap, fmt::Debug, sync::Arc};
+use std::{
+    collections::HashMap,
+    fmt::Debug,
+    str::{FromStr, Utf8Error},
+    sync::Arc,
+};
 use url::Url;
 use uuid::Uuid;
 use wp_localization::{MessageBundle, WpMessages, WpSupportsLocalization};

wp_api/src/request/endpoint.rs

@@ -1,4 +1,4 @@
-use crate::ParsedUrl;
+use crate::parsed_url::ParsedUrl;
 use std::sync::Arc;
 use strum_macros::EnumIter;
 use url::Url;
@@ -149,7 +149,7 @@ mod macros {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::ParsedUrl;
+    use crate::parsed_url::ParsedUrl;
     use rstest::*;
     use std::sync::Arc;