aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnur Gündüz <ogunduz@gmail.com>2026-09-29 14:30:28 +0200
committerOnur Gündüz <ogunduz@gmail.com>2026-09-29 14:30:28 +0200
commit66e86c9693a7184944cdd2a0dbf1514e9d0125dc (patch)
treef4710699c0876849a858e764d631d8a8e41b4aca
parent91af268aeb40ba7adc69a6e1acf89a94466ecb5e (diff)
downloadele-66e86c9693a7184944cdd2a0dbf1514e9d0125dc.tar.gz
ele-66e86c9693a7184944cdd2a0dbf1514e9d0125dc.zip
Preserve out-of-range JSON numbers without panicking
-rw-r--r--README.md2
-rw-r--r--src/eval.rs30
-rw-r--r--tests/json_number_tests.rs71
3 files changed, 94 insertions, 9 deletions
diff --git a/README.md b/README.md
index 872c0eb..83757eb 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,8 @@ Implement `Filterable` for your type, compile the expression once with `Expr::co
`Expr::evaluate` is a convenience method for one record: it compiles on every call and returns false if compilation fails. Use `Expr::compile` when errors must be reported.
+JSON numbers use `i64`, `u64`, or finite `f64` when representable. If another crate enables `serde_json/arbitrary_precision`, larger values are retained as `Value::JsonNumber` without panicking or converting to infinity. Numeric comparisons against an out-of-range value return false, including `!=`; presence checks and exact bare-literal matching of its JSON number text remain available. This does not provide arbitrary-precision arithmetic.
+
Bare-literal matching also requires overriding `all_field_values` or `matches_global`; the default searches no values. Override `matches_global` to search borrowed data without building a list of values. `Value::matches_global` provides recursive matching for individual values.
```rust
diff --git a/src/eval.rs b/src/eval.rs
index 512d7e5..9c37b15 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -13,6 +13,8 @@ pub enum Value<'a> {
Uint(u64),
/// Floating-point number.
Float(f64),
+ /// Borrowed JSON number, including values outside the native numeric range.
+ JsonNumber(&'a serde_json::Number),
/// Borrowed string reference.
String(&'a str),
/// Owned string (for computed values).
@@ -51,6 +53,7 @@ impl<'a> Value<'a> {
Value::Int(i) => *i == 0,
Value::Uint(u) => *u == 0,
Value::Float(f) => *f == 0.0,
+ Value::JsonNumber(number) => native_number(number).is_some_and(|value| value.is_zero()),
Value::String(s) => s.is_empty(),
Value::StringOwned(s) => s.is_empty(),
Value::List(v) => v.is_empty(),
@@ -173,21 +176,23 @@ pub trait Filterable {
}
}
+fn native_number(number: &serde_json::Number) -> Option<Value<'static>> {
+ if let Some(value) = number.as_i64() {
+ Some(Value::Int(value))
+ } else if let Some(value) = number.as_u64() {
+ Some(Value::Uint(value))
+ } else {
+ number.as_f64().filter(|value| value.is_finite()).map(Value::Float)
+ }
+}
+
impl<'a> From<&'a Json> for Value<'a> {
fn from(value: &'a Json) -> Self {
match value {
Json::Null => Self::Null,
Json::Bool(value) => Self::Bool(*value),
Json::String(value) => Self::String(value),
- Json::Number(value) => {
- if let Some(value) = value.as_i64() {
- Self::Int(value)
- } else if let Some(value) = value.as_u64() {
- Self::Uint(value)
- } else {
- Self::Float(value.as_f64().unwrap())
- }
- }
+ Json::Number(value) => native_number(value).unwrap_or(Self::JsonNumber(value)),
Json::Array(values) => Self::JsonArray(values),
Json::Object(values) => Self::JsonObject(values),
}
@@ -307,6 +312,9 @@ fn value_matches_literal(value: &Value<'_>, literal: &Literal<'_>, op: CompareOp
}
fn compare_literal(op: CompareOp, value: &Value<'_>, literal: &Literal<'_>) -> bool {
+ if let Value::JsonNumber(number) = value {
+ return native_number(number).is_some_and(|value| compare_literal(op, &value, literal));
+ }
if let Some(text) = value.as_str() {
return string_match(text, literal, op);
}
@@ -414,6 +422,10 @@ fn value_contains_str(val: &Value<'_>, search: &str) -> bool {
Value::Int(i) => i.to_string() == search,
Value::Uint(u) => u.to_string() == search,
Value::Float(f) => f.to_string() == search,
+ Value::JsonNumber(number) => match native_number(number) {
+ Some(value) => value.matches_global(search),
+ None => number.to_string() == search,
+ },
Value::Bool(b) => {
let bs = if *b { "true" } else { "false" };
bs.eq_ignore_ascii_case(search)
diff --git a/tests/json_number_tests.rs b/tests/json_number_tests.rs
new file mode 100644
index 0000000..97f63ca
--- /dev/null
+++ b/tests/json_number_tests.rs
@@ -0,0 +1,71 @@
+use aip_filter::{Filterable, Value, parse};
+use serde_json::{Number, Value as Json};
+
+#[test]
+fn large_json_numbers_are_rejected_or_preserved_without_panicking() {
+ for text in ["1e400", "-1e400", "1e9999"] {
+ let number = match serde_json::from_str::<Json>(text) {
+ Ok(number) => number,
+ Err(error) => {
+ assert!(error.to_string().contains("number out of range"));
+ continue;
+ }
+ };
+ let value = Value::from(&number);
+ assert!(matches!(value, Value::JsonNumber(_)));
+ assert!(!value.is_zero());
+ assert!(value.matches_global(&number.to_string()));
+
+ let record = serde_json::json!({"n": number, "msg": "match"});
+ for operator in ["=", "!=", "<", ">", "<=", ">=", ":"] {
+ let expr = parse(&format!("n {operator} 0")).unwrap().unwrap();
+ assert!(
+ !expr.compile().unwrap().evaluate(&record),
+ "{text} {operator} 0"
+ );
+ }
+ for filter in ["n:*", "msg=match"] {
+ assert!(
+ parse(filter)
+ .unwrap()
+ .unwrap()
+ .compile()
+ .unwrap()
+ .evaluate(&record)
+ );
+ }
+ let array = serde_json::json!({"n": [number]});
+ assert!(
+ !parse("n:0")
+ .unwrap()
+ .unwrap()
+ .compile()
+ .unwrap()
+ .evaluate(&array)
+ );
+ }
+}
+
+#[test]
+fn borrowed_native_json_numbers_keep_numeric_behavior() {
+ struct Record<'a>(&'a Number);
+ impl Filterable for Record<'_> {
+ fn field(&self, name: &str) -> Option<Value<'_>> {
+ (name == "n").then_some(Value::JsonNumber(self.0))
+ }
+ }
+ for number in [
+ Number::from(0),
+ Number::from(5),
+ Number::from_f64(5.5).unwrap(),
+ ] {
+ let record = Record(&number);
+ let expr = parse(&format!("n = {number}")).unwrap().unwrap();
+ assert!(expr.compile().unwrap().evaluate(&record));
+ assert_eq!(
+ Value::JsonNumber(&number).is_zero(),
+ number.as_i64() == Some(0)
+ );
+ assert!(Value::JsonNumber(&number).matches_global(&number.to_string()));
+ }
+}