From e758cbe1ee7a2bb128cbd95fd6d3cdcd34623800 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 28 Dec 2023 22:00:15 +0000
Subject: [PATCH] pkg: bump version to 4.1.4
---
quartz/processors/parse.ts | 69 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/quartz/processors/parse.ts b/quartz/processors/parse.ts
index 23af762..3950fee 100644
--- a/quartz/processors/parse.ts
+++ b/quartz/processors/parse.ts
@@ -5,37 +5,34 @@
import { Root as MDRoot } from "remark-parse/lib"
import { Root as HTMLRoot } from "hast"
import { ProcessedContent } from "../plugins/vfile"
-import { PerfTimer } from "../perf"
+import { PerfTimer } from "../util/perf"
import { read } from "to-vfile"
-import { FilePath, QUARTZ, slugifyFilePath } from "../path"
+import { FilePath, QUARTZ, slugifyFilePath } from "../util/path"
import path from "path"
-import os from "os"
import workerpool, { Promise as WorkerPromise } from "workerpool"
-import { QuartzLogger } from "../log"
-import { trace } from "../trace"
-import { BuildCtx } from "../ctx"
+import { QuartzLogger } from "../util/log"
+import { trace } from "../util/trace"
+import { BuildCtx } from "../util/ctx"
-export type QuartzProcessor = Processor<MDRoot, HTMLRoot, void>
+export type QuartzProcessor = Processor<MDRoot, MDRoot, HTMLRoot>
export function createProcessor(ctx: BuildCtx): QuartzProcessor {
const transformers = ctx.cfg.plugins.transformers
- // base Markdown -> MD AST
- let processor = unified().use(remarkParse)
-
- // MD AST -> MD AST transforms
- for (const plugin of transformers.filter((p) => p.markdownPlugins)) {
- processor = processor.use(plugin.markdownPlugins!(ctx))
- }
-
- // MD AST -> HTML AST
- processor = processor.use(remarkRehype, { allowDangerousHtml: true })
-
- // HTML AST -> HTML AST transforms
- for (const plugin of transformers.filter((p) => p.htmlPlugins)) {
- processor = processor.use(plugin.htmlPlugins!(ctx))
- }
-
- return processor
+ return (
+ unified()
+ // base Markdown -> MD AST
+ .use(remarkParse)
+ // MD AST -> MD AST transforms
+ .use(
+ transformers
+ .filter((p) => p.markdownPlugins)
+ .flatMap((plugin) => plugin.markdownPlugins!(ctx)),
+ )
+ // MD AST -> HTML AST
+ .use(remarkRehype, { allowDangerousHtml: true })
+ // HTML AST -> HTML AST transforms
+ .use(transformers.filter((p) => p.htmlPlugins).flatMap((plugin) => plugin.htmlPlugins!(ctx)))
+ )
}
function* chunks<T>(arr: T[], n: number) {
@@ -56,6 +53,8 @@
platform: "node",
format: "esm",
packages: "external",
+ sourcemap: true,
+ sourcesContent: false,
plugins: [
{
name: "css-and-scripts-as-text",
@@ -80,6 +79,7 @@
const res: ProcessedContent[] = []
for (const fp of fps) {
try {
+ const perf = new PerfTimer()
const file = await read(fp)
// strip leading and trailing whitespace
@@ -87,23 +87,23 @@
// Text -> Text transforms
for (const plugin of cfg.plugins.transformers.filter((p) => p.textTransform)) {
- file.value = plugin.textTransform!(ctx, file.value)
+ file.value = plugin.textTransform!(ctx, file.value.toString())
}
// base data properties that plugins may use
- file.data.slug = slugifyFilePath(path.relative(argv.directory, file.path) as FilePath)
- file.data.filePath = fp
+ file.data.filePath = file.path as FilePath
+ file.data.relativePath = path.posix.relative(argv.directory, file.path) as FilePath
+ file.data.slug = slugifyFilePath(file.data.relativePath)
const ast = processor.parse(file)
const newAst = await processor.run(ast, file)
res.push([newAst, file])
if (argv.verbose) {
- console.log(`[process] ${fp} -> ${file.data.slug}`)
+ console.log(`[process] ${fp} -> ${file.data.slug} (${perf.timeSince()})`)
}
} catch (err) {
trace(`\nFailed to process \`${fp}\``, err as Error)
- throw err
}
}
@@ -111,13 +111,16 @@
}
}
+const clamp = (num: number, min: number, max: number) =>
+ Math.min(Math.max(Math.round(num), min), max)
export async function parseMarkdown(ctx: BuildCtx, fps: FilePath[]): Promise<ProcessedContent[]> {
const { argv } = ctx
const perf = new PerfTimer()
const log = new QuartzLogger(argv.verbose)
+ // rough heuristics: 128 gives enough time for v8 to JIT and optimize parsing code paths
const CHUNK_SIZE = 128
- let concurrency = fps.length < CHUNK_SIZE ? 1 : os.availableParallelism()
+ const concurrency = ctx.argv.concurrency ?? clamp(fps.length / CHUNK_SIZE, 1, 4)
let res: ProcessedContent[] = []
log.start(`Parsing input files using ${concurrency} threads`)
@@ -143,7 +146,11 @@
childPromises.push(pool.exec("parseFiles", [argv, chunk, ctx.allSlugs]))
}
- const results: ProcessedContent[][] = await WorkerPromise.all(childPromises)
+ const results: ProcessedContent[][] = await WorkerPromise.all(childPromises).catch((err) => {
+ const errString = err.toString().slice("Error:".length)
+ console.error(errString)
+ process.exit(1)
+ })
res = results.flat()
await pool.terminate()
}
--
Gitblit v1.10.0