methanol 0.0.1 → 0.0.2

package/src/pagefind.js

@@ -20,7 +20,7 @@
 
 import { access } from 'fs/promises'
 import { constants } from 'fs'
-import { join } from 'path'
+import { join, delimiter } from 'path'
 import { spawn } from 'child_process'
 import { state } from './state.js'
 
@@ -36,6 +36,14 @@ const resolvePagefindBin = async () => {
 			return candidate
 		} catch {}
 	}
+	const pathEntries = (process.env.PATH || '').split(delimiter).filter(Boolean)
+	for (const entry of pathEntries) {
+		const candidate = join(entry, binName)
+		try {
+			await access(candidate, constants.X_OK)
+			return candidate
+		} catch {}
+	}
 	return null
 }
 
@@ -88,7 +96,7 @@ export const runPagefind = async () => {
 		return false
 	}
 	console.log('Running Pagefind search indexing...')
-	const extraArgs = buildArgsFromOptions(state.PAGEFIND_BUILD_OPTIONS)
+	const extraArgs = buildArgsFromOptions(state.PAGEFIND_BUILD)
 	const ok = await runCommand(bin, ['--site', state.DIST_DIR, ...extraArgs], {
 		cwd: state.PROJECT_ROOT
 	})

package/src/pages.js

@@ -28,7 +28,7 @@ import { createStageLogger } from './stage-logger.js'
 
 const isPageFile = (name) => name.endsWith('.mdx') || name.endsWith('.md')
 const isInternalPage = (name) => name.startsWith('_') || name.startsWith('.')
-const isIgnoredEntry = (name) => name.startsWith('.')
+const isIgnoredEntry = (name) => name.startsWith('.') || name.startsWith('_')
 
 const pageMetadataCache = new Map()
 const pageDerivedCache = new Map()
@@ -41,10 +41,18 @@ const collectLanguagesFromPages = (pages = []) => {
 		if (label == null || label === '') continue
 		const routePath = page.routePath || '/'
 		const href = page.routeHref || routePath || '/'
+		const frontmatterCode = page?.frontmatter?.langCode
+		const code =
+			typeof frontmatterCode === 'string' && frontmatterCode.trim()
+				? frontmatterCode.trim()
+				: routePath === '/'
+					? null
+					: routePath.replace(/^\/+/, '')
 		languages.set(routePath, {
 			routePath,
 			href,
-			label: String(label)
+			label: String(label),
+			code: code || null
 		})
 	}
 	return Array.from(languages.values()).sort((a, b) => a.href.localeCompare(b.href))
@@ -150,7 +158,19 @@ const buildPagesTree = (pages, options = {}) => {
 	const rootPath = normalizeRoutePath(options.rootPath || '/')
 	const rootDir = rootPath === '/' ? '' : rootPath.replace(/^\/+/, '')
 	const includeHiddenRoot = Boolean(options.includeHiddenRoot)
+	const currentRoutePath = normalizeRoutePath(options.currentRoutePath || '/')
 	const rootSegments = rootDir ? rootDir.split('/') : []
+	const resolveRouteWithinRoot = (routePath) => {
+		if (!routePath) return '/'
+		if (!rootDir) return routePath
+		if (routePath === rootPath) return '/'
+		if (routePath.startsWith(`${rootPath}/`)) {
+			const stripped = routePath.slice(rootPath.length)
+			return stripped.startsWith('/') ? stripped : `/${stripped}`
+		}
+		return routePath
+	}
+	const currentRouteWithinRoot = resolveRouteWithinRoot(currentRoutePath)
 	const isUnderRoot = (page) => {
 		if (!rootDir) return true
 		return page.routePath === rootPath || page.routePath.startsWith(`${rootPath}/`)
@@ -179,6 +199,18 @@ const buildPagesTree = (pages, options = {}) => {
 			.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}/`)) {
@@ -186,6 +218,11 @@ const buildPagesTree = (pages, options = {}) => {
 			}
 		}
 	}
+	if (exposedHiddenDirs.size) {
+		for (const hiddenDir of exposedHiddenDirs) {
+			hiddenDirs.delete(hiddenDir)
+		}
+	}
 	const isUnderHiddenDir = (dir) => {
 		if (!dir) return false
 		const parts = dir.split('/')
@@ -215,9 +252,25 @@ const buildPagesTree = (pages, options = {}) => {
 		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)) {
-			continue
+			const isHidden404 = page.routePath === '/404'
+			const shouldExposeHidden =
+				!isHidden404 &&
+				page.hiddenByFrontmatter === true &&
+				(page.routePath === currentRoutePath || isUnderExposedHiddenDir(page.dir))
+			if (!shouldExposeHidden) {
+				continue
+			}
 		}
 		if (isUnderHiddenDir(page.dir)) {
 			continue
@@ -352,6 +405,7 @@ export const buildPageEntry = async ({ filePath, pagesDir, source }) => {
 	const derived = pageDerivedCache.get(filePath)
 	const exclude = Boolean(metadata.frontmatter?.exclude)
 	const frontmatterHidden = metadata.frontmatter?.hidden
+	const hiddenByFrontmatter = frontmatterHidden === true
 	const isNotFoundPage = routePath === '/404'
 	const hidden = frontmatterHidden === false
 		? false
@@ -375,6 +429,7 @@ export const buildPageEntry = async ({ filePath, pagesDir, source }) => {
 		date: parseDate(metadata.frontmatter?.date) || parseDate(stats.mtime),
 		isRoot: Boolean(metadata.frontmatter?.isRoot),
 		hidden,
+		hiddenByFrontmatter,
 		exclude,
 		content: metadata.content,
 		frontmatter: metadata.frontmatter,
@@ -479,6 +534,38 @@ const resolveRootPath = (routePath, pagesByRoute, pagesByRouteIndex = null) => {
 	return '/'
 }
 
+const buildNavSequence = (nodes, pagesByRoute) => {
+	const result = []
+	const seen = new Set()
+	const addEntry = (entry) => {
+		if (!entry?.routePath) return
+		const key = entry.filePath || entry.routePath
+		if (seen.has(key)) return
+		seen.add(key)
+		result.push(entry)
+	}
+	const walk = (items = []) => {
+		for (const node of items) {
+			if (node.type === 'directory') {
+				if (node.routePath) {
+					const page = pagesByRoute.get(node.routePath) || node.page || null
+					if (page) addEntry(page)
+				}
+				if (node.children?.length) {
+					walk(node.children)
+				}
+				continue
+			}
+			if (node.type === 'page') {
+				const page = pagesByRoute.get(node.routePath) || node
+				addEntry(page)
+			}
+		}
+	}
+	walk(nodes)
+	return result
+}
+
 export const buildPagesContext = async ({ compileAll = true } = {}) => {
 	const logEnabled = state.CURRENT_MODE === 'production' && cli.command === 'build'
 	const stageLogger = createStageLogger(logEnabled)
@@ -555,18 +642,34 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		return pagesByRoute.get(routePath) || pagesByRouteIndex.get(routePath) || null
 	}
 	const pagesTreeCache = new Map()
+	const navSequenceCache = new Map()
 	const getPagesTree = (routePath) => {
 		const rootPath = resolveRootPath(routePath, pagesByRoute, pagesByRouteIndex)
-		if (pagesTreeCache.has(rootPath)) {
-			return pagesTreeCache.get(rootPath)
+		const normalizedRoute = normalizeRoutePath(routePath || '/')
+		const cacheKey = `${rootPath}::${normalizedRoute}`
+		if (pagesTreeCache.has(cacheKey)) {
+			return pagesTreeCache.get(cacheKey)
 		}
 		const tree = buildPagesTree(pages, {
 			rootPath,
-			includeHiddenRoot: rootPath !== '/'
+			includeHiddenRoot: rootPath !== '/',
+			currentRoutePath: normalizedRoute
 		})
-		pagesTreeCache.set(rootPath, tree)
+		pagesTreeCache.set(cacheKey, tree)
 		return tree
 	}
+	const getNavSequence = (routePath) => {
+		const rootPath = resolveRootPath(routePath, pagesByRoute, pagesByRouteIndex)
+		const normalizedRoute = normalizeRoutePath(routePath || '/')
+		const cacheKey = `${rootPath}::${normalizedRoute}`
+		if (navSequenceCache.has(cacheKey)) {
+			return navSequenceCache.get(cacheKey)
+		}
+		const tree = getPagesTree(routePath)
+		const sequence = buildNavSequence(tree, pagesByRoute)
+		navSequenceCache.set(cacheKey, sequence)
+		return sequence
+	}
 	let pagesTree = getPagesTree('/')
 	const notFound = pagesByRoute.get('/404') || null
 	const languages = collectLanguagesFromPages(pages)
@@ -581,7 +684,7 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		pagefind: {
 			enabled: state.PAGEFIND_ENABLED,
 			options: state.PAGEFIND_OPTIONS || null,
-			buildOptions: state.PAGEFIND_BUILD_OPTIONS || null
+			build: state.PAGEFIND_BUILD || null
 		},
 		generatedAt: new Date().toISOString()
 	}
@@ -604,8 +707,35 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 		},
 		refreshPagesTree: () => {
 			pagesTreeCache.clear()
+			navSequenceCache.clear()
 			pagesContext.pagesTree = getPagesTree('/')
 		},
+		getSiblings: (routePath, filePath = null) => {
+			if (!routePath) return { prev: null, next: null }
+			const sequence = getNavSequence(routePath)
+			if (!sequence.length) return { prev: null, next: null }
+			let index = -1
+			if (filePath) {
+				index = sequence.findIndex((entry) => entry.filePath === filePath)
+			}
+			if (index < 0) {
+				index = sequence.findIndex((entry) => entry.routePath === routePath)
+			}
+			if (index < 0) return { prev: null, next: null }
+			const toNavEntry = (entry) => {
+				if (!entry) return null
+				return {
+					routePath: entry.routePath,
+					routeHref: entry.routeHref || entry.routePath,
+					title: entry.title || entry.name || entry.routePath,
+					filePath: entry.filePath || null
+				}
+			}
+			return {
+				prev: toNavEntry(sequence[index - 1] || null),
+				next: toNavEntry(sequence[index + 1] || null)
+			}
+		},
 		refreshLanguages: () => {
 			pagesContext.languages = collectLanguagesFromPages(pages)
 			pagesContext.getLanguageForRoute = (routePath) =>
@@ -627,7 +757,10 @@ export const buildPagesContext = async ({ compileAll = true } = {}) => {
 			if (logEnabled) {
 				stageLogger.update(compileToken, `Compiling MDX [${i + 1}/${totalPages}] ${page.filePath}`)
 			}
-			await compilePageMdx(page, pagesContext)
+			await compilePageMdx(page, pagesContext, {
+				lazyPagesTree: true,
+				refreshPagesTree: false
+			})
 		}
 		stageLogger.end(compileToken)
 		pagesTreeCache.clear()

package/src/rehype-plugins/link-resolve.js

@@ -19,9 +19,10 @@
  */
 
 import { existsSync } from 'fs'
-import { dirname, resolve } from 'path'
+import { dirname, resolve, relative, isAbsolute } from 'path'
 import { isElement } from 'hast-util-is-element'
 import { visit } from 'unist-util-visit'
+import { state } from '../state.js'
 
 const extensionRegex = /\.(mdx?|html)$/i
 
@@ -44,14 +45,40 @@ const splitHref = (href) => {
 
 const resolveCandidate = (baseDir, targetPath) => resolve(baseDir, targetPath)
 
-const hasExistingSource = (baseDir, pathWithoutSuffix, extension) => {
-	const targetPath = `${pathWithoutSuffix}${extension}`
-	return existsSync(resolveCandidate(baseDir, targetPath))
+const isWithinRoot = (root, targetPath) => {
+	if (!root) return false
+	const relPath = relative(root, targetPath)
+	if (relPath === '') return true
+	if (relPath.startsWith('..') || relPath.startsWith('..\\')) return false
+	if (isAbsolute(relPath)) return false
+	return true
+}
+
+const hasExistingSource = (baseDir, pathWithoutSuffix, extension, root) => {
+	const targetPath = resolveCandidate(baseDir, `${pathWithoutSuffix}${extension}`)
+	if (root && !isWithinRoot(root, targetPath)) {
+		return false
+	}
+	return existsSync(targetPath)
+}
+
+const resolvePagesRoot = (filePath) => {
+	const roots = [state.PAGES_DIR, state.THEME_PAGES_DIR].filter(Boolean).map((dir) => resolve(dir))
+	if (!roots.length) return null
+	if (!filePath) return roots[0]
+	const resolvedFile = resolve(filePath)
+	for (const root of roots) {
+		if (isWithinRoot(root, resolvedFile)) {
+			return root
+		}
+	}
+	return roots[0]
 }
 
 export const linkResolve = () => {
 	return (tree, file) => {
 		const baseDir = file?.path ? dirname(file.path) : file?.cwd || process.cwd()
+		const pagesRoot = resolvePagesRoot(file?.path || null)
 		visit(tree, (node) => {
 			if (!isElement(node) || node.tagName !== 'a') {
 				return
@@ -71,12 +98,12 @@ export const linkResolve = () => {
 
 			let shouldStrip = false
 			if (/\.mdx?$/i.test(extension)) {
-				shouldStrip = hasExistingSource(baseDir, withoutExtension, extension)
+				shouldStrip = hasExistingSource(baseDir, withoutExtension, extension, pagesRoot)
 			} else if (/\.html$/i.test(extension)) {
 				shouldStrip =
-					hasExistingSource(baseDir, withoutExtension, extension) ||
-					hasExistingSource(baseDir, withoutExtension, '.md') ||
-					hasExistingSource(baseDir, withoutExtension, '.mdx')
+					hasExistingSource(baseDir, withoutExtension, extension, pagesRoot) ||
+					hasExistingSource(baseDir, withoutExtension, '.md', pagesRoot) ||
+					hasExistingSource(baseDir, withoutExtension, '.mdx', pagesRoot)
 			}
 
 			if (!shouldStrip) {

package/src/state.js

@@ -101,6 +101,19 @@ const withCommonOptions = (y) =>
 			type: 'boolean',
 			default: false
 		})
+		.option('code-highlighting', {
+			describe: 'Enable or disable code highlighting',
+			type: 'string',
+			coerce: (value) => {
+				if (value == null) return null
+				if (value === true || value === '') return true
+				if (typeof value === 'boolean') return value
+				const normalized = String(value).trim().toLowerCase()
+				if (normalized === 'true') return true
+				if (normalized === 'false') return false
+				return null
+			}
+		})
 
 const parser = yargs(hideBin(process.argv))
 	.scriptName('methanol')
@@ -127,7 +140,8 @@ export const cli = {
 	CLI_ASSETS_DIR: argv.assets || null,
 	CLI_OUTPUT_DIR: argv.output || null,
 	CLI_CONFIG_PATH: argv.config || null,
-	CLI_SITE_NAME: argv['site-name'] || null
+	CLI_SITE_NAME: argv['site-name'] || null,
+	CLI_CODE_HIGHLIGHTING: typeof argv['code-highlighting'] === 'boolean' ? argv['code-highlighting'] : null
 }
 
 export const state = {
@@ -149,10 +163,16 @@ export const state = {
 	USER_VITE_CONFIG: null,
 	USER_MDX_CONFIG: null,
 	USER_PUBLIC_OVERRIDE: false,
-	RESOURCES: [],
+	SOURCES: [],
 	PAGEFIND_ENABLED: false,
 	PAGEFIND_OPTIONS: null,
-	PAGEFIND_BUILD_OPTIONS: null,
+	PAGEFIND_BUILD: null,
+	USER_PRE_BUILD_HOOKS: [],
+	USER_POST_BUILD_HOOKS: [],
+	THEME_PRE_BUILD_HOOKS: [],
+	THEME_POST_BUILD_HOOKS: [],
+	STARRY_NIGHT_ENABLED: false,
+	STARRY_NIGHT_OPTIONS: null,
 	CURRENT_MODE: 'production',
 	RESOLVED_MDX_CONFIG: undefined,
 	RESOLVED_VITE_CONFIG: undefined

package/src/vite-plugins.js

@@ -146,9 +146,9 @@ export const methanolResolverPlugin = () => {
 				}
 			}
 
-			if (state.RESOURCES.length) {
+			if (state.SOURCES.length) {
 				const { pathname, search } = new URL(id, 'http://methanol')
-				for (const entry of state.RESOURCES) {
+				for (const entry of state.SOURCES) {
 					const { find, replacement } = entry
 					if (!find || !replacement) continue
 					if (typeof find === 'string') {

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

@@ -0,0 +1,95 @@
+/* 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 { signal, $ } from 'refui'
+
+const ACCENTS = [
+	{ id: 'default', label: 'Amber', color: '#ffa000' },
+	{ id: 'rose', label: 'Rose', color: '#f43f5e' },
+	{ id: 'blue', label: 'Indigo', color: '#818cf8' },
+	{ id: 'green', label: 'Teal', color: '#2dd4bf' },
+	{ id: 'purple', label: 'Violet', color: '#a78bfa' }
+]
+
+export default function () {
+	const currentAccent = signal('default')
+	const isOpen = signal(false)
+
+	// Initialize theme from localStorage
+	if (typeof window !== 'undefined') {
+		const saved = localStorage.getItem('methanol-accent')
+		if (saved && ACCENTS.some((a) => a.id === saved)) {
+			currentAccent.value = saved
+			if (saved !== 'default') {
+				document.documentElement.classList.add(`accent-${saved}`)
+			}
+		}
+
+		// Close popup when clicking outside
+		document.addEventListener('click', (e) => {
+			if (!e.target.closest('.theme-switch-wrapper')) {
+				isOpen.value = false
+			}
+		})
+	}
+
+	const setAccent = (id) => {
+		const oldId = currentAccent.value
+
+		// Remove old
+		if (oldId !== 'default') {
+			document.documentElement.classList.remove(`accent-${oldId}`)
+		}
+
+		// Add new
+		if (id !== 'default') {
+			document.documentElement.classList.add(`accent-${id}`)
+		}
+
+		currentAccent.value = id
+		localStorage.setItem('methanol-accent', id)
+		isOpen.value = false
+	}
+
+	const togglePopup = () => {
+		isOpen.value = !isOpen.value
+	}
+
+	return (
+		<div class="theme-switch-container">
+			<div class="theme-switch-wrapper">
+				<div class={$(() => `accent-popup ${isOpen.value ? 'open' : ''}`)}>
+					{ACCENTS.map((accent) => (
+						<button
+							class={$(() => `accent-option ${currentAccent.value === accent.id ? 'active' : ''}`)}
+							on:click={() => setAccent(accent.id)}
+						>
+							<span class="option-circle" style={`background-color: ${accent.color}`}></span>
+							{accent.label}
+						</button>
+					))}
+				</div>
+				<button class="theme-switch-btn" on:click={togglePopup} attr:aria-label="Select accent color">
+					<div class="accent-circle"></div>
+				</button>
+			</div>
+		</div>
+	)
+}

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

@@ -0,0 +1,23 @@
+/* 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.
+ */
+
+export default function () {
+	// render nothing on server side
+}

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

@@ -87,7 +87,7 @@ export default function () {
 
 	return (
 		<div class="theme-switch-container">
-			<button class="theme-switch-btn" on:click={toggle} aria-label="Toggle theme">
+			<button class="theme-switch-btn" on:click={toggle} attr:aria-label="Toggle theme">
 				<CurrentIcon />
 			</button>
 		</div>