getfilepress 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getfilepress",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "type": "module",
   "description": "FilePress — file-based Markdown blog engine. Link this package from a content-only site (config + posts), then run `filepress build`.",
@@ -84,7 +84,7 @@
   "scripts": {
     "postinstall": "node scripts/postinstall.mjs",
     "filepress": "node scripts/filepress.mjs",
-    "test": "pnpm --filter @filepress/core test && pnpm --filter @filepress/import test && pnpm --filter @filepress/app test",
+    "test": "pnpm --filter @filepress/core test && pnpm --filter @filepress/import test && pnpm --filter @filepress/app test && tsx --test scripts/sync-sibling-sites.test.ts",
     "check": "pnpm filepress check --site demo",
     "build": "pnpm filepress build --site demo",
     "build:demo": "pnpm filepress build --site demo",
@@ -95,6 +95,7 @@
     "dev:demo": "node scripts/ensure-lease.mjs demo 5179 && pnpm filepress dev --site demo",
     "dev:www": "node scripts/ensure-lease.mjs getfilepress 5180 && pnpm filepress dev --site getfilepress",
     "create-site": "node scripts/create-site.mjs",
+    "sync-siblings": "tsx scripts/sync-sibling-sites.ts",
     "import": "node scripts/filepress.mjs import",
     "pack:smoke": "node scripts/pack-smoke.mjs"
   }

package/packages/app/src/lib/prerender-empty-ok.ts

@@ -0,0 +1,15 @@
+/**
+ * Dynamic routes that may have zero `entries()` and still be a valid site:
+ * no extra index pages, no tags, no Markdown pages, or no posts (pages-only).
+ */
+export const prerenderEmptyOk = [
+	'/page/[n]',
+	'/tags/[tag]',
+	'/[slug]',
+	'/posts/[slug]'
+] as const;
+
+export function unexpectedUnseenPrerenderRoutes(routes: string[]): string[] {
+	const ok = new Set<string>(prerenderEmptyOk);
+	return routes.filter((route) => !ok.has(route));
+}

package/packages/app/vite.config.ts

@@ -12,6 +12,7 @@ import { geniePlugin } from './vite-plugin-genie.ts';
 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';
 
 const appRoot = dirname(fileURLToPath(import.meta.url));
 const defaultSiteRoot = resolve(appRoot, '../../sites/demo');
@@ -160,8 +161,7 @@ export default defineConfig(async () => {
 						throw new Error(message);
 					},
 					handleUnseenRoutes: ({ routes }) => {
-						const emptyOk = new Set(['/page/[n]', '/tags/[tag]', '/[slug]']);
-						const unexpected = routes.filter((r) => !emptyOk.has(r));
+						const unexpected = unexpectedUnseenPrerenderRoutes(routes);
 						if (unexpected.length > 0) {
 							throw new Error(
 								`Routes marked prerenderable but not prerendered: ${unexpected.join(', ')}`

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

@@ -19,3 +19,116 @@ export function writeBuildHeaders(buildDir: string): 'wrote' | 'kept' {
 	writeFileSync(dest, defaultSecurityHeaders());
 	return 'wrote';
 }
+
+export type MergeSecurityHeadersResult = {
+	text: string;
+	changed: boolean;
+	added: string[];
+};
+
+type HeaderBlock = { path: string; lines: string[] };
+
+/** Header name from a `_headers` line (`Name: value` or `! Name`). */
+export function headerNameFromLine(line: string): string | null {
+	const t = line.trim();
+	if (!t || t.startsWith('#')) return null;
+	if (t.startsWith('! ')) return t.slice(2).trim().toLowerCase();
+	const colon = t.indexOf(':');
+	if (colon === -1) return null;
+	return t.slice(0, colon).trim().toLowerCase();
+}
+
+function isPathLine(line: string): boolean {
+	if (line.startsWith(' ') || line.startsWith('\t')) return false;
+	const t = line.trim();
+	return t.startsWith('/') || t.startsWith('http://') || t.startsWith('https://');
+}
+
+function parseHeadersFile(text: string): { preamble: string[]; blocks: HeaderBlock[] } {
+	const lines = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
+	const preamble: string[] = [];
+	const blocks: HeaderBlock[] = [];
+	let current: HeaderBlock | null = null;
+	let beforeFirst = true;
+
+	for (const line of lines) {
+		if (isPathLine(line)) {
+			current = { path: line.trim(), lines: [] };
+			blocks.push(current);
+			beforeFirst = false;
+			continue;
+		}
+		if (beforeFirst) preamble.push(line);
+		else if (current) current.lines.push(line);
+	}
+	return { preamble, blocks };
+}
+
+function serializeHeadersFile(preamble: string[], blocks: HeaderBlock[]): string {
+	const out: string[] = [...preamble];
+	for (const block of blocks) {
+		out.push(block.path);
+		out.push(...block.lines);
+	}
+	let text = out.join('\n');
+	if (!text.endsWith('\n')) text += '\n';
+	return text;
+}
+
+function starHeaderLines(defaults: string): string[] {
+	const { blocks } = parseHeadersFile(defaults);
+	const star = blocks.find((b) => b.path === '/*');
+	if (!star) {
+		throw new Error('default _headers template has no /* block');
+	}
+	return star.lines.filter((line) => headerNameFromLine(line));
+}
+
+function blockIndent(lines: string[]): string {
+	for (const line of lines) {
+		if (headerNameFromLine(line)) {
+			const match = /^(?<indent>[ \t]+)/.exec(line);
+			if (match?.groups?.indent) return match.groups.indent;
+		}
+	}
+	return '  ';
+}
+
+/**
+ * Fold FilePress default `/*` security rules into a site-owned `_headers`
+ * without dropping other path blocks. Existing values for the same header
+ * name win (including an explicit `Access-Control-Allow-Origin`).
+ */
+export function mergeSecurityHeaders(
+	existing: string,
+	defaults: string = defaultSecurityHeaders()
+): MergeSecurityHeadersResult {
+	const wanted = starHeaderLines(defaults);
+	const parsed = parseHeadersFile(existing);
+	const added: string[] = [];
+	let star = parsed.blocks.find((b) => b.path === '/*');
+	if (!star) {
+		star = { path: '/*', lines: [''] };
+		parsed.blocks.push(star);
+	}
+
+	const present = new Set(
+		star.lines.map((line) => headerNameFromLine(line)).filter((n): n is string => Boolean(n))
+	);
+	const indent = blockIndent(star.lines);
+
+	let insertAt = star.lines.length;
+	while (insertAt > 0 && star.lines[insertAt - 1].trim() === '') insertAt--;
+
+	for (const line of wanted) {
+		const name = headerNameFromLine(line);
+		if (!name || present.has(name)) continue;
+		star.lines.splice(insertAt, 0, `${indent}${line.trim()}`);
+		insertAt++;
+		present.add(name);
+		added.push(name);
+	}
+
+	const text = serializeHeadersFile(parsed.preamble, parsed.blocks);
+	return { text, changed: added.length > 0, added };
+}

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

@@ -22,7 +22,8 @@ export {
 
 export { absoluteUrl, ogImageUrl } from './config';
 export type { SiteConfig, PathMount } from './config';
-export { defaultSecurityHeaders, writeBuildHeaders } from './headers';
+export { defaultSecurityHeaders, writeBuildHeaders, mergeSecurityHeaders } from './headers';
+export type { MergeSecurityHeadersResult } from './headers';
 export {
 	normalizePathMounts,
 	pathMountReservedSlugs,