From fbb452385325d4418ce53e61178fe2494255caf5 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 14 Mar 2025 22:08:23 +0000
Subject: [PATCH] fix(folder): use memoized trie instead of handrolled path solution (closes #1767)
---
quartz/components/pages/FolderContent.tsx | 115 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 40 deletions(-)
diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx
index 2a727c0..e775653 100644
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -1,16 +1,14 @@
import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "../types"
-import path from "path"
import style from "../styles/listPage.scss"
-import { byDateAndAlphabetical, PageList, SortFn } from "../PageList"
-import { stripSlashes, simplifySlug, joinSegments, FullSlug } from "../../util/path"
+import { PageList, SortFn } from "../PageList"
import { Root } from "hast"
import { htmlToJsx } from "../../util/jsx"
import { i18n } from "../../i18n"
import { QuartzPluginData } from "../../plugins/vfile"
import { ComponentChildren } from "preact"
import { concatenateResources } from "../../util/resources"
-
+import { FileTrieNode } from "../../util/fileTrie"
interface FolderContentOptions {
/**
* Whether to display number of folders
@@ -27,51 +25,88 @@
export default ((opts?: Partial<FolderContentOptions>) => {
const options: FolderContentOptions = { ...defaultOptions, ...opts }
+ let trie: FileTrieNode<
+ QuartzPluginData & {
+ slug: string
+ title: string
+ filePath: string
+ }
+ >
const FolderContent: QuartzComponent = (props: QuartzComponentProps) => {
const { tree, fileData, allFiles, cfg } = props
- const folderSlug = stripSlashes(simplifySlug(fileData.slug!))
- const folderParts = folderSlug.split(path.posix.sep)
- const allPagesInFolder: QuartzPluginData[] = []
- const allPagesInSubfolders: Map<FullSlug, QuartzPluginData[]> = new Map()
+ if (!trie) {
+ trie = new FileTrieNode([])
+ allFiles.forEach((file) => {
+ if (file.frontmatter) {
+ trie.add({
+ ...file,
+ slug: file.slug!,
+ title: file.frontmatter.title,
+ filePath: file.filePath!,
+ })
+ }
+ })
+ }
- allFiles.forEach((file) => {
- const fileSlug = stripSlashes(simplifySlug(file.slug!))
- const prefixed = fileSlug.startsWith(folderSlug) && fileSlug !== folderSlug
- const fileParts = fileSlug.split(path.posix.sep)
- const isDirectChild = fileParts.length === folderParts.length + 1
+ const folder = trie.findNode(fileData.slug!.split("/"))
+ if (!folder) {
+ return null
+ }
- if (!prefixed) {
- return
- }
+ const allPagesInFolder: QuartzPluginData[] =
+ folder.children
+ .map((node) => {
+ // regular file, proceed
+ if (node.data) {
+ return node.data
+ }
- if (isDirectChild) {
- allPagesInFolder.push(file)
- } else if (options.showSubfolders) {
- const subfolderSlug = joinSegments(
- ...fileParts.slice(0, folderParts.length + 1),
- ) as FullSlug
- const pagesInFolder = allPagesInSubfolders.get(subfolderSlug) || []
- allPagesInSubfolders.set(subfolderSlug, [...pagesInFolder, file])
- }
- })
+ if (node.isFolder && options.showSubfolders) {
+ // folders that dont have data need synthetic files
+ const getMostRecentDates = (): QuartzPluginData["dates"] => {
+ let maybeDates: QuartzPluginData["dates"] | undefined = undefined
+ for (const child of node.children) {
+ if (child.data?.dates) {
+ // compare all dates and assign to maybeDates if its more recent or its not set
+ if (!maybeDates) {
+ maybeDates = child.data.dates
+ } else {
+ if (child.data.dates.created > maybeDates.created) {
+ maybeDates.created = child.data.dates.created
+ }
- allPagesInSubfolders.forEach((files, subfolderSlug) => {
- const hasIndex = allPagesInFolder.some(
- (file) => subfolderSlug === stripSlashes(simplifySlug(file.slug!)),
- )
- if (!hasIndex) {
- const subfolderDates = files.sort(byDateAndAlphabetical(cfg))[0].dates
- const subfolderTitle = subfolderSlug.split(path.posix.sep).at(-1)!
- allPagesInFolder.push({
- slug: subfolderSlug,
- dates: subfolderDates,
- frontmatter: { title: subfolderTitle, tags: ["folder"] },
+ if (child.data.dates.modified > maybeDates.modified) {
+ maybeDates.modified = child.data.dates.modified
+ }
+
+ if (child.data.dates.published > maybeDates.published) {
+ maybeDates.published = child.data.dates.published
+ }
+ }
+ }
+ }
+ return (
+ maybeDates ?? {
+ created: new Date(),
+ modified: new Date(),
+ published: new Date(),
+ }
+ )
+ }
+
+ return {
+ slug: node.slug,
+ dates: getMostRecentDates(),
+ frontmatter: {
+ title: node.displayName,
+ tags: [],
+ },
+ }
+ }
})
- }
- })
-
+ .filter((page) => page !== undefined) ?? []
const cssClasses: string[] = fileData.frontmatter?.cssclasses ?? []
const classes = cssClasses.join(" ")
const listProps = {
--
Gitblit v1.10.0