methanol 0.0.20 → 0.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "methanol",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Static site generator powered by rEFui and MDX",
   "main": "./index.js",
   "type": "module",

package/src/build-system.js

@@ -101,6 +101,8 @@ export const buildHtmlEntries = async () => {
 	const excludedDirs = Array.from(pagesContext.excludedDirs || [])
 	const rssContent = new Map()
 	const intermediateOutputs = []
+	let feedIds = []
+	let feedAssignments = null
 	try {
 		await runWorkerStage({
 			workers,
@@ -168,6 +170,18 @@ export const buildHtmlEntries = async () => {
 				}
 			}))
 		})
+		if (state.RSS_ENABLED) {
+			const feedPages = selectFeedPages(pages, state.RSS_OPTIONS || {})
+			const pageIndex = new Map(pages.map((page, index) => [page, index]))
+			feedIds = feedPages.map((page) => pageIndex.get(page)).filter((id) => id != null)
+			if (feedIds.length) {
+				feedAssignments = Array.from({ length: workers.length }, () => [])
+				for (const id of feedIds) {
+					feedAssignments[id % workers.length].push(id)
+				}
+			}
+		}
+
 		const renderToken = stageLogger.start('Rendering pages')
 		completed = 0
 		await runWorkerStage({
@@ -178,7 +192,8 @@ export const buildHtmlEntries = async () => {
 				message: {
 					type: 'render',
 					stage: 'render',
-					ids: assignments[index]
+					ids: assignments[index],
+					feedIds: feedAssignments ? feedAssignments[index] : []
 				}
 			})),
 			onProgress: (count) => {
@@ -198,56 +213,15 @@ export const buildHtmlEntries = async () => {
 				if (state.INTERMEDIATE_DIR) {
 					intermediateOutputs.push({ name, id })
 				}
+				if (result.feedContent != null) {
+					const key = page.path || page.routePath
+					if (key) {
+						rssContent.set(key, result.feedContent || '')
+					}
+				}
 			}
 		})
 		stageLogger.end(renderToken)
-
-		if (state.RSS_ENABLED) {
-			const feedPages = selectFeedPages(pages, state.RSS_OPTIONS || {})
-			const feedIds = []
-			const pageIndex = new Map(pages.map((page, index) => [page, index]))
-			for (const page of feedPages) {
-				const id = pageIndex.get(page)
-				if (id != null) {
-					feedIds.push(id)
-				}
-			}
-			if (feedIds.length) {
-				const rssToken = stageLogger.start('Rendering feed')
-				completed = 0
-				const rssAssignments = Array.from({ length: workers.length }, () => [])
-				for (let i = 0; i < feedIds.length; i += 1) {
-					rssAssignments[i % workers.length].push(feedIds[i])
-				}
-				await runWorkerStage({
-					workers,
-					stage: 'rss',
-					messages: workers.map((worker, index) => ({
-						worker,
-						message: {
-							type: 'rss',
-							stage: 'rss',
-							ids: rssAssignments[index]
-						}
-					})),
-					onProgress: (count) => {
-						if (!logEnabled) return
-						completed = count
-						stageLogger.update(rssToken, `Rendering feed [${completed}/${feedIds.length}]`)
-					},
-					onResult: (result) => {
-						if (!result || typeof result.id !== 'number') return
-						const page = pages[result.id]
-						if (!page) return
-						const key = page.path || page.routePath
-						if (key) {
-							rssContent.set(key, result.content || '')
-						}
-					}
-				})
-				stageLogger.end(rssToken)
-			}
-		}
 	} finally {
 		await terminateWorkers(workers)
 	}

package/src/config.js

@@ -461,6 +461,9 @@ export const applyConfig = async (config, mode) => {
 		state.RSS_ENABLED = cli.CLI_RSS
 	}
 	state.RSS_OPTIONS = resolveFeedOptions(config)
+	if (cli.CLI_RSS !== undefined && cli.CLI_ATOM === undefined) {
+		state.RSS_OPTIONS = { ...(state.RSS_OPTIONS || {}), atom: false }
+	}
 	if (cli.CLI_ATOM !== undefined) {
 		if (cli.CLI_ATOM === true) {
 			state.RSS_ENABLED = true

package/src/feed.js

@@ -63,15 +63,6 @@ const wrapCdata = (value) => {
 	return `<![CDATA[${text.replace(/]]>/g, ']]]]><![CDATA[>')}]]>`
 }
 
-const escapeXml = (value) => {
-	const text = value == null ? '' : String(value)
-	if (!text) return ''
-	return text
-		.replace(/&/g, '&amp;')
-		.replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
-}
-
 const resolveSiteUrl = (options, site) => {
 	if (options?.siteUrl) return options.siteUrl
 	if (state.SITE_BASE) return state.SITE_BASE
@@ -86,10 +77,10 @@ const buildItem = (page, siteUrl, htmlContent = null, isAtom = false, siteOwner
 	const link = new URL(href, siteUrl).href
 	const title = page.title || page.name || page.routePath || link
 	const description = extractExcerpt(page)
-	const contentSource = htmlContent || page.content || ''
+	const contentSource = htmlContent ?? page.content ?? ''
 	const content = contentSource
 		? (isAtom
-			? HTMLRenderer.rawHTML(escapeXml(contentSource))
+			? contentSource
 			: HTMLRenderer.rawHTML(wrapCdata(contentSource)))
 		: null
 	const authorValue = page.frontmatter?.author
@@ -183,7 +174,7 @@ export const generateRssFeed = async (pagesContext, rssContent = null) => {
 	const items = pages
 		.map((page) => ({
 			page,
-			content: rssContent?.get(page.path) || rssContent?.get(page.routePath) || null
+			content: rssContent?.get(page.path) ?? rssContent?.get(page.routePath) ?? null
 		}))
 		.map((entry) => buildItem(entry.page, siteUrl, entry.content, isAtom, siteOwner))
 		.filter(Boolean)

package/src/mdx.js

@@ -636,7 +636,8 @@ export const renderPageContent = async ({ routePath, path, components, pagesCont
 		routePath,
 		path,
 		pageMeta,
-		pagesContext
+		pagesContext,
+		lazyPagesTree: true
 	})
 
 	await compilePageMdx(pageMeta, pagesContext, { ctx })

package/src/pages-index.js

@@ -21,7 +21,16 @@
 import JSON5 from 'json5'
 import { extractExcerpt } from './text-utils.js'
 
-const OMIT_KEYS = new Set(['content', 'mdxComponent', 'mdxCtx', 'getSiblings'])
+const OMIT_KEYS = new Set([
+	'content',
+	'mdxComponent',
+	'mdxCtx',
+	'getSiblings',
+	'matter',
+	'path',
+	'exclude',
+	'segments'
+])
 
 const sanitizePage = (page) => {
 	const result = {}

package/src/state.js

@@ -169,19 +169,25 @@ const parser = yargs(hideBin(process.argv))
 	.wrap(null)
 
 const argv = parser.parseSync()
+const parsedCommand = argv._[0] ? String(argv._[0]) : null
+const isServeCommand = parsedCommand === 'serve' || parsedCommand === 'preview'
+const rawInput = argv.input || null
+const rawOutput = argv.output || null
+const normalizedInput = isServeCommand && rawInput && !rawOutput ? null : rawInput
+const normalizedOutput = isServeCommand && rawInput && !rawOutput ? rawInput : rawOutput
 
 export const cli = {
 	argv,
-	command: argv._[0] ? String(argv._[0]) : null,
+	command: parsedCommand,
 	showHelp: () => parser.showHelp(),
 	CLI_INTERMEDIATE_DIR: argv['intermediate-dir'] || null,
 	CLI_EMIT_INTERMEDIATE: Boolean(argv['emit-intermediate']),
 	CLI_HOST: argv.host ?? null,
 	CLI_PORT: typeof argv.port === 'number' ? argv.port : null,
-	CLI_PAGES_DIR: argv.input || null,
+	CLI_PAGES_DIR: normalizedInput,
 	CLI_COMPONENTS_DIR: argv.components || null,
 	CLI_ASSETS_DIR: argv.assets || null,
-	CLI_OUTPUT_DIR: argv.output || null,
+	CLI_OUTPUT_DIR: normalizedOutput,
 	CLI_CONFIG_PATH: argv.config || null,
 	CLI_SITE_NAME: argv['site-name'] || null,
 	CLI_OWNER: argv.owner || null,

package/src/workers/build-worker.js

@@ -169,8 +169,9 @@ const handleCompile = async (message) => {
 }
 
 const handleRender = async (message) => {
-	const { ids = [], stage } = message || {}
-	const { renderHtml } = await import('../mdx.js')
+	const { ids = [], stage, feedIds = [] } = message || {}
+	const { renderHtml, renderPageContent } = await import('../mdx.js')
+	const feedSet = new Set(Array.isArray(feedIds) ? feedIds : [])
 	let completed = 0
 	for (const id of ids) {
 		const page = pages[id]
@@ -187,7 +188,17 @@ const handleRender = async (message) => {
 				pagesContext,
 				pageMeta: page
 			})
-			parentPort?.postMessage({ type: 'result', stage, result: { id, html } })
+			let feedContent = null
+			if (feedSet.has(id)) {
+				feedContent = await renderPageContent({
+					routePath: page.routePath,
+					path: page.path,
+					components,
+					pagesContext,
+					pageMeta: page
+				})
+			}
+			parentPort?.postMessage({ type: 'result', stage, result: { id, html, feedContent } })
 		} catch (error) {
 			logPageError('MDX render', page, error)
 			throw error
@@ -197,35 +208,6 @@ const handleRender = async (message) => {
 	}
 }
 
-const handleRss = async (message) => {
-	const { ids = [], stage } = message || {}
-	const { renderPageContent } = await import('../mdx.js')
-	let completed = 0
-	for (const id of ids) {
-		const page = pages[id]
-		if (!page) {
-			completed += 1
-			parentPort?.postMessage({ type: 'progress', stage, completed })
-			continue
-		}
-		try {
-			const content = await renderPageContent({
-				routePath: page.routePath,
-				path: page.path,
-				components,
-				pagesContext,
-				pageMeta: page
-			})
-			parentPort?.postMessage({ type: 'result', stage, result: { id, content } })
-		} catch (error) {
-			logPageError('RSS render', page, error)
-			throw error
-		}
-		completed += 1
-		parentPort?.postMessage({ type: 'progress', stage, completed })
-	}
-}
-
 parentPort?.on('message', async (message) => {
 	const { type, stage } = message || {}
 	try {
@@ -250,11 +232,6 @@ parentPort?.on('message', async (message) => {
 			parentPort?.postMessage({ type: 'done', stage })
 			return
 		}
-		if (type === 'rss') {
-			await handleRss(message)
-			parentPort?.postMessage({ type: 'done', stage })
-			return
-		}
 	} catch (error) {
 		parentPort?.postMessage({ type: 'error', stage, error: serializeError(error) })
 	}

package/themes/default/src/nav-tree.jsx

@@ -118,11 +118,12 @@ const NavTree = ({ nodes, depth }) => {
 	)
 }
 
-const rootNodes = signal()
+const _rootNodes = signal()
+const rootNodes = signal(_rootNodes, (nodes) => nodes?.map(toSignal))
 const rootTree = HTMLRenderer.createElement(NavTree, { nodes: rootNodes, depth: 0 })
 
 export const renderNavTree = (nodes, path) => {
 	currentPath.value = path
-	rootNodes.value = nodes.map(toSignal)
+	_rootNodes.value = nodes
 	return rootTree
 }