refactor(cli): use wrapper decorator instead of spreading return values

src/hyprshade/cli/on.py

@@ -4,20 +4,19 @@
 
 import click
 
-from .utils import MergedVarOption, ShaderParamType, option_variables
+from .utils import (
+    MergedVarOption,
+    ShaderParamType,
+    variables_option,
+)
 
 if TYPE_CHECKING:
     from hyprshade.shader.core import Shader
 
 
 @click.command(short_help="Turn on screen shader")
 @click.argument("shader", type=ShaderParamType())
-@click.option(
-    "--var",
-    "-V",
-    "variables",
-    **option_variables(),
-)
+@variables_option()
 def on(shader: Shader, variables: MergedVarOption):
     """Turn on screen shader."""
 

src/hyprshade/cli/toggle.py

@@ -14,8 +14,8 @@
     ContextObject,
     MergedVarOption,
     ShaderParamType,
-    option_variables,
     optional_param,
+    variables_option,
 )
 
 
@@ -43,12 +43,7 @@
     default=False,
     help="Automatically infer fallback",
 )
-@click.option(
-    "--var",
-    "-V",
-    "variables",
-    **option_variables(),
-)
+@variables_option()
 @click.pass_obj
 def toggle(
     obj: ContextObject,

src/hyprshade/cli/utils.py

@@ -13,6 +13,7 @@
 )
 
 import click
+from click.decorators import FC
 from more_itertools import unique_justseen
 
 from hyprshade.config.core import Config
@@ -132,28 +133,32 @@ def convert(
         return VarOptionPair(key, value_)
 
 
-def option_variables(
-    metavar: str | None = "KEY=VALUE",
-    *,
-    callback: Callable | None = None,
-) -> dict[str, Any]:
+def variables_option(
+    *param_decls: str, cls: type[click.Option] | None = None, **attrs: Any
+) -> Callable[[FC], FC]:
     def __to_dict_callback(
         ctx: click.Context,
         param: click.Parameter,
         value: tuple[VarOptionPair, ...],
     ) -> MergedVarOption:
         merged = VarOptionPair.merge(value)
-        if callback is not None:  # pragma: no cover
+        if (callback := attrs.get("callback")) is not None:  # pragma: no cover
             return callback(ctx, param, merged)
         return merged
 
-    return {
-        "type": VarParamType(),
-        "multiple": True,
-        "callback": __to_dict_callback,
-        "help": "Variables to pass to the shader. May be specified multiple times.",
-        "metavar": metavar,
-    }
+    if len(param_decls) == 0:
+        param_decls = ("--var", "-V", "variables")
+
+    return click.option(
+        *param_decls,
+        cls=cls,
+        metavar="KEY=VALUE",
+        help="Variables to pass to the shader. May be specified multiple times.",
+        **attrs,
+        type=VarParamType(),
+        multiple=True,
+        callback=__to_dict_callback,
+    )
 
 
 class ContextObject: