flakeModules.modules: Make values valid definitions for plain submodule

dev/tests/eval-tests.nix

@@ -95,23 +95,42 @@ rec {
       };
     };
 
-  modulesFlake = mkFlake
+  modulesFlake =
-    {
+    mkFlake
-      inputs.self = { };
+      {
-      moduleLocation = "modulesFlake";
+        inputs.self = { };
-    }
+        moduleLocation = "modulesFlake";
-    {
+      }
-      imports = [ flake-parts.flakeModules.modules ];
+      {
-      systems = [ ];
+        imports = [ flake-parts.flakeModules.modules ];
-      flake = {
+        options = {
-        modules.generic.example = { lib, ... }: {
+          # Test option that uses plain types.submodule
-          options.generic.example = lib.mkOption { default = "works in any module system application"; };
+          flake.fooConfiguration = lib.mkOption {
+            type = lib.types.submoduleWith {
+              # Just Like types.submodule;
+              shorthandOnlyDefinesConfig = true;
+              class = "foo";
+              modules = [ ];
+            };
+          };
         };
-        modules.foo.example = { lib, ... }: {
+        config = {
-          options.foo.example = lib.mkOption { default = "works in foo application"; };
+          systems = [ ];
+          flake = {
+            modules.generic.example =
+              { lib, ... }:
+              {
+                options.generic.example = lib.mkOption { default = "works in any module system application"; };
+              };
+            modules.foo.example =
+              { lib, ... }:
+              {
+                options.foo.example = lib.mkOption { default = "works in foo application"; };
+              };
+            fooConfiguration = modulesFlake.modules.foo.example;
+          };
         };
       };
-    };
 
   flakeModulesDeclare = mkFlake
     { inputs.self = { outPath = ./.; }; }
@@ -315,6 +334,9 @@ rec {
       ];
     }).config.foo.example == "works in foo application";
 
+    # Test that modules can be loaded into plain submodules with shorthandOnlyDefinesConfig = true
+    assert modulesFlake.fooConfiguration.foo.example == "works in foo application";
+
     assert specialArgFlake.foo;
 
     assert builtins.isAttrs partitionWithoutExtraInputsFlake.devShells.x86_64-linux;

extras/modules.nix

@@ -9,13 +9,19 @@ let
     escapeNixIdentifier
     ;
 
-  addInfo = class: moduleName:
+  addInfo =
-    if class == "generic"
+    class: moduleName:
-    then module: module
+    if class == "generic" then
+      module: module
     else
       module:
-      # TODO: set key?
+      # By returning a function, it will be accepted as a full-on module despite
+      # a submodule having shorthandOnlyDefinesConfig = true, which is the
+      # `types.submodule` default.
+      # https://github.com/hercules-ci/flake-parts/issues/326
+      { ... }:
       {
+        # TODO: set key?
         _class = class;
         _file = "${toString moduleLocation}#modules.${escapeNixIdentifier class}.${escapeNixIdentifier moduleName}";
         imports = [ module ];