Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dis_macro and add ref dis injection #19

Merged
merged 5 commits into from
Feb 26, 2024
Merged

Update dis_macro and add ref dis injection #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4de024a
Update dis_macro and add ref dis injectiond
garethj2 Feb 23, 2024
52a30cf
Update comments
garethj2 Feb 23, 2024
c540584
Add to encoder
garethj2 Feb 23, 2024
9d9de25
PR feedback
garethj2 Feb 24, 2024
52c65af
Remove ref display name injection + make decoder visitor public
garethj2 Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/haystack/encoding/json/decode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::fmt;
/// Hayson Marker deserializer
impl<'de> Deserialize<'de> for Marker {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Marker, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
if val.is_marker() {
Ok(Marker)
} else {
Expand All @@ -33,7 +33,7 @@ type JsonErr = serde_json::Error;
/// Hayson Remove deserializer
impl<'de> Deserialize<'de> for Remove {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Remove, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
if val.is_remove() {
Ok(Remove)
} else {
Expand All @@ -45,7 +45,7 @@ impl<'de> Deserialize<'de> for Remove {
/// Hayson Remove deserializer
impl<'de> Deserialize<'de> for Na {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Na, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
if val.is_na() {
Ok(Na)
} else {
Expand All @@ -57,7 +57,7 @@ impl<'de> Deserialize<'de> for Na {
/// Hayson Number deserializer
impl<'de> Deserialize<'de> for Number {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Number, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Number(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Number")),
Expand All @@ -68,7 +68,7 @@ impl<'de> Deserialize<'de> for Number {
/// Hayson Date deserializer
impl<'de> Deserialize<'de> for Date {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Date, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Date(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Date")),
Expand All @@ -79,7 +79,7 @@ impl<'de> Deserialize<'de> for Date {
/// Hayson Time deserializer
impl<'de> Deserialize<'de> for Time {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Time, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Time(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Time")),
Expand All @@ -90,7 +90,7 @@ impl<'de> Deserialize<'de> for Time {
/// Hayson DateTime deserializer
impl<'de> Deserialize<'de> for DateTime {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<DateTime, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::DateTime(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson DateTime")),
Expand All @@ -101,7 +101,7 @@ impl<'de> Deserialize<'de> for DateTime {
/// Hayson Ref deserializer
impl<'de> Deserialize<'de> for Ref {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Ref, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Ref(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Ref")),
Expand All @@ -112,7 +112,7 @@ impl<'de> Deserialize<'de> for Ref {
/// Hayson Uri deserializer
impl<'de> Deserialize<'de> for Uri {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Uri, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Uri(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Uri")),
Expand All @@ -123,7 +123,7 @@ impl<'de> Deserialize<'de> for Uri {
/// Hayson Symbol deserializer
impl<'de> Deserialize<'de> for Symbol {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Symbol, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Symbol(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Symbol")),
Expand All @@ -134,7 +134,7 @@ impl<'de> Deserialize<'de> for Symbol {
/// Hayson Str deserializer
impl<'de> Deserialize<'de> for Str {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Str, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Str(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Str")),
Expand All @@ -145,7 +145,7 @@ impl<'de> Deserialize<'de> for Str {
/// Hayson Coord deserializer
impl<'de> Deserialize<'de> for Coord {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Coord, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Coord(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Coord")),
Expand All @@ -156,7 +156,7 @@ impl<'de> Deserialize<'de> for Coord {
/// Hayson XStr deserializer
impl<'de> Deserialize<'de> for XStr {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<XStr, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::XStr(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson XStr")),
Expand All @@ -167,7 +167,7 @@ impl<'de> Deserialize<'de> for XStr {
/// Hayson XStr deserializer
impl<'de> Deserialize<'de> for Dict {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Dict, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Dict(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Dict")),
Expand All @@ -178,7 +178,7 @@ impl<'de> Deserialize<'de> for Dict {
/// Hayson Grid deserializer
impl<'de> Deserialize<'de> for Grid {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Grid, D::Error> {
let val = deserializer.deserialize_any(HValVisitor)?;
let val = deserializer.deserialize_any(JsonValueDecoderVisitor)?;
match val {
HVal::Grid(val) => Ok(val),
_ => Err(D::Error::custom("Invalid Hayson Grid")),
Expand All @@ -189,13 +189,13 @@ impl<'de> Deserialize<'de> for Grid {
/// Hayson deserializer
impl<'de> Deserialize<'de> for HVal {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<HVal, D::Error> {
deserializer.deserialize_any(HValVisitor)
deserializer.deserialize_any(JsonValueDecoderVisitor)
}
}

struct HValVisitor;
pub struct JsonValueDecoderVisitor;
/// Visitor for Hayson elements
impl<'de> Visitor<'de> for HValVisitor {
impl<'de> Visitor<'de> for JsonValueDecoderVisitor {
type Value = HVal;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
Expand Down
6 changes: 5 additions & 1 deletion src/haystack/val/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,11 @@ where

if let Some(val) = dict.get("disMacro") {
return if let Value::Str(val) = val {
dis_macro(&val.value, |val| dict.get(val), get_localized)
dis_macro(
&val.value,
|val| dict.get(val).map(Cow::Borrowed),
get_localized,
)
} else {
decode_str_from_value(val)
};
Expand Down
13 changes: 7 additions & 6 deletions src/haystack/val/dis_macro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use regex::{Captures, Regex, Replacer};
/// values in a display macro string.
struct DisReplacer<'a, 'b, GetValueFunc, GetLocalizedFunc>
where
GetValueFunc: Fn(&str) -> Option<&'a Value>,
GetValueFunc: Fn(&str) -> Option<Cow<'a, Value>>,
GetLocalizedFunc: Fn(&str) -> Option<Cow<'a, str>>,
{
get_value: &'b GetValueFunc,
Expand All @@ -20,7 +20,7 @@ where
impl<'a, 'b, GetValueFunc, GetLocalizedFunc> Replacer
for DisReplacer<'a, 'b, GetValueFunc, GetLocalizedFunc>
where
GetValueFunc: Fn(&str) -> Option<&'a Value>,
GetValueFunc: Fn(&str) -> Option<Cow<'a, Value>>,
GetLocalizedFunc: Fn(&str) -> Option<Cow<'a, str>>,
{
fn replace_append(&mut self, caps: &Captures<'_>, dst: &mut String) {
Expand All @@ -29,9 +29,9 @@ where
// Replace $tag or ${tag}
if let Some(cap_match) = caps.get(2).or_else(|| caps.get(4)) {
if let Some(value) = (self.get_value)(cap_match.as_str()) {
if let Value::Ref(val) = value {
if let Value::Ref(val) = value.as_ref() {
dst.push_str(val.dis.as_ref().unwrap_or(&val.value));
} else if let Value::Str(val) = value {
} else if let Value::Str(val) = value.as_ref() {
dst.push_str(&val.value);
} else {
dst.push_str(&value.to_string());
Expand Down Expand Up @@ -70,7 +70,7 @@ pub fn dis_macro<'a, GetValueFunc, GetLocalizedFunc>(
get_localized: GetLocalizedFunc,
) -> Cow<'a, str>
where
GetValueFunc: Fn(&str) -> Option<&'a Value>,
GetValueFunc: Fn(&str) -> Option<Cow<'a, Value>>,
GetLocalizedFunc: Fn(&str) -> Option<Cow<'a, str>>,
{
// Cache the regular expression in memory so it doesn't need to compile on each invocation.
Expand Down Expand Up @@ -103,7 +103,7 @@ mod test {

static DICT: OnceLock<Dict> = OnceLock::new();

fn dict_cb<'a>(name: &str) -> Option<&'a Value> {
fn dict_cb<'a>(name: &str) -> Option<Cow<'a, Value>> {
DICT.get_or_init(|| {
dict![
"equipRef" => Value::make_ref("ref"),
Expand All @@ -114,6 +114,7 @@ mod test {
]
})
.get(name)
.map(|val| Cow::Borrowed(val))
}

fn i18n_cb<'a>(name: &str) -> Option<Cow<'a, str>> {
Expand Down
Loading