emdash 0.34.0 → 0.36.0

package/src/components/LiveSearch.astro

@@ -9,6 +9,15 @@
  * <LiveSearch placeholder="Search articles..." collections={["posts", "pages"]} />
  * ```
  *
+ * Results are scoped to the page's locale, taken from `Astro.currentLocale`,
+ * so a translated site returns each entry once, in the language of the page
+ * the visitor searched from. Pass `locale` to override that, or `null` to
+ * search across every locale:
+ *
+ * ```astro
+ * <LiveSearch collections={["posts", "pages"]} locale={null} />
+ * ```
+ *
  * Customize the result rendering with slots:
  *
  * ```astro
@@ -26,6 +35,12 @@ export interface Props {
 	placeholder?: string;
 	/** Collections to search (defaults to all searchable collections) */
 	collections?: string[];
+	/**
+	 * Locale to restrict results to. Defaults to `Astro.currentLocale`, which
+	 * Astro derives from the URL, so results match the page the search was
+	 * made from. Pass `null` to search across every locale.
+	 */
+	locale?: string | null;
 	/** Minimum characters before searching (defaults to 2) */
 	minChars?: number;
 	/** Debounce delay in milliseconds (defaults to 300) */
@@ -59,6 +74,7 @@ export interface Props {
 const {
 	placeholder = "Search...",
 	collections,
+	locale = Astro.currentLocale ?? null,
 	minChars = 2,
 	debounce = 300,
 	limit = 10,
@@ -77,6 +93,7 @@ const {
 
 const config = {
 	collections: collections?.join(",") ?? "",
+	locale: locale ?? "",
 	minChars,
 	debounce,
 	limit,
@@ -145,6 +162,7 @@ const config = {
 
 	interface Config {
 		collections: string;
+		locale: string;
 		minChars: number;
 		debounce: number;
 		limit: number;
@@ -164,6 +182,7 @@ const config = {
 		private template: HTMLTemplateElement | null = null;
 		private config: Config = {
 			collections: "",
+			locale: "",
 			minChars: 2,
 			debounce: 300,
 			limit: 10,
@@ -364,6 +383,10 @@ const config = {
 					params.set("collections", this.config.collections);
 				}
 
+				if (this.config.locale) {
+					params.set("locale", this.config.locale);
+				}
+
 				const response = await fetch(`${endpoint}?${params}`, {
 					signal: this.abortController.signal,
 				});

package/src/components/inline-code-block.tsx

@@ -2,20 +2,49 @@
  * Code block node view for the inline (visual editing) Portable Text editor.
  *
  * Mirrors the admin editor's `CodeBlockNode` but with no Kumo/Lingui deps,
- * so it can ship as part of the SSR runtime. Wraps the base
- * `@tiptap/extension-code-block` and overlays a small inline language picker
- * in the top-right corner of each code block.
+ * so it can ship as part of the SSR runtime. Wraps the Lowlight code block and
+ * overlays a small inline language picker in the top-right corner of each code
+ * block.
  *
  * Keep the language list in sync with
  * `packages/admin/src/components/editor/codeBlockLanguages.ts`. Duplicated
  * here so packages/core stays independent of the admin package.
  */
 
-import CodeBlock from "@tiptap/extension-code-block";
+import { CodeBlockLowlight } from "@tiptap/extension-code-block-lowlight";
 import type { NodeViewProps } from "@tiptap/react";
 import { NodeViewContent, NodeViewWrapper, ReactNodeViewRenderer } from "@tiptap/react";
+import dockerfile from "highlight.js/lib/languages/dockerfile";
+import { common, createLowlight } from "lowlight";
 import * as React from "react";
 
+const INLINE_CODE_BLOCK_LOWLIGHT_KEY = Symbol.for("emdash:inline-code-block-lowlight");
+const globalStore = globalThis as Record<symbol, unknown>;
+const lowlight =
+	// eslint-disable-next-line typescript/no-unsafe-type-assertion -- globalThis singleton pattern
+	(globalStore[INLINE_CODE_BLOCK_LOWLIGHT_KEY] as ReturnType<typeof createLowlight> | undefined) ??
+	(() => {
+		const instance = createLowlight(common);
+		instance.register({ dockerfile });
+		globalStore[INLINE_CODE_BLOCK_LOWLIGHT_KEY] = instance;
+		return instance;
+	})();
+
+const editorLowlight = {
+	highlight(language: string, value: string) {
+		return lowlight.highlight(lowlight.registered(language) ? language : "plaintext", value);
+	},
+	highlightAuto(value: string) {
+		return lowlight.highlight("plaintext", value);
+	},
+	listLanguages() {
+		return lowlight.listLanguages();
+	},
+	registered(language: string) {
+		return lowlight.registered(language);
+	},
+};
+
 interface CodeBlockLanguage {
 	id: string;
 	label: string;
@@ -40,6 +69,7 @@ const CODE_BLOCK_LANGUAGES: readonly CodeBlockLanguage[] = [
 	{ id: "json", label: "JSON" },
 	{ id: "jsx", label: "JSX" },
 	{ id: "kotlin", label: "Kotlin", aliases: ["kt"] },
+	{ id: "lua", label: "Lua" },
 	{ id: "markdown", label: "Markdown", aliases: ["md"] },
 	{ id: "mdx", label: "MDX" },
 	{ id: "php", label: "PHP" },
@@ -56,6 +86,7 @@ const CODE_BLOCK_LANGUAGES: readonly CodeBlockLanguage[] = [
 	{ id: "vue", label: "Vue" },
 	{ id: "xml", label: "XML" },
 	{ id: "yaml", label: "YAML", aliases: ["yml"] },
+	{ id: "zig", label: "Zig" },
 ];
 
 function findLanguage(value: string | null | undefined): CodeBlockLanguage | null {
@@ -96,6 +127,36 @@ function languageLabel(value: string | null | undefined): string {
 	return value;
 }
 
+async function copyTextToClipboard(text: string, shouldUseFallback: () => boolean): Promise<void> {
+	if (navigator.clipboard?.writeText) {
+		try {
+			await navigator.clipboard.writeText(text);
+			return;
+		} catch {}
+	}
+	if (!shouldUseFallback()) return;
+	const activeElement = document.activeElement;
+	const selection = document.getSelection();
+	const previousRange = selection?.rangeCount ? selection.getRangeAt(0).cloneRange() : null;
+	const textarea = document.createElement("textarea");
+	textarea.value = text;
+	textarea.readOnly = true;
+	textarea.dataset.emdashClipboardFallback = "";
+	textarea.style.position = "fixed";
+	textarea.style.opacity = "0";
+	document.body.append(textarea);
+	textarea.select();
+	try {
+		if (!document.execCommand("copy")) throw new Error("Clipboard copy failed");
+	} finally {
+		textarea.remove();
+		if (activeElement instanceof HTMLElement && activeElement.isConnected) activeElement.focus();
+		if (previousRange) {
+			selection?.removeAllRanges();
+			selection?.addRange(previousRange);
+		}
+	}
+}
 function CodeBlockLanguageDatalist({ id }: { id: string }) {
 	return (
 		<datalist id={id}>
@@ -156,13 +217,15 @@ function XIcon() {
 	);
 }
 
-function InlineCodeBlockNodeView({ node, updateAttributes, selected }: NodeViewProps) {
+function InlineCodeBlockNodeView({ node, updateAttributes }: NodeViewProps) {
 	const [isEditing, setIsEditing] = React.useState(false);
-	const [isHovered, setIsHovered] = React.useState(false);
+	const [copyStatus, setCopyStatus] = React.useState<"idle" | "copied" | "failed">("idle");
 	const storedLanguage = typeof node.attrs.language === "string" ? node.attrs.language : "";
 	const [draft, setDraft] = React.useState(storedLanguage);
 	const inputRef = React.useRef<HTMLInputElement>(null);
 	const popoverRef = React.useRef<HTMLDivElement>(null);
+	const copyResetTimer = React.useRef<ReturnType<typeof setTimeout> | null>(null);
+	const copyRequestId = React.useRef(0);
 	// Per-instance datalist id so multiple code blocks (or multiple inline
 	// editors) on the same page don't create duplicate DOM ids.
 	const datalistId = React.useId();
@@ -211,17 +274,37 @@ function InlineCodeBlockNodeView({ node, updateAttributes, selected }: NodeViewP
 		document.addEventListener("mousedown", onMouseDown);
 		return () => document.removeEventListener("mousedown", onMouseDown);
 	}, [isEditing, closePicker]);
+	React.useEffect(
+		() => () => {
+			copyRequestId.current += 1;
+			if (copyResetTimer.current) clearTimeout(copyResetTimer.current);
+		},
+		[],
+	);
+	const copyCode = React.useCallback(async () => {
+		const requestId = ++copyRequestId.current;
+		setCopyStatus("idle");
+		try {
+			await copyTextToClipboard(node.textContent, () => requestId === copyRequestId.current);
+			if (requestId !== copyRequestId.current) return;
+			setCopyStatus("copied");
+			if (copyResetTimer.current) clearTimeout(copyResetTimer.current);
+			copyResetTimer.current = setTimeout(setCopyStatus, 1500, "idle");
+		} catch {
+			if (requestId !== copyRequestId.current) return;
+			if (copyResetTimer.current) clearTimeout(copyResetTimer.current);
+			setCopyStatus("failed");
+		}
+	}, [node.textContent]);
 
 	const label = languageLabel(storedLanguage);
-	const chipVisible = isHovered || selected || isEditing || Boolean(storedLanguage);
+	const copied = copyStatus === "copied";
+	const copyFailed = copyStatus === "failed";
 
 	return (
 		<NodeViewWrapper
 			className="emdash-inline-code-block"
 			data-language={storedLanguage || undefined}
-			style={{ position: "relative", margin: "1rem 0" }}
-			onMouseEnter={() => setIsHovered(true)}
-			onMouseLeave={() => setIsHovered(false)}
 		>
 			<CodeBlockLanguageDatalist id={datalistId} />
 			<pre className="emdash-code-block">
@@ -229,35 +312,20 @@ function InlineCodeBlockNodeView({ node, updateAttributes, selected }: NodeViewP
 			</pre>
 
 			<div
+				className="emdash-inline-code-block-controls-wrap"
+				data-persistent={isEditing || copyStatus !== "idle" ? "true" : "false"}
 				contentEditable={false}
-				style={{
-					position: "absolute",
-					top: "0.5rem",
-					insetInlineEnd: "0.5rem",
-					userSelect: "none",
-					zIndex: 1,
-					opacity: chipVisible ? 1 : 0,
-					pointerEvents: chipVisible ? "auto" : "none",
-					transition: "opacity 0.15s",
-				}}
-				// When the chip is hidden, also remove it from the tab order so
-				// keyboard users don't land on an invisible focus target.
-				// `inert` would be cleaner but isn't available on JSX HTMLDivElement
-				// types yet; aria-hidden + tabIndex on the button below cover the
-				// same need.
-				aria-hidden={chipVisible ? undefined : true}
 			>
 				{isEditing ? (
 					<div
 						ref={popoverRef}
+						className="emdash-inline-code-block-popover"
 						style={{
 							display: "flex",
 							alignItems: "center",
 							gap: "0.25rem",
 							padding: "0.25rem",
 							borderRadius: "0.375rem",
-							border: "1px solid rgba(0,0,0,0.1)",
-							background: "var(--emdash-inline-bg, #ffffff)",
 							boxShadow: "0 4px 12px rgba(0,0,0,0.1)",
 						}}
 					>
@@ -268,17 +336,14 @@ function InlineCodeBlockNodeView({ node, updateAttributes, selected }: NodeViewP
 							value={draft}
 							onChange={(e) => setDraft(e.target.value)}
 							onKeyDown={handleKeyDown}
+							className="emdash-inline-code-block-language-input"
 							placeholder="Language"
 							aria-label="Language"
 							style={{
 								height: "1.75rem",
-								width: "10rem",
 								fontSize: "0.75rem",
 								padding: "0 0.5rem",
-								border: "1px solid rgba(0,0,0,0.15)",
 								borderRadius: "0.25rem",
-								background: "transparent",
-								color: "inherit",
 							}}
 						/>
 						<button
@@ -303,27 +368,74 @@ function InlineCodeBlockNodeView({ node, updateAttributes, selected }: NodeViewP
 						</button>
 					</div>
 				) : (
-					<button
-						type="button"
-						tabIndex={chipVisible ? 0 : -1}
-						onMouseDown={(e) => e.preventDefault()}
-						onClick={openPicker}
-						title="Set language"
-						aria-label={`Set language (current: ${label})`}
+					<div
 						className="emdash-inline-code-block-chip"
 						style={{
-							padding: "0.125rem 0.5rem",
-							fontSize: "0.75rem",
-							borderRadius: "0.375rem",
-							border: "1px solid rgba(0,0,0,0.1)",
-							background: "rgba(255,255,255,0.9)",
-							color: "rgba(0,0,0,0.6)",
-							cursor: "pointer",
+							display: "inline-flex",
+							maxWidth: "min(100%, calc(100vw - 1rem))",
+							height: "26px",
+							fontSize: "13px",
 						}}
 					>
-						{storedLanguage ? label : "Set language"}
-					</button>
+						<button
+							type="button"
+							onMouseDown={(event) => event.preventDefault()}
+							onClick={openPicker}
+							title="Set language"
+							aria-label={`Set language (current: ${label})`}
+							style={{
+								minWidth: 0,
+								flexShrink: 1,
+								display: "inline-flex",
+								alignItems: "center",
+								gap: "0.25rem",
+								padding: "0 0.5rem",
+								border: 0,
+								background: "transparent",
+								color: "inherit",
+								font: "inherit",
+							}}
+						>
+							<span style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
+								{storedLanguage ? label : "Set language"}
+							</span>
+							<span style={{ flexShrink: 0 }} aria-hidden="true">
+								⌄
+							</span>
+						</button>
+						<button
+							type="button"
+							onMouseDown={(event) => event.preventDefault()}
+							onClick={copyCode}
+							title={copyFailed ? "Retry copy" : copied ? "Copied" : "Copy code"}
+							aria-label={copyFailed ? "Retry copy" : "Copy code"}
+							style={{
+								...iconButtonStyle,
+								height: "26px",
+								width: "26px",
+								flexShrink: 0,
+								borderInlineStart: "1px solid var(--emdash-code-border)",
+							}}
+						>
+							<span aria-hidden="true">
+								{copied ? <CheckIcon /> : copyFailed ? <XIcon /> : "⧉"}
+							</span>
+						</button>
+					</div>
 				)}
+				<span
+					role="status"
+					aria-live="polite"
+					style={{
+						position: "absolute",
+						width: 1,
+						height: 1,
+						overflow: "hidden",
+						clipPath: "inset(50%)",
+					}}
+				>
+					{copyFailed ? "Copy failed" : copied ? "Copied" : ""}
+				</span>
 			</div>
 		</NodeViewWrapper>
 	);
@@ -336,8 +448,27 @@ function InlineCodeBlockNodeView({ node, updateAttributes, selected }: NodeViewP
  * configure `StarterKit.configure({ codeBlock: false })` and add this
  * extension to the editor.
  */
-export const InlineCodeBlockExtension = CodeBlock.extend({
+export const InlineCodeBlockExtension = CodeBlockLowlight.extend({
+	addKeyboardShortcuts() {
+		const shortcuts = this.parent?.() ?? {};
+		const selectionIsInCodeBlock = () => {
+			const { $from, $to } = this.editor.state.selection;
+			return $from.parent.type === this.type && $from.sameParent($to);
+		};
+
+		return {
+			...shortcuts,
+			Tab: (props) => (selectionIsInCodeBlock() ? (shortcuts.Tab?.(props) ?? false) : false),
+			"Shift-Tab": (props) =>
+				selectionIsInCodeBlock() ? (shortcuts["Shift-Tab"]?.(props) ?? false) : false,
+		};
+	},
 	addNodeView() {
 		return ReactNodeViewRenderer(InlineCodeBlockNodeView);
 	},
+}).configure({
+	lowlight: editorLowlight,
+	defaultLanguage: "plaintext",
+	enableTabIndentation: true,
+	tabSize: 4,
 });

package/src/content/converters/gallery.ts

@@ -46,6 +46,8 @@ export function sanitizeGalleryImages(
 		if (typeof record.caption === "string" && record.caption) image.caption = record.caption;
 		if (typeof record.width === "number") image.width = record.width;
 		if (typeof record.height === "number") image.height = record.height;
+		if (typeof record.focalX === "number") image.focalX = record.focalX;
+		if (typeof record.focalY === "number") image.focalY = record.focalY;
 		if (typeof record.blurhash === "string" && record.blurhash) image.blurhash = record.blurhash;
 		if (typeof record.dominantColor === "string" && record.dominantColor)
 			image.dominantColor = record.dominantColor;

package/src/content/converters/types.ts

@@ -91,6 +91,8 @@ export interface PortableTextGalleryImage {
 	caption?: string;
 	width?: number;
 	height?: number;
+	focalX?: number;
+	focalY?: number;
 	/** LQIP blurhash placeholder (images only) */
 	blurhash?: string;
 	/** LQIP dominant-color placeholder, as a CSS color (images only) */

package/src/database/connection.ts

@@ -1,6 +1,6 @@
-import BetterSqlite3 from "better-sqlite3";
 import { Kysely, SqliteDialect } from "kysely";
 
+import { openNodeSqliteDatabase } from "../db/node-sqlite-compat.js";
 import { EmDashDatabaseError } from "./errors.js";
 import { kyselyLogOption } from "./instrumentation.js";
 import type { Database } from "./types.js";
@@ -12,23 +12,6 @@ export interface DatabaseConfig {
 	authToken?: string;
 }
 
-/**
- * Returns a helpful, actionable message when better-sqlite3's native binary
- * was compiled against a different Node.js version than the one running. This
- * happens after upgrading Node without rebuilding native deps.
- *
- * Returns null if the error is not a NODE_MODULE_VERSION mismatch.
- */
-export function formatNativeModuleVersionError(error: unknown): string | null {
-	const message = error instanceof Error ? error.message : String(error);
-	if (!message.includes("NODE_MODULE_VERSION")) return null;
-	return (
-		"better-sqlite3's native binary was compiled against a different Node.js version. " +
-		"Rebuild it with `pnpm rebuild better-sqlite3` (or `npm rebuild better-sqlite3`), " +
-		"or reinstall dependencies with your current Node.js version."
-	);
-}
-
 /**
  * Creates a Kysely database instance
  * Supports:
@@ -42,15 +25,7 @@ export function createDatabase(config: DatabaseConfig): Kysely<Database> {
 		if (config.url.startsWith("file:") || config.url === ":memory:") {
 			const dbPath = config.url === ":memory:" ? ":memory:" : config.url.replace("file:", "");
 
-			const sqlite = new BetterSqlite3(dbPath);
-
-			// Enable WAL mode for crash safety — writes go to a write-ahead log
-			// before being applied, preventing FTS5 shadow table corruption on
-			// process kill during content writes. No-op for :memory: databases.
-			sqlite.pragma("journal_mode = WAL");
-
-			// Enable foreign key constraints
-			sqlite.pragma("foreign_keys = ON");
+			const sqlite = openNodeSqliteDatabase(dbPath, { journalMode: "wal" });
 
 			const dialect = new SqliteDialect({
 				database: sqlite,
@@ -73,10 +48,6 @@ export function createDatabase(config: DatabaseConfig): Kysely<Database> {
 		if (error instanceof EmDashDatabaseError) {
 			throw error;
 		}
-		const nativeVersionHint = formatNativeModuleVersionError(error);
-		if (nativeVersionHint) {
-			throw new EmDashDatabaseError(nativeVersionHint, error);
-		}
 		throw new EmDashDatabaseError("Failed to create database", error);
 	}
 }

package/src/database/index.ts

@@ -1,7 +1,13 @@
 // `createDatabase` is intentionally not re-exported here: it lives in
-// `connection.ts`, which statically imports `better-sqlite3`. See #947.
+// `connection.ts`, which statically imports the Node-only `node:sqlite` module.
 export { EmDashDatabaseError } from "./errors.js";
 export type { DatabaseConfig } from "./connection.js";
-export { runMigrations, getMigrationStatus, rollbackMigration } from "./migrations/runner.js";
-export type { MigrationStatus } from "./migrations/runner.js";
+export {
+	runMigrations,
+	getMigrationStatus,
+	getExactMigrationStatus,
+	rollbackMigration,
+	MIGRATION_NAMES,
+} from "./migrations/runner.js";
+export type { MigrationStatus, ExactMigrationStatus } from "./migrations/runner.js";
 export type * from "./types.js";

package/src/database/json-recordset.ts

@@ -0,0 +1,16 @@
+import { sql, type Kysely, type RawBuilder } from "kysely";
+
+import { isPostgres } from "./dialect-helpers.js";
+import type { Database } from "./types.js";
+
+export function jsonTextValues(
+	db: Kysely<Database>,
+	values: readonly string[],
+): RawBuilder<{ value: string }> {
+	const payload = JSON.stringify([...new Set(values)]);
+	return isPostgres(db)
+		? sql<{
+				value: string;
+			}>`SELECT value::text AS value FROM jsonb_array_elements_text(${payload}::jsonb) AS value`
+		: sql<{ value: string }>`SELECT value AS value FROM json_each(${payload})`;
+}

package/src/database/migrations/019_i18n.ts

@@ -223,7 +223,7 @@ export async function up(db: Kysely<unknown>): Promise<void> {
 		const tmp = `${t}_i18n_tmp`;
 
 		// Note: no transaction wrapper — D1 doesn't support transactions,
-		// and SQLite/better-sqlite3 is single-writer so crash-safety is
+		// and file-backed SQLite is single-writer so crash-safety is
 		// handled by the journal mode. The tmp table approach is already
 		// crash-recoverable (orphaned tmp tables are harmless).
 		{

package/src/database/migrations/071_restore_content_bylines_table.ts

@@ -0,0 +1,43 @@
+import type { Kysely } from "kysely";
+import { sql } from "kysely";
+
+import { isSqlite, tableExists } from "../dialect-helpers.js";
+
+/**
+ * Restore `_emdash_content_bylines` where migration 040's SQLite rebuild
+ * stopped between dropping the old table and renaming the staged copy.
+ *
+ * 040 guards its rebuild on `PRAGMA foreign_key_list`, which returns no rows
+ * for a missing table, so a retry after that partial run skips the rename and
+ * leaves `_emdash_content_bylines_new` behind with the credits inside. The
+ * indexes went with the dropped table.
+ *
+ * The Postgres path of 040 alters the table in place, so this is a no-op there.
+ */
+export async function up(db: Kysely<unknown>): Promise<void> {
+	if (!isSqlite(db)) return;
+
+	if (!(await tableExists(db, "_emdash_content_bylines"))) {
+		if (!(await tableExists(db, "_emdash_content_bylines_new"))) return;
+		await sql`ALTER TABLE _emdash_content_bylines_new RENAME TO _emdash_content_bylines`.execute(
+			db,
+		);
+	}
+
+	await db.schema
+		.createIndex("idx_content_bylines_content")
+		.ifNotExists()
+		.on("_emdash_content_bylines")
+		.columns(["collection_slug", "content_id", "sort_order"])
+		.execute();
+	await db.schema
+		.createIndex("idx_content_bylines_byline")
+		.ifNotExists()
+		.on("_emdash_content_bylines")
+		.column("byline_id")
+		.execute();
+}
+
+export async function down(_db: Kysely<unknown>): Promise<void> {
+	// no-op
+}

package/src/database/migrations/072_media_folders.ts

@@ -0,0 +1,72 @@
+import type { Kysely } from "kysely";
+
+import { columnExists } from "../dialect-helpers.js";
+
+const DUPLICATE_COLUMN_RE = /(?:duplicate column|column .* already exists|already exists.*column)/i;
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+	await db.schema
+		.createTable("media_folders")
+		.ifNotExists()
+		.addColumn("id", "text", (col) => col.primaryKey())
+		.addColumn("name", "text", (col) => col.notNull())
+		.addColumn("name_key", "text", (col) => col.notNull().unique())
+		.execute();
+
+	await addFolderColumnIfMissing(db, () =>
+		db.schema
+			.alterTable("media")
+			.addColumn("folder_id", "text", (col) =>
+				col.references("media_folders.id").onDelete("set null"),
+			)
+			.execute(),
+	);
+
+	await db.schema
+		.createIndex("idx_media_folder_id")
+		.ifNotExists()
+		.on("media")
+		.column("folder_id")
+		.execute();
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+	await db.schema.dropIndex("idx_media_folder_id").ifExists().execute();
+	if (await columnExists(db, "media", "folder_id")) {
+		await db.schema.alterTable("media").dropColumn("folder_id").execute();
+	}
+	await db.schema.dropTable("media_folders").ifExists().execute();
+}
+
+async function addFolderColumnIfMissing(
+	db: Kysely<unknown>,
+	addColumn: () => Promise<void>,
+): Promise<void> {
+	if (await columnExists(db, "media", "folder_id")) return;
+
+	try {
+		await addColumn();
+	} catch (error) {
+		if (DUPLICATE_COLUMN_RE.test(deepErrorMessage(error))) {
+			if (await columnExists(db, "media", "folder_id")) return;
+		}
+		throw error;
+	}
+}
+
+function deepErrorMessage(error: unknown): string {
+	if (error instanceof Error) {
+		const own = error.message ?? "";
+		if (error.cause) {
+			const causeMessage = deepErrorMessage(error.cause);
+			return own ? `${own}: ${causeMessage}` : causeMessage;
+		}
+		return own;
+	}
+	if (typeof error === "string") return error;
+	try {
+		return JSON.stringify(error);
+	} catch {
+		return String(error);
+	}
+}