emdash 1.3.0 → 1.4.0

package/dist/{menus-Cl4kwdt7.mjs → menus-oypxT1pI.mjs}

@@ -1,21 +1,24 @@
 import { t as validateIdentifier } from "./validate-DANX1-Qi.mjs";
+import { a as getLocaleChainRank, o as getLocaleRank } from "./config-Cs_AwWXI.mjs";
+import { getRequestContext } from "./request-context.mjs";
 import { t as OptionsRepository } from "./options-DhrI7eMv.mjs";
-import { n as cachedQuery, t as CacheNamespace } from "./object-cache-Bo6DGaC9.mjs";
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-xC4UD5-S.mjs";
-import { r as requestCached } from "./request-cache-C4CIo5ad.mjs";
-import { i as sanitizeHref } from "./url-Dn3IStq8.mjs";
-import { t as CommentRepository } from "./comment-UvIWDKcW.mjs";
-import { C as toBylineInfo, t as PluginContextFactory } from "./context-BYptmCN0.mjs";
-import { a as resolveLocalizedContentRoutePath, i as resolveLocaleChain, r as resolveLocale } from "./resolve-D-kqyKns.mjs";
-import { n as inspectContentPolicyDecision } from "./content-policy-Dm32n9C6.mjs";
+import { n as localeMatches } from "./query-BFHjCzSh.mjs";
+import { _ as isObjectCacheActive, a as contentCacheNamespaces, n as cachedQuery, r as cachedQueryWithEpochs, t as CacheNamespace } from "./object-cache-DmKr09La.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-DiW8VMwz.mjs";
+import { r as requestCached } from "./request-cache-5z2WzWmh.mjs";
+import { i as sanitizeHref } from "./url-DTfGDJhI.mjs";
+import { t as CommentRepository } from "./comment-DB74Zpa4.mjs";
+import { C as toBylineInfo, t as PluginContextFactory } from "./context-CzjejcsE.mjs";
+import { a as resolveLocalizedContentRoutePath, i as resolveLocaleChain, r as resolveLocale } from "./resolve-DdNXBJSr.mjs";
+import { n as inspectContentPolicyDecision } from "./content-policy-BmE0MPZY.mjs";
 import { t as menuTag } from "./chrome-tags-BIKBMZYO.mjs";
-import { c as getDb } from "./loader-CswroUbe.mjs";
+import { u as getDb } from "./loader-DhnedqY4.mjs";
 import { n as videoBlockFields, r as videoNodeAttrs, t as isPortableTextVideoBlock } from "./video-DytCnw3L.mjs";
 import { a as normalizePluginCapabilities, o as warnDeprecatedPluginCapabilities } from "./types-sUHaH7lC.mjs";
-import { a as sanitizeGalleryImages, i as resolveImageMedia } from "./apply-T7ATgzCh.mjs";
+import { a as sanitizeGalleryImages, i as resolveImageMedia } from "./apply-DVnupNeS.mjs";
 import { r as setCronTasksEnabled } from "./cron-D7obTIfk.mjs";
-import { t as PluginRouteRegistry } from "./routes-BerZFrvV.mjs";
-import { t as CommentReactionRepository } from "./comment-reaction-dGp6_FRo.mjs";
+import { t as PluginRouteRegistry } from "./routes-avqgc-8r.mjs";
+import { t as CommentReactionRepository } from "./comment-reaction-BScxIWUn.mjs";
 import { sql } from "kysely";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { z } from "astro/zod";
@@ -41,6 +44,7 @@ const mediaSchema = z.object({
 	id: z.string(),
 	src: z.string().optional(),
 	alt: z.string().optional(),
+	caption: z.string().optional(),
 	width: z.number().optional(),
 	height: z.number().optional(),
 	filename: z.string().optional(),
@@ -3388,6 +3392,13 @@ async function getCommentCountWithDb(db, collection, contentId) {
 
 //#endregion
 //#region src/menus/index.ts
+/** Per isolate: the namespaces each resolved menu was last cached under. */
+const LAST_RESOLVED_NAMESPACES_KEY = Symbol.for("emdash:menu-resolved-namespaces");
+const lastResolvedNamespaces = globalThis[LAST_RESOLVED_NAMESPACES_KEY] ?? (() => {
+	const map = /* @__PURE__ */ new Map();
+	globalThis[LAST_RESOLVED_NAMESPACES_KEY] = map;
+	return map;
+})();
 /**
 * Get a menu by name with resolved URLs.
 *
@@ -3400,16 +3411,65 @@ async function getCommentCountWithDb(db, collection, contentId) {
 async function getMenu(name, options = {}) {
 	const locale = resolveLocale(options.locale);
 	const trailingSlash = options.trailingSlash ?? await getHostTrailingSlash();
-	return requestCached(`menu:${name}:${locale ?? "*"}:${trailingSlash}`, () => cachedQuery({
-		namespace: CacheNamespace.MENUS,
-		key: `${name}:${locale ?? "*"}:${trailingSlash}`,
-		load: async () => {
-			return getMenuWithDb(name, await getDb(), {
-				locale,
-				trailingSlash
-			});
-		}
-	}));
+	const key = `${name}:${locale ?? "*"}:${trailingSlash}`;
+	return requestCached(`menu:${key}`, async () => {
+		if (!await isObjectCacheActive()) return getMenuWithDb(name, await getDb(), {
+			locale,
+			trailingSlash
+		});
+		const readRows = async () => {
+			let epoch;
+			return {
+				rows: await cachedQueryWithEpochs({
+					namespace: CacheNamespace.MENUS,
+					key: `rows:${name}:${locale ?? "*"}`,
+					load: async () => loadMenuRows(name, await getDb(), locale),
+					onEpochs: ([menus]) => {
+						epoch = menus;
+					}
+				}),
+				epoch
+			};
+		};
+		const remembered = lastResolvedNamespaces.get(key);
+		const earlyRead = remembered ? void 0 : await readRows();
+		const namespaces = remembered ?? (earlyRead?.rows && resolvedMenuNamespaces(earlyRead.rows.items));
+		if (!namespaces) return null;
+		let resolvedEpoch;
+		let loaded;
+		const menu = await cachedQueryWithEpochs({
+			namespace: namespaces,
+			key,
+			onEpochs: ([menus]) => {
+				resolvedEpoch = menus;
+			},
+			load: async () => {
+				const { rows } = earlyRead && earlyRead.epoch === resolvedEpoch ? earlyRead : await readRows();
+				if (!rows) return null;
+				loaded = resolvedMenuNamespaces(rows.items);
+				return resolveMenu(rows, await getDb(), trailingSlash);
+			},
+			cacheable: (value) => value !== null && sameNamespaces(loaded, namespaces)
+		});
+		if (menu) lastResolvedNamespaces.set(key, loaded ?? namespaces);
+		else lastResolvedNamespaces.delete(key);
+		return menu;
+	});
+}
+/**
+* Object-cache namespaces for a resolved menu: the menu epoch plus the content
+* epoch of every collection its items link to, and the taxonomy epoch when it
+* links to terms. Which links resolve depends on those rows, so publishing,
+* unpublishing, or trashing a linked entry invalidates the cached menu.
+*/
+function resolvedMenuNamespaces(items) {
+	const namespaces = [CacheNamespace.MENUS];
+	for (const collection of collectContentReferences(items).keys()) namespaces.push(...contentCacheNamespaces(collection));
+	if (items.some((item) => item.type === "taxonomy" && item.reference_id)) namespaces.push(CacheNamespace.TAXONOMIES);
+	return namespaces;
+}
+function sameNamespaces(a, b) {
+	return a !== void 0 && a.length === b.length && a.every((namespace, i) => namespace === b[i]);
 }
 async function getHostTrailingSlash() {
 	try {
@@ -3423,7 +3483,11 @@ async function getHostTrailingSlash() {
 * admin routes that already have a database handle.
 */
 async function getMenuWithDb(name, db, options = {}) {
-	const chain = resolveLocaleChain(options.locale);
+	const rows = await loadMenuRows(name, db, options.locale);
+	return rows && resolveMenu(rows, db, options.trailingSlash);
+}
+async function loadMenuRows(name, db, requestedLocale) {
+	const chain = resolveLocaleChain(requestedLocale);
 	let query = db.selectFrom("_emdash_menus as m").leftJoin("_emdash_menu_items as i", "i.menu_id", "m.id").selectAll("i").select([
 		"m.id as m_id",
 		"m.name as m_name",
@@ -3431,21 +3495,30 @@ async function getMenuWithDb(name, db, options = {}) {
 		"m.locale as m_locale",
 		"m.translation_group as m_translation_group"
 	]).where("m.name", "=", name).orderBy("i.sort_order", "asc");
-	if (chain.length > 0) query = query.where("m.locale", "in", chain);
+	if (chain.length > 0) query = query.where((eb) => eb.or(chain.map((locale) => localeMatches("m.locale", locale))));
 	const rows = await query.execute();
-	const locales = new Set(rows.map((row) => row.m_locale));
-	const locale = chain.length === 0 ? [...locales].toSorted()[0] : chain.find((l) => locales.has(l));
-	const menuRow = rows.find((row) => row.m_locale === locale);
+	const menuRow = rows.toSorted((a, b) => {
+		if (chain.length === 0) return a.m_locale.localeCompare(b.m_locale) || a.m_id.localeCompare(b.m_id);
+		return getLocaleChainRank(a.m_locale, chain) - getLocaleChainRank(b.m_locale, chain) || a.m_id.localeCompare(b.m_id);
+	})[0];
 	if (!menuRow) return null;
 	const menuId = menuRow.m_id;
-	const items = await buildMenuTree(rows.filter((row) => row.m_id === menuId && row.id !== null), db, menuRow.m_locale, options.trailingSlash);
+	const itemRows = rows.filter((row) => row.m_id === menuId && row.id !== null);
 	return {
-		id: menuRow.m_id,
-		name: menuRow.m_name,
-		label: menuRow.m_label,
-		items,
-		locale: menuRow.m_locale,
-		translationGroup: menuRow.m_translation_group
+		menu: {
+			id: menuRow.m_id,
+			name: menuRow.m_name,
+			label: menuRow.m_label,
+			locale: menuRow.m_locale,
+			translationGroup: menuRow.m_translation_group
+		},
+		items: itemRows
+	};
+}
+async function resolveMenu(rows, db, trailingSlash) {
+	return {
+		...rows.menu,
+		items: await buildMenuTree(rows.items, db, rows.menu.locale, trailingSlash)
 	};
 }
 /**
@@ -3469,7 +3542,7 @@ async function getMenusWithDb(db, options = {}) {
 		"label",
 		"locale"
 	]).orderBy("name", "asc");
-	if (locale !== void 0) query = query.where("locale", "=", locale);
+	if (locale !== void 0) query = query.where(localeMatches("locale", locale));
 	return query.execute();
 }
 /**
@@ -3500,6 +3573,7 @@ async function buildMenuTree(items, db, locale, trailingSlash) {
 	const validItems = (await Promise.all(items.map((item) => resolveMenuItem(item, urlPatterns, contentLookup, taxonomyLookup, locale, trailingSlash)))).filter((item) => item !== null);
 	const itemMap = /* @__PURE__ */ new Map();
 	const rootItems = [];
+	const itemIds = new Set(items.map((item) => item.id));
 	for (const item of validItems) itemMap.set(item.id, {
 		...item,
 		children: []
@@ -3507,11 +3581,8 @@ async function buildMenuTree(items, db, locale, trailingSlash) {
 	for (const item of items) {
 		const menuItem = itemMap.get(item.id);
 		if (!menuItem) continue;
-		if (item.parent_id) {
-			const parent = itemMap.get(item.parent_id);
-			if (parent) parent.children.push(menuItem);
-			else rootItems.push(menuItem);
-		} else rootItems.push(menuItem);
+		if (item.parent_id && itemIds.has(item.parent_id)) itemMap.get(item.parent_id)?.children.push(menuItem);
+		else rootItems.push(menuItem);
 	}
 	return rootItems;
 }
@@ -3607,35 +3678,45 @@ async function resolveMenuItem(item, urlPatterns, contentLookup, taxonomyLookup,
 	};
 }
 async function resolveContentReferences(db, references, locale) {
+	const editMode = getRequestContext()?.editMode === true;
+	const isVisible = (row) => row.deleted_at === null && (editMode || row.status === "published");
 	const entries = await Promise.all(Array.from(references, async ([collection, referenceGroups]) => {
 		const lookup = /* @__PURE__ */ new Map();
 		const localized = /* @__PURE__ */ new Map();
+		const found = /* @__PURE__ */ new Set();
 		try {
 			validateIdentifier(collection, "menu item collection");
 			for (const batch of chunks([...referenceGroups], SQL_BATCH_SIZE)) {
 				const result = await sql`
-						SELECT id, slug, published_at, locale, translation_group
+						SELECT id, slug, published_at, locale, translation_group, status, deleted_at
 						FROM ${sql.ref(`ec_${collection}`)}
 						WHERE translation_group IN (${sql.join(batch)})
 					`.execute(db);
-				for (const row of result.rows) if (shouldPreferLocalizedRow(row, localized.get(row.translation_group), locale)) localized.set(row.translation_group, row);
+				for (const row of result.rows) {
+					found.add(row.translation_group);
+					if (!isVisible(row)) continue;
+					if (shouldPreferLocalizedRow(row, localized.get(row.translation_group), locale)) localized.set(row.translation_group, row);
+				}
 			}
 			for (const [referenceGroup, row] of localized) lookup.set(referenceGroup, {
 				id: row.id,
 				slug: row.slug,
 				publishedAt: row.published_at
 			});
-			const unresolved = [...referenceGroups].filter((id) => !lookup.has(id));
+			const unresolved = [...referenceGroups].filter((id) => !found.has(id));
 			for (const batch of chunks(unresolved, SQL_BATCH_SIZE)) {
 				const result = await sql`
-						SELECT id, slug, published_at FROM ${sql.ref(`ec_${collection}`)}
+						SELECT id, slug, published_at, status, deleted_at FROM ${sql.ref(`ec_${collection}`)}
 						WHERE id IN (${sql.join(batch)})
 					`.execute(db);
-				for (const row of result.rows) lookup.set(row.id, {
-					id: row.id,
-					slug: row.slug,
-					publishedAt: row.published_at
-				});
+				for (const row of result.rows) {
+					if (!isVisible(row)) continue;
+					lookup.set(row.id, {
+						id: row.id,
+						slug: row.slug,
+						publishedAt: row.published_at
+					});
+				}
 			}
 		} catch (error) {
 			console.error(`Failed to resolve content URLs for ${collection}:`, error);
@@ -3646,9 +3727,9 @@ async function resolveContentReferences(db, references, locale) {
 }
 function shouldPreferLocalizedRow(candidate, existing, locale) {
 	if (!existing) return true;
-	if (candidate.locale === locale) return existing.locale !== locale || candidate.id < existing.id;
-	if (existing.locale === locale) return false;
-	return candidate.locale < existing.locale || candidate.locale === existing.locale && candidate.id < existing.id;
+	const candidateRank = getLocaleRank(candidate.locale, locale);
+	const existingRank = getLocaleRank(existing.locale, locale);
+	return candidateRank < existingRank || candidateRank === existingRank && (candidate.locale < existing.locale || candidate.locale === existing.locale && candidate.id < existing.id);
 }
 /**
 * Resolve the URL for a content reference. `referenceGroup` is the content
@@ -3718,4 +3799,4 @@ function resolveTaxonomyUrl(referenceGroup, taxonomyLookup) {
 
 //#endregion
 export { file as A, definePlugin as C, portableTextIdentityExtensions as D, prosemirrorToPortableText as E, EmDashConfigurationError as M, portableText as O, resolveExclusiveHooks as S, portableTextToProsemirror as T, isContentSaveRejection as _, getComments as a, createHookPipeline as b, inspectSandboxHookResult as c, createNoopSandboxRunner as d, NodeCronScheduler as f, ContentSaveRejectedError as g, EmailPipeline as h, getCommentCount as i, image as j, reference as k, NoopSandboxRunner as l, createPluginManager as m, getMenuWithCacheHint as n, MAX_SANDBOX_SAVE_REJECTION_REASON_LENGTH as o, PluginManager as p, getMenus as r, SANDBOX_HOOK_RESULT_VERSION as s, getMenu as t, SandboxNotAvailableError as u, EXCLUSIVE_HOOK_KEY_PREFIX$1 as v, definePluginRoute as w, getActiveContentSaveHookName as x, HookPipeline as y };
-//# sourceMappingURL=menus-Cl4kwdt7.mjs.map
+//# sourceMappingURL=menus-oypxT1pI.mjs.map