From f7bf4038dc7fcf3adc09697797da1c68c932eadc Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 06 Jul 2023 23:56:30 +0000
Subject: [PATCH] fix path parsing
---
quartz/processors/parse.ts | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/quartz/processors/parse.ts b/quartz/processors/parse.ts
index 173675e..6560bf6 100644
--- a/quartz/processors/parse.ts
+++ b/quartz/processors/parse.ts
@@ -11,18 +11,18 @@
import path from 'path'
import os from 'os'
import workerpool, { Promise as WorkerPromise } from 'workerpool'
-import { QuartzTransformerPlugin } from '../plugins/types'
+import { QuartzTransformerPluginInstance } from '../plugins/types'
import { QuartzLogger } from '../log'
import chalk from 'chalk'
export type QuartzProcessor = Processor<MDRoot, HTMLRoot, void>
-export function createProcessor(transformers: QuartzTransformerPlugin[]): QuartzProcessor {
+export function createProcessor(transformers: QuartzTransformerPluginInstance[]): QuartzProcessor {
// base Markdown -> MD AST
let processor = unified().use(remarkParse)
// MD AST -> MD AST transforms
- for (const plugin of transformers) {
- processor = processor.use(plugin.markdownPlugins())
+ for (const plugin of transformers.filter(p => p.markdownPlugins)) {
+ processor = processor.use(plugin.markdownPlugins!())
}
// MD AST -> HTML AST
@@ -30,8 +30,8 @@
// HTML AST -> HTML AST transforms
- for (const plugin of transformers) {
- processor = processor.use(plugin.htmlPlugins())
+ for (const plugin of transformers.filter(p => p.htmlPlugins)) {
+ processor = processor.use(plugin.htmlPlugins!())
}
return processor
@@ -73,13 +73,18 @@
})
}
-export function createFileParser(baseDir: string, fps: string[], verbose: boolean) {
+export function createFileParser(transformers: QuartzTransformerPluginInstance[], baseDir: string, fps: string[], verbose: boolean) {
return async (processor: QuartzProcessor) => {
const res: ProcessedContent[] = []
for (const fp of fps) {
try {
const file = await read(fp)
+ // Text -> Text transforms
+ for (const plugin of transformers.filter(p => p.textTransform)) {
+ file.value = plugin.textTransform!(file.value)
+ }
+
// base data properties that plugins may use
file.data.slug = slugify(path.relative(baseDir, file.path))
file.data.filePath = fp
@@ -92,7 +97,7 @@
console.log(`[process] ${fp} -> ${file.data.slug}`)
}
} catch (err) {
- console.log(chalk.red(`Failed to process \`${fp}\`: `) + err)
+ console.log(chalk.red(`\nFailed to process \`${fp}\`: `) + err)
process.exit(1)
}
}
@@ -101,7 +106,7 @@
}
}
-export async function parseMarkdown(transformers: QuartzTransformerPlugin[], baseDir: string, fps: string[], verbose: boolean): Promise<ProcessedContent[]> {
+export async function parseMarkdown(transformers: QuartzTransformerPluginInstance[], baseDir: string, fps: string[], verbose: boolean): Promise<ProcessedContent[]> {
const perf = new PerfTimer()
const log = new QuartzLogger(verbose)
@@ -111,9 +116,8 @@
log.start(`Parsing input files using ${concurrency} threads`)
if (concurrency === 1) {
- // single-thread
const processor = createProcessor(transformers)
- const parse = createFileParser(baseDir, fps, verbose)
+ const parse = createFileParser(transformers, baseDir, fps, verbose)
res = await parse(processor)
} else {
await transpileWorkerScript()
--
Gitblit v1.10.0