lib.evalModules: add modules tree report attribute

Co-authored-by: Ali Jamadi <[email protected]>

Author: mightyiam

lib/modules.nix

@@ -358,6 +358,7 @@ let
         options = checked options;
         config = checked (removeAttrs config [ "_module" ]);
         _module = checked (config._module);
+        modules = [];
         inherit extendModules type class;
       };
     in
@@ -513,6 +514,7 @@ let
           disabledKeys = concatMap ({ file, disabled }: map (moduleKey file) disabled) disabled;
           keyFilter = filter (attrs: !elem attrs.key disabledKeys);
         in
+        # CONITUE HERE ALI AND DAWN
         map (attrs: attrs.module) (genericClosure {
           startSet = keyFilter modules;
           operator = attrs: keyFilter attrs.modules;

lib/tests/modules.sh

@@ -82,6 +82,24 @@ checkConfigOutput() {
     fi
 }
 
+checkConfigOutputVerbatim() {
+    local expected=$1
+    shift
+    local actual
+    set +e
+    actual=$(evalConfig "$@" 2> /dev/null)
+    set -e
+    if [[ "$actual" == "$expected" ]]; then
+        ((++pass))
+    else
+        logStartFailure
+        echo "ACTUAL:"
+        reportFailure "$@"
+        echo "EXPECTED: '$expected'"
+        logFailure
+        logEndFailure
+    fi
+}
 checkConfigError() {
     local errorContains=$1
     local err=""
@@ -305,6 +323,20 @@ checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix
 checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
 checkConfigError 'toInt: Could not convert .* to int' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
 
+# Check `modules` attribute
+expected='
+[
+  {
+    "_file": "./modules/modules/root.nix",
+    "imports": [],
+    "type": "attrset"
+  }
+]
+'
+
+expected=$(echo "$expected" | jq --compact-output)
+checkConfigOutputVerbatim "$expected" modules ./modules/root.nix
+
 # Check mkAliasOptionModule.
 checkConfigOutput '^true$' config.enable ./alias-with-priority.nix
 checkConfigOutput '^true$' config.enableAlias ./alias-with-priority.nix

lib/tests/modules/default.nix

@@ -11,5 +11,6 @@
     })
     config
     options
+    modules
     ;
 }

lib/tests/modules/modules/root.nix

@@ -0,0 +1,3 @@
+{
+
+}

lib/tests/test-with-nix.nix

@@ -32,6 +32,7 @@ pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}"
       })
     ];
     nativeBuildInputs = [
+      pkgs.jq
       nix
       pkgs.gitMinimal
     ] ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.inotify-tools;