From d4c122646ccd6fc989b4436e16b2dffdc931dee6 Mon Sep 17 00:00:00 2001
From: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:39:44 +0000
Subject: [PATCH] fix(explorer): default sortFn implementation (#511)
---
quartz/plugins/transformers/frontmatter.ts | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/quartz/plugins/transformers/frontmatter.ts b/quartz/plugins/transformers/frontmatter.ts
index 8dd0a45..04b1105 100644
--- a/quartz/plugins/transformers/frontmatter.ts
+++ b/quartz/plugins/transformers/frontmatter.ts
@@ -1,16 +1,18 @@
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 yaml from "js-yaml"
+import toml from "toml"
+import { slugTag } from "../../util/path"
export interface Options {
- language: 'yaml' | 'toml',
delims: string | string[]
+ language: "yaml" | "toml"
}
const defaultOptions: Options = {
- language: 'yaml',
- delims: '---'
+ delims: "---",
+ language: "yaml",
}
export const FrontMatter: QuartzTransformerPlugin<Partial<Options> | undefined> = (userOpts) => {
@@ -19,34 +21,51 @@
name: "FrontMatter",
markdownPlugins() {
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
- }
+ yaml: (s) => yaml.load(s, { schema: yaml.JSON_SCHEMA }) as object,
+ toml: (s) => toml.parse(s) as object,
+ },
})
- if (data.tags && !Array.isArray(data.tags)) {
- data.tags = data.tags.toString().split(",").map((tag: string) => tag.trim())
+ // tag is an alias for tags
+ if (data.tag) {
+ data.tags = data.tag
}
+ // coerce title to string
+ if (data.title) {
+ data.title = data.title.toString()
+ }
+
+ if (data.tags && !Array.isArray(data.tags)) {
+ data.tags = data.tags
+ .toString()
+ .split(",")
+ .map((tag: string) => tag.trim())
+ }
+
+ // slug them all!!
+ data.tags = [...new Set(data.tags?.map((tag: string) => slugTag(tag)))] ?? []
+
// fill in frontmatter
file.data.frontmatter = {
title: file.stem ?? "Untitled",
tags: [],
- ...data
+ ...data,
}
}
- }
+ },
]
},
}
}
-declare module 'vfile' {
+declare module "vfile" {
interface DataMap {
frontmatter: { [key: string]: any } & {
title: string
--
Gitblit v1.10.0