@brillout/docpress 0.10.19 → 0.10.21

package/config/resolveHeadingsData.ts

@@ -1,4 +1,5 @@
 export { resolveHeadingsData }
+export type { ActiveCategory }
 
 import { assert, isBrowser, jsxToTextContent } from '../utils/server'
 import type {
@@ -25,6 +26,12 @@ type PageSectionResolved = {
   pageSectionLevel: number
 }
 
+type ActiveCategory = {
+  name: string
+  order: number
+  hide?: boolean
+}
+
 function resolveHeadingsData(pageContext: PageContextOriginal) {
   const config = getConfig()
 
@@ -37,7 +44,7 @@ function resolveHeadingsData(pageContext: PageContextOriginal) {
   const { headingsDetachedResolved } = resolved
   let { headingsResolved } = resolved
 
-  const { activeHeading, isDetachedPage, activeCategory } = getActiveHeading(
+  const { activeHeading, isDetachedPage, activeCategoryName } = getActiveHeading(
     headingsResolved,
     headingsDetachedResolved,
     pageContext,
@@ -72,6 +79,17 @@ function resolveHeadingsData(pageContext: PageContextOriginal) {
     }
   }
 
+  const activeCategory: ActiveCategory = config.categories
+    // normalize
+    ?.map((c, i) => ({
+      order: i,
+      ...(typeof c === 'string' ? { name: c } : c),
+    }))
+    .find((c) => c.name === activeCategoryName) ?? {
+    name: activeCategoryName,
+    order: 99999999999,
+  }
+
   const pageContextAddendum = {
     navItemsAll,
     navItemsDetached,
@@ -150,7 +168,7 @@ function getActiveHeading(
   pageContext: { urlPathname: string; exports: Exports },
 ) {
   let activeHeading: HeadingResolved | HeadingDetachedResolved | null = null
-  let activeCategory = 'Miscellaneous'
+  let activeCategoryName = 'Miscellaneous'
   let headingCategory: string | undefined
   const { urlPathname } = pageContext
   assert(urlPathname)
@@ -161,7 +179,7 @@ function getActiveHeading(
     if (heading.url === urlPathname) {
       activeHeading = heading
       assert(headingCategory)
-      activeCategory = headingCategory
+      activeCategoryName = headingCategory
       assert(heading.level === 2, { pageUrl: urlPathname, heading })
       break
     }
@@ -183,8 +201,8 @@ function getActiveHeading(
       ].join('\n'),
     )
   }
-  if (activeHeading.category) activeCategory = activeHeading.category
-  return { activeHeading, isDetachedPage, activeCategory }
+  if (activeHeading.category) activeCategoryName = activeHeading.category
+  return { activeHeading, isDetachedPage, activeCategoryName }
 }
 
 function getPageSectionsResolved(

package/dist/config/resolveHeadingsData.d.ts

@@ -1,7 +1,13 @@
 export { resolveHeadingsData };
+export type { ActiveCategory };
 import type { NavItem } from '../NavItemComponent';
 import type { LinkData } from '../components';
 import type { PageContextOriginal } from './resolvePageContext';
+type ActiveCategory = {
+    name: string;
+    order: number;
+    hide?: boolean;
+};
 declare function resolveHeadingsData(pageContext: PageContextOriginal): {
     navItemsAll: NavItem[];
     navItemsDetached: NavItem[] | undefined;
@@ -9,5 +15,5 @@ declare function resolveHeadingsData(pageContext: PageContextOriginal): {
     isLandingPage: boolean;
     pageTitle: string | null;
     documentTitle: string;
-    activeCategory: string;
+    activeCategory: ActiveCategory;
 };

package/dist/config/resolveHeadingsData.js

@@ -26,6 +26,7 @@ import { parseMarkdownMini } from '../parseMarkdownMini';
 import { determineNavItemsColumnLayout } from '../renderer/determineNavItemsColumnLayout';
 assert(!isBrowser());
 function resolveHeadingsData(pageContext) {
+    var _a, _b;
     var config = getConfig();
     {
         var headings = config.headings, headingsDetached = config.headingsDetached;
@@ -34,8 +35,8 @@ function resolveHeadingsData(pageContext) {
     var resolved = getHeadingsResolved(config);
     var headingsDetachedResolved = resolved.headingsDetachedResolved;
     var headingsResolved = resolved.headingsResolved;
-    var _a = getActiveHeading(headingsResolved, headingsDetachedResolved, pageContext), activeHeading = _a.activeHeading, isDetachedPage = _a.isDetachedPage, activeCategory = _a.activeCategory;
-    var _b = getTitles(activeHeading, pageContext, config), documentTitle = _b.documentTitle, isLandingPage = _b.isLandingPage, pageTitle = _b.pageTitle;
+    var _c = getActiveHeading(headingsResolved, headingsDetachedResolved, pageContext), activeHeading = _c.activeHeading, isDetachedPage = _c.isDetachedPage, activeCategoryName = _c.activeCategoryName;
+    var _d = getTitles(activeHeading, pageContext, config), documentTitle = _d.documentTitle, isLandingPage = _d.isLandingPage, pageTitle = _d.pageTitle;
     var pageSectionsResolved = getPageSectionsResolved(pageContext, activeHeading);
     var linksAll = __spreadArray(__spreadArray(__spreadArray([], pageSectionsResolved.map(pageSectionToLinkData), true), headingsResolved.map(headingToLinkData), true), headingsDetachedResolved.map(headingToLinkData), true);
     var navItemsAll;
@@ -57,6 +58,10 @@ function resolveHeadingsData(pageContext) {
             });
         }
     }
+    var activeCategory = (_b = (_a = config.categories) === null || _a === void 0 ? void 0 : _a.map(function (c, i) { return (__assign({ order: i }, (typeof c === 'string' ? { name: c } : c))); }).find(function (c) { return c.name === activeCategoryName; })) !== null && _b !== void 0 ? _b : {
+        name: activeCategoryName,
+        order: 99999999999,
+    };
     var pageContextAddendum = {
         navItemsAll: navItemsAll,
         navItemsDetached: navItemsDetached,
@@ -121,7 +126,7 @@ function getTitles(activeHeading, pageContext, config) {
 function getActiveHeading(headingsResolved, headingsDetachedResolved, pageContext) {
     var _a;
     var activeHeading = null;
-    var activeCategory = 'Miscellaneous';
+    var activeCategoryName = 'Miscellaneous';
     var headingCategory;
     var urlPathname = pageContext.urlPathname;
     assert(urlPathname);
@@ -133,7 +138,7 @@ function getActiveHeading(headingsResolved, headingsDetachedResolved, pageContex
         if (heading.url === urlPathname) {
             activeHeading = heading;
             assert(headingCategory);
-            activeCategory = headingCategory;
+            activeCategoryName = headingCategory;
             assert(heading.level === 2, { pageUrl: urlPathname, heading: heading });
             break;
         }
@@ -156,8 +161,8 @@ function getActiveHeading(headingsResolved, headingsDetachedResolved, pageContex
         ].join('\n'));
     }
     if (activeHeading.category)
-        activeCategory = activeHeading.category;
-    return { activeHeading: activeHeading, isDetachedPage: isDetachedPage, activeCategory: activeCategory };
+        activeCategoryName = activeHeading.category;
+    return { activeHeading: activeHeading, isDetachedPage: isDetachedPage, activeCategoryName: activeCategoryName };
 }
 function getPageSectionsResolved(pageContext, activeHeading) {
     var _a;

package/dist/config/resolvePageContext.d.ts

@@ -16,7 +16,7 @@ declare function resolvePageContext(pageContext: PageContextOriginal): {
     isLandingPage: boolean;
     pageTitle: string | null;
     documentTitle: string;
-    activeCategory: string;
+    activeCategory: import("./resolveHeadingsData").ActiveCategory;
 } & {
     urlPathname: string;
     meta: {

package/dist/types/Config.d.ts

@@ -20,6 +20,7 @@ type Config = {
     };
     headings: HeadingDefinition[];
     headingsDetached: HeadingDetachedDefinition[];
+    categories?: Category[];
     /** Sets `<meta name="description" content="${tagline}" />` */
     tagline: string;
     websiteUrl: string;
@@ -34,3 +35,9 @@ type Config = {
     navLogoStyle?: React.CSSProperties;
     navLogoTextStyle?: React.CSSProperties;
 };
+/** Order in Algolia search results */
+type Category = string | {
+    name: string;
+    /** Hide from Algolia search */
+    hide?: boolean;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.10.19",
+  "version": "0.10.21",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",

package/renderer/onRenderHtml.tsx

@@ -6,6 +6,7 @@ import { assert } from '../utils/server'
 import type { PageContextResolved } from '../config/resolvePageContext'
 import { getPageElement } from './getPageElement'
 import type { OnRenderHtmlAsync } from 'vike/types'
+import { ActiveCategory } from '../config/resolveHeadingsData'
 
 const onRenderHtml: OnRenderHtmlAsync = async (
   pageContext,
@@ -32,7 +33,7 @@ Promise<Awaited<ReturnType<OnRenderHtmlAsync>>> => {
         ${descriptionTag}
         <meta name="viewport" content="width=device-width,initial-scale=1">
         ${getOpenGraphTags(pageContext.urlPathname, pageContextResolved.documentTitle, pageContextResolved.meta)}
-        <meta name="docsearch:category" content="${pageContextResolved.activeCategory}" />
+        ${getAlgoliaTags(pageContextResolved.activeCategory)}
       </head>
       <body>
         <div id="page-view">${dangerouslySkipEscape(pageHtml)}</div>
@@ -40,6 +41,15 @@ Promise<Awaited<ReturnType<OnRenderHtmlAsync>>> => {
     </html>`
 }
 
+function getAlgoliaTags(activeCategory: ActiveCategory) {
+  const categoryNameTag = escapeInject`<meta name="algolia:category" content="${activeCategory.name}">`
+  if (activeCategory.hide) {
+    return escapeInject`${categoryNameTag}<meta name="algolia:category:hide"> `
+  } else {
+    return escapeInject`${categoryNameTag}<meta name="algolia:category:order" content="${activeCategory.order.toString()}"> `
+  }
+}
+
 function getOpenGraphTags(
   url: string,
   documentTitle: string,

package/types/Config.ts

@@ -22,6 +22,7 @@ type Config = {
   }
   headings: HeadingDefinition[]
   headingsDetached: HeadingDetachedDefinition[]
+  categories?: Category[]
   /** Sets `<meta name="description" content="${tagline}" />` */
   tagline: string
   websiteUrl: string
@@ -36,3 +37,12 @@ type Config = {
   navLogoStyle?: React.CSSProperties
   navLogoTextStyle?: React.CSSProperties
 }
+
+/** Order in Algolia search results */
+type Category =
+  | string
+  | {
+      name: string
+      /** Hide from Algolia search */
+      hide?: boolean
+    }