From cbae88fc4e9b98764cfccca2e85f265c4b894573 Mon Sep 17 00:00:00 2001
From: Adam Brangenberg <adambrangenberg@proton.me>
Date: Mon, 31 Jul 2023 04:08:32 +0000
Subject: [PATCH] Removing redundant properties (#356)
---
quartz/plugins/emitters/folderPage.tsx | 68 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/quartz/plugins/emitters/folderPage.tsx b/quartz/plugins/emitters/folderPage.tsx
index 1eed30d..5de2e92 100644
--- a/quartz/plugins/emitters/folderPage.tsx
+++ b/quartz/plugins/emitters/folderPage.tsx
@@ -6,45 +6,62 @@
import { ProcessedContent, defaultProcessedContent } from "../vfile"
import { FullPageLayout } from "../../cfg"
import path from "path"
-import { clientSideSlug } from "../../path"
+import { CanonicalSlug, FilePath, ServerSlug, canonicalizeServer, joinSegments } from "../../path"
+import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { FolderContent } from "../../components"
-export const FolderPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
- if (!opts) {
- throw new Error("ErrorPage must be initialized with options specifiying the components to use")
+export const FolderPage: QuartzEmitterPlugin<FullPageLayout> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultListPageLayout,
+ pageBody: FolderContent(),
+ ...userOpts,
}
- const { head: Head, header, beforeBody, pageBody: Content, left, right, footer: Footer } = opts
+ const { head: Head, header, beforeBody, pageBody, 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, ...left, ...right, Footer]
},
- async emit(_contentDir, cfg, content, resources, emit): Promise<string[]> {
- const fps: string[] = []
- const allFiles = content.map(c => c[1].data)
+ async emit(ctx, content, resources, emit): Promise<FilePath[]> {
+ const fps: FilePath[] = []
+ const allFiles = content.map((c) => c[1].data)
+ const cfg = ctx.cfg.configuration
- const folders: Set<string> = new Set(allFiles.flatMap(data => data.slug ? [path.dirname(data.slug)] : []))
+ const folders: Set<CanonicalSlug> = new Set(
+ allFiles.flatMap((data) => {
+ const slug = data.slug
+ const folderName = path.dirname(slug ?? "") as CanonicalSlug
+ if (slug && folderName !== "." && folderName !== "tags") {
+ return [folderName]
+ }
+ return []
+ }),
+ )
- // remove special prefixes
- folders.delete(".")
- folders.delete("tags")
-
- const folderDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...folders].map(folder => ([
- folder, defaultProcessedContent({ slug: folder, frontmatter: { title: `Folder: ${folder}`, tags: [] } })
- ])))
+ const folderDescriptions: Record<string, ProcessedContent> = Object.fromEntries(
+ [...folders].map((folder) => [
+ folder,
+ defaultProcessedContent({
+ slug: joinSegments(folder, "index") as ServerSlug,
+ frontmatter: { title: `Folder: ${folder}`, tags: [] },
+ }),
+ ]),
+ )
for (const [tree, file] of content) {
- const slug = clientSideSlug(file.data.slug!)
+ const slug = canonicalizeServer(file.data.slug!)
if (folders.has(slug)) {
folderDescriptions[slug] = [tree, file]
}
}
for (const folder of folders) {
- const slug = folder
+ const slug = folder
const externalResources = pageResources(slug, resources)
const [tree, file] = folderDescriptions[folder]
const componentData: QuartzComponentProps = {
@@ -53,17 +70,12 @@
cfg,
children: [],
tree,
- allFiles
+ allFiles,
}
- const content = renderPage(
- slug,
- componentData,
- opts,
- externalResources
- )
+ const content = renderPage(slug, componentData, opts, externalResources)
- const fp = file.data.slug + ".html"
+ const fp = (file.data.slug! + ".html") as FilePath
await emit({
content,
slug: file.data.slug!,
@@ -73,6 +85,6 @@
fps.push(fp)
}
return fps
- }
+ },
}
}
--
Gitblit v1.10.0