From 1d9fd3a6f8ac53be4ba7d409defe291c0dbdf97a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 22 Sep 2023 23:55:06 -0400
Subject: [PATCH] manual / manpages: Adjust option filter filtering, move from
 C++ to Nix

Behavior change:

Before we only showed uption if the command-specific options were
non-empty. But that is somewhat odd since we also show common options.
Now, we do everything based on the union of both sorts of options (with
hidden-categories filtered, as before).

Implementation change:

The JSON dumping once again includes all options; the filtering of
hidden categories is done in the Nix instead. This is better separation
of "content" vs "presentation", and prepare the way for the HTML manual
vs manpages / `--help` doing different things.
---
 doc/manual/generate-manpage.nix | 8 ++++++--
 src/libutil/args.cc             | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix
index e18810594..b41730bc2 100644
--- a/doc/manual/generate-manpage.nix
+++ b/doc/manual/generate-manpage.nix
@@ -75,10 +75,14 @@ let
         (details ? doc)
         (replaceStrings ["@stores@"] [storeDocs] details.doc);
 
-      maybeOptions = optionalString (details.flags != {}) ''
+      maybeOptions = let
+        allVisibleOptions = filterAttrs
+          (_: o: ! o.hiddenCategory)
+          (details.flags // toplevel.flags);
+      in optionalString (allVisibleOptions != {}) ''
         # Options
 
-        ${showOptions (details.flags // toplevel.flags)}
+        ${showOptions allVisibleOptions}
 
         > **Note**
         >
diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index 8db293762..e410c7eec 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -236,7 +236,7 @@ nlohmann::json Args::toJSON()
 
     for (auto & [name, flag] : longFlags) {
         auto j = nlohmann::json::object();
-        if (hiddenCategories.count(flag->category)) continue;
+        j["hiddenCategory"] = hiddenCategories.count(flag->category) > 0;
         if (flag->aliases.count(name)) continue;
         if (flag->shortName)
             j["shortName"] = std::string(1, flag->shortName);