broken

Cargo.toml

@@ -18,7 +18,7 @@ libdeflate = ["libdeflater/freestanding"]
 serialize = []
 
 [dependencies]
-jomini = { version = "0.21", features = ["json"] }
+jomini =  { git = "https://github.com/rakaly/jomini.git", branch = "deser", features = ["json"] }
 zip = { version =  "0.6", default-features = false }
 serde = { version = "1", features = ["derive"] }
 thiserror = "1"

src/lib.rs

@@ -52,6 +52,7 @@ mod header;
 mod melt;
 pub mod models;
 mod tokens;
+mod maybe_object;
 
 pub use ck3date::*;
 pub use errors::*;

src/maybe_object.rs

@@ -0,0 +1,54 @@
+use std::fmt;
+use std::marker::PhantomData;
+use serde::{Deserialize, Deserializer, de, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Serialize)]
+pub enum MaybeObject<T> {
+    Text(String),
+    Object(T),
+}
+
+impl<'de, T> Deserialize<'de> for MaybeObject<T>
+where
+    T: Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct MaybeObjectVisitor<T1> {
+            marker: PhantomData<T1>,
+        }
+
+        impl<'de, T1> de::Visitor<'de> for MaybeObjectVisitor<T1>
+        where
+            T1: Deserialize<'de>,
+        {
+            type Value = MaybeObject<T1>;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("an object or string")
+            }
+
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(MaybeObject::Text(String::from(v)))
+            }
+
+            fn visit_map<A>(self, map: A) -> Result<Self::Value, A::Error>
+            where
+                A: de::MapAccess<'de>,
+            {
+                let mvd = de::value::MapAccessDeserializer::new(map);
+                let result = T1::deserialize(mvd)?;
+                Ok(MaybeObject::Object(result))
+            }
+        }
+
+        deserializer.deserialize_map(MaybeObjectVisitor {
+            marker: PhantomData,
+        })
+    }
+}

src/models/gamestate.rs

@@ -1,11 +1,13 @@
 use std::collections::HashMap;
-use super::MetadataOwned;
-use crate::flavor::reencode_float;
-use serde::{Deserialize, Deserializer, Serialize};
 
 
-use crate::Ck3Date;
+use serde::{Deserialize, Deserializer, Serialize};
 
+use crate::{Ck3Date};
+use crate::flavor::reencode_float;
+use crate::maybe_object::MaybeObject;
+
+use super::MetadataOwned;
 
 #[derive(Debug, Deserialize)]
 pub struct Gamestate {
@@ -20,10 +22,11 @@ pub struct Gamestate {
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct Dynasties {
-    pub dynasty_house: HashMap<u64, DynastyHouse>,
-    pub dynasties: HashMap<u64, Dynasty>,
+    pub dynasty_house: HashMap<u64, MaybeObject<DynastyHouse>>,
+    pub dynasties: HashMap<u64, MaybeObject<Dynasty>>,
 }
 
+
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct PlayedCharacter {
     pub name: String,
@@ -33,7 +36,7 @@ pub struct PlayedCharacter {
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DynastyHouse {
     pub name: Option<String>,
-    pub dynasty: u64
+    // pub dynasty: Option<String>
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
@@ -113,4 +116,4 @@ where
 
 pub (crate) fn default_false() -> bool {
     false
-}
+}