methanol 0.0.11 → 0.0.13

package/src/workers/build-pool.js

@@ -0,0 +1,156 @@
+/* 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 { cpus } from 'os'
+import { Worker } from 'worker_threads'
+import { state, cli } from '../state.js'
+
+const BUILD_WORKER_URL = new URL('./build-worker.js', import.meta.url)
+const cliOverrides = {
+	CLI_INTERMEDIATE_DIR: cli.CLI_INTERMEDIATE_DIR,
+	CLI_EMIT_INTERMEDIATE: cli.CLI_EMIT_INTERMEDIATE,
+	CLI_HOST: cli.CLI_HOST,
+	CLI_PORT: cli.CLI_PORT,
+	CLI_PAGES_DIR: cli.CLI_PAGES_DIR,
+	CLI_COMPONENTS_DIR: cli.CLI_COMPONENTS_DIR,
+	CLI_ASSETS_DIR: cli.CLI_ASSETS_DIR,
+	CLI_OUTPUT_DIR: cli.CLI_OUTPUT_DIR,
+	CLI_CONFIG_PATH: cli.CLI_CONFIG_PATH,
+	CLI_SITE_NAME: cli.CLI_SITE_NAME,
+	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_PWA: cli.CLI_PWA
+}
+
+const resolveWorkerCount = (total) => {
+	const cpuCount = Math.max(1, cpus()?.length || 1)
+	const requested = state.WORKER_JOBS
+	if (requested == null || requested <= 0) {
+		const items = Math.max(1, Number.isFinite(total) ? total : 1)
+		const autoCount = Math.round(Math.log(items))
+		return Math.max(1, Math.min(cpuCount, autoCount))
+	}
+	return Math.max(1, Math.min(cpuCount, Math.floor(requested)))
+}
+
+export const createBuildWorkers = (pageCount, options = {}) => {
+	const { command = 'build' } = options || {}
+	const workerCount = Math.min(resolveWorkerCount(pageCount), pageCount || 1) || 1
+	const workers = []
+	for (let i = 0; i < workerCount; i += 1) {
+		workers.push(
+			new Worker(BUILD_WORKER_URL, {
+				type: 'module',
+				workerData: {
+					mode: state.CURRENT_MODE,
+					configPath: cli.CLI_CONFIG_PATH,
+					command,
+					cli: cliOverrides
+				}
+			})
+		)
+	}
+	const assignments = Array.from({ length: workers.length }, () => [])
+	for (let i = 0; i < pageCount; i += 1) {
+		assignments[i % workers.length].push(i)
+	}
+	return { workers, assignments }
+}
+
+export const terminateWorkers = async (workers = []) => {
+	await Promise.all(workers.map((worker) => worker.terminate().catch(() => null)))
+}
+
+export const runWorkerStage = async ({ workers, stage, messages, onProgress, collect }) => {
+	return await new Promise((resolve, reject) => {
+		let completed = 0
+		let doneCount = 0
+		const results = []
+		const handleFailure = (error) => {
+			for (const w of workers) {
+				const handler = handlers.get(w)
+				if (handler) {
+					w.off('message', handler)
+					w.off('error', errorHandlers.get(w))
+					w.off('exit', exitHandlers.get(w))
+				}
+			}
+			reject(error instanceof Error ? error : new Error(String(error)))
+		}
+		const handleMessage = (worker, message) => {
+			if (!message || message.stage !== stage) return
+			if (message.type === 'progress') {
+				completed += 1
+				if (onProgress) {
+					onProgress(completed)
+				}
+				return
+			}
+			if (message.type === 'done') {
+				if (collect) {
+					const data = collect(message)
+					if (Array.isArray(data) && data.length) {
+						results.push(...data)
+					}
+				}
+				doneCount += 1
+				if (doneCount >= workers.length) {
+					for (const w of workers) {
+						const handler = handlers.get(w)
+						if (handler) {
+							w.off('message', handler)
+							w.off('error', errorHandlers.get(w))
+							w.off('exit', exitHandlers.get(w))
+						}
+					}
+					resolve(results)
+				}
+				return
+			}
+			if (message.type === 'error') {
+				handleFailure(new Error(message.error || 'Worker error'))
+			}
+		}
+		const handlers = new Map()
+		const errorHandlers = new Map()
+		const exitHandlers = new Map()
+		for (const worker of workers) {
+			const handler = (message) => handleMessage(worker, message)
+			handlers.set(worker, handler)
+			worker.on('message', handler)
+			const errorHandler = (error) => handleFailure(error)
+			const exitHandler = (code) => {
+				if (code !== 0) {
+					handleFailure(new Error(`Build worker exited with code ${code}`))
+				}
+			}
+			errorHandlers.set(worker, errorHandler)
+			exitHandlers.set(worker, exitHandler)
+			worker.on('error', errorHandler)
+			worker.on('exit', exitHandler)
+		}
+		for (const entry of messages) {
+			entry.worker.postMessage(entry.message)
+		}
+	})
+}

package/src/workers/build-worker.js

@@ -0,0 +1,231 @@
+/* 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 '../register-loader.js'
+import { parentPort, workerData } from 'worker_threads'
+import { style } from '../logger.js'
+
+const { mode = 'production', configPath = null, command = 'build', cli: cliOverrides = null } =
+	workerData || {}
+let initPromise = null
+let pages = []
+let pagesContext = null
+let components = null
+
+const ensureInit = async () => {
+	if (initPromise) return initPromise
+	initPromise = (async () => {
+		const { loadUserConfig, applyConfig, resolveUserViteConfig } = await import('../config.js')
+		const { buildComponentRegistry } = await import('../components.js')
+		const { state, cli } = await import('../state.js')
+		if (cliOverrides) {
+			Object.assign(cli, cliOverrides)
+		}
+		const config = await loadUserConfig(mode, configPath)
+		await applyConfig(config, mode)
+		await resolveUserViteConfig(command)
+		const themeComponentsDir = state.THEME_COMPONENTS_DIR
+		const themeEnv = state.THEME_ENV
+		const themeRegistry = themeComponentsDir
+			? await buildComponentRegistry({
+					componentsDir: themeComponentsDir,
+					register: themeEnv.register
+				})
+			: { components: {} }
+		const themeComponents = {
+			...(themeRegistry.components || {}),
+			...(state.USER_THEME.components || {})
+		}
+		const registry = await buildComponentRegistry()
+		components = {
+			...themeComponents,
+			...(registry.components || {})
+		}
+	})()
+	return initPromise
+}
+
+const rebuildPagesContext = async (excludedRoutes, excludedDirs) => {
+	const { createPagesContextFromPages } = await import('../pages.js')
+	pagesContext = createPagesContextFromPages({
+		pages,
+		excludedRoutes,
+		excludedDirs
+	})
+}
+
+const refreshMdxCtx = (page) => {
+	if (!page?.mdxCtx || !pagesContext) return
+	const ctx = page.mdxCtx
+	ctx.page = page
+	ctx.pages = pagesContext.pages || []
+	ctx.pagesByRoute = pagesContext.pagesByRoute || new Map()
+	ctx.languages = pagesContext.languages || []
+	ctx.language = pagesContext.getLanguageForRoute
+		? pagesContext.getLanguageForRoute(page.routePath)
+		: null
+	ctx.site = pagesContext.site || null
+	ctx.getSiblings = pagesContext.getSiblings
+		? () => pagesContext.getSiblings(page.routePath, page.path)
+		: null
+	if (page && ctx.getSiblings && page.getSiblings !== ctx.getSiblings) {
+		page.getSiblings = ctx.getSiblings
+	}
+	if (pagesContext.getPagesTree) {
+		ctx.pagesTree = pagesContext.getPagesTree(page.routePath)
+	} else {
+		ctx.pagesTree = pagesContext.pagesTree || []
+	}
+}
+
+const serializeError = (error) => {
+	if (!error) return 'Unknown error'
+	if (error.stack) return error.stack
+	if (error.message) return error.message
+	return String(error)
+}
+
+const logPageError = (phase, page, error) => {
+	const target = page?.path || page?.routePath || 'unknown file'
+	console.error(style.red(`\n\n[methanol] ${phase} error in ${target}`))
+	// Error is thrown so wo don't need to print here
+	// console.error(error?.stack || error)
+}
+
+const handleSetPages = async (message) => {
+	const { pages: nextPages, excludedRoutes = [], excludedDirs = [] } = message || {}
+	pages = Array.isArray(nextPages) ? nextPages : []
+	await rebuildPagesContext(new Set(excludedRoutes), new Set(excludedDirs))
+}
+
+const handleSyncUpdates = async (message) => {
+	const { updates = [], titles = null, excludedRoutes = null, excludedDirs = null } = message || {}
+	if (Array.isArray(titles)) {
+		for (let i = 0; i < titles.length; i += 1) {
+			const page = pages[i]
+			if (!page) continue
+			if (titles[i] !== undefined) {
+				page.title = titles[i]
+			}
+		}
+	}
+	for (const update of updates) {
+		const page = pages[update.id]
+		if (!page) continue
+		if (update.title !== undefined) page.title = update.title
+		if (update.toc !== undefined) page.toc = update.toc
+	}
+	await rebuildPagesContext(
+		excludedRoutes ? new Set(excludedRoutes) : pagesContext?.excludedRoutes || new Set(),
+		excludedDirs ? new Set(excludedDirs) : pagesContext?.excludedDirs || new Set()
+	)
+	for (const page of pages) {
+		if (!page?.mdxCtx) continue
+		refreshMdxCtx(page)
+	}
+}
+
+const handleCompile = async (message) => {
+	const { ids = [], stage } = message || {}
+	const { compilePageMdx } = await import('../mdx.js')
+	const updates = []
+	let completed = 0
+	for (const id of ids) {
+		const page = pages[id]
+		if (!page || page.content == null || page.mdxComponent) {
+			completed += 1
+			parentPort?.postMessage({ type: 'progress', stage, completed })
+			continue
+		}
+		try {
+			await compilePageMdx(page, pagesContext, {
+				lazyPagesTree: true,
+				refreshPagesTree: false
+			})
+			updates.push({ id, title: page.title, toc: page.toc || null })
+		} catch (error) {
+			logPageError('MDX compile', page, error)
+			throw error
+		}
+		completed += 1
+		parentPort?.postMessage({ type: 'progress', stage, completed })
+	}
+	return updates
+}
+
+const handleRender = async (message) => {
+	const { ids = [], stage } = message || {}
+	const { renderHtml } = await import('../mdx.js')
+	const results = []
+	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 html = await renderHtml({
+				routePath: page.routePath,
+				path: page.path,
+				components,
+				pagesContext,
+				pageMeta: page
+			})
+			results.push({ id, html })
+		} catch (error) {
+			logPageError('MDX render', page, error)
+			throw error
+		}
+		completed += 1
+		parentPort?.postMessage({ type: 'progress', stage, completed })
+	}
+	return results
+}
+
+parentPort?.on('message', async (message) => {
+	const { type, stage } = message || {}
+	try {
+		await ensureInit()
+		if (type === 'setPages') {
+			await handleSetPages(message)
+			parentPort?.postMessage({ type: 'done', stage: 'setPages' })
+			return
+		}
+		if (type === 'sync') {
+			await handleSyncUpdates(message)
+			parentPort?.postMessage({ type: 'done', stage: 'sync' })
+			return
+		}
+		if (type === 'compile') {
+			const updates = await handleCompile(message)
+			parentPort?.postMessage({ type: 'done', stage, updates })
+			return
+		}
+		if (type === 'render') {
+			const results = await handleRender(message)
+			parentPort?.postMessage({ type: 'done', stage, results })
+			return
+		}
+	} catch (error) {
+		parentPort?.postMessage({ type: 'error', stage, error: serializeError(error) })
+	}
+})

package/src/workers/mdx-compile-worker.js

@@ -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 '../register-loader.js'
+import { parentPort, workerData } from 'worker_threads'
+
+const { mode = 'production', configPath = null, cli: cliOverrides = null } = workerData || {}
+let initPromise = null
+let compileMdxSource = null
+
+const ensureInit = async () => {
+	if (initPromise) return initPromise
+	initPromise = (async () => {
+		const { loadUserConfig, applyConfig } = await import('../config.js')
+		const { cli } = await import('../state.js')
+		if (cliOverrides) {
+			Object.assign(cli, cliOverrides)
+		}
+		const mdx = await import('../mdx.js')
+		compileMdxSource = mdx.compileMdxSource
+		const config = await loadUserConfig(mode, configPath)
+		await applyConfig(config, mode)
+	})()
+	return initPromise
+}
+
+const serializeError = (error) => {
+	if (!error) return 'Unknown error'
+	if (error.stack) return error.stack
+	if (error.message) return error.message
+	return String(error)
+}
+
+parentPort?.on('message', async (message) => {
+	const { id, path, content, frontmatter } = message || {}
+	try {
+		await ensureInit()
+		const result = await compileMdxSource({ content, path, frontmatter })
+		parentPort?.postMessage({ id, result })
+	} catch (error) {
+		parentPort?.postMessage({ id, error: serializeError(error) })
+	}
+})

package/themes/default/components/ThemeAccentSwitch.static.jsx

@@ -18,6 +18,6 @@
  * under the License.
  */
 
-export default function () {
-	// render nothing on server side
-}
+// Nothing needs to be rendered on the server side for accent switch
+// But we explicitly need to keep a file here to prevent Methanol from
+// rendering the client version as fallback

package/themes/default/components/ThemeColorSwitch.static.jsx

@@ -18,6 +18,6 @@
  * under the License.
  */
 
-export default function () {
-	// render nothing on server side
-}
+// Nothing needs to be rendered on the server side for accent switch
+// But we explicitly need to keep a file here to prevent Methanol from
+// rendering the client version as fallback

package/themes/default/components/pre.client.jsx

@@ -38,7 +38,7 @@ export default function (props, ...children) {
 		}
 	}
 
-	const Btn = copied.choose(
+	const BtnImg = copied.choose(
 		() => (
 			<svg
 				attr:width="14"
@@ -74,7 +74,7 @@ export default function (props, ...children) {
 	return (
 		<div class="code-block-container">
 			<button class="copy-btn" on:click={copy} attr:aria-label="Copy code">
-				<Btn />
+				<BtnImg />
 			</button>
 			<pre {...props} $ref={el}>
 				{...children}

package/themes/default/{public → sources}/theme-prepare.js

@@ -29,7 +29,7 @@
 	if (savedAccent && savedAccent !== 'default') {
 		document.documentElement.classList.add('accent-' + savedAccent)
 	}
-})()
+})
 ;(function initPrefetch() {
 	const prefetched = new Set()
 	const canPrefetch = (anchor) => {
@@ -58,4 +58,5 @@
 		document.head.appendChild(link)
 	}
 	document.addEventListener('pointerover', onHover, { capture: true, passive: true })
-})()
+})
+console.log('theme prep')

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

@@ -79,11 +79,12 @@ const NavTree = ({ nodes, depth }) => (
 					<li class={isActive.choose('is-active', null)}>
 						<details class="sidebar-collapsible" open={isOpen.choose(true, null)}>
 							<summary class="sb-dir-header">{header}</summary>
-							<If condition={() => children.value.length}>{() => (
-								<ul data-depth={depth + 1}>
-									<NavTree nodes={children} depth={depth + 1} />
-								</ul>
-							)}
+							<If condition={() => children.value.length}>
+								{() => (
+									<ul data-depth={depth + 1}>
+										<NavTree nodes={children} depth={depth + 1} />
+									</ul>
+								)}
 							</If>
 						</details>
 					</li>

package/themes/default/src/page.jsx

@@ -22,7 +22,7 @@ import { HTMLRenderer as R, DOCTYPE_HTML } from 'methanol'
 import { renderToc } from '../components/ThemeToCContainer.static.jsx'
 import { renderNavTree } from './nav-tree.jsx'
 
-const PAGE_TEMPLATE = async ({ PageContent, ExtraHead, components, ctx }) => {
+const PAGE_TEMPLATE = ({ PageContent, ExtraHead, components, ctx }) => {
 	const page = ctx.page
 	const pagesByRoute = ctx.pagesByRoute
 	const pages = ctx.pages || []
@@ -122,13 +122,13 @@ const PAGE_TEMPLATE = async ({ PageContent, ExtraHead, components, ctx }) => {
 					{twitterTitle ? <meta name="twitter:title" content={twitterTitle} /> : null}
 					{twitterDescription ? <meta name="twitter:description" content={twitterDescription} /> : null}
 					{twitterImage ? <meta name="twitter:image" content={twitterImage} /> : null}
-					<ExtraHead />
 					<link
 						rel="preload stylesheet"
 						as="style"
 						href="/.methanol_theme_default/style.css"
 					/>
-					<script src="/theme-prepare.js"></script>
+					<script type="module" src="/.methanol_theme_default/theme-prepare.js"></script>
+					<ExtraHead />
 				</head>
 				<body>
 					<input type="checkbox" id="nav-toggle" class="nav-toggle" />