Rename getName helper to getPluginName.

This commit is contained in:
Kevin Baensch 2025-05-03 21:43:19 +02:00
parent fe3073ddaf
commit 2547713ec4
Signed by: derped
GPG key ID: C0F1D326C7626543
2 changed files with 11 additions and 11 deletions

View file

@ -17,9 +17,9 @@ let
3. (path) baseNameOf plugin.dir
Type:
getName :: Plugin -> String
getPluginName :: Plugin -> String
*/
getName =
getPluginName =
plugin:
if (plugin ? name && plugin.name != null) then
assert builtins.isString plugin.name;
@ -124,7 +124,7 @@ let
resolvePlugin = pluginFn: pluginFn vPlug;
in
lib.pipe plugin [
# Resolve dir and dependencies first so getName can resolve names
# Resolve dir and dependencies first so getPluginName can resolve names
(
plugin:
plugin
@ -132,7 +132,7 @@ let
dir = runIfSet resolvePlugin "dir";
dependencies = runIfSet (
pluginListFn:
(map (pluginOrPackage: getName (pluginWrapper pluginOrPackage))) (resolvePlugin pluginListFn)
(map (pluginOrPackage: getPluginName (pluginWrapper pluginOrPackage))) (resolvePlugin pluginListFn)
) "dependencies";
}
)
@ -141,7 +141,7 @@ let
plugin
// {
__posArgs = runIfSet lib.flatten "short";
name = getName plugin;
name = getPluginName plugin;
enabled = runIfSet stringLiteral "enabled";
cond = runIfSet stringLiteral "cond";
init = runIfSet stringLiteral "init";

View file

@ -21,25 +21,25 @@ let
in
{
helpers = {
getName = {
getPluginName = {
testName = {
expr = lazyUtils.helpers.getName (nullPlugin // { name = "nameTest"; });
expr = lazyUtils.helpers.getPluginName (nullPlugin // { name = "nameTest"; });
expected = "nameTest";
};
testShort = {
expr = lazyUtils.helpers.getName (nullPlugin // { short = "shortTest"; });
expr = lazyUtils.helpers.getPluginName (nullPlugin // { short = "shortTest"; });
expected = "shortTest";
};
testDir = {
expr = lazyUtils.helpers.getName (nullPlugin // { dir = ./empty.txt; });
expr = lazyUtils.helpers.getPluginName (nullPlugin // { dir = ./empty.txt; });
expected = "empty.txt";
};
testDrv = {
expr = lazyUtils.helpers.getName (nullPlugin // { dir = miniDrv; });
expr = lazyUtils.helpers.getPluginName (nullPlugin // { dir = miniDrv; });
expected = "test";
};
testInvalidInput = {
expr = lazyUtils.helpers.getName { };
expr = lazyUtils.helpers.getPluginName { };
expectedError = {
type = "ThrownError";
# For some reason there is whitespace after the newline