lib/types: init defaultComposedFunctor for types.{attrsWith,listOf}

NixOS · Dec 17, 2024 · 204bd60 · 204bd60
1 parent 08de518
commit 204bd60
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/lib/types.nix b/lib/types.nix
@@ -127,6 +127,16 @@ rec {
     payload = null;
     binOp   = a: b: null;
   };
+  # Default composed type functor
+  defaultComposedFunctor = name: payload: {
+    inherit name payload;
+    type    = mergedPayload: types.${name} mergedPayload;
+    binOp   = a: b: if a == b then a else null;
+    # Legacy support attributes
+    wrappedDeprecationMessage = { loc }: lib.warn ''
+      The deprecated `type.functor.wrapped` attribute of the option `${showOption loc}` is accessed, use `type.nestedTypes.elemType` instead.
+    '' payload.elemType;
+  };
 
   isOptionType = isType "option-type";
   mkOptionType =
@@ -580,7 +590,9 @@ rec {
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: listOf (elemType.substSubModules m);
-      functor = (defaultFunctor name) // { wrapped = elemType; };
+      functor = (defaultComposedFunctor name { inherit elemType; }) // {
+        type = payload: types.listOf payload.elemType;
+      };
       nestedTypes.elemType = elemType;
     };
 
@@ -664,14 +676,10 @@ rec {
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<${placeholder}>"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: attrsWith { elemType = elemType.substSubModules m; inherit lazy placeholder; };
-      functor = defaultFunctor "attrsWith" // {
-        wrappedDeprecationMessage = { loc }: lib.warn ''
-          The deprecated `type.functor.wrapped` attribute of the option `${showOption loc}` is accessed, use `type.nestedTypes.elemType` instead.
-        '' elemType;
-        payload = {
-          # Important!: Add new function attributes here in case of future changes
+      functor = (defaultComposedFunctor "attrsWith" {
           inherit elemType lazy placeholder;
-        };
+      }) // {
+        # Custom type merging required because of the "placeholder" attribute
         inherit binOp;
       };
       nestedTypes.elemType = elemType;