lib: modules: refactor 'mapModules'

Introduce the recursive version of this function, then refactor to
reduce repetition.

lib/modules.nix

@@ -3,6 +3,31 @@ let
   inherit (builtins) readDir pathExists;
   inherit (lib) hasPrefix hasSuffix nameValuePair removeSuffix;
   inherit (self.attrs) mapFilterAttrs;
+
+  implOptionalRecursion = recurse:
+    let
+      recurseStep =
+        if recurse
+        then (n: path: fn: nameValuePair n (impl path fn))
+        else (_: _: _: nameValuePair "" null);
+      impl = dir: fn:
+        mapFilterAttrs
+          (n: _: n != "" && !(hasPrefix "_" n))
+          (n: v:
+            let
+              path = "${toString dir}/${n}";
+            in
+            if v == "directory"
+            then
+              if pathExists "${path}/default.nix"
+              then nameValuePair n (fn path)
+              else recurseStep n path fn
+            else if v == "regular" && n != "default.nix" && hasSuffix ".nix" n
+            then nameValuePair (removeSuffix ".nix" n) (fn path)
+            else nameValuePair "" null)
+          (readDir dir);
+    in
+    impl;
 in
 {
   # Find all nix modules in a directory, discard any prefixed with "_",
@@ -13,19 +38,13 @@ in
   #   path
   #   (path -> any)
   #   attrs
-  mapModules = dir: fn:
+  mapModules = implOptionalRecursion false;
-    mapFilterAttrs
+
-      (n: v:
+  # Recursive version of mapModules.
-        v != null &&
+  #
-        !(hasPrefix "_" n))
+  # mapModulesRec ::
-      (n: v:
+  #   path
-        let path = "${toString dir}/${n}"; in
+  #   (path -> any)
-        if v == "directory" && pathExists "${path}/default.nix"
+  #   attrs
-        then nameValuePair n (fn path)
+  mapModulesRec = implOptionalRecursion true;
-        else if v == "regular" &&
-          n != "default.nix" &&
-          hasSuffix ".nix" n
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
-        else nameValuePair "" null)
-      (readDir dir);
 }