Add BrowserHistory and BrowserLocation

Cargo.toml

@@ -19,6 +19,7 @@ gloo-storage = { version = "0.2.0", path = "crates/storage" }
 gloo-render = { version = "0.1.0", path = "crates/render" }
 gloo-console = { version = "0.2.0", path = "crates/console" }
 gloo-utils = { version = "0.1.0", path = "crates/utils" }
+gloo-history = { version = "0.1.0", path = "crates/history" }
 
 [features]
 default = []
@@ -36,4 +37,5 @@ members = [
     "crates/storage",
     "crates/console",
     "crates/utils",
+    "crates/history",
 ]

crates/history/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "gloo-history"
+version = "0.1.0"
+description = "Universal Session History"
+authors = ["Rust and WebAssembly Working Group"]
+edition = "2018"
+license = "MIT OR Apache-2.0"
+readme = "README.md"
+repository = "https://github.com/rustwasm/gloo/tree/master/crates/history"
+homepage = "https://github.com/rustwasm/gloo"
+categories = ["api-bindings", "storage", "wasm"]
+
+[dependencies]
+wasm-bindgen = "0.2"
+gloo-utils = { version = "0.1.0", path = "../utils" }
+gloo-events = { version = "0.1.0", path = "../events" }
+serde = { version = "1", optional = true }
+serde_urlencoded = { version = "0.7", optional = true }
+serde-wasm-bindgen = { version = "0.3.1", optional = true }
+thiserror = { version = "1.0", optional = true }
+
+[dependencies.web-sys]
+version = "0.3"
+features = [
+    "History",
+    "Window",
+    "Location",
+]
+
+[dev-dependencies]
+wasm-bindgen-test = "0.3"
+serde = { version = "1", features = ["derive"] }
+gloo-timers = { version = "0.2.0", features = ["futures"], path = "../timers" }
+
+[features]
+serialize = ["serde", "serde_urlencoded", "serde-wasm-bindgen", "thiserror"]
+default = ["serialize"]

crates/history/src/any.rs

@@ -0,0 +1,203 @@
+use std::borrow::Cow;
+
+#[cfg(feature = "serialize")]
+use serde::de::DeserializeOwned;
+#[cfg(feature = "serialize")]
+use serde::Serialize;
+
+use crate::browser::{BrowserHistory, BrowserLocation};
+#[cfg(feature = "serialize")]
+use crate::error::HistoryResult;
+use crate::history::History;
+use crate::listener::HistoryListener;
+use crate::location::Location;
+
+/// A [`History`] that provides a universial API to the underlying history type.
+#[derive(Clone, PartialEq, Debug)]
+pub enum AnyHistory {
+    /// A Browser History.
+    Browser(BrowserHistory),
+}
+
+/// The [`Location`] for [`AnyHistory`]
+#[derive(Clone, PartialEq, Debug)]
+pub enum AnyLocation {
+    /// A Browser Location.
+    Browser(BrowserLocation),
+}
+
+impl History for AnyHistory {
+    type Location = AnyLocation;
+
+    fn len(&self) -> usize {
+        match self {
+            Self::Browser(m) => m.len(),
+        }
+    }
+
+    fn go(&self, delta: isize) {
+        match self {
+            Self::Browser(m) => m.go(delta),
+        }
+    }
+
+    fn push<'a>(&self, route: impl Into<Cow<'a, str>>) {
+        match self {
+            Self::Browser(m) => m.push(route),
+        }
+    }
+
+    fn replace<'a>(&self, route: impl Into<Cow<'a, str>>) {
+        match self {
+            Self::Browser(m) => m.replace(route),
+        }
+    }
+
+    #[cfg(feature = "serialize")]
+    fn push_with_state<'a, T>(&self, route: impl Into<Cow<'a, str>>, state: T) -> HistoryResult<()>
+    where
+        T: Serialize + 'static,
+    {
+        match self {
+            Self::Browser(m) => m.push_with_state(route, state),
+        }
+    }
+
+    #[cfg(feature = "serialize")]
+    fn replace_with_state<'a, T>(
+        &self,
+        route: impl Into<Cow<'a, str>>,
+        state: T,
+    ) -> HistoryResult<()>
+    where
+        T: Serialize + 'static,
+    {
+        match self {
+            Self::Browser(m) => m.replace_with_state(route, state),
+        }
+    }
+
+    #[cfg(feature = "serialize")]
+    fn push_with_query<'a, Q>(&self, route: impl Into<Cow<'a, str>>, query: Q) -> HistoryResult<()>
+    where
+        Q: Serialize,
+    {
+        match self {
+            Self::Browser(m) => m.push_with_query(route, query),
+        }
+    }
+    #[cfg(feature = "serialize")]
+    fn replace_with_query<'a, Q>(
+        &self,
+        route: impl Into<Cow<'a, str>>,
+        query: Q,
+    ) -> HistoryResult<()>
+    where
+        Q: Serialize,
+    {
+        match self {
+            Self::Browser(m) => m.replace_with_query(route, query),
+        }
+    }
+
+    #[cfg(feature = "serialize")]
+    fn push_with_query_and_state<'a, Q, T>(
+        &self,
+        route: impl Into<Cow<'a, str>>,
+        query: Q,
+        state: T,
+    ) -> HistoryResult<()>
+    where
+        Q: Serialize,
+        T: Serialize + 'static,
+    {
+        match self {
+            Self::Browser(m) => m.push_with_query_and_state(route, query, state),
+        }
+    }
+
+    #[cfg(feature = "serialize")]
+    fn replace_with_query_and_state<'a, Q, T>(
+        &self,
+        route: impl Into<Cow<'a, str>>,
+        query: Q,
+        state: T,
+    ) -> HistoryResult<()>
+    where
+        Q: Serialize,
+        T: Serialize + 'static,
+    {
+        match self {
+            Self::Browser(m) => m.replace_with_query_and_state(route, query, state),
+        }
+    }
+
+    fn listen<CB>(&self, callback: CB) -> HistoryListener
+    where
+        CB: Fn() + 'static,
+    {
+        match self {
+            Self::Browser(m) => m.listen(callback),
+        }
+    }
+
+    fn location(&self) -> Self::Location {
+        match self {
+            Self::Browser(m) => AnyLocation::Browser(m.location()),
+        }
+    }
+}
+
+impl Location for AnyLocation {
+    type History = AnyHistory;
+
+    fn path(&self) -> String {
+        match self {
+            Self::Browser(m) => m.path(),
+        }
+    }
+
+    fn search(&self) -> String {
+        match self {
+            Self::Browser(m) => m.search(),
+        }
+    }
+
+    #[cfg(feature = "serialize")]
+    fn query<T>(&self) -> HistoryResult<T>
+    where
+        T: DeserializeOwned,
+    {
+        match self {
+            Self::Browser(m) => m.query(),
+        }
+    }
+
+    fn hash(&self) -> String {
+        match self {
+            Self::Browser(m) => m.hash(),
+        }
+    }
+
+    #[cfg(feature = "serialize")]
+    fn state<T>(&self) -> HistoryResult<T>
+    where
+        T: DeserializeOwned + 'static,
+    {
+        match self {
+            Self::Browser(m) => m.state(),
+        }
+    }
+}
+
+impl From<BrowserHistory> for AnyHistory {
+    fn from(m: BrowserHistory) -> AnyHistory {
+        AnyHistory::Browser(m)
+    }
+}
+
+impl From<BrowserLocation> for AnyLocation {
+    fn from(m: BrowserLocation) -> AnyLocation {
+        AnyLocation::Browser(m)
+    }
+}