Skip to content

Chore add crate prefix #62

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

Merged
jiftechnify merged 2 commits into from
Dec 22, 2025
Merged

Chore add crate prefix #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
856e06d
chore: prepending $crate to internal macro invocations
jiftechnify Dec 22, 2025
123fea8
add tests: passing &Value/&mut Value to query_value!()
jiftechnify Dec 22, 2025
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
56 changes: 28 additions & 28 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,51 +246,51 @@ doc_query_value! {macro_rules! query_value {
/* non-mut traversal */
// traversal step
(@trv { $vopt:expr } . $key:ident $($rest:tt)*) => {
query_value!(@trv { $vopt.and_then(|v| v.get(stringify!($key))) } $($rest)*)
$crate::query_value!(@trv { $vopt.and_then(|v| v.get(stringify!($key))) } $($rest)*)
};
(@trv { $vopt:expr } [ $idx:expr ] $($rest:tt)*) => {
query_value!(@trv { $vopt.and_then(|v| v.get($idx)) } $($rest)*)
$crate::query_value!(@trv { $vopt.and_then(|v| v.get($idx)) } $($rest)*)
};
// conversion step -> convert then jump to finalization step
(@trv { $vopt:expr } -> $dest:ident $($rest:tt)*) => {
$crate::__paste! {
query_value!(@fin { $vopt.and_then(|v| v.[<as_ $dest>]()) } $($rest)*)
$crate::query_value!(@fin { $vopt.and_then(|v| v.[<as_ $dest>]()) } $($rest)*)
}
};
(@trv { $vopt:expr } >> $dest:ident $($rest:tt)*) => {
query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
$crate::query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
};
(@trv { $vopt:expr } >> ($dest:ty) $($rest:tt)*) => {
query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
$crate::query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
};
// no conversion -> just jump to finalization step
(@trv { $vopt:expr } $($rest:tt)*) => {
query_value!(@fin { $vopt } $($rest)*)
$crate::query_value!(@fin { $vopt } $($rest)*)
};

/* mut traversal */
// traversal step
(@trv_mut { $vopt:expr } . $key:ident $($rest:tt)*) => {
query_value!(@trv_mut { $vopt.and_then(|v| v.get_mut(stringify!($key))) } $($rest)*)
$crate::query_value!(@trv_mut { $vopt.and_then(|v| v.get_mut(stringify!($key))) } $($rest)*)
};
(@trv_mut { $vopt:expr } [ $idx:expr ] $($rest:tt)*) => {
query_value!(@trv_mut { $vopt.and_then(|v| v.get_mut($idx)) } $($rest)*)
$crate::query_value!(@trv_mut { $vopt.and_then(|v| v.get_mut($idx)) } $($rest)*)
};
// conversion step -> convert then jump to finalization step
(@trv_mut { $vopt:expr } -> $dest:ident $($rest:tt)*) => {
$crate::__paste! {
query_value!(@fin { $vopt.and_then(|v| v.[<as_ $dest _mut>]()) } $($rest)*)
$crate::query_value!(@fin { $vopt.and_then(|v| v.[<as_ $dest _mut>]()) } $($rest)*)
}
};
(@trv_mut { $vopt:expr } >> $dest:ident $($rest:tt)*) => {
query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
$crate::query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
};
(@trv_mut { $vopt:expr } >> ($dest:ty) $($rest:tt)*) => {
query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
$crate::query_value!(@fin { $vopt.and_then(|v| <$dest>::deserialize(v.clone()).ok()) } $($rest)*)
};
// no conversion -> just jump to finalization step
(@trv_mut { $vopt:expr } $($rest:tt)*) => {
query_value!(@fin { $vopt } $($rest)*)
$crate::query_value!(@fin { $vopt } $($rest)*)
};

/* finalize: handle unwrapping operator */
Expand All @@ -311,10 +311,10 @@ doc_query_value! {macro_rules! query_value {

/* entry points */
(mut $v:tt $($rest:tt)*) => {
query_value!(@trv_mut { Some(&mut $v) } $($rest)*)
$crate::query_value!(@trv_mut { Some(&mut $v) } $($rest)*)
};
($v:tt $($rest:tt)*) => {
query_value!(@trv { Some(&$v) } $($rest)*)
$crate::query_value!(@trv { Some(&$v) } $($rest)*)
};
}}

Expand Down Expand Up @@ -367,15 +367,15 @@ doc_query_value_result! {macro_rules! query_value_result {
/* non-mut traversal */
// traversal step
(@trv [$trace:ident] { $vopt:expr } . $key:ident $($rest:tt)*) => {
query_value_result!(@trv [$trace] {
$crate::query_value_result!(@trv [$trace] {
$vopt.and_then(|v| {
$trace.push_str(stringify!(.$key));
v.get(stringify!($key)).ok_or_else(|| $crate::Error::ValueNotFoundAtPath($trace.clone()))
})
} $($rest)*)
};
(@trv [$trace:ident] { $vopt:expr } [ $idx:expr ] $($rest:tt)*) => {
query_value_result!(@trv [$trace] {
$crate::query_value_result!(@trv [$trace] {
$vopt.and_then(|v| {
$trace.push_str(format!("[{}]", stringify!($idx)).as_str());
v.get($idx).ok_or_else(|| $crate::Error::ValueNotFoundAtPath($trace.clone()))
Expand All @@ -385,7 +385,7 @@ doc_query_value_result! {macro_rules! query_value_result {
// conversion step -> convert then jump to finalization step
(@trv [$trace:ident] { $vopt:expr } -> $dest:ident $($rest:tt)*) => {
$crate::__paste! {
query_value_result!(@fin [$trace] {
$crate::query_value_result!(@fin [$trace] {
$vopt.and_then(|v| {
let conv_name = format!("as_{}", stringify!($dest));
v.[<as_ $dest>]() .ok_or_else(|| $crate::Error::AsCastFailed(conv_name))
Expand All @@ -394,36 +394,36 @@ doc_query_value_result! {macro_rules! query_value_result {
}
};
(@trv [$trace:ident] { $vopt:expr } >> $dest:ident $($rest:tt)*) => {
query_value_result!(@fin [$trace] {
$crate::query_value_result!(@fin [$trace] {
$vopt.and_then(|v| {
<$dest>::deserialize(v.clone()).map_err(|e| $crate::Error::DeserializationFailed(Box::new(e)))
})
} $($rest)*)
};
(@trv [$trace:ident] { $vopt:expr } >> ($dest:ty) $($rest:tt)*) => {
query_value_result!(@fin [$trace] {
$crate::query_value_result!(@fin [$trace] {
$vopt.and_then(|v| {
<$dest>::deserialize(v.clone()).map_err(|e| $crate::Error::DeserializationFailed(Box::new(e)))
})
} $($rest)*)
};
// no conversion -> just jump to finalization step
(@trv [$trace:ident] { $vopt:expr } $($rest:tt)*) => {
query_value_result!(@fin [$trace] { $vopt } $($rest)*)
$crate::query_value_result!(@fin [$trace] { $vopt } $($rest)*)
};

/* mut traversal */
// traversal step
(@trv_mut [$trace:ident] { $vopt:expr } . $key:ident $($rest:tt)*) => {
query_value_result!(@trv_mut [$trace] {
$crate::query_value_result!(@trv_mut [$trace] {
$vopt.and_then(|v| {
$trace.push_str(stringify!(.$key));
v.get_mut(stringify!($key)).ok_or_else(|| $crate::Error::ValueNotFoundAtPath($trace.clone()))
})
} $($rest)*)
};
(@trv_mut [$trace:ident] { $vopt:expr } [ $idx:expr ] $($rest:tt)*) => {
query_value_result!(@trv_mut [$trace] {
$crate::query_value_result!(@trv_mut [$trace] {
$vopt.and_then(|v| {
$trace.push_str(format!("[{}]", stringify!($idx)).as_str());
v.get_mut($idx).ok_or_else(|| $crate::Error::ValueNotFoundAtPath($trace.clone()))
Expand All @@ -433,7 +433,7 @@ doc_query_value_result! {macro_rules! query_value_result {
// conversion step -> convert then jump to finalization step
(@trv_mut [$trace:ident] { $vopt:expr } -> $dest:ident $($rest:tt)*) => {
$crate::__paste! {
query_value_result!(@fin [$trace] {
$crate::query_value_result!(@fin [$trace] {
$vopt.and_then(|v| {
let conv_name = format!("as_{}_mut", stringify!($dest));
v.[<as_ $dest _mut>]().ok_or_else(|| $crate::Error::AsCastFailed(conv_name))
Expand All @@ -442,22 +442,22 @@ doc_query_value_result! {macro_rules! query_value_result {
}
};
(@trv_mut [$trace:ident] { $vopt:expr } >> $dest:ident $($rest:tt)*) => {
query_value_result!(@fin [$trace] {
$crate::query_value_result!(@fin [$trace] {
$vopt.and_then(|v| {
<$dest>::deserialize(v.clone()).map_err(|e| $crate::Error::DeserializationFailed(Box::new(e)))
})
} $($rest)*)
};
(@trv_mut [$trace:ident] { $vopt:expr } >> ($dest:ty) $($rest:tt)*) => {
query_value_result!(@fin [$trace] {
$crate::query_value_result!(@fin [$trace] {
$vopt.and_then(|v| {
<$dest>::deserialize(v.clone()).map_err(|e| $crate::Error::DeserializationFailed(Box::new(e)))
})
} $($rest)*)
};
// no conversion -> just jump to finalization step
(@trv_mut [$trace:ident] { $vopt:expr } $($rest:tt)*) => {
query_value_result!(@fin [$trace] { $vopt } $($rest)*)
$crate::query_value_result!(@fin [$trace] { $vopt } $($rest)*)
};

/* finalize: handle unwrapping operator */
Expand Down Expand Up @@ -490,9 +490,9 @@ doc_query_value_result! {macro_rules! query_value_result {

/* entry points */
(mut $v:tt $($rest:tt)*) => {
query_value_result!(@trv_mut [trace] { Ok::<_, $crate::Error>(&mut $v) } $($rest)*)
$crate::query_value_result!(@trv_mut [trace] { Ok::<_, $crate::Error>(&mut $v) } $($rest)*)
};
($v:tt $($rest:tt)*) => {
query_value_result!(@trv [trace] { Ok::<_, $crate::Error>(&$v) } $($rest)*)
$crate::query_value_result!(@trv [trace] { Ok::<_, $crate::Error>(&$v) } $($rest)*)
};
}}
25 changes: 25 additions & 0 deletions tests/query_value.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,31 @@ mod json {
assert_eq!(query_value!(j.arr[4] -> str), Some("appended!"));
}

#[test]
fn test_query_with_ref_value() {
let j = make_sample_json();
let j_ref = &j;

let tests = [
(query_value!(j_ref.str), json!("s")),
(query_value!(j_ref.nums.u64), json!(123)),
(query_value!(j_ref.obj.inner), json!("value")),
];

test_is_some_of_expected_val!(tests);
}

#[test]
fn test_query_with_refmut_value() {
let mut j = make_sample_json();
let mut j_ref = &mut j;

assert_eq!(
query_value!(mut j_ref.obj.inner).unwrap(),
&mut json!("value")
);
}

#[test]
fn test_query_and_cast() {
let j = make_sample_json();
Expand Down
27 changes: 27 additions & 0 deletions tests/query_value_result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,33 @@ mod json {
assert_eq!(query_value_result!(j.arr[4] -> str).unwrap(), "appended!");
}

#[test]
fn test_query_with_ref_value() {
let j = make_sample_json();
let j_ref = &j;

let tests = [
(query_value_result!(j_ref.str), json!("s")),
(query_value_result!(j_ref.nums.u64), json!(123)),
(query_value_result!(j_ref.obj.inner), json!("value")),
];

for (res, exp) in tests {
assert_eq!(res.unwrap(), &exp);
}
}

#[test]
fn test_query_with_refmut_value() {
let mut j = make_sample_json();
let mut j_ref = &mut j;

assert_eq!(
query_value_result!(mut j_ref.obj.inner).unwrap(),
&mut json!("value")
);
}

#[test]
fn test_query_and_cast() {
let j = make_sample_json();
Expand Down