lib/options: rename convertArgs to processDefaultNullArgs

This commit is contained in:
Matt Sturgeon 2024-06-14 12:28:59 +01:00
parent 5cec79e59f
commit 8e8c22ce65
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299

View file

@ -151,7 +151,7 @@ rec {
defaultNullOpts = defaultNullOpts =
let let
# Ensures that default is null and defaultText is not set # Ensures that default is null and defaultText is not set
convertArgs = processDefaultNullArgs =
args: args:
assert assert
args ? default args ? default
@ -165,7 +165,7 @@ rec {
# TODO: removed 2024-06-14; remove stub 2024-09-01 # TODO: removed 2024-06-14; remove stub 2024-09-01
mkDesc = abort "mkDesc has been removed. Use the `pluginDefault` argument or `helpers.pluginDefaultText`."; mkDesc = abort "mkDesc has been removed. Use the `pluginDefault` argument or `helpers.pluginDefaultText`.";
mkNullable' = args: mkNullOrOption' (convertArgs args); mkNullable' = args: mkNullOrOption' (processDefaultNullArgs args);
mkNullable = mkNullable =
type: pluginDefault: description: type: pluginDefault: description:
mkNullable' { inherit type pluginDefault description; }; mkNullable' { inherit type pluginDefault description; };
@ -176,20 +176,20 @@ rec {
type: pluginDefault: description: type: pluginDefault: description:
mkNullableWithRaw' { inherit type pluginDefault description; }; mkNullableWithRaw' { inherit type pluginDefault description; };
mkStrLuaOr' = args: mkNullOrStrLuaOr' (convertArgs args); mkStrLuaOr' = args: mkNullOrStrLuaOr' (processDefaultNullArgs args);
mkStrLuaOr = mkStrLuaOr =
type: pluginDefault: description: type: pluginDefault: description:
mkStrLuaOr' { inherit type pluginDefault description; }; mkStrLuaOr' { inherit type pluginDefault description; };
mkStrLuaFnOr' = args: mkNullOrStrLuaFnOr' (convertArgs args); mkStrLuaFnOr' = args: mkNullOrStrLuaFnOr' (processDefaultNullArgs args);
mkStrLuaFnOr = mkStrLuaFnOr =
type: pluginDefault: description: type: pluginDefault: description:
mkStrLuaFnOr' { inherit type pluginDefault description; }; mkStrLuaFnOr' { inherit type pluginDefault description; };
mkLua' = args: mkNullOrLua' (convertArgs args); mkLua' = args: mkNullOrLua' (processDefaultNullArgs args);
mkLua = pluginDefault: description: mkLua' { inherit pluginDefault description; }; mkLua = pluginDefault: description: mkLua' { inherit pluginDefault description; };
mkLuaFn' = args: mkNullOrLuaFn' (convertArgs args); mkLuaFn' = args: mkNullOrLuaFn' (processDefaultNullArgs args);
mkLuaFn = pluginDefault: description: mkLuaFn' { inherit pluginDefault description; }; mkLuaFn = pluginDefault: description: mkLuaFn' { inherit pluginDefault description; };
mkNum' = args: mkNullableWithRaw' (args // { type = types.number; }); mkNum' = args: mkNullableWithRaw' (args // { type = types.number; });