From 08f8e3b4a4879dd7c91c16fbce80c4f2bc5e357f Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 10 Jul 2023 02:32:24 +0000
Subject: [PATCH] docs + various polish
---
quartz/processors/parse.ts | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/quartz/processors/parse.ts b/quartz/processors/parse.ts
index f937701..9947860 100644
--- a/quartz/processors/parse.ts
+++ b/quartz/processors/parse.ts
@@ -21,8 +21,8 @@
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,15 +73,24 @@
})
}
-export function createFileParser(baseDir: string, fps: string[], verbose: boolean) {
+export function createFileParser(transformers: QuartzTransformerPluginInstance[], baseDir: string, fps: string[], allSlugs: string[], verbose: boolean) {
return async (processor: QuartzProcessor) => {
const res: ProcessedContent[] = []
for (const fp of fps) {
try {
const file = await read(fp)
+ // strip leading and trailing whitespace
+ file.value = file.value.toString().trim()
+
+ // 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.allSlugs = allSlugs
file.data.filePath = fp
const ast = processor.parse(file)
@@ -107,13 +116,16 @@
const CHUNK_SIZE = 128
let concurrency = fps.length < CHUNK_SIZE ? 1 : os.availableParallelism()
- let res: ProcessedContent[] = []
+ // get all slugs ahead of time as each thread needs a copy
+ // const slugs: string[] = fps.map(fp => slugify(path))
+ const allSlugs = fps.map(fp => slugify(path.relative(baseDir, path.resolve(fp))))
+
+ let res: ProcessedContent[] = []
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, allSlugs, verbose)
res = await parse(processor)
} else {
await transpileWorkerScript()
@@ -128,7 +140,7 @@
const childPromises: WorkerPromise<ProcessedContent[]>[] = []
for (const chunk of chunks(fps, CHUNK_SIZE)) {
- childPromises.push(pool.exec('parseFiles', [baseDir, chunk, verbose]))
+ childPromises.push(pool.exec('parseFiles', [baseDir, chunk, allSlugs, verbose]))
}
const results: ProcessedContent[][] = await WorkerPromise.all(childPromises)
--
Gitblit v1.10.0