model: add classes

deployment/data-model-test.nix

@@ -22,6 +22,7 @@ in
         fediversity = eval (
           { config, ... }:
           {
+            _class = "fediversity-settings";
             config = {
               resources.nixos-configuration = {
                 description = "An entire NixOS configuration";
@@ -51,6 +52,7 @@ in
                   };
               };
               resources.login-shell = {
+                _class = "fediversity-resource";
                 description = "The operator needs to be able to log into the shell";
                 request =
                   { ... }:
@@ -104,10 +106,12 @@ in
               applications.hello =
                 { ... }:
                 {
+                  _class = "fediversity-application";
                   description = ''Command-line tool that will print "Hello, world!" on the terminal'';
                   module =
                     { ... }:
                     {
+                      _class = "fediversity-application-config";
                       options = {
                         enable = lib.mkEnableOption "Hello in the shell";
                       };
@@ -115,21 +119,25 @@ in
                   implementation =
                     cfg:
                     lib.optionalAttrs cfg.enable {
+                      _class = "fediversity-application-requirements";
                       dummy.login-shell.packages.hello = pkgs.hello;
                     };
                 };
               environments.single-nixos-vm =
                 { config, ... }:
                 {
+                  _class = "fediversity-environment";
                   resources.shell.login-shell.username = "operator";
                   implementation =
                     requests:
                     { providers, ... }:
                     {
+                      _class = "nixops4Deployment";
                       providers = {
                         inherit (inputs.nixops4.modules.nixops4Provider) local;
                       };
                       resources.the-machine = {
+                        _class = "nixops4Resource";
                         type = providers.local.exec;
                         imports = [
                           inputs.nixops4-nixos.modules.nixops4Resource.nixos
@@ -137,6 +145,7 @@ in
                         nixos.module =
                           { ... }:
                           {
+                            _class = "nixos";
                             users.users = config.resources.shell.login-shell.apply (
                               lib.filterAttrs (_name: value: value ? login-shell) requests
                             );
@@ -150,12 +159,16 @@ in
                 type = config.configuration;
                 readOnly = true;
                 default = {
+                  _class = "fediversity-configuration";
                   enable = true;
                   applications.hello.enable = true;
                 };
               };
               example-deployment = mkOption {
-                type = types.submodule nixops4Deployment;
+                type = types.submoduleWith {
+                  class = "nixops4Deployment";
+                  modules = [ nixops4Deployment ];
+                };
                 readOnly = true;
                 default = config.environments.single-nixos-vm.deployment config.example-configuration;
               };

deployment/data-model.nix

@@ -10,13 +10,14 @@ let
     attrsOf
     attrTag
     deferredModuleWith
-    submodule
+    submoduleWith
     optionType
     functionTo
     ;
 
   functionType = import ./function.nix;
-  application-resources = {
+  application-requirements = {
+    _class = "fediversity-application-requirements";
     options.resources = mkOption {
       # TODO: maybe transpose, and group the resources by type instead
       type = attrsOf (
@@ -27,14 +28,16 @@ let
   nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default;
 in
 {
+  _class = "fediversity-settings";
   options = {
     resources = mkOption {
       description = "Collection of deployment resources that can be required by applications and policed by hosting providers";
-      type = attrsOf (
-        submodule (
+      type = attrsOf (submoduleWith {
+        class = "fediversity-resource";
+        modules = [
+          (
             { ... }:
             {
-            _class = "fediversity-resource";
               options = {
                 description = mkOption {
                   description = "Description of the resource to help application module authors and hosting providers to work with it";
@@ -46,10 +49,10 @@ in
                 };
                 policy = mkOption {
                   description = "Options for configuring the resource policy for the hosting provider, a description of how the resource is made available";
-                type = deferredModuleWith {
-                  staticModules = [
+                  type = submoduleWith {
+                    class = "fediversity-resource-policy";
+                    modules = [
                       {
-                      _class = "fediversity-resource-policy";
                         options.apply = mkOption {
                           description = "Apply the policy to a request";
                         };
@@ -60,13 +63,15 @@ in
               };
             }
           )
-      );
+        ];
+      });
     };
     applications = mkOption {
       description = "Collection of Fediversity applications";
-      type = attrsOf (
-        submodule (application: {
-          _class = "fediversity-application";
+      type = attrsOf (submoduleWith {
+        class = "fediversity-application";
+        modules = [
+          (application: {
             options = {
               description = mkOption {
                 description = "Description to be shown in the application overview";
@@ -88,22 +93,27 @@ in
               };
               config-mapping = mkOption {
                 description = "Function type for the mapping from application configuration to required resources";
-              type = submodule functionType;
+                type = submoduleWith {
+                  class = "module-function";
+                  modules = [ functionType ];
+                };
                 readOnly = true;
                 default = {
                   input-type = application.config.module;
-                output-type = application-resources;
+                  output-type = application-requirements;
                 };
               };
             };
           })
-      );
+        ];
+      });
     };
     environments = mkOption {
       description = "Run-time environments for Fediversity applications to be deployed to";
-      type = attrsOf (
-        submodule (environment: {
-          _class = "fediversity-environment";
+      type = attrsOf (submoduleWith {
+        class = "fediversity-environment";
+        modules = [
+          (environment: {
             options = {
               resources = mkOption {
                 description = ''
@@ -114,7 +124,15 @@ in
                 # TODO: maybe transpose, and group the resources by type instead
                 type = attrsOf (
                   attrTag (
-                  lib.mapAttrs (_name: resource: mkOption { type = submodule resource.policy; }) config.resources
+                    lib.mapAttrs (
+                      _name: resource:
+                      mkOption {
+                        type = submoduleWith {
+                          class = "fediversity-resource-policy";
+                          modules = [ resource.policy ];
+                        };
+                      }
+                    ) config.resources
                   )
                 );
               };
@@ -124,16 +142,22 @@ in
               };
               resource-mapping = mkOption {
                 description = "Function type for the mapping from resources to a (NixOps4) deployment";
-              type = submodule functionType;
+                type = submoduleWith {
+                  class = "module-function";
+                  modules = [ functionType ];
+                };
                 readOnly = true;
                 default = {
-                input-type = application-resources;
+                  input-type = application-requirements;
                   output-type = nixops4Deployment;
                 };
               };
               deployment = mkOption {
                 description = "Generate a deployment from a configuration";
-              type = functionTo (submodule environment.config.resource-mapping.output-type);
+                type = functionTo (submoduleWith {
+                  class = "nixops4Deployment";
+                  modules = [ environment.config.resource-mapping.output-type ];
+                });
                 readOnly = true;
                 default =
                   cfg:
@@ -148,13 +172,17 @@ in
               };
             };
           })
-      );
+        ];
+      });
     };
     configuration = mkOption {
       description = "Configuration type declaring options to be set by operators";
       type = optionType;
       readOnly = true;
-      default = submodule {
+      default = submoduleWith {
+        class = "fediversity-configuration";
+        modules = [
+          {
             options = {
               enable = lib.mkEnableOption {
                 description = "your Fediversity configuration";
@@ -163,11 +191,16 @@ in
                 _name: application:
                 mkOption {
                   description = application.description;
-              type = submodule application.module;
+                  type = submoduleWith {
+                    class = "fediversity-application-config";
+                    modules = [ application.module ];
+                  };
                   default = { };
                 }
               ) config.applications;
             };
+          }
+        ];
       };
     };
   };

deployment/function.nix

@@ -13,6 +13,7 @@ let
 in
 {
   options = {
+    _class = "module-function";
     input-type = mkOption {
       type = deferredModule;
     };