emdash 0.24.1 → 0.26.0

package/dist/astro/middleware/auth.d.mts

@@ -1,12 +1,12 @@
-import "../../options-CqECG0gM.mjs";
-import "../../types-B-gIxFCE.mjs";
-import "../../types-TTx8uP7V.mjs";
-import "../../byline-fields-Ca56gaT6.mjs";
-import "../../index-BroXT-vD.mjs";
-import "../../runner-CEtq-6Sm.mjs";
-import "../../index-qbL02uhs.mjs";
+import "../../options-41nCWqi9.mjs";
+import "../../types-xIfVRNLp.mjs";
+import "../../types-BYnDBVwe.mjs";
+import "../../byline-fields-KD3JFRuH.mjs";
+import "../../index-BRNabKrx.mjs";
+import "../../runner-BbR3DfrL.mjs";
+import "../../index-Dt0OKJB4.mjs";
 import "../../types-CUsXGRVj.mjs";
-import "../../validate-DOFrIb-c.mjs";
+import "../../validate-CG0V0wNR.mjs";
 import { EmDashHandlers } from "../types.mjs";
 import { User } from "@emdash-cms/auth";
 import * as astro from "astro";

package/dist/astro/middleware/auth.mjs

@@ -1,7 +1,7 @@
 import "../../after-B1IIdH3Y.mjs";
 import "../../base64-CmWvODNW.mjs";
-import "../../types-CmI1OyQg.mjs";
-import { t as apiError } from "../../error-lq_fL-RS.mjs";
+import "../../types-CZgK3EMW.mjs";
+import { t as apiError } from "../../error-rVGiqWDt.mjs";
 import { n as getPublicOrigin } from "../../public-url-CTVqgMmg.mjs";
 import { t as getAuthMode } from "../../mode-BB0F8xTC.mjs";
 import { t as resolveSessionUser } from "../../session-user-B8aLtKAH.mjs";

package/dist/astro/middleware/redirect.mjs

@@ -1,9 +1,9 @@
 import "../../dialect-helpers-DRI5pyY3.mjs";
 import "../../base64-CmWvODNW.mjs";
-import "../../types-CmI1OyQg.mjs";
-import { t as RedirectRepository } from "../../redirect-C1KVGYWe.mjs";
-import { a as setCachedRedirects, i as matchCachedPatterns, n as getCachedRedirects } from "../../cache-BUJe2w6Z.mjs";
-import { a as getDb } from "../../loader-BR2SgfEc.mjs";
+import "../../types-CZgK3EMW.mjs";
+import { t as RedirectRepository } from "../../redirect-_M0trWoo.mjs";
+import { a as setCachedRedirects, i as matchCachedPatterns, n as getCachedRedirects } from "../../cache-D9jF5bYw.mjs";
+import { a as getDb } from "../../loader-BA_zhkS_.mjs";
 import { n as isTerminalStatus } from "../../status-vUK0SA17.mjs";
 import { defineMiddleware } from "astro:middleware";
 

package/dist/astro/middleware.d.mts

@@ -1,4 +1,4 @@
-import "../types-B-gIxFCE.mjs";
+import "../types-xIfVRNLp.mjs";
 import { Kysely } from "kysely";
 import * as astro from "astro";
 

package/dist/astro/middleware.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.mts","names":[],"sources":["../../src/scheduled-publish.ts","../../src/astro/middleware.ts"],"mappings":";;;;;ACgRA;AAAA,UD5PiB,YAAA;EAChB,UAAA;EACA,EAAA;AAAA;;;;;;;;;AC0PD;;;;;;;;iBAAsB,iBAAA,CACrB,OAAA;EAAW,WAAA,IAAe,IAAA,EAAM,YAAA,OAAmB,OAAA;AAAA,IACjD,OAAA;EAAU,SAAA,EAAW,YAAA;AAAA;AAAA,cAoKX,SAAA,EA+YX,KAAA,CA/YoB,iBAAA"}
+{"version":3,"file":"middleware.d.mts","names":[],"sources":["../../src/scheduled-publish.ts","../../src/astro/middleware.ts"],"mappings":";;;;;ACgRA;AAAA,UD5PiB,YAAA;EAChB,UAAA;EACA,EAAA;AAAA;;;;;;;;;AC0PD;;;;;;;;iBAAsB,iBAAA,CACrB,OAAA;EAAW,WAAA,IAAe,IAAA,EAAM,YAAA,OAAmB,OAAA;AAAA,IACjD,OAAA;EAAU,SAAA,EAAW,YAAA;AAAA;AAAA,cAoKX,SAAA,EA4ZX,KAAA,CA5ZoB,iBAAA"}

package/dist/astro/middleware.mjs

@@ -1,57 +1,57 @@
-import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner-BsquExlK.mjs";
+import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner-DPdt_Wpa.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { o as isSqlite } from "../dialect-helpers-DRI5pyY3.mjs";
 import { i as setI18nConfig } from "../config-CVssduLe.mjs";
-import { _ as resolveExclusiveHooks, g as createHookPipeline, m as EmailPipeline, p as PluginRouteRegistry, t as getMenu, v as definePlugin } from "../menus-GvRSpgIA.mjs";
+import { _ as resolveExclusiveHooks, g as createHookPipeline, m as EmailPipeline, p as PluginRouteRegistry, t as getMenu, v as definePlugin } from "../menus-CYH09a41.mjs";
 import { t as after } from "../after-B1IIdH3Y.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
-import "../object-cache-SEb2IM4Z.mjs";
-import { r as RevisionRepository, t as ContentRepository } from "../content-PoVGKjp0.mjs";
+import "../object-cache-CHbHv83-.mjs";
+import { r as RevisionRepository, t as ContentRepository } from "../content-ncUWWjna.mjs";
 import "../base64-CmWvODNW.mjs";
-import "../types-CmI1OyQg.mjs";
-import { t as MediaRepository } from "../media-CTjJoJTh.mjs";
-import "../user-JAuc8VUf.mjs";
-import "../taxonomy-BBUlGug5.mjs";
-import "../comment-BDx50EX5.mjs";
+import "../types-CZgK3EMW.mjs";
+import { t as MediaRepository } from "../media-C5t_eCnk.mjs";
+import "../user-DkG2jKCp.mjs";
+import "../taxonomy-BU0LjdVb.mjs";
+import "../comment-D9BLDpZI.mjs";
 import { t as OptionsRepository } from "../options-DTTML-Tx.mjs";
-import "../context-Dvws41_A.mjs";
-import "../menus-8O6xNcYW.mjs";
-import "../redirect-C1KVGYWe.mjs";
+import "../context-C_g-iJVA.mjs";
+import "../menus-CBb6UrMU.mjs";
+import "../redirect-_M0trWoo.mjs";
 import { i as setRequestCacheEntry, r as requestCached } from "../request-cache-KCNHp_RJ.mjs";
 import "../byline-registry-BOjqDOim.mjs";
 import { n as initWithLock, t as createInitLock } from "../init-lock-6b309ZrF.mjs";
-import "../field-defs-cache-CYYx8xlG.mjs";
-import "../byline-C-YajfV7.mjs";
-import { n as normalizeMediaValue } from "../normalize-ClbNIenm.mjs";
-import "../placeholder-B0s2mWu5.mjs";
-import "../seo-3QrZ1EPT.mjs";
-import { n as isMissingTableError } from "../db-errors-UXB1CK42.mjs";
-import { $ as handleContentGet, B as handleMediaUpdate, G as handleContentAuthors, H as handleRevisionList, I as handleMediaCreate, J as handleContentCountTrashed, K as handleContentCompare, L as handleMediaDelete, Q as handleContentDuplicate, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDelete, Y as handleContentCreate, Z as handleContentDiscardDraft, _ as loadBundleFromR2, at as handleContentRestore, ct as handleContentUnpublish, dt as validateRev, et as handleContentGetIncludingTrashed, it as handleContentPublish, lt as handleContentUnschedule, nt as handleContentListTrashed, ot as handleContentSchedule, q as handleContentCountScheduled, rt as handleContentPermanentDelete, s as normalizeRegistryConfig, st as handleContentTranslations, tt as handleContentList, ut as handleContentUpdate, z as handleMediaList } from "../api-d_0wi9fW.mjs";
-import "../dashboard-DsYU8JKS.mjs";
+import "../field-defs-cache-ljXzJCfc.mjs";
+import "../byline-LL8lyqdb.mjs";
+import { n as normalizeMediaValue } from "../normalize-CeglrBT9.mjs";
+import "../enrich-BQ0mxJRs.mjs";
+import "../seo-DKeXHkzE.mjs";
+import { n as isMissingTableError } from "../db-errors-CK46D-ly.mjs";
+import { $ as handleContentGet, B as handleMediaUpdate, G as handleContentAuthors, H as handleRevisionList, I as handleMediaCreate, J as handleContentCountTrashed, K as handleContentCompare, L as handleMediaDelete, Q as handleContentDuplicate, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDelete, Y as handleContentCreate, Z as handleContentDiscardDraft, _ as loadBundleFromR2, at as handleContentRestore, ct as handleContentUnpublish, dt as validateRev, et as handleContentGetIncludingTrashed, it as handleContentPublish, lt as handleContentUnschedule, nt as handleContentListTrashed, ot as handleContentSchedule, q as handleContentCountScheduled, rt as handleContentPermanentDelete, s as normalizeRegistryConfig, st as handleContentTranslations, tt as handleContentList, ut as handleContentUpdate, z as handleMediaList } from "../api-BMfveMoB.mjs";
+import "../dashboard-CotyqQrW.mjs";
 import { n as hashString } from "../hash-DrvzIXcz.mjs";
-import { t as FTSManager } from "../fts-manager-DW_NR-Fs.mjs";
-import { n as SchemaRegistry } from "../registry-CJkCubOJ.mjs";
+import { t as FTSManager } from "../fts-manager-BbCCbEKA.mjs";
+import { n as SchemaRegistry } from "../registry-g8yYt4cC.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
-import { a as getDb } from "../loader-BR2SgfEc.mjs";
-import "../schema-DMjXuvNU.mjs";
-import "../zod-generator-xEHODMJf.mjs";
-import "../seo-DCEF-AVr.mjs";
-import "../sections-CCMic8dB.mjs";
+import { a as getDb } from "../loader-BA_zhkS_.mjs";
+import "../schema-DoLd3j2e.mjs";
+import "../zod-generator-gFsRuNNy.mjs";
+import "../seo-BkhuuaaE.mjs";
+import "../sections-5J2YJPqJ.mjs";
 import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-Cdfkic3t.mjs";
-import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-D9rvaLuY.mjs";
-import "../settings-C3Yi5Co3.mjs";
+import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-DJeki-97.mjs";
+import "../settings-BMNr9Dmi.mjs";
 import "../resolve-C7I0qiR0.mjs";
-import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-CurpLtNC.mjs";
-import "../taxonomies-DhLaNJji.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-BWKnQYQF.mjs";
+import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-D13i2ctt.mjs";
+import "../taxonomies-CM_fUqLU.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-kPGX7VS-.mjs";
 import "../types-BvbeGEtr.mjs";
 import "../ssrf-BRKb343l.mjs";
-import "../error-lq_fL-RS.mjs";
-import "../parse-DHI873qU.mjs";
-import "../redirects-x9eFPeyi.mjs";
-import "../byline-fields-B-KXkg5R.mjs";
+import "../error-rVGiqWDt.mjs";
+import "../parse-BwAdS7FZ.mjs";
+import "../redirects-Dcbuisoj.mjs";
+import "../byline-fields-eyJMblSr.mjs";
 import "../status-vUK0SA17.mjs";
-import { a as invalidateUrlPatternCache } from "../query-DZdlS6Cu.mjs";
+import { a as invalidateUrlPatternCache } from "../query-BpQb-blG.mjs";
 import "../import-Bb1T9WJS.mjs";
 import { t as getTrustedProxyHeaders } from "../trusted-proxy-DZY5WCn2.mjs";
 import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-CmS1tDFf.mjs";
@@ -61,14 +61,14 @@ import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from ".
 import "../utils-B7A57fm9.mjs";
 import "../tokens-LeuXF9gG.mjs";
 import "../preview-DKGCt2_p.mjs";
-import "../comment-reaction-Gv_pgfI3.mjs";
-import "../bylines-BMtJnPnG.mjs";
-import { n as getWidgetAreas } from "../widgets-Dri0spI4.mjs";
-import "../apply-BE9UaWX0.mjs";
-import "../load-DMFi4n1p.mjs";
-import "../search-D1wKk3lc.mjs";
+import "../comment-reaction-Drl9SkNu.mjs";
+import "../bylines-DE47vP8d.mjs";
+import { n as getWidgetAreas } from "../widgets-BfOZ-ajY.mjs";
+import "../apply--IVNSdXn.mjs";
+import "../load-DMjXghbZ.mjs";
+import "../search-BR0ZeZmh.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-C0JPFUG8.mjs";
+import { n as VERSION, t as COMMIT } from "../version-BoNBItP_.mjs";
 import { t as getAuthMode } from "../mode-BB0F8xTC.mjs";
 import { t as cleanupExpiredChallenges } from "../challenge-store-LhiqMccz.mjs";
 import { a as validateEncryptionKeyAtStartup } from "../secrets-BSf9pRRY.mjs";
@@ -925,9 +925,9 @@ var EmDashRuntime = class EmDashRuntime {
 			const seedHolder = getSeedHolder();
 			try {
 				await initWithLock(seedHolder.lock, () => seedHolder.done.has(seedKey) ? true : void 0, async () => {
-					const { applySeed } = await import("../apply-BE9UaWX0.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-DMFi4n1p.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-BzXHWnkV.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply--IVNSdXn.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-DMjXghbZ.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-CuJ1Ps9j.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -1663,7 +1663,7 @@ var EmDashRuntime = class EmDashRuntime {
 		if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(body.data, collection, true)).content;
 		processedData = await this.runSandboxedBeforeSave(processedData, collection, true);
 		processedData = await this.normalizeMediaFields(collection, processedData);
-		const { validateContentData } = await import("../validation-CY1gk4Ar.mjs");
+		const { validateContentData } = await import("../validation-CwUfTdGF.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1679,7 +1679,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-PoVGKjp0.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-ncUWWjna.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id, body.locale);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1706,7 +1706,7 @@ var EmDashRuntime = class EmDashRuntime {
 			if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(bodyWithoutRev.data, collection, false)).content;
 			processedData = await this.runSandboxedBeforeSave(processedData, collection, false);
 			processedData = await this.normalizeMediaFields(collection, processedData);
-			const { validateContentData } = await import("../validation-CY1gk4Ar.mjs");
+			const { validateContentData } = await import("../validation-CwUfTdGF.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -1786,7 +1786,9 @@ var EmDashRuntime = class EmDashRuntime {
 		return handleContentListTrashed(this.db, collection, params);
 	}
 	async handleContentRestore(collection, id) {
-		return handleContentRestore(this.db, collection, id);
+		const result = await handleContentRestore(this.db, collection, id);
+		if (result.success) this.runAfterRestoreHooks(contentItemToRecord(result.data.item), collection);
+		return result;
 	}
 	async handleContentPermanentDelete(collection, id) {
 		const result = await handleContentPermanentDelete(this.db, collection, id);
@@ -1810,10 +1812,14 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentSchedule(collection, id, scheduledAt) {
-		return handleContentSchedule(this.db, collection, id, scheduledAt);
+		const result = await handleContentSchedule(this.db, collection, id, scheduledAt);
+		if (result.success && result.data) this.runAfterScheduleHooks(contentItemToRecord(result.data.item), collection);
+		return result;
 	}
 	async handleContentUnschedule(collection, id) {
-		return handleContentUnschedule(this.db, collection, id);
+		const result = await handleContentUnschedule(this.db, collection, id);
+		if (result.success && result.data) this.runAfterUnscheduleHooks(contentItemToRecord(result.data.item), collection);
+		return result;
 	}
 	async handleContentCountScheduled(collection) {
 		return handleContentCountScheduled(this.db, collection);
@@ -2091,12 +2097,29 @@ var EmDashRuntime = class EmDashRuntime {
 			}).catch((err) => console.error(`EmDash: Sandboxed plugin ${pluginId} afterDelete error:`, err));
 		}
 	}
-	runAfterPublishHooks(content, collection) {
+	runDeferredContentHook(name, content, collection) {
+		const label = name.slice(8);
 		after(async () => {
-			if (this.hooks.hasHooks("content:afterPublish")) try {
-				await this.hooks.runContentAfterPublish(content, collection);
+			if (this.hooks.hasHooks(name)) try {
+				switch (name) {
+					case "content:afterPublish":
+						await this.hooks.runContentAfterPublish(content, collection);
+						break;
+					case "content:afterUnpublish":
+						await this.hooks.runContentAfterUnpublish(content, collection);
+						break;
+					case "content:afterRestore":
+						await this.hooks.runContentAfterRestore(content, collection);
+						break;
+					case "content:afterSchedule":
+						await this.hooks.runContentAfterSchedule(content, collection);
+						break;
+					case "content:afterUnschedule":
+						await this.hooks.runContentAfterUnschedule(content, collection);
+						break;
+				}
 			} catch (err) {
-				console.error("EmDash afterPublish hook error:", err);
+				console.error(`EmDash ${label} hook error:`, err);
 			}
 			const tasks = [];
 			for (const [pluginKey, plugin] of this.sandboxedPlugins) {
@@ -2104,28 +2127,32 @@ var EmDashRuntime = class EmDashRuntime {
 				if (!pluginId || !this.isPluginEnabled(pluginId)) continue;
 				tasks.push((async () => {
 					try {
-						await plugin.invokeHook("content:afterPublish", {
+						await plugin.invokeHook(name, {
 							content,
 							collection
 						});
 					} catch (err) {
-						console.error(`EmDash: Sandboxed plugin ${pluginId} afterPublish error:`, err);
+						console.error(`EmDash: Sandboxed plugin ${pluginId} ${label} error:`, err);
 					}
 				})());
 			}
 			await Promise.allSettled(tasks);
 		});
 	}
+	runAfterPublishHooks(content, collection) {
+		this.runDeferredContentHook("content:afterPublish", content, collection);
+	}
 	runAfterUnpublishHooks(content, collection) {
-		if (this.hooks.hasHooks("content:afterUnpublish")) this.hooks.runContentAfterUnpublish(content, collection).catch((err) => console.error("EmDash afterUnpublish hook error:", err));
-		for (const [pluginKey, plugin] of this.sandboxedPlugins) {
-			const [pluginId] = pluginKey.split(":");
-			if (!pluginId || !this.isPluginEnabled(pluginId)) continue;
-			plugin.invokeHook("content:afterUnpublish", {
-				content,
-				collection
-			}).catch((err) => console.error(`EmDash: Sandboxed plugin ${pluginId} afterUnpublish error:`, err));
-		}
+		this.runDeferredContentHook("content:afterUnpublish", content, collection);
+	}
+	runAfterRestoreHooks(content, collection) {
+		this.runDeferredContentHook("content:afterRestore", content, collection);
+	}
+	runAfterScheduleHooks(content, collection) {
+		this.runDeferredContentHook("content:afterSchedule", content, collection);
+	}
+	runAfterUnscheduleHooks(content, collection) {
+		this.runDeferredContentHook("content:afterUnschedule", content, collection);
 	}
 	async handleSandboxedRoute(plugin, path, request) {
 		const routeName = path.replace(LEADING_SLASH_PATTERN, "");
@@ -2783,6 +2810,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 		const playgroundDb = locals.__playgroundDb;
 		const hasSessionCookie = cookies.get("astro-session") !== void 0;
 		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await resolveSessionUser(context.session);
+		const hasBearerAuth = (request.headers.get("authorization") ?? "").toLowerCase().startsWith("bearer ");
 		if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
 			if (!sessionUser && !playgroundDb) {
 				const timings = [];
@@ -2790,7 +2818,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (!isSetupVerified() && !context.isPrerendered) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-BR2SgfEc.mjs").then((n) => n.o);
+						const { getDb } = await import("../loader-BA_zhkS_.mjs").then((n) => n.o);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						markSetupVerified();
 					} catch (error) {
@@ -2889,6 +2917,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				locals.emdash = {
 					handleContentList: runtime.handleContentList.bind(runtime),
 					handleContentGet: runtime.handleContentGet.bind(runtime),
+					handleContentAuthors: runtime.handleContentAuthors.bind(runtime),
 					handleContentCreate: runtime.handleContentCreate.bind(runtime),
 					handleContentUpdate: runtime.handleContentUpdate.bind(runtime),
 					handleContentDelete: runtime.handleContentDelete.bind(runtime),
@@ -2944,7 +2973,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 			}
 			const scoped = createRequestScopedDb$1({
 				config: config?.database?.config,
-				isAuthenticated: !!sessionUser,
+				isAuthenticated: !!sessionUser || hasBearerAuth,
 				isWrite: request.method !== "GET" && request.method !== "HEAD",
 				cookies: context.cookies,
 				url