emdash 0.36.0 → 0.38.0

package/src/aws-sdk.d.ts

@@ -64,6 +64,7 @@ declare module "@aws-sdk/client-s3" {
 			Body?: unknown;
 			ContentType?: string;
 			ContentLength?: number;
+			CacheControl?: string;
 		});
 	}
 

package/src/cache/chrome-tags.ts

@@ -0,0 +1,24 @@
+/**
+ * Stable cache tags for EmDash chrome (settings, menus, taxonomies, widget areas).
+ *
+ * These tags are used by both the public read helpers (cacheHint) and the
+ * admin write routes (cache.invalidate), closing the Workers edge cache loop.
+ */
+
+const PREFIX = "emdash";
+
+export function siteSettingsTag(): string {
+	return `${PREFIX}:settings`;
+}
+
+export function menuTag(name: string): string {
+	return `${PREFIX}:menu:${name}`;
+}
+
+export function taxonomyTag(name: string): string {
+	return `${PREFIX}:taxonomy:${name}`;
+}
+
+export function widgetAreaTag(name: string): string {
+	return `${PREFIX}:widget-area:${name}`;
+}

package/src/cli/commands/content.ts

@@ -238,6 +238,10 @@ const updateCommand = defineCommand({
 			type: "boolean",
 			description: "Keep as draft instead of auto-publishing",
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
@@ -249,13 +253,16 @@ const updateCommand = defineCommand({
 				data,
 				_rev: args.rev,
 				locale: args.locale,
+				overrideLock: args["override-lock"],
 			});
 
 			// Auto-publish unless --draft is set.
 			// Only publish if the update created a draft revision (i.e. the
 			// collection supports revisions and data went to a draft).
 			if (!args.draft && updated.draftRevisionId) {
-				await client.publish(args.collection, updated.id);
+				await client.publish(args.collection, updated.id, {
+					overrideLock: args["override-lock"],
+				});
 			}
 
 			// Re-fetch to return the current state
@@ -281,13 +288,17 @@ const deleteCommand = defineCommand({
 			description: "Content item ID or slug",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.delete(args.collection, args.id);
+			await client.delete(args.collection, args.id, { overrideLock: args["override-lock"] });
 			output({ success: true }, args);
 			consola.success(`Deleted ${args.collection}/${args.id}`);
 		} catch (error) {
@@ -310,13 +321,17 @@ const publishCommand = defineCommand({
 			description: "Content item ID or slug",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.publish(args.collection, args.id);
+			await client.publish(args.collection, args.id, { overrideLock: args["override-lock"] });
 			output({ success: true }, args);
 			consola.success(`Published ${args.collection}/${args.id}`);
 		} catch (error) {
@@ -339,13 +354,17 @@ const unpublishCommand = defineCommand({
 			description: "Content item ID or slug",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.unpublish(args.collection, args.id);
+			await client.unpublish(args.collection, args.id, { overrideLock: args["override-lock"] });
 			output({ success: true }, args);
 			consola.success(`Unpublished ${args.collection}/${args.id}`);
 		} catch (error) {
@@ -373,13 +392,20 @@ const scheduleCommand = defineCommand({
 			description: "ISO 8601 datetime to publish at",
 			required: true,
 		},
+		"override-lock": {
+			type: "boolean",
+			description: "Write even though another editor holds this entry's edit lock",
+		},
 		...connectionArgs,
 	},
 	async run({ args }) {
 		configureOutputMode(args);
 		try {
 			const client = createClientFromArgs(args);
-			await client.schedule(args.collection, args.id, { at: args.at });
+			await client.schedule(args.collection, args.id, {
+				at: args.at,
+				overrideLock: args["override-lock"],
+			});
 			output({ success: true }, args);
 			consola.success(`Scheduled ${args.collection}/${args.id} for ${args.at}`);
 		} catch (error) {

package/src/cli/commands/export-seed.ts

@@ -318,8 +318,10 @@ async function exportCollections(db: Kysely<Database>): Promise<SeedCollection[]
 			supports: collection.supports.length > 0 ? collection.supports : undefined,
 			urlPattern: collection.urlPattern || undefined,
 			routable: collection.routable === false ? false : undefined,
+			editLocking: collection.editLocking === false ? false : undefined,
 			hidden: collection.hidden || undefined,
 			sortOrder: collection.sortOrder,
+			group: collection.group,
 			fields: fields.map(
 				(field): SeedField => ({
 					slug: field.slug,

package/src/client/index.ts

@@ -733,6 +733,8 @@ export class EmDashClient {
 			status?: string;
 			_rev?: string;
 			locale?: string;
+			/** Write even though another editor holds this entry's edit lock. */
+			overrideLock?: boolean;
 		},
 	): Promise<ContentItem> {
 		// Convert markdown strings to PT
@@ -747,6 +749,7 @@ export class EmDashClient {
 			slug: input.slug,
 			status: input.status,
 			...(input._rev ? { _rev: input._rev } : {}),
+			...(input.overrideLock ? { overrideLock: true } : {}),
 		};
 		const params = new URLSearchParams();
 		if (input.locale) params.set("locale", input.locale);
@@ -764,35 +767,54 @@ export class EmDashClient {
 	}
 
 	/** Delete (soft) a content item */
-	async delete(collection: string, id: string): Promise<void> {
+	async delete(
+		collection: string,
+		id: string,
+		options: { overrideLock?: boolean } = {},
+	): Promise<void> {
+		const query = options.overrideLock ? "?overrideLock=true" : "";
 		await this.request<unknown>(
 			"DELETE",
-			`/content/${encodeURIComponent(collection)}/${encodeURIComponent(id)}`,
+			`/content/${encodeURIComponent(collection)}/${encodeURIComponent(id)}${query}`,
 		);
 	}
 
 	/** Publish a content item */
-	async publish(collection: string, id: string): Promise<void> {
+	async publish(
+		collection: string,
+		id: string,
+		options: { overrideLock?: boolean } = {},
+	): Promise<void> {
 		await this.request<unknown>(
 			"POST",
 			`/content/${encodeURIComponent(collection)}/${encodeURIComponent(id)}/publish`,
+			options.overrideLock ? { overrideLock: true } : undefined,
 		);
 	}
 
 	/** Unpublish a content item */
-	async unpublish(collection: string, id: string): Promise<void> {
+	async unpublish(
+		collection: string,
+		id: string,
+		options: { overrideLock?: boolean } = {},
+	): Promise<void> {
 		await this.request<unknown>(
 			"POST",
 			`/content/${encodeURIComponent(collection)}/${encodeURIComponent(id)}/unpublish`,
+			options.overrideLock ? { overrideLock: true } : undefined,
 		);
 	}
 
 	/** Schedule publishing */
-	async schedule(collection: string, id: string, options: { at: string }): Promise<void> {
+	async schedule(
+		collection: string,
+		id: string,
+		options: { at: string; overrideLock?: boolean },
+	): Promise<void> {
 		await this.request<unknown>(
 			"POST",
 			`/content/${encodeURIComponent(collection)}/${encodeURIComponent(id)}/schedule`,
-			{ scheduledAt: options.at },
+			{ scheduledAt: options.at, ...(options.overrideLock ? { overrideLock: true } : {}) },
 		);
 	}
 
@@ -821,10 +843,15 @@ export class EmDashClient {
 	}
 
 	/** Discard draft revision, reverting to the published version */
-	async discardDraft(collection: string, id: string): Promise<void> {
+	async discardDraft(
+		collection: string,
+		id: string,
+		options: { overrideLock?: boolean } = {},
+	): Promise<void> {
 		await this.request<unknown>(
 			"POST",
 			`/content/${encodeURIComponent(collection)}/${encodeURIComponent(id)}/discard-draft`,
+			options.overrideLock ? { overrideLock: true } : undefined,
 		);
 	}
 

package/src/components/EmDashBodyEnd.astro

@@ -13,6 +13,7 @@
 import type { PublicPageContext } from "../plugins/types.js";
 import { renderFragments } from "../page/fragments.js";
 import { getPageRuntime } from "../page/index.js";
+import { resolveSeoPanelPage } from "../page/seo-contributions.js";
 
 interface Props {
 	page: PublicPageContext;
@@ -24,7 +25,9 @@ const runtime = getPageRuntime(Astro.locals as Record<string, unknown>);
 let html = "";
 
 if (runtime) {
-	const contributions = await runtime.collectPageFragments(page);
+	// Same SEO panel overlay as <EmDashHead>, so body fragment hooks see
+	// the identical page context as head hooks (a request-cache read).
+	const contributions = await runtime.collectPageFragments(await resolveSeoPanelPage(page));
 	html = renderFragments(contributions, "body:end");
 }
 ---

package/src/components/EmDashBodyStart.astro

@@ -13,6 +13,7 @@
 import type { PublicPageContext } from "../plugins/types.js";
 import { renderFragments } from "../page/fragments.js";
 import { getPageRuntime } from "../page/index.js";
+import { resolveSeoPanelPage } from "../page/seo-contributions.js";
 
 interface Props {
 	page: PublicPageContext;
@@ -24,7 +25,9 @@ const runtime = getPageRuntime(Astro.locals as Record<string, unknown>);
 let html = "";
 
 if (runtime) {
-	const contributions = await runtime.collectPageFragments(page);
+	// Same SEO panel overlay as <EmDashHead>, so body fragment hooks see
+	// the identical page context as head hooks (a request-cache read).
+	const contributions = await runtime.collectPageFragments(await resolveSeoPanelPage(page));
 	html = renderFragments(contributions, "body:start");
 }
 ---

package/src/components/EmDashHead.astro

@@ -3,8 +3,16 @@
  * Renders base SEO metadata, plugin-contributed metadata, and trusted head fragments.
  *
  * Base SEO metadata (meta tags, OG, Twitter Card, canonical, JSON-LD) is generated
- * from the page context's seo/articleMeta/siteName fields. Contributions are
- * composed in the order `[...plugin, ...site, ...base]` and resolved by
+ * from the page context's seo/articleMeta/siteName fields. When the page renders
+ * a content entry (`page.content` is set) that was fetched through EmDash's
+ * content APIs in this request (`getEmDashEntry()` or the live loader,
+ * including warm object-cache hits), the entry's SEO panel values are overlaid
+ * onto the page context automatically: the entry query folds the
+ * `_emdash_seo` row in as a subselect and primes a request-scoped cache, so
+ * the overlay costs zero additional queries. Editor-set values flow into the
+ * base contributions, the JSON-LD builders, and plugin hooks — the body
+ * fragment components apply the same overlay. Contributions are composed in
+ * the order `[...plugin, ...site, ...base]` and resolved by
  * `resolvePageMetadata()` with first-wins dedup. Plugins sit at the front of
  * the array, so for any given key plugin contributions override site-level
  * ones, which override base ones.
@@ -30,6 +38,7 @@ import JsonLdScript from "./JsonLdScript.astro";
 import {
 	generateBaseSeoContributions,
 	generateSiteSeoContributions,
+	resolveSeoPanelPage,
 } from "../page/seo-contributions.js";
 import { renderSiteIdentity } from "../page/site-identity.js";
 import { getPageRuntime } from "../page/index.js";
@@ -51,21 +60,32 @@ let fragmentsHtml = "";
 let jsonLdScripts: ResolvedPageMetadata["jsonld"] = [];
 
 if (runtime) {
-	// Run independent async loads in parallel: site settings (SEO meta
-	// tags + favicon) and plugin page-metadata contributions. Plugin
-	// contributions come BEFORE site/base in the contribution array,
-	// so resolvePageMetadata's first-wins dedup lets plugins override
-	// defaults.
-	//
 	// `getSiteSettings()` is request-cached and worker-cached, so when
 	// a parent template has already called it (the standard pattern in
 	// `Base.astro`), this is free. Otherwise it's a single batched
 	// query that supersedes any per-key fetch this component would
-	// otherwise have done.
-	const [siteSettings, pluginContributions, fragments] = await Promise.all([
-		getSiteSettings(),
-		runtime.collectPageMetadata(page),
-		runtime.collectPageFragments(page),
+	// otherwise have done. Loaded first because the site URL feeds the
+	// SEO-panel overlay below.
+	const siteSettings = await getSiteSettings();
+	const siteUrl =
+		page.siteUrl || siteSettings.url || (URL.canParse(page.url) ? new URL(page.url).origin : "");
+
+	// SEO panel values for the rendered content entry, primed by
+	// the entry query's folded _emdash_seo column — a request-cache read,
+	// never a database query. Overlaid onto the page context before
+	// anything consumes it, so editor-set description/image/canonical/
+	// noindex take effect by default — in the rendered head tags, in the
+	// JSON-LD builders, and in what plugin hooks see — without the
+	// template wiring getSeoMeta().
+	const resolvedPage = await resolveSeoPanelPage(page, siteUrl);
+
+	// Plugin page-metadata contributions and body fragments run in
+	// parallel. Plugin contributions come BEFORE site/base in the
+	// contribution array, so resolvePageMetadata's first-wins dedup lets
+	// plugins override defaults.
+	const [pluginContributions, fragments] = await Promise.all([
+		runtime.collectPageMetadata(resolvedPage),
+		runtime.collectPageFragments(resolvedPage),
 	]);
 
 	// Site-level default OG image: applied per-page in base contributions
@@ -80,10 +100,10 @@ if (runtime) {
 	const defaultOgImage = absolutizeMediaUrl(
 		siteSettings.seo?.defaultOgImage?.url,
 		siteSettings.url,
-		page,
+		resolvedPage,
 	);
 	const baseContributions: PageMetadataContribution[] = generateBaseSeoContributions(
-		page,
+		resolvedPage,
 		defaultOgImage,
 	);
 
@@ -94,7 +114,6 @@ if (runtime) {
 	// key is the hreflang value).
 	let hreflangContributions: PageMetadataContribution[] = [];
 	if (page.content && isI18nEnabled()) {
-		const siteUrl = page.siteUrl || siteSettings.url || new URL(page.url).origin;
 		const alternates = await getHreflangAlternates(page.content.collection, page.content.id, {
 			siteUrl,
 		});

package/src/components/EmDashImage.astro

@@ -25,6 +25,7 @@ import type { HTMLAttributes } from "astro/types";
 import { Image as AstroImage, getImage } from "astro:assets";
 import type { ImageEmbed } from "../media/types.js";
 import { getMediaProvider } from "../media/provider-loader.js";
+import { normalizeLegacyExternalMediaValue } from "../media/normalize.js";
 import { buildRenderMediaUrl } from "../media/url.js";
 import {
 	buildResponsiveImage,
@@ -78,7 +79,7 @@ function normalizeImage(
 	if (typeof img === "string") {
 		return { id: "", src: img };
 	}
-	return img;
+	return normalizeLegacyExternalMediaValue(img);
 }
 
 /**

package/src/components/EmDashMedia.astro

@@ -20,6 +20,7 @@ import type { MediaValue } from "../fields/types.js";
 import type { EmbedResult, EmbedOptions } from "../media/types.js";
 import type { HTMLAttributes } from "astro/types";
 import { getMediaProvider } from "../media/provider-loader.js";
+import { normalizeLegacyExternalMediaValue } from "../media/normalize.js";
 
 interface Props extends Omit<HTMLAttributes<"img" | "video" | "audio">, "src" | "width" | "height"> {
 	/** Media value from content field */
@@ -42,7 +43,7 @@ function normalizeValue(val: MediaValue | string | undefined | null): MediaValue
 	if (typeof val === "string") {
 		return { id: "", src: val, provider: "local" };
 	}
-	return val;
+	return normalizeLegacyExternalMediaValue(val);
 }
 
 const media = normalizeValue(value);

package/src/components/Gallery.astro

@@ -11,7 +11,12 @@ import { Image as AstroImage } from "astro:assets";
 import type { ImageEmbed } from "../media/types.js";
 import { getMediaProvider } from "../media/provider-loader.js";
 import { buildRenderMediaUrl } from "../media/url.js";
-import { toAbsoluteMediaUrl, RESPONSIVE_BREAKPOINTS } from "../media/responsive.js";
+import {
+	toAbsoluteMediaUrl,
+	gallerySizes,
+	GALLERY_DEFAULT_COLUMNS,
+	RESPONSIVE_BREAKPOINTS,
+} from "../media/responsive.js";
 import { getPublicOrigin } from "../api/public-url.js";
 import { focalPointToObjectPosition } from "../media/focal-point.js";
 
@@ -43,6 +48,12 @@ export interface Props {
 	};
 	/** Render the LQIP placeholder as an inline background. Disable for strict CSP. */
 	placeholder?: boolean;
+	/**
+	 * `sizes` attribute for every image in the gallery. Defaults to an estimate
+	 * from the column count against the viewport; set it when the gallery renders
+	 * in a narrower container, e.g. `"(max-width: 640px) 45vw, 220px"`.
+	 */
+	sizes?: string;
 }
 
 /**
@@ -61,9 +72,11 @@ function generateSrcset(
 		.join(", ");
 }
 
-const { node, placeholder = true } = Astro.props;
+const { node, placeholder = true, sizes: sizesOverride } = Astro.props;
 const images = node?.images ?? [];
-const columns = node?.columns ?? 3;
+const columns = node?.columns ?? GALLERY_DEFAULT_COLUMNS;
+// Each image fills one grid cell, not the viewport.
+const cellSizes = sizesOverride ?? gallerySizes(columns);
 
 if (!images.length) {
 	return null;
@@ -102,7 +115,7 @@ const resolvedImages = await Promise.all(
 						if (embed.getSrc) {
 							const maxWidth = width || 1200;
 							srcset = generateSrcset(embed.getSrc, maxWidth, aspectRatio);
-							sizes = width ? `(min-width: ${width}px) ${width}px, 100vw` : "100vw";
+							sizes = cellSizes;
 						}
 					}
 				} catch (error) {
@@ -166,6 +179,7 @@ const resolvedImages = await Promise.all(
 						width={image.width!}
 						height={image.height!}
 						layout="constrained"
+						sizes={cellSizes}
 						style={image.objectPosition ? `object-position: ${image.objectPosition};` : undefined}
 					/>
 				) : (

package/src/components/InlineEditor.astro

@@ -13,9 +13,10 @@ export interface Props {
 	collection: string;
 	entryId: string;
 	field: string;
+	tablePlaceholder?: string;
 }
 
-const { value, collection, entryId, field } = Astro.props;
+const { value, collection, entryId, field, tablePlaceholder } = Astro.props;
 ---
 
 <InlinePortableTextEditor
@@ -24,4 +25,5 @@ const { value, collection, entryId, field } = Astro.props;
 	collection={collection}
 	entryId={entryId}
 	field={field}
+	tablePlaceholder={tablePlaceholder}
 />