refactor(yants/types): enhance types check

flake.nix

@@ -4,7 +4,7 @@
     POP.url = "github:divnix/POP";
     POP.inputs.nixpkgs.follows = "";
     POP.inputs.flake-compat.follows = "";
-    yants.url = "github:divnix/yants";
+    yants.url = "github:divnix/yants/?ref=refs/pull/5/head";
 
     haumea.url = "github:nix-community/haumea";
     haumea.inputs.nixpkgs.follows = "nixlib";

local/cells/repo/configs.nix

@@ -9,6 +9,9 @@
 { inputs, cell }:
 with inputs.std.inputs.dmerge; {
   conform.data = {
-    commit.conventional.scopes = append [ "nixosModules" ];
+    commit.conventional.scopes = append [
+      "nixosModules"
+      "yants"
+    ];
   };
 }

src/haumea/pops.nix

@@ -155,7 +155,7 @@ let
         defun
           (
             with types; [
-              (either haumeaInitLoadPop (attrs any))
+              (either haumeaLoadExtenderPop haumeaLoadExtender)
               haumeaDefaultPop
             ]
           )
@@ -165,7 +165,7 @@ let
         defun
           (
             with types; [
-              (either (list haumeaInitLoadPop) (list (attrs any)))
+              (either (list haumeaLoadExtenderPop) (list haumeaLoadExtender))
               haumeaDefaultPop
             ]
           )

src/haumea/structAttrs.nix

@@ -43,6 +43,11 @@ let
 
       addExporters = function;
       addExporter = function;
+      load = attrs any;
+      initLoad = struct "haumea.load" structAttrs.haumeaLoad;
+
+      outputs = function;
+      layouts = attrs any;
     };
 
     haumeaExporterPop = structAttrs.pop // {
@@ -52,7 +57,6 @@ let
       setLoad = function;
       setOutputs = function;
     };
-
     haumeaLoad = {
       src = either path string;
       transformer = either function (list any);
@@ -68,9 +72,17 @@ let
           ]
           "type";
     };
+
+    haumeaLoadExtender = {
+      load = structOption "haumea.load" structAttrs.haumeaLoad;
+    };
+
+    haumeaLoadExtenderPop = structAttrs.pop // structAttrs.haumeaInitLoadPop;
+
     haumeaLoadPop = structAttrs.pop // structAttrs.haumeaLoad;
     haumeaInitLoadPop = structAttrs.pop // rec {
       initLoad = struct "haumea.load" structAttrs.haumeaLoad;
+      load = structAttrs.haumeaLoadExtender.load;
       #list (either function any);
       setInit = function;
     };

src/haumea/types.nix

@@ -3,19 +3,23 @@
   root,
   super,
 }:
-with (yants "flops");
+with (yants "flops.haumea");
 let
   inherit (super.structAttrs)
     haumeaLoadPop
     haumeaExporterPop
     haumeaInitLoadPop
     haumeaDefaultPop
+    haumeaLoadExtender
+    haumeaLoadExtenderPop
     pop
   ;
   inherit (haumeaInitLoadPop) initLoad;
 in
 {
   pop = openStruct pop;
+  haumeaLoadExtender = struct "loadPop" haumeaLoadExtender;
+  haumeaLoadExtenderPop = struct "loadExtenderPop" haumeaLoadExtenderPop;
   haumeaLoadPop = openStruct haumeaLoadPop;
   haumeaExporterPop = openStruct haumeaExporterPop;
   haumeaDefaultPop = openStruct haumeaDefaultPop;