feat(pops/haumea): add inputsTransformer

tao3k · Nov 22, 2023 · ce1f931 · ce1f931
1 parent 576a1ca
commit ce1f931
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 31 deletions.
diff --git a/examples/haumea.nix b/examples/haumea.nix
@@ -44,15 +44,20 @@ let
   };
 
   c =
-    ((b.addLoadExtender { src = ../tests/haumeaData/__data; }).addLoadExtender (
-      extendPop pops.loadExtender (
-        self: super: {
-          load = {
-            loader = [ (matchers.nix loaders.scoped) ];
-          };
-        }
+    ((b.addLoadExtender {
+      load.src = ../tests/haumeaData/__data;
+      load.inputsTransformer = [ (x: (x // { a = "1"; })) ];
+    }).addLoadExtender
+      (
+        extendPop pops.loadExtender (
+          self: super: {
+            load = {
+              loader = [ (matchers.nix loaders.scoped) ];
+            };
+          }
+        )
       )
-    )).addExporters
+    ).addExporters
       [
         (extendPop pops.exporter (
           self: super: {

diff --git a/src/haumea/pops.nix b/src/haumea/pops.nix
@@ -22,6 +22,7 @@ let
         src = ./.;
         loader = haumea.lib.loaders.default;
         inputs = { };
+        inputsTransformer = [ ];
         transformer = [ ];
         type = "default";
       };
@@ -63,10 +64,15 @@ let
             extendPop self (
               self: super: {
                 load = {
-                  inherit (load) loader transformer type;
+                  inherit (load)
+                    loader
+                    transformer
+                    type
+                    inputsTransformer
+                  ;
                   src =
                     if l.isString load.src then l.unsafeDiscardStringContext load.src else load.src;
-                  inputs = l.removeAttrs load.inputs [ "self" ];
+                  inputs = lib.pipe load.inputs load.inputsTransformer;
                 };
               }
             )
@@ -133,25 +139,28 @@ let
 
       # -- load --
       load =
-        l.foldl
-          (
-            acc: extender:
-            let
-              ext' =
-                if (extender ? setInit) then
-                  (extender.setInit self.initLoad).load
-                else
-                  extender.load or { }
-              ;
-            in
-            l.recursiveMerge' ([
-              acc
-              ext'
-            ])
-          )
-          self.initLoad
-          self.loadExtenders;
-
+        let
+          cfg =
+            l.foldl
+              (
+                acc: extender:
+                let
+                  ext' =
+                    if (extender ? setInit) then
+                      (extender.setInit self.initLoad).load
+                    else
+                      extender.load or { }
+                  ;
+                in
+                l.recursiveMerge' ([
+                  acc
+                  ext'
+                ])
+              )
+              self.initLoad
+              self.loadExtenders;
+        in
+        (exporter.setLoad cfg).load;
       # -- loadExtenders --
       addLoadExtender =
         defun
@@ -208,7 +217,7 @@ let
       layouts =
         (
           let
-            cfg = (exporter.setLoad self.load).load;
+            cfg = self.load;
             haumeaOutputs =
               if
                 (l.elem cfg.type [
@@ -219,7 +228,14 @@ let
               then
                 nixosModules { inherit cfg; }
               else
-                { default = haumea.lib.load (l.removeAttrs cfg [ "type" ]); }
+                {
+                  default = haumea.lib.load (
+                    l.removeAttrs cfg [
+                      "type"
+                      "inputsTransformer"
+                    ]
+                  );
+                }
             ;
           in
           haumeaOutputs // (l.removeAttrs self.exports [ "default" ])

diff --git a/src/haumea/structAttrs.nix b/src/haumea/structAttrs.nix
@@ -60,6 +60,7 @@ let
     haumeaLoad = {
       src = either path string;
       transformer = either function (list any);
+      inputsTransformer = either function (list any);
       inputs = attrs any;
       loader = either function (list any);
       type =