emdash 0.35.0 → 0.37.0

package/src/fields/boolean.ts

@@ -15,7 +15,7 @@ export function boolean(options: BooleanOptions = {}): FieldDefinition<boolean>
 	const boolSchema = z.boolean();
 
 	// Apply default
-	const schema: z.ZodTypeAny =
+	const schema: z.ZodType =
 		options.default !== undefined ? boolSchema.default(options.default) : boolSchema;
 
 	const ui: FieldUIHints = {

package/src/fields/datetime.ts

@@ -25,7 +25,7 @@ export function datetime(options: DatetimeOptions = {}): FieldDefinition<Date> {
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? dateSchema : dateSchema.optional();
+	const schema: z.ZodType = options.required ? dateSchema : dateSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "datetime",

package/src/fields/file.ts

@@ -21,7 +21,7 @@ export function file(options: FileOptions = {}): FieldDefinition<FileValue> {
 		meta: z.record(z.string(), z.unknown()).optional(),
 	});
 
-	const schema: z.ZodTypeAny = options.required ? fileObjSchema : fileObjSchema.optional();
+	const schema: z.ZodType = options.required ? fileObjSchema : fileObjSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "file",

package/src/fields/image.ts

@@ -2,7 +2,7 @@ import { z } from "astro/zod";
 
 import type { FieldDefinition, ImageValue } from "./types.js";
 
-const imageSchema = z.object({
+const mediaSchema = z.object({
 	id: z.string(),
 	src: z.string().optional(),
 	alt: z.string().optional(),
@@ -17,10 +17,16 @@ const imageSchema = z.object({
 	meta: z.record(z.string(), z.unknown()).optional(),
 });
 
+const imageSchema = mediaSchema.extend({
+	darkVariant: mediaSchema.optional(),
+});
+
 export interface ImageOptions {
 	required?: boolean;
 	maxSize?: number; // in bytes
 	allowedTypes?: string[]; // MIME types — exact or prefix
+	/** Offer editors a second slot for a dark-color-scheme counterpart of the image. */
+	darkVariant?: boolean;
 }
 
 export function image(options: ImageOptions = {}): FieldDefinition<ImageValue | undefined> {

package/src/fields/integer.ts

@@ -29,7 +29,7 @@ export function integer(options: IntegerOptions = {}): FieldDefinition<number> {
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? intSchema : intSchema.optional();
+	const schema: z.ZodType = options.required ? intSchema : intSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "number",

package/src/fields/json.ts

@@ -15,7 +15,7 @@ export function json<T = unknown>(options: JsonOptions<T> = {}): FieldDefinition
 	// When T = unknown (default), z.unknown() is already z.ZodType<unknown>.
 	// When a custom schema is provided, it carries the correct generic.
 	// The generic constraint ensures type safety for callers.
-	let schema: z.ZodTypeAny = options.schema ?? z.unknown();
+	let schema: z.ZodType = options.schema ?? z.unknown();
 
 	// Optional vs required
 	if (!options.required && !options.schema) {

package/src/fields/multiselect.ts

@@ -28,7 +28,7 @@ export function multiSelect<T extends readonly [string, ...string[]]>(
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = msOptions.required ? arraySchema : arraySchema.optional();
+	const schema: z.ZodType = msOptions.required ? arraySchema : arraySchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "multiSelect",

package/src/fields/number.ts

@@ -32,7 +32,7 @@ export function number(options: NumberOptions = {}): FieldDefinition<number> {
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? numberSchema : numberSchema.optional();
+	const schema: z.ZodType = options.required ? numberSchema : numberSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "number",

package/src/fields/portable-text.ts

@@ -10,7 +10,7 @@ const portableTextBlockSchema: z.ZodType<PortableTextBlock> = z
 		_type: z.string(),
 		_key: z.string(),
 	})
-	.passthrough();
+	.loose();
 
 /**
  * Portable Text field

package/src/fields/richtext.ts

@@ -14,7 +14,7 @@ export function richText(options: RichTextOptions = {}): FieldDefinition<string>
 	const stringSchema = z.string();
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "richText",

package/src/fields/select.ts

@@ -19,7 +19,7 @@ export function select<T extends readonly [string, ...string[]]>(
 	const enumSchema = z.enum(selectOptions.options);
 
 	// Apply default first, then optional
-	let schema: z.ZodTypeAny;
+	let schema: z.ZodType;
 	if (selectOptions.default !== undefined) {
 		schema = enumSchema.default(selectOptions.default);
 	} else if (!selectOptions.required) {

package/src/fields/slug.ts

@@ -20,7 +20,7 @@ export function slug(options: SlugOptions = {}): FieldDefinition<string> {
 	const stringSchema = z.string().regex(pattern, "Invalid slug format");
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "slug",

package/src/fields/text.ts

@@ -37,7 +37,7 @@ export function text(options: TextOptions = {}): FieldDefinition<string> {
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "text",

package/src/fields/textarea.ts

@@ -33,7 +33,7 @@ export function textarea(options: TextareaOptions = {}): FieldDefinition<string>
 	}
 
 	// Optional vs required
-	const schema: z.ZodTypeAny = options.required ? stringSchema : stringSchema.optional();
+	const schema: z.ZodType = options.required ? stringSchema : stringSchema.optional();
 
 	const ui: FieldUIHints = {
 		widget: "textarea",

package/src/fields/types.ts

@@ -10,7 +10,7 @@ export type ColumnType = "TEXT" | "REAL" | "INTEGER" | "JSON";
 /**
  * Base field definition
  *
- * Note: schema uses z.ZodTypeAny to accommodate optional/default wrappers
+ * Note: schema uses z.ZodType to accommodate optional/default wrappers
  */
 export interface FieldDefinition<_T = unknown> {
 	type: string;
@@ -18,7 +18,7 @@ export interface FieldDefinition<_T = unknown> {
 	 * The SQLite column type to use when storing this field
 	 */
 	columnType: ColumnType;
-	schema: z.ZodTypeAny;
+	schema: z.ZodType;
 	options?: unknown;
 	ui?: FieldUIHints;
 	validation?: FieldValidation;
@@ -51,9 +51,13 @@ export type { MediaValue } from "../media/types.js";
 import type { MediaValue } from "../media/types.js";
 
 /**
- * @deprecated Use MediaValue instead. ImageValue is an alias for backwards compatibility.
+ * Persisted image field value: the media item shown by default, plus an
+ * optional counterpart for dark color schemes.
  */
-export type ImageValue = MediaValue;
+export interface ImageValue extends MediaValue {
+	/** Media item shown instead of the primary one when the page renders in a dark color scheme. */
+	darkVariant?: MediaValue;
+}
 
 /**
  * Persisted file field value.

package/src/index.ts

@@ -83,7 +83,11 @@ export {
 	handleMediaGet,
 	handleMediaCreate,
 	handleMediaUpdate,
+	handleMediaReplaceMetadata,
 	handleMediaDelete,
+	handleMediaUsageActivationAdvance,
+	handleMediaUsageProgress,
+	handleMediaUsageRepair,
 	handleRevisionList,
 	handleRevisionGet,
 	handleRevisionRestore,
@@ -98,13 +102,21 @@ export type {
 	RevisionListResponse,
 	RevisionResponse,
 	ManifestResponse,
+	ManifestCollectionMap,
+	ManifestCollectionDescriptor,
+	ManifestFieldDescriptor,
 	FieldDescriptor,
 	ApiContext,
 } from "./api/index.js";
 
 // Content converters (Portable Text <-> ProseMirror)
-export { prosemirrorToPortableText, portableTextToProsemirror } from "./content/index.js";
+export {
+	portableTextIdentityExtensions,
+	prosemirrorToPortableText,
+	portableTextToProsemirror,
+} from "./content/index.js";
 export type {
+	PortableTextToProsemirrorOptions,
 	PortableTextSpan,
 	PortableTextMarkDef,
 	PortableTextLinkMark,
@@ -243,6 +255,8 @@ export {
 	PluginManager,
 	createPluginManager,
 	PluginRouteError,
+	ContentSaveRejectedError,
+	isContentSaveRejection,
 	// Scheduler (Node timer heartbeat — used by virtual:emdash/scheduler)
 	NodeCronScheduler,
 	// Sandbox
@@ -253,6 +267,9 @@ export {
 	createSandboxRouteErrorEnvelope,
 	getSandboxRouteErrorDetails,
 	getSandboxRouteErrorEnvelope,
+	MAX_SANDBOX_SAVE_REJECTION_REASON_LENGTH,
+	SANDBOX_HOOK_RESULT_VERSION,
+	inspectSandboxHookResult,
 	createNoopSandboxRunner,
 	// HTTP access for plugins (shared between in-process, Cloudflare, and workerd runners)
 	createHttpAccess,
@@ -326,6 +343,9 @@ export type {
 	SandboxRouteErrorCode,
 	SandboxRouteErrorDetails,
 	SandboxRouteErrorEnvelope,
+	SandboxHookErrorEnvelope,
+	SandboxHookResultInspection,
+	SandboxSaveRejectedError,
 } from "./plugins/index.js";
 
 // Capability normalization (legacy → canonical alias layer)
@@ -425,6 +445,7 @@ export {
 	getPluginSettings,
 	getSiteSetting,
 	getSiteSettings,
+	getSiteSettingsWithCacheHint,
 	setSiteSettings,
 } from "./settings/index.js";
 export type {
@@ -456,7 +477,7 @@ export { getComments, getCommentCount } from "./comments/query.js";
 export type { GetCommentsOptions, GetCommentsResult } from "./comments/query.js";
 
 // Menus
-export { getMenu, getMenus } from "./menus/index.js";
+export { getMenu, getMenuWithCacheHint, getMenus } from "./menus/index.js";
 export type {
 	Menu,
 	MenuItem,
@@ -477,6 +498,7 @@ export {
 	getTaxonomyDefs,
 	getTaxonomyDef,
 	getTaxonomyTerms,
+	getTaxonomyTermsWithCacheHint,
 	getTerm,
 	getEntryTerms,
 	getTermsForEntries,
@@ -493,7 +515,12 @@ export type {
 } from "./taxonomies/types.js";
 
 // Widgets
-export { getWidgetArea, getWidgetAreas, getWidgetComponents } from "./widgets/index.js";
+export {
+	getWidgetArea,
+	getWidgetAreaWithCacheHint,
+	getWidgetAreas,
+	getWidgetComponents,
+} from "./widgets/index.js";
 export type {
 	Widget,
 	WidgetArea,

package/src/loader.ts

@@ -59,6 +59,9 @@ const SEO_ALIAS_COLUMNS = Object.values(SEO_COLUMN_ALIASES);
 /** Folded SEO JSON column name in the result set (expanded onto aliases in JS). */
 const SEO_FOLDED_COLUMN = "_emdash_seo";
 
+/** Folded boolean field slugs used to restore SQLite integer values. */
+const BOOLEAN_FIELDS_FOLDED_COLUMN = "_emdash_boolean_fields";
+
 /**
  * System columns excluded from entry.data
  * Note: slug is intentionally NOT excluded - it's useful as data.slug in templates
@@ -91,6 +94,7 @@ const SYSTEM_COLUMNS = new Set([
 	"_emdash_bylines",
 	"_emdash_bylines_exist",
 	SEO_FOLDED_COLUMN,
+	BOOLEAN_FIELDS_FOLDED_COLUMN,
 ]);
 
 /** Markers for byline/taxonomy hydration folded into the content query. */
@@ -185,6 +189,19 @@ function foldedSeoSelect(db: Kysely<any>, type: string, outer: string) {
 	return sql`(SELECT ${obj} FROM ${sql.ref("_emdash_seo")} AS s WHERE s.collection = ${type} AND s.content_id = ${o}.id LIMIT 1) AS ${sql.ref(SEO_FOLDED_COLUMN)}`;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any -- any Kysely instance
+function foldedBooleanFieldsSelect(db: Kysely<any>, type: string) {
+	const aggregate = isPostgres(db)
+		? sql`coalesce(json_agg(f.slug), '[]'::json)`
+		: sql`json_group_array(f.slug)`;
+	return sql`(
+		SELECT ${aggregate}
+		FROM ${sql.ref("_emdash_fields")} AS f
+		INNER JOIN ${sql.ref("_emdash_collections")} AS c ON c.id = f.collection_id
+		WHERE c.slug = ${type} AND f.type = ${"boolean"}
+	) AS ${sql.ref(BOOLEAN_FIELDS_FOLDED_COLUMN)}`;
+}
+
 /**
  * Expand the folded `_emdash_seo` JSON column onto the row using SEO_COLUMN_ALIASES,
  * so {@link extractSeo} reads it transparently. SQLite returns a JSON string
@@ -493,7 +510,10 @@ function normalizeLocalMediaValue(value: unknown): unknown {
  * Extracts content fields (non-system columns) and parses JSON where needed.
  * System columns needed for templates (id, status, dates) are included with camelCase names.
  */
-function mapRowToData(row: Record<string, unknown>): Record<string, unknown> {
+function mapRowToData(
+	row: Record<string, unknown>,
+	booleanFields: ReadonlySet<string>,
+): Record<string, unknown> {
 	const data: Record<string, unknown> = {};
 	const rawDateValues: Record<string, string> = {};
 
@@ -516,6 +536,11 @@ function mapRowToData(row: Record<string, unknown>): Record<string, unknown> {
 
 		if (SYSTEM_COLUMNS.has(key)) continue;
 
+		if (booleanFields.has(key) && (typeof value === "boolean" || value === 0 || value === 1)) {
+			data[key] = Boolean(value);
+			continue;
+		}
+
 		// Try to parse JSON strings (for portableText, json fields, etc.)
 		if (typeof value === "string") {
 			try {
@@ -543,14 +568,38 @@ function mapRowToData(row: Record<string, unknown>): Record<string, unknown> {
 	return data;
 }
 
+function parseFoldedBooleanFields(row: Record<string, unknown> | undefined): Set<string> {
+	const raw = row?.[BOOLEAN_FIELDS_FOLDED_COLUMN];
+	let values: unknown;
+	if (typeof raw === "string") {
+		try {
+			values = JSON.parse(raw);
+		} catch {
+			return new Set();
+		}
+	} else {
+		values = raw;
+	}
+
+	if (!Array.isArray(values)) return new Set();
+	return new Set(values.filter((value): value is string => typeof value === "string"));
+}
+
 /**
  * Map revision data (already-parsed JSON object) to entry data.
  * Strips _-prefixed metadata keys (e.g. _slug) used internally by revisions.
  */
-function mapRevisionData(data: Record<string, unknown>): Record<string, unknown> {
+function mapRevisionData(
+	data: Record<string, unknown>,
+	booleanFields: ReadonlySet<string>,
+): Record<string, unknown> {
 	const result: Record<string, unknown> = {};
 	for (const [key, value] of Object.entries(data)) {
 		if (key.startsWith("_")) continue; // revision metadata
+		if (booleanFields.has(key) && (typeof value === "boolean" || value === 0 || value === 1)) {
+			result[key] = Boolean(value);
+			continue;
+		}
 		result[key] = normalizeLocalMediaValue(value);
 	}
 	return result;
@@ -904,6 +953,7 @@ export function buildTaxonomyPivotQuery(
 		bylines: bylinesSelect,
 		bylinesExist: bylinesExistSelect,
 	} = foldedHydrationSelects(db, collection, "r");
+	const booleanFieldsSelect = foldedBooleanFieldsSelect(db, collection);
 
 	// Authoritative re-check on the joined `ec_*` row.
 	const deletedR = deletedIsNull ? sql`r.deleted_at IS NULL` : sql`r.deleted_at IS NOT NULL`;
@@ -945,7 +995,7 @@ export function buildTaxonomyPivotQuery(
 				ORDER BY sortval ${dir}, r.id ${dir}
 				${limitClause}
 			)
-			SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}
+			SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
 			FROM picked JOIN ${sql.ref(tableName)} AS r ON r.id = picked.entry_id
 			WHERE ${deletedR} ${statusR} ${localeR}
 			ORDER BY picked.sortval ${dir}, picked.entry_id ${dir}
@@ -969,7 +1019,7 @@ export function buildTaxonomyPivotQuery(
 				${residual}
 				${bylineCt}
 		)
-		SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}
+		SELECT r.*, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
 		FROM picked JOIN ${sql.ref(tableName)} AS r ON r.id = picked.entry_id
 		WHERE ${deletedR} ${statusR} ${localeR}
 			${cursorCond}
@@ -1337,6 +1387,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 						bylines: bylinesSelect,
 						bylinesExist: bylinesExistSelect,
 					} = foldedHydrationSelects(db, type, tableName);
+					const booleanFieldsSelect = foldedBooleanFieldsSelect(db, type);
 
 					// LIMIT/OFFSET clause. SQLite only accepts OFFSET when a
 					// LIMIT is present, so a bare offset uses `LIMIT -1`
@@ -1352,7 +1403,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 							: sql`LIMIT -1 OFFSET ${offset}`;
 					}
 					result = await sql<Record<string, unknown>>`
-						SELECT *, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect} FROM ${sql.ref(tableName)}
+						SELECT *, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect} FROM ${sql.ref(tableName)}
 						WHERE deleted_at IS NULL
 						AND ${statusCondition}
 						${localeFilter}
@@ -1372,6 +1423,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 				// Map rows to entries
 				const i18nConfig = virtualConfig?.i18n;
 				const i18nEnabled = i18nConfig && i18nConfig.locales.length > 1;
+				const booleanFields = parseFoldedBooleanFields(rows[0]);
 				const entries = rows.map((row) => {
 					const slug = rowStr(row, "slug") || rowStr(row, "id");
 					const rowLocale = rowStr(row, "locale");
@@ -1380,7 +1432,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 						rowLocale !== "" &&
 						(rowLocale !== i18nConfig.defaultLocale || i18nConfig.prefixDefaultLocale);
 					const id = shouldPrefix ? `${rowLocale}/${slug}` : slug;
-					const data = mapRowToData(row);
+					const data = mapRowToData(row, booleanFields);
 					stashFolded(data, row);
 					return {
 						id,
@@ -1494,16 +1546,17 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 					bylinesExist: bylinesExistSelect,
 				} = foldedHydrationSelects(db, type, "c");
 				const seoSelect = foldedSeoSelect(db, type, "c");
+				const booleanFieldsSelect = foldedBooleanFieldsSelect(db, type);
 				const result = locale
 					? await sql<Record<string, unknown>>`
-							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}
+							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
 							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}
+							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}, ${bylinesExistSelect}, ${booleanFieldsSelect}
 							FROM ${sql.ref(tableName)} AS c
 							WHERE c.deleted_at IS NULL
 							AND (c.slug = ${id} OR c.id = ${id})
@@ -1568,7 +1621,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 						const revEntryData: Record<string, unknown> = {
 							...systemData,
 							slug,
-							...mapRevisionData(parsed),
+							...mapRevisionData(parsed, parseFoldedBooleanFields(row)),
 						};
 						const revSeo = extractSeo(row);
 						if (revSeo) revEntryData.seo = revSeo;
@@ -1586,7 +1639,7 @@ export function emdashLoader(): LiveLoader<EntryData, EntryFilter, CollectionFil
 					}
 				}
 
-				const entryData = mapRowToData(row);
+				const entryData = mapRowToData(row, parseFoldedBooleanFields(row));
 				const entrySeo = extractSeo(row);
 				if (entrySeo) entryData.seo = entrySeo;
 				stashFolded(entryData, row);