feat: add StructAcessType to ensure access type

Signed-off-by: Woshiluo Luo <woshiluo.luo@outlook.com>

Author: woshiluo

src/de_mut/data.rs

@@ -4,7 +4,7 @@ use super::{DtError, PropCursor, RefDtb, RegConfig};
 use core::marker::PhantomData;
 use serde::{de, Deserialize};
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub(super) enum ValueCursor {
     Prop(PropCursor),
     Body(BodyCursor),
@@ -304,10 +304,10 @@ impl<'de> de::Deserializer<'de> for &mut ValueDeserializer<'de> {
     where
         V: de::Visitor<'de>,
     {
-        use super::{StructAccess, Temp};
+        use super::{StructAccess, StructAccessType, Temp};
         if let ValueCursor::Body(cursor) = self.cursor {
             return visitor.visit_map(StructAccess {
-                fields: None,
+                access_type: StructAccessType::Map(false),
                 temp: Temp::Node(self.body_cursor, cursor),
                 de: self,
             });
@@ -324,10 +324,10 @@ impl<'de> de::Deserializer<'de> for &mut ValueDeserializer<'de> {
     where
         V: de::Visitor<'de>,
     {
-        use super::{StructAccess, Temp};
+        use super::{StructAccess, StructAccessType, Temp};
         if let ValueCursor::Body(cursor) = self.cursor {
             return visitor.visit_map(StructAccess {
-                fields: Some(fields),
+                access_type: StructAccessType::Struct(fields),
                 temp: Temp::Node(self.body_cursor, cursor),
                 de: self,
             });

src/de_mut/mod.rs

@@ -53,9 +53,15 @@ where
     })
 }
 
+// For map type, we should send root item to trans dtb and reg
+enum StructAccessType {
+    Map(bool),
+    Struct(&'static [&'static str]),
+}
+
 /// 结构体解析状态。
 struct StructAccess<'de, 'b> {
-    fields: Option<&'static [&'static str]>,
+    access_type: StructAccessType,
     temp: Temp,
     de: &'b mut ValueDeserializer<'de>,
 }
@@ -77,10 +83,17 @@ impl<'de> de::MapAccess<'de> for StructAccess<'de, '_> {
     where
         K: de::DeserializeSeed<'de>,
     {
+        if let StructAccessType::Map(flag) = self.access_type {
+            if !flag {
+                return seed
+                    .deserialize(de::value::BorrowedStrDeserializer::new("/"))
+                    .map(Some);
+            }
+        }
         let check_contains = |name: &str| -> bool {
-            match self.fields {
-                Some(fields) => fields.contains(&name),
-                None => true,
+            match self.access_type {
+                StructAccessType::Struct(fields) => fields.contains(&name),
+                _ => true,
             }
         };
         let name = loop {
@@ -148,6 +161,17 @@ impl<'de> de::MapAccess<'de> for StructAccess<'de, '_> {
     where
         V: de::DeserializeSeed<'de>,
     {
+        if let StructAccessType::Map(ref mut flag) = self.access_type {
+            if !*flag {
+                *flag = true;
+                return seed.deserialize(&mut ValueDeserializer {
+                    dtb: self.de.dtb,
+                    reg: self.de.reg,
+                    body_cursor: self.de.body_cursor,
+                    cursor: self.de.cursor,
+                });
+            }
+        }
         match self.temp {
             Temp::Node(origin_cursor, cursor) => {
                 // 键是独立节点名字，递归

src/de_mut/node.rs

@@ -179,9 +179,12 @@ impl<'de> Deserialize<'de> for Node<'_> {
                 let mut reg: Option<RegConfig> = None;
                 let mut props_start: Option<BodyCursor> = None;
                 let mut nodes_start: Option<BodyCursor> = None;
-                while let Some((_, value)) = access.next_entry::<&str, ValueDeserializer<'b>>()? {
+                while let Some((key, value)) = access.next_entry::<&str, ValueDeserializer<'b>>()? {
                     dtb = Some(value.dtb);
                     reg = Some(value.reg);
+                    if key == "/" {
+                        continue;
+                    }
                     match value.cursor {
                         ValueCursor::Prop(_) => {
                             if props_start.is_none() {
@@ -196,7 +199,6 @@ impl<'de> Deserialize<'de> for Node<'_> {
                     }
                 }
 
-                // TODO: May panic if a node have no children & prop
                 Ok(Node {
                     dtb: dtb.unwrap(),
                     reg: reg.unwrap(),

src/utils/mod.rs

@@ -54,7 +54,6 @@ impl Node<'_> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use crate::{
         buildin::{Node, StrSeq},
         from_raw_mut, Dtb, DtbPtr,