getfilepress 0.1.9 → 0.1.11

package/packages/app/vite-plugin-genie.ts

@@ -11,7 +11,7 @@ import {
 	runInspire,
 	scanOllamaHosts
 } from './src/lib/genie/ops.ts';
-import { deleteVersion, listVersions } from './src/lib/genie/store.ts';
+import { deleteVersion, duplicateVersion, listVersions, updateVersionMeta } from './src/lib/genie/store.ts';
 
 function readBody(req: IncomingMessage): Promise<string> {
 	return new Promise((resolve, reject) => {
@@ -160,8 +160,51 @@ export function geniePlugin(siteRoot: string): Plugin {
 						);
 					}
 
+					if (method === 'POST' && path === '/__filepress/genie/star') {
+						const body = JSON.parse(await readBody(req));
+						if (!body.versionId) {
+							return sendJson(res, 400, { error: '`versionId` required' });
+						}
+						if (typeof body.starred !== 'boolean') {
+							return sendJson(res, 400, { error: '`starred` boolean required' });
+						}
+						return sendJson(res, 200, {
+							version: updateVersionMeta(siteRoot, body.versionId, { starred: body.starred })
+						});
+					}
+
+					if (method === 'POST' && path === '/__filepress/genie/label') {
+						const body = JSON.parse(await readBody(req));
+						if (!body.versionId) {
+							return sendJson(res, 400, { error: '`versionId` required' });
+						}
+						if (typeof body.label !== 'string') {
+							return sendJson(res, 400, { error: '`label` string required' });
+						}
+						return sendJson(res, 200, {
+							version: updateVersionMeta(siteRoot, body.versionId, { label: body.label })
+						});
+					}
+
+					if (method === 'POST' && path === '/__filepress/genie/duplicate') {
+						const body = JSON.parse(await readBody(req));
+						if (!body.versionId) {
+							return sendJson(res, 400, { error: '`versionId` required' });
+						}
+						return sendJson(res, 200, {
+							version: duplicateVersion(
+								siteRoot,
+								body.versionId,
+								typeof body.label === 'string' ? body.label : undefined
+							)
+						});
+					}
+
 					if (method === 'POST' && path === '/__filepress/genie/delete') {
 						const body = JSON.parse(await readBody(req));
+						if (!body.versionId) {
+							return sendJson(res, 400, { error: '`versionId` required' });
+						}
 						deleteVersion(siteRoot, body.versionId);
 						return sendJson(res, 200, { ok: true });
 					}
@@ -169,6 +212,7 @@ export function geniePlugin(siteRoot: string): Plugin {
 					return sendJson(res, 404, { error: `Unknown Genie route: ${method} ${path}` });
 				} catch (e) {
 					const message = e instanceof Error ? e.message : String(e);
+					console.error(`filepress genie: ${method} ${path} failed: ${message}`);
 					return sendJson(res, 500, { error: message });
 				}
 			});

package/packages/app/vite.config.ts

@@ -13,6 +13,8 @@ import { pathMountsPlugin } from './vite-plugin-path-mounts.ts';
 import { filepressLeaseName, localberthGet } from './localberth-port.ts';
 import type { PathMount } from '../core/src/lib/paths-shared.ts';
 import { unexpectedUnseenPrerenderRoutes } from './src/lib/prerender-empty-ok.ts';
+import { buildRedirectRules, THEME_PRESETS, type ThemePreset } from '../core/src/lib/config.ts';
+import { serializeRedirects, type RedirectRule } from '../core/src/lib/redirects.ts';
 
 const appRoot = dirname(fileURLToPath(import.meta.url));
 const defaultSiteRoot = resolve(appRoot, '../../sites/demo');
@@ -53,8 +55,15 @@ const coreConfig = join(appRoot, '../core/src/lib/config.ts');
 const coreServer = join(appRoot, '../core/src/lib/server.ts');
 const coreTheme = join(appRoot, '../core/src/lib/theme.ts');
 
-/** Load `paths` via a short-lived Vite SSR graph (config-only getfilepress alias). */
-async function loadPathMounts(): Promise<PathMount[]> {
+type SiteHints = {
+	paths: PathMount[];
+	theme: ThemePreset;
+	redirects: RedirectRule[];
+};
+
+/** Load config via a short-lived Vite SSR graph (config-only getfilepress alias). */
+async function loadSiteHints(): Promise<SiteHints> {
+	const fallback: SiteHints = { paths: [], theme: 'essay', redirects: [] };
 	const temp = await createServer({
 		configFile: false,
 		root: siteRoot,
@@ -73,17 +82,35 @@ async function loadPathMounts(): Promise<PathMount[]> {
 	});
 	try {
 		const mod = await temp.ssrLoadModule(pathToFileURL(siteConfig).href);
-		const paths = mod.default?.paths;
-		return Array.isArray(paths) ? (paths as PathMount[]) : [];
+		const cfg = mod.default as {
+			paths?: PathMount[];
+			theme?: ThemePreset;
+			homePage?: string | null;
+			redirects?: RedirectRule[];
+		} | null;
+		const theme = cfg?.theme && THEME_PRESETS.includes(cfg.theme) ? cfg.theme : 'essay';
+		return {
+			paths: Array.isArray(cfg?.paths) ? cfg.paths : [],
+			theme,
+			redirects: buildRedirectRules({
+				homePage: cfg?.homePage ?? null,
+				redirects: Array.isArray(cfg?.redirects) ? cfg.redirects : []
+			})
+		};
 	} catch (err) {
 		const detail = err instanceof Error ? err.message : String(err);
-		console.warn(`filepress: could not load path mounts (${detail}); continuing with none.`);
-		return [];
+		console.warn(`filepress: could not load site config (${detail}); continuing with defaults.`);
+		return fallback;
 	} finally {
 		await temp.close();
 	}
 }
 
+function resolveSitePreset(theme: ThemePreset): string {
+	const file = join(appRoot, '../core/src/lib/styles/presets', `${theme}.css`);
+	return existsSync(file) ? file : join(appRoot, '../core/src/lib/styles/presets/essay.css');
+}
+
 function resolvePort(): number | undefined {
 	const raw = process.env.FILEPRESS_PORT?.trim();
 	if (raw) {
@@ -96,11 +123,14 @@ function resolvePort(): number | undefined {
 const fixedPort = resolvePort();
 
 export default defineConfig(async () => {
-	const pathMounts = await loadPathMounts();
+	const hints = await loadSiteHints();
+	const pathMounts = hints.paths;
+	const sitePreset = resolveSitePreset(hints.theme);
 	writeFileSync(
 		join(filepressCache, 'path-mounts.json'),
 		`${JSON.stringify(pathMounts, null, '\t')}\n`
 	);
+	writeFileSync(join(filepressCache, 'redirects.txt'), serializeRedirects(hints.redirects));
 
 	const host = process.env.HOST?.trim() || '127.0.0.1';
 	return {
@@ -134,6 +164,7 @@ export default defineConfig(async () => {
 					'getfilepress/theme': coreTheme,
 					'$site-config': siteConfig,
 					'$site-theme': siteTheme,
+					'$site-preset': sitePreset,
 					'$critical-theme': criticalThemeOut
 				},
 				paths: {

package/packages/core/src/lib/components/PostCard.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { PostMeta } from '../content/types';
-	import { formatDate } from '../format';
+	import { formatDate, formatReadingTime } from '../format';
 
 	let {
 		post,
@@ -18,6 +18,7 @@
 		{#if post.author}
 			&middot; <span class="byline">{post.author}</span>
 		{/if}
+		&middot; <span class="reading-time">{formatReadingTime(post.readingMinutes)}</span>
 	</p>
 	<h2 class="post-title"><a href="/posts/{post.slug}">{post.title}</a></h2>
 	{#if post.description}

package/packages/core/src/lib/config.ts

@@ -8,7 +8,12 @@
  * server code.
  */
 import { normalizePathMounts, type PathMount } from './paths-shared';
+import { writingPostRedirects, type RedirectRule } from './redirects';
 export type { PathMount } from './paths-shared';
+export type { RedirectRule } from './redirects';
+
+export const THEME_PRESETS = ['essay', 'ink', 'folio'] as const;
+export type ThemePreset = (typeof THEME_PRESETS)[number];
 export interface NewsletterConfig {
 	/** Full URL to an external signup form (Buttondown, Substack, etc.). */
 	url: string;
@@ -72,6 +77,10 @@ export interface SiteConfig {
 	 * FilePress does not parse or theme mount contents.
 	 */
 	paths: PathMount[];
+	/** Named token sheet loaded after Essay, before the site `theme.css`. */
+	theme: ThemePreset;
+	/** Extra Cloudflare/Netlify `_redirects` lines merged at build. */
+	redirects: RedirectRule[];
 }
 
 /** What a site author supplies; everything but `title` and `url` is optional. */
@@ -95,6 +104,10 @@ export interface SiteConfigInput {
 	newsletter?: NewsletterConfig | null;
 	/** Mount site-relative dirs at URL prefixes (docs shells, etc.). */
 	paths?: PathMount[];
+	/** Built-in token preset. Default `essay`. Site `theme.css` still wins last. */
+	theme?: ThemePreset;
+	/** Extra `_redirects` rules (from → to). */
+	redirects?: RedirectRule[];
 }
 
 const defaultFooterLinks: NavItem[] = [
@@ -178,10 +191,43 @@ export function defineFilepressConfig(input: SiteConfigInput): SiteConfig {
 		footerLinks: normalizeNavItems(input.footerLinks) ?? [...defaultFooterLinks],
 		topics: input.topics ?? [],
 		newsletter: input.newsletter ?? null,
-		paths: normalizePathMounts(input.paths)
+		paths: normalizePathMounts(input.paths),
+		theme: normalizeTheme(input.theme),
+		redirects: normalizeRedirects(input.redirects)
 	};
 }
 
+/** Engine + site rules to write into `build/_redirects`. */
+export function buildRedirectRules(site: Pick<SiteConfig, 'homePage' | 'redirects'>): RedirectRule[] {
+	return [...(site.homePage ? writingPostRedirects() : []), ...site.redirects];
+}
+
+function normalizeTheme(theme: ThemePreset | undefined): ThemePreset {
+	const name = (theme ?? 'essay').trim().toLowerCase();
+	if (!THEME_PRESETS.includes(name as ThemePreset)) {
+		throw new Error(
+			`filepress.config: \`theme\` must be ${THEME_PRESETS.join(', ')} (got "${theme}").`
+		);
+	}
+	return name as ThemePreset;
+}
+
+function normalizeRedirects(rules: RedirectRule[] | undefined): RedirectRule[] {
+	if (!rules?.length) return [];
+	return rules.map((rule) => {
+		const from = (rule.from ?? '').trim();
+		const to = (rule.to ?? '').trim();
+		if (!from || !to) {
+			throw new Error('filepress.config: redirects need non-empty `from` and `to`.');
+		}
+		const status = rule.status ?? 301;
+		if (status !== 301 && status !== 302 && status !== 308) {
+			throw new Error(`filepress.config: redirect status must be 301, 302, or 308 (got ${status}).`);
+		}
+		return { from, to, status };
+	});
+}
+
 /** Join the site origin with a path, guarding against double slashes. */
 export function absoluteUrl(site: Pick<SiteConfig, 'url'>, path: string): string {
 	const base = site.url.replace(/\/+$/, '');

package/packages/core/src/lib/content/parse.ts

@@ -1,4 +1,5 @@
 import matter from 'gray-matter';
+import { readingMinutes } from '../format';
 import type { PageSource, PostSource, RawFrontmatter, RawPageFrontmatter } from './types';
 import { RESERVED_PAGE_SLUGS } from './types';
 
@@ -135,6 +136,7 @@ export function parsePost(path: string, raw: string): PostSource {
 		author,
 		draft,
 		sourcePath: path,
+		readingMinutes: readingMinutes(parsed.content),
 		body: parsed.content
 	};
 }

package/packages/core/src/lib/content/types.ts

@@ -29,6 +29,8 @@ export interface PostMeta {
 	draft: boolean;
 	/** Source file path relative to the repo root, e.g. "/posts/foo.md". */
 	sourcePath: string;
+	/** Whole minutes at ~228 wpm, computed from the Markdown body. */
+	readingMinutes: number;
 }
 
 /** A post's metadata plus its raw (uncompiled) Markdown body. */

package/packages/core/src/lib/format.ts

@@ -23,3 +23,14 @@ export function formatDate(iso: string): string {
 	const [y, m, d] = iso.split('-').map(Number);
 	return `${d} ${MONTHS[m - 1]} ${y}`;
 }
+
+/** ~228 wpm (adult silent reading). Always at least one minute for a published post. */
+export function readingMinutes(body: string, wordsPerMinute = 228): number {
+	const words = body.trim().split(/\s+/).filter(Boolean).length;
+	if (words === 0) return 1;
+	return Math.max(1, Math.round(words / wordsPerMinute));
+}
+
+export function formatReadingTime(minutes: number): string {
+	return minutes === 1 ? '1 min read' : `${minutes} min read`;
+}

package/packages/core/src/lib/index.ts

@@ -12,7 +12,9 @@ export {
 	defineFilepressConfig,
 	absoluteUrl,
 	ogImageUrl,
-	postsIndexPath
+	postsIndexPath,
+	buildRedirectRules,
+	THEME_PRESETS
 } from './config';
 export type {
 	SiteConfig,
@@ -21,11 +23,13 @@ export type {
 	Topic,
 	NavItem,
 	NavIconName,
-	PathMount
+	PathMount,
+	ThemePreset,
+	RedirectRule
 } from './config';
 
 export { isPathMountHref } from './paths-shared';
 
-export { formatDate } from './format';
+export { formatDate, formatReadingTime, readingMinutes } from './format';
 
 export type { PostMeta, PostSource, RenderedPost, RawFrontmatter } from './content/types';

package/packages/core/src/lib/redirects.ts

@@ -0,0 +1,88 @@
+/**
+ * Cloudflare Pages / Netlify `_redirects` lines.
+ * Code owns the file shape; sites and import only supply from/to pairs.
+ */
+export type RedirectStatus = 301 | 302 | 308;
+
+export type RedirectRule = {
+	from: string;
+	to: string;
+	status: RedirectStatus;
+};
+
+const STATUS = new Set<RedirectStatus>([301, 302, 308]);
+
+export function normalizeRedirectPath(path: string): string {
+	const trimmed = path.trim();
+	if (!trimmed) throw new Error('redirect path cannot be empty');
+	if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
+		const url = new URL(trimmed);
+		const out = url.pathname || '/';
+		return out === '/' ? '/' : out.replace(/\/+$/, '') || '/';
+	}
+	const withSlash = trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
+	if (withSlash.includes('*') || withSlash.includes(':splat')) return withSlash;
+	return withSlash === '/' ? '/' : withSlash.replace(/\/+$/, '') || '/';
+}
+
+export function serializeRedirects(rules: RedirectRule[]): string {
+	const lines = rules.map((r) => `${r.from}  ${r.to}  ${r.status}`);
+	return `${lines.join('\n')}\n`;
+}
+
+export function parseRedirectsFile(text: string): RedirectRule[] {
+	const rules: RedirectRule[] = [];
+	for (const raw of text.split(/\r?\n/)) {
+		const line = raw.replace(/#.*$/, '').trim();
+		if (!line) continue;
+		const parts = line.split(/\s+/);
+		if (parts.length < 2) continue;
+		const status = Number(parts[2] ?? 301);
+		if (!STATUS.has(status as RedirectStatus)) continue;
+		rules.push({
+			from: parts[0],
+			to: parts[1],
+			status: status as RedirectStatus
+		});
+	}
+	return rules;
+}
+
+export function mergeRedirects(existing: string, extra: RedirectRule[]): string {
+	const have = new Set(parseRedirectsFile(existing).map((r) => `${r.from}\0${r.to}`));
+	const add = extra.filter((r) => !have.has(`${r.from}\0${r.to}`));
+	if (add.length === 0) return existing.endsWith('\n') ? existing : `${existing}\n`;
+	const prefix = existing.trimEnd();
+	const block = serializeRedirects(add);
+	return prefix ? `${prefix}\n${block}` : block;
+}
+
+/** When `/` is a landing page, old `/writing` indexes used to hold the post list. */
+export function writingPostRedirects(): RedirectRule[] {
+	return [
+		{ from: '/writing', to: '/posts', status: 308 },
+		{ from: '/writing/*', to: '/posts/:splat', status: 301 }
+	];
+}
+
+export function redirectsFromSourceUrls(
+	pairs: Array<{ sourceUrl: string; destPath: string }>
+): RedirectRule[] {
+	const rules: RedirectRule[] = [];
+	const seen = new Set<string>();
+	for (const pair of pairs) {
+		let from: string;
+		try {
+			from = normalizeRedirectPath(pair.sourceUrl);
+		} catch {
+			continue;
+		}
+		const to = pair.destPath.startsWith('/') ? pair.destPath : `/${pair.destPath}`;
+		if (from === to || from === '/') continue;
+		const key = `${from}\0${to}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		rules.push({ from, to, status: 301 });
+	}
+	return rules;
+}

package/packages/core/src/lib/server.ts

@@ -20,8 +20,15 @@ export {
 	filenameOf
 } from './content/parse';
 
-export { absoluteUrl, ogImageUrl } from './config';
-export type { SiteConfig, PathMount } from './config';
+export { absoluteUrl, ogImageUrl, buildRedirectRules } from './config';
+export type { SiteConfig, PathMount, ThemePreset, RedirectRule } from './config';
+export {
+	serializeRedirects,
+	parseRedirectsFile,
+	mergeRedirects,
+	writingPostRedirects,
+	redirectsFromSourceUrls
+} from './redirects';
 export { defaultSecurityHeaders, writeBuildHeaders, mergeSecurityHeaders } from './headers';
 export type { MergeSecurityHeadersResult } from './headers';
 export {

package/packages/core/src/lib/styles/presets/essay.css

@@ -0,0 +1,2 @@
+/* Essay is the default FilePress look. This sheet is a no-op placeholder so
+   `$site-preset` always resolves. */

package/packages/core/src/lib/styles/presets/folio.css

@@ -0,0 +1,27 @@
+/* Warmer folio: more margin, amber accent. Tokens only. */
+:root {
+	--bg: #f7f1e6;
+	--surface: #fffdf8;
+	--ink: #1c1812;
+	--ink-soft: #5a5146;
+	--ink-faint: #8a7f70;
+	--rule: #e6dcc8;
+	--rule-strong: #d2c4a8;
+	--accent: #8a4b12;
+	--accent-strong: #6b3910;
+	--gap: clamp(1.5rem, 5vw, 3rem);
+}
+
+@media (prefers-color-scheme: dark) {
+	:root {
+		--bg: #16130e;
+		--surface: #1f1b14;
+		--ink: #f3ead8;
+		--ink-soft: #c4b59a;
+		--ink-faint: #8e826c;
+		--rule: #322c22;
+		--rule-strong: #443b2d;
+		--accent: #e0a05a;
+		--accent-strong: #f0c08a;
+	}
+}

package/packages/core/src/lib/styles/presets/ink.css

@@ -0,0 +1,28 @@
+/* Cooler, slightly tighter cousin of Essay. Tokens only — HTML stays the same. */
+:root {
+	--bg: #f3f4f2;
+	--surface: #ffffff;
+	--ink: #141513;
+	--ink-soft: #454843;
+	--ink-faint: #767a73;
+	--rule: #dce0d8;
+	--rule-strong: #c5cbbf;
+	--accent: #1c3d5a;
+	--accent-strong: #132b40;
+	--measure: 38rem;
+	--measure-wide: 44rem;
+}
+
+@media (prefers-color-scheme: dark) {
+	:root {
+		--bg: #101210;
+		--surface: #181a17;
+		--ink: #e8ebe4;
+		--ink-soft: #a8ada4;
+		--ink-faint: #7a7f76;
+		--rule: #272a25;
+		--rule-strong: #353930;
+		--accent: #8eb6d4;
+		--accent-strong: #b0cce3;
+	}
+}

package/packages/core/src/lib/styles/theme.css

@@ -59,6 +59,7 @@
 
 html {
 	-webkit-text-size-adjust: 100%;
+	overflow-x: clip;
 }
 
 body {
@@ -773,6 +774,20 @@ hr {
 }
 
 @media (max-width: 34rem) {
+	body {
+		font-size: 1.08rem;
+		line-height: 1.65;
+	}
+	.site-logo {
+		height: 3.1rem;
+	}
+	.site-title {
+		font-size: 1.28rem;
+	}
+	.site-nav {
+		flex-wrap: wrap;
+		gap: 0.75rem 1.1rem;
+	}
 	.post-nav {
 		grid-template-columns: 1fr;
 	}
@@ -780,3 +795,25 @@ hr {
 		text-align: left;
 	}
 }
+
+.error-page {
+	text-align: center;
+	font-style: normal;
+	padding: 4rem 0;
+}
+.error-page h1 {
+	font-size: 1.65rem;
+	margin: 0.35rem 0 0.75rem;
+}
+.error-code {
+	font-family: var(--font-sans);
+	font-size: 0.72rem;
+	letter-spacing: 0.16em;
+	text-transform: uppercase;
+	color: var(--ink-faint);
+	margin: 0;
+}
+.error-actions {
+	margin-top: 1.5rem;
+	font-style: normal;
+}

package/packages/import/src/cli.ts

@@ -359,6 +359,7 @@ Options:
 						nav: ir.nav,
 						topics: ir.topics,
 						lede: ir.lede,
+						homeMarkdown: Boolean(ir.homeMarkdown),
 						notes: ir.notes,
 						images: imagePlan.chosen,
 						unsplashQueries: imagePlan.unsplashQueries

package/packages/import/src/extract.ts

@@ -199,6 +199,7 @@ export async function extractSite(discovered: DiscoverResult): Promise<SiteIR> {
 	let description = '';
 	let author = title;
 	let lede: string | null = null;
+	let homeMarkdown: string | null = null;
 	let generator: string | null = null;
 
 	if (homeDoc) {
@@ -230,7 +231,13 @@ export async function extractSite(discovered: DiscoverResult): Promise<SiteIR> {
 				lede = sentence && sentence.length > 80 ? sentence : `${cut.replace(/\s+\S*$/, '').trim()}…`;
 			}
 		}
-		notes.push('Home bio mapped to config `lede` (posts remain the index). Long bio → pages/about.md when present.');
+		const homeMd = htmlToMarkdown(clone.innerHTML).trim();
+		if (homeMd.length > 200 && paragraphs.length >= 2) {
+			homeMarkdown = homeMd;
+			notes.push('Home bio is long enough for pages/home.md; the post index moves to /posts.');
+		} else {
+			notes.push('Home bio mapped to config `lede` (posts remain the index).');
+		}
 	}
 
 	const posts: SiteIRPost[] = [];
@@ -334,7 +341,12 @@ export async function extractSite(discovered: DiscoverResult): Promise<SiteIR> {
 			tag
 		}));
 
-	const nav: Array<{ label: string; href: string }> = [{ label: 'Posts', href: '/' }];
+	const nav: Array<{ label: string; href: string }> = homeMarkdown
+		? [
+				{ label: 'Home', href: '/' },
+				{ label: 'Posts', href: '/posts' }
+			]
+		: [{ label: 'Posts', href: '/' }];
 	for (const page of pages) {
 		nav.push({
 			label: page.title,
@@ -372,6 +384,7 @@ export async function extractSite(discovered: DiscoverResult): Promise<SiteIR> {
 		nav,
 		topics,
 		lede,
+		homeMarkdown,
 		notes,
 		assets: [...new Set(assets)]
 	};

package/packages/import/src/ir.ts

@@ -36,6 +36,8 @@ export type SiteIR = {
 	topics: Array<{ label: string; tag: string }>;
 	/** Suggested lede for the filepress index (from home bio), or null. */
 	lede: string | null;
+	/** Full home bio as Markdown when it is long enough to be `pages/home.md`. */
+	homeMarkdown: string | null;
 	/** Notes for the import report (URL remaps, skips). */
 	notes: string[];
 	/** Same-origin chrome assets to copy into static/ (favicons, etc.). */