npm - emdash - Versions diffs - 0.25.1 → 0.26.0 - Mend

emdash 0.25.1 → 0.26.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (346) hide show

package/src/media/usage/types.ts ADDED Viewed

@@ -0,0 +1,46 @@
+import type { FieldType } from "../../schema/types.js";
+export type MediaKind =
+	| "image"
+	| "video"
+	| "audio"
+	| "document"
+	| "archive"
+	| "font"
+	| "text"
+	| "other";
+export type MediaUsageReferenceType = "image_field" | "file_field" | "portable_text_image";
+export interface MediaUsageExtractionSubField {
+	slug: string;
+	type: FieldType;
+	label?: string;
+}
+export interface MediaUsageExtractionValidation {
+	subFields?: readonly MediaUsageExtractionSubField[];
+}
+export interface MediaUsageExtractionField {
+	slug: string;
+	type: FieldType;
+	validation?: MediaUsageExtractionValidation | null;
+}
+export interface ExtractMediaUsageOccurrencesInput {
+	fields: readonly MediaUsageExtractionField[];
+	data: Record<string, unknown>;
+}
+export interface ExtractedMediaUsageOccurrence {
+	fieldSlug: string;
+	fieldPath: string;
+	occurrenceIndex: number;
+	referenceType: MediaUsageReferenceType;
+	mediaId: string | null;
+	provider: string;
+	providerAssetId: string;
+	mediaKind: MediaKind | null;
+	mimeType: string | null;
+}

package/src/object-cache/index.ts CHANGED Viewed

@@ -167,7 +167,7 @@ async function getBackend(): Promise<ObjectCacheBackend | null> {
 		} catch (error) {
 			// Importing the virtual module fails outside an Astro/Vite context
 			// (e.g. unit tests, CLI). Treat as "no cache configured".
-			if (import.meta.env.DEV) {
+			if (import.meta.env?.DEV) {
 				console.warn("[object-cache] backend unavailable:", error);
 			}
 			holder.backend = null;
@@ -378,7 +378,7 @@ export async function cachedQuery<T>(options: CachedQueryOptions<T>): Promise<T>
 				const encoded = encode({ e: currentEpochs, v: value } satisfies CacheEnvelope<T>);
 				await backend.set(fullKey, encoded, ttl);
 			} catch (error) {
-				if (import.meta.env.DEV) {
+				if (import.meta.env?.DEV) {
 					console.warn("[object-cache] set failed:", error);
 				}
 			}
@@ -388,6 +388,12 @@ export async function cachedQuery<T>(options: CachedQueryOptions<T>): Promise<T>
 	return value;
 }
+/** Whether object-cache reads are active for the current request. */
+export async function isObjectCacheActive(): Promise<boolean> {
+	const backend = await getBackend();
+	return backend !== null && !shouldBypass();
+}
 /**
  * Invalidate every cached value in `namespace` by bumping its epoch.
  *

package/src/page/metadata.ts CHANGED Viewed

@@ -20,6 +20,10 @@ export interface ResolvedPageMetadata {
 	jsonld: Array<{ id?: string; json: string }>;
 }
+interface RenderPageMetadataOptions {
+	includeJsonLd?: boolean;
+}
 // ── Validation ──────────────────────────────────────────────────
 /** Schemes safe for use in link href attributes */
@@ -66,6 +70,16 @@ export function safeJsonLdSerialize(value: unknown): string {
 		.replace(JSONLD_U2029_RE, "\\u2029");
 }
+export async function createSha256CspHash(value: string): Promise<string> {
+	const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(value));
+	const bytes = new Uint8Array(digest);
+	let binary = "";
+	for (const byte of bytes) {
+		binary += String.fromCharCode(byte);
+	}
+	return `sha256-${btoa(binary)}`;
+}
 // ── Merge / dedupe ──────────────────────────────────────────────
 /**
@@ -155,8 +169,12 @@ export function resolvePageMetadata(
 // ── HTML rendering ──────────────────────────────────────────────
 /** Render resolved metadata to an HTML string for embedding in <head> */
-export function renderPageMetadata(metadata: ResolvedPageMetadata): string {
+export function renderPageMetadata(
+	metadata: ResolvedPageMetadata,
+	options: RenderPageMetadataOptions = {},
+): string {
 	const parts: string[] = [];
+	const includeJsonLd = options.includeJsonLd ?? true;
 	for (const m of metadata.meta) {
 		parts.push(`<meta name="${escapeHtmlAttr(m.name)}" content="${escapeHtmlAttr(m.content)}">`);
@@ -177,8 +195,10 @@ export function renderPageMetadata(metadata: ResolvedPageMetadata): string {
 		parts.push(tag);
 	}
-	for (const j of metadata.jsonld) {
-		parts.push(`<script type="application/ld+json">${j.json}</script>`);
+	if (includeJsonLd) {
+		for (const j of metadata.jsonld) {
+			parts.push(`<script type="application/ld+json">${j.json}</script>`);
+		}
 	}
 	return parts.join("\n");

package/src/plugin-types.ts CHANGED Viewed

@@ -51,12 +51,17 @@ import type {
 	ContentAfterPublishHandler,
 	ContentAfterRestoreHandler,
 	ContentAfterSaveHandler,
+	ContentAfterScheduleHandler,
 	ContentAfterUnpublishHandler,
+	ContentAfterUnscheduleHandler,
 	ContentBeforeDeleteHandler,
 	ContentBeforeSaveHandler,
 	ContentDeleteEvent,
 	ContentHookEvent,
 	ContentPublishStateChangeEvent,
+	ContentRestoreStateChangeEvent,
+	ContentScheduleStateChangeEvent,
+	ContentStateChangeEvent,
 	CronEvent,
 	CronHandler,
 	EmailAfterSendEvent,
@@ -99,6 +104,8 @@ export interface HookHandlers {
 	"content:afterPublish": ContentAfterPublishHandler;
 	"content:afterUnpublish": ContentAfterUnpublishHandler;
 	"content:afterRestore": ContentAfterRestoreHandler;
+	"content:afterSchedule": ContentAfterScheduleHandler;
+	"content:afterUnschedule": ContentAfterUnscheduleHandler;
 	"media:beforeUpload": MediaBeforeUploadHandler;
 	"media:afterUpload": MediaAfterUploadHandler;
 	cron: CronHandler;
@@ -228,6 +235,9 @@ export type {
 	ContentDeleteEvent,
 	ContentHookEvent,
 	ContentPublishStateChangeEvent,
+	ContentRestoreStateChangeEvent,
+	ContentScheduleStateChangeEvent,
+	ContentStateChangeEvent,
 	CronEvent,
 	EmailAfterSendEvent,
 	EmailBeforeSendEvent,

package/src/plugins/define-plugin.ts CHANGED Viewed

@@ -22,11 +22,6 @@ import type {
 	PluginStorageConfig,
 } from "./types.js";
-// Plugin ID validation patterns
-const SIMPLE_ID = /^[a-z0-9-]+$/;
-const SCOPED_ID = /^@[a-z0-9-]+\/[a-z0-9-]+$/;
-const SEMVER_PATTERN = /^\d+\.\d+\.\d+/;
 /**
  * Define a native EmDash plugin.
  *
@@ -94,6 +89,20 @@ export function definePlugin<TStorage extends PluginStorageConfig>(
 function defineNativePlugin<TStorage extends PluginStorageConfig>(
 	definition: PluginDefinition<TStorage>,
 ): ResolvedPlugin<TStorage> {
+	// Declared function-local (not module scope) on purpose. Under
+	// `ssr.noExternal` the worker entry can instantiate native plugins during a
+	// circular module init, reaching this function before module-scope consts
+	// initialize -> "Cannot access 'SIMPLE_ID' before initialization" -> every
+	// route 500s on Cloudflare Workers. Call-time consts evaluate after the
+	// literals are parsed, so the temporal dead zone cannot occur regardless of
+	// bundle ordering. See #1370.
+	// oxlint-disable-next-line e18e/prefer-static-regex -- call-time on purpose (see #1370)
+	const SIMPLE_ID = /^[a-z0-9-]+$/;
+	// oxlint-disable-next-line e18e/prefer-static-regex -- call-time on purpose (see #1370)
+	const SCOPED_ID = /^@[a-z0-9-]+\/[a-z0-9-]+$/;
+	// oxlint-disable-next-line e18e/prefer-static-regex -- call-time on purpose (see #1370)
+	const SEMVER_PATTERN = /^\d+\.\d+\.\d+/;
 	const {
 		id,
 		version,

package/src/plugins/hooks.ts CHANGED Viewed

@@ -17,7 +17,7 @@ import type {
 	PluginContext,
 	ContentHookEvent,
 	ContentDeleteEvent,
-	ContentPublishStateChangeEvent,
+	ContentStateChangeEvent,
 	MediaUploadEvent,
 	MediaAfterUploadEvent,
 	LifecycleEvent,
@@ -33,7 +33,9 @@ import type {
 	ContentAfterDeleteHandler,
 	ContentAfterPublishHandler,
 	ContentAfterRestoreHandler,
+	ContentAfterScheduleHandler,
 	ContentAfterUnpublishHandler,
+	ContentAfterUnscheduleHandler,
 	MediaBeforeUploadHandler,
 	MediaAfterUploadHandler,
 	LifecycleHandler,
@@ -68,6 +70,8 @@ type HookNameV2 =
 	| "content:afterPublish"
 	| "content:afterUnpublish"
 	| "content:afterRestore"
+	| "content:afterSchedule"
+	| "content:afterUnschedule"
 	| "media:beforeUpload"
 	| "media:afterUpload"
 	| "cron"
@@ -84,6 +88,13 @@ type HookNameV2 =
 /**
  * Map from hook name to handler type — used for type-safe hook retrieval
  */
+type ContentStateChangeHookName =
+	| "content:afterPublish"
+	| "content:afterUnpublish"
+	| "content:afterRestore"
+	| "content:afterSchedule"
+	| "content:afterUnschedule";
 interface HookHandlerMap {
 	"plugin:install": LifecycleHandler;
 	"plugin:activate": LifecycleHandler;
@@ -96,6 +107,8 @@ interface HookHandlerMap {
 	"content:afterPublish": ContentAfterPublishHandler;
 	"content:afterUnpublish": ContentAfterUnpublishHandler;
 	"content:afterRestore": ContentAfterRestoreHandler;
+	"content:afterSchedule": ContentAfterScheduleHandler;
+	"content:afterUnschedule": ContentAfterUnscheduleHandler;
 	"media:beforeUpload": MediaBeforeUploadHandler;
 	"media:afterUpload": MediaAfterUploadHandler;
 	cron: CronHandler;
@@ -224,6 +237,8 @@ export class HookPipeline {
 			this.registerPluginHook(plugin, "content:afterPublish");
 			this.registerPluginHook(plugin, "content:afterUnpublish");
 			this.registerPluginHook(plugin, "content:afterRestore");
+			this.registerPluginHook(plugin, "content:afterSchedule");
+			this.registerPluginHook(plugin, "content:afterUnschedule");
 			this.registerPluginHook(plugin, "media:beforeUpload");
 			this.registerPluginHook(plugin, "media:afterUpload");
 			this.registerPluginHook(plugin, "cron");
@@ -269,6 +284,8 @@ export class HookPipeline {
 		["content:afterPublish", "content:read"],
 		["content:afterUnpublish", "content:read"],
 		["content:afterRestore", "content:read"],
+		["content:afterSchedule", "content:read"],
+		["content:afterUnschedule", "content:read"],
 		// Media
 		["media:beforeUpload", "media:write"],
 		["media:afterUpload", "media:read"],
@@ -653,18 +670,19 @@ export class HookPipeline {
 	}
 	/**
-	 * Run content:afterPublish hooks (fire-and-forget).
+	 * Run content state-change hooks that all share the same event shape.
 	 */
-	async runContentAfterPublish(
+	private async runContentStateChangeHook(
+		name: ContentStateChangeHookName,
 		content: Record<string, unknown>,
 		collection: string,
 	): Promise<HookResult<void>[]> {
-		const hooks = this.getTypedHooks("content:afterPublish");
+		const hooks = this.getTypedHooks(name);
 		const results: HookResult<void>[] = [];
 		for (const hook of hooks) {
 			const { handler } = hook;
-			const event: ContentPublishStateChangeEvent = { content, collection };
+			const event: ContentStateChangeEvent = { content, collection };
 			const ctx = this.getContext(hook.pluginId);
 			const start = Date.now();
@@ -692,6 +710,16 @@ export class HookPipeline {
 		return results;
 	}
+	/**
+	 * Run content:afterPublish hooks (fire-and-forget).
+	 */
+	async runContentAfterPublish(
+		content: Record<string, unknown>,
+		collection: string,
+	): Promise<HookResult<void>[]> {
+		return this.runContentStateChangeHook("content:afterPublish", content, collection);
+	}
 	/**
 	 * Run content:afterUnpublish hooks (fire-and-forget).
 	 */
@@ -699,37 +727,7 @@ export class HookPipeline {
 		content: Record<string, unknown>,
 		collection: string,
 	): Promise<HookResult<void>[]> {
-		const hooks = this.getTypedHooks("content:afterUnpublish");
-		const results: HookResult<void>[] = [];
-		for (const hook of hooks) {
-			const { handler } = hook;
-			const event: ContentPublishStateChangeEvent = { content, collection };
-			const ctx = this.getContext(hook.pluginId);
-			const start = Date.now();
-			try {
-				await this.executeWithTimeout(() => handler(event, ctx), hook.timeout);
-				results.push({
-					success: true,
-					pluginId: hook.pluginId,
-					duration: Date.now() - start,
-				});
-			} catch (error) {
-				results.push({
-					success: false,
-					error: error instanceof Error ? error : new Error(String(error)),
-					pluginId: hook.pluginId,
-					duration: Date.now() - start,
-				});
-				if (hook.errorPolicy === "abort") {
-					throw error;
-				}
-			}
-		}
-		return results;
+		return this.runContentStateChangeHook("content:afterUnpublish", content, collection);
 	}
 	/**
@@ -739,37 +737,27 @@ export class HookPipeline {
 		content: Record<string, unknown>,
 		collection: string,
 	): Promise<HookResult<void>[]> {
-		const hooks = this.getTypedHooks("content:afterRestore");
-		const results: HookResult<void>[] = [];
-		for (const hook of hooks) {
-			const { handler } = hook;
-			const event: ContentPublishStateChangeEvent = { content, collection };
-			const ctx = this.getContext(hook.pluginId);
-			const start = Date.now();
-			try {
-				await this.executeWithTimeout(() => handler(event, ctx), hook.timeout);
-				results.push({
-					success: true,
-					pluginId: hook.pluginId,
-					duration: Date.now() - start,
-				});
-			} catch (error) {
-				results.push({
-					success: false,
-					error: error instanceof Error ? error : new Error(String(error)),
-					pluginId: hook.pluginId,
-					duration: Date.now() - start,
-				});
+		return this.runContentStateChangeHook("content:afterRestore", content, collection);
+	}
-				if (hook.errorPolicy === "abort") {
-					throw error;
-				}
-			}
-		}
+	/**
+	 * Run content:afterSchedule hooks (fire-and-forget).
+	 */
+	async runContentAfterSchedule(
+		content: Record<string, unknown>,
+		collection: string,
+	): Promise<HookResult<void>[]> {
+		return this.runContentStateChangeHook("content:afterSchedule", content, collection);
+	}
-		return results;
+	/**
+	 * Run content:afterUnschedule hooks (fire-and-forget).
+	 */
+	async runContentAfterUnschedule(
+		content: Record<string, unknown>,
+		collection: string,
+	): Promise<HookResult<void>[]> {
+		return this.runContentStateChangeHook("content:afterUnschedule", content, collection);
 	}
 	// =========================================================================

package/src/plugins/index.ts CHANGED Viewed

@@ -128,6 +128,9 @@ export type {
 	ContentHookEvent,
 	ContentDeleteEvent,
 	ContentPublishStateChangeEvent,
+	ContentRestoreStateChangeEvent,
+	ContentScheduleStateChangeEvent,
+	ContentStateChangeEvent,
 	MediaUploadEvent,
 	MediaAfterUploadEvent,
 	LifecycleEvent,
@@ -149,6 +152,8 @@ export type {
 	ContentBeforeDeleteHandler,
 	ContentAfterDeleteHandler,
 	ContentAfterRestoreHandler,
+	ContentAfterScheduleHandler,
+	ContentAfterUnscheduleHandler,
 	MediaBeforeUploadHandler,
 	MediaAfterUploadHandler,
 	LifecycleHandler,

package/src/plugins/manager.ts CHANGED Viewed

@@ -381,6 +381,28 @@ export class PluginManager {
 		return this.hookPipeline!.runContentAfterRestore(content, collection);
 	}
+	/**
+	 * Run content:afterSchedule hooks across all active plugins
+	 */
+	async runContentAfterSchedule(
+		content: Record<string, unknown>,
+		collection: string,
+	): Promise<HookResult<void>[]> {
+		this.ensureInitialized();
+		return this.hookPipeline!.runContentAfterSchedule(content, collection);
+	}
+	/**
+	 * Run content:afterUnschedule hooks across all active plugins
+	 */
+	async runContentAfterUnschedule(
+		content: Record<string, unknown>,
+		collection: string,
+	): Promise<HookResult<void>[]> {
+		this.ensureInitialized();
+		return this.hookPipeline!.runContentAfterUnschedule(content, collection);
+	}
 	/**
 	 * Run media:beforeUpload hooks across all active plugins
 	 */

package/src/plugins/manifest-schema.ts CHANGED Viewed

@@ -98,6 +98,8 @@ export const HOOK_NAMES = [
 	"content:afterPublish",
 	"content:afterUnpublish",
 	"content:afterRestore",
+	"content:afterSchedule",
+	"content:afterUnschedule",
 	"media:beforeUpload",
 	"media:afterUpload",
 	"cron",

package/src/plugins/types.ts CHANGED Viewed

@@ -725,13 +725,29 @@ export interface ContentDeleteEvent {
 }
 /**
- * Content publish state change hook event (fired after publish or unpublish)
+ * Content state-change hook event (fired after publish, unpublish, restore,
+ * schedule, or unschedule).
  */
-export interface ContentPublishStateChangeEvent {
+export interface ContentStateChangeEvent {
 	content: Record<string, unknown>;
 	collection: string;
 }
+/**
+ * Content publish/unpublish hook event.
+ */
+export type ContentPublishStateChangeEvent = ContentStateChangeEvent;
+/**
+ * Content restore hook event.
+ */
+export type ContentRestoreStateChangeEvent = ContentStateChangeEvent;
+/**
+ * Content schedule/unschedule hook event.
+ */
+export type ContentScheduleStateChangeEvent = ContentStateChangeEvent;
 /**
  * Media hook event
  */
@@ -792,7 +808,17 @@ export type ContentAfterUnpublishHandler = (
 ) => Promise<void>;
 export type ContentAfterRestoreHandler = (
-	event: ContentPublishStateChangeEvent,
+	event: ContentRestoreStateChangeEvent,
+	ctx: PluginContext,
+) => Promise<void>;
+export type ContentAfterScheduleHandler = (
+	event: ContentScheduleStateChangeEvent,
+	ctx: PluginContext,
+) => Promise<void>;
+export type ContentAfterUnscheduleHandler = (
+	event: ContentScheduleStateChangeEvent,
 	ctx: PluginContext,
 ) => Promise<void>;
@@ -982,6 +1008,10 @@ export interface PluginHooks {
 		| HookConfig<ContentAfterUnpublishHandler>
 		| ContentAfterUnpublishHandler;
 	"content:afterRestore"?: HookConfig<ContentAfterRestoreHandler> | ContentAfterRestoreHandler;
+	"content:afterSchedule"?: HookConfig<ContentAfterScheduleHandler> | ContentAfterScheduleHandler;
+	"content:afterUnschedule"?:
+		| HookConfig<ContentAfterUnscheduleHandler>
+		| ContentAfterUnscheduleHandler;
 	// Media hooks
 	"media:beforeUpload"?: HookConfig<MediaBeforeUploadHandler> | MediaBeforeUploadHandler;
@@ -1302,6 +1332,8 @@ export interface ResolvedPluginHooks {
 	"content:afterPublish"?: ResolvedHook<ContentAfterPublishHandler>;
 	"content:afterUnpublish"?: ResolvedHook<ContentAfterUnpublishHandler>;
 	"content:afterRestore"?: ResolvedHook<ContentAfterRestoreHandler>;
+	"content:afterSchedule"?: ResolvedHook<ContentAfterScheduleHandler>;
+	"content:afterUnschedule"?: ResolvedHook<ContentAfterUnscheduleHandler>;
 	"media:beforeUpload"?: ResolvedHook<MediaBeforeUploadHandler>;
 	"media:afterUpload"?: ResolvedHook<MediaAfterUploadHandler>;
 	cron?: ResolvedHook<CronHandler>;

package/src/schema/zod-generator.ts CHANGED Viewed

@@ -86,7 +86,15 @@ function getBaseSchema(type: FieldType, field: Field): ZodTypeAny {
 			return z.preprocess((v) => (v === 0 || v === 1 ? Boolean(v) : v), z.boolean());
 		case "datetime":
-			return z.string().datetime().or(z.string().date());
+			// Accept every value that legitimately round-trips through the admin
+			// and seeds: ISO with `Z`, ISO with a timezone offset, a naive
+			// datetime (`YYYY-MM-DDTHH:mm[:ss]` -- what `<input type="datetime-local">`
+			// and many seeds produce), and a date-only value. The admin re-sends
+			// every loaded field on autosave, so a stored naive datetime must
+			// validate or the entry becomes unsavable through its own editor
+			// (#1368; same class as #867). `z.iso.*` retains semantic validation,
+			// so impossible dates are still rejected.
+			return z.iso.datetime({ offset: true, local: true }).or(z.iso.date());
 		case "select": {
 			const options = field.validation?.options;

package/src/seed/apply.ts CHANGED Viewed

@@ -346,6 +346,12 @@ export async function applySeed(
 				}
 			}
 		}
+		// Seeded/updated defs change which taxonomies exist — clear the
+		// isolate-wide defs + names caches so later reads in this isolate
+		// (e.g. an auto-seed triggered mid-request) reflect them immediately.
+		const { invalidateTaxonomyDefsCache } = await import("../taxonomies/index.js");
+		invalidateTaxonomyDefsCache();
 	}
 	// 6. Bylines