adam/leptos-use
1
0
Fork 0
mirror of https://github.com/adoyle0/leptos-use.git synced 2025-01-23 00:59:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Problem: use_storage defaults to StringCodec. Allow turbo fish usage and rely on Default

Browse source
This commit is contained in:
Joshua McQuistan 2023-10-27 16:08:51 +01:00
parent bbebd8a67f
commit d56c5cf514
4 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/storage/codec_json.rs
View file

@ -1,6 +1,6 @@
use super::{Codec, UseStorageOptions};
#[derive(Clone, PartialEq)]
#[derive(Clone, Default, PartialEq)]
pub struct JsonCodec();
impl<T: serde::Serialize + serde::de::DeserializeOwned> Codec<T> for JsonCodec {

2
src/storage/codec_prost.rs
View file

@ -2,7 +2,7 @@ use super::{Codec, UseStorageOptions};
use base64::Engine;
use thiserror::Error;
#[derive(Clone, PartialEq)]
#[derive(Clone, Default, PartialEq)]
pub struct ProstCodec();
#[derive(Error, Debug, PartialEq)]

5
src/storage/mod.rs
View file

@ -4,4 +4,9 @@ mod codec_json;
mod codec_prost;
mod use_storage;
pub use crate::core::StorageType;
#[cfg(feature = "serde")]
pub use codec_json::*;
#[cfg(feature = "prost")]
pub use codec_prost::*;
pub use use_storage::*;

43
src/storage/use_storage.rs
View file

@ -34,17 +34,22 @@ pub enum UseStorageError<Err> {
}
/// Hook for using local storage. Returns a result of a signal and a setter / deleter.
pub fn use_local_storage<T>(key: impl AsRef<str>) -> (Memo<T>, impl Fn(Option<T>) -> ())
pub fn use_local_storage<T, C>(key: impl AsRef<str>) -> (Memo<T>, impl Fn(Option<T>) -> () + Clone)
where
T: Clone + Default + FromStr + PartialEq + ToString,
T: Clone + Default + PartialEq,
C: Codec<T> + Default,
{
use_storage_with_options(StorageType::Local, key, UseStorageOptions::string_codec())
use_storage_with_options(
StorageType::Local,
key,
UseStorageOptions::<T, C>::default(),
)
}
pub fn use_local_storage_with_options<T, C>(
key: impl AsRef<str>,
options: UseStorageOptions<T, C>,
) -> (Memo<T>, impl Fn(Option<T>) -> ())
) -> (Memo<T>, impl Fn(Option<T>) -> () + Clone)
where
T: Clone + PartialEq,
C: Codec<T>,
@ -53,17 +58,24 @@ where
}
/// Hook for using session storage. Returns a result of a signal and a setter / deleter.
pub fn use_session_storage<T>(key: impl AsRef<str>) -> (Memo<T>, impl Fn(Option<T>) -> ())
pub fn use_session_storage<T, C>(
key: impl AsRef<str>,
) -> (Memo<T>, impl Fn(Option<T>) -> () + Clone)
where
T: Clone + Default + FromStr + PartialEq + ToString,
T: Clone + Default + PartialEq,
C: Codec<T> + Default,
{
use_storage_with_options(StorageType::Session, key, UseStorageOptions::string_codec())
use_storage_with_options(
StorageType::Session,
key,
UseStorageOptions::<T, C>::default(),
)
}
pub fn use_session_storage_with_options<T, C>(
key: impl AsRef<str>,
options: UseStorageOptions<T, C>,
) -> (Memo<T>, impl Fn(Option<T>) -> ())
) -> (Memo<T>, impl Fn(Option<T>) -> () + Clone)
where
T: Clone + PartialEq,
C: Codec<T>,
@ -76,7 +88,7 @@ pub fn use_storage_with_options<T, C>(
storage_type: StorageType,
key: impl AsRef<str>,
options: UseStorageOptions<T, C>,
) -> (Memo<T>, impl Fn(Option<T>) -> ())
) -> (Memo<T>, impl Fn(Option<T>) -> () + Clone)
where
T: Clone + PartialEq,
C: Codec<T>,
@ -206,6 +218,17 @@ fn decode_item<T, C: Codec<T>>(
.unwrap_or_default()
}
impl<T: Default + 'static, C: Codec<T> + Default> Default for UseStorageOptions<T, C> {
fn default() -> Self {
Self {
codec: C::default(),
on_error: Rc::new(|_err| ()),
listen_to_storage_changes: true,
default_value: MaybeSignal::default(),
}
}
}
impl<T: Clone + Default, C: Codec<T>> UseStorageOptions<T, C> {
pub(super) fn new(codec: C) -> Self {
Self {
@ -244,7 +267,7 @@ pub trait Codec<T>: Clone + 'static {
fn decode(&self, str: String) -> Result<T, Self::Error>;
}
#[derive(Clone, PartialEq)]
#[derive(Clone, Default, PartialEq)]
pub struct StringCodec();
impl<T: FromStr + ToString> Codec<T> for StringCodec {