methanol 0.0.18 → 0.0.20

package/src/pages.js

@@ -46,12 +46,15 @@ const cliOverrides = {
 	CLI_OUTPUT_DIR: cli.CLI_OUTPUT_DIR,
 	CLI_CONFIG_PATH: cli.CLI_CONFIG_PATH,
 	CLI_SITE_NAME: cli.CLI_SITE_NAME,
+	CLI_OWNER: cli.CLI_OWNER,
 	CLI_CODE_HIGHLIGHTING: cli.CLI_CODE_HIGHLIGHTING,
 	CLI_JOBS: cli.CLI_JOBS,
 	CLI_VERBOSE: cli.CLI_VERBOSE,
 	CLI_BASE: cli.CLI_BASE,
 	CLI_SEARCH: cli.CLI_SEARCH,
 	CLI_THEME: cli.CLI_THEME,
+	CLI_RSS: cli.CLI_RSS,
+	CLI_ATOM: cli.CLI_ATOM,
 	CLI_PWA: cli.CLI_PWA
 }
 
@@ -348,13 +351,15 @@ const buildPagesTree = (pages, options = {}) => {
 	const treePages = pages
 		.filter((page) => isUnderRoot(page))
 		.map((page) => {
-			if (!rootDir) return page
+			const originalDir = page.dir
+			if (!rootDir) return { ...page, originalDir }
 			const relativePath = stripRootPrefix(page.relativePath, rootDir)
 			const dir = stripRootPrefix(page.dir, rootDir)
 			const segments = page.segments.slice(rootSegments.length)
 			const depth = segments.length
 			return {
 				...page,
+				originalDir,
 				relativePath,
 				dir,
 				segments,
@@ -363,46 +368,6 @@ const buildPagesTree = (pages, options = {}) => {
 		})
 	const root = []
 	const dirs = new Map()
-	const hiddenDirs = new Set(
-		treePages
-			.filter((page) => page.isIndex && page.dir && page.hidden && !(includeHiddenRoot && page.routePath === rootPath))
-			.map((page) => page.dir)
-	)
-	const exposedHiddenDirs = new Set()
-	if (currentRoutePath && currentRoutePath !== '/' && hiddenDirs.size) {
-		for (const hiddenDir of hiddenDirs) {
-			const hiddenRoute = `/${hiddenDir}`
-			if (
-				currentRouteWithinRoot === hiddenRoute ||
-				currentRouteWithinRoot.startsWith(`${hiddenRoute}/`)
-			) {
-				exposedHiddenDirs.add(hiddenDir)
-			}
-		}
-	}
-	if (includeHiddenRoot && rootDir) {
-		for (const hiddenDir of Array.from(hiddenDirs)) {
-			if (rootDir === hiddenDir || rootDir.startsWith(`${hiddenDir}/`)) {
-				hiddenDirs.delete(hiddenDir)
-			}
-		}
-	}
-	if (exposedHiddenDirs.size) {
-		for (const hiddenDir of exposedHiddenDirs) {
-			hiddenDirs.delete(hiddenDir)
-		}
-	}
-	const isUnderHiddenDir = (dir) => {
-		if (!dir) return false
-		const parts = dir.split('/')
-		for (let i = 1; i <= parts.length; i++) {
-			const candidate = parts.slice(0, i).join('/')
-			if (hiddenDirs.has(candidate)) {
-				return true
-			}
-		}
-		return false
-	}
 	const getDirNode = (path, name, depth) => {
 		if (dirs.has(path)) return dirs.get(path)
 		const dir = {
@@ -416,64 +381,41 @@ const buildPagesTree = (pages, options = {}) => {
 			title: null,
 			weight: null,
 			date: null,
-			isRoot: false
+			isRoot: false,
+			hidden: false,
+			hiddenByFrontmatter: false
 		}
 		dirs.set(path, dir)
 		return dir
 	}
-	const isUnderExposedHiddenDir = (dir) => {
-		if (!dir || !exposedHiddenDirs.size) return false
-		for (const hiddenDir of exposedHiddenDirs) {
-			if (dir === hiddenDir || dir.startsWith(`${hiddenDir}/`)) {
-				return true
-			}
-		}
-		return false
-	}
 	for (const page of treePages) {
-		if (page.hidden && !(includeHiddenRoot && page.routePath === rootPath)) {
-			const isHiddenSpecial = page.routePath === '/404' || page.routePath === '/offline'
-			const shouldExposeHidden =
-				!isHiddenSpecial &&
-				page.hiddenByFrontmatter === true &&
-				(
-					page.routePath === currentRoutePath ||
-					(page.isIndex && page.dir && isUnderExposedHiddenDir(page.dir))
-				)
-			if (!shouldExposeHidden) {
-				continue
-			}
-		}
-		if (isUnderHiddenDir(page.dir)) {
-			continue
-		}
+		const isRootIndex = page.isRoot && page.isIndex
+		const promoteRoot = rootPath === '/' && isRootIndex && page.routePath !== '/'
 		const parts = page.relativePath.split('/')
 		parts.pop()
 		let cursor = root
 		let currentPath = ''
-		for (const part of parts) {
-			currentPath = currentPath ? `${currentPath}/${part}` : part
-			if (hiddenDirs.has(currentPath)) {
-				cursor = null
-				break
-			}
-			const dir = getDirNode(currentPath, part, currentPath.split('/').length)
-			if (!cursor.includes(dir)) {
-				cursor.push(dir)
+		if (!promoteRoot) {
+			for (const part of parts) {
+				currentPath = currentPath ? `${currentPath}/${part}` : part
+				const dir = getDirNode(currentPath, part, currentPath.split('/').length)
+				if (!cursor.includes(dir)) {
+					cursor.push(dir)
+				}
+				cursor = dir.children
 			}
-			cursor = dir.children
-		}
-		if (!cursor) {
-			continue
 		}
-		if (page.isIndex && page.dir) {
-			const dir = getDirNode(page.dir, page.dir.split('/').pop(), page.depth)
+		const dirPath = page.dir || ''
+		if (page.isIndex && dirPath && !page.isRoot) {
+			const dir = getDirNode(dirPath, dirPath.split('/').pop() || '', dirPath ? dirPath.split('/').length : 0)
 			dir.routePath = page.routePath
 			dir.routeHref = page.routeHref
 			dir.title = page.title
 			dir.weight = page.weight ?? null
 			dir.date = page.date ?? null
 			dir.isRoot = page.isRoot || false
+			dir.hidden = page.hidden || false
+			dir.hiddenByFrontmatter = page.hiddenByFrontmatter || false
 			dir.page = page
 			continue
 		}
@@ -771,44 +713,81 @@ export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDir
 		}
 		return pagesByRoute.get(routePath) || null
 	}
-	const pagesTreeCache = new Map()
-	const navSequenceCache = new Map()
-	const getPagesTree = (routePath) => {
-		const rootPath = resolveRootPath(routePath, pagesByRoute)
-		const normalizedRoute = normalizeRoutePath(routePath || '/')
-		const cacheKey = `${rootPath}::${normalizedRoute}`
-		if (pagesTreeCache.has(cacheKey)) {
-			return pagesTreeCache.get(cacheKey)
-		}
-		const tree = buildPagesTree(pages, {
-			rootPath,
-			includeHiddenRoot: rootPath !== '/',
-			currentRoutePath: normalizedRoute
+	const filterPagesForRoot = (rootPath) => {
+		const normalizedRoot = normalizeRoutePath(rootPath || '/')
+		return pages.filter((page) => {
+			const resolvedRoot = resolveRootPath(page.routePath, pagesByRoute)
+			if (normalizedRoot === '/') {
+				return resolvedRoot === '/' || page.routePath === resolvedRoot
+			}
+			return resolvedRoot === normalizedRoot
+		})
+	}
+	const buildGlobalTree = () =>
+		buildPagesTree(filterPagesForRoot('/'), {
+			rootPath: '/',
+			includeHiddenRoot: false,
+			currentRoutePath: '/'
 		})
-		pagesTreeCache.set(cacheKey, tree)
-		return tree
+	let pagesTreeGlobal = buildGlobalTree()
+	const treeByRoot = new Map()
+	const navSequenceByRoot = new Map()
+
+	const getFilteredTreeForRoot = (rootPath) => {
+		const normalizedRoot = normalizeRoutePath(rootPath || '/')
+		if (treeByRoot.has(normalizedRoot)) return treeByRoot.get(normalizedRoot)
+		if (normalizedRoot === '/') {
+			treeByRoot.set(normalizedRoot, pagesTreeGlobal)
+			return pagesTreeGlobal
+		}
+		const scoped = buildPagesTree(filterPagesForRoot(normalizedRoot), {
+			rootPath: normalizedRoot,
+			includeHiddenRoot: false,
+			currentRoutePath: normalizedRoot
+		})
+		treeByRoot.set(normalizedRoot, scoped)
+		return scoped
+	}
+
+	const getPagesTree = (routePath = '/') => {
+		const rootPath = resolveRootPath(routePath, pagesByRoute)
+		return getFilteredTreeForRoot(rootPath)
 	}
-	const getNavSequence = (routePath) => {
+
+	const getNavSequence = (routePath = '/') => {
 		const rootPath = resolveRootPath(routePath, pagesByRoute)
-		const normalizedRoute = normalizeRoutePath(routePath || '/')
-		const cacheKey = `${rootPath}::${normalizedRoute}`
-		if (navSequenceCache.has(cacheKey)) {
-			return navSequenceCache.get(cacheKey)
+		const normalizedRoot = normalizeRoutePath(rootPath || '/')
+		if (navSequenceByRoot.has(normalizedRoot)) {
+			return navSequenceByRoot.get(normalizedRoot)
 		}
-		const tree = getPagesTree(routePath)
+		const tree = getFilteredTreeForRoot(rootPath)
 		const sequence = buildNavSequence(tree, pagesByRoute)
-		navSequenceCache.set(cacheKey, sequence)
+		navSequenceByRoot.set(normalizedRoot, sequence)
 		return sequence
 	}
-	let pagesTree = getPagesTree('/')
 	const notFound = pagesByRoute.get('/404') || null
 	const languages = collectLanguagesFromPages(pageList)
 	const userSite = state.USER_SITE || {}
 	const siteBase = state.VITE_BASE ?? userSite.base ?? null
+	const feedPathValue = state.RSS_OPTIONS?.path
+	const isAtomFeed = Boolean(state.RSS_OPTIONS?.atom)
+	const defaultFeedPath = isAtomFeed ? '/atom.xml' : '/rss.xml'
+	const feedPath = typeof feedPathValue === 'string' && feedPathValue.trim()
+		? (feedPathValue.trim().startsWith('/') ? feedPathValue.trim() : `/${feedPathValue.trim()}`)
+		: defaultFeedPath
+	const feed = state.RSS_ENABLED
+		? {
+				enabled: true,
+				atom: isAtomFeed,
+				path: feedPath,
+				href: withBase(feedPath)
+			}
+		: { enabled: false }
 	const site = {
 		...userSite,
 		base: siteBase,
 		name: state.SITE_NAME,
+		owner: state.SITE_OWNER,
 		root: state.ROOT_DIR,
 		pagesDir: state.PAGES_DIR,
 		componentsDir: state.COMPONENTS_DIR,
@@ -820,6 +799,7 @@ export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDir
 			options: state.PAGEFIND_OPTIONS || null,
 			build: state.PAGEFIND_BUILD || null
 		},
+		feed,
 		generatedAt: new Date().toISOString()
 	}
 	const excludedDirPaths = new Set(Array.from(dirExcludes).map((dir) => `/${dir}`))
@@ -827,7 +807,7 @@ export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDir
 		pages: pageList,
 		pagesByRoute,
 		getPageByRoute,
-		pagesTree,
+		pagesTree: pagesTreeGlobal,
 		getPagesTree,
 		derivedTitleCache: pageDerivedCache,
 		setDerivedTitle: (path, title, toc) => {
@@ -839,9 +819,10 @@ export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDir
 			pageDerivedCache.delete(path)
 		},
 		refreshPagesTree: () => {
-			pagesTreeCache.clear()
-			navSequenceCache.clear()
-			pagesContext.pagesTree = getPagesTree('/')
+			pagesTreeGlobal = buildGlobalTree()
+			treeByRoot.clear()
+			navSequenceByRoot.clear()
+			pagesContext.pagesTree = pagesTreeGlobal
 		},
 		getSiblings: (routePath, path = null) => {
 			if (!routePath) return { prev: null, next: null }
@@ -855,6 +836,19 @@ export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDir
 				index = sequence.findIndex((entry) => entry.routePath === routePath)
 			}
 			if (index < 0) return { prev: null, next: null }
+			const isVisible = (entry) => {
+				if (!entry) return false
+				if (entry.isRoot === true && entry.hidden !== false) return false
+				return !entry.hidden
+			}
+			let prevIndex = index - 1
+			while (prevIndex >= 0 && !isVisible(sequence[prevIndex])) {
+				prevIndex -= 1
+			}
+			let nextIndex = index + 1
+			while (nextIndex < sequence.length && !isVisible(sequence[nextIndex])) {
+				nextIndex += 1
+			}
 			const toNavEntry = (entry) => {
 				if (!entry) return null
 				return {
@@ -865,8 +859,8 @@ export const createPagesContextFromPages = ({ pages, excludedRoutes, excludedDir
 				}
 			}
 			return {
-				prev: toNavEntry(sequence[index - 1] || null),
-				next: toNavEntry(sequence[index + 1] || null)
+				prev: toNavEntry(sequence[prevIndex] || null),
+				next: toNavEntry(sequence[nextIndex] || null)
 			}
 		},
 		refreshLanguages: () => {

package/src/reframe.js

@@ -45,6 +45,7 @@ export function env(parentEnv) {
 	let parent = parentEnv || null
 
 	let renderCount = 0
+	let hydrationEnabled = true
 
 	function register(info) {
 		const { clientPath, staticPath, staticImportURL, exportName } = info
@@ -62,9 +63,14 @@ export function env(parentEnv) {
 
 		const component = async ({ children: childrenProp, ...props }, ...children) => {
 			const id = renderCount++
-			const idStr = id.toString(16)
 
 			const staticComponent = (await import(staticImportURL)).default
+
+			if (!getHydrationEnabled()) {
+				return (R) => (staticComponent ? R.c(staticComponent, props, ...children) : null)
+			}
+
+			const idStr = id.toString(16)
 			const script = `$$rfrm(${JSON.stringify(key)},${id},${Object.keys(props).length ? JSON5.stringify(props).replace(/<\/script/ig, '<\\/script') : '{}'})`
 
 			return (R) => {
@@ -101,9 +107,18 @@ export function env(parentEnv) {
 		parent = nextParent || null
 	}
 
+	function setHydrationEnabled(value) {
+		hydrationEnabled = value !== false
+	}
+
+	function getHydrationEnabled() {
+		if (hydrationEnabled === false) return false
+		return parent?.getHydrationEnabled?.() !== false
+	}
+
 	function resetRenderCount() {
 		renderCount = 0
-		parent?.resetRenderCount()
+		parent?.resetRenderCount?.()
 	}
 
 	function getMergedRegistry() {
@@ -123,6 +138,8 @@ export function env(parentEnv) {
 		genRegistryScript,
 		setParent,
 		resetRenderCount,
+		setHydrationEnabled,
+		getHydrationEnabled,
 		get registry() {
 			return getMergedRegistry()
 		}

package/src/state.js

@@ -75,6 +75,12 @@ const withCommonOptions = (y) =>
 			requiresArg: true,
 			nargs: 1
 		})
+		.option('owner', {
+			describe: 'Site owner override',
+			type: 'string',
+			requiresArg: true,
+			nargs: 1
+		})
 		.option('port', {
 			describe: 'Port for dev/preview',
 			type: 'number',
@@ -136,6 +142,16 @@ const withCommonOptions = (y) =>
 			requiresArg: true,
 			nargs: 1
 		})
+		.option('rss', {
+			describe: 'Enable or disable feed output',
+			type: 'boolean',
+			default: undefined
+		})
+		.option('atom', {
+			describe: 'Output Atom feed instead of RSS',
+			type: 'boolean',
+			default: undefined
+		})
 		.option('pwa', {
 			describe: 'Enable or disable PWA support',
 			type: 'boolean',
@@ -168,12 +184,15 @@ export const cli = {
 	CLI_OUTPUT_DIR: argv.output || null,
 	CLI_CONFIG_PATH: argv.config || null,
 	CLI_SITE_NAME: argv['site-name'] || null,
+	CLI_OWNER: argv.owner || null,
 	CLI_CODE_HIGHLIGHTING: typeof argv.highlight === 'boolean' ? argv.highlight : null,
 	CLI_JOBS: typeof argv.jobs === 'number' && Number.isFinite(argv.jobs) ? argv.jobs : null,
 	CLI_VERBOSE: Boolean(argv.verbose),
 	CLI_BASE: argv.base || null,
 	CLI_SEARCH: typeof argv.search === 'boolean' ? argv.search : undefined,
 	CLI_THEME: argv.theme || null,
+	CLI_RSS: typeof argv.rss === 'boolean' ? argv.rss : undefined,
+	CLI_ATOM: typeof argv.atom === 'boolean' ? argv.atom : undefined,
 	CLI_PWA: typeof argv.pwa === 'boolean' ? argv.pwa : undefined
 }
 
@@ -181,6 +200,7 @@ export const state = {
 	PROJECT_ROOT,
 	ROOT_DIR: PROJECT_ROOT,
 	SITE_NAME: 'Methanol Site',
+	SITE_OWNER: null,
 	SITE_BASE: null,
 	VITE_BASE: null,
 	PAGES_DIR: resolve(PROJECT_ROOT, 'pages'),
@@ -204,6 +224,8 @@ export const state = {
 	PAGEFIND_ENABLED: false,
 	PAGEFIND_OPTIONS: null,
 	PAGEFIND_BUILD: null,
+	RSS_ENABLED: false,
+	RSS_OPTIONS: null,
 	PWA_ENABLED: false,
 	USER_PRE_BUILD_HOOKS: [],
 	USER_POST_BUILD_HOOKS: [],

package/src/templates/atom-feed.jsx

@@ -0,0 +1,61 @@
+/* Copyright Yukino Song, SudoMaker Ltd.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { HTMLRenderer as R } from 'methanol'
+
+const ATOM_DECLARATION = R.rawHTML('<?xml version="1.0" encoding="UTF-8"?>')
+
+const AtomFeed = ({ site, items }) => {
+	const title = site?.title || site?.name || 'Methanol Feed'
+	const siteUrl = site?.url || null
+	const feedUrl = site?.feedUrl || null
+	const updated = site?.updated || new Date().toISOString()
+	const generator = site?.generator || 'Methanol'
+	return [
+		ATOM_DECLARATION,
+		<feed xmlns="http://www.w3.org/2005/Atom">
+			<title>{title}</title>
+			{siteUrl ? <link href={siteUrl} /> : null}
+			{feedUrl ? <link rel="self" href={feedUrl} /> : null}
+			<id>{feedUrl || siteUrl || title}</id>
+			<updated>{updated}</updated>
+			{generator ? <generator>{generator}</generator> : null}
+			{Array.isArray(items)
+				? items.map((item) => (
+						<entry>
+							<title>{item.title}</title>
+							<link href={item.link} />
+							<id>{item.link}</id>
+							{item.description ? <summary>{item.description}</summary> : null}
+							{item.content ? <content type="html">{item.content}</content> : null}
+							{item.author ? (
+								<author>
+									<name>{item.author}</name>
+								</author>
+							) : null}
+							{item.updated ? <updated>{item.updated}</updated> : null}
+						</entry>
+					))
+				: null}
+		</feed>
+	]
+}
+
+export default AtomFeed

package/src/{error-page.jsx → templates/error-page.jsx}

@@ -18,11 +18,11 @@
  * under the License.
  */
 
-import { HTMLRenderer as R } from './renderer.js'
+import { DOCTYPE_HTML } from 'methanol'
 
 export const DevErrorPage = ({ message = '', basePrefix = ''} = {}) => (
 	<>
-		{R.rawHTML`<!doctype html>`}
+		{DOCTYPE_HTML}
 		<html lang="en">
 			<head>
 				<meta charset="UTF-8" />

package/src/templates/rss-feed.jsx

@@ -0,0 +1,60 @@
+/* Copyright Yukino Song, SudoMaker Ltd.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { HTMLRenderer as R } from 'methanol'
+
+const RSS_DECLARATION = R.rawHTML('<?xml version="1.0" encoding="UTF-8"?>')
+
+const RssFeed = ({ site, items }) => {
+	const title = site?.title || site?.name || 'Methanol Feed'
+	const link = site?.url || null
+	const description = site?.description || ''
+	const language = site?.language || null
+	const generator = site?.generator || 'Methanol'
+	const lastBuildDate = site?.lastBuildDate || null
+	return [
+		RSS_DECLARATION,
+		<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/">
+			<channel>
+				<title>{title}</title>
+				{link ? <link>{link}</link> : null}
+				<description>{description}</description>
+				{language ? <language>{language}</language> : null}
+				{generator ? <generator>{generator}</generator> : null}
+				{lastBuildDate ? <lastBuildDate>{lastBuildDate}</lastBuildDate> : null}
+				{Array.isArray(items)
+					? items.map((item) => (
+							<item>
+								<title>{item.title}</title>
+								<link>{item.link}</link>
+								<guid isPermaLink="true">{item.link}</guid>
+								{item.description ? <description>{item.description}</description> : null}
+								{item.content ? <content:encoded>{item.content}</content:encoded> : null}
+								{item.author ? <author>{item.author}</author> : null}
+								{item.pubDate ? <pubDate>{item.pubDate}</pubDate> : null}
+							</item>
+						))
+					: null}
+			</channel>
+		</rss>
+	]
+}
+
+export default RssFeed

package/src/workers/build-pool.js

@@ -34,12 +34,15 @@ const cliOverrides = {
 	CLI_OUTPUT_DIR: cli.CLI_OUTPUT_DIR,
 	CLI_CONFIG_PATH: cli.CLI_CONFIG_PATH,
 	CLI_SITE_NAME: cli.CLI_SITE_NAME,
+	CLI_OWNER: cli.CLI_OWNER,
 	CLI_CODE_HIGHLIGHTING: cli.CLI_CODE_HIGHLIGHTING,
 	CLI_JOBS: cli.CLI_JOBS,
 	CLI_VERBOSE: cli.CLI_VERBOSE,
 	CLI_BASE: cli.CLI_BASE,
 	CLI_SEARCH: cli.CLI_SEARCH,
 	CLI_THEME: cli.CLI_THEME,
+	CLI_RSS: cli.CLI_RSS,
+	CLI_ATOM: cli.CLI_ATOM,
 	CLI_PWA: cli.CLI_PWA
 }
 
@@ -82,7 +85,7 @@ export const terminateWorkers = async (workers = []) => {
 	await Promise.all(workers.map((worker) => worker.terminate().catch(() => null)))
 }
 
-export const runWorkerStage = async ({ workers, stage, messages, onProgress, collect }) => {
+export const runWorkerStage = async ({ workers, stage, messages, onProgress, collect, onResult }) => {
 	return await new Promise((resolve, reject) => {
 		let completed = 0
 		let doneCount = 0
@@ -107,6 +110,12 @@ export const runWorkerStage = async ({ workers, stage, messages, onProgress, col
 				}
 				return
 			}
+			if (message.type === 'result') {
+				if (onResult) {
+					onResult(message.result)
+				}
+				return
+			}
 			if (message.type === 'done') {
 				if (collect) {
 					const data = collect(message)