style: format

Author: jer3m01

docs/app.config.ts

@@ -3,8 +3,8 @@ import { defineConfig } from "@solidjs/start/config";
 import arraybuffer from "vite-plugin-arraybuffer";
 
 import { createWithSolidBase, defineTheme } from "../src/config";
+import { SidebarConfig, createFilesystemSidebar } from "../src/config/sidebar";
 import defaultTheme, { DefaultThemeSidebarItem } from "../src/default-theme";
-import { createFilesystemSidebar, SidebarConfig } from "../src/config/sidebar";
 
 const theme = defineTheme({
 	componentsPath: import.meta.resolve("./src/solidbase-theme"),
@@ -106,7 +106,6 @@ export default defineConfig(
 	),
 );
 
-
 function customFSSidebar(route: string, title: string) {
 	const sidebar = createFilesystemSidebar(route);
 
@@ -115,6 +114,6 @@ function customFSSidebar(route: string, title: string) {
 			title,
 			items: sidebar.filter((i) => !("items" in i)),
 		},
-		...sidebar.filter((i) => ("items" in i))
+		...sidebar.filter((i) => "items" in i),
 	];
 }

src/config/sidebar.ts

@@ -25,48 +25,67 @@ export interface SidebarItemSection<T = {}> {
 export type SidebarItemWithMeta<T = {}> = SidebarItem<T> & {
 	filePath: string;
 	matterData?: any;
-}
+};
 
 export interface FilesystemSidebarOptions {
 	filter?: (item: SidebarItemWithMeta) => boolean;
 	sort?: (a: SidebarItemWithMeta, b: SidebarItemWithMeta) => number;
 }
 
-const ROUTES_FOLDER = import.meta.resolve("./src/routes/").substring("file:".length);
+const ROUTES_FOLDER = import.meta
+	.resolve("./src/routes/")
+	.substring("file:".length);
 
-export function createFilesystemSidebar<Item = SidebarItem>(route: string, options?: FilesystemSidebarOptions): Item[] {
+export function createFilesystemSidebar<Item = SidebarItem>(
+	route: string,
+	options?: FilesystemSidebarOptions,
+): Item[] {
 	const folder = path.join(ROUTES_FOLDER, route);
 
 	const resolvedOptions: Required<FilesystemSidebarOptions> = {
 		filter: (item) => {
-			console.log("AAAAAAAAA", item.matterData)
-			return item.matterData?.excludeFromSidebar !== true
+			console.log("AAAAAAAAA", item.matterData);
+			return item.matterData?.excludeFromSidebar !== true;
 		},
 		sort: (a, b) => {
 			if (stripExtension(a.filePath).endsWith("index")) return -1;
 			if (a.filePath > b.filePath) return 1;
 			if (b.filePath > a.filePath) return -1;
 			return 0;
 		},
-		...options
-	}
-
-	const items = readdirSync(folder).flatMap((file) => {
-		return traverse(path.join(folder, file), folder, resolvedOptions);
-	}).filter(Boolean) as SidebarItemWithMeta[];
+		...options,
+	};
 
+	const items = readdirSync(folder)
+		.flatMap((file) => {
+			return traverse(path.join(folder, file), folder, resolvedOptions);
+		})
+		.filter(Boolean) as SidebarItemWithMeta[];
 
 	const transform = (items: SidebarItemWithMeta[]): Item[] => {
-		return items.filter(resolvedOptions.filter).sort(resolvedOptions.sort).map((item) => {
-			if ("items" in item) return (stripMeta({ ...item, items: transform(item.items as SidebarItemWithMeta[]) as SidebarItem[]}));
-			return stripMeta(item);
-		}) as Item[];
-	}
+		return items
+			.filter(resolvedOptions.filter)
+			.sort(resolvedOptions.sort)
+			.map((item) => {
+				if ("items" in item)
+					return stripMeta({
+						...item,
+						items: transform(
+							item.items as SidebarItemWithMeta[],
+						) as SidebarItem[],
+					});
+				return stripMeta(item);
+			}) as Item[];
+	};
 
 	return transform(items);
 }
 
-function traverse(filePath: string, baseFolder: string, options: Required<FilesystemSidebarOptions>): SidebarItemWithMeta | SidebarItemWithMeta[] | undefined {
+function traverse(
+	filePath: string,
+	baseFolder: string,
+	options: Required<FilesystemSidebarOptions>,
+): SidebarItemWithMeta | SidebarItemWithMeta[] | undefined {
 	const title = formatTitle(path.basename(filePath));
 
 	if (title.includes("[...")) return;
@@ -76,16 +95,19 @@ function traverse(filePath: string, baseFolder: string, options: Required<Filesy
 
 		return {
 			title: getMatterData(filePath).title ?? title,
-			link: `/${removeParenthesesGroups(stripExtension(path.relative(baseFolder, filePath)))}`.replace(/\/index$/, "").replaceAll("//", "/"),
+			link: `/${removeParenthesesGroups(stripExtension(path.relative(baseFolder, filePath)))}`
+				.replace(/\/index$/, "")
+				.replaceAll("//", "/"),
 			filePath,
 			matterData,
 		};
 	}
 
-	const items =
-		(readdirSync(filePath).flatMap((file) => {
-		return traverse(path.join(filePath, file), baseFolder, options);
-	}).filter(Boolean) as SidebarItemWithMeta[]);
+	const items = readdirSync(filePath)
+		.flatMap((file) => {
+			return traverse(path.join(filePath, file), baseFolder, options);
+		})
+		.filter(Boolean) as SidebarItemWithMeta[];
 
 	if (title === "") {
 		return items;
@@ -117,7 +139,7 @@ function formatTitle(filePath: string): string {
 }
 
 function removeParenthesesGroups(s: string) {
-	return s.replaceAll(/\((\w|-)+\)/g, "").replaceAll("//", "/");
+	return s.replaceAll(/\((\w|-|_)+\)/g, "").replaceAll("//", "/");
 }
 
 function stripMeta(item: SidebarItemWithMeta): SidebarItem {