emdash 0.2.0 → 0.4.0

package/dist/{search-BsYMed12.mjs → search-B5p9D36n.mjs}

@@ -1,17 +1,19 @@
-import { o as jsonExtractExpr } from "./dialect-helpers-B9uSp2GJ.mjs";
-import { n as validateJsonFieldName, r as validatePluginIdentifier, t as validateIdentifier } from "./validate-CqRJb_xU.mjs";
-import { i as slugify, r as RevisionRepository, t as ContentRepository } from "./content-BmXndhdi.mjs";
+import { n as validateJsonFieldName, r as validatePluginIdentifier, t as validateIdentifier } from "./validate-VPnKoIzW.mjs";
+import { o as jsonExtractExpr } from "./dialect-helpers-DhTzaUxP.mjs";
+import { a as slugify, r as RevisionRepository, t as ContentRepository } from "./content-BsBoyj8G.mjs";
 import { r as encodeBase64, t as decodeBase64 } from "./base64-MBPo9ozB.mjs";
 import { n as decodeCursor, r as encodeCursor, t as EmDashValidationError } from "./types-CMMN0pNg.mjs";
 import { t as MediaRepository } from "./media-DqHVh136.mjs";
-import { a as stripCredentialHeaders, f as OptionsRepository, i as ssrfSafeFetch, o as validateExternalUrl, r as SsrfError } from "./apply-wmVEOSbR.mjs";
-import { a as withTransaction, i as FTSManager, n as SchemaRegistry } from "./registry-1EvbAfsC.mjs";
-import { t as RedirectRepository } from "./redirect-DIfIni3r.mjs";
-import { n as SQL_BATCH_SIZE, r as chunks, t as BylineRepository } from "./byline-1WQPlISL.mjs";
-import { r as isI18nEnabled } from "./config-Cq8H0SfX.mjs";
-import { n as getDb } from "./loader-CHb2v0jm.mjs";
-import { i as pluginManifestSchema } from "./manifest-schema-CuMio1A9.mjs";
-import { t as generatePreviewToken } from "./tokens-DrB-W6Q-.mjs";
+import { a as stripCredentialHeaders, f as OptionsRepository, i as ssrfSafeFetch, o as validateExternalUrl, r as SsrfError } from "./apply-Cma_PiF6.mjs";
+import { t as withTransaction } from "./transaction-Cn2rjY78.mjs";
+import { t as RedirectRepository } from "./redirect-7lGhLBNZ.mjs";
+import { n as SQL_BATCH_SIZE, r as chunks, t as BylineRepository } from "./byline-WuOq9MFJ.mjs";
+import { r as isI18nEnabled } from "./config-DkxPrM9l.mjs";
+import { r as invalidateRedirectCache } from "./cache-E3Dts-yT.mjs";
+import { i as FTSManager, n as SchemaRegistry } from "./registry-BgnP3ysR.mjs";
+import { n as getDb } from "./loader-BYzwzORf.mjs";
+import { i as pluginManifestSchema } from "./manifest-schema-BsXINkQD.mjs";
+import { t as generatePreviewToken } from "./tokens-DKHiCYCB.mjs";
 import { sql } from "kysely";
 import { ulid } from "ulidx";
 import { z } from "astro/zod";
@@ -1278,34 +1280,18 @@ async function handleContentUpdate(db, collection, id, body) {
 				message: `Collection "${collection}" does not have SEO enabled. Remove the seo field or enable SEO on this collection.`
 			}
 		};
-		const repo = new ContentRepository(db);
-		const resolvedId = await resolveId(repo, collection, id) ?? id;
-		if (body._rev) {
-			const existing = await repo.findById(collection, resolvedId);
-			if (!existing) return {
-				success: false,
-				error: {
-					code: "NOT_FOUND",
-					message: `Content item not found: ${id}`
-				}
-			};
-			const revCheck = validateRev(body._rev, existing);
-			if (!revCheck.valid) return {
-				success: false,
-				error: {
-					code: "CONFLICT",
-					message: revCheck.message
-				}
-			};
-		}
+		const resolvedId = await resolveId(new ContentRepository(db), collection, id) ?? id;
 		const item = await withTransaction(db, async (trx) => {
 			const trxRepo = new ContentRepository(trx);
 			const bylineRepo = new BylineRepository(trx);
-			let oldSlug;
-			if (body.slug) {
-				const existing = await trxRepo.findById(collection, resolvedId);
-				if (existing?.slug && existing.slug !== body.slug) oldSlug = existing.slug;
+			const existing = body._rev || body.slug ? await trxRepo.findById(collection, resolvedId) : null;
+			if (body._rev) {
+				if (!existing) throw Object.assign(/* @__PURE__ */ new Error(`Content item not found: ${id}`), { apiError: { code: "NOT_FOUND" } });
+				const revCheck = validateRev(body._rev, existing);
+				if (!revCheck.valid) throw Object.assign(new Error(revCheck.message), { apiError: { code: "CONFLICT" } });
 			}
+			let oldSlug;
+			if (body.slug && existing?.slug && existing.slug !== body.slug) oldSlug = existing.slug;
 			const updated = await trxRepo.update(collection, resolvedId, {
 				data: body.data,
 				slug: body.slug,
@@ -1319,6 +1305,7 @@ async function handleContentUpdate(db, collection, id, body) {
 			if (oldSlug && body.slug) {
 				const collectionRow = await trx.selectFrom("_emdash_collections").select("url_pattern").where("slug", "=", collection).executeTakeFirst();
 				await new RedirectRepository(trx).createAutoRedirect(collection, oldSlug, body.slug, resolvedId, collectionRow?.url_pattern ?? null);
+				invalidateRedirectCache();
 			}
 			if (isI18nEnabled() && body.data && updated.translationGroup) await syncNonTranslatableFields(trx, collection, updated.id, updated.translationGroup, body.data);
 			if (body.seo && hasSeo) updated.seo = await new SeoRepository(trx).upsert(collection, resolvedId, body.seo);
@@ -1334,6 +1321,16 @@ async function handleContentUpdate(db, collection, id, body) {
 			}
 		};
 	} catch (error) {
+		if (error instanceof Error && "apiError" in error) {
+			const { code } = error.apiError;
+			return {
+				success: false,
+				error: {
+					code,
+					message: error.message
+				}
+			};
+		}
 		console.error("Content update error:", error);
 		return {
 			success: false,
@@ -3662,7 +3659,8 @@ const redirectSchema = z$1.object({
 }).meta({ id: "Redirect" });
 const redirectListResponseSchema = z$1.object({
 	items: z$1.array(redirectSchema),
-	nextCursor: z$1.string().optional()
+	nextCursor: z$1.string().optional(),
+	loopRedirectIds: z$1.array(z$1.string()).optional()
 }).meta({ id: "RedirectListResponse" });
 const notFoundEntrySchema = z$1.object({
 	id: z$1.string(),
@@ -5130,12 +5128,31 @@ var CronExecutor = class {
 				hookFailed = true;
 				console.error(`[cron] Hook failed for ${task.plugin_id}:${task.task_name}:`, error);
 			}
-			if (task.is_oneshot) if (hookFailed) await sql`
+			if (task.is_oneshot) if (hookFailed) {
+				const meta = parsedData?.__emdash != null && typeof parsedData.__emdash === "object" ? parsedData.__emdash : void 0;
+				const raw = meta?.retryCount;
+				const retryCount = typeof raw === "number" && Number.isFinite(raw) && raw > 0 ? Math.floor(raw) : 0;
+				const MAX_ONESHOT_RETRIES = 5;
+				if (retryCount >= MAX_ONESHOT_RETRIES) {
+					console.error(`[cron] One-shot task ${task.plugin_id}:${task.task_name} exceeded ${MAX_ONESHOT_RETRIES} retries, removing`);
+					await sql`
+						DELETE FROM _emdash_cron_tasks WHERE id = ${task.id}
+					`.execute(this.db);
+				} else {
+					const backoffMs = 6e4 * Math.pow(2, retryCount);
+					await sql`
 						UPDATE _emdash_cron_tasks
-						SET status = 'idle', locked_at = NULL, next_run_at = ${new Date(Date.now() + 6e4).toISOString()}
+						SET status = 'idle', locked_at = NULL, next_run_at = ${new Date(Date.now() + backoffMs).toISOString()}, data = ${JSON.stringify({
+						...parsedData,
+						__emdash: {
+							...meta,
+							retryCount: retryCount + 1
+						}
+					})}
 						WHERE id = ${task.id}
 					`.execute(this.db);
-			else await sql`
+				}
+			} else await sql`
 						DELETE FROM _emdash_cron_tasks WHERE id = ${task.id}
 					`.execute(this.db);
 			else await sql`
@@ -5399,9 +5416,13 @@ function createContentAccess(db) {
 			const result = {
 				id: item.id,
 				type: item.type,
+				slug: item.slug,
+				status: item.status,
 				data: item.data,
 				createdAt: item.createdAt,
-				updatedAt: item.updatedAt
+				updatedAt: item.updatedAt,
+				locale: item.locale,
+				publishedAt: item.publishedAt
 			};
 			if (await seoRepo.isEnabled(collection)) result.seo = await seoRepo.get(collection, item.id);
 			return result;
@@ -5423,9 +5444,13 @@ function createContentAccess(db) {
 			const items = result.items.map((item) => ({
 				id: item.id,
 				type: item.type,
+				slug: item.slug,
+				status: item.status,
 				data: item.data,
 				createdAt: item.createdAt,
-				updatedAt: item.updatedAt
+				updatedAt: item.updatedAt,
+				locale: item.locale,
+				publishedAt: item.publishedAt
 			}));
 			if (items.length > 0 && await seoRepo.isEnabled(collection)) {
 				const seoMap = await seoRepo.getMany(collection, items.map((i) => i.id));
@@ -5467,9 +5492,13 @@ function createContentAccessWithWrite(db) {
 				const result = {
 					id: item.id,
 					type: item.type,
+					slug: item.slug,
+					status: item.status,
 					data: item.data,
 					createdAt: item.createdAt,
-					updatedAt: item.updatedAt
+					updatedAt: item.updatedAt,
+					locale: item.locale,
+					publishedAt: item.publishedAt
 				};
 				if (hasSeo) result.seo = seo !== void 0 ? await trxSeoRepo.upsert(collection, item.id, seo) : await trxSeoRepo.get(collection, item.id);
 				return result;
@@ -5489,9 +5518,13 @@ function createContentAccessWithWrite(db) {
 				const result = {
 					id: item.id,
 					type: item.type,
+					slug: item.slug,
+					status: item.status,
 					data: item.data,
 					createdAt: item.createdAt,
-					updatedAt: item.updatedAt
+					updatedAt: item.updatedAt,
+					locale: item.locale,
+					publishedAt: item.publishedAt
 				};
 				if (hasSeo) result.seo = seo !== void 0 ? await trxSeoRepo.upsert(collection, item.id, seo) : await trxSeoRepo.get(collection, item.id);
 				return result;
@@ -5552,17 +5585,18 @@ function createMediaAccessWithWrite(db, getUploadUrlFn, storage) {
 		getUploadUrl: getUploadUrlFn,
 		async upload(filename, contentType, bytes) {
 			if (!storage) throw new Error("Media upload() requires a storage backend. Configure storage in PluginContextFactoryOptions.");
-			const mediaId = ulid();
+			const keyPrefix = ulid();
 			const basename = filename.split("/").pop() ?? filename;
 			const dotIdx = basename.lastIndexOf(".");
-			const storageKey = `${mediaId}${dotIdx > 0 ? basename.slice(dotIdx).toLowerCase() : ""}`;
+			const storageKey = `${keyPrefix}${dotIdx > 0 ? basename.slice(dotIdx).toLowerCase() : ""}`;
 			await storage.upload({
 				key: storageKey,
 				body: new Uint8Array(bytes),
 				contentType
 			});
+			let media;
 			try {
-				await mediaRepo.create({
+				media = await mediaRepo.create({
 					filename: basename,
 					mimeType: contentType,
 					size: bytes.byteLength,
@@ -5576,7 +5610,7 @@ function createMediaAccessWithWrite(db, getUploadUrlFn, storage) {
 				throw error;
 			}
 			return {
-				mediaId,
+				mediaId: media.id,
 				storageKey,
 				url: `/_emdash/api/media/file/${storageKey}`
 			};
@@ -5588,6 +5622,11 @@ function createMediaAccessWithWrite(db, getUploadUrlFn, storage) {
 }
 /** Maximum number of redirects to follow in plugin HTTP access */
 const MAX_PLUGIN_REDIRECTS = 5;
+/**
+* Check if a hostname matches any pattern in the allowed list.
+* Patterns: "*" matches all, "*.example.com" matches subdomains AND bare "example.com",
+* "api.example.com" matches exactly.
+*/
 function isHostAllowed(host, allowedHosts) {
 	return allowedHosts.some((pattern) => {
 		if (pattern === "*") return true;
@@ -5985,6 +6024,8 @@ var HookPipeline = class HookPipeline {
 		while (remaining.length > 0) {
 			const ready = remaining.filter((hook) => hook.dependencies.every((dep) => sorted.some((s) => s.pluginId === dep)));
 			if (ready.length === 0) {
+				const pluginIds = remaining.map((h) => h.pluginId).join(", ");
+				console.warn(`[hooks] Hook dependency cycle or missing dependency detected among plugins: ${pluginIds}. Falling back to priority order.`);
 				remaining.sort((a, b) => a.priority - b.priority);
 				sorted.push(...remaining);
 				break;
@@ -6000,7 +6041,13 @@ var HookPipeline = class HookPipeline {
 	* Execute a hook with timeout
 	*/
 	async executeWithTimeout(fn, timeout) {
-		return Promise.race([fn(), new Promise((_, reject) => setTimeout(() => reject(/* @__PURE__ */ new Error(`Hook timeout after ${timeout}ms`)), timeout))]);
+		let timer;
+		const timeoutPromise = new Promise((_, reject) => timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Hook timeout after ${timeout}ms`)), timeout));
+		try {
+			return await Promise.race([fn(), timeoutPromise]);
+		} finally {
+			clearTimeout(timer);
+		}
 	}
 	/**
 	* Run plugin:install hooks
@@ -6162,7 +6209,8 @@ var HookPipeline = class HookPipeline {
 			const { handler } = hook;
 			const event = {
 				id,
-				collection
+				collection,
+				permanent: false
 			};
 			const ctx = this.getContext(hook.pluginId);
 			const start = Date.now();
@@ -6193,14 +6241,15 @@ var HookPipeline = class HookPipeline {
 	/**
 	* Run content:afterDelete hooks
 	*/
-	async runContentAfterDelete(id, collection) {
+	async runContentAfterDelete(id, collection, permanent) {
 		const hooks = this.getTypedHooks("content:afterDelete");
 		const results = [];
 		for (const hook of hooks) {
 			const { handler } = hook;
 			const event = {
 				id,
-				collection
+				collection,
+				permanent
 			};
 			const ctx = this.getContext(hook.pluginId);
 			const start = Date.now();
@@ -6968,11 +7017,12 @@ var PluginRouteHandler = class {
 				},
 				status: error.status
 			};
+			console.error(`[plugin:${this.plugin.id}] Route handler failed:`, error);
 			return {
 				success: false,
 				error: {
 					code: "INTERNAL_ERROR",
-					message: `Route handler failed: ${error instanceof Error ? error.message : String(error)}`
+					message: "An internal error occurred"
 				},
 				status: 500
 			};
@@ -7257,9 +7307,9 @@ var PluginManager = class {
 	/**
 	* Run content:afterDelete hooks across all active plugins
 	*/
-	async runContentAfterDelete(id, collection) {
+	async runContentAfterDelete(id, collection, permanent) {
 		this.ensureInitialized();
-		return this.hookPipeline.runContentAfterDelete(id, collection);
+		return this.hookPipeline.runContentAfterDelete(id, collection, permanent);
 	}
 	/**
 	* Run content:afterPublish hooks across all active plugins
@@ -8762,6 +8812,7 @@ function interpolateUrlPattern(pattern, slug, id) {
 async function resolveContentUrl(collection, entryId, db, urlPatterns) {
 	if (!entryId) return null;
 	try {
+		validateIdentifier(collection, "menu item collection");
 		const row = (await sql`
 			SELECT slug FROM ${sql.ref(`ec_${collection}`)} WHERE id = ${entryId} LIMIT 1
 		`.execute(db)).rows[0];
@@ -8936,7 +8987,7 @@ async function getTermsForEntries(collection, entryIds, taxonomyName) {
 * Get entries by term (wraps getEmDashCollection)
 */
 async function getEntriesByTerm(collection, taxonomyName, termSlug) {
-	const { getEmDashCollection } = await import("./query-5Hcv_5ER.mjs").then((n) => n.a);
+	const { getEmDashCollection } = await import("./query-B6Vu0d2i.mjs").then((n) => n.o);
 	const { entries } = await getEmDashCollection(collection, { where: { [taxonomyName]: termSlug } });
 	return entries;
 }
@@ -9342,9 +9393,9 @@ function escapeQuery(query) {
 	if (!query || typeof query !== "string") return "";
 	query = query.trim();
 	if (query.length === 0) return "";
+	if (query.startsWith("\"") && query.endsWith("\"") && query.length >= 2) return `"${query.slice(1, -1).replace(DOUBLE_QUOTE_PATTERN, "\"\"")}"`;
 	const escaped = query.replace(DOUBLE_QUOTE_PATTERN, "\"\"");
 	if (FTS_OPERATORS_PATTERN.test(query)) return escaped;
-	if (query.startsWith("\"") && query.endsWith("\"")) return query;
 	const terms = escaped.split(WHITESPACE_SPLIT_PATTERN).filter((t) => t.length > 0);
 	if (terms.length === 0) return "";
 	return terms.map((t) => `"${t}"*`).join(" ");
@@ -9445,4 +9496,4 @@ function extractSearchableFields(entry, fields) {
 
 //#endregion
 export { sanitizeHeadersForSandbox as $, getAllSources as A, handleContentGet as At, createNoopSandboxRunner as B, handleContentUnschedule as Bt, isPreviewRequest as C, handleContentCompare as Ct, parseWxrDate as D, handleContentDelete as Dt, wordpressRestSource as E, handleContentCreate as Et, registerSource as F, handleContentPublish as Ft, DEV_CONSOLE_EMAIL_PLUGIN_ID as G, image as Gt, createPluginManager as H, validateRev as Ht, importReusableBlocksAsSections as I, handleContentRestore as It, HookPipeline as J, devConsoleEmailDeliver as K, isStandardPluginDefinition as L, handleContentSchedule as Lt, getSource as M, handleContentList as Mt, getUrlSources as N, handleContentListTrashed as Nt, wxrSource as O, handleContentDiscardDraft as Ot, probeUrl as P, handleContentPermanentDelete as Pt, extractRequestMeta as Q, NoopSandboxRunner as R, handleContentTranslations as Rt, getPreviewToken as S, hashString as St, getPreviewUrl as T, handleContentCountTrashed as Tt, PluginRouteError as U, portableText as Ut, PluginManager as V, handleContentUpdate as Vt, PluginRouteRegistry as W, reference as Wt, resolveExclusiveHooks as X, createHookPipeline as Y, CronExecutor as Z, getTermsForEntries as _, handleRevisionGet as _t, search as a, isSafeHref as at, getCommentCount as b, generateManifest as bt, getWidgetArea as c, getSection as ct, getEntriesByTerm as d, getCollectionInfo as dt, definePlugin as et, getEntryTerms as f, handleMediaCreate as ft, getTerm as g, handleMediaUpdate as gt, getTaxonomyTerms as h, handleMediaList as ht, getSuggestions as i, prosemirrorToPortableText as it, getFileSources as j, handleContentGetIncludingTrashed as jt, clearSources as k, handleContentDuplicate as kt, getWidgetAreas as l, getSections as lt, getTaxonomyDefs as m, handleMediaGet as mt, extractSearchableFields as n, parseWxrString as nt, searchCollection as o, sanitizeHref as ot, getTaxonomyDef as p, handleMediaDelete as pt, EmailPipeline as q, getSearchStats as r, portableTextToProsemirror as rt, searchWithDb as s, loadBundleFromR2 as st, extractPlainText as t, parseWxr as tt, getWidgetComponents as u, PluginStateRepository as ut, getMenu as v, handleRevisionList as vt, buildPreviewUrl as w, handleContentCountScheduled as wt, getComments as x, computeContentHash as xt, getMenus as y, handleRevisionRestore as yt, SandboxNotAvailableError as z, handleContentUnpublish as zt };
-//# sourceMappingURL=search-BsYMed12.mjs.map
+//# sourceMappingURL=search-B5p9D36n.mjs.map