DavHau/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

jsonschema: Filter out 'invisible' options, that are there to throw errors on define

Browse Source
This commit is contained in:
Luis Hebendanz 2024-05-03 19:36:59 +02:00
parent 159198b81a
commit 393ed517e2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jsonschema/default.nix
View File

@ -17,7 +17,7 @@ let
location: ${lib.concatStringsSep "." option.loc}
'';
# Exclude the option if it's type is in the excludedTypes list
# Exclude the option if its type is in the excludedTypes list
# or if the option has a defaultText attribute
isExcludedOption =
option: ((lib.elem (option.type.name or null) excludedTypes) || (option ? defaultText));
@ -26,6 +26,9 @@ let
filterExcludedAttrs = lib.filterAttrs (_name: opt: !isExcludedOption opt);
# Filter out options where the visible attribute is set to false
filterInvisibleOpts = lib.filterAttrs (_name: opt: opt.visible or true);
allBasicTypes = [
"boolean"
"integer"
@ -50,7 +53,7 @@ rec {
parseOptions =
options':
let
options = filterExcludedAttrs (clean options');
options = filterInvisibleOpts (filterExcludedAttrs (clean options'));
# parse options to jsonschema properties
properties = lib.mapAttrs (_name: option: parseOption option) options;
# TODO: figure out how to handle if prop.anyOf is used

3
pkgs/schemas/flake-module.nix
View File

@ -7,7 +7,7 @@
# Uncomment if you only want one module to be available
# clanModules = {
# syncthing = self.clanModules.syncthing;
# borgbackup = self.clanModules.borgbackup;
# };
baseModule = {
@ -30,6 +30,7 @@
];
};
in
# Filter out "injected" options that are not part of the module
if (evaled.options.clan ? "${modulename}") then evaled.options.clan.${modulename} else { };
clanModuleSchemas = lib.mapAttrs (