feat: include # prefix of index path

SARDONYX-sard · Dec 15, 2024 · aecefda · aecefda
1 parent e4f5648
commit aecefda
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/core/nemesis_xml/src/helpers/tag.rs b/core/nemesis_xml/src/helpers/tag.rs
@@ -3,7 +3,7 @@ use serde_hkx::xml::de::parser::{delimited_with_multispace0, tag::attr_string};
 use std::str::FromStr;
 use winnow::{
     ascii::digit1,
-    combinator::{alt, delimited, preceded, seq},
+    combinator::{alt, delimited, seq},
     error::{
         ContextError, StrContext,
         StrContextValue::{self},
@@ -162,13 +162,10 @@ fn index_name_attr<'a>(input: &mut &'a str) -> PResult<PointerType<'a>> {
 /// # Errors
 /// If parsing failed.
 pub fn index_name<'a>(input: &mut &'a str) -> PResult<PointerType<'a>> {
-    preceded(
-        "#",
-        alt((
-            digit1.map(PointerType::Index),
-            take_until(0.., '\"').map(PointerType::Var),
-        )),
-    )
+    alt((
+        ("#", digit1).take().map(PointerType::Index),
+        take_until(0.., '\"').map(PointerType::Var),
+    ))
     .parse_next(input)
 }
 
@@ -180,10 +177,10 @@ mod tests {
     fn test_index() {
         assert_eq!(
             index_name_attr.parse("\"#0002\""),
-            Ok(PointerType::Index("0002"))
+            Ok(PointerType::Index("#0002"))
         );
         assert_eq!(
-            index_name_attr.parse("\"#$id$2\""),
+            index_name_attr.parse("\"$id$2\""),
             Ok(PointerType::Var("$id$2"))
         );
     }

diff --git a/core/nemesis_xml/src/patch/mod.rs b/core/nemesis_xml/src/patch/mod.rs
@@ -543,9 +543,8 @@ impl<'de> PatchDeserializer<'de> {
 
 #[cfg(test)]
 mod tests {
-    use simd_json::json_typed;
-
     use super::*;
+    use simd_json::json_typed;
 
     #[test]
     fn replace_field() {
@@ -566,7 +565,7 @@ mod tests {
             actual,
             vec![JsonPatch {
                 op: Op::Replace,
-                path: vec!["0010", "hkbProjectData", "stringData"]
+                path: vec!["#0010", "hkbProjectData", "stringData"]
                     .into_iter()
                     .map(|s| s.into())
                     .collect(),
@@ -607,7 +606,7 @@ mod tests {
                 op: Op::Add,
                 // path: https://crates.io/crates/jsonpath-rust
                 path: vec![
-                    "0009",
+                    "#0009",
                     "hkbProjectStringData",
                     "characterFilenames",
                     "[1:7]"
@@ -664,7 +663,7 @@ mod tests {
             vec![JsonPatch {
                 op: Op::Remove,
                 path: vec![
-                    "0009",
+                    "#0009",
                     "hkbProjectStringData",
                     "characterFilenames",
                     "[5:7]"
@@ -701,7 +700,7 @@ mod tests {
                 op: Op::Replace,
                 // path: https://crates.io/crates/jsonpath-rust
                 path: [
-                    "0008",
+                    "#0008",
                     "hkRootLevelContainer",
                     "namedVariants",
                     "[0]",
@@ -717,7 +716,7 @@ mod tests {
     }
 
     #[cfg_attr(feature = "tracing", quick_tracing::init)]
-    #[ignore = "dummy"]
+    #[ignore = "because we need external test files"]
     #[test]
     fn parse() {
         use std::fs::read_to_string;