From cb68069d455cf513da4eefeab7868062085b4064 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 08:24:48 +0000
Subject: [PATCH] chore(deps-dev): bump typescript from 5.5.3 to 5.5.4 (#1343)
---
quartz/plugins/emitters/tagPage.tsx | 118 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 27 deletions(-)
diff --git a/quartz/plugins/emitters/tagPage.tsx b/quartz/plugins/emitters/tagPage.tsx
index 30717fa..066d4ec 100644
--- a/quartz/plugins/emitters/tagPage.tsx
+++ b/quartz/plugins/emitters/tagPage.tsx
@@ -3,32 +3,101 @@
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 { CanonicalSlug, FilePath, ServerSlug } from "../../path"
+import {
+ FilePath,
+ FullSlug,
+ getAllSegmentPrefixes,
+ joinSegments,
+ pathToRoot,
+} from "../../util/path"
+import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { TagContent } from "../../components"
+import { write } from "./helpers"
+import { i18n } from "../../i18n"
+import DepGraph from "../../depgraph"
-export const TagPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
- if (!opts) {
- throw new Error("TagPage must be initialized with options specifiying the components to use")
+interface TagPageOptions extends FullPageLayout {
+ sort?: (f1: QuartzPluginData, f2: QuartzPluginData) => number
+}
+
+export const TagPage: QuartzEmitterPlugin<Partial<TagPageOptions>> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultListPageLayout,
+ pageBody: TagContent({ 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: "TagPage",
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) {
+ const graph = new DepGraph<FilePath>()
- const tags: Set<string> = new Set(allFiles.flatMap(data => data.frontmatter?.tags ?? []))
- const tagDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...tags].map(tag => ([
- tag, defaultProcessedContent({ slug: `tags/${tag}` as ServerSlug, frontmatter: { title: `Tag: ${tag}`, tags: [] } })
- ])))
+ for (const [_tree, file] of content) {
+ const sourcePath = file.data.filePath!
+ const tags = (file.data.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes)
+ // if the file has at least one tag, it is used in the tag index page
+ if (tags.length > 0) {
+ tags.push("index")
+ }
+
+ for (const tag of tags) {
+ graph.addEdge(
+ sourcePath,
+ joinSegments(ctx.argv.output, "tags", tag + ".html") as FilePath,
+ )
+ }
+ }
+
+ 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 tags: Set<string> = new Set(
+ allFiles.flatMap((data) => data.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes),
+ )
+
+ // add base tag
+ tags.add("index")
+
+ const tagDescriptions: Record<string, ProcessedContent> = Object.fromEntries(
+ [...tags].map((tag) => {
+ const title =
+ tag === "index"
+ ? i18n(cfg.locale).pages.tagContent.tagIndex
+ : `${i18n(cfg.locale).pages.tagContent.tag}: ${tag}`
+ return [
+ tag,
+ defaultProcessedContent({
+ slug: joinSegments("tags", tag) as FullSlug,
+ frontmatter: { title, tags: [] },
+ }),
+ ]
+ }),
+ )
for (const [tree, file] of content) {
const slug = file.data.slug!
@@ -41,27 +110,22 @@
}
for (const tag of tags) {
- const slug = `tags/${tag}` as CanonicalSlug
- const externalResources = pageResources(slug, resources)
+ const slug = joinSegments("tags", tag) as FullSlug
+ const externalResources = pageResources(pathToRoot(slug), resources)
const [tree, file] = tagDescriptions[tag]
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!,
ext: ".html",
@@ -70,6 +134,6 @@
fps.push(fp)
}
return fps
- }
+ },
}
}
--
Gitblit v1.10.0