Don't export endpoint module, remove url module

wp_api/src/endpoint.rs

@@ -1,7 +1,7 @@
 use url::Url;
 
-pub use plugins_endpoint::*;
-pub use users_endpoint::*;
+use plugins_endpoint::*;
+use users_endpoint::*;
 
 use crate::SparseField;
 

wp_api/src/lib.rs

@@ -2,19 +2,18 @@
 
 use serde::Deserialize;
 use std::collections::HashMap;
+use url::Url;
 
 pub use api_error::{WPApiError, WPRestError, WPRestErrorCode, WPRestErrorWrapper};
 use endpoint::*;
 use login::*;
 use plugins::*;
-use url::*;
 use users::*;
 
 mod api_error; // re-exported relevant types
 pub mod endpoint;
 pub mod login;
 pub mod plugins;
-pub mod url;
 pub mod users;
 
 #[cfg(test)]

wp_api/src/login.rs

@@ -1,7 +1,7 @@
-use crate::url::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::str;
+use url::Url;
 
 // After a successful login, the system will receive an OAuth callback with the login details
 // embedded as query params. This function parses that URL and extracts the login details as an object.
@@ -60,3 +60,35 @@ pub struct WPAPIApplicationPasswordDetails {
     pub user_login: String,
     pub password: String,
 }
+
+// A type that's guaranteed to represent a valid URL
+//
+// It is a programmer error to instantiate this object with an invalid URL
+#[derive(Debug, uniffi::Record)]
+pub struct WPRestAPIURL {
+    pub string_value: String,
+}
+
+impl WPRestAPIURL {
+    pub fn as_str(&self) -> &str {
+        self.string_value.as_str()
+    }
+
+    pub fn as_url(&self) -> url::Url {
+        Url::parse(self.string_value.as_str()).unwrap()
+    }
+}
+
+impl From<Url> for WPRestAPIURL {
+    fn from(url: url::Url) -> Self {
+        WPRestAPIURL {
+            string_value: url.into(),
+        }
+    }
+}
+
+impl From<WPRestAPIURL> for String {
+    fn from(url: WPRestAPIURL) -> Self {
+        url.string_value
+    }
+}