@brillout/docpress 0.5.5 → 0.5.7

package/dist/index.js

@@ -64,22 +64,22 @@ function getTitle({
     assert(hrefWithoutHash || urlHash);
   }
   let heading;
-  let linkIsOnSamePage = false;
+  let isLinkOnSamePage = false;
   if (hrefWithoutHash) {
     heading = findHeading(hrefWithoutHash, pageContext);
     if (heading.url === pageContext.urlPathname) {
-      linkIsOnSamePage = true;
+      isLinkOnSamePage = true;
       heading = pageContext.activeHeading;
     }
   } else {
     assert(urlHash);
-    linkIsOnSamePage = true;
+    isLinkOnSamePage = true;
     heading = pageContext.activeHeading;
   }
   assert(heading);
-  assert(linkIsOnSamePage === (heading.url === pageContext.urlPathname));
-  assert(linkIsOnSamePage === (heading.url === pageContext.activeHeading.url));
-  assert(linkIsOnSamePage === (heading === pageContext.activeHeading));
+  assert(isLinkOnSamePage === (heading.url === pageContext.urlPathname));
+  assert(isLinkOnSamePage === (heading.url === pageContext.activeHeading.url));
+  assert(isLinkOnSamePage === (heading === pageContext.activeHeading));
   const breadcrumbs = [];
   if (heading.parentHeadings) {
     breadcrumbs.push(
@@ -90,8 +90,8 @@ function getTitle({
   if (urlHash) {
     let sectionTitle = void 0;
     assert(!urlHash.startsWith("#"));
-    const pageHeading = findHeading(`#${urlHash}`, pageContext);
-    if (pageHeading) {
+    if (isLinkOnSamePage) {
+      const pageHeading = findHeading(`#${urlHash}`, pageContext);
       sectionTitle = pageHeading.title;
     } else if ("sectionTitles" in heading && heading.sectionTitles) {
       heading.sectionTitles.forEach((title) => {
@@ -112,7 +112,7 @@ function getTitle({
     breadcrumbs.push(sectionTitle);
   }
   {
-    if (noBreadcrumb || linkIsOnSamePage) {
+    if (noBreadcrumb || isLinkOnSamePage) {
       return breadcrumbs[breadcrumbs.length - 1];
     }
   }
@@ -125,15 +125,13 @@ function getTitle({
 }
 function findHeading(href, pageContext) {
   assert(href.startsWith("/") || href.startsWith("#"));
-  const { headingsProcessed, headingsDetachedProcessed } = pageContext;
-  {
-    const heading2 = headingsDetachedProcessed.find(({ url }) => href === url);
-    if (heading2) {
-      return heading2;
-    }
+  const { headingsAll } = pageContext;
+  const heading = headingsAll.find(({ url }) => href === url);
+  if (href.startsWith("#")) {
+    assertUsage(heading, `Couldn't find ${href} in ${pageContext.urlPathname}, does it exist?`);
+  } else {
+    assertUsage(heading, `Couldn't find heading for ${href}, did you define the heading for ${href}?`);
   }
-  const heading = headingsProcessed.find(({ url }) => href === url);
-  assert(heading, `Could not find heading for ${href}. Did you define the heading for ${href}?`);
   return heading;
 }
 

package/dist/renderer/_default.page.server.js

@@ -189,11 +189,11 @@ function Navigation({
     id: "navigation-container"
   }, /* @__PURE__ */ React3.createElement(NavigationHeader, null), pageContext.headingsOfDetachedPage && /* @__PURE__ */ React3.createElement(React3.Fragment, null, pageContext.headingsOfDetachedPage.length > 1 && /* @__PURE__ */ React3.createElement(NavigationContent, {
     id: "navigation-content-detached",
-    headings: pageContext.headingsOfDetachedPage,
+    headingsProcessed: pageContext.headingsOfDetachedPage,
     currentUrl
   }), /* @__PURE__ */ React3.createElement(DetachedPageNote, null)), /* @__PURE__ */ React3.createElement(NavigationContent, {
     id: "navigation-content-main",
-    headings: pageContext.headingsProcessed,
+    headingsProcessed: pageContext.headingsProcessed,
     currentUrl
   }), /* @__PURE__ */ React3.createElement(NavigationFullscreenClose, null)));
 }
@@ -203,7 +203,7 @@ function NavigationMask() {
   });
 }
 function NavigationContent(props) {
-  const headings = getHeadingsWithComputedProps(props.headings, props.currentUrl);
+  const headings = getHeadingsWithComputedProps(props.headingsProcessed, props.currentUrl);
   const headingsGrouped = groupHeadings(headings);
   return /* @__PURE__ */ React3.createElement("div", {
     id: props.id,
@@ -435,8 +435,14 @@ function resolvePageContext(pageContext) {
   const processed = getHeadingsWithProcessedTitle(config);
   const { headingsDetachedProcessed } = processed;
   let { headingsProcessed } = processed;
-  const { activeHeading, activeNavigationHeading } = findHeading(headingsProcessed, headingsDetachedProcessed, pageContext);
+  const { activeHeading, activeNavigationHeading } = findHeading(
+    headingsProcessed,
+    headingsDetachedProcessed,
+    pageContext
+  );
   let headingsOfDetachedPage = null;
+  let headingsAll = [...headingsProcessed, ...headingsDetachedProcessed];
+  headingsAll = getHeadingsWithSubHeadings(headingsAll, pageContext, activeHeading);
   if (activeNavigationHeading) {
     headingsProcessed = getHeadingsWithSubHeadings(headingsProcessed, pageContext, activeNavigationHeading);
   } else {
@@ -462,6 +468,7 @@ function resolvePageContext(pageContext) {
       algolia
     },
     activeHeading,
+    headingsAll,
     headingsProcessed,
     headingsDetachedProcessed,
     headingsOfDetachedPage,
@@ -517,12 +524,10 @@ function findHeading(headingsProcessed, headingsDetachedProcessed, pageContext)
   }
   return { activeHeading, activeNavigationHeading };
 }
-function getHeadingsWithSubHeadings(headingsProcessed, pageContext, activeNavigationHeading) {
+function getHeadingsWithSubHeadings(headingsProcessed, pageContext, activeHeading) {
   const headingsProcessedWithSubHeadings = headingsProcessed.slice();
-  if (activeNavigationHeading === null)
-    return headingsProcessedWithSubHeadings;
-  const pageHeadings = getPageHeadings(pageContext, activeNavigationHeading);
-  const activeHeadingIdx = headingsProcessedWithSubHeadings.indexOf(activeNavigationHeading);
+  const pageHeadings = getPageHeadings(pageContext, activeHeading);
+  const activeHeadingIdx = headingsProcessedWithSubHeadings.indexOf(activeHeading);
   assert(activeHeadingIdx >= 0);
   pageHeadings.forEach((pageHeading, i) => {
     headingsProcessedWithSubHeadings.splice(activeHeadingIdx + 1 + i, 0, pageHeading);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "scripts": {
     "// Check types while developing": "",
     "types": "tsc --noEmit --watch",