From efd46f84de2d8dcc630b96de5454027bfbbf5f6e Mon Sep 17 00:00:00 2001
From: Eiko Wagenknecht <git@eiko-wagenknecht.de>
Date: Mon, 19 Feb 2024 08:08:36 +0000
Subject: [PATCH] fix(frontmatter): delimiters parameter was not passed (#885)
---
quartz/plugins/transformers/frontmatter.ts | 41 +++++------------------------------------
1 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/quartz/plugins/transformers/frontmatter.ts b/quartz/plugins/transformers/frontmatter.ts
index 41c1b13..7073d43 100644
--- a/quartz/plugins/transformers/frontmatter.ts
+++ b/quartz/plugins/transformers/frontmatter.ts
@@ -5,35 +5,18 @@
import toml from "toml"
import { slugTag } from "../../util/path"
import { QuartzPluginData } from "../vfile"
-import chalk from "chalk"
+import { i18n } from "../../i18n"
export interface Options {
- delims: string | string[]
+ delimiters: string | [string, string]
language: "yaml" | "toml"
}
const defaultOptions: Options = {
- delims: "---",
+ delimiters: "---",
language: "yaml",
}
-function coerceDate(fp: string, d: unknown): Date | undefined {
- if (d === undefined || d === null) return undefined
- const dt = new Date(d as string | number)
- const invalidDate = isNaN(dt.getTime()) || dt.getTime() === 0
- if (invalidDate) {
- console.log(
- chalk.yellow(
- `\nWarning: found invalid date "${d}" in \`${fp}\`. Supported formats: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#date_time_string_format`,
- ),
- )
-
- return undefined
- }
-
- return dt
-}
-
function coalesceAliases(data: { [key: string]: any }, aliases: string[]) {
for (const alias of aliases) {
if (data[alias] !== undefined && data[alias] !== null) return data[alias]
@@ -61,12 +44,11 @@
const opts = { ...defaultOptions, ...userOpts }
return {
name: "FrontMatter",
- markdownPlugins() {
+ markdownPlugins({ cfg }) {
return [
[remarkFrontmatter, ["yaml", "toml"]],
() => {
return (_, file) => {
- const fp = file.data.filePath!
const { data } = matter(Buffer.from(file.value), {
...opts,
engines: {
@@ -78,7 +60,7 @@
if (data.title) {
data.title = data.title.toString()
} else if (data.title === null || data.title === undefined) {
- data.title = file.stem ?? "Untitled"
+ data.title = file.stem ?? i18n(cfg.configuration.locale).propertyDefaults.title
}
const tags = coerceToArray(coalesceAliases(data, ["tags", "tag"]))
@@ -88,16 +70,6 @@
if (aliases) data.aliases = aliases
const cssclasses = coerceToArray(coalesceAliases(data, ["cssclasses", "cssclass"]))
if (cssclasses) data.cssclasses = cssclasses
- const created = coerceDate(fp, coalesceAliases(data, ["created", "date"]))
-
- if (created) data.created = created
- const modified = coerceDate(
- fp,
- coalesceAliases(data, ["modified", "lastmod", "updated", "last-modified"]),
- )
- if (modified) data.modified = modified
- const published = coerceDate(fp, coalesceAliases(data, ["published", "publishDate"]))
- if (published) data.published = published
// fill in frontmatter
file.data.frontmatter = data as QuartzPluginData["frontmatter"]
@@ -120,9 +92,6 @@
draft: boolean
enableToc: string
cssclasses: string[]
- created: Date
- modified: Date
- published: Date
}>
}
}
--
Gitblit v1.10.0