emdash 0.39.0 → 0.40.0

package/src/components/Gallery.astro

@@ -18,6 +18,7 @@ import {
 	RESPONSIVE_BREAKPOINTS,
 } from "../media/responsive.js";
 import { getPublicOrigin } from "../api/public-url.js";
+import { sanitizeGalleryImages } from "../content/converters/gallery.js";
 import { focalPointToObjectPosition } from "../media/focal-point.js";
 
 export interface Props {
@@ -73,7 +74,7 @@ function generateSrcset(
 }
 
 const { node, placeholder = true, sizes: sizesOverride } = Astro.props;
-const images = node?.images ?? [];
+const images = sanitizeGalleryImages(node?.images);
 const columns = node?.columns ?? GALLERY_DEFAULT_COLUMNS;
 // Each image fills one grid cell, not the viewport.
 const cellSizes = sizesOverride ?? gallerySizes(columns);

package/src/components/Image.astro

@@ -11,6 +11,9 @@ import { getMediaProvider } from "../media/provider-loader.js";
 import { buildRenderMediaUrl } from "../media/url.js";
 import { toAbsoluteMediaUrl, RESPONSIVE_BREAKPOINTS } from "../media/responsive.js";
 import { getPublicOrigin } from "../api/public-url.js";
+import { sanitizeHref } from "../utils/url.js";
+import { normalizeImageLink } from "../content/converters/image-link.js";
+import { resolveImageMedia } from "../content/converters/gallery.js";
 
 export interface Props {
 	node: {
@@ -41,6 +44,12 @@ export interface Props {
 		displayHeight?: number;
 		/** Alignment for this image instance (e.g. from a WordPress import) */
 		alignment?: "left" | "center" | "right" | "wide" | "full";
+		/**
+		 * Optional link. When set, the image is rendered inside an `<a>` using
+		 * `sanitizeHref`-validated `href`. A bare string is the legacy shape
+		 * written by WordPress/Gutenberg imports.
+		 */
+		link?: string | { href: string; blank?: boolean };
 	};
 	/** Render the LQIP placeholder as an inline background. Disable for strict CSP. */
 	placeholder?: boolean;
@@ -68,7 +77,17 @@ if (!node?.asset) {
 	return null;
 }
 
-const { asset, alt = "", caption, width, height, displayWidth, displayHeight, alignment } = node;
+const { caption, displayWidth, displayHeight, alignment, link } = node;
+const { asset, alt = "", width, height } = resolveImageMedia(node);
+
+const imageLink = normalizeImageLink(link);
+const linkHref = imageLink ? sanitizeHref(imageLink.href) : null;
+// Same-page anchor links (`#section`) are on-page jumps — never open them in
+// a new tab, regardless of `blank`. Mirrors marks/Link.astro.
+const isSamePageAnchor = linkHref?.startsWith("#") ?? false;
+const linkBlank = !isSamePageAnchor && imageLink?.blank === true;
+const linkTarget = linkBlank ? "_blank" : undefined;
+const linkRel = linkBlank ? "noopener noreferrer" : undefined;
 
 // Calculate aspect ratio from original dimensions
 const aspectRatio = width && height ? width / height : undefined;
@@ -149,12 +168,11 @@ if (!src) {
 
 // Build placeholder background style. Prefer first-class LQIP fields; fall
 // back to `asset.meta` for legacy snapshots persisted before LQIP was promoted.
-const blurhash = (node.blurhash ?? (asset.meta?.blurhash as string | undefined)) as
-	| string
-	| undefined;
-const dominantColor = (node.dominantColor ?? (asset.meta?.dominantColor as string | undefined)) as
+const blurhash = (node.blurhash ?? (node.asset.meta?.blurhash as string | undefined)) as
 	| string
 	| undefined;
+const dominantColor = (node.dominantColor ??
+	(node.asset.meta?.dominantColor as string | undefined)) as string | undefined;
 
 let placeholderStyle = "";
 if (placeholder && blurhash) {
@@ -168,7 +186,34 @@ if (placeholder && blurhash) {
 
 <figure class:list={["emdash-image", alignment && `emdash-image--align-${alignment}`]}>
 	{
-		astroImageSrc ? (
+		linkHref ? (
+			<a href={linkHref} target={linkTarget} rel={linkRel}>
+				{astroImageSrc ? (
+					<AstroImage
+						src={astroImageSrc}
+						alt={alt}
+						width={renderWidth}
+						height={renderHeight}
+						layout="constrained"
+						loading="lazy"
+						decoding="async"
+						style={placeholderStyle || undefined}
+					/>
+				) : (
+					<img
+						src={src}
+						srcset={srcset}
+						sizes={sizes}
+						alt={alt}
+						width={renderWidth}
+						height={renderHeight}
+						loading="lazy"
+						decoding="async"
+						style={placeholderStyle || undefined}
+					/>
+				)}
+			</a>
+		) : astroImageSrc ? (
 			<AstroImage
 				src={astroImageSrc}
 				alt={alt}

package/src/components/InlinePortableTextEditor.tsx

@@ -26,6 +26,7 @@ import Suggestion from "@tiptap/suggestion";
 import * as React from "react";
 import { createPortal } from "react-dom";
 
+import { resolveImageMedia } from "../content/converters/gallery.js";
 import {
 	deriveLegacyListId,
 	normalizeProseMirrorOrderedListJson,
@@ -298,14 +299,15 @@ function convertPMNode(node: PMNode, path: string): PTBlock | PTBlock[] | null {
 		}
 		case "pluginBlock": {
 			// Spread the captured data back out so the block round-trips losslessly.
-			// `data` holds every field except _type / _key / id (which live on
-			// dedicated attrs).
-			const { blockType, id, data } = node.attrs ?? {};
+			// `data` holds every field except _type / _key and the identity field
+			// (`id` or `url`, named by `identityField`), which live on dedicated attrs.
+			const { blockType, id, identityField, data } = node.attrs ?? {};
+			const field = identityField === "url" || identityField === "" ? identityField : "id";
 			return {
 				...(data && typeof data === "object" ? data : {}),
 				_type: typeof blockType === "string" ? blockType : "embed",
 				_key: k(),
-				id: typeof id === "string" ? id : "",
+				...(field ? { [field]: typeof id === "string" ? id : "" } : {}),
 			};
 		}
 		default:
@@ -579,8 +581,8 @@ function convertPTBlock(block: PTBlock): PMNode | null {
 			displayWidth?: number;
 			displayHeight?: number;
 		};
-		const asset = ib.asset;
-		const meta = asset?.meta;
+		const meta = ib.asset?.meta;
+		const { asset, alt, width, height } = resolveImageMedia(ib);
 		// Prefer first-class LQIP fields; fall back to `asset.meta` for legacy.
 		const blurhash =
 			typeof ib.blurhash === "string"
@@ -597,14 +599,14 @@ function convertPTBlock(block: PTBlock): PMNode | null {
 		return {
 			type: "image",
 			attrs: {
-				src: asset?.url || ib.url || (asset?._ref ? `/_emdash/api/media/file/${asset._ref}` : ""),
-				alt: ib.alt || "",
+				src: asset.url || ib.url || (asset._ref ? `/_emdash/api/media/file/${asset._ref}` : ""),
+				alt: alt || "",
 				title: ib.caption || "",
 				caption: ib.caption || "",
-				mediaId: asset?._ref,
-				provider: canonicalMediaProviderId(asset?.provider),
-				width: ib.width,
-				height: ib.height,
+				mediaId: asset._ref || undefined,
+				provider: canonicalMediaProviderId(asset.provider),
+				width,
+				height,
 				blurhash,
 				dominantColor,
 				displayWidth: ib.displayWidth,
@@ -621,15 +623,22 @@ function convertPTBlock(block: PTBlock): PMNode | null {
 	// Unknown block types — treat as plugin blocks. Capture every field other
 	// than the well-known ones into `data` so the block round-trips losslessly,
 	// even if no plugin currently registers this type. Matches the admin
-	// editor's behaviour at PortableTextEditor.tsx:572-588.
-	const { _type, _key, id, url, ...rest } = block;
+	// editor's `convertCustomBlock`.
+	// The identity lives under whichever of `id` / `url` the block arrived with,
+	// so the PM → PT direction can write it back under the same key.
+	const identityField =
+		typeof block.id === "string" ? "id" : typeof block.url === "string" ? "url" : "";
+	const identity = identityField ? block[identityField] : undefined;
 	// Filter out _-prefixed keys to prevent accumulation across edit cycles.
-	const data = Object.fromEntries(Object.entries(rest).filter(([key]) => !key.startsWith("_")));
+	const data = Object.fromEntries(
+		Object.entries(block).filter(([key]) => !key.startsWith("_") && key !== identityField),
+	);
 	return {
 		type: "pluginBlock",
 		attrs: {
-			blockType: typeof _type === "string" ? _type : "embed",
-			id: typeof id === "string" ? id : typeof url === "string" ? url : "",
+			blockType: typeof block._type === "string" ? block._type : "embed",
+			id: typeof identity === "string" ? identity : "",
+			identityField,
 			data,
 		},
 	};
@@ -1209,13 +1218,14 @@ const PluginBlockNode = Node.create({
 	draggable: true,
 
 	addAttributes() {
-		// All three attributes are stored on the ProseMirror node but not
+		// These attributes are stored on the ProseMirror node but not
 		// rendered as DOM attributes — they're metadata for the round-trip,
 		// not styling or behaviour the placeholder DOM needs to expose.
 		const noDom = { rendered: false, parseHTML: () => null };
 		return {
 			blockType: { default: "", ...noDom },
 			id: { default: "", ...noDom },
+			identityField: { default: "id", ...noDom },
 			data: { default: {}, ...noDom },
 		};
 	},

package/src/components/blocks.ts

@@ -0,0 +1,44 @@
+export interface BlockValue {
+	_type: string;
+	_version: number;
+	_key: string;
+}
+
+export interface BlockComponentProps<T extends BlockValue = BlockValue> {
+	value: T;
+	index: number;
+	blockKey: string;
+}
+
+export type BlockComponent<T extends BlockValue = BlockValue> = (
+	props: BlockComponentProps<T>,
+) => unknown;
+
+export type BlockComponents<T extends BlockValue> = {
+	[Type in T["_type"]]: BlockComponent<Extract<T, { _type: Type }>>;
+};
+
+export function defineBlockComponents<T extends BlockValue>(
+	components: BlockComponents<T>,
+): BlockComponents<T> {
+	return components;
+}
+
+export type BlockRendererResolution<T extends BlockValue> =
+	| { kind: "component"; component: BlockComponent<T> }
+	| { kind: "diagnostic" }
+	| { kind: "fallback"; component: BlockComponent<T> }
+	| { kind: "none" };
+
+export function resolveBlockRenderer<T extends BlockValue>(
+	block: T,
+	components: Partial<BlockComponents<T>>,
+	fallback: BlockComponent<T> | undefined,
+	development: boolean,
+): BlockRendererResolution<T> {
+	// oxlint-disable-next-line typescript/no-unsafe-type-assertion -- the mapped component key and block discriminant come from the same T union
+	const component = components[block._type as T["_type"]] as BlockComponent<T> | undefined;
+	if (component) return { kind: "component", component };
+	if (development) return { kind: "diagnostic" };
+	return fallback ? { kind: "fallback", component: fallback } : { kind: "none" };
+}

package/src/components/index.ts

@@ -1,18 +1,20 @@
 /**
- * EmDash Portable Text Components
+ * EmDash content components
  *
- * Pre-built components for rendering Portable Text content from WordPress imports.
+ * Components for rendering Portable Text and stored block arrays.
  *
  * Usage:
  * ```astro
  * ---
- * import { PortableText } from "emdash/ui";
+ * import { Blocks, PortableText } from "emdash/ui";
+ * import Hero from "./Hero.astro";
  * ---
  * <PortableText value={post.data.content} />
+ * <Blocks value={page.data.layout} components={{ hero: Hero }} />
  * ```
  *
  * The PortableText component uses EmDash's built-in renderers by default.
- * Pass custom components to override specific types:
+ * Pass custom components to override specific Portable Text types:
  *
  * ```astro
  * <PortableText value={content} components={{ type: { image: MyImage } }} />
@@ -21,6 +23,14 @@
 
 // Wrapper component with EmDash defaults
 export { default as PortableText } from "./PortableText.astro";
+export { default as Blocks } from "./Blocks.astro";
+export {
+	defineBlockComponents,
+	type BlockComponent,
+	type BlockComponentProps,
+	type BlockComponents,
+	type BlockValue,
+} from "./blocks.js";
 
 /**
  * @deprecated Import from `emdash/ui/comments` instead. Barrel re-exports pull

package/src/content/converters/gallery.ts

@@ -1,10 +1,52 @@
 /**
- * Shared sanitization for gallery block images, used by both converters so
- * the editor round-trip and the stored shape stay in lockstep.
+ * Shared sanitization for gallery block images and image media, used by both
+ * converters so the editor round-trip and the stored shape stay in lockstep.
  */
 
+import { localMediaFileUrl } from "../../media/url.js";
 import type { PortableTextGalleryImage } from "./types.js";
 
+export interface ImageMedia {
+	asset: PortableTextGalleryImage["asset"];
+	alt?: string;
+	width?: number;
+	height?: number;
+}
+
+/**
+ * Read an image's media reference, alt text, and dimensions. Accepts the
+ * reference shape (`_ref`, `url`) and the MediaValue that seeded `$media`
+ * stores instead (`id`, `src`, `meta.storageKey`, dimensions). The image's own
+ * `alt`, `width`, and `height` take precedence over the asset's.
+ */
+export function resolveImageMedia(image: unknown): ImageMedia {
+	const record: Record<string, unknown> = isRecord(image) ? image : {};
+	const asset: Record<string, unknown> = isRecord(record.asset) ? record.asset : {};
+	// The media id is not a storage key, so local files need `url`.
+	const storageKey = isRecord(asset.meta) ? nonEmptyString(asset.meta.storageKey) : undefined;
+	const url =
+		nonEmptyString(asset.url) ??
+		nonEmptyString(asset.src) ??
+		(storageKey ? localMediaFileUrl(storageKey) : undefined);
+	const provider = nonEmptyString(asset.provider);
+	const alt = nonEmptyString(record.alt) ?? nonEmptyString(asset.alt);
+	const width = typeof record.width === "number" ? record.width : asset.width;
+	const height = typeof record.height === "number" ? record.height : asset.height;
+
+	const media: ImageMedia = {
+		asset: {
+			_type: "reference",
+			_ref: nonEmptyString(asset._ref) ?? nonEmptyString(asset.id) ?? "",
+			...(url ? { url } : {}),
+			...(provider ? { provider } : {}),
+		},
+	};
+	if (alt) media.alt = alt;
+	if (typeof width === "number") media.width = width;
+	if (typeof height === "number") media.height = height;
+	return media;
+}
+
 /**
  * Normalize an untrusted `images` value into well-formed gallery images.
  * Non-object entries and entries without an asset object are dropped.
@@ -21,9 +63,8 @@ export function sanitizeGalleryImages(
 	for (const entry of value as unknown[]) {
 		if (!isRecord(entry)) continue;
 		const record = entry;
-		const asset = record.asset;
-		if (!isRecord(asset)) continue;
-		const assetRecord = asset;
+		if (!isRecord(record.asset)) continue;
+		const { asset, alt, width, height } = resolveImageMedia(record);
 
 		const image: PortableTextGalleryImage = {
 			_type: "image",
@@ -33,19 +74,12 @@ export function sanitizeGalleryImages(
 					: generateKey
 						? generateKey()
 						: "",
-			asset: {
-				_type: "reference",
-				_ref: typeof assetRecord._ref === "string" ? assetRecord._ref : "",
-				...(typeof assetRecord.url === "string" && assetRecord.url ? { url: assetRecord.url } : {}),
-				...(typeof assetRecord.provider === "string" && assetRecord.provider
-					? { provider: assetRecord.provider }
-					: {}),
-			},
+			asset,
 		};
-		if (typeof record.alt === "string" && record.alt) image.alt = record.alt;
+		if (alt) image.alt = alt;
 		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 (width !== undefined) image.width = width;
+		if (height !== undefined) image.height = 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;
@@ -58,6 +92,10 @@ export function sanitizeGalleryImages(
 	return images;
 }
 
+function nonEmptyString(value: unknown): string | undefined {
+	return typeof value === "string" && value ? value : undefined;
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }

package/src/content/converters/image-link.ts

@@ -0,0 +1,27 @@
+/**
+ * Image link normalisation.
+ *
+ * A Portable Text image block carries its optional link in one of two shapes:
+ *
+ * - `{ href, blank? }` — the canonical shape the editor writes
+ * - `"https://…"` — a bare string, emitted by `gutenberg-to-portable-text`
+ *   for linked images and therefore present on WordPress-imported content
+ *
+ * Every consumer reads through this helper so the legacy shape keeps working
+ * and is upgraded to the canonical shape the first time the block round-trips
+ * through the editor.
+ */
+import type { PortableTextImageLink } from "./types.js";
+
+export function normalizeImageLink(raw: unknown): PortableTextImageLink | null {
+	if (typeof raw === "string") {
+		const href = raw.trim();
+		return href ? { href } : null;
+	}
+	if (typeof raw !== "object" || raw === null) return null;
+	const { href, blank } = raw as { href?: unknown; blank?: unknown };
+	if (typeof href !== "string") return null;
+	const trimmed = href.trim();
+	if (!trimmed) return null;
+	return blank === true ? { href: trimmed, blank: true } : { href: trimmed };
+}

package/src/content/converters/index.ts

@@ -8,4 +8,5 @@ export { prosemirrorToPortableText } from "./prosemirror-to-portable-text.js";
 export { portableTextToProsemirror } from "./portable-text-to-prosemirror.js";
 export type { PortableTextToProsemirrorOptions } from "./portable-text-to-prosemirror.js";
 export { portableTextIdentityExtensions } from "./portable-text-identity.js";
+export { normalizeImageLink } from "./image-link.js";
 export * from "./types.js";

package/src/content/converters/portable-text-to-prosemirror.ts

@@ -9,7 +9,8 @@ import {
 	portableTextTableToProseMirror,
 } from "@emdash-cms/admin/portable-text-table";
 
-import { sanitizeGalleryImages } from "./gallery.js";
+import { resolveImageMedia, sanitizeGalleryImages } from "./gallery.js";
+import { normalizeImageLink } from "./image-link.js";
 import {
 	UnsupportedPortableTextMarksError,
 	assertPortableTextMarksSupported,
@@ -648,20 +649,22 @@ function imageAlignment(value: unknown): PortableTextImageBlock["alignment"] {
  * Convert image block to ProseMirror
  */
 function convertImage(block: PortableTextImageBlock, preserveIdentity: boolean): ProseMirrorNode {
+	const { asset, alt, width, height } = resolveImageMedia(block);
 	return {
 		type: "image",
 		attrs: identityAttrs(
 			{
-				src: block.asset.url || block.asset._ref,
-				alt: block.alt || "",
+				src: asset.url || asset._ref,
+				alt: alt || "",
 				title: block.caption || "",
-				mediaId: block.asset._ref,
-				provider: block.asset.provider,
-				width: block.width,
-				height: block.height,
+				mediaId: asset._ref,
+				provider: asset.provider,
+				width,
+				height,
 				displayWidth: block.displayWidth,
 				displayHeight: block.displayHeight,
 				alignment: imageAlignment(block.alignment),
+				link: normalizeImageLink(block.link),
 			},
 			block._key,
 			preserveIdentity,

package/src/content/converters/prosemirror-to-portable-text.ts

@@ -375,6 +375,19 @@ function convertImage(node: ProseMirrorNode): PortableTextImageBlock {
 	const displayHeight = typeof attrs?.displayHeight === "number" ? attrs.displayHeight : undefined;
 	const alignment = attrs?.alignment;
 
+	// Normalise link: drop entirely when href is missing or empty so half-populated
+	// { blank: true } objects don't round-trip.
+	let link: { href: string; blank?: boolean } | undefined;
+	const rawLink = attrs?.link;
+	if (rawLink && typeof rawLink === "object") {
+		const linkObj = rawLink as { href?: unknown; blank?: unknown };
+		const href = typeof linkObj.href === "string" ? linkObj.href.trim() : "";
+		if (href) {
+			link = { href };
+			if (linkObj.blank === true) link.blank = true;
+		}
+	}
+
 	return {
 		_type: "image",
 		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey(),
@@ -400,6 +413,7 @@ function convertImage(node: ProseMirrorNode): PortableTextImageBlock {
 			alignment === "full"
 				? alignment
 				: undefined,
+		link,
 	};
 }
 

package/src/content/converters/types.ts

@@ -80,6 +80,23 @@ export interface PortableTextImageBlock {
 	/** Display height for this instance (overrides original) */
 	displayHeight?: number;
 	alignment?: "left" | "center" | "right" | "wide" | "full";
+	/**
+	 * Optional link. When set, the image is rendered inside an `<a>` using
+	 * `sanitizeHref`-validated `href`. Mirrors `PortableTextLinkMark`.
+	 *
+	 * The bare string form is legacy: `gutenberg-to-portable-text` emits
+	 * `link: "https://…"` for linked images, so WordPress-imported content
+	 * carries it. Read the field through `normalizeImageLink()`.
+	 */
+	link?: string | PortableTextImageLink;
+}
+
+/**
+ * Canonical link shape on a Portable Text image block.
+ */
+export interface PortableTextImageLink {
+	href: string;
+	blank?: boolean;
 }
 
 /**

package/src/database/content-datetime.ts

@@ -39,11 +39,28 @@ function repeaterDatetimeFields(validation: string | null): string[] {
 		.map((field) => field.slug);
 }
 
+/**
+ * Datetime contexts by collection slug, shared so that a bulk write reads each
+ * collection's context once. A cached context doesn't see later writes to the
+ * `site:timezone` setting or to field definitions, so share one only across
+ * work that makes neither.
+ */
+export type DatetimeContextCache = Map<string, Promise<DatetimeContext>>;
+
 export class ContentDatetimeNormalizer {
-	constructor(private readonly db: Kysely<Database>) {}
+	constructor(
+		private readonly db: Kysely<Database>,
+		private readonly contexts?: DatetimeContextCache,
+	) {}
 
 	private context(collection: string): Promise<DatetimeContext> {
-		return this.loadContext(collection);
+		if (!this.contexts) return this.loadContext(collection);
+		let context = this.contexts.get(collection);
+		if (!context) {
+			context = this.loadContext(collection);
+			this.contexts.set(collection, context);
+		}
+		return context;
 	}
 
 	private async loadContext(collection: string): Promise<DatetimeContext> {

package/src/database/migrations/035_bounded_404_log.ts

@@ -45,51 +45,40 @@ export async function up(db: Kysely<unknown>): Promise<void> {
 		WHERE last_seen_at IS NULL
 	`.execute(db);
 
-	// 2. Deduplicate existing rows by path.
-	//    For each path, roll up hits and pick the freshest last_seen_at onto
-	//    a single keeper row, then delete the non-keepers. Uses window
-	//    functions (ROW_NUMBER) so the dedup SQL is valid on both SQLite
-	//    (3.25+, 2018) and Postgres. The previous GROUP BY approach was
-	//    accepted by SQLite but invalid on Postgres because `id` wasn't in
-	//    the GROUP BY or wrapped in an aggregate.
-	if (!hitsExists) {
-		await sql`
-			WITH ranked AS (
+	// 2. Deduplicate existing rows by path: copy each duplicated path's hit
+	//    count and latest timestamp onto all of its rows, then keep only the
+	//    freshest row. The totals come from a single GROUP BY join so the pass
+	//    stays linear. Both statements are safe to rerun after a partial run.
+	await sql`
+		UPDATE _emdash_404_log
+		SET
+			hits = agg.path_count,
+			last_seen_at = agg.latest_created_at
+		FROM (
+			SELECT path, COUNT(*) AS path_count, MAX(created_at) AS latest_created_at
+			FROM _emdash_404_log
+			GROUP BY path
+			HAVING COUNT(*) > 1
+		) AS agg
+		WHERE _emdash_404_log.path = agg.path
+	`.execute(db);
+
+	// Delete the non-keepers (every row except the freshest per path).
+	await sql`
+		DELETE FROM _emdash_404_log
+		WHERE id IN (
+			SELECT id FROM (
 				SELECT
 					id,
-					path,
 					ROW_NUMBER() OVER (
 						PARTITION BY path
 						ORDER BY created_at DESC, id DESC
-					) AS rn,
-					COUNT(*) OVER (PARTITION BY path) AS path_count,
-					MAX(created_at) OVER (PARTITION BY path) AS latest_created_at
+					) AS rn
 				FROM _emdash_404_log
-			)
-			UPDATE _emdash_404_log
-			SET
-				hits = (SELECT path_count FROM ranked WHERE ranked.id = _emdash_404_log.id),
-				last_seen_at = (SELECT latest_created_at FROM ranked WHERE ranked.id = _emdash_404_log.id)
-			WHERE id IN (SELECT id FROM ranked WHERE rn = 1)
-		`.execute(db);
-
-		// Delete the non-keepers (every row except the freshest per path).
-		await sql`
-			DELETE FROM _emdash_404_log
-			WHERE id IN (
-				SELECT id FROM (
-					SELECT
-						id,
-						ROW_NUMBER() OVER (
-							PARTITION BY path
-							ORDER BY created_at DESC, id DESC
-						) AS rn
-					FROM _emdash_404_log
-				) AS ranked
-				WHERE rn > 1
-			)
-		`.execute(db);
-	}
+			) AS ranked
+			WHERE rn > 1
+		)
+	`.execute(db);
 
 	// 3. Add unique index on path for upsert semantics.
 	await db.schema