@fern-api/fdr-sdk 1.2.43-60e226c2d6 → 1.2.44-08a3a65358

package/dist/js/navigation/ledger-root-builder.mjs

@@ -1310,7 +1310,14 @@ function sectionNode(ctx, scoped, sectionChildren, scopePrefix) {
   const relSection = stripLeadingScopePrefix(seg.section, scopePrefix);
   let slug = structuralNodeSlug(ctx, overview?.fullPath, relSection, scopePrefix);
   if (relSection === "" && overview?.fullPath == null) {
-    slug = inferSectionSlugFromNav(ctx, nav, scopePrefix) ?? slug;
+    const inferred = inferSectionSlugFromNav(ctx, nav, scopePrefix);
+    if (inferred != null) {
+      const inferredStr = String(inferred);
+      const collides = nav.some((r) => r.fullPath != null && String(ctx.contentSlug(r.fullPath)) === inferredStr);
+      if (!collides) {
+        slug = inferred;
+      }
+    }
   }
   const metaPointsTo = metaStr(seg.metadata, "pointsTo");
   const defaults = withMetadataDefaults({
@@ -1718,6 +1725,13 @@ function buildSectionTree(ctx, scopeSegs, parentPath, scopePrefix, changelogScop
     if (!sectionPaths.has(parent)) {
       return nearestExistingAncestor(sec, sectionPaths) === parentPath;
     }
+    if (depth != null) {
+      const pSeg = scopeSegs.find((c) => c.seg.section === parent);
+      const pDepth = pSeg != null ? metaNum(pSeg.seg.metadata, "sidebarDepth") : void 0;
+      if (pDepth != null && depth <= pDepth) {
+        return nearestExistingAncestor(parent, sectionPaths) === parentPath;
+      }
+    }
     return false;
   }).sort((a, b) => a.seg.sortOrder - b.seg.sortOrder);
   const siblingBoundaries = computeDuplicateSiblingSortBoundaries(direct);
@@ -1806,6 +1820,9 @@ function buildSidebarRootChildren(ctx, scopeSegs, scopePrefix, changelogScopePre
   const hasRootSection = ordered.some(
     (s) => metaStr(s.seg.metadata, "type") === "section" && s.seg.section === "" && (metaNum(s.seg.metadata, "childIndex") == null || siblingBoundaries.has(s))
   );
+  const hasTrueRootWrapper = ordered.some(
+    (s) => metaStr(s.seg.metadata, "type") === "section" && s.seg.section === "" && metaNum(s.seg.metadata, "childIndex") == null
+  );
   const depth0SectionPaths = /* @__PURE__ */ new Set();
   for (const s of ordered) {
     if (metaStr(s.seg.metadata, "type") === "section" && metaNum(s.seg.metadata, "sidebarDepth") === 0) {
@@ -1840,7 +1857,15 @@ function buildSidebarRootChildren(ctx, scopeSegs, scopePrefix, changelogScopePre
     }
     if (type === "section" && sec === "" && hasRootSection) {
       const bounds = siblingBoundaries.get(s);
-      const ownedSegs = bounds != null ? scopeSegs.filter((seg) => seg.seg.sortOrder >= bounds.lo && seg.seg.sortOrder < bounds.hi) : scopeSegs;
+      let ownedSegs = bounds != null ? scopeSegs.filter((seg) => seg.seg.sortOrder >= bounds.lo && seg.seg.sortOrder < bounds.hi) : scopeSegs;
+      if (!hasTrueRootWrapper) {
+        ownedSegs = ownedSegs.filter((o) => {
+          if (o.seg.section === "") {
+            return true;
+          }
+          return metaNum(o.seg.metadata, "sidebarDepth") != null;
+        });
+      }
       const sectionChildren = buildSectionTree(ctx, ownedSegs, "", scopePrefix, changelogScopePrefix);
       const node = sectionNode(ctx, s, sectionChildren, scopePrefix);
       annotated.push({ node, pos: metaNum(s.seg.metadata, "childIndex"), isLeaf: false });
@@ -1849,7 +1874,7 @@ function buildSidebarRootChildren(ctx, scopeSegs, scopePrefix, changelogScopePre
     const depth = metaNum(s.seg.metadata, "sidebarDepth");
     const parent = parentSectionPath(sec);
     const isRootLevel = depth === 0 || parent === "" || !sectionPaths.has(parent) && nearestExistingAncestor(sec, sectionPaths) === "";
-    if (isRootLevel && hasRootSection && sec !== "" && depth !== 0) {
+    if (isRootLevel && hasRootSection && sec !== "" && (depth != null ? depth !== 0 : hasTrueRootWrapper)) {
       continue;
     }
     if (isRootLevel && depth != null && depth > 0 && depth0SectionPaths.has(sec)) {
@@ -1883,7 +1908,11 @@ function buildSidebarRootChildren(ctx, scopeSegs, scopePrefix, changelogScopePre
   const hasLeafPos = annotated.some((a) => a.isLeaf && a.pos != null);
   const hasSegmentPos = annotated.some((a) => !a.isLeaf && a.pos != null);
   const flat = hasLeafPos && hasSegmentPos ? annotated.map((a, seq) => ({ ...a, seq })).sort(
-    (x, y) => (x.pos ?? Number.MAX_SAFE_INTEGER) - (y.pos ?? Number.MAX_SAFE_INTEGER) || x.seq - y.seq
+    (x, y) => (x.pos ?? Number.MAX_SAFE_INTEGER) - (y.pos ?? Number.MAX_SAFE_INTEGER) || // When positions tie, prefer structural nodes (sections) over
+    // leaves (pages). This handles stale tabRoot nav entries whose
+    // displaySortOrder wasn't updated due to content-addressing
+    // (the segment hash doesn't include childPosition).
+    (x.isLeaf === y.isLeaf ? 0 : x.isLeaf ? 1 : -1) || x.seq - y.seq
   ).map((a) => a.node) : annotated.map((a) => a.node);
   return groupSidebarRootChildren(ctx, flat);
 }