[BUGFIX] Fix toctrees with maxdepth, without titlesonly

Author: linawolf

packages/guides/src/Compiler/NodeTransformers/MenuNodeTransformers/SectionMenuEntryNodeTransformer.php renamed to packages/guides/src/Compiler/NodeTransformers/MenuNodeTransformers/ContentsMenuEntryNodeTransformer.php

@@ -5,6 +5,7 @@
 namespace phpDocumentor\Guides\Compiler\NodeTransformers\MenuNodeTransformers;
 
 use phpDocumentor\Guides\Compiler\CompilerContext;
+use phpDocumentor\Guides\Nodes\Menu\ContentMenuNode;
 use phpDocumentor\Guides\Nodes\Menu\MenuEntryNode;
 use phpDocumentor\Guides\Nodes\Menu\MenuNode;
 use phpDocumentor\Guides\Nodes\Menu\SectionMenuEntryNode;
@@ -15,7 +16,7 @@
 
 use const PHP_INT_MAX;
 
-final class SectionMenuEntryNodeTransformer extends AbstractMenuEntryNodeTransformer
+final class ContentsMenuEntryNodeTransformer extends AbstractMenuEntryNodeTransformer
 {
     private const DEFAULT_MAX_LEVELS = PHP_INT_MAX;
 
@@ -33,6 +34,10 @@ public function supports(Node $node): bool
     /** @return list<MenuEntryNode> */
     protected function handleMenuEntry(MenuNode $currentMenu, MenuEntryNode $node, CompilerContext $compilerContext): array
     {
+        if (!$currentMenu instanceof ContentMenuNode) {
+            return [$node];
+        }
+
         assert($node instanceof SectionMenuEntryNode);
         $depth = (int) $currentMenu->getOption('depth', self::DEFAULT_MAX_LEVELS - 1) + 1;
         $documentEntry = $compilerContext->getDocumentNode()->getDocumentEntry();

packages/guides/src/Compiler/NodeTransformers/MenuNodeTransformers/InternalMenuEntryNodeTransformer.php

@@ -59,8 +59,8 @@ protected function handleMenuEntry(MenuNode $currentMenu, MenuEntryNode $node, C
                 $this->isInRootline($documentEntry, $compilerContext->getDocumentNode()->getDocumentEntry()),
                 $this->isCurrent($documentEntry, $currentPath),
             );
-            if (!$currentMenu->hasOption('titlesonly')) {
-                $this->addSubSectionsToMenuEntries($documentEntry, $menuEntry, $maxDepth - 1);
+            if (!$currentMenu->hasOption('titlesonly') && $maxDepth > 1) {
+                $this->addSubSectionsToMenuEntries($documentEntry, $menuEntry, $maxDepth);
             }
 
             if ($currentMenu instanceof TocNode) {

packages/guides/src/Compiler/NodeTransformers/MenuNodeTransformers/SubInternalMenuEntryNodeTransformer.php

@@ -38,7 +38,7 @@ protected function handleMenuEntry(MenuNode $currentMenu, MenuEntryNode $node, C
         assert($node instanceof InternalMenuEntryNode);
         $maxDepth = (int) $currentMenu->getOption('maxdepth', self::DEFAULT_MAX_LEVELS);
         $documentEntryOfMenuEntry = $compilerContext->getProjectNode()->getDocumentEntry($node->getUrl());
-        $this->addSubEntries($compilerContext, $node, $documentEntryOfMenuEntry, $node->getLevel() + 1, $maxDepth);
+        $this->addSubEntries($currentMenu, $compilerContext, $node, $documentEntryOfMenuEntry, $node->getLevel() + 1, $maxDepth);
 
         return [$node];
     }
@@ -50,6 +50,7 @@ public function getPriority(): int
     }
 
     private function addSubEntries(
+        MenuNode $currentMenu,
         CompilerContext $compilerContext,
         InternalMenuEntryNode $sectionMenuEntry,
         DocumentEntryNode $documentEntry,
@@ -71,8 +72,13 @@ private function addSubEntries(
                 self::isInRootline($subDocumentEntryNode, $compilerContext->getDocumentNode()->getDocumentEntry()),
                 self::isCurrent($subDocumentEntryNode, $compilerContext->getDocumentNode()->getFilePath()),
             );
+
+            if (!$currentMenu->hasOption('titlesonly') && $maxDepth - $currentLevel + 1 > 1) {
+                $this->addSubSectionsToMenuEntries($subDocumentEntryNode, $subMenuEntry, $maxDepth - $currentLevel + 2);
+            }
+
             $sectionMenuEntry->addMenuEntry($subMenuEntry);
-            $this->addSubEntries($compilerContext, $subMenuEntry, $subDocumentEntryNode, $currentLevel + 1, $maxDepth);
+            $this->addSubEntries($currentMenu, $compilerContext, $subMenuEntry, $subDocumentEntryNode, $currentLevel + 1, $maxDepth);
         }
     }
 }

tests/Integration/tests/toctree/toctree-maxdepth/expected/index.html

@@ -32,3 +32,20 @@ Maxdepth 4
 
     page1
     subpage2/page1
+
+Maxdepth 5
+
+.. toctree::
+    :maxdepth: 5
+
+    page1
+    subpage2/page1
+
+
+
+No Maxdepth
+
+.. toctree::
+
+    page1
+    subpage2/page1

tests/Integration/tests/toctree/toctree-maxdepth/input/index.rst

@@ -15,6 +15,16 @@ Page 1, Level 3
 
 Paragraph.
 
+Page 1, Level 4
+...............
+
+Paragraph.
+
+Page 1, Level 5
+###############
+
+Paragraph.
+
 Page 1, Level 2.2
 -----------------
 

tests/Integration/tests/toctree/toctree-maxdepth/input/page1.rst

@@ -13,6 +13,16 @@ Subpage 1, Page 1, Level 3
 
 Paragraph.
 
+Subpage 1, Page 1, Level 4
+..........................
+
+Paragraph.
+
+Subpage 1, Page 1, Level 5
+##########################
+
+Paragraph.
+
 Subpage 1, Page 1, Level 2.2
 ----------------------------