emdash 0.37.0 → 0.39.0

package/src/fields/image.ts

@@ -12,6 +12,8 @@ const mediaSchema = z.object({
 	mimeType: z.string().optional(),
 	blurhash: z.string().optional(),
 	dominantColor: z.string().optional(),
+	focalX: z.number().optional(),
+	focalY: z.number().optional(),
 	provider: z.string().optional(),
 	previewUrl: z.string().optional(),
 	meta: z.record(z.string(), z.unknown()).optional(),

package/src/i18n/config.ts

@@ -59,17 +59,17 @@ export function resolveContentCreateLocale(
 		if (typeof locale !== "string") {
 			throw new Error("Invalid locale code: expected a string");
 		}
-		if (!isValidLocaleCode(locale)) {
-			throw new Error(`Invalid locale code: "${locale}"`);
-		}
-
 		const configured = config?.locales.find(
 			(candidate) => candidate.toLowerCase() === locale.toLowerCase(),
 		);
-		if (config && !configured) {
+		if (configured) return configured;
+		if (!isValidLocaleCode(locale)) {
+			throw new Error(`Invalid locale code: "${locale}"`);
+		}
+		if (config) {
 			throw new Error(`Locale "${locale}" is not configured for this site`);
 		}
-		return configured ?? locale;
+		return locale;
 	}
 
 	return config?.defaultLocale ?? "en";

package/src/i18n/resolve.ts

@@ -37,9 +37,47 @@ export function resolveLocaleChain(explicit?: string): string[] {
 }
 
 const REPEATED_SLASHES = /\/{2,}/g;
+const TRAILING_SLASH = /\/$/;
+const DATE_TOKEN = /\{(year|month|day|hour|minute|second)\}/g;
+// SQLite-style datetime without timezone info ("2023-05-08 10:00:00").
+// Stored values are UTC; without this, `new Date()` would parse them in the
+// server's local zone and the same row could yield different URLs per host.
+const OFFSETLESS_DATETIME = /^(\d{4}-\d{2}-\d{2})[ T](\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?)$/;
+const pad2 = (n: number) => String(n).padStart(2, "0");
+
+function parseUtcDate(date: string | Date): Date {
+	if (date instanceof Date) return date;
+	const offsetless = OFFSETLESS_DATETIME.exec(date);
+	return new Date(offsetless ? `${offsetless[1]}T${offsetless[2]}Z` : date);
+}
 
 /**
- * Interpolate a collection `url_pattern` with a row's slug and id.
+ * Substitute WordPress-style date tokens (`{year}`, `{month}`, `{day}`,
+ * `{hour}`, `{minute}`, `{second}`) from a publish date. Month/day/time parts
+ * are zero-padded, mirroring WordPress (`%monthnum%`, `%day%`, ...). Tokens are
+ * left untouched when no valid date is available, so callers without a date
+ * (or unpublished entries) never produce a half-resolved URL.
+ */
+function applyDateTokens(path: string, date: string | Date | null | undefined): string {
+	const d = date == null ? null : parseUtcDate(date);
+	if (!d || Number.isNaN(d.getTime())) return path;
+	const parts: Record<string, string> = {
+		year: String(d.getUTCFullYear()),
+		month: pad2(d.getUTCMonth() + 1),
+		day: pad2(d.getUTCDate()),
+		hour: pad2(d.getUTCHours()),
+		minute: pad2(d.getUTCMinutes()),
+		second: pad2(d.getUTCSeconds()),
+	};
+	return path.replace(DATE_TOKEN, (match, key: string) => parts[key] ?? match);
+}
+
+/**
+ * Interpolate a collection `url_pattern` with a row's slug, id and publish date.
+ *
+ * Supported tokens: `{slug}`, `{id}`, and the date tokens `{year}`,
+ * `{month}`, `{day}`, `{hour}`, `{minute}`, `{second}` (resolved from `date`,
+ * for WordPress-style permalinks like `/{year}/{month}/{day}/{slug}.html`).
  *
  * Falls back to `/{collection}/{slug}` when no pattern is configured.
  * Does NOT apply any locale prefix — pass the result through
@@ -51,18 +89,52 @@ export function interpolateUrlPattern(options: {
 	collection: string;
 	slug: string;
 	id: string;
+	/** Publish date used for date tokens; tokens stay literal when absent. */
+	date?: string | Date | null;
 }): string {
-	const { pattern, collection, slug, id } = options;
+	const { pattern, collection, slug, id, date } = options;
 	const basePattern = pattern ?? `/${encodeURIComponent(collection)}/{slug}`;
 	let path = basePattern
-		.replace("{slug}", encodeURIComponent(slug))
-		.replace("{id}", encodeURIComponent(id));
+		.replaceAll("{slug}", encodeURIComponent(slug))
+		.replaceAll("{id}", encodeURIComponent(id));
+	path = applyDateTokens(path, date);
 	path = path.replace(REPEATED_SLASHES, "/");
 	if (path.length > 1 && path.endsWith("/")) path = path.slice(0, -1);
 	if (!path.startsWith("/")) path = `/${path}`;
 	return path;
 }
 
+export interface ContentRoutePathOptions {
+	pattern: string | null;
+	collection: string;
+	slug: string;
+	id: string;
+	date?: string | Date | null;
+	trailingSlash?: "always" | "never" | "ignore";
+}
+
+/** Resolve a content row to the route path shared by menus and public URL surfaces. */
+export function resolveContentRoutePath(options: ContentRoutePathOptions): string {
+	const path = interpolateUrlPattern(options);
+	if (options.trailingSlash === "always" && path !== "/") return `${path}/`;
+	if (options.trailingSlash === "never" && path !== "/") return path.replace(TRAILING_SLASH, "");
+	return path;
+}
+
+/** Resolve a content row to its locale-aware route path. */
+export async function resolveLocalizedContentRoutePath(
+	options: ContentRoutePathOptions & { locale: string },
+): Promise<string | null> {
+	const path = interpolateUrlPattern(options);
+	const localized = await localizePath(path, options.locale);
+	if (localized === null) return null;
+	if (options.trailingSlash === "always" && localized !== "/") return `${localized}/`;
+	if (options.trailingSlash === "never" && localized !== "/") {
+		return localized.replace(TRAILING_SLASH, "");
+	}
+	return localized;
+}
+
 /**
  * Apply a locale prefix to a path, honouring the user's Astro `i18n`
  * routing config (`prefixDefaultLocale`, custom `path`/`codes` mappings).
@@ -109,25 +181,36 @@ export async function localizePath(path: string, locale: string): Promise<string
  */
 async function resolveLocaleSegment(locale: string): Promise<string | null | undefined> {
 	const i18n = await readAstroI18nConfig();
-	if (!i18n || !i18n.locales || i18n.locales.length <= 1) return null;
+	return resolveLocaleSegmentFromConfig(i18n, locale);
+}
 
-	const isDefault = locale === i18n.defaultLocale;
-	if (isDefault && !i18n.prefixDefaultLocale) return "";
+/** @internal Exported for testing Astro object-locale routing without a virtual module. */
+export function resolveLocaleSegmentFromConfig(
+	i18n: AstroI18nConfig | null,
+	locale: string,
+): string | null | undefined {
+	if (!i18n || !i18n.locales || i18n.locales.length <= 1) return null;
 
-	// When the locale has a custom `path`/`codes` mapping, use the path
-	// for the URL segment. Otherwise use the locale code directly.
+	let segment: string | undefined;
+	let isDefault = locale === i18n.defaultLocale;
 	for (const entry of i18n.locales) {
 		if (typeof entry === "string") {
-			if (entry === locale) return entry;
-		} else if (entry.codes.includes(locale)) {
-			return entry.path;
+			if (entry === locale) {
+				segment = entry;
+				break;
+			}
+		} else if (entry.path === locale || entry.codes.includes(locale)) {
+			segment = entry.path;
+			isDefault ||= entry.path === i18n.defaultLocale || entry.codes.includes(i18n.defaultLocale);
+			break;
 		}
 	}
-
-	return undefined;
+	if (segment === undefined) return undefined;
+	if (isDefault && !i18n.prefixDefaultLocale) return "";
+	return segment;
 }
 
-interface AstroI18nConfig {
+export interface AstroI18nConfig {
 	defaultLocale: string;
 	locales: Array<string | { codes: readonly string[]; path: string }>;
 	prefixDefaultLocale?: boolean;

package/src/index.ts

@@ -13,10 +13,15 @@ export type {
 	UserTable,
 	MediaTable,
 } from "./database/index.js";
+export { EmDashConfigurationError } from "./config/errors.js";
+export type { EmDashConfigurationErrorCode } from "./config/errors.js";
+export { resolvePluginEncryptionKeys } from "./config/secrets.js";
 
 // Repositories
 export {
 	ContentRepository,
+	CommentRepository,
+	RevisionRepository,
 	MediaRepository,
 	PluginStorageRepository,
 	UserRepository,
@@ -75,6 +80,7 @@ export {
 	handleContentUnpublish,
 	handleContentSchedule,
 	handleContentUnschedule,
+	handleScheduledPolicyRejection,
 	handleContentCountScheduled,
 	handleContentDiscardDraft,
 	handleContentCompare,
@@ -124,6 +130,10 @@ export type {
 	PortableTextImageBlock,
 	PortableTextCodeBlock,
 	PortableTextHtmlBlock,
+	PortableTextTableAlignment,
+	PortableTextTableBlock,
+	PortableTextTableCell,
+	PortableTextTableRow,
 	PortableTextUnknownBlock,
 	ProseMirrorMark,
 	ProseMirrorNode,
@@ -246,8 +256,10 @@ export type {
 } from "./object-cache/types.js";
 
 // Plugin system
+export { pluginResponse } from "./plugin-types.js";
 export {
 	definePlugin,
+	definePluginRoute,
 	adaptSandboxEntry,
 	pluginManifestSchema,
 	createHookPipeline,
@@ -255,8 +267,12 @@ export {
 	PluginManager,
 	createPluginManager,
 	PluginRouteError,
+	StorageSerializationError,
 	ContentSaveRejectedError,
 	isContentSaveRejection,
+	SCHEDULED_POLICY_REJECTION_PREFIX,
+	isScheduledPolicyRejection,
+	scheduledPolicyRejectionKey,
 	// Scheduler (Node timer heartbeat — used by virtual:emdash/scheduler)
 	NodeCronScheduler,
 	// Sandbox
@@ -274,30 +290,101 @@ export {
 	// HTTP access for plugins (shared between in-process, Cloudflare, and workerd runners)
 	createHttpAccess,
 	createUnrestrictedHttpAccess,
+	PLUGIN_HTTP_MAX_REQUEST_BYTES,
+	PLUGIN_HTTP_MAX_RESPONSE_BYTES,
+	bufferPluginHttpRequest,
+	pluginHttpRedirectAction,
+	pluginHttpResponseFromWire,
+	pluginHttpResponseToWire,
+	readPluginHttpBytes,
+	rewritePluginHttpRedirect,
+	createContentAccess,
+	createContentAccessWithWrite,
+	createSettingsAccess,
+	createPluginSecretRedactor,
+	decodePluginSettingValue,
+	encryptPluginSetting,
+	isEncryptedPluginSetting,
+	PluginSettingEncryptionError,
+	createCommentAccess,
+	createRedirectAccess,
+	RedirectAccessError,
+	createSchemaAccess,
+	createMediaAccess,
+	DEFAULT_PLUGIN_MEDIA_READ_BYTES,
+	MAX_PLUGIN_MEDIA_READ_BYTES,
+	parsePluginMediaMetadataPatch,
+	readPluginMediaBytes,
+	toPluginMediaItem,
+	updatePluginMediaMetadata,
+	CronAccessImpl,
 } from "./plugins/index.js";
 export type {
+	EncryptedPluginSetting,
+	PluginSecretRedactor,
 	PluginDefinition,
 	ResolvedPlugin,
 	PluginCapability,
 	PluginContext,
 	PluginStorageConfig,
 	StorageCollection,
+	PaginatedResult,
+	NumericDelta,
+	UpdateIfArgs,
+	UpdateIfResult,
+	VersionedValue,
+	VersionedContentItem,
+	ConditionalWriteResult,
+	ConditionalDeleteResult,
+	ContentActionCallbacks,
 	KVAccess,
+	SettingsAccess,
+	SettingField,
 	ContentAccess,
+	ContentItem as PluginContentItem,
+	ContentTranslationSummary,
+	ContentRevisionInfo,
+	SchemaAccess,
+	CollectionSchemaInfo,
+	FieldSchemaInfo,
 	ContentCreateOptions,
+	ContentListOptions,
+	CronTaskInfo,
 	MediaAccess,
+	MediaBytes,
+	MediaMetadataPatch,
 	HttpAccess,
+	PluginHttpResponseWire,
+	PluginHttpRedirectAction,
 	LogAccess,
+	SiteInfo,
 	TaxonomyAccess,
+	TaxonomyAccessWithWrite,
 	TaxonomyDefInfo,
 	TaxonomyTermInfo,
+	TaxonomyTermCreateInput,
 	TaxonomyReadOptions,
+	RedirectAccess,
+	RedirectAccessWithWrite,
+	RedirectCreateInput,
+	RedirectInfo,
+	RedirectListOptions,
+	RedirectStatus,
+	RedirectUpdateInput,
+	VersionedRedirect,
 	PluginHooks,
 	HookConfig,
 	HookName,
 	ResolvedHook,
 	ResolvedPluginHooks,
+	ActorInfo,
+	ScheduledPolicyRejection,
+	VersionedScheduledPolicyRejection,
+	ContentActionOrigin,
 	ContentHookEvent,
+	ContentPolicyDecision,
+	ContentPolicyEvent,
+	ContentSchedulePolicyEvent,
 	ContentDeleteEvent,
 	ContentPublishStateChangeEvent,
 	ContentRestoreStateChangeEvent,
@@ -306,9 +393,12 @@ export type {
 	MediaUploadEvent,
 	HookResult,
 	PluginRoute,
+	PluginRouteDefinition,
 	RouteContext,
 	PluginAdminConfig,
 	PluginAdminPage,
+	PluginEditorPanel,
+	PluginEditorAction,
 	PluginAdminExports,
 	FieldWidgetConfig,
 	PortableTextBlockConfig,
@@ -325,6 +415,11 @@ export type {
 	ModerationDecision,
 	CollectionCommentSettings,
 	StoredComment,
+	PluginComment,
+	PluginCommentStatus,
+	CommentAccess,
+	CommentListOptions,
+	CommentCountOptions,
 
 	// Scheduler types
 	CronScheduler,
@@ -333,10 +428,14 @@ export type {
 	// Sandbox runtime types
 	SandboxRunner,
 	SandboxedPluginInstance,
+	SandboxInvocationOptions,
 	SandboxRunnerFactory,
 	SandboxOptions,
 	SandboxEmailMessage,
 	SandboxEmailSendCallback,
+	SandboxCommentModerateCallback,
+	SandboxContentCreateCallback,
+	SandboxHttpFetchCallback,
 	PluginManifest,
 	ValidatedPluginManifest,
 	SerializedRequest,
@@ -354,6 +453,7 @@ export {
 	isDeprecatedCapability,
 	normalizeCapability,
 	normalizeCapabilities,
+	normalizePluginCapabilities,
 } from "./plugins/index.js";
 export type { CurrentPluginCapability, DeprecatedPluginCapability } from "./plugins/index.js";
 
@@ -369,6 +469,7 @@ export type {
 	CollectionSource,
 	FieldValidation,
 	FieldWidgetOptions,
+	UnsupportedFieldType,
 	Collection,
 	Field,
 	CreateCollectionInput,

package/src/loader.ts

@@ -20,6 +20,7 @@ import { decodeCursor, encodeCursor } from "./database/repositories/types.js";
 import { validateIdentifier } from "./database/validate.js";
 import { getI18nConfig } from "./i18n/config.js";
 import type { Database } from "./index.js";
+import { primeSeoPanel } from "./page/seo-panel.js";
 import { getRequestContext } from "./request-context.js";
 import { isMissingColumnError, isMissingTableError } from "./utils/db-errors.js";
 
@@ -1167,6 +1168,20 @@ export async function getDb(): Promise<Kysely<Database>> {
 	return dbInstance;
 }
 
+/** @internal Date projection for published archive entries. */
+export async function loadPublishedDates(type: string, locale?: string) {
+	const tableName = getTableName(type);
+	const db = await getDb();
+	const result = await sql<{ published_at: string | null; updated_at: string | null }>`
+		SELECT published_at, updated_at FROM ${sql.ref(tableName)}
+		WHERE deleted_at IS NULL
+		AND ${buildStatusCondition(db, "published")}
+		${locale ? sql`AND locale = ${locale}` : sql``}
+		ORDER BY published_at DESC, id DESC
+	`.execute(db);
+	return result.rows;
+}
+
 /**
  * Create an EmDash Live Collections loader
  *
@@ -1547,16 +1562,25 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 				} = foldedHydrationSelects(db, type, "c");
 				const seoSelect = foldedSeoSelect(db, type, "c");
 				const booleanFieldsSelect = foldedBooleanFieldsSelect(db, type);
+				// Keep collection-wide metadata in one result column for wide D1 collections.
+				const jsonObject = isPostgres(db) ? sql`json_build_object` : sql`json_object`;
+				const metadataSelect = sql`(
+					SELECT ${jsonObject}(
+						'bylinesExist', _emdash_bylines_exist,
+						'booleanFields', _emdash_boolean_fields
+					)
+					FROM (SELECT ${bylinesExistSelect}, ${booleanFieldsSelect}) AS metadata
+				) AS _emdash_entry_metadata`;
 				const result = locale
 					? await sql<Record<string, unknown>>`
-							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
+							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})
 							LIMIT 1
 						`.execute(db)
 					: await sql<Record<string, unknown>>`
-							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
+							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})
@@ -1568,6 +1592,15 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 					return undefined;
 				}
 
+				const rawMetadata = row._emdash_entry_metadata;
+				const metadata: unknown =
+					typeof rawMetadata === "string" ? JSON.parse(rawMetadata) : rawMetadata;
+				delete row._emdash_entry_metadata;
+				if (isPlainObject(metadata)) {
+					row._emdash_bylines_exist = metadata.bylinesExist;
+					row[BOOLEAN_FIELDS_FOLDED_COLUMN] = metadata.booleanFields;
+				}
+
 				// Expand the folded SEO JSON column onto SEO_COLUMN_ALIASES so
 				// extractSeo() reads it transparently. Missing/null SEO is a
 				// no-op: extractSeo() returns null when the aliases are absent.
@@ -1624,7 +1657,12 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 							...mapRevisionData(parsed, parseFoldedBooleanFields(row)),
 						};
 						const revSeo = extractSeo(row);
-						if (revSeo) revEntryData.seo = revSeo;
+						if (revSeo) {
+							revEntryData.seo = revSeo;
+							// SEO comes from the content row, so the panel data is
+							// valid for the entry regardless of the revision shown.
+							primeSeoPanel(type, rowStr(row, "id"), revSeo);
+						}
 						stashFolded(revEntryData, row);
 						return {
 							id: revId,
@@ -1641,7 +1679,14 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 
 				const entryData = mapRowToData(row, parseFoldedBooleanFields(row));
 				const entrySeo = extractSeo(row);
-				if (entrySeo) entryData.seo = entrySeo;
+				if (entrySeo) {
+					entryData.seo = entrySeo;
+					// Prime the request cache so <EmDashHead> can apply the panel
+					// values without its own _emdash_seo query. Keyed by the
+					// content-row id — the same value templates pass as
+					// page.content.id.
+					primeSeoPanel(type, rowStr(row, "id"), entrySeo);
+				}
 				stashFolded(entryData, row);
 				return {
 					id: entryId,