getfilepress 0.1.32 → 0.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "getfilepress",
-	"version": "0.1.32",
+	"version": "0.1.33",
 	"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`.",
@@ -106,6 +106,14 @@
 		"node": ">=20"
 	},
 	"packageManager": "pnpm@10.30.1",
+	"pnpm": {
+		"overrides": {
+			"js-yaml": "3.15.2",
+			"nanoid": "3.3.18",
+			"postcss": "8.5.23",
+			"sharp": "0.35.4"
+		}
+	},
 	"devDependencies": {
 		"wrangler": "^4.120.1"
 	}

package/packages/app/src/lib/genie/store.ts

@@ -33,7 +33,7 @@ function ensureGenieDirs(siteRoot: string) {
 }
 
 export function newVersionId(): string {
-	const ts = new Date().toISOString().replace(/[:.]/g, '-').replace(/Z$/, 'Z');
+	const ts = new Date().toISOString().replace(/[:.]/g, '-');
 	return `${ts}-${randomBytes(2).toString('hex')}`;
 }
 

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

@@ -7,7 +7,7 @@
  * keeps `@filepress/core` app-agnostic and importable from both client and
  * server code.
  */
-import { normalizePathMounts, type PathMount } from './paths-shared';
+import { normalizePathMounts, stripTrailingSlashes, type PathMount } from './paths-shared';
 import { writingPostRedirects, type RedirectRule } from './redirects';
 export type { PathMount } from './paths-shared';
 export type { RedirectRule } from './redirects';
@@ -228,7 +228,7 @@ export function defineFilepressConfig(input: SiteConfigInput): SiteConfig {
 		lede: (input.lede ?? '').trim() || null,
 		logo,
 		ogImage: (input.ogImage ?? '').trim() || logo,
-		url: url.replace(/\/+$/, ''),
+		url: stripTrailingSlashes(url),
 		author: (input.author ?? '').trim() || title,
 		postsPerPage:
 			Number.isFinite(input.postsPerPage) && (input.postsPerPage as number) > 0
@@ -279,7 +279,7 @@ function normalizeRedirects(rules: RedirectRule[] | undefined): RedirectRule[] {
 
 /** 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(/\/+$/, '');
+	const base = stripTrailingSlashes(site.url);
 	const suffix = path.startsWith('/') ? path : `/${path}`;
 	return `${base}${suffix}`;
 }

package/packages/core/src/lib/paths-shared.ts

@@ -12,6 +12,17 @@ export interface PathMount {
 	url: string;
 }
 
+export function toPosixPath(path: string): string {
+	return path.split('\\').join('/');
+}
+
+/** Drop trailing `/` without a regular expression. */
+export function stripTrailingSlashes(path: string): string {
+	let out = path;
+	while (out.length > 1 && out.endsWith('/')) out = out.slice(0, -1);
+	return out;
+}
+
 /** Engine route prefixes a mount must not steal. */
 const ENGINE_URL_PREFIXES = new Set([
 	...RESERVED_PAGE_SLUGS,
@@ -38,8 +49,8 @@ export function normalizePathMounts(input: PathMount[] | undefined): PathMount[]
 		if (!raw || typeof raw !== 'object') {
 			throw new Error('filepress.config: each `paths` entry must be an object { url, dir }.');
 		}
-		const dir = String(raw.dir ?? '').trim().replace(/\\/g, '/').replace(/\/+$/, '');
-		let url = String(raw.url ?? '').trim().replace(/\\/g, '/');
+		const dir = stripTrailingSlashes(toPosixPath(String(raw.dir ?? '').trim()));
+		let url = toPosixPath(String(raw.url ?? '').trim());
 		if (!dir) {
 			throw new Error('filepress.config: `paths[].dir` must be a non-empty site-relative path.');
 		}
@@ -51,7 +62,7 @@ export function normalizePathMounts(input: PathMount[] | undefined): PathMount[]
 		if (!url.startsWith('/')) {
 			throw new Error(`filepress.config: \`paths[].url\` must start with / (got "${raw.url}").`);
 		}
-		url = url.replace(/\/+$/, '') || '/';
+		url = stripTrailingSlashes(url) || '/';
 		if (url === '/') {
 			throw new Error('filepress.config: `paths[].url` cannot be `/` (that is the site home).');
 		}

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

@@ -2,6 +2,7 @@
  * Cloudflare Pages / Netlify `_redirects` lines.
  * Code owns the file shape; sites and import only supply from/to pairs.
  */
+import { stripTrailingSlashes } from './paths-shared';
 export type RedirectStatus = 301 | 302 | 308;
 
 export type RedirectRule = {
@@ -18,11 +19,11 @@ export function normalizeRedirectPath(path: string): string {
 	if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
 		const url = new URL(trimmed);
 		const out = url.pathname || '/';
-		return out === '/' ? '/' : out.replace(/\/+$/, '') || '/';
+		return out === '/' ? '/' : stripTrailingSlashes(out) || '/';
 	}
 	const withSlash = trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
 	if (withSlash.includes('*') || withSlash.includes(':splat')) return withSlash;
-	return withSlash === '/' ? '/' : withSlash.replace(/\/+$/, '') || '/';
+	return withSlash === '/' ? '/' : stripTrailingSlashes(withSlash) || '/';
 }
 
 export function serializeRedirects(rules: RedirectRule[]): string {
@@ -33,7 +34,8 @@ export function serializeRedirects(rules: RedirectRule[]): string {
 export function parseRedirectsFile(text: string): RedirectRule[] {
 	const rules: RedirectRule[] = [];
 	for (const raw of text.split(/\r?\n/)) {
-		const line = raw.replace(/#.*$/, '').trim();
+		const hash = raw.indexOf('#');
+		const line = (hash === -1 ? raw : raw.slice(0, hash)).trim();
 		if (!line) continue;
 		const parts = line.split(/\s+/);
 		if (parts.length < 2) continue;

package/packages/import/src/ollama.ts

@@ -1,5 +1,6 @@
 import { mkdirSync, writeFileSync } from 'node:fs';
 import { dirname } from 'node:path';
+import { parseHTML } from 'linkedom';
 import type { DesignBrief, SiteIR } from './ir.ts';
 import type { InspirationSignals } from './inspire.ts';
 import { DEFAULT_BRIEF, parseBriefJson } from './theme.ts';
@@ -430,10 +431,11 @@ export async function generateDesignBrief(opts: {
 
 /** Short text summary of an inspiration homepage for the brief prompt. */
 export function summarizeHtmlForBrief(html: string, max = 1200): string {
-	const text = html
-		.replace(/<script[\s\S]*?<\/script>/gi, ' ')
-		.replace(/<style[\s\S]*?<\/style>/gi, ' ')
-		.replace(/<[^>]+>/g, ' ')
+	const { document } = parseHTML(html);
+	for (const node of document.querySelectorAll('script, style, noscript')) {
+		node.remove();
+	}
+	const text = (document.body?.textContent ?? document.documentElement?.textContent ?? '')
 		.replace(/\s+/g, ' ')
 		.trim();
 	return text.slice(0, max);

package/packages/import/src/wordpress.ts

@@ -2,6 +2,7 @@
  * WordPress REST overlay for filepress import.
  * Sitemap + HTML still own the crawl; this fills categories → tags and nav.
  */
+import { parseHTML } from 'linkedom';
 import { fetchText, originOf } from './fetch.ts';
 
 export type WpTerm = {
@@ -40,18 +41,11 @@ const SKIP_CATEGORY = new Set(['uncategorized']);
 const SKIP_PAGE = new Set(['sample-page']);
 
 export function decodeWpText(raw: string): string {
-	return raw
-		.replace(/<[^>]+>/g, ' ')
-		.replace(/&#(\d+);/g, (_, n) => String.fromCodePoint(Number(n)))
-		.replace(/&#x([0-9a-f]+);/gi, (_, n) => String.fromCodePoint(parseInt(n, 16)))
-		.replace(/&amp;/g, '&')
-		.replace(/&lt;/g, '<')
-		.replace(/&gt;/g, '>')
-		.replace(/&quot;/g, '"')
-		.replace(/&#039;|&apos;/g, "'")
-		.replace(/&nbsp;/g, ' ')
-		.replace(/\s+/g, ' ')
-		.trim();
+	const { document } = parseHTML('<div id="fp-wp"></div>');
+	const el = document.getElementById('fp-wp');
+	if (!el) return raw.replace(/\s+/g, ' ').trim();
+	el.innerHTML = raw;
+	return (el.textContent ?? '').replace(/\s+/g, ' ').trim();
 }
 
 export function termsToTags(categories: WpTerm[], tags: WpTerm[], categoryIds: number[], tagIds: number[]): string[] {

package/scripts/preview.mjs

@@ -6,7 +6,7 @@
  */
 import { createServer } from 'node:http';
 import { existsSync, readFileSync, statSync } from 'node:fs';
-import { extname, join, resolve, sep } from 'node:path';
+import { extname, isAbsolute, join, relative, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const MIME = {
@@ -32,16 +32,28 @@ const MIME = {
 const isMain =
 	Boolean(process.argv[1]) && resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url));
 
-function underRoot(root, abs) {
-	return abs === root || abs.startsWith(root + sep);
+function containedUnder(root, abs) {
+	const rel = relative(root, abs);
+	return rel === '' || (rel !== '..' && !rel.startsWith(`..${sep}`) && !isAbsolute(rel));
 }
 
 /** Map a request path to a file under `root`, or null. */
 export function resolveBuildFile(root, urlPath) {
-	const pathname = decodeURIComponent((urlPath.split('?')[0] || '/'));
-	const rel = pathname.replace(/^\/+/, '');
-	const abs = resolve(root, rel);
-	if (!underRoot(root, abs)) return null;
+	const base = resolve(root);
+	let pathname;
+	try {
+		pathname = decodeURIComponent((urlPath.split('?')[0] || '/'));
+	} catch {
+		return null;
+	}
+	const parts = [];
+	for (const seg of pathname.split('/')) {
+		if (!seg || seg === '.') continue;
+		if (seg === '..') return null;
+		parts.push(seg);
+	}
+	const abs = parts.length ? join(base, ...parts) : base;
+	if (!containedUnder(base, abs)) return null;
 	try {
 		const st = statSync(abs);
 		if (st.isFile()) return abs;