emdash 0.30.0 → 0.31.1

package/dist/astro/middleware.mjs

@@ -1,64 +1,64 @@
-import { a as runMigrations, n as MIGRATION_RACE_WAIT_MS, t as ConcurrentMigrationTimeoutError } from "../runner-DfnZ5eUr.mjs";
+import { a as runMigrations, n as MIGRATION_RACE_WAIT_MS, t as ConcurrentMigrationTimeoutError } from "../runner-BdeLEgad.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
-import { s as isSqlite } from "../dialect-helpers-HxEQGl_1.mjs";
-import { i as setI18nConfig } from "../config-CVssduLe.mjs";
-import { E as AuditRepository, _ as createHookPipeline, h as EmailPipeline, m as buildRouteMeta, p as PluginRouteRegistry, t as getMenu, v as resolveExclusiveHooks, y as definePlugin } from "../menus-BcyElFtI.mjs";
+import { c as listTablesLike, s as isSqlite } from "../dialect-helpers-BtOwo2us.mjs";
+import { a as setI18nConfig, n as getI18nConfig } from "../config-B6b_BobR.mjs";
+import { E as AuditRepository, _ as createHookPipeline, h as EmailPipeline, m as buildRouteMeta, p as PluginRouteRegistry, t as getMenu, v as resolveExclusiveHooks, y as definePlugin } from "../menus-CPf_SW7u.mjs";
 import { t as after } from "../after-B1IIdH3Y.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
 import "../object-cache-Bok5j2ae.mjs";
-import { r as RevisionRepository, t as ContentRepository } from "../content-Ci04z2z-.mjs";
+import { r as RevisionRepository, t as ContentRepository } from "../content-BC43pICM.mjs";
 import { n as isMissingTableError } from "../db-errors-CcWLaRiR.mjs";
 import "../base64-B-PsqheR.mjs";
-import "../types-D1iJ3DpO.mjs";
-import { t as MediaRepository } from "../media-BjhhENaJ.mjs";
-import "../user-Bh-L1qo6.mjs";
-import "../taxonomy-DfVooU4W.mjs";
-import "../comment-DPT0WKyd.mjs";
+import "../types-CrRUFdej.mjs";
+import { t as MediaRepository } from "../media-its1WLYv.mjs";
+import "../user-aTXqmXBz.mjs";
+import "../taxonomy-0mCI25HN.mjs";
+import "../comment-B9cUud8H.mjs";
 import { t as OptionsRepository } from "../options-BlmBHTvX.mjs";
-import { r as createSiteInfo } from "../context-B6hc7zJL.mjs";
-import "../menus-CZyG6rvx.mjs";
-import "../redirect-CgLPYflR.mjs";
+import { r as createSiteInfo } from "../context-DOurRIrb.mjs";
+import "../menus-BMGzWyWH.mjs";
+import "../redirect-BoUac4NT.mjs";
 import { i as setRequestCacheEntry, r as requestCached } from "../request-cache-BSUptuJR.mjs";
 import "../byline-registry-BCuOp4UF.mjs";
 import { n as initWithLock, t as createInitLock } from "../init-lock-DJkX6Hto.mjs";
-import "../field-defs-cache-DvmlgP-D.mjs";
-import "../byline-XEjchwzZ.mjs";
-import "../relation-9M9j_UWo.mjs";
+import "../field-defs-cache-KfNJ_qLQ.mjs";
+import "../byline-BTOxUlFF.mjs";
+import "../relation-Du0r04E0.mjs";
 import { n as normalizeMediaValue } from "../normalize-C-SHXmra.mjs";
 import "../enrich-CFJJgxs_.mjs";
-import "../seo-2cmFHZns.mjs";
-import { t as FTSManager } from "../fts-manager-DzqIBrrW.mjs";
-import "../resolve-Cd9dzclN.mjs";
+import "../seo-kJzVAmmu.mjs";
+import { t as FTSManager } from "../fts-manager-hyCU9OOp.mjs";
+import "../resolve-DFr4kq72.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
-import { a as getDb } from "../loader-Be3ouI5L.mjs";
-import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-DjSKBZpq.mjs";
-import { $ as handleContentDiscardDraft, B as handleMediaGet, G as handleRevisionRestore, H as handleMediaUpdate, J as handleContentCompare, Q as handleContentDelete, R as handleMediaCreate, U as handleRevisionGet, V as handleMediaList, W as handleRevisionList, X as handleContentCountTrashed, Y as handleContentCountScheduled, Z as handleContentCreate, _ as loadBundleFromR2, at as handleContentPermanentDelete, ct as handleContentSchedule, dt as handleContentUnschedule, et as handleContentDuplicate, ft as handleContentUpdate, it as handleContentListTrashed, lt as handleContentTranslations, nt as handleContentGetIncludingTrashed, ot as handleContentPublish, pt as validateRev, q as handleContentAuthors, rt as handleContentList, s as normalizeRegistryConfig, st as handleContentRestore, tt as handleContentGet, ut as handleContentUnpublish, z as handleMediaDelete } from "../api-b8WIiGU4.mjs";
-import "../dashboard-C5NkXFbi.mjs";
+import { a as getDb } from "../loader-D4rigvjR.mjs";
+import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-r7pqLBCn.mjs";
+import { $ as handleContentDiscardDraft, B as handleMediaGet, G as handleRevisionRestore, H as handleMediaUpdate, J as handleContentCompare, Q as handleContentDelete, R as handleMediaCreate, U as handleRevisionGet, V as handleMediaList, W as handleRevisionList, X as handleContentCountTrashed, Y as handleContentCountScheduled, Z as handleContentCreate, _ as loadBundleFromR2, at as handleContentPermanentDelete, ct as handleContentSchedule, dt as handleContentUnschedule, et as handleContentDuplicate, ft as handleContentUpdate, it as handleContentListTrashed, lt as handleContentTranslations, nt as handleContentGetIncludingTrashed, ot as handleContentPublish, pt as validateRev, q as handleContentAuthors, rt as handleContentList, s as normalizeRegistryConfig, st as handleContentRestore, tt as handleContentGet, ut as handleContentUnpublish, z as handleMediaDelete } from "../api-BkqFzIu4.mjs";
+import "../dashboard-CBm4zhc3.mjs";
 import { n as hashString } from "../hash-DFFrkivP.mjs";
-import { a as findNonTranslatableSiblingContentIds, c as refreshContentMediaUsageAfterWrite, o as markContentMediaUsageCollectionStale, r as deleteContentMediaUsage } from "../content-refresh-D4khvC0R.mjs";
-import "../media-usage-CljdO1mc.mjs";
-import { n as SchemaRegistry } from "../registry-FV15nLge.mjs";
-import "../query-Di7DOmPV.mjs";
-import "../zod-generator-B5prQ5M4.mjs";
-import "../schema-BXxlHeAf.mjs";
+import { a as findNonTranslatableSiblingContentIds, c as refreshContentMediaUsageAfterWrite, o as markContentMediaUsageCollectionStale, r as deleteContentMediaUsage } from "../content-refresh-CPMSauD3.mjs";
+import "../media-usage-DPQ3K4xB.mjs";
+import { n as SchemaRegistry } from "../registry-y21kjhfG.mjs";
+import "../query-DdFGHzQF.mjs";
+import "../zod-generator-CwkHWz4f.mjs";
+import "../schema-BH8P8vaC.mjs";
 import "../seo-C3GDfT0V.mjs";
 import { t as PluginStateRepository } from "../state-xxv6ZTMv.mjs";
-import "../sections-CwW4s1al.mjs";
+import "../sections-CzVBAKjw.mjs";
 import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-C2exrGAi.mjs";
-import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-CpA4lQFt.mjs";
-import "../settings-C4s8hFQm.mjs";
-import "../taxonomies-Ce49uIzY.mjs";
+import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-C2PaBS49.mjs";
+import "../settings-Dtc0DU31.mjs";
+import "../taxonomies-BN6M9Nrv.mjs";
 import { r as normalizeManifestRoute } from "../manifest-schema-bCq54i7F.mjs";
 import "../types-CK0LxPUQ.mjs";
 import "../ssrf-CviKqWmq.mjs";
-import "../error-CEGF6UZb.mjs";
-import "../parse-C_-6klII.mjs";
-import "../media-kIV1IxFf.mjs";
-import "../redirects-BBq3n2Rj.mjs";
-import "../relations-5_avdrN_.mjs";
+import "../error-DJ98TRbQ.mjs";
+import "../parse-53zyxlpv.mjs";
+import "../media-BJ6SRY3g.mjs";
+import "../redirects-D457qwt0.mjs";
+import "../relations-CZMpBqEd.mjs";
 import "../status-COfycGIU.mjs";
-import { a as invalidateUrlPatternCache } from "../query-DR73ZNfm.mjs";
-import "../import-Dmkm8S1W.mjs";
+import { a as invalidateUrlPatternCache } from "../query-Bz9bWZfm.mjs";
+import "../import-oDYCgNYQ.mjs";
 import { t as getTrustedProxyHeaders } from "../trusted-proxy-CwjQj0YG.mjs";
 import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-DzXYYI-n.mjs";
 import "../ssrf-BB__xfNM.mjs";
@@ -67,20 +67,20 @@ import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from ".
 import "../utils-BbUgmeZG.mjs";
 import "../tokens-DVltpO2D.mjs";
 import "../preview-D4Jnbfx7.mjs";
-import "../hreflang-db2Tpb2o.mjs";
-import "../comment-reaction-C65MldIB.mjs";
-import "../bylines-czseViYo.mjs";
-import { n as getWidgetAreas } from "../widgets-DGv1Z04V.mjs";
-import "../apply-CmIJK9j8.mjs";
-import "../load-Cx27ki1l.mjs";
-import "../search-Bff-7jFt.mjs";
+import "../hreflang-CbYeCzl9.mjs";
+import "../comment-reaction-VUXO981F.mjs";
+import "../bylines-Bc-3xtpz.mjs";
+import { n as getWidgetAreas } from "../widgets-5fipNkMT.mjs";
+import "../apply-DuXsqll7.mjs";
+import "../load-Dg5gtWma.mjs";
+import "../search-D-Yhpmvs.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-907opKac.mjs";
+import { n as VERSION, t as COMMIT } from "../version-BRMngh9I.mjs";
 import { t as getAuthMode } from "../mode-fiXRMfeA.mjs";
 import "../snapshot-BdpUJKD-.mjs";
-import { u as maybeRunScheduledBackup } from "../backup-S8kFWtwD.mjs";
+import { u as maybeRunScheduledBackup } from "../backup-DoW-H0r4.mjs";
 import { t as cleanupExpiredChallenges } from "../challenge-store-BFzgFRog.mjs";
-import { a as validateEncryptionKeyAtStartup } from "../secrets-CSwQIl4q.mjs";
+import { a as validateEncryptionKeyAtStartup } from "../secrets-CQ-69kF9.mjs";
 import { t as resolveSessionUser } from "../session-user-DbHqKDKe.mjs";
 import { Kysely, sql } from "kysely";
 import { z } from "zod";
@@ -96,6 +96,49 @@ import { createScheduler } from "virtual:emdash/scheduler";
 import { createStorage } from "virtual:emdash/storage";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 
+//#region src/i18n/repair-locale-casing.ts
+/** Rewrite stored locales to the exact casing used by the site configuration. */
+async function repairLocaleCasing(db, configuredLocales) {
+	const tableNames = await listTablesLike(db, "ec_%");
+	for (const tableName of tableNames) {
+		const table = sql.ref(tableName);
+		const slug = tableName.slice(3);
+		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);
+		}
+	}
+}
+
+//#endregion
 //#region src/plugins/sandbox/runner-options.ts
 /**
 * Build platform sandbox options with the same normalized site context used
@@ -304,6 +347,11 @@ async function publishDueContent(db, options = {}) {
 * Created once per worker lifetime, cached and reused across requests.
 */
 const LEADING_SLASH_PATTERN = /^\//;
+const LOCALE_CASING_REPAIR_OPTION = "emdash:repair_locale_casing";
+function getLocaleCasingRepairVersion(locales) {
+	if (locales.length === 0) return null;
+	return `1:${locales.toSorted().join(",")}`;
+}
 /**
 * Parse a JSON column expected to contain an array of strings.
 *
@@ -901,6 +949,9 @@ var EmDashRuntime = class EmDashRuntime {
 		await phase("rt.secrets", "Validate encryption key", () => validateEncryptionKeyAtStartup());
 		const storage = EmDashRuntime.getStorage(deps);
 		let pluginStates = /* @__PURE__ */ new Map();
+		const configuredLocales = virtualConfig?.i18n?.locales ?? getI18nConfig()?.locales ?? [];
+		const localeCasingRepairVersion = getLocaleCasingRepairVersion(configuredLocales);
+		let storedLocaleCasingRepairVersion;
 		let siteInfo;
 		let seedGate = {
 			collectionCount: 1,
@@ -927,8 +978,10 @@ var EmDashRuntime = class EmDashRuntime {
 			const siteOpts = await optionsRepo.getMany([
 				"emdash:site_title",
 				"emdash:site_url",
-				"emdash:locale"
+				"emdash:locale",
+				LOCALE_CASING_REPAIR_OPTION
 			]);
+			storedLocaleCasingRepairVersion = siteOpts.get(LOCALE_CASING_REPAIR_OPTION);
 			return {
 				siteName: siteOpts.get("emdash:site_title") ?? void 0,
 				siteUrl: siteOpts.get("emdash:site_url") ?? void 0,
@@ -963,14 +1016,18 @@ var EmDashRuntime = class EmDashRuntime {
 			} catch {}
 		}));
 		await Promise.all(coldStartReads);
+		if (localeCasingRepairVersion && (configuredLocales.some((locale) => locale.includes("-") || locale !== locale.toLowerCase()) || storedLocaleCasingRepairVersion !== void 0) && storedLocaleCasingRepairVersion !== localeCasingRepairVersion) await phase("rt.locale", "Repair locale casing", async () => {
+			await repairLocaleCasing(db, configuredLocales);
+			await new OptionsRepository(db).set(LOCALE_CASING_REPAIR_OPTION, localeCasingRepairVersion);
+		});
 		if (seedGate.collectionCount === 0 && !seedGate.setupDone) {
 			const seedKey = deps.config.database?.entrypoint ?? "default";
 			const seedHolder = getSeedHolder();
 			try {
 				await initWithLock(seedHolder.lock, () => seedHolder.done.has(seedKey) ? true : void 0, async () => {
-					const { applySeed } = await import("../apply-CmIJK9j8.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-Cx27ki1l.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-V9nCwq_-.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-DuXsqll7.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-Dg5gtWma.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-CDT1jl6_.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -1730,7 +1787,7 @@ var EmDashRuntime = class EmDashRuntime {
 		if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(body.data, collection, true)).content;
 		processedData = await this.runSandboxedBeforeSave(processedData, collection, true);
 		processedData = await this.normalizeMediaFields(collection, processedData);
-		const { validateContentData } = await import("../validation-BsVUJfsP.mjs");
+		const { validateContentData } = await import("../validation-DlD0E35W.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1747,7 +1804,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-Ci04z2z-.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-BC43pICM.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id, body.locale);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1774,7 +1831,7 @@ var EmDashRuntime = class EmDashRuntime {
 			if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(bodyWithoutRev.data, collection, false)).content;
 			processedData = await this.runSandboxedBeforeSave(processedData, collection, false);
 			processedData = await this.normalizeMediaFields(collection, processedData);
-			const { validateContentData } = await import("../validation-BsVUJfsP.mjs");
+			const { validateContentData } = await import("../validation-DlD0E35W.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -2324,16 +2381,30 @@ var EmDashRuntime = class EmDashRuntime {
 		});
 	}
 	runAfterDeleteHooks(id, collection, permanent) {
-		if (this.hooks.hasHooks("content:afterDelete")) this.hooks.runContentAfterDelete(id, collection, permanent).catch((err) => console.error("EmDash afterDelete hook error:", err));
-		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));
-		}
+		after(async () => {
+			if (this.hooks.hasHooks("content:afterDelete")) try {
+				await this.hooks.runContentAfterDelete(id, collection, permanent);
+			} catch (err) {
+				console.error("EmDash afterDelete hook error:", err);
+			}
+			const tasks = [];
+			for (const [pluginKey, plugin] of this.sandboxedPlugins) {
+				const [pluginId] = pluginKey.split(":");
+				if (!pluginId || !this.isPluginEnabled(pluginId)) continue;
+				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);
+		});
 	}
 	runDeferredContentHook(name, content, collection) {
 		const label = name.slice(8);
@@ -2716,10 +2787,15 @@ async function prefetchWidgetAreas() {
 	const areas = await getWidgetAreas();
 	for (const area of areas) setRequestCacheEntry(`widget-area:${area.name}`, area);
 }
-/** Warm every taxonomy's term list via the real helper (primes per-name keys). */
+/**
+* Warm every taxonomy's term list via the real helper (primes per-name keys).
+* Counts are left out: they cost an aggregate over the whole assignment pivot
+* per taxonomy, and only a consumer that renders one can say it's needed. A
+* consumer that does asks for it and reuses the term list warmed here.
+*/
 async function prefetchTaxonomyTerms() {
 	const defs = await getTaxonomyDefs();
-	await Promise.allSettled(defs.map((def) => getTaxonomyTerms(def.name)));
+	await Promise.allSettled(defs.map((def) => getTaxonomyTerms(def.name, { includeCounts: false })));
 }
 /** Warm every menu via the real helper (primes `menu:${name}:${locale}`). */
 async function prefetchMenus() {
@@ -3123,7 +3199,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (!isSetupVerified() && !context.isPrerendered) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-Be3ouI5L.mjs").then((n) => n.o);
+						const { getDb } = await import("../loader-D4rigvjR.mjs").then((n) => n.o);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						markSetupVerified();
 					} catch (error) {