change docsgen to use h3s instead of collapsible common options

Author: toptobes

docs_spec.json

@@ -1,5 +1,5 @@
 {
-  "collapsibleOptionGroups" : [
+  "commonGroups" : [
     "Common Options",
     "Connection Options"
   ],

src/main/java/com/dtsx/astra/cli/core/docs/AsciidocGenerator.java

@@ -9,7 +9,6 @@
 import picocli.CommandLine.Model.CommandSpec;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.dtsx.astra.cli.core.docs.AliasUtils.resolveAliasingInformation;
@@ -90,11 +89,11 @@ private DocsPageSections mkDocsPageSections(List<String> commandFullName, Comman
     }
 
     private CommandOptions resolveCommandOptions(CommandSpec commandSpec) {
-        val collapsibleGroups = docsSpec.collapsibleOptionGroups();
+        val commonGroups = docsSpec.commonGroups();
 
         return new CommandOptions(
-            commandSpec.argGroups().stream().filter((g) -> g.heading() != null && collapsibleGroups.stream().anyMatch(g.heading()::contains)).toList(),
-            commandSpec.argGroups().stream().filter((g) -> g.heading() == null || collapsibleGroups.stream().noneMatch(g.heading()::contains)).toList(),
+            commandSpec.argGroups().stream().filter((g) -> g.heading() != null && commonGroups.stream().anyMatch(g.heading()::contains)).toList(),
+            commandSpec.argGroups().stream().filter((g) -> g.heading() == null || commonGroups.stream().noneMatch(g.heading()::contains)).toList(),
             commandSpec.args().stream().filter((a) -> a.group() == null).toList()
         );
     }

src/main/java/com/dtsx/astra/cli/core/docs/DocsPage.java

@@ -145,7 +145,7 @@ public String render() {
         }
     }
 
-    public record CommandOptions(List<ArgGroupSpec> hiddenGroups, List<ArgGroupSpec> groupArgs, List<ArgSpec> nonGroupArgs) implements DocsPageSection {
+    public record CommandOptions(List<ArgGroupSpec> commonGroups, List<ArgGroupSpec> groupArgs, List<ArgSpec> nonGroupArgs) implements DocsPageSection {
         @Override
         public String render() {
             val sb = new StringBuilder("== Options").append(NL).append(NL);
@@ -167,15 +167,13 @@ public String render() {
                 }
             }
 
-            for (val group : hiddenGroups) {
+            for (val group : commonGroups) {
                 sb.append(NL);
-                sb.append('.').append(group.heading().replaceAll("%n|:", "")).append(NL);
-                sb.append("[%collapsible").append("]").append(NL);
-                sb.append("====").append(NL);
+                sb.append("=== ").append(group.heading().replaceAll("%n|:", "")).append(NL);
                 for (val arg : allNestedArgs(group)) {
                     renderArg(sb, arg);
                 }
-                sb.append("====").append(NL);
+                sb.append("=== ").append(NL);
             }
 
             return sb.toString();

src/main/java/com/dtsx/astra/cli/core/docs/ExternalDocsSpec.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 
 public record ExternalDocsSpec(
-    @JsonProperty(required = true) List<String> collapsibleOptionGroups,
+    @JsonProperty(required = true) List<String> commonGroups,
     @JsonProperty(required = true) List<String> hideCommands,
     @JsonProperty(required = true) Map<String, List<String>> seeAlsoLinks
 ) {}