From fa6c02d3213dfd4e6da8e78bd3a2e7004555fd01 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 24 Jan 2024 01:08:56 +0000
Subject: [PATCH] fix: make search result card block
---
quartz/plugins/transformers/frontmatter.ts | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/quartz/plugins/transformers/frontmatter.ts b/quartz/plugins/transformers/frontmatter.ts
index e9432a1..26a665d 100644
--- a/quartz/plugins/transformers/frontmatter.ts
+++ b/quartz/plugins/transformers/frontmatter.ts
@@ -1,17 +1,21 @@
import matter from "gray-matter"
-import remarkFrontmatter from 'remark-frontmatter'
+import remarkFrontmatter from "remark-frontmatter"
import { QuartzTransformerPlugin } from "../types"
-import yaml from 'js-yaml'
-import { slug as slugAnchor } from 'github-slugger'
+import yaml from "js-yaml"
+import toml from "toml"
+import { slugTag } from "../../util/path"
+import { QuartzPluginData } from "../vfile"
export interface Options {
- language: 'yaml' | 'toml',
delims: string | string[]
+ language: "yaml" | "toml"
+ oneLineTagDelim: string
}
const defaultOptions: Options = {
- language: 'yaml',
- delims: '---'
+ delims: "---",
+ language: "yaml",
+ oneLineTagDelim: ",",
}
export const FrontMatter: QuartzTransformerPlugin<Partial<Options> | undefined> = (userOpts) => {
@@ -19,15 +23,18 @@
return {
name: "FrontMatter",
markdownPlugins() {
+ const { oneLineTagDelim } = opts
+
return [
- remarkFrontmatter,
+ [remarkFrontmatter, ["yaml", "toml"]],
() => {
return (_, file) => {
- const { data } = matter(file.value, {
+ const { data } = matter(Buffer.from(file.value), {
...opts,
engines: {
- yaml: s => yaml.load(s, { schema: yaml.JSON_SCHEMA }) as object
- }
+ yaml: (s) => yaml.load(s, { schema: yaml.JSON_SCHEMA }) as object,
+ toml: (s) => toml.parse(s) as object,
+ },
})
// tag is an alias for tags
@@ -35,27 +42,41 @@
data.tags = data.tag
}
- if (data.tags && !Array.isArray(data.tags)) {
- data.tags = data.tags.toString().split(",").map((tag: string) => tag.trim())
+ // coerce title to string
+ if (data.title) {
+ data.title = data.title.toString()
+ } else if (data.title === null || data.title === undefined) {
+ data.title = file.stem ?? "Untitled"
+ }
+
+ if (data.tags) {
+ // coerce to array
+ if (!Array.isArray(data.tags)) {
+ data.tags = data.tags
+ .toString()
+ .split(oneLineTagDelim)
+ .map((tag: string) => tag.trim())
+ }
+
+ // remove all non-string tags
+ data.tags = data.tags
+ .filter((tag: unknown) => typeof tag === "string" || typeof tag === "number")
+ .map((tag: string | number) => tag.toString())
}
// slug them all!!
- data.tags = data.tags?.map((tag: string) => slugAnchor(tag)) ?? []
+ data.tags = [...new Set(data.tags?.map((tag: string) => slugTag(tag)))]
// fill in frontmatter
- file.data.frontmatter = {
- title: file.stem ?? "Untitled",
- tags: [],
- ...data
- }
+ file.data.frontmatter = data as QuartzPluginData["frontmatter"]
}
- }
+ },
]
},
}
}
-declare module 'vfile' {
+declare module "vfile" {
interface DataMap {
frontmatter: { [key: string]: any } & {
title: string
--
Gitblit v1.10.0