yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'lib.jsonschema: parse some more types' (#1417) from DavHau-dave into main

Browse Source
This commit is contained in:
clan-bot
2024-05-23 14:17:56 +00:00
parent d137342243 54fcfda43e
commit cab69935ef
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/jsonschema/default.nix
View File

@@ -83,20 +83,20 @@ rec {
in in
# either type # either type
# TODO: if all nested optiosn are excluded, the parent sould be excluded too # TODO: if all nested options are excluded, the parent should be excluded too
if if
option.type.name or null == "either" option.type.name or null == "either" || option.type.name or null == "coercedTo"
# return jsonschema property definition for either # return jsonschema property definition for either
then then
let let
optionsList' = [ optionsList' = [
{ {
type = option.type.nestedTypes.left; type = option.type.nestedTypes.left or option.type.nestedTypes.coercedType;
_type = "option"; _type = "option";
loc = option.loc; loc = option.loc;
} }
{ {
type = option.type.nestedTypes.right; type = option.type.nestedTypes.right or option.type.nestedTypes.finalType;
_type = "option"; _type = "option";
loc = option.loc; loc = option.loc;
} }
@@ -157,12 +157,21 @@ rec {
# TODO: Add support for intMatching in jsonschema # TODO: Add support for intMatching in jsonschema
# parse port type aka. "unsignedInt16" # parse port type aka. "unsignedInt16"
else if option.type.name == "unsignedInt16" then else if
option.type.name == "unsignedInt16"
|| option.type.name == "unsignedInt"
|| option.type.name == "pkcs11"
|| option.type.name == "intBetween"
then
default // example // description // { type = "integer"; } default // example // description // { type = "integer"; }
# parse string # parse string
# TODO: parse more precise string types
else if else if
option.type.name == "str" option.type.name == "str"
|| option.type.name == "singleLineStr"
|| option.type.name == "passwdEntry str"
|| option.type.name == "passwdEntry path"
# return jsonschema property definition for string # return jsonschema property definition for string
then then
default // example // description // { type = "string"; } default // example // description // { type = "string"; }