@brillout/docpress 0.5.4 → 0.5.6

package/dist/{chunk-3VVR6QXA.js → chunk-5UXVGXHH.js}

@@ -44,9 +44,9 @@ function RepoLink({ path, text, editMode }) {
   }, text);
 }
 
-// src/headings.ts
+// src/parseTitle.ts
 import React3 from "react";
-function getHeadings(config) {
+function getHeadingsWithProcessedTitle(config) {
   const headingsWithoutParent = config.headings.map((heading) => {
     const titleProcessed = parseTitle(heading.title);
     const titleInNav = heading.titleInNav || heading.title;
@@ -69,28 +69,28 @@ function getHeadings(config) {
     };
     return headingProcessed;
   });
-  const headings = [];
+  const headingsProcessed = [];
   headingsWithoutParent.forEach((heading) => {
-    const parentHeadings = findParentHeadings(heading, headings);
-    headings.push({ ...heading, parentHeadings });
+    const parentHeadings = findParentHeadings(heading, headingsProcessed);
+    headingsProcessed.push({ ...heading, parentHeadings });
   });
-  const headingsDetached = config.headingsDetached.map((headingsDetached2) => {
-    const { url, title } = headingsDetached2;
+  const headingsDetachedProcessed = config.headingsDetached.map((headingsDetached) => {
+    const { url, title } = headingsDetached;
     assert(
-      headings.find((heading) => heading.url === url) === void 0,
-      `remove ${headingsDetached2.url} from headingsDetached`
+      headingsProcessed.find((heading) => heading.url === url) === void 0,
+      `remove ${headingsDetached.url} from headingsDetached`
     );
     const titleProcessed = typeof title === "string" ? parseTitle(title) : title;
     return {
-      ...headingsDetached2,
+      ...headingsDetached,
       level: 2,
       title: titleProcessed,
       titleInNav: titleProcessed,
       parentHeadings: null
     };
   });
-  assertHeadingsUrl([...headings, ...headingsDetached]);
-  return { headings, headingsDetached };
+  assertHeadingsUrl([...headingsProcessed, ...headingsDetachedProcessed]);
+  return { headingsProcessed, headingsDetachedProcessed };
 }
 function findParentHeadings(heading, headings) {
   const parentHeadings = [];
@@ -172,6 +172,6 @@ export {
   usePageContext,
   isRepoLink,
   RepoLink,
-  getHeadings,
+  getHeadingsWithProcessedTitle,
   parseTitle
 };

package/dist/index.js

@@ -1,10 +1,9 @@
 import {
   RepoLink,
-  getHeadings,
   isRepoLink,
   parseTitle,
   usePageContext
-} from "./chunk-3VVR6QXA.js";
+} from "./chunk-5UXVGXHH.js";
 import {
   FeatureList
 } from "./chunk-NVJING6T.js";
@@ -34,6 +33,10 @@ function Link({
   doNotInferSectionTitle,
   titleNormalCase
 }) {
+  assertUsage(
+    href.startsWith("/") || href.startsWith("#"),
+    `<Link href /> prop \`href==='${href}'\` but should start with '/' or '#'`
+  );
   if (isRepoLink(href)) {
     return /* @__PURE__ */ React.createElement(RepoLink, {
       path: href,
@@ -86,7 +89,11 @@ function getTitle({
   breadcrumbs.push(heading.title);
   if (urlHash) {
     let sectionTitle = void 0;
-    if ("sectionTitles" in heading && heading.sectionTitles) {
+    assert(!urlHash.startsWith("#"));
+    const pageHeading = linkIsOnSamePage && findHeading(`#${urlHash}`, pageContext);
+    if (pageHeading) {
+      sectionTitle = pageHeading.title;
+    } else if ("sectionTitles" in heading && heading.sectionTitles) {
       heading.sectionTitles.forEach((title) => {
         if (determineSectionUrlHash(title) === urlHash) {
           sectionTitle = parseTitle(title);
@@ -117,16 +124,16 @@ function getTitle({
   }));
 }
 function findHeading(href, pageContext) {
-  assert(href.startsWith("/"), `\`href==='${href}'\` but should start with \`/\`.`);
-  const { headings, headingsDetached } = getHeadings(pageContext.config);
+  assert(href.startsWith("/") || href.startsWith("#"));
+  const { headingsProcessed, headingsDetachedProcessed } = pageContext;
   {
-    const heading2 = headingsDetached.find(({ url }) => href === url);
+    const heading2 = headingsDetachedProcessed.find(({ url }) => href === url);
     if (heading2) {
       return heading2;
     }
   }
-  const heading = headings.find(({ url }) => href === url);
-  assert(heading, `Could not find page \`${href}\`. Does it exist?`);
+  const heading = headingsProcessed.find(({ url }) => href === url);
+  assert(heading, `Could not find heading for ${href}. Did you define the heading for ${href}?`);
   return heading;
 }
 
@@ -309,7 +316,9 @@ var alignable_default = "/assets/alignable-B4QZV4X7.svg";
 
 // src/components/Sponsors/sponsorsList.ts
 var individuals = [
-  { username: "royalswe" },
+  { username: "talzion12" },
+  { username: "felixhaeberle" },
+  { username: "apappas1129" },
   { username: "agalbenus" },
   { username: "phiberber" },
   { username: "cookieplace" },

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

@@ -1,10 +1,10 @@
 import {
   PageContextProvider,
   RepoLink,
-  getHeadings,
+  getHeadingsWithProcessedTitle,
   parseTitle,
   usePageContext
-} from "../chunk-3VVR6QXA.js";
+} from "../chunk-5UXVGXHH.js";
 import {
   Emoji,
   jsxToTextContent,
@@ -187,13 +187,13 @@ function Navigation({
   const currentUrl = pageContext.urlPathname;
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement("div", {
     id: "navigation-container"
-  }, /* @__PURE__ */ React3.createElement(NavigationHeader, null), pageContext.detachedPageHeadings && /* @__PURE__ */ React3.createElement(React3.Fragment, null, pageContext.detachedPageHeadings.length > 1 && /* @__PURE__ */ React3.createElement(NavigationContent, {
+  }, /* @__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.detachedPageHeadings,
+    headings: pageContext.headingsOfDetachedPage,
     currentUrl
   }), /* @__PURE__ */ React3.createElement(DetachedPageNote, null)), /* @__PURE__ */ React3.createElement(NavigationContent, {
     id: "navigation-content-main",
-    headings: pageContext.headingsWithSubHeadings,
+    headings: pageContext.headingsProcessed,
     currentUrl
   }), /* @__PURE__ */ React3.createElement(NavigationFullscreenClose, null)));
 }
@@ -432,19 +432,18 @@ function getConfig() {
 // src/config/resolvePageContext.ts
 function resolvePageContext(pageContext) {
   const config = getConfig();
-  const { headings, headingsDetached } = getHeadings(config);
-  const { activeHeading, activeNavigationHeading } = findHeading(headings, headingsDetached, pageContext);
-  let headingsWithSubHeadings;
-  let detachedPageHeadings;
+  const processed = getHeadingsWithProcessedTitle(config);
+  const { headingsDetachedProcessed } = processed;
+  let { headingsProcessed } = processed;
+  const { activeHeading, activeNavigationHeading } = findHeading(headingsProcessed, headingsDetachedProcessed, pageContext);
+  let headingsOfDetachedPage = null;
   if (activeNavigationHeading) {
-    detachedPageHeadings = null;
-    headingsWithSubHeadings = getHeadingsWithSubHeadings(headings, pageContext, activeNavigationHeading);
+    headingsProcessed = getHeadingsWithSubHeadings(headingsProcessed, pageContext, activeNavigationHeading);
   } else {
-    detachedPageHeadings = [activeHeading, ...getPageHeadings(pageContext, activeHeading)];
-    headingsWithSubHeadings = headings;
+    headingsOfDetachedPage = [activeHeading, ...getPageHeadings(pageContext, activeHeading)];
   }
   const { title, isLandingPage, pageTitle } = getMetaData(
-    headingsDetached,
+    headingsDetachedProcessed,
     activeNavigationHeading,
     pageContext,
     config
@@ -463,16 +462,16 @@ function resolvePageContext(pageContext) {
       algolia
     },
     activeHeading,
-    headings,
-    headingsWithSubHeadings,
-    detachedPageHeadings,
+    headingsProcessed,
+    headingsDetachedProcessed,
+    headingsOfDetachedPage,
     isLandingPage,
     pageTitle,
     config
   });
   return pageContextResolved;
 }
-function getMetaData(headingsDetached, activeNavigationHeading, pageContext, config) {
+function getMetaData(headingsDetachedProcessed, activeNavigationHeading, pageContext, config) {
   const url = pageContext.urlOriginal;
   let title;
   let pageTitle;
@@ -480,7 +479,7 @@ function getMetaData(headingsDetached, activeNavigationHeading, pageContext, con
     title = activeNavigationHeading.titleDocument || jsxToTextContent(activeNavigationHeading.title);
     pageTitle = activeNavigationHeading.title;
   } else {
-    pageTitle = headingsDetached.find((h) => h.url === url).title;
+    pageTitle = headingsDetachedProcessed.find((h) => h.url === url).title;
     title = jsxToTextContent(pageTitle);
   }
   const isLandingPage = url === "/";
@@ -492,12 +491,12 @@ function getMetaData(headingsDetached, activeNavigationHeading, pageContext, con
   }
   return { title, isLandingPage, pageTitle };
 }
-function findHeading(headings, headingsDetached, pageContext) {
+function findHeading(headingsProcessed, headingsDetachedProcessed, pageContext) {
   let activeNavigationHeading = null;
   let activeHeading = null;
   assert(pageContext.urlOriginal);
   const pageUrl = pageContext.urlOriginal;
-  headings.forEach((heading) => {
+  headingsProcessed.forEach((heading) => {
     if (heading.url === pageUrl) {
       activeNavigationHeading = heading;
       activeHeading = heading;
@@ -505,30 +504,30 @@ function findHeading(headings, headingsDetached, pageContext) {
     }
   });
   if (!activeHeading) {
-    activeHeading = headingsDetached.find(({ url }) => pageUrl === url) ?? null;
+    activeHeading = headingsDetachedProcessed.find(({ url }) => pageUrl === url) ?? null;
   }
   if (!activeHeading) {
     throw new Error(
       [
         `Heading not found for URL '${pageUrl}'`,
         "Heading is defined for following URLs:",
-        ...headings.map((h) => `  ${h.url}`).filter(Boolean).sort()
+        ...headingsProcessed.map((h) => `  ${h.url}`).filter(Boolean).sort()
       ].join("\n")
     );
   }
   return { activeHeading, activeNavigationHeading };
 }
-function getHeadingsWithSubHeadings(headings, pageContext, activeNavigationHeading) {
-  const headingsWithSubHeadings = headings.slice();
+function getHeadingsWithSubHeadings(headingsProcessed, pageContext, activeNavigationHeading) {
+  const headingsProcessedWithSubHeadings = headingsProcessed.slice();
   if (activeNavigationHeading === null)
-    return headingsWithSubHeadings;
+    return headingsProcessedWithSubHeadings;
   const pageHeadings = getPageHeadings(pageContext, activeNavigationHeading);
-  const activeHeadingIdx = headingsWithSubHeadings.indexOf(activeNavigationHeading);
+  const activeHeadingIdx = headingsProcessedWithSubHeadings.indexOf(activeNavigationHeading);
   assert(activeHeadingIdx >= 0);
   pageHeadings.forEach((pageHeading, i) => {
-    headingsWithSubHeadings.splice(activeHeadingIdx + 1 + i, 0, pageHeading);
+    headingsProcessedWithSubHeadings.splice(activeHeadingIdx + 1 + i, 0, pageHeading);
   });
-  return headingsWithSubHeadings;
+  return headingsProcessedWithSubHeadings;
 }
 function getPageHeadings(pageContext, currentHeading) {
   const pageHeadings = [];

package/package.json

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