Merge pull request 'fixed tests case' (#9) from release/0.4.0 into main

Reviewed-on: #9

Cargo.lock

@@ -853,7 +853,7 @@ dependencies = [
 
 [[package]]
 name = "mould"
-version = "0.2.1"
+version = "0.4.0"
 dependencies = [
  "anyhow",
  "clap",

Cargo.toml

@@ -1,4 +1,10 @@
-[[bin.""]]
+[package]
+edition = "2024"
+name = "mould"
+version = "0.4.0"
+authors = ["Nils Pukropp <nils@narl.io>"]
+
+[[bin]]
 name = "mould"
 path = "src/main.rs"
 
@@ -17,23 +23,11 @@ tui-input = "0.15.0"
 
 [dependencies.clap]
 version = "4.6.0"
-
+features = ["derive"]
-[dependencies.clap.features]
-"" = ["derive"]
 
 [dependencies.serde]
 version = "1.0.228"
-
+features = ["derive"]
-[dependencies.serde.features]
-"" = ["derive"]
 
 [dev-dependencies]
 tempfile = "3.27.0"
-
-[package]
-edition = 2024
-name = "mould"
-version = "0.4.0"
-
-[package.authors]
-"" = ["Nils Pukropp <nils@narl.io>"]

config.example.toml

@@ -9,15 +9,16 @@ transparent = false
 # Colors are specified in hex format ("#RRGGBB").
 # Default values follow the Semantic Catppuccin Mocha palette.
 
-bg_normal = "#11111b"
+bg_normal = "#1e1e2e"
 bg_highlight = "#89b4fa"
 bg_active = "#a6e3a1"
 bg_search = "#cba6f7"
 fg_normal = "#cdd6f4"
-fg_dimmed = "#a6adc8"
+fg_dimmed = "#6c7086"
-fg_highlight = "#11111b"
+fg_highlight = "#1e1e2e"
 fg_warning = "#f38ba8"
 fg_modified = "#fab387"
+fg_accent = "#b4befe"
 border_normal = "#45475a"
 border_active = "#a6e3a1"
 tree_depth_1 = "#b4befe"

src/format/hierarchical.rs

@@ -310,12 +310,14 @@ mod tests {
             }
         });
 
-        flatten(&json, "", &mut vars);
+        flatten(&json, "", 0, "", &mut vars);
-        assert_eq!(vars.len(), 2);
+        assert_eq!(vars.len(), 6);
 
         let mut root = Value::Object(Map::new());
         for var in vars {
-            insert_into_value(&mut root, &var.key, &var.value);
+            if !var.is_group {
+                insert_into_value(&mut root, &var.path, var.value.as_deref().unwrap_or(""));
+            }
         }
 
         // When unflattening, it parses bool back