Merge pull request #67 from hiltontj/hiltontj/cts-update-nov-2023

Compliance Update

serde_json_path/CHANGELOG.md

@@ -8,8 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 # Unreleased
 
 - **added**: `is_empty`, `is_more_than_one`, and `as_more_than_one` methods to `ExactlyOneError` ([#65])
+- **fixed**: allow whitespace before dot-name selectors ([#67])
+- **fixed**: ensure that the check `== -0` in filters works as expected ([#67]) 
 
 [#65]: https://github.com/hiltontj/serde_json_path/pull/65
+[#67]: https://github.com/hiltontj/serde_json_path/pull/67
 
 # 0.6.3 (17 September 2023)
 
@@ -229,4 +232,4 @@ assert_eq!(nodes, vec![1, 2, 3]);
 
 # Previous Versions
 
-Previous versions are not documented here.
+Previous versions are not documented here.

serde_json_path/src/parser/primitive/number.rs

@@ -55,5 +55,9 @@ mod tests {
             parse_number("1.0001"),
             Ok(("", Number::from_f64(1.0001).unwrap()))
         );
+        assert_eq!(
+            parse_number("-0"),
+            Ok(("", Number::from_f64(-0.0).unwrap()))
+        );
     }
 }

serde_json_path/src/parser/segment.rs

@@ -95,11 +95,14 @@ fn parse_dot_wildcard_shorthand(input: &str) -> PResult<Segment> {
 
 #[cfg_attr(feature = "trace", tracing::instrument(level = "trace", parent = None, ret, err))]
 fn parse_child_segment(input: &str) -> PResult<Segment> {
-    alt((
-        parse_dot_wildcard_shorthand,
-        parse_dot_member_name_shorthand,
-        parse_child_long_hand,
-    ))(input)
+    preceded(
+        multispace0,
+        alt((
+            parse_dot_wildcard_shorthand,
+            parse_dot_member_name_shorthand,
+            parse_child_long_hand,
+        )),
+    )(input)
 }
 
 #[cfg_attr(feature = "trace", tracing::instrument(level = "trace", parent = None, ret, err))]

serde_json_path/tests/compliance.rs

@@ -60,7 +60,7 @@ fn compliace_test_suite() {
     }
 }
 
-const TEST_CASE_N: usize = 303;
+const TEST_CASE_N: usize = 388;
 
 #[test]
 #[ignore = "this is only for testing individual CTS test cases as needed"]

serde_json_path_core/CHANGELOG.md

@@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 # Unreleased
 
 - **added**: `is_empty`, `is_more_than_one`, and `as_more_than_one` methods to `ExactlyOneError` ([#65])
+- **fixed**: ensure that the check `== -0` in filters works as expected ([#67]) 
 
 [#65]: https://github.com/hiltontj/serde_json_path/pull/65
+[#67]: https://github.com/hiltontj/serde_json_path/pull/67
 
 # 0.1.2 (17 September 2023)
 

serde_json_path_core/src/spec/selector/filter.rs

@@ -214,15 +214,34 @@ pub struct ComparisonExpr {
 
 fn check_equal_to(left: &JsonPathValue, right: &JsonPathValue) -> bool {
     match (left, right) {
-        (JsonPathValue::Node(v1), JsonPathValue::Node(v2)) => v1 == v2,
-        (JsonPathValue::Node(v1), JsonPathValue::Value(v2)) => *v1 == v2,
-        (JsonPathValue::Value(v1), JsonPathValue::Node(v2)) => v1 == *v2,
-        (JsonPathValue::Value(v1), JsonPathValue::Value(v2)) => v1 == v2,
+        (JsonPathValue::Node(v1), JsonPathValue::Node(v2)) => value_equal_to(v1, v2),
+        (JsonPathValue::Node(v1), JsonPathValue::Value(v2)) => value_equal_to(v1, v2),
+        (JsonPathValue::Value(v1), JsonPathValue::Node(v2)) => value_equal_to(v1, v2),
+        (JsonPathValue::Value(v1), JsonPathValue::Value(v2)) => value_equal_to(v1, v2),
         (JsonPathValue::Nothing, JsonPathValue::Nothing) => true,
         _ => false,
     }
 }
 
+fn value_equal_to(left: &Value, right: &Value) -> bool {
+    match (left, right) {
+        (Value::Number(l), Value::Number(r)) => number_equal_to(l, r),
+        _ => left == right,
+    }
+}
+
+fn number_equal_to(left: &Number, right: &Number) -> bool {
+    if let (Some(l), Some(r)) = (left.as_f64(), right.as_f64()) {
+        l == r
+    } else if let (Some(l), Some(r)) = (left.as_i64(), right.as_i64()) {
+        l == r
+    } else if let (Some(l), Some(r)) = (left.as_u64(), right.as_u64()) {
+        l == r
+    } else {
+        false
+    }
+}
+
 fn value_less_than(left: &Value, right: &Value) -> bool {
     match (left, right) {
         (Value::Number(n1), Value::Number(n2)) => number_less_than(n1, n2),