@brillout/docpress 0.3.13 → 0.4.1

package/dist/{chunk-IZDN24FQ.js → chunk-H7GTGR6A.js}

@@ -74,20 +74,23 @@ function getHeadings(config) {
     const parentHeadings = findParentHeadings(heading, headings);
     headings.push({ ...heading, parentHeadings });
   });
-  const headingsWithoutLink = config.headingsWithoutLink.map((headingsWithoutLink2) => {
-    const { url, title } = headingsWithoutLink2;
+  const headingsDetached = config.headingsDetached.map((headingsDetached2) => {
+    const { url, title } = headingsDetached2;
     assert(
       headings.find((heading) => heading.url === url) === void 0,
-      `remove ${headingsWithoutLink2.url} from headingsWithoutLink`
+      `remove ${headingsDetached2.url} from headingsDetached`
     );
     const titleProcessed = typeof title === "string" ? parseTitle(title) : title;
     return {
-      ...headingsWithoutLink2,
-      title: titleProcessed
+      ...headingsDetached2,
+      level: 2,
+      title: titleProcessed,
+      titleInNav: titleProcessed,
+      parentHeadings: null
     };
   });
-  assertHeadingsUrl([...headings, ...headingsWithoutLink]);
-  return { headings, headingsWithoutLink };
+  assertHeadingsUrl([...headings, ...headingsDetached]);
+  return { headings, headingsDetached };
 }
 function findParentHeadings(heading, headings) {
   const parentHeadings = [];

package/dist/cli/index.js

@@ -16,7 +16,7 @@ Error.stackTraceLimit = Infinity;
 cli();
 async function cli() {
   if (isDev) {
-    await import("../devServer-OXABOEEC.js");
+    await import("../devServer-KXRA4OLE.js");
   } else if (isBuild) {
     await build(vite_config_default);
     await build({ ...vite_config_default, build: { ssr: true } });

package/dist/{devServer-OXABOEEC.js → devServer-KXRA4OLE.js}

@@ -8,7 +8,7 @@ import "./chunk-3QC7HYIF.js";
 // src/cli/devServer.ts
 import express from "express";
 import * as vite from "vite";
-import { renderPage } from "vite-plugin-ssr";
+import { renderPage } from "vite-plugin-ssr/server";
 var viteVersion = vite.version || "2.?.?";
 startServer();
 async function startServer() {

package/dist/index.d.ts

@@ -24,7 +24,7 @@ declare function Emoji({ name, style }: {
     style?: React$1.CSSProperties;
 }): JSX.Element;
 
-type HeadingWithoutLink = {
+type HeadingDetachedDefinition = {
     url: string;
     title: string | JSX.Element;
 };
@@ -72,7 +72,7 @@ type Config = {
         indexName: string;
     };
     headings: HeadingDefinition[];
-    headingsWithoutLink: HeadingWithoutLink[];
+    headingsDetached: HeadingDetachedDefinition[];
     navHeaderMobile: React.ReactNode;
     navHeader: React.ReactNode;
     titleNormalCase: boolean;
@@ -146,4 +146,4 @@ declare function CodeBlock({ children, lineBreak }: {
     lineBreak?: true;
 }): JSX.Element;
 
-export { CodeBlock, Config, Emoji, EmojiName, HeadingDefinition, HeadingWithoutLink, HorizontalLine, ImportMeta, Info, Link, Note, P, ReadingRecommendation, RepoLink, Sponsor, Sponsors, assert, assertUsage, assertWarning, crawlAllFiles, determineSectionTitle, determineSectionUrlHash, filter, isBrowser, isRepoLink, jsxToTextContent, objectAssign };
+export { CodeBlock, Config, Emoji, EmojiName, HeadingDefinition, HeadingDetachedDefinition, HorizontalLine, ImportMeta, Info, Link, Note, P, ReadingRecommendation, RepoLink, Sponsor, Sponsors, assert, assertUsage, assertWarning, crawlAllFiles, determineSectionTitle, determineSectionUrlHash, filter, isBrowser, isRepoLink, jsxToTextContent, objectAssign };

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   isRepoLink,
   parseTitle,
   usePageContext
-} from "./chunk-IZDN24FQ.js";
+} from "./chunk-H7GTGR6A.js";
 import {
   FeatureList
 } from "./chunk-NVJING6T.js";
@@ -76,9 +76,9 @@ function getTitle({
   assert(heading);
   assert(heading === pageContext.activeHeading || !linkIsOnSamePage);
   const breadcrumbs = [];
-  if ("parentHeadings" in heading) {
+  if (heading.parentHeadings) {
     breadcrumbs.push(
-      ...heading.parentHeadings.slice().reverse().map(({ title }) => title)
+      ...(heading.parentHeadings ?? []).slice().reverse().map(({ title }) => title)
     );
   }
   breadcrumbs.push(heading.title);
@@ -114,9 +114,9 @@ function getTitle({
 }
 function findHeading(href, pageContext) {
   assert(href.startsWith("/"), `\`href==='${href}'\` but should start with \`/\`.`);
-  const { headings, headingsWithoutLink } = getHeadings(pageContext.config);
+  const { headings, headingsDetached } = getHeadings(pageContext.config);
   {
-    const heading2 = headingsWithoutLink.find(({ url }) => href === url);
+    const heading2 = headingsDetached.find(({ url }) => href === url);
     if (heading2) {
       return heading2;
     }
@@ -267,6 +267,27 @@ var inlang_default = "/assets/inlang-GFRWND6X.png";
 
 // src/components/Sponsors/sponsorsList.ts
 var individuals = [
+  {
+    username: "fortezhuo"
+  },
+  {
+    username: "nshelia"
+  },
+  {
+    username: "marcusway"
+  },
+  {
+    username: "edikdeisling"
+  },
+  {
+    username: "AurelienLourot"
+  },
+  {
+    username: "jahredhope"
+  },
+  {
+    username: "charlieforward9"
+  },
   {
     username: "leonmondria"
   },
@@ -282,6 +303,9 @@ var individuals = [
   {
     username: "ser1us"
   },
+  {
+    username: "nikitavoloboev"
+  },
   {
     username: "samuelstroschein"
   },
@@ -402,7 +426,14 @@ function Sponsors() {
     sponsor,
     key: i
   }))), /* @__PURE__ */ React8.createElement("div", {
-    style: { display: "flex", flexWrap: "wrap", justifyContent: "center", alignItems: "end", marginTop: 10 }
+    style: {
+      display: "flex",
+      flexWrap: "wrap",
+      justifyContent: "center",
+      alignItems: "end",
+      margin: "17px auto",
+      maxWidth: 700
+    }
   }, sponsorsIndividuals.map((sponsor, i) => /* @__PURE__ */ React8.createElement(SponsorDiv, {
     sponsor,
     key: i
@@ -425,7 +456,7 @@ function SponsorDiv({ sponsor }) {
     width = 30;
     height = 30;
     padding = 0;
-    marginHeight = 10;
+    marginHeight = 5;
     marginWidth = 5;
     backgroundColor = "none";
   } else {

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

@@ -6,7 +6,7 @@ import "../chunk-3QC7HYIF.js";
 // src/autoScrollNav.ts
 autoScrollNav();
 function autoScrollNav() {
-  const navigationEl = document.getElementById("navigation-content");
+  const navigationEl = document.getElementById("navigation-content-main");
   assert(navigationEl);
   const href = window.location.pathname;
   const navLinks = Array.from(navigationEl.querySelectorAll(`a[href="${href}"]`));
@@ -29,18 +29,20 @@ function installSectionUrlHashs() {
     assert(window.location.pathname === "/");
     return;
   }
-  const navigationEl = document.getElementById("navigation-content");
-  assert(navigationEl);
-  const docSections = Array.from(document.querySelectorAll("h2"));
-  docSections.forEach((docSection) => {
-    if (!docSection.id)
-      return;
-    const urlHash = "#" + docSection.id;
-    assertNavLink(navigationEl, urlHash);
-    docSection.onclick = () => {
-      window.location.hash = urlHash;
-      jumpToSection();
-    };
+  const navigationsEl = Array.from(document.querySelectorAll(".navigation-content"));
+  assert(navigationsEl.length > 0);
+  navigationsEl.forEach((navigationEl) => {
+    const docSections = Array.from(document.querySelectorAll("h2"));
+    docSections.forEach((docSection) => {
+      if (!docSection.id)
+        return;
+      const urlHash = "#" + docSection.id;
+      assertNavLink(navigationEl, urlHash);
+      docSection.onclick = () => {
+        window.location.hash = urlHash;
+        jumpToSection();
+      };
+    });
   });
 }
 function assertNavLink(navigationEl, urlHash) {
@@ -93,7 +95,7 @@ function toggleNavExpend() {
 }
 function updateColumnWidth() {
   const navMinWidth = 299;
-  const navH1Groups = Array.from(document.querySelectorAll(".nav-h1-group"));
+  const navH1Groups = Array.from(document.querySelectorAll("#navigation-content-main .nav-h1-group"));
   const numberOfColumnsMax = navH1Groups.length;
   const widthAvailable = getViewportWidth();
   const numberOfColumns = Math.max(1, Math.min(numberOfColumnsMax, Math.floor(widthAvailable / navMinWidth)));
@@ -107,7 +109,7 @@ function updateColumnWidth() {
     return column;
   });
   mergeColumns(columns, numberOfColumns);
-  const navContent = document.getElementById("navigation-content");
+  const navContent = document.getElementById("navigation-content-main");
   Array.from(navContent.children).forEach((child) => {
     assert(child.className === "nav-column");
   });

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

@@ -18,6 +18,14 @@
   overflow-y: auto;
   overscroll-behavior: contain;
   border-right: 1px solid #eee;
+  --background-color: #f0f0f0;
+  padding-bottom: 70px;
+}
+.navigation-content {
+  margin-top: 20px;
+}
+#navigation-content-detached {
+  margin-top: 25px;
 }
 #navigation-mask {
   position: fixed;
@@ -92,14 +100,16 @@ html.navigation-fullscreen #navigation-container {
   left: 0;
   background-color: white;
 }
-html.navigation-fullscreen #navigation-header {
+html.navigation-fullscreen #navigation-header,
+html.navigation-fullscreen #navigation-content-detached,
+html.navigation-fullscreen #detached-note {
   display: none !important;
 }
-html.navigation-fullscreen #navigation-content {
+html.navigation-fullscreen .navigation-content {
   display: flex;
   margin: auto;
 }
-html.navigation-fullscreen #navigation-content > .nav-column {
+html.navigation-fullscreen .navigation-content > .nav-column {
   flex-grow: 1;
   max-width: 350px;
 }
@@ -231,13 +241,6 @@ html.navigation-fullscreen .nav-item {
 /* src/navigation/Navigation-highlight.css */
 
 /* src/navigation/Navigation.css */
-#navigation-container {
-  --background-color: #f0f0f0;
-  padding-bottom: 70px;
-}
-html.navigation-fullscreen #detached-note {
-  display: none;
-}
 
 /* src/navigation/navigation-fullscreen/NavigationFullscreenButton.css */
 :root {

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

@@ -1,5 +1,5 @@
-import * as vite_plugin_ssr_dist_cjs_node_html_renderHtml from 'vite-plugin-ssr/dist/cjs/node/html/renderHtml';
-import { PageContextBuiltIn } from 'vite-plugin-ssr';
+import * as vite_plugin_ssr_dist_cjs_node_runtime_html_renderHtml from 'vite-plugin-ssr/dist/cjs/node/runtime/html/renderHtml';
+import { PageContextBuiltIn } from 'vite-plugin-ssr/types';
 
 type MarkdownHeading = {
     title: string;
@@ -17,6 +17,6 @@ type PageContextOriginal = PageContextBuiltIn & {
     exports: Exports;
 };
 
-declare function render(pageContextOriginal: PageContextOriginal): Promise<vite_plugin_ssr_dist_cjs_node_html_renderHtml.TemplateWrapped>;
+declare function render(pageContextOriginal: PageContextOriginal): Promise<vite_plugin_ssr_dist_cjs_node_runtime_html_renderHtml.TemplateWrapped>;
 
 export { render };

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

@@ -4,7 +4,7 @@ import {
   getHeadings,
   parseTitle,
   usePageContext
-} from "../chunk-IZDN24FQ.js";
+} from "../chunk-H7GTGR6A.js";
 import {
   Emoji,
   jsxToTextContent,
@@ -22,7 +22,7 @@ import {
 // src/renderer/_default.page.server.tsx
 import ReactDOMServer from "react-dom/server";
 import React7 from "react";
-import { escapeInject as escapeInject2, dangerouslySkipEscape as dangerouslySkipEscape2 } from "vite-plugin-ssr";
+import { escapeInject as escapeInject2, dangerouslySkipEscape as dangerouslySkipEscape2 } from "vite-plugin-ssr/server";
 
 // src/PageLayout.tsx
 import React6 from "react";
@@ -184,11 +184,17 @@ function NavigationFullscreenClose() {
 function Navigation({
   pageContext
 }) {
-  const { isDetachedPage } = pageContext;
+  const currentUrl = pageContext.urlPathname;
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement("div", {
     id: "navigation-container"
-  }, /* @__PURE__ */ React3.createElement(NavigationHeader, null), isDetachedPage && /* @__PURE__ */ React3.createElement(DetachedPageNote, null), /* @__PURE__ */ React3.createElement(NavigationContent, {
-    pageContext
+  }, /* @__PURE__ */ React3.createElement(NavigationHeader, null), pageContext.detachedPageHeadings && /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(NavigationContent, {
+    id: "navigation-content-detached",
+    headings: pageContext.detachedPageHeadings,
+    currentUrl
+  }), /* @__PURE__ */ React3.createElement(DetachedPageNote, null)), /* @__PURE__ */ React3.createElement(NavigationContent, {
+    id: "navigation-content-main",
+    headings: pageContext.headingsWithSubHeadings,
+    currentUrl
   }), /* @__PURE__ */ React3.createElement(NavigationFullscreenClose, null)));
 }
 function NavigationMask() {
@@ -196,13 +202,12 @@ function NavigationMask() {
     id: "navigation-mask"
   });
 }
-function NavigationContent({
-  pageContext
-}) {
-  const headings = getHeadingsWithComputedProps(pageContext);
+function NavigationContent(props) {
+  const headings = getHeadingsWithComputedProps(props.headings, props.currentUrl);
   const headingsGrouped = groupHeadings(headings);
   return /* @__PURE__ */ React3.createElement("div", {
-    id: "navigation-content"
+    id: props.id,
+    className: "navigation-content"
   }, /* @__PURE__ */ React3.createElement("div", {
     className: "nav-column",
     style: { position: "relative" }
@@ -247,8 +252,9 @@ function Heading({
 }
 function groupHeadings(headings) {
   const headingsGrouped = [];
+  const headingLevelMin = Math.min(...headings.map((h) => h.level));
   headings.forEach((heading) => {
-    if (heading.level === 1) {
+    if (heading.level === headingLevelMin) {
       headingsGrouped.push({ ...heading, headings: [] });
     } else {
       headingsGrouped[headingsGrouped.length - 1].headings.push(heading);
@@ -256,18 +262,17 @@ function groupHeadings(headings) {
   });
   return headingsGrouped;
 }
-function getHeadingsWithComputedProps(pageContext) {
-  const { headingsWithSubHeadings, urlPathname } = pageContext;
-  return headingsWithSubHeadings.map((heading, i) => {
+function getHeadingsWithComputedProps(headings, currentUrl) {
+  return headings.map((heading, i) => {
     var _a2;
     assert([1, 2, 3, 4].includes(heading.level), heading);
-    const headingPrevious = headingsWithSubHeadings[i - 1];
-    const headingNext = headingsWithSubHeadings[i + 1];
+    const headingPrevious = headings[i - 1];
+    const headingNext = headings[i + 1];
     let isActiveFirst = false;
     let isActiveLast = false;
     let isActive = false;
-    if (heading.url === urlPathname) {
-      assert(heading.level === 2, { urlPathname });
+    if (heading.url === currentUrl) {
+      assert(heading.level === 2, { currentUrl });
       isActive = true;
       isActiveFirst = true;
       if ((headingNext == null ? void 0 : headingNext.level) !== 3) {
@@ -282,7 +287,7 @@ function getHeadingsWithComputedProps(pageContext) {
     }
     const isFirstOfItsKind = heading.level !== (headingPrevious == null ? void 0 : headingPrevious.level);
     const isLastOfItsKind = heading.level !== (headingNext == null ? void 0 : headingNext.level);
-    const isChildOfListHeading = !!((_a2 = heading.parentHeadings[0]) == null ? void 0 : _a2.isListTitle);
+    const isChildOfListHeading = !!heading.parentHeadings && !!((_a2 = heading.parentHeadings[0]) == null ? void 0 : _a2.isListTitle);
     return {
       ...heading,
       computed: {
@@ -304,8 +309,8 @@ function DetachedPageNote() {
       textAlign: "left",
       marginLeft: 10,
       marginRight: 10,
-      marginTop: 30,
-      marginBottom: -8,
+      marginTop: 25,
+      marginBottom: -5,
       borderRadius: 5,
       padding: 10
     }
@@ -427,11 +432,19 @@ function getConfig() {
 // src/config/resolvePageContext.ts
 function resolvePageContext(pageContext) {
   const config = getConfig();
-  const { headings, headingsWithoutLink } = getHeadings(config);
-  const { activeHeading, activeNavigationHeading } = findHeading(headings, headingsWithoutLink, pageContext);
-  const headingsWithSubHeadings = getHeadingsWithSubHeadings(headings, pageContext, activeNavigationHeading);
-  const { title, isLandingPage, pageTitle, isDetachedPage } = getMetaData(
-    headingsWithoutLink,
+  const { headings, headingsDetached } = getHeadings(config);
+  const { activeHeading, activeNavigationHeading } = findHeading(headings, headingsDetached, pageContext);
+  let headingsWithSubHeadings;
+  let detachedPageHeadings;
+  if (activeNavigationHeading) {
+    detachedPageHeadings = null;
+    headingsWithSubHeadings = getHeadingsWithSubHeadings(headings, pageContext, activeNavigationHeading);
+  } else {
+    detachedPageHeadings = [activeHeading, ...getPageHeadings(pageContext, activeHeading)];
+    headingsWithSubHeadings = headings;
+  }
+  const { title, isLandingPage, pageTitle } = getMetaData(
+    headingsDetached,
     activeNavigationHeading,
     pageContext,
     config
@@ -452,26 +465,23 @@ function resolvePageContext(pageContext) {
     activeHeading,
     headings,
     headingsWithSubHeadings,
+    detachedPageHeadings,
     isLandingPage,
-    isDetachedPage,
     pageTitle,
     config
   });
   return pageContextResolved;
 }
-function getMetaData(headingsWithoutLink, activeNavigationHeading, pageContext, config) {
+function getMetaData(headingsDetached, activeNavigationHeading, pageContext, config) {
   const url = pageContext.urlOriginal;
   let title;
   let pageTitle;
-  let isDetachedPage;
   if (activeNavigationHeading) {
     title = activeNavigationHeading.titleDocument || jsxToTextContent(activeNavigationHeading.title);
     pageTitle = activeNavigationHeading.title;
-    isDetachedPage = false;
   } else {
-    pageTitle = headingsWithoutLink.find((h) => h.url === url).title;
+    pageTitle = headingsDetached.find((h) => h.url === url).title;
     title = jsxToTextContent(pageTitle);
-    isDetachedPage = true;
   }
   const isLandingPage = url === "/";
   if (!isLandingPage) {
@@ -480,9 +490,9 @@ function getMetaData(headingsWithoutLink, activeNavigationHeading, pageContext,
   if (isLandingPage) {
     pageTitle = null;
   }
-  return { title, isLandingPage, pageTitle, isDetachedPage };
+  return { title, isLandingPage, pageTitle };
 }
-function findHeading(headings, headingsWithoutLink, pageContext) {
+function findHeading(headings, headingsDetached, pageContext) {
   let activeNavigationHeading = null;
   let activeHeading = null;
   assert(pageContext.urlOriginal);
@@ -495,7 +505,7 @@ function findHeading(headings, headingsWithoutLink, pageContext) {
     }
   });
   if (!activeHeading) {
-    activeHeading = headingsWithoutLink.find(({ url }) => pageUrl === url) ?? null;
+    activeHeading = headingsDetached.find(({ url }) => pageUrl === url) ?? null;
   }
   const debugInfo = {
     msg: "Heading not found for url: " + pageUrl,
@@ -509,38 +519,47 @@ function getHeadingsWithSubHeadings(headings, pageContext, activeNavigationHeadi
   const headingsWithSubHeadings = headings.slice();
   if (activeNavigationHeading === null)
     return headingsWithSubHeadings;
+  const pageHeadings = getPageHeadings(pageContext, activeNavigationHeading);
   const activeHeadingIdx = headingsWithSubHeadings.indexOf(activeNavigationHeading);
   assert(activeHeadingIdx >= 0);
-  const pageHeadings = pageContext.exports.headings || [];
   pageHeadings.forEach((pageHeading, i) => {
-    const title = parseTitle(pageHeading.title);
-    const url = pageHeading.headingId && "#" + pageHeading.headingId;
-    assert(
-      pageHeading.headingLevel !== 3,
-      "Wrong page heading level `" + pageHeading.headingLevel + "` (it should be `<h2>`) for sub-heading `" + pageHeading.title + "` of page `" + pageContext.urlOriginal + "`."
-    );
-    if (pageHeading.headingLevel === 2) {
+    headingsWithSubHeadings.splice(activeHeadingIdx + 1 + i, 0, pageHeading);
+  });
+  return headingsWithSubHeadings;
+}
+function getPageHeadings(pageContext, currentHeading) {
+  const pageHeadings = [];
+  const markdownHeadings = pageContext.exports.headings ?? [];
+  markdownHeadings.forEach((markdownHeading) => {
+    const title = parseTitle(markdownHeading.title);
+    const url = markdownHeading.headingId && "#" + markdownHeading.headingId;
+    if (markdownHeading.headingLevel === 3) {
+      console.warn(
+        "Wrong page heading level `" + markdownHeading.headingLevel + "` (it should be `<h2>`) for sub-heading `" + markdownHeading.title + "` of page `" + pageContext.urlOriginal + "`."
+      );
+    }
+    if (markdownHeading.headingLevel === 2) {
       const heading = {
         url,
         title,
-        parentHeadings: [activeNavigationHeading, ...activeNavigationHeading.parentHeadings],
+        parentHeadings: [currentHeading, ...currentHeading.parentHeadings ?? []],
         titleInNav: title,
         level: 3
       };
-      headingsWithSubHeadings.splice(activeHeadingIdx + 1 + i, 0, heading);
+      pageHeadings.push(heading);
     }
   });
-  if (activeNavigationHeading == null ? void 0 : activeNavigationHeading.sectionTitles) {
-    activeNavigationHeading.sectionTitles.forEach((sectionTitle) => {
-      const pageHeadingTitles = pageHeadings.map((h) => h.title);
+  if (currentHeading == null ? void 0 : currentHeading.sectionTitles) {
+    currentHeading.sectionTitles.forEach((sectionTitle) => {
+      const pageHeadingTitles = markdownHeadings.map((h) => h.title);
       assert(pageHeadingTitles.includes(sectionTitle), { pageHeadingTitles, sectionTitle });
     });
   }
-  return headingsWithSubHeadings;
+  return pageHeadings;
 }
 
 // src/algolia/DocSearch.ts
-import { dangerouslySkipEscape, escapeInject } from "vite-plugin-ssr";
+import { dangerouslySkipEscape, escapeInject } from "vite-plugin-ssr/server";
 function getDocSearchCSS(pageContext) {
   const docSearchCSS = !pageContext.meta.algolia ? "" : escapeInject`
       <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@alpha" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.3.13",
+  "version": "0.4.1",
   "scripts": {
     "// Check types while developing": "",
     "types": "tsc --noEmit --watch",
@@ -24,7 +24,7 @@
     "shiki": "^0.10.1",
     "twemoji": "^13.1.0",
     "vite": "npm:@brillout/vite@4.0.1-fix",
-    "vite-plugin-ssr": "^0.4.65"
+    "vite-plugin-ssr": "^0.4.110"
   },
   "type": "module",
   "exports": {