emdash 0.40.1 → 0.42.0

package/src/cli/commands/seed.ts

@@ -13,6 +13,7 @@ import consola from "consola";
 import { createDatabase } from "../../database/connection.js";
 import { runMigrations } from "../../database/migrations/runner.js";
 import { applySeed } from "../../seed/apply.js";
+import { claimExplicitSeedOwnership } from "../../seed/ownership.js";
 import type { SeedFile, SeedApplyOptions } from "../../seed/types.js";
 import { validateSeed } from "../../seed/validate.js";
 import { LocalStorage } from "../../storage/local.js";
@@ -225,6 +226,7 @@ export const seedCommand = defineCommand({
 		// Apply seed
 		consola.start("Applying seed...");
 		try {
+			await claimExplicitSeedOwnership(db, seed);
 			const result = await applySeed(db, seed, options);
 
 			consola.success("Seed applied successfully!");

package/src/cli/credentials.ts

@@ -26,17 +26,7 @@ export interface StoredCredential {
 	};
 }
 
-/** Credential for marketplace auth (GitHub OAuth JWT, no refresh token) */
-export interface MarketplaceCredential {
-	token: string;
-	expiresAt: string;
-	author?: {
-		id: string;
-		name: string;
-	};
-}
-
-type CredentialStore = Record<string, StoredCredential | MarketplaceCredential>;
+type CredentialStore = Record<string, StoredCredential>;
 
 // ---------------------------------------------------------------------------
 // Paths
@@ -185,52 +175,3 @@ export function listCredentialKeys(): string[] {
 	const store = readStore();
 	return Object.keys(store);
 }
-
-// ---------------------------------------------------------------------------
-// Marketplace credentials
-// ---------------------------------------------------------------------------
-
-function marketplaceKey(registryUrl: string): string {
-	try {
-		return `marketplace:${new URL(registryUrl).origin}`;
-	} catch {
-		return `marketplace:${registryUrl}`;
-	}
-}
-
-/**
- * Get stored marketplace credential for a registry URL.
- */
-export function getMarketplaceCredential(registryUrl: string): MarketplaceCredential | null {
-	const key = marketplaceKey(registryUrl);
-	const store = readStore();
-	const cred = store[key];
-	if (!cred || !("token" in cred)) return null;
-	// Check expiry
-	if (new Date(cred.expiresAt) < new Date()) return null;
-	return cred;
-}
-
-/**
- * Save marketplace credential for a registry URL.
- */
-export function saveMarketplaceCredential(registryUrl: string, cred: MarketplaceCredential): void {
-	const key = marketplaceKey(registryUrl);
-	const store = readStore();
-	store[key] = cred;
-	writeStore(store);
-}
-
-/**
- * Remove marketplace credential for a registry URL.
- */
-export function removeMarketplaceCredential(registryUrl: string): boolean {
-	const key = marketplaceKey(registryUrl);
-	const store = readStore();
-	if (key in store) {
-		delete store[key];
-		writeStore(store);
-		return true;
-	}
-	return false;
-}

package/src/cli/index.ts

@@ -12,7 +12,6 @@ import { loginCommand, logoutCommand, whoamiCommand } from "./commands/login.js"
 import { mediaCommand } from "./commands/media.js";
 import { menuCommand } from "./commands/menu.js";
 import { migrateCommand } from "./commands/migrate.js";
-import { pluginCommand } from "./commands/plugin.js";
 import { schemaCommand } from "./commands/schema.js";
 import { searchCommand } from "./commands/search-cmd.js";
 import { secretsCommand } from "./commands/secrets.js";
@@ -47,7 +46,6 @@ const main = defineCommand({
 		search: searchCommand,
 		taxonomy: taxonomyCommand,
 		menu: menuCommand,
-		plugin: pluginCommand,
 		site: siteCommand,
 	},
 });

package/src/client/index.ts

@@ -1298,14 +1298,20 @@ export class EmDashClient {
 		return data.taxonomies;
 	}
 
-	/** List terms in a taxonomy */
+	/**
+	 * List terms in a taxonomy. Visible-usage counts are included by default.
+	 * Pass `includeCounts: false` to skip the aggregate; `count` is then omitted
+	 * from each term.
+	 */
 	async terms(
 		taxonomy: string,
-		options?: { limit?: number; cursor?: string },
+		options?: { limit?: number; cursor?: string; includeCounts?: boolean },
 	): Promise<ListResult<Term>> {
 		const params = new URLSearchParams();
 		if (options?.limit) params.set("limit", String(options.limit));
 		if (options?.cursor) params.set("cursor", options.cursor);
+		if (options?.includeCounts !== undefined)
+			params.set("includeCounts", String(options.includeCounts));
 
 		const qs = params.toString();
 		const data = await this.request<{ terms: Term[] }>(

package/src/components/Image.astro

@@ -30,6 +30,7 @@ export interface Props {
 		};
 		alt?: string;
 		caption?: string;
+		title?: string;
 		/** Original image width */
 		width?: number;
 		/** Original image height */
@@ -77,8 +78,14 @@ if (!node?.asset) {
 	return null;
 }
 
-const { caption, displayWidth, displayHeight, alignment, link } = node;
+const { caption, title, displayWidth, displayHeight, alignment, link } = node;
 const { asset, alt = "", width, height } = resolveImageMedia(node);
+const dimension = (value: number | undefined) =>
+	typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
+const originalWidth = dimension(width);
+const originalHeight = dimension(height);
+const customWidth = dimension(displayWidth);
+const customHeight = dimension(displayHeight);
 
 const imageLink = normalizeImageLink(link);
 const linkHref = imageLink ? sanitizeHref(imageLink.href) : null;
@@ -90,24 +97,24 @@ const linkTarget = linkBlank ? "_blank" : undefined;
 const linkRel = linkBlank ? "noopener noreferrer" : undefined;
 
 // Calculate aspect ratio from original dimensions
-const aspectRatio = width && height ? width / height : undefined;
+const aspectRatio = originalWidth && originalHeight ? originalWidth / originalHeight : undefined;
 
 // Calculate render dimensions
 let renderWidth: number | undefined;
 let renderHeight: number | undefined;
 
-if (displayWidth && displayHeight) {
-	renderWidth = displayWidth;
-	renderHeight = displayHeight;
-} else if (displayWidth && aspectRatio) {
-	renderWidth = displayWidth;
-	renderHeight = Math.round(displayWidth / aspectRatio);
-} else if (displayHeight && aspectRatio) {
-	renderWidth = Math.round(displayHeight * aspectRatio);
-	renderHeight = displayHeight;
+if (customWidth && customHeight) {
+	renderWidth = customWidth;
+	renderHeight = customHeight;
+} else if (customWidth && aspectRatio) {
+	renderWidth = customWidth;
+	renderHeight = Math.round(customWidth / aspectRatio);
+} else if (customHeight && aspectRatio) {
+	renderWidth = Math.round(customHeight * aspectRatio);
+	renderHeight = customHeight;
 } else {
-	renderWidth = width;
-	renderHeight = height;
+	renderWidth = originalWidth;
+	renderHeight = originalHeight;
 }
 
 // Get the image source URL and srcset
@@ -192,6 +199,7 @@ if (placeholder && blurhash) {
 					<AstroImage
 						src={astroImageSrc}
 						alt={alt}
+						title={title}
 						width={renderWidth}
 						height={renderHeight}
 						layout="constrained"
@@ -205,6 +213,7 @@ if (placeholder && blurhash) {
 						srcset={srcset}
 						sizes={sizes}
 						alt={alt}
+						title={title}
 						width={renderWidth}
 						height={renderHeight}
 						loading="lazy"
@@ -217,6 +226,7 @@ if (placeholder && blurhash) {
 			<AstroImage
 				src={astroImageSrc}
 				alt={alt}
+				title={title}
 				width={renderWidth}
 				height={renderHeight}
 				layout="constrained"
@@ -230,6 +240,7 @@ if (placeholder && blurhash) {
 				srcset={srcset}
 				sizes={sizes}
 				alt={alt}
+				title={title}
 				width={renderWidth}
 				height={renderHeight}
 				loading="lazy"

package/src/components/InlinePortableTextEditor.tsx

@@ -154,7 +154,7 @@ function attrStr(attrs: Record<string, unknown> | undefined, key: string): strin
 /** Safely extract an optional string attribute from ProseMirror attrs */
 function attrStrOpt(attrs: Record<string, unknown> | undefined, key: string): string | undefined {
 	const v = attrs?.[key];
-	return typeof v === "string" ? v : undefined;
+	return typeof v === "string" && v ? v : undefined;
 }
 
 /** Safely extract a number attribute from ProseMirror attrs */
@@ -163,6 +163,14 @@ function attrNum(attrs: Record<string, unknown> | undefined, key: string): numbe
 	return typeof v === "number" ? v : undefined;
 }
 
+function attrDimension(
+	attrs: Record<string, unknown> | undefined,
+	key: string,
+): number | undefined {
+	const value = attrNum(attrs, key);
+	return value !== undefined && Number.isFinite(value) && value > 0 ? value : undefined;
+}
+
 function canonicalMediaProviderId(provider: string | undefined): string | undefined {
 	return provider === "external-url" ? "external" : provider;
 }
@@ -267,6 +275,10 @@ function convertPMNode(node: PMNode, path: string): PTBlock | PTBlock[] | null {
 			const provider = attrStrOpt(node.attrs, "provider");
 			const blurhash = attrStrOpt(node.attrs, "blurhash");
 			const dominantColor = attrStrOpt(node.attrs, "dominantColor");
+			const title = attrStrOpt(node.attrs, "title");
+			const caption = Object.hasOwn(node.attrs ?? {}, "caption")
+				? (attrStrOpt(node.attrs, "caption") ?? (title ? "" : undefined))
+				: title;
 			// Persist LQIP as first-class block fields (matching the image-field
 			// MediaValue path) rather than nesting in `asset.meta`, so read sites
 			// and normalize don't need a dual-shape fallback. `asset.meta` is left
@@ -281,13 +293,14 @@ function convertPMNode(node: PMNode, path: string): PTBlock | PTBlock[] | null {
 					provider: provider && provider !== "local" ? provider : undefined,
 				},
 				alt: attrStrOpt(node.attrs, "alt"),
-				caption: attrStrOpt(node.attrs, "caption") ?? attrStrOpt(node.attrs, "title"),
-				width: attrNum(node.attrs, "width"),
-				height: attrNum(node.attrs, "height"),
+				caption,
+				title,
+				width: attrDimension(node.attrs, "width"),
+				height: attrDimension(node.attrs, "height"),
 				...(blurhash ? { blurhash } : {}),
 				...(dominantColor ? { dominantColor } : {}),
-				displayWidth: attrNum(node.attrs, "displayWidth"),
-				displayHeight: attrNum(node.attrs, "displayHeight"),
+				displayWidth: attrDimension(node.attrs, "displayWidth"),
+				displayHeight: attrDimension(node.attrs, "displayHeight"),
 			};
 		}
 		case "horizontalRule":
@@ -573,6 +586,7 @@ function convertPTBlock(block: PTBlock): PMNode | null {
 			url?: string;
 			alt?: string;
 			caption?: string;
+			title?: string;
 			width?: number;
 			height?: number;
 			/** LQIP — first-class field (legacy snapshots keep it in `asset.meta`). */
@@ -601,8 +615,8 @@ function convertPTBlock(block: PTBlock): PMNode | null {
 			attrs: {
 				src: asset.url || ib.url || (asset._ref ? `/_emdash/api/media/file/${asset._ref}` : ""),
 				alt: alt || "",
-				title: ib.caption || "",
-				caption: ib.caption || "",
+				title: ib.title || "",
+				caption: Object.hasOwn(ib, "caption") ? ib.caption || "" : ib.title || "",
 				mediaId: asset._ref || undefined,
 				provider: canonicalMediaProviderId(asset.provider),
 				width,
@@ -2260,6 +2274,9 @@ export function InlinePortableTextEditor({
 						provider: { default: null },
 						width: { default: null },
 						height: { default: null },
+						displayWidth: { default: null },
+						displayHeight: { default: null },
+						caption: { default: null },
 						blurhash: { default: null },
 						dominantColor: { default: null },
 					};

package/src/components/WidgetArea.astro

@@ -1,5 +1,5 @@
 ---
-import { getWidgetArea } from "../widgets/index.js";
+import { getWidgetAreaWithCacheHint } from "../widgets/index.js";
 import WidgetRenderer from "./WidgetRenderer.astro";
 
 interface Props {
@@ -8,7 +8,8 @@ interface Props {
 }
 
 const { name, class: className } = Astro.props;
-const area = await getWidgetArea(name);
+const { data: area, cacheHint } = await getWidgetAreaWithCacheHint(name);
+if (Astro.cache?.enabled) Astro.cache.set(cacheHint);
 ---
 
 {

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

@@ -645,6 +645,10 @@ function imageAlignment(value: unknown): PortableTextImageBlock["alignment"] {
 		: undefined;
 }
 
+function imageDimension(value: unknown): number | undefined {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
+}
+
 /**
  * Convert image block to ProseMirror
  */
@@ -656,13 +660,14 @@ function convertImage(block: PortableTextImageBlock, preserveIdentity: boolean):
 			{
 				src: asset.url || asset._ref,
 				alt: alt || "",
-				title: block.caption || "",
+				title: block.title || "",
+				caption: Object.hasOwn(block, "caption") ? block.caption || "" : block.title || "",
 				mediaId: asset._ref,
 				provider: asset.provider,
-				width,
-				height,
-				displayWidth: block.displayWidth,
-				displayHeight: block.displayHeight,
+				width: imageDimension(width),
+				height: imageDimension(height),
+				displayWidth: imageDimension(block.displayWidth),
+				displayHeight: imageDimension(block.displayHeight),
 				alignment: imageAlignment(block.alignment),
 				link: normalizeImageLink(block.link),
 			},
@@ -684,24 +689,25 @@ function convertMalformedImage(
 	// PortableTextUnknownBlock allows indexed access via [key: string]: unknown
 	const url = "url" in block && typeof block.url === "string" ? block.url : "";
 	const alt = "alt" in block && typeof block.alt === "string" ? block.alt : "";
-	const caption = "caption" in block && typeof block.caption === "string" ? block.caption : "";
-	const width = "width" in block && typeof block.width === "number" ? block.width : undefined;
-	const height = "height" in block && typeof block.height === "number" ? block.height : undefined;
-	const displayWidth =
-		"displayWidth" in block && typeof block.displayWidth === "number"
-			? block.displayWidth
-			: undefined;
-	const displayHeight =
-		"displayHeight" in block && typeof block.displayHeight === "number"
-			? block.displayHeight
-			: undefined;
+	const title = "title" in block && typeof block.title === "string" ? block.title : "";
+	const rawCaption = "caption" in block ? block.caption : undefined;
+	const caption = Object.hasOwn(block, "caption")
+		? typeof rawCaption === "string"
+			? rawCaption
+			: ""
+		: title;
+	const width = imageDimension("width" in block ? block.width : undefined);
+	const height = imageDimension("height" in block ? block.height : undefined);
+	const displayWidth = imageDimension("displayWidth" in block ? block.displayWidth : undefined);
+	const displayHeight = imageDimension("displayHeight" in block ? block.displayHeight : undefined);
 	return {
 		type: "image",
 		attrs: identityAttrs(
 			{
 				src: url,
 				alt,
-				title: caption,
+				title,
+				caption,
 				mediaId: undefined,
 				provider: undefined,
 				width,

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

@@ -359,6 +359,10 @@ function convertHtmlBlock(node: ProseMirrorNode): PortableTextHtmlBlock {
 	};
 }
 
+function imageDimension(value: unknown): number | undefined {
+	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
+}
+
 /**
  * Convert image to Portable Text
  */
@@ -369,10 +373,16 @@ function convertImage(node: ProseMirrorNode): PortableTextImageBlock {
 	const src = typeof attrs?.src === "string" ? attrs.src : "";
 	const alt = typeof attrs?.alt === "string" ? attrs.alt : undefined;
 	const title = typeof attrs?.title === "string" ? attrs.title : undefined;
-	const width = typeof attrs?.width === "number" ? attrs.width : undefined;
-	const height = typeof attrs?.height === "number" ? attrs.height : undefined;
-	const displayWidth = typeof attrs?.displayWidth === "number" ? attrs.displayWidth : undefined;
-	const displayHeight = typeof attrs?.displayHeight === "number" ? attrs.displayHeight : undefined;
+	const caption =
+		attrs && Object.hasOwn(attrs, "caption")
+			? typeof attrs.caption === "string"
+				? attrs.caption
+				: undefined
+			: title;
+	const width = imageDimension(attrs?.width);
+	const height = imageDimension(attrs?.height);
+	const displayWidth = imageDimension(attrs?.displayWidth);
+	const displayHeight = imageDimension(attrs?.displayHeight);
 	const alignment = attrs?.alignment;
 
 	// Normalise link: drop entirely when href is missing or empty so half-populated
@@ -400,7 +410,8 @@ function convertImage(node: ProseMirrorNode): PortableTextImageBlock {
 			provider: provider && provider !== "local" ? provider : undefined,
 		},
 		alt: alt || undefined,
-		caption: title || undefined,
+		caption: caption || (title ? "" : undefined),
+		title: title || undefined,
 		width: width || undefined,
 		height: height || undefined,
 		displayWidth: displayWidth || undefined,

package/src/content/converters/types.ts

@@ -71,6 +71,7 @@ export interface PortableTextImageBlock {
 	};
 	alt?: string;
 	caption?: string;
+	title?: string;
 	/** Original image width */
 	width?: number;
 	/** Original image height */

package/src/database/content-datetime.ts

@@ -6,16 +6,24 @@ import {
 	normalizeDatetime,
 	type DatetimeFieldDescriptor,
 } from "../datetime-normalization.js";
-import type { RepeaterSubField } from "../schema/types.js";
+import { requestCached } from "../request-cache.js";
+import type { FieldType, RepeaterSubField } from "../schema/types.js";
+import { isSafeUrlFieldWriteValue } from "../utils/url.js";
 import { EmDashValidationError } from "./repositories/types.js";
 import type { Database } from "./types.js";
 
+interface UrlFieldDescriptor {
+	slug: string;
+	urlSubFields?: readonly string[];
+}
+
 interface DatetimeContext {
 	timezone: string;
 	fields: DatetimeFieldDescriptor[];
+	urlFields: UrlFieldDescriptor[];
 }
 
-function repeaterDatetimeFields(validation: string | null): string[] {
+function repeaterSubFieldsOfType(validation: string | null, type: FieldType): string[] {
 	if (!validation) return [];
 	let parsed: unknown;
 	try {
@@ -32,7 +40,7 @@ function repeaterDatetimeFields(validation: string | null): string[] {
 				typeof field === "object" &&
 				field !== null &&
 				"type" in field &&
-				field.type === "datetime" &&
+				field.type === type &&
 				"slug" in field &&
 				typeof field.slug === "string",
 		)
@@ -54,13 +62,18 @@ export class ContentDatetimeNormalizer {
 	) {}
 
 	private context(collection: string): Promise<DatetimeContext> {
-		if (!this.contexts) return this.loadContext(collection);
-		let context = this.contexts.get(collection);
-		if (!context) {
-			context = this.loadContext(collection);
-			this.contexts.set(collection, context);
+		if (this.contexts) {
+			let context = this.contexts.get(collection);
+			if (!context) {
+				context = this.loadContext(collection);
+				this.contexts.set(collection, context);
+			}
+			return context;
 		}
-		return context;
+		// Fall back to the per-request cache so repeated writes in the same
+		// invocation (e.g. bulk imports) do not re-query field/timezone metadata
+		// for every item.
+		return requestCached(`datetimeContext:${collection}`, () => this.loadContext(collection));
 	}
 
 	private async loadContext(collection: string): Promise<DatetimeContext> {
@@ -70,7 +83,7 @@ export class ContentDatetimeNormalizer {
 				.innerJoin("_emdash_collections as collection", "collection.id", "field.collection_id")
 				.select(["field.slug", "field.type", "field.validation"])
 				.where("collection.slug", "=", collection)
-				.where("field.type", "in", ["datetime", "repeater"])
+				.where("field.type", "in", ["datetime", "repeater", "url"])
 				.execute(),
 			this.db
 				.selectFrom("options")
@@ -87,18 +100,39 @@ export class ContentDatetimeNormalizer {
 				// The datetime normalizer reports an invalid timezone when it encounters a value.
 			}
 		}
-		return {
-			timezone,
-			fields: rows.map((row) =>
-				row.type === "datetime"
-					? { slug: row.slug, type: "datetime" }
-					: {
-							slug: row.slug,
-							type: "repeater",
-							datetimeSubFields: repeaterDatetimeFields(row.validation),
-						},
-			),
-		};
+		const fields: DatetimeFieldDescriptor[] = [];
+		const urlFields: UrlFieldDescriptor[] = [];
+		for (const row of rows) {
+			if (row.type === "datetime") {
+				fields.push({ slug: row.slug, type: "datetime" });
+			} else if (row.type === "url") {
+				urlFields.push({ slug: row.slug });
+			} else {
+				fields.push({
+					slug: row.slug,
+					type: "repeater",
+					datetimeSubFields: repeaterSubFieldsOfType(row.validation, "datetime"),
+				});
+				const urlSubFields = repeaterSubFieldsOfType(row.validation, "url");
+				if (urlSubFields.length > 0) urlFields.push({ slug: row.slug, urlSubFields });
+			}
+		}
+		return { timezone, fields, urlFields };
+	}
+
+	/**
+	 * Normalizes datetimes in incoming field values and rejects `url` values
+	 * with unsafe schemes, control characters, or off-site path forms. Values
+	 * already stored are not checked, so restoring or syncing existing data
+	 * goes through {@link normalizeData} instead.
+	 */
+	async normalizeInput(
+		collection: string,
+		data: Record<string, unknown>,
+	): Promise<Record<string, unknown>> {
+		const context = await this.context(collection);
+		assertSafeUrlFields(data, context.urlFields);
+		return this.normalizeWithContext(context, [data])[0] ?? data;
 	}
 
 	async normalizeData(
@@ -113,7 +147,13 @@ export class ContentDatetimeNormalizer {
 		collection: string,
 		items: readonly Record<string, unknown>[],
 	): Promise<Record<string, unknown>[]> {
-		const context = await this.context(collection);
+		return this.normalizeWithContext(await this.context(collection), items);
+	}
+
+	private normalizeWithContext(
+		context: DatetimeContext,
+		items: readonly Record<string, unknown>[],
+	): Record<string, unknown>[] {
 		try {
 			return items.map(
 				(data) => normalizeContentDatetimes(data, context.fields, context.timezone).value,
@@ -138,3 +178,51 @@ export class ContentDatetimeNormalizer {
 		}
 	}
 }
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+// Reads parse a stored string that looks like JSON, so a repeater written as a JSON string
+// comes back as rows and must be checked as rows.
+function repeaterRows(value: unknown): unknown[] | undefined {
+	let rows = value;
+	if (typeof rows === "string" && rows.startsWith("[")) {
+		try {
+			rows = JSON.parse(rows);
+		} catch {
+			return undefined;
+		}
+	}
+	return Array.isArray(rows) ? rows : undefined;
+}
+
+function assertSafeUrl(path: string, value: unknown): void {
+	if (typeof value === "string" && !isSafeUrlFieldWriteValue(value)) {
+		throw new EmDashValidationError(
+			`Field "${path}" must use http, https, mailto, or tel, or be a safe relative path or fragment`,
+			{ path },
+		);
+	}
+}
+
+function assertSafeUrlFields(
+	data: Record<string, unknown>,
+	urlFields: readonly UrlFieldDescriptor[],
+): void {
+	for (const field of urlFields) {
+		const value = data[field.slug];
+		if (!field.urlSubFields) {
+			assertSafeUrl(field.slug, value);
+			continue;
+		}
+		const rows = repeaterRows(value);
+		if (!rows) continue;
+		for (const [index, row] of rows.entries()) {
+			if (!isRecord(row)) continue;
+			for (const subField of field.urlSubFields) {
+				assertSafeUrl(`${field.slug}.${index}.${subField}`, row[subField]);
+			}
+		}
+	}
+}