From 6ab22a0017c0a60eef942013e4960f92d43f170d Mon Sep 17 00:00:00 2001
From: Emile Clark-Boman <emile@agribit.com.au>
Date: Sun, 14 Dec 2025 18:56:07 +1000
Subject: [PATCH] fix: mergeStruct family of functions

---
 nib/parse/struct.nix | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/nib/parse/struct.nix b/nib/parse/struct.nix
index 5d54ac8..048533f 100644
--- a/nib/parse/struct.nix
+++ b/nib/parse/struct.nix
@@ -54,26 +54,30 @@ with nib.types; rec {
         inherit path;
       });
 
-  # check is a function taking two structs
-  # and returning a result monad.
-  mergeStruct' = check: template: S: let
-    R = check template S;
-  in
-    errOr ({...}:
-      Ok (
-        mapAttrsRecursive (
-          path: value: let
-            valueS = attrValueAt S path;
-          in
-            if valueS != null
-            then valueS
-            else value
-        )
-        template
-      ))
-    R;
+  mergeStructs' = f: cond: S: T:
+    mapAttrsRecursiveCond
+    cond
+    (path: valueS: let
+      valueT = attrValueAt T path;
+    in
+      unwrapSome valueT (_: f valueS))
+    S;
 
   # mergeStruct ensures no properties are evaluated (entirely lazy)
+  mergeStructs = mergeStruct (x: x);
+
+  # given a template struct, and the struct to parse
+  parseStructFor =
+    mergeStructs'
+    (leaf: !isTerminal leaf)
+    (value:
+      if isTerminal value
+      then unwrapTerminal value
+      else valueS);
+
+  # TODO: Define:
+  # TODO: throwUnreachable = throw "Unreachable code was evaluated..";
+  # TODO: abortUnreachable = abort "Unreachable code was evaluated...";
   mergeStruct = mergeStruct' (_: _: Ok');
 
   # mergeTypedPartialStruct must evaluate properties (not lazy)