From 2c69b0c97d40f76363d20478cb799ce4b7518e56 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 09 Dec 2023 00:55:40 +0000
Subject: [PATCH] fix: frontmatter coercion (empty string is falsy)
---
quartz/plugins/transformers/frontmatter.ts | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/quartz/plugins/transformers/frontmatter.ts b/quartz/plugins/transformers/frontmatter.ts
index 58ae7c7..6498a07 100644
--- a/quartz/plugins/transformers/frontmatter.ts
+++ b/quartz/plugins/transformers/frontmatter.ts
@@ -2,16 +2,19 @@
import remarkFrontmatter from "remark-frontmatter"
import { QuartzTransformerPlugin } from "../types"
import yaml from "js-yaml"
-import { slugTag } from "../../path"
+import toml from "toml"
+import { slugTag } from "../../util/path"
export interface Options {
- language: "yaml" | "toml"
delims: string | string[]
+ language: "yaml" | "toml"
+ oneLineTagDelim: string
}
const defaultOptions: Options = {
- language: "yaml",
delims: "---",
+ language: "yaml",
+ oneLineTagDelim: ",",
}
export const FrontMatter: QuartzTransformerPlugin<Partial<Options> | undefined> = (userOpts) => {
@@ -19,31 +22,39 @@
return {
name: "FrontMatter",
markdownPlugins() {
+ const { oneLineTagDelim } = opts
+
return [
- remarkFrontmatter,
+ [remarkFrontmatter, ["yaml", "toml"]],
() => {
return (_, file) => {
const { data } = matter(file.value, {
...opts,
engines: {
yaml: (s) => yaml.load(s, { schema: yaml.JSON_SCHEMA }) as object,
+ toml: (s) => toml.parse(s) as object,
},
})
// tag is an alias for tags
- if (data.tag) {
- data.tags = data.tag
+ if (data.tag !== null) {
+ data.tags = data.tag.toString()
}
- if (data.tags && !Array.isArray(data.tags)) {
+ // coerce title to string
+ if (data.title !== null) {
+ data.title = data.title.toString()
+ }
+
+ if (data.tags !== null && !Array.isArray(data.tags)) {
data.tags = data.tags
.toString()
- .split(",")
+ .split(oneLineTagDelim)
.map((tag: string) => tag.trim())
}
// slug them all!!
- data.tags = data.tags?.map((tag: string) => slugTag(tag)) ?? []
+ data.tags = [...new Set(data.tags?.map((tag: string) => slugTag(tag)))] ?? []
// fill in frontmatter
file.data.frontmatter = {
--
Gitblit v1.10.0