emdash 0.30.0 → 0.31.0

package/src/emdash-runtime.ts

@@ -36,6 +36,8 @@ import type {
 	ContentDateField,
 } from "./database/repositories/types.js";
 import { validateIdentifier } from "./database/validate.js";
+import { getI18nConfig } from "./i18n/config.js";
+import { repairLocaleCasing } from "./i18n/repair-locale-casing.js";
 import { normalizeMediaValue } from "./media/normalize.js";
 import type { MediaProvider, MediaProviderCapabilities } from "./media/types.js";
 import {
@@ -71,6 +73,12 @@ import { createSingleFlightCache, singleFlightCached } from "./utils/single-flig
 import { COMMIT, VERSION } from "./version.js";
 
 const LEADING_SLASH_PATTERN = /^\//;
+const LOCALE_CASING_REPAIR_OPTION = "emdash:repair_locale_casing";
+
+function getLocaleCasingRepairVersion(locales: readonly string[]): string | null {
+	if (locales.length === 0) return null;
+	return `1:${locales.toSorted().join(",")}`;
+}
 
 /**
  * Parse a JSON column expected to contain an array of strings.
@@ -1130,6 +1138,10 @@ export class EmDashRuntime {
 		const storage = EmDashRuntime.getStorage(deps);
 
 		let pluginStates: Map<string, string> = new Map();
+		const configuredLocales: string[] =
+			virtualConfig?.i18n?.locales ?? getI18nConfig()?.locales ?? [];
+		const localeCasingRepairVersion = getLocaleCasingRepairVersion(configuredLocales);
+		let storedLocaleCasingRepairVersion: string | undefined;
 		let siteInfo:
 			| {
 					siteName?: string;
@@ -1175,7 +1187,9 @@ export class EmDashRuntime {
 				"emdash:site_title",
 				"emdash:site_url",
 				"emdash:locale",
+				LOCALE_CASING_REPAIR_OPTION,
 			]);
+			storedLocaleCasingRepairVersion = siteOpts.get(LOCALE_CASING_REPAIR_OPTION);
 			return {
 				siteName: siteOpts.get("emdash:site_title") ?? undefined,
 				siteUrl: siteOpts.get("emdash:site_url") ?? undefined,
@@ -1241,6 +1255,20 @@ export class EmDashRuntime {
 
 		await Promise.all(coldStartReads);
 
+		if (
+			localeCasingRepairVersion &&
+			(configuredLocales.some(
+				(locale) => locale.includes("-") || locale !== locale.toLowerCase(),
+			) ||
+				storedLocaleCasingRepairVersion !== undefined) &&
+			storedLocaleCasingRepairVersion !== localeCasingRepairVersion
+		) {
+			await phase("rt.locale", "Repair locale casing", async () => {
+				await repairLocaleCasing(db, configuredLocales);
+				await new OptionsRepository(db).set(LOCALE_CASING_REPAIR_OPTION, localeCasingRepairVersion);
+			});
+		}
+
 		// Auto-seed the default schema for a first load that skipped the setup
 		// wizard (the wizard and dev-bypass apply seeds explicitly). Run under a
 		// per-isolate lock keyed by the configured db so a reclaimed-and-rerun
@@ -2965,7 +2993,7 @@ export class EmDashRuntime {
 			await this.refreshContentUsageAfterSuccessfulWrite(collection, [result.data.id]);
 		}
 
-		// Run afterDelete hooks (fire-and-forget)
+		// Run afterDelete hooks (deferred past the response via after())
 		if (result.success) {
 			this.runAfterDeleteHooks(id, collection, false);
 		}
@@ -3052,7 +3080,7 @@ export class EmDashRuntime {
 			await this.refreshContentUsageAfterSuccessfulWrite(collection, [result.data.item.id]);
 		}
 
-		// Run afterUnpublish hooks (fire-and-forget)
+		// Run afterUnpublish hooks (deferred past the response via after())
 		if (result.success && result.data) {
 			this.runAfterUnpublishHooks(contentItemToRecord(result.data.item), collection);
 		}
@@ -3746,24 +3774,34 @@ export class EmDashRuntime {
 	}
 
 	private runAfterDeleteHooks(id: string, collection: string, permanent: boolean): void {
-		// Trusted plugins
-		if (this.hooks.hasHooks("content:afterDelete")) {
-			this.hooks
-				.runContentAfterDelete(id, collection, permanent)
-				.catch((err) => console.error("EmDash afterDelete hook error:", err));
-		}
+		after(async () => {
+			// Trusted plugins
+			if (this.hooks.hasHooks("content:afterDelete")) {
+				try {
+					await this.hooks.runContentAfterDelete(id, collection, permanent);
+				} catch (err) {
+					console.error("EmDash afterDelete hook error:", err);
+				}
+			}
 
-		// Sandboxed plugins
-		for (const [pluginKey, plugin] of this.sandboxedPlugins) {
-			const [pluginId] = pluginKey.split(":");
-			if (!pluginId || !this.isPluginEnabled(pluginId)) continue;
+			// Sandboxed plugins
+			const tasks: Promise<void>[] = [];
+			for (const [pluginKey, plugin] of this.sandboxedPlugins) {
+				const [pluginId] = pluginKey.split(":");
+				if (!pluginId || !this.isPluginEnabled(pluginId)) continue;
 
-			plugin
-				.invokeHook("content:afterDelete", { id, collection, permanent })
-				.catch((err) =>
-					console.error(`EmDash: Sandboxed plugin ${pluginId} afterDelete error:`, err),
+				tasks.push(
+					(async () => {
+						try {
+							await plugin.invokeHook("content:afterDelete", { id, collection, permanent });
+						} catch (err) {
+							console.error(`EmDash: Sandboxed plugin ${pluginId} afterDelete error:`, err);
+						}
+					})(),
 				);
-		}
+			}
+			await Promise.allSettled(tasks);
+		});
 	}
 
 	private runDeferredContentHook(

package/src/i18n/config.ts

@@ -30,6 +30,14 @@ export function getI18nConfig(): I18nConfig | null {
 	return _config ?? null;
 }
 
+/** Match a locale to the exact casing used by the site configuration. */
+export function resolveConfiguredLocale(locale: string): string {
+	return (
+		_config?.locales.find((configured) => configured.toLowerCase() === locale.toLowerCase()) ??
+		locale
+	);
+}
+
 /**
  * Check if i18n is enabled.
  * Returns true when multiple locales are configured.

package/src/i18n/repair-locale-casing.ts

@@ -0,0 +1,51 @@
+import type { Kysely } from "kysely";
+import { sql } from "kysely";
+
+import { listTablesLike } from "../database/dialect-helpers.js";
+import type { Database } from "../database/types.js";
+
+/** Rewrite stored locales to the exact casing used by the site configuration. */
+export async function repairLocaleCasing(
+	db: Kysely<Database>,
+	configuredLocales: readonly string[],
+): Promise<void> {
+	const tableNames = await listTablesLike(db, "ec_%");
+
+	for (const tableName of tableNames) {
+		const table = sql.ref(tableName);
+		const slug = tableName.slice("ec_".length);
+		for (const locale of configuredLocales) {
+			await sql`
+				UPDATE ${table} AS target
+				SET locale = ${locale}
+				WHERE lower(target.locale) = lower(${locale})
+					AND target.locale != ${locale}
+					AND NOT EXISTS (
+						SELECT 1
+						FROM ${table} AS existing
+						WHERE existing.slug = target.slug AND existing.locale = ${locale}
+					)
+					AND target.id = (
+						SELECT MIN(candidate.id)
+						FROM ${table} AS candidate
+						WHERE candidate.slug = target.slug
+							AND lower(candidate.locale) = lower(${locale})
+							AND candidate.locale != ${locale}
+					)
+			`.execute(db);
+
+			await sql`
+				UPDATE content_taxonomies AS pivot
+				SET locale = ${locale}
+				WHERE pivot.collection = ${slug}
+					AND lower(pivot.locale) = lower(${locale})
+					AND pivot.locale != ${locale}
+					AND EXISTS (
+						SELECT 1
+						FROM ${table} AS content
+						WHERE content.id = pivot.entry_id AND content.locale = ${locale}
+					)
+			`.execute(db);
+		}
+	}
+}

package/src/search/query.ts

@@ -10,6 +10,7 @@ import { sql } from "kysely";
 import { encodeCursor, decodeCursor, InvalidCursorError } from "../database/repositories/types.js";
 import type { Database } from "../database/types.js";
 import { validateIdentifier } from "../database/validate.js";
+import { resolveConfiguredLocale } from "../i18n/config.js";
 import { getDb } from "../loader.js";
 import { FTSManager } from "./fts-manager.js";
 import type {
@@ -250,7 +251,7 @@ async function searchSingleCollection(
 	const contentTable = ftsManager.getContentTableName(collection);
 	const limit = options.limit ?? 20;
 	const status = options.status ?? "published";
-	const locale = options.locale;
+	const locale = options.locale ? resolveConfiguredLocale(options.locale) : undefined;
 
 	// Check if FTS table exists
 	if (!(await ftsManager.ftsTableExists(collection))) {
@@ -397,7 +398,7 @@ export async function getSuggestions(
 	options: SuggestOptions = {},
 ): Promise<Suggestion[]> {
 	const limit = options.limit ?? 5;
-	const locale = options.locale;
+	const locale = options.locale ? resolveConfiguredLocale(options.locale) : undefined;
 
 	// Get searchable collections
 	let collections = options.collections;

package/src/seed/apply.ts

@@ -19,7 +19,7 @@ import { TaxonomyRepository } from "../database/repositories/taxonomy.js";
 import { withTransaction } from "../database/transaction.js";
 import type { Database } from "../database/types.js";
 import type { MediaValue } from "../fields/types.js";
-import { getI18nConfig } from "../i18n/config.js";
+import { getI18nConfig, resolveConfiguredLocale } from "../i18n/config.js";
 import { ssrfSafeFetch, validateExternalUrl } from "../import/ssrf.js";
 import { markContentMediaUsageCollectionStaleSafely } from "../media/usage/content-refresh.js";
 import { SchemaRegistry } from "../schema/registry.js";
@@ -263,7 +263,7 @@ export async function applySeed(
 		const termSeedIdMap = new Map<string, string>();
 
 		for (const taxonomy of seed.taxonomies) {
-			const defLocale = taxonomy.locale ?? defaultLocale;
+			const defLocale = resolveConfiguredLocale(taxonomy.locale ?? defaultLocale);
 
 			// (name, locale) is the UNIQUE key after migration 036.
 			const existingDef = await db
@@ -340,7 +340,7 @@ export async function applySeed(
 					);
 				} else {
 					for (const term of taxonomy.terms) {
-						const termLocale = term.locale ?? defLocale;
+						const termLocale = resolveConfiguredLocale(term.locale ?? defLocale);
 						const existing = await termRepo.findBySlug(taxonomy.name, term.slug, termLocale);
 						if (existing) {
 							if (onConflict === "error") {
@@ -464,7 +464,7 @@ export async function applySeed(
 					// Resolve the entry's locale up front so a non-`en` single-locale
 					// export (which omits `locale`) is filed under the project default
 					// rather than `en` (#1421).
-					const entryLocale = entry.locale ?? defaultLocale;
+					const entryLocale = resolveConfiguredLocale(entry.locale ?? defaultLocale);
 
 					// Check if entry exists (by slug + locale for locale-aware lookup)
 					const existing = await contentRepo.findBySlug(collectionSlug, entry.slug, entryLocale);
@@ -621,7 +621,7 @@ export async function applySeed(
 		const itemSeedIdMap = new Map<string, { id: string; translationGroup: string }>();
 
 		for (const menu of seed.menus) {
-			const locale = menu.locale ?? defaultLocale;
+			const locale = resolveConfiguredLocale(menu.locale ?? defaultLocale);
 			let lookup = db
 				.selectFrom("_emdash_menus")
 				.selectAll()
@@ -867,6 +867,8 @@ async function applyHierarchicalTerms(
 ): Promise<void> {
 	// "locale::slug" -> id, so the same slug can resolve per locale.
 	const slugToId = new Map<string, string>();
+	const resolveTermLocale = (term: SeedTaxonomyTerm) =>
+		resolveConfiguredLocale(term.locale ?? defLocale);
 
 	// Multiple passes — handles deep nesting and translationOf forward refs.
 	let remaining = [...terms];
@@ -876,7 +878,7 @@ async function applyHierarchicalTerms(
 		const processedThisPass: string[] = [];
 
 		for (const term of remaining) {
-			const termLocale = term.locale ?? defLocale;
+			const termLocale = resolveTermLocale(term);
 			const parentReady = !term.parent || slugToId.has(`${termLocale}::${term.parent}`);
 			const translationReady = !term.translationOf || termSeedIdMap.has(term.translationOf);
 
@@ -921,7 +923,7 @@ async function applyHierarchicalTerms(
 		}
 
 		remaining = remaining.filter(
-			(t) => !processedThisPass.includes(t.slug + "::" + (t.locale ?? defLocale)),
+			(term) => !processedThisPass.includes(term.slug + "::" + resolveTermLocale(term)),
 		);
 		maxPasses--;
 	}

package/src/seed/validate.ts

@@ -4,6 +4,7 @@
  * Validates a seed file structure before applying it.
  */
 
+import { getI18nConfig, resolveConfiguredLocale } from "../i18n/config.js";
 import { FIELD_TYPES } from "../schema/types.js";
 import type { SeedFile, SeedMenuItem, ValidationResult } from "./types.js";
 
@@ -49,6 +50,9 @@ export function validateSeed(data: unknown): ValidationResult {
 	}
 
 	const seed = data as Partial<SeedFile>;
+	const defaultLocale =
+		getI18nConfig()?.defaultLocale ??
+		(typeof seed.defaultLocale === "string" ? seed.defaultLocale : "en");
 
 	// Required fields
 	if (!seed.version) {
@@ -163,7 +167,8 @@ export function validateSeed(data: unknown): ValidationResult {
 					errors.push(`${prefix}: name is required`);
 				} else {
 					// Uniqueness is per (name, locale).
-					const key = `${taxonomy.name}::${taxonomy.locale ?? ""}`;
+					const locale = resolveConfiguredLocale(taxonomy.locale ?? defaultLocale);
+					const key = `${taxonomy.name}::${locale}`;
 					if (taxonomyNames.has(key)) {
 						errors.push(
 							taxonomy.locale
@@ -206,7 +211,10 @@ export function validateSeed(data: unknown): ValidationResult {
 							} else {
 								// Uniqueness is per (slug, locale) so the same slug can repeat
 								// across locale variants of the def.
-								const key = `${term.slug}::${term.locale ?? taxonomy.locale ?? ""}`;
+								const locale = resolveConfiguredLocale(
+									term.locale ?? taxonomy.locale ?? defaultLocale,
+								);
+								const key = `${term.slug}::${locale}`;
 								if (termSlugs.has(key)) {
 									errors.push(
 										`${termPrefix}.slug: duplicate term slug "${term.slug}" in taxonomy "${taxonomy.name}"`,
@@ -233,7 +241,9 @@ export function validateSeed(data: unknown): ValidationResult {
 						if (taxonomy.hierarchical && taxonomy.terms) {
 							for (let j = 0; j < taxonomy.terms.length; j++) {
 								const term = taxonomy.terms[j];
-								const termLocale = term.locale ?? taxonomy.locale ?? "";
+								const termLocale = resolveConfiguredLocale(
+									term.locale ?? taxonomy.locale ?? defaultLocale,
+								);
 								if (term.parent && !termSlugs.has(`${term.parent}::${termLocale}`)) {
 									errors.push(
 										`${prefix}.terms[${j}].parent: parent term "${term.parent}" not found in taxonomy`,
@@ -268,7 +278,8 @@ export function validateSeed(data: unknown): ValidationResult {
 				} else {
 					// Uniqueness is per (name, locale) — siblings of a translation
 					// group share name but differ in locale.
-					const key = `${menu.name}::${menu.locale ?? ""}`;
+					const locale = resolveConfiguredLocale(menu.locale ?? defaultLocale);
+					const key = `${menu.name}::${locale}`;
 					if (menuNames.has(key)) {
 						errors.push(
 							menu.locale