From 5fcba1bfaf8821fbb01cc7e67e01c553ffebfa39 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 17:02:03 +0000
Subject: [PATCH] chore(deps): bump mdast-util-to-hast from 13.1.0 to 13.2.0 (#1279)
---
quartz/plugins/emitters/folderPage.tsx | 125 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 37 deletions(-)
diff --git a/quartz/plugins/emitters/folderPage.tsx b/quartz/plugins/emitters/folderPage.tsx
index 7ac6d81..7eebb21 100644
--- a/quartz/plugins/emitters/folderPage.tsx
+++ b/quartz/plugins/emitters/folderPage.tsx
@@ -3,82 +3,133 @@
import HeaderConstructor from "../../components/Header"
import BodyConstructor from "../../components/Body"
import { pageResources, renderPage } from "../../components/renderPage"
-import { ProcessedContent, defaultProcessedContent } from "../vfile"
+import { ProcessedContent, QuartzPluginData, defaultProcessedContent } from "../vfile"
import { FullPageLayout } from "../../cfg"
import path from "path"
-import { CanonicalSlug, FilePath, ServerSlug, canonicalizeServer, joinSegments } from "../../path"
+import {
+ FilePath,
+ FullSlug,
+ SimpleSlug,
+ stripSlashes,
+ joinSegments,
+ pathToRoot,
+ simplifySlug,
+} from "../../util/path"
+import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { FolderContent } from "../../components"
+import { write } from "./helpers"
+import { i18n } from "../../i18n"
+import DepGraph from "../../depgraph"
-export const FolderPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
- if (!opts) {
- throw new Error("ErrorPage must be initialized with options specifiying the components to use")
+interface FolderPageOptions extends FullPageLayout {
+ sort?: (f1: QuartzPluginData, f2: QuartzPluginData) => number
+}
+
+export const FolderPage: QuartzEmitterPlugin<Partial<FolderPageOptions>> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultListPageLayout,
+ pageBody: FolderContent({ sort: userOpts?.sort }),
+ ...userOpts,
}
- const { head: Head, header, beforeBody, pageBody: Content, left, right, footer: Footer } = opts
+ const { head: Head, header, beforeBody, pageBody, afterBody, left, right, footer: Footer } = opts
const Header = HeaderConstructor()
const Body = BodyConstructor()
return {
name: "FolderPage",
getQuartzComponents() {
- return [Head, Header, Body, ...header, ...beforeBody, Content, ...left, ...right, Footer]
+ return [
+ Head,
+ Header,
+ Body,
+ ...header,
+ ...beforeBody,
+ pageBody,
+ ...afterBody,
+ ...left,
+ ...right,
+ Footer,
+ ]
},
- async emit(_contentDir, cfg, content, resources, emit): Promise<FilePath[]> {
- const fps: FilePath[] = []
- const allFiles = content.map(c => c[1].data)
+ async getDependencyGraph(_ctx, content, _resources) {
+ // Example graph:
+ // nested/file.md --> nested/index.html
+ // nested/file2.md ------^
+ const graph = new DepGraph<FilePath>()
- const folders: Set<CanonicalSlug> = new Set(allFiles.flatMap(data => {
- const slug = data.slug
- const folderName = path.dirname(slug ?? "") as CanonicalSlug
- if (slug && folderName !== ".") {
- return [folderName]
+ content.map(([_tree, vfile]) => {
+ const slug = vfile.data.slug
+ const folderName = path.dirname(slug ?? "") as SimpleSlug
+ if (slug && folderName !== "." && folderName !== "tags") {
+ graph.addEdge(vfile.data.filePath!, joinSegments(folderName, "index.html") as FilePath)
}
- return []
- }))
+ })
- // remove special prefixes
- folders.delete("tags" as CanonicalSlug)
+ return graph
+ },
+ async emit(ctx, content, resources): Promise<FilePath[]> {
+ const fps: FilePath[] = []
+ const allFiles = content.map((c) => c[1].data)
+ const cfg = ctx.cfg.configuration
- const folderDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...folders].map(folder => ([
- folder, defaultProcessedContent({ slug: joinSegments(folder, "index") as ServerSlug, frontmatter: { title: `Folder: ${folder}`, tags: [] } })
- ])))
+ const folders: Set<SimpleSlug> = new Set(
+ allFiles.flatMap((data) => {
+ const slug = data.slug
+ const folderName = path.dirname(slug ?? "") as SimpleSlug
+ if (slug && folderName !== "." && folderName !== "tags") {
+ return [folderName]
+ }
+ return []
+ }),
+ )
+
+ const folderDescriptions: Record<string, ProcessedContent> = Object.fromEntries(
+ [...folders].map((folder) => [
+ folder,
+ defaultProcessedContent({
+ slug: joinSegments(folder, "index") as FullSlug,
+ frontmatter: {
+ title: `${i18n(cfg.locale).pages.folderContent.folder}: ${folder}`,
+ tags: [],
+ },
+ }),
+ ]),
+ )
for (const [tree, file] of content) {
- const slug = canonicalizeServer(file.data.slug!)
+ const slug = stripSlashes(simplifySlug(file.data.slug!)) as SimpleSlug
if (folders.has(slug)) {
folderDescriptions[slug] = [tree, file]
}
}
for (const folder of folders) {
- const slug = folder
- const externalResources = pageResources(slug, resources)
+ const slug = joinSegments(folder, "index") as FullSlug
+ const externalResources = pageResources(pathToRoot(slug), resources)
const [tree, file] = folderDescriptions[folder]
const componentData: QuartzComponentProps = {
+ ctx,
fileData: file.data,
externalResources,
cfg,
children: [],
tree,
- allFiles
+ allFiles,
}
- const content = renderPage(
- slug,
- componentData,
- opts,
- externalResources
- )
-
- const fp = file.data.slug! + ".html" as FilePath
- await emit({
+ const content = renderPage(cfg, slug, componentData, opts, externalResources)
+ const fp = await write({
+ ctx,
content,
- slug: file.data.slug!,
+ slug,
ext: ".html",
})
fps.push(fp)
}
return fps
- }
+ },
}
}
--
Gitblit v1.10.0