emdash 1.3.0 → 1.4.0

package/dist/{loader-CswroUbe.mjs → loader-DhnedqY4.mjs}

@@ -1,14 +1,17 @@
-import { d as __exportAll } from "./runner-C5NeAkBQ.mjs";
-import { n as isMissingTableError, t as isMissingColumnError } from "./db-errors-CBD5yMro.mjs";
+import { f as __exportAll } from "./runner-Bkkfk4O8.mjs";
+import { n as isMissingColumnError, r as isMissingTableError, t as getMissingColumnIdentifier } from "./db-errors-unnO6yiZ.mjs";
 import { t as validateIdentifier } from "./validate-DANX1-Qi.mjs";
-import { n as buildStatusCondition, u as isPostgres } from "./dialect-helpers-7_IqPdh9.mjs";
-import { r as getI18nConfig } from "./config-CvmjJcVw.mjs";
+import { n as buildStatusCondition, u as isPostgres } from "./dialect-helpers-B1XN2HGB.mjs";
+import { i as getLocaleCandidates, r as getI18nConfig } from "./config-Cs_AwWXI.mjs";
+import { t as after } from "./after-32yNRvd2.mjs";
 import { getRequestContext } from "./request-context.mjs";
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-xC4UD5-S.mjs";
-import { i as setRequestCacheEntry } from "./request-cache-C4CIo5ad.mjs";
-import { c as decodeCursor, i as InvalidCursorError, l as encodeCursor } from "./types-D2NEXtgB.mjs";
+import { n as invalidateSingleFlightCache, r as singleFlightCached, t as createSingleFlightCache } from "./single-flight-cache-D0EaGbN1.mjs";
+import { i as storedLocaleOrder, n as localeMatches, r as localeOrder, t as canonicalLocaleColumn } from "./query-BFHjCzSh.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-DiW8VMwz.mjs";
+import { i as setRequestCacheEntry } from "./request-cache-5z2WzWmh.mjs";
+import { a as InvalidCursorError, l as decodeCursor, u as encodeCursor } from "./types-DwhEvIVb.mjs";
 import { kyselyLogOption } from "./database/instrumentation.mjs";
-import { t as jsonTextValues } from "./json-recordset-BUjxhr77.mjs";
+import { t as jsonTextValues } from "./json-recordset-D0WhN2UA.mjs";
 import { Kysely, sql } from "kysely";
 
 //#region src/database/repositories/taxonomy-def.ts
@@ -19,8 +22,8 @@ import { Kysely, sql } from "kysely";
 * A row that has no group yet, because code without the group table wrote it
 * during a rolling deploy, reads its own copy.
 */
-function selectTaxonomyDefs(db) {
-	return db.selectFrom("_emdash_taxonomy_defs as d").leftJoin("_emdash_taxonomy_def_groups as g", "g.name", "d.name").select([
+function selectTaxonomyDefs(db, locale) {
+	let query = db.selectFrom("_emdash_taxonomy_defs as d").leftJoin("_emdash_taxonomy_def_groups as g", "g.name", "d.name").select([
 		"d.id",
 		"d.name",
 		"d.label",
@@ -31,6 +34,8 @@ function selectTaxonomyDefs(db) {
 		sql`coalesce(g.hierarchical, d.hierarchical)`.as("hierarchical"),
 		sql`coalesce(g.collections, d.collections)`.as("collections")
 	]);
+	if (locale !== void 0) query = query.where(localeMatches("d.locale", locale)).orderBy(localeOrder("d.locale", locale), "asc");
+	return query;
 }
 /**
 * The taxonomy's group id and structure, or null when no locale defines `name`.
@@ -109,15 +114,78 @@ function primeSeoPanel(collection, id, seo) {
 	setRequestCacheEntry(seoPanelCacheKey(collection, id), seo);
 }
 
+//#endregion
+//#region src/utils/revalidating-cache.ts
+const REVALIDATING_CACHE_TTL_MS = 3e4;
+function createRevalidatingCache() {
+	return {
+		snapshot: null,
+		expiresAt: 0,
+		generation: 0,
+		revalidatingUntil: 0,
+		refresh: createSingleFlightCache()
+	};
+}
+function invalidateRevalidatingCache(cache) {
+	cache.generation++;
+	cache.snapshot = null;
+	cache.expiresAt = 0;
+	cache.revalidatingUntil = 0;
+	invalidateSingleFlightCache(cache.refresh);
+}
+/** Serve the last good snapshot while an expired value refreshes via after(). */
+async function revalidatingCached(cache, load, onError) {
+	const refresh = () => singleFlightCached(cache.refresh, load, {
+		anchor: (promise) => after(() => promise),
+		ownerTimeoutMs: REVALIDATING_CACHE_TTL_MS
+	});
+	const install = (value) => {
+		cache.snapshot = { value };
+		cache.expiresAt = Date.now() + REVALIDATING_CACHE_TTL_MS;
+	};
+	const revalidate = () => {
+		const now = Date.now();
+		if (cache.revalidatingUntil > now) return;
+		cache.revalidatingUntil = now + REVALIDATING_CACHE_TTL_MS;
+		const generation = ++cache.generation;
+		invalidateSingleFlightCache(cache.refresh);
+		after(async () => {
+			try {
+				const value = await refresh();
+				if (generation === cache.generation) install(value);
+			} catch (error) {
+				onError(error);
+			}
+		});
+	};
+	for (let attempt = 0; attempt < 3; attempt++) {
+		const snapshot = cache.snapshot;
+		if (snapshot) {
+			if (Date.now() >= cache.expiresAt) revalidate();
+			return snapshot.value;
+		}
+		const generation = cache.generation;
+		const loaded = await refresh();
+		if (generation === cache.generation) {
+			install(loaded);
+			return loaded;
+		}
+		if (attempt === 2) return loaded;
+	}
+	throw new Error("Revalidating cache refresh exhausted without loading value");
+}
+
 //#endregion
 //#region src/loader.ts
 var loader_exports = /* @__PURE__ */ __exportAll({
 	CURSOR_RAW_VALUES: () => CURSOR_RAW_VALUES,
+	FOLDED_AUTHOR_BYLINE: () => FOLDED_AUTHOR_BYLINE,
 	FOLDED_BYLINES: () => FOLDED_BYLINES,
 	FOLDED_BYLINES_EXIST: () => FOLDED_BYLINES_EXIST,
 	FOLDED_TERMS: () => FOLDED_TERMS,
 	LARGE_TERM_ASSIGNMENTS: () => LARGE_TERM_ASSIGNMENTS,
 	buildTaxonomyPivotQuery: () => buildTaxonomyPivotQuery,
+	creditFromFoldedAuthorByline: () => creditFromFoldedAuthorByline,
 	creditsFromFoldedBylines: () => creditsFromFoldedBylines,
 	emdashLoader: () => emdashLoader,
 	encodeSortCursor: () => encodeSortCursor,
@@ -198,6 +266,13 @@ const FOLDED_BYLINES = Symbol.for("emdash:foldedBylines");
 */
 const FOLDED_BYLINES_EXIST = Symbol.for("emdash:foldedBylinesExist");
 /**
+* Marker for the folded author-fallback byline: the byline linked to the
+* entry's `author_id` in the entry's locale, or `null` when there is none.
+* Lets byline hydration resolve an entry with no explicit credit without the
+* byline query path. Unset when the row's fold predates it.
+*/
+const FOLDED_AUTHOR_BYLINE = Symbol.for("emdash:foldedAuthorByline");
+/**
 * Correlated JSON-array subqueries that fold taxonomy-term and byline hydration
 * into the content query, removing the two separate hydration round trips per
 * fetch. `outer` is the content table's alias/name; each subquery correlates on
@@ -218,11 +293,40 @@ function foldedHydrationSelects(db, type, outer) {
 	const termObj = obj("'id', coalesce(exact_term.id, default_term.id), 'name', coalesce(exact_term.name, default_term.name), 'slug', coalesce(exact_term.slug, default_term.slug), 'label', coalesce(exact_term.label, default_term.label), 'parent_id', coalesce(exact_term.parent_id, default_term.parent_id), 'locale', coalesce(exact_term.locale, default_term.locale), 'translation_group', coalesce(exact_term.translation_group, default_term.translation_group)");
 	const defaultLocale = getI18nConfig()?.defaultLocale ?? "en";
 	const selectedTermId = sql`coalesce(exact_term.id, default_term.id)`;
-	const terms = sql`(SELECT ${pg ? sql`coalesce(json_agg(${termObj}) FILTER (WHERE ${selectedTermId} IS NOT NULL), '[]'::json)` : sql`json_group_array(${termObj}) FILTER (WHERE ${selectedTermId} IS NOT NULL)`} FROM ${sql.ref("content_taxonomies")} AS ct LEFT JOIN ${sql.ref("taxonomies")} AS exact_term ON exact_term.translation_group = ct.taxonomy_id AND exact_term.locale = ${o}.locale LEFT JOIN ${sql.ref("taxonomies")} AS default_term ON default_term.translation_group = ct.taxonomy_id AND default_term.locale = ${defaultLocale} WHERE ct.collection = ${type} AND ct.entry_id = ${o}.translation_group) AS ${sql.ref("_emdash_terms")}`;
+	const termAgg = pg ? sql`coalesce(json_agg(${termObj}) FILTER (WHERE ${selectedTermId} IS NOT NULL), '[]'::json)` : sql`json_group_array(${termObj}) FILTER (WHERE ${selectedTermId} IS NOT NULL)`;
+	const hasLocaleAliases = Object.keys(getI18nConfig()?.localeAliases ?? {}).length > 0;
+	const terms = hasLocaleAliases ? sql`(SELECT ${termAgg} FROM ${sql.ref("content_taxonomies")} AS ct
+		LEFT JOIN ${sql.ref("taxonomies")} AS exact_term ON exact_term.id = (
+			SELECT candidate.id FROM taxonomies AS candidate
+			WHERE candidate.translation_group = ct.taxonomy_id
+				AND ${canonicalLocaleColumn("candidate.locale")} = ${canonicalLocaleColumn(`${outer}.locale`)}
+			ORDER BY ${storedLocaleOrder("candidate.locale")}, candidate.id LIMIT 1
+		)
+		LEFT JOIN ${sql.ref("taxonomies")} AS default_term ON default_term.id = (
+			SELECT candidate.id FROM taxonomies AS candidate
+			WHERE candidate.translation_group = ct.taxonomy_id
+				AND ${localeMatches("candidate.locale", defaultLocale)}
+			ORDER BY ${localeOrder("candidate.locale", defaultLocale)}, candidate.id LIMIT 1
+		)
+		WHERE ct.collection = ${type} AND ct.entry_id = ${o}.translation_group) AS ${sql.ref("_emdash_terms")}` : sql`(SELECT ${termAgg} FROM ${sql.ref("content_taxonomies")} AS ct LEFT JOIN ${sql.ref("taxonomies")} AS exact_term ON exact_term.translation_group = ct.taxonomy_id AND exact_term.locale = ${o}.locale LEFT JOIN ${sql.ref("taxonomies")} AS default_term ON default_term.translation_group = ct.taxonomy_id AND default_term.locale = ${defaultLocale} WHERE ct.collection = ${type} AND ct.entry_id = ${o}.translation_group) AS ${sql.ref("_emdash_terms")}`;
 	const bylineInner = obj("'id', b.id, 'slug', b.slug, 'displayName', b.display_name, 'bio', b.bio, 'avatarMediaId', b.avatar_media_id, 'avatarStorageKey', m.storage_key, 'avatarAlt', m.alt, 'avatarBlurhash', m.blurhash, 'avatarDominantColor', m.dominant_color, 'websiteUrl', b.website_url, 'userId', b.user_id, 'isGuest', b.is_guest, 'createdAt', b.created_at, 'updatedAt', b.updated_at, 'locale', b.locale, 'translationGroup', b.translation_group");
+	const credit = sql`${pg ? sql.raw("json_build_object('roleLabel', cb.role_label, 'sortOrder', cb.sort_order, 'byline', ") : sql.raw("json_object('roleLabel', cb.role_label, 'sortOrder', cb.sort_order, 'byline', ")}${bylineInner})`;
+	const credits = hasLocaleAliases ? sql`(SELECT ${agg(credit)} FROM ${sql.ref("_emdash_content_bylines")} AS cb
+		${foldJoin} ${sql.ref("_emdash_bylines")} AS b ON b.id = (
+			SELECT candidate.id FROM _emdash_bylines AS candidate
+			WHERE candidate.translation_group = cb.byline_id
+				AND ${canonicalLocaleColumn("candidate.locale")} = ${canonicalLocaleColumn(`${outer}.locale`)}
+			ORDER BY ${storedLocaleOrder("candidate.locale")}, candidate.id LIMIT 1
+		)
+		LEFT JOIN ${sql.ref("media")} AS m ON m.id = b.avatar_media_id
+		WHERE cb.collection_slug = ${type} AND cb.content_id = ${o}.id)` : sql`(SELECT ${agg(credit)} FROM ${sql.ref("_emdash_content_bylines")} AS cb ${foldJoin} ${sql.ref("_emdash_bylines")} AS b ON b.translation_group = cb.byline_id LEFT JOIN ${sql.ref("media")} AS m ON m.id = b.avatar_media_id WHERE cb.collection_slug = ${type} AND cb.content_id = ${o}.id AND b.locale = ${o}.locale)`;
+	const author = hasLocaleAliases ? sql`(SELECT ${bylineInner} FROM ${sql.ref("_emdash_bylines")} AS b LEFT JOIN ${sql.ref("media")} AS m ON m.id = b.avatar_media_id
+		WHERE b.user_id = ${o}.author_id
+			AND ${canonicalLocaleColumn("b.locale")} = ${canonicalLocaleColumn(`${outer}.locale`)}
+		ORDER BY ${storedLocaleOrder("b.locale")}, b.id LIMIT 1)` : sql`(SELECT ${bylineInner} FROM ${sql.ref("_emdash_bylines")} AS b LEFT JOIN ${sql.ref("media")} AS m ON m.id = b.avatar_media_id WHERE b.user_id = ${o}.author_id AND b.locale = ${o}.locale LIMIT 1)`;
 	return {
 		terms,
-		bylines: sql`(SELECT ${agg(sql`${pg ? sql.raw("json_build_object('roleLabel', cb.role_label, 'sortOrder', cb.sort_order, 'byline', ") : sql.raw("json_object('roleLabel', cb.role_label, 'sortOrder', cb.sort_order, 'byline', ")}${bylineInner})`)} FROM ${sql.ref("_emdash_content_bylines")} AS cb ${foldJoin} ${sql.ref("_emdash_bylines")} AS b ON b.translation_group = cb.byline_id LEFT JOIN ${sql.ref("media")} AS m ON m.id = b.avatar_media_id WHERE cb.collection_slug = ${type} AND cb.content_id = ${o}.id AND b.locale = ${o}.locale) AS ${sql.ref("_emdash_bylines")}`,
+		bylines: pg ? sql`json_build_object('credits', ${credits}, 'author', ${author}) AS ${sql.ref("_emdash_bylines")}` : sql`json_object('credits', json(${credits}), 'author', json(${author})) AS ${sql.ref("_emdash_bylines")}`,
 		bylinesExist: sql`(SELECT 1 FROM ${sql.ref("_emdash_bylines")} LIMIT 1) AS ${sql.ref("_emdash_bylines_exist")}`
 	};
 }
@@ -276,22 +380,38 @@ function expandFoldedSeo(row) {
 	if (!parsed) return;
 	for (const [col, alias] of Object.entries(SEO_COLUMN_ALIASES)) row[alias] = parsed[col] ?? null;
 }
+/**
+* A folded byline object as a `BylineSummary`. The fold's JSON keys are the
+* `BylineSummary` keys (see `bylineInner` in {@link foldedHydrationSelects}).
+*/
+function foldedBylineSummary(raw) {
+	const byline = isPlainObject(raw) ? raw : {};
+	return {
+		...byline,
+		isGuest: Boolean(byline.isGuest),
+		customFields: {}
+	};
+}
 function creditsFromFoldedBylines(folded) {
 	return folded.map((raw) => {
 		const credit = isPlainObject(raw) ? raw : {};
-		const byline = isPlainObject(credit.byline) ? credit.byline : {};
 		return {
 			roleLabel: typeof credit.roleLabel === "string" ? credit.roleLabel : null,
 			sortOrder: Number(credit.sortOrder ?? 0),
 			source: "explicit",
-			byline: {
-				...byline,
-				isGuest: Boolean(byline.isGuest),
-				customFields: {}
-			}
+			byline: foldedBylineSummary(credit.byline)
 		};
 	}).toSorted((a, b) => a.sortOrder - b.sortOrder);
 }
+/** The inferred credit for a folded author-fallback byline. */
+function creditFromFoldedAuthorByline(raw) {
+	return {
+		byline: foldedBylineSummary(raw),
+		sortOrder: 0,
+		roleLabel: null,
+		source: "inferred"
+	};
+}
 /**
 * Stash folded hydration JSON (non-enumerable) for the query.ts fast paths.
 * SQLite returns a JSON string (parse it); Postgres returns already-parsed JSON.
@@ -305,8 +425,18 @@ function stashFolded(data, row) {
 		} catch {
 			continue;
 		}
-		else if (Array.isArray(raw)) value = raw;
+		else if (Array.isArray(raw) || isPlainObject(raw)) value = raw;
 		else continue;
+		if (sym === FOLDED_BYLINES && isPlainObject(value)) {
+			const { credits, author } = value;
+			if (author === null || isPlainObject(author)) Object.defineProperty(data, FOLDED_AUTHOR_BYLINE, {
+				value: author,
+				enumerable: false,
+				configurable: true
+			});
+			value = credits;
+		}
+		if (!Array.isArray(value)) continue;
 		Object.defineProperty(data, sym, {
 			value,
 			enumerable: false,
@@ -354,62 +484,37 @@ function getTableName(type) {
 	validateIdentifier(type, "collection type");
 	return `ec_${type}`;
 }
-const TAXONOMY_NAMES_CACHE_KEY = Symbol.for("emdash:taxonomy-names");
+const TAXONOMY_NAMES_CACHE_KEY = Symbol.for("emdash:taxonomy-names:swr");
 const taxonomyNamesStore = globalThis;
-const taxonomyNamesHolder = taxonomyNamesStore[TAXONOMY_NAMES_CACHE_KEY] ?? (() => {
-	const holder = { cache: null };
-	taxonomyNamesStore[TAXONOMY_NAMES_CACHE_KEY] = holder;
-	return holder;
+const taxonomyNamesCache = taxonomyNamesStore[TAXONOMY_NAMES_CACHE_KEY] ?? (() => {
+	const cache = createRevalidatingCache();
+	taxonomyNamesStore[TAXONOMY_NAMES_CACHE_KEY] = cache;
+	return cache;
 })();
-function setTaxonomyNamesCache(cache) {
-	taxonomyNamesHolder.cache = cache;
-}
-/**
-* Get taxonomy names attached to a collection (cached for the primary DB,
-* bypassed only when the per-request DB is an isolated instance — playground /
-* DO preview). Plain D1 Sessions routing shares schema with the singleton, so
-* the isolate-wide cache stays valid.
-*/
-async function getTaxonomyNames(db, collection) {
-	const hasIsolatedDb = getRequestContext()?.dbIsIsolated === true;
-	if (!hasIsolatedDb && taxonomyNamesHolder.cache) return taxonomyNamesHolder.cache.get(collection) ?? /* @__PURE__ */ new Set();
+async function fetchTaxonomyNames(db) {
 	try {
 		const defs = await selectTaxonomyDefs(db).execute();
 		const namesByCollection = /* @__PURE__ */ new Map();
-		for (const def of defs) {
-			let collections;
-			try {
-				collections = JSON.parse(def.collections ?? "[]");
-			} catch {
-				continue;
-			}
-			if (!Array.isArray(collections)) continue;
-			for (const attachedCollection of collections) {
-				if (typeof attachedCollection !== "string") continue;
-				const names = namesByCollection.get(attachedCollection) ?? /* @__PURE__ */ new Set();
-				names.add(def.name);
-				namesByCollection.set(attachedCollection, names);
-			}
+		for (const def of defs) for (const collection of parseTaxonomyCollections(def.collections)) {
+			const names = namesByCollection.get(collection) ?? /* @__PURE__ */ new Set();
+			names.add(def.name);
+			namesByCollection.set(collection, names);
 		}
-		if (!hasIsolatedDb) setTaxonomyNamesCache(namesByCollection);
-		return namesByCollection.get(collection) ?? /* @__PURE__ */ new Set();
+		return namesByCollection;
 	} catch (error) {
 		if (!isMissingTableError(error) && !isMissingColumnError(error)) throw error;
-		const empty = /* @__PURE__ */ new Set();
-		if (!hasIsolatedDb) setTaxonomyNamesCache(/* @__PURE__ */ new Map());
-		return empty;
+		return /* @__PURE__ */ new Map();
 	}
 }
-/**
-* Reset the isolate-wide taxonomy-names cache.
-*
-* Called from `invalidateTaxonomyDefsCache()` so that creating or seeding a
-* taxonomy definition is reflected within the current isolate instead of
-* waiting for the isolate to recycle. Keeps this cache consistent with the
-* isolate-wide taxonomy-defs cache in `taxonomies/index.ts`.
-*/
+async function getTaxonomyNames(db, collection) {
+	const load = () => fetchTaxonomyNames(db);
+	return (getRequestContext()?.dbIsIsolated ? await load() : await revalidatingCached(taxonomyNamesCache, load, (error) => {
+		console.error("[emdash:loader] revalidating taxonomy names failed:", error);
+	})).get(collection) ?? /* @__PURE__ */ new Set();
+}
+/** Discard mappings after a local taxonomy-definition write. @internal */
 function resetTaxonomyNamesCache() {
-	setTaxonomyNamesCache(null);
+	invalidateRevalidatingCache(taxonomyNamesCache);
 }
 /**
 * System columns to include in data (mapped to camelCase where needed)
@@ -573,10 +678,7 @@ function revisionEntry(row, parsed, booleanFields, sortColumn) {
 		slug,
 		status: rowStr(row, "status", "draft"),
 		data,
-		cacheHint: {
-			tags: [rowStr(row, "id")],
-			lastModified: row.updated_at ? new Date(rowStr(row, "updated_at")) : void 0
-		}
+		cacheHint: { tags: [rowStr(row, "id")] }
 	};
 }
 /**
@@ -612,7 +714,8 @@ async function loadEntriesByGroups(type, translationGroups, options = {}) {
 	const statusFilter = options.publishedOnly ? sql`AND status = ${"published"}` : sql``;
 	const booleanFieldsSelect = foldedBooleanFieldsSelect(db, type);
 	const localeChain = options.localeChain ?? [];
-	const chainPosition = localeChain.length > 0 ? sql`CASE locale ${sql.join(localeChain.map((locale, index) => sql`WHEN ${locale} THEN ${sql.lit(index)}`), sql` `)} ELSE ${sql.lit(localeChain.length)} END,` : sql``;
+	const localeCandidates = [...new Set(localeChain.flatMap((locale) => getLocaleCandidates(locale)))];
+	const chainPosition = localeCandidates.length > 0 ? sql`CASE locale ${sql.join(localeCandidates.map((locale, index) => sql`WHEN ${locale} THEN ${sql.lit(index)}`), sql` `)} ELSE ${sql.lit(localeCandidates.length)} END,` : sql``;
 	const entries = [];
 	try {
 		for (const chunk of chunks(translationGroups, SQL_BATCH_SIZE)) {
@@ -636,10 +739,7 @@ async function loadEntriesByGroups(type, translationGroups, options = {}) {
 				slug: rowStr(row, "slug"),
 				status: rowStr(row, "status", "draft"),
 				data: mapRowToData(row, booleanFields),
-				cacheHint: {
-					tags: [rowStr(row, "id")],
-					lastModified: row.updated_at ? new Date(rowStr(row, "updated_at")) : void 0
-				}
+				cacheHint: { tags: [rowStr(row, "id")] }
 			});
 		}
 	} catch (error) {
@@ -837,7 +937,7 @@ const SYSTEM_QUERY_KEYS = new Set([...SYSTEM_COLUMNS, "slug"]);
 async function findStoragelessQueryKey(collection, keys) {
 	const candidates = keys.filter((key) => !SYSTEM_QUERY_KEYS.has(key));
 	if (candidates.length === 0) return void 0;
-	const { getReferenceFieldMap } = await import("./field-map-Bft9LKak.mjs").then((n) => n.t);
+	const { getReferenceFieldMap } = await import("./field-map-BSXdNGt5.mjs").then((n) => n.t);
 	const bound = await getReferenceFieldMap(collection);
 	return candidates.find((key) => bound.has(key));
 }
@@ -936,7 +1036,7 @@ function isIndexedPivotSort(orderBy) {
 */
 async function resolveTermGroups(db, name, slugs, locale, probeCollection) {
 	let query = db.selectFrom("taxonomies").select("translation_group").distinct().where("name", "=", name).where("slug", "in", slugs).$if(probeCollection !== void 0, (qb) => qb.select((eb) => eb.selectFrom("content_taxonomies").select(sql`1`.as("hit")).where("content_taxonomies.collection", "=", probeCollection).whereRef("content_taxonomies.taxonomy_id", "=", "taxonomies.translation_group").limit(1).offset(LARGE_TERM_ASSIGNMENTS - 1).as("large")));
-	if (locale) query = query.where("locale", "=", locale);
+	if (locale) query = query.where(localeMatches("locale", locale));
 	const rows = await query.execute();
 	const groups = /* @__PURE__ */ new Set();
 	let large = false;
@@ -1003,7 +1103,7 @@ function buildTaxonomyPivotQuery(opts) {
 	const booleanFieldsSelect = foldedBooleanFieldsSelect(db, collection);
 	const deletedR = deletedIsNull ? sql`r.deleted_at IS NULL` : sql`r.deleted_at IS NOT NULL`;
 	const statusR = status !== void 0 ? sql`AND ${buildStatusCondition(db, status, "r")}` : sql``;
-	const localeR = locale ? sql`AND r.locale = ${locale}` : sql``;
+	const localeR = locale ? sql`AND ${localeMatches("r.locale", locale)}` : sql``;
 	if (isIndexedSort) {
 		const sortRef = sql.ref(`r.${primary.field}`);
 		const sortval = multiGroup ? sql`MAX(${sortRef})` : sortRef;
@@ -1115,6 +1215,7 @@ function emdashLoader() {
 	return {
 		name: "emdash",
 		async loadCollection({ filter }) {
+			const callerColumns = /* @__PURE__ */ new Set();
 			try {
 				const db = await getDb();
 				const type = filter?.type;
@@ -1163,6 +1264,13 @@ function emdashLoader() {
 					console.warn(`[emdash] where filter: ${message}`);
 					return { error: new Error(message) };
 				}
+				for (const key of [...Object.keys(fieldFilters), ...Object.keys(orderBy ?? {})]) {
+					if (!FIELD_NAME_PATTERN.test(key) || SYSTEM_QUERY_KEYS.has(key)) continue;
+					const name = key.toLowerCase();
+					callerColumns.add(name);
+					callerColumns.add(`${tableName}.${name}`);
+					if (taxonomyFilters.length > 0 && Object.keys(fieldFilters).length === 0) callerColumns.add(`r.${name}`);
+				}
 				if (bylineFilter && bylineFilter.groups.length === 0 || taxonomyFilters.some((f) => f.slugs.length === 0)) return {
 					entries: [],
 					cacheHint: { tags: [type] }
@@ -1198,7 +1306,7 @@ function emdashLoader() {
 				} else {
 					const orderByClause = buildOrderByClause(orderBy);
 					const statusCondition = buildStatusCondition(db, status);
-					const localeFilter = locale ? sql`AND locale = ${locale}` : sql``;
+					const localeFilter = locale ? sql`AND ${localeMatches("locale", locale)}` : sql``;
 					const cursorCond = cursorCondition ? sql`AND ${cursorCondition}` : sql``;
 					const fieldConds = buildFieldConditions(db, fieldFilters);
 					const fieldCondsSQL = fieldConds.length > 0 ? sql`${sql.join(fieldConds, sql` AND `)}` : null;
@@ -1209,7 +1317,7 @@ function emdashLoader() {
 								AND ct.entry_id = ${sql.ref(tableName)}.translation_group
 								AND t.name = ${f.name}
 								AND t.slug IN (${sql.join(f.slugs.map((s) => sql`${s}`))})
-							${locale ? sql`AND t.locale = ${locale}` : sql``}
+							${locale ? sql`AND ${localeMatches("t.locale", locale)}` : sql``}
 						)`), sql` `)}` : sql``;
 					const bylineCond = bylineFilter ? sql`AND EXISTS (
 							SELECT 1 FROM _emdash_content_bylines cb
@@ -1257,10 +1365,7 @@ function emdashLoader() {
 						slug: rowStr(row, "slug"),
 						status: rowStr(row, "status", "draft"),
 						data,
-						cacheHint: {
-							tags: [rowStr(row, "id")],
-							lastModified: row.updated_at ? new Date(rowStr(row, "updated_at")) : void 0
-						}
+						cacheHint: { tags: [rowStr(row, "id")] }
 					};
 				});
 				let nextCursor;
@@ -1268,23 +1373,17 @@ function emdashLoader() {
 					const lastRow = rows.at(-1);
 					nextCursor = encodeSortCursor(sortColumn, lastRow[sortColumn], String(lastRow.id));
 				}
-				let collectionLastModified;
-				for (const row of rows) if (row.updated_at) {
-					const d = new Date(rowStr(row, "updated_at"));
-					if (!collectionLastModified || d > collectionLastModified) collectionLastModified = d;
-				}
 				return {
 					entries,
 					nextCursor,
-					cacheHint: {
-						tags: [type],
-						lastModified: collectionLastModified
-					}
+					cacheHint: { tags: [type] }
 				};
 			} catch (error) {
 				const message = error instanceof Error ? error.message : String(error);
-				if (isMissingTableError(error) || isMissingColumnError(error)) {
-					if (isMissingColumnError(error)) console.warn(`[emdash] where filter: ${message}`);
+				if (isMissingTableError(error)) return { entries: [] };
+				const missingColumn = getMissingColumnIdentifier(error);
+				if (missingColumn && callerColumns.has(missingColumn)) {
+					console.warn(`[emdash] where filter: ${message}`);
 					return { entries: [] };
 				}
 				return { error: /* @__PURE__ */ new Error(`Failed to load collection: ${message}`) };
@@ -1308,17 +1407,19 @@ function emdashLoader() {
 					)
 					FROM (SELECT ${bylinesExistSelect}, ${booleanFieldsSelect}) AS metadata
 				) AS _emdash_entry_metadata`;
+				const slugVisibility = filter?.publishedOnly ? sql`AND c.status = ${"published"}` : sql``;
 				const row = (locale ? await sql`
 							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${metadataSelect}
 							FROM ${sql.ref(tableName)} AS c
 							WHERE c.deleted_at IS NULL
-							AND ((c.slug = ${id} AND c.locale = ${locale}) OR c.id = ${id})
+							AND ((c.slug = ${id} AND ${localeMatches("c.locale", locale)} ${slugVisibility}) OR c.id = ${id})
+							ORDER BY CASE WHEN c.id = ${id} THEN 0 ELSE 1 END, ${localeOrder("c.locale", locale)}, c.id
 							LIMIT 1
 						`.execute(db) : await sql`
 							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${metadataSelect}
 							FROM ${sql.ref(tableName)} AS c
 							WHERE c.deleted_at IS NULL
-							AND (c.slug = ${id} OR c.id = ${id})
+							AND ((c.slug = ${id} ${slugVisibility}) OR c.id = ${id})
 							LIMIT 1
 						`.execute(db)).rows[0];
 				if (!row) return;
@@ -1361,10 +1462,7 @@ function emdashLoader() {
 					slug: rowStr(row, "slug"),
 					status: rowStr(row, "status", "draft"),
 					data: entryData,
-					cacheHint: {
-						tags: [rowStr(row, "id")],
-						lastModified: row.updated_at ? new Date(rowStr(row, "updated_at")) : void 0
-					}
+					cacheHint: { tags: [rowStr(row, "id")] }
 				};
 			} catch (error) {
 				if (isMissingTableError(error)) return;
@@ -1376,5 +1474,5 @@ function emdashLoader() {
 }
 
 //#endregion
-export { creditsFromFoldedBylines as a, getDb as c, resetTaxonomyNamesCache as d, primeSeoPanel as f, selectTaxonomyDefs as g, saveTaxonomyStructure as h, FOLDED_TERMS as i, loadEntriesByGroups as l, parseTaxonomyCollections as m, FOLDED_BYLINES as n, emdashLoader as o, findTaxonomyStructure as p, FOLDED_BYLINES_EXIST as r, encodeSortCursor as s, CURSOR_RAW_VALUES as t, loader_exports as u };
-//# sourceMappingURL=loader-CswroUbe.mjs.map
+export { primeSeoPanel as _, FOLDED_TERMS as a, saveTaxonomyStructure as b, emdashLoader as c, loadEntriesByGroups as d, loader_exports as f, revalidatingCached as g, invalidateRevalidatingCache as h, FOLDED_BYLINES_EXIST as i, encodeSortCursor as l, createRevalidatingCache as m, FOLDED_AUTHOR_BYLINE as n, creditFromFoldedAuthorByline as o, resetTaxonomyNamesCache as p, FOLDED_BYLINES as r, creditsFromFoldedBylines as s, CURSOR_RAW_VALUES as t, getDb as u, findTaxonomyStructure as v, selectTaxonomyDefs as x, parseTaxonomyCollections as y };
+//# sourceMappingURL=loader-DhnedqY4.mjs.map