chore: fix

Author: SoonIter

packages/plugin-llms/src/plugin.ts

@@ -1,13 +1,18 @@
 import path from 'node:path';
 import type { RsbuildPlugin } from '@rsbuild/core';
 import type { RouteService } from '@rspress/core';
-import { removeBase } from '@rspress/shared';
+import { matchPath } from '@rspress/runtime/server';
+import { getSidebarDataGroup, removeBase } from '@rspress/shared';
 import type {
   Nav,
   PageIndexInfo,
   RouteMeta,
   RspressPlugin,
   Sidebar,
+  SidebarDivider,
+  SidebarGroup,
+  SidebarItem,
+  SidebarSectionHeader,
 } from '@rspress/shared';
 import type { NavItemWithLink } from '@rspress/shared';
 import { generateLlmsFullTxt, generateLlmsTxt } from './llmsTxt';
@@ -19,7 +24,7 @@ const rsbuildPluginLlms = ({
   routes,
   titleRef,
   descriptionRef,
-  // sidebar,
+  sidebar,
   baseRef,
   docDirectoryRef,
   routeServiceRef,
@@ -88,6 +93,10 @@ const rsbuildPluginLlms = ({
         others.push(pageData);
       });
 
+      for (const array of pageArray) {
+        organizeBySidebar(sidebar, array, base);
+      }
+
       if (llmsTxt) {
         const llmsTxtContent = generateLlmsTxt(
           pageArray,
@@ -200,6 +209,61 @@ function mergeRouteMetaWithPageData(
   return mergedPageDataList;
 }
 
+function flatSidebar(
+  sidebar: (
+    | SidebarGroup
+    | SidebarItem
+    | SidebarDivider
+    | SidebarSectionHeader
+    | string
+  )[],
+): string[] {
+  if (!sidebar) {
+    return [];
+  }
+  return sidebar
+    .flatMap(i => {
+      if (typeof i === 'string') {
+        return i;
+      }
+      if ('link' in i && typeof i.link === 'string') {
+        return [i.link, ...flatSidebar((i as any)?.items ?? [])];
+      }
+      if ('items' in i && Array.isArray(i.items)) {
+        return flatSidebar(i.items);
+      }
+      return undefined;
+    })
+    .filter(Boolean) as string[];
+}
+
+function organizeBySidebar(
+  sidebar: Sidebar,
+  pages: PageIndexInfo[],
+  base: string,
+) {
+  if (pages.length === 0) {
+    return;
+  }
+  const pageItem = pages[0];
+  const currSidebar = getSidebarDataGroup(
+    sidebar as any,
+    pageItem.routePath,
+    base,
+  );
+
+  if (currSidebar.length === 0) {
+    return;
+  }
+  const orderList = flatSidebar(currSidebar);
+
+  pages.sort((a, b) => {
+    const aIndex = orderList.findIndex(order => matchPath(order, a.routePath));
+    const bIndex = orderList.findIndex(order => matchPath(order, b.routePath));
+    return aIndex - bIndex;
+  });
+}
+
 /**
  * A plugin for rspress to generate llms.txt, llms-full.txt, md files to let llm understand your website.
  */
@@ -237,7 +301,14 @@ export function pluginLlms(options: Options = {}): RspressPlugin {
       }
     },
     beforeBuild(config) {
-      Object.assign(sidebar, config.themeConfig?.sidebar ?? {});
+      const configSidebar = config?.themeConfig?.locales
+        ?.map(i => i.sidebar)
+        .reduce((prev: Sidebar, curr) => {
+          Object.assign(prev, curr);
+          return prev;
+        }, {} as Sidebar);
+      Object.assign(sidebar, configSidebar);
+
       const configNav = config.themeConfig?.locales
         ?.filter(i => Boolean(i.nav))
         ?.map(i => {

packages/runtime/server.d.ts

@@ -1 +1,2 @@
 export { StaticRouter } from 'react-router-dom/server';
+export { matchPath } from 'react-router-dom';

packages/runtime/server.js

@@ -1 +1,2 @@
 export { StaticRouter } from 'react-router-dom/server';
+export { matchPath } from 'react-router-dom';

packages/shared/src/index.ts

@@ -1,5 +1,9 @@
 export * from './types';
-export { matchSidebar, matchNavbar } from './runtime-utils/sidebar';
+export {
+  matchSidebar,
+  matchNavbar,
+  getSidebarDataGroup,
+} from './runtime-utils/sidebar';
 export {
   APPEARANCE_KEY,
   DEFAULT_HIGHLIGHT_LANGUAGES,

packages/shared/src/runtime-utils/sidebar.ts

@@ -1,4 +1,4 @@
-import type { NavItemWithLink } from '../types/defaultTheme';
+import type { NavItemWithLink, NormalizedSidebar } from '../types/defaultTheme';
 import { withBase, withoutBase } from './utils';
 import { addTrailingSlash } from './utils';
 
@@ -29,6 +29,39 @@ export const matchSidebar = (
   return currentPathname.startsWith(prefixWithDot);
 };
 
+/**
+ * get the sidebar group for the current page
+ * @param sidebar const { sidebar } = useLocaleSiteData();
+ * @param currentPathname
+ * @returns
+ */
+export const getSidebarDataGroup = (
+  sidebar: NormalizedSidebar,
+  currentPathname: string,
+  base: string,
+): NormalizedSidebar[string] => {
+  /**
+   * why sort?
+   * {
+   *  '/': [],
+   *  '/guide': [
+   *    {
+   *      text: 'Getting Started',
+   *      link: '/guide/getting-started',
+   *    }
+   *   ],
+   * }
+   */
+  const navRoutes = Object.keys(sidebar).sort((a, b) => b.length - a.length);
+  for (const name of navRoutes) {
+    if (matchSidebar(name, currentPathname, base)) {
+      const sidebarGroup = sidebar[name];
+      return sidebarGroup;
+    }
+  }
+  return [];
+};
+
 export const matchNavbar = (
   item: NavItemWithLink,
   currentPathname: string,