@brillout/docpress 0.5.34 → 0.5.35

package/dist/{chunk-GMA6WHHB.js → chunk-MGOI4AFO.js}

@@ -47,32 +47,31 @@ function RepoLink({ path, text, editMode }) {
 // src/parseTitle.ts
 import React3 from "react";
 function getHeadingsWithProcessedTitle(config) {
-  const headingsWithoutParent = config.headings.map((heading) => {
-    const titleProcessed = parseTitle(heading.title);
-    const titleInNav = heading.titleInNav || heading.title;
-    let titleInNavProcessed;
-    if ("isListTitle" in heading) {
-      assert(heading.isListTitle === true);
-      let titleParsed = parseTitle(titleInNav);
-      titleInNavProcessed = React3.createElement(React3.Fragment, {}, getListPrefix(), titleParsed);
-    } else {
+  const headingsWithoutBreadcrumb = config.headings.map(
+    (heading) => {
+      const titleProcessed = parseTitle(heading.title);
+      const titleInNav = heading.titleInNav || heading.title;
+      let titleInNavProcessed;
       titleInNavProcessed = parseTitle(titleInNav);
+      if ("titleEmoji" in heading) {
+        assert(heading.titleEmoji);
+        titleInNavProcessed = withEmoji(heading.titleEmoji, titleInNavProcessed);
+      }
+      const headingProcessed = {
+        ...heading,
+        title: titleProcessed,
+        titleInNav: titleInNavProcessed
+      };
+      return headingProcessed;
     }
-    if ("titleEmoji" in heading) {
-      assert(heading.titleEmoji);
-      titleInNavProcessed = withEmoji(heading.titleEmoji, titleInNavProcessed);
-    }
-    const headingProcessed = {
-      ...heading,
-      title: titleProcessed,
-      titleInNav: titleInNavProcessed
-    };
-    return headingProcessed;
-  });
+  );
   const headingsProcessed = [];
-  headingsWithoutParent.forEach((heading) => {
-    const parentHeadings = findParentHeadings(heading, headingsProcessed);
-    headingsProcessed.push({ ...heading, parentHeadings });
+  headingsWithoutBreadcrumb.forEach((heading) => {
+    const headingsBreadcrumb = getHeadingsBreadcrumb(heading, headingsProcessed);
+    headingsProcessed.push({
+      ...heading,
+      headingsBreadcrumb
+    });
   });
   const headingsDetachedProcessed = config.headingsDetached.map((headingsDetached) => {
     const { url, title } = headingsDetached;
@@ -86,29 +85,23 @@ function getHeadingsWithProcessedTitle(config) {
       level: 2,
       title: titleProcessed,
       titleInNav: titleProcessed,
-      parentHeadings: null
+      headingsBreadcrumb: null
     };
   });
   assertHeadingsUrl([...headingsProcessed, ...headingsDetachedProcessed]);
   return { headingsProcessed, headingsDetachedProcessed };
 }
-function findParentHeadings(heading, headings) {
-  const parentHeadings = [];
+function getHeadingsBreadcrumb(heading, headings) {
+  const headingsBreadcrumb = [];
   let levelCurrent = heading.level;
-  let listTitleParentFound = false;
   headings.slice().reverse().forEach((parentCandidate) => {
-    let isListTitleParent = false;
-    if (!listTitleParentFound && levelCurrent === heading.level && parentCandidate.level === heading.level && !parentCandidate.isListTitle && heading.isListTitle) {
-      isListTitleParent = true;
-      listTitleParentFound = true;
-    }
     const isParent = parentCandidate.level < levelCurrent;
-    if (isParent || isListTitleParent) {
+    if (isParent) {
       levelCurrent = parentCandidate.level;
-      parentHeadings.push(parentCandidate);
+      headingsBreadcrumb.push(parentCandidate);
     }
   });
-  return parentHeadings;
+  return headingsBreadcrumb;
 }
 function assertHeadingsUrl(headings) {
   headings.forEach((heading) => {
@@ -118,11 +111,6 @@ function assertHeadingsUrl(headings) {
     }
   });
 }
-function getListPrefix() {
-  const nonBreakingSpace = String.fromCodePoint(160);
-  const bulletPoint = String.fromCodePoint(8226);
-  return nonBreakingSpace + bulletPoint + nonBreakingSpace;
-}
 function parseTitle(title) {
   const parts = [];
   let current;

package/dist/index.d.ts

@@ -36,7 +36,6 @@ type HeadingDefinition = HeadingBase & (({
     level: 4;
 } & HeadingAbstract) | {
     level: 2;
-    isListTitle?: true;
     sectionTitles?: string[];
     url: null | string;
 } | {

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   isRepoLink,
   parseTitle,
   usePageContext
-} from "./chunk-GMA6WHHB.js";
+} from "./chunk-MGOI4AFO.js";
 import {
   FeatureList
 } from "./chunk-NVJING6T.js";
@@ -47,10 +47,10 @@ function Link({
     const pageContext = usePageContext();
     return /* @__PURE__ */ React.createElement("a", {
       href
-    }, children || text || getTitle({ href, noBreadcrumb, pageContext, doNotInferSectionTitle }));
+    }, children || text || getLinkText({ href, noBreadcrumb, pageContext, doNotInferSectionTitle }));
   }
 }
-function getTitle({
+function getLinkText({
   href,
   noBreadcrumb,
   pageContext,
@@ -80,13 +80,13 @@ function getTitle({
   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(
-      ...(heading.parentHeadings ?? []).slice().reverse().map(({ title }) => title)
+  const breadcrumbParts = [];
+  if (heading.headingsBreadcrumb) {
+    breadcrumbParts.push(
+      ...(heading.headingsBreadcrumb ?? []).slice().reverse().map(({ title }) => title)
     );
   }
-  breadcrumbs.push(heading.title);
+  breadcrumbParts.push(heading.title);
   if (urlHash) {
     let sectionTitle = void 0;
     assert(!urlHash.startsWith("#"));
@@ -107,14 +107,14 @@ function getTitle({
       );
       sectionTitle = determineSectionTitle(href);
     }
-    breadcrumbs.push(sectionTitle);
+    breadcrumbParts.push(sectionTitle);
   }
   {
     if (noBreadcrumb || isLinkOnSamePage) {
-      return breadcrumbs[breadcrumbs.length - 1];
+      return breadcrumbParts[breadcrumbParts.length - 1];
     }
   }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, breadcrumbs.map((title, i) => {
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, breadcrumbParts.map((title, i) => {
     const seperator = i === 0 ? /* @__PURE__ */ React.createElement(React.Fragment, null) : " > ";
     return /* @__PURE__ */ React.createElement(React.Fragment, {
       key: i

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

@@ -233,9 +233,6 @@ html.navigation-fullscreen .nav-item {
   border-bottom-left-radius: 5px;
   border-bottom-right-radius: var(--expend-border-radius);
 }
-.nav-item-h3.nav-item-parent-is-list-heading {
-  --padding-left-additional: 21px;
-}
 
 /* src/navigation/Navigation-highlight.css */
 

package/dist/renderer/_default.page.server.d.ts

@@ -1,5 +1,5 @@
 import * as vike_dist_esm_node_runtime_html_renderHtml from 'vike/dist/esm/node/runtime/html/renderHtml';
-import { PageContextBuiltIn } from 'vike/types';
+import { PageContextBuiltInServer } from 'vike/types';
 
 type MarkdownHeading = {
     title: string;
@@ -12,7 +12,7 @@ type ReactComponent = () => JSX.Element;
 type Exports = {
     headings?: MarkdownHeading[];
 };
-type PageContextOriginal = PageContextBuiltIn & {
+type PageContextOriginal = PageContextBuiltInServer & {
     Page: ReactComponent;
     exports: Exports;
 };

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

@@ -4,7 +4,7 @@ import {
   getHeadingsWithProcessedTitle,
   parseTitle,
   usePageContext
-} from "../chunk-GMA6WHHB.js";
+} from "../chunk-MGOI4AFO.js";
 import {
   Emoji,
   jsxToTextContent,
@@ -245,7 +245,6 @@ function Heading({
       heading.computed.isActive && " is-active",
       heading.computed.isActiveFirst && " is-active-first",
       heading.computed.isActiveLast && " is-active-last",
-      heading.computed.isChildOfListHeading && "nav-item-parent-is-list-heading",
       heading.computed.isFirstOfItsKind && "nav-item-first-of-its-kind",
       heading.computed.isLastOfItsKind && "nav-item-last-of-its-kind"
     ].filter(Boolean).join(" "),
@@ -266,7 +265,6 @@ function groupHeadings(headings) {
 }
 function getHeadingsWithComputedProps(headings, currentUrl) {
   return headings.map((heading, i) => {
-    var _a2;
     assert([1, 2, 3, 4].includes(heading.level), heading);
     const headingPrevious = headings[i - 1];
     const headingNext = headings[i + 1];
@@ -289,7 +287,6 @@ function getHeadingsWithComputedProps(headings, currentUrl) {
     }
     const isFirstOfItsKind = heading.level !== (headingPrevious == null ? void 0 : headingPrevious.level);
     const isLastOfItsKind = heading.level !== (headingNext == null ? void 0 : headingNext.level);
-    const isChildOfListHeading = !!heading.parentHeadings && !!((_a2 = heading.parentHeadings[0]) == null ? void 0 : _a2.isListTitle);
     return {
       ...heading,
       computed: {
@@ -297,8 +294,7 @@ function getHeadingsWithComputedProps(headings, currentUrl) {
         isActiveFirst,
         isActiveLast,
         isFirstOfItsKind,
-        isLastOfItsKind,
-        isChildOfListHeading
+        isLastOfItsKind
       }
     };
   });
@@ -444,11 +440,11 @@ function resolvePageContext(pageContext) {
   );
   let headingsOfDetachedPage = null;
   let headingsAll = [...headingsProcessed, ...headingsDetachedProcessed];
-  headingsAll = getHeadingsWithSubHeadings(headingsAll, pageContext, activeHeading);
+  headingsAll = getHeadingsAll(headingsAll, pageContext, activeHeading);
   if (activeNavigationHeading) {
-    headingsProcessed = getHeadingsWithSubHeadings(headingsProcessed, pageContext, activeNavigationHeading);
+    headingsProcessed = getHeadingsAll(headingsProcessed, pageContext, activeNavigationHeading);
   } else {
-    headingsOfDetachedPage = [activeHeading, ...getPageHeadings(pageContext, activeHeading)];
+    headingsOfDetachedPage = [activeHeading, ...getHeadingsOfTheCurrentPage(pageContext, activeHeading)];
   }
   const { title, isLandingPage, pageTitle } = getMetaData(
     headingsDetachedProcessed,
@@ -526,40 +522,40 @@ function findHeading(headingsProcessed, headingsDetachedProcessed, pageContext)
   }
   return { activeHeading, activeNavigationHeading };
 }
-function getHeadingsWithSubHeadings(headingsProcessed, pageContext, activeHeading) {
-  const headingsProcessedWithSubHeadings = headingsProcessed.slice();
-  const pageHeadings = getPageHeadings(pageContext, activeHeading);
-  const activeHeadingIdx = headingsProcessedWithSubHeadings.indexOf(activeHeading);
+function getHeadingsAll(headingsProcessed, pageContext, activeHeading) {
+  const headingsAll = headingsProcessed.slice();
+  const headingsOfTheCurrentPage = getHeadingsOfTheCurrentPage(pageContext, activeHeading);
+  const activeHeadingIdx = headingsAll.indexOf(activeHeading);
   assert(activeHeadingIdx >= 0);
-  pageHeadings.forEach((pageHeading, i) => {
-    headingsProcessedWithSubHeadings.splice(activeHeadingIdx + 1 + i, 0, pageHeading);
+  headingsOfTheCurrentPage.forEach((pageHeading, i) => {
+    headingsAll.splice(activeHeadingIdx + 1 + i, 0, pageHeading);
   });
-  return headingsProcessedWithSubHeadings;
+  return headingsAll;
 }
-function getPageHeadings(pageContext, currentHeading) {
-  const pageHeadings = [];
-  const markdownHeadings = pageContext.exports.headings ?? [];
-  markdownHeadings.forEach((markdownHeading) => {
+function getHeadingsOfTheCurrentPage(pageContext, currentHeading) {
+  const headingsOfCurrentPage = [];
+  const headingsExport = pageContext.exports.headings ?? [];
+  headingsExport.forEach((markdownHeading) => {
     const title = parseTitle(markdownHeading.title);
     const url = markdownHeading.headingId && "#" + markdownHeading.headingId;
     if (markdownHeading.headingLevel === 2) {
       const heading = {
         url,
         title,
-        parentHeadings: [currentHeading, ...currentHeading.parentHeadings ?? []],
+        headingsBreadcrumb: [currentHeading, ...currentHeading.headingsBreadcrumb ?? []],
         titleInNav: title,
         level: 3
       };
-      pageHeadings.push(heading);
+      headingsOfCurrentPage.push(heading);
     }
   });
   if (currentHeading == null ? void 0 : currentHeading.sectionTitles) {
     currentHeading.sectionTitles.forEach((sectionTitle) => {
-      const pageHeadingTitles = markdownHeadings.map((h) => h.title);
+      const pageHeadingTitles = headingsExport.map((h) => h.title);
       assert(pageHeadingTitles.includes(sectionTitle), { pageHeadingTitles, sectionTitle });
     });
   }
-  return pageHeadings;
+  return headingsOfCurrentPage;
 }
 
 // src/algolia/DocSearch.ts

package/package.json

@@ -1,15 +1,21 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.5.34",
+  "version": "0.5.35",
   "scripts": {
     "// Check types while developing": "",
     "types": "tsc --noEmit --watch",
     "// Develop Docpress using demo/": "",
+    "dev": "pnpm run dev:build && pnpm run dev:start",
     "dev:build": "tsup",
     "dev:start": "node dist/index.js dev",
-    "dev": "pnpm run dev:build && pnpm run dev:start",
     "// Build Docpress": "",
     "build": "rimraf dist/ && framework-builder",
+    "// Preview build": "",
+    "preview": "pnpm run preview:build && pnpm run preview:start",
+    "preview:build": "pnpm run build && node dist/cli/index.js build",
+    "preview:start": "node dist/cli/index.js preview",
+    "// Test": "",
+    "test": "test-e2e",
     "// Release": "",
     "release": "release-me patch",
     "release:breaking-change": "release-me minor"
@@ -25,7 +31,7 @@
     "remark-gfm": "^3.0.1",
     "shiki": "^0.10.1",
     "twemoji": "^13.1.0",
-    "vike": "^0.4.151",
+    "vike": "^0.4.158",
     "vike-contributors": "^0.0.6",
     "vite": "^4.3.9"
   },
@@ -65,6 +71,7 @@
     "@brillout/docpress": "link:.",
     "@brillout/framework-builder": "^0.1.1",
     "@brillout/release-me": "^0.1.13",
+    "@brillout/test-e2e": "^0.5.25",
     "@types/express": "^4.17.13",
     "@types/node": "^15.12.1",
     "@types/react": "^17.0.44",