fix: expose

Author: deemp

nix/commands/commandsType.nix

@@ -106,9 +106,15 @@ rec {
                               )
                               helps;
 
-                        prefix = attrByPath path (config.prefix or "") prefixes;
-
-                        expose = attrByPath path (config.expose or (!forPackages)) exposes;
+                        prefix = attrByPath path config.prefix prefixes;
+
+                        expose = attrByPath path
+                          (
+                            if config.expose != null
+                            then config.expose
+                            else (!forPackages)
+                          )
+                          exposes;
                       in
                       {
                         "${if forPackages then "package" else "command"}" = value;

nix/commands/nestedOptions.nix

@@ -166,7 +166,7 @@ in
 
   expose = mkOption {
     type = types.nullOr types.bool;
-    default = false;
+    default = null;
     description = ''
       Can be used as ${flat "expose"} for all
       ${nested "packages"} and ${nested "commands"}.

tests/extra/commands.lib.nix

@@ -62,7 +62,7 @@ let inherit (pkgs) lib; in
         {
           category = "category 1";
           command = "${lib.getExe pkgs.gawk} $@";
-          expose = false;
+          expose = true;
           help = "[command] run awk";
           name = "a.b.awk";
           package = null;
@@ -71,7 +71,7 @@ let inherit (pkgs) lib; in
         {
           category = "category 1";
           command = "${lib.getExe pkgs.jq} $@";
-          expose = false;
+          expose = true;
           help = "[command] run jq";
           name = "a.b.jq-2";
           package = null;
@@ -80,7 +80,7 @@ let inherit (pkgs) lib; in
         {
           category = "category 1";
           command = ''printf "hello\n"'';
-          expose = false;
+          expose = true;
           help = ''[command] print "hello"'';
           name = "command with spaces";
           package = null;