emdash 0.1.1 → 0.2.0

package/dist/astro/middleware.mjs

@@ -1,26 +1,26 @@
 import "../connection-B4zVnQIa.mjs";
 import { a as isSqlite } from "../dialect-helpers-B9uSp2GJ.mjs";
-import { r as runMigrations } from "../runner-BraqvGYk.mjs";
-import { $ as definePlugin, At as handleContentGetIncludingTrashed, Bt as handleContentUpdate, Ct as handleContentCountScheduled, Dt as handleContentDiscardDraft, Et as handleContentDelete, Ft as handleContentRestore, G as devConsoleEmailDeliver, It as handleContentSchedule, J as createHookPipeline, K as EmailPipeline, Lt as handleContentTranslations, Mt as handleContentListTrashed, Nt as handleContentPermanentDelete, Ot as handleContentDuplicate, Pt as handleContentPublish, Q as sanitizeHeadersForSandbox, Rt as handleContentUnpublish, St as handleContentCompare, Tt as handleContentCreate, U as PluginRouteRegistry, Vt as validateRev, W as DEV_CONSOLE_EMAIL_PLUGIN_ID, X as CronExecutor, Y as resolveExclusiveHooks, Z as extractRequestMeta, _t as handleRevisionList, dt as handleMediaCreate, ft as handleMediaDelete, gt as handleRevisionGet, ht as handleMediaUpdate, jt as handleContentList, kt as handleContentGet, lt as PluginStateRepository, mt as handleMediaList, ot as loadBundleFromR2, pt as handleMediaGet, vt as handleRevisionRestore, wt as handleContentCountTrashed, xt as hashString, zt as handleContentUnschedule } from "../search-C1gg67nN.mjs";
-import { r as RevisionRepository } from "../content-D6C2WsZC.mjs";
+import { r as runMigrations } from "../runner-BoN0-FPi.mjs";
+import { $ as sanitizeHeadersForSandbox, At as handleContentGet, Bt as handleContentUnschedule, Ct as handleContentCompare, Dt as handleContentDelete, Et as handleContentCreate, Ft as handleContentPublish, G as DEV_CONSOLE_EMAIL_PLUGIN_ID, Ht as validateRev, It as handleContentRestore, K as devConsoleEmailDeliver, Lt as handleContentSchedule, Mt as handleContentList, Nt as handleContentListTrashed, Ot as handleContentDiscardDraft, Pt as handleContentPermanentDelete, Q as extractRequestMeta, Rt as handleContentTranslations, St as hashString, Tt as handleContentCountTrashed, Vt as handleContentUpdate, W as PluginRouteRegistry, X as resolveExclusiveHooks, Y as createHookPipeline, Z as CronExecutor, _t as handleRevisionGet, et as definePlugin, ft as handleMediaCreate, gt as handleMediaUpdate, ht as handleMediaList, jt as handleContentGetIncludingTrashed, kt as handleContentDuplicate, mt as handleMediaGet, pt as handleMediaDelete, q as EmailPipeline, st as loadBundleFromR2, ut as PluginStateRepository, vt as handleRevisionList, wt as handleContentCountScheduled, yt as handleRevisionRestore, zt as handleContentUnpublish } from "../search-BsYMed12.mjs";
+import { r as RevisionRepository } from "../content-BmXndhdi.mjs";
 import "../base64-MBPo9ozB.mjs";
 import "../types-CMMN0pNg.mjs";
 import { t as MediaRepository } from "../media-DqHVh136.mjs";
-import { u as OptionsRepository } from "../apply-kC39ev1Z.mjs";
-import { i as FTSManager, n as SchemaRegistry } from "../registry-BNYQKX_d.mjs";
+import { f as OptionsRepository } from "../apply-wmVEOSbR.mjs";
+import { i as FTSManager, n as SchemaRegistry } from "../registry-1EvbAfsC.mjs";
 import "../redirect-DIfIni3r.mjs";
-import "../byline-CL847F26.mjs";
+import "../byline-1WQPlISL.mjs";
 import { n as normalizeMediaValue } from "../placeholder-aiCD8aSZ.mjs";
-import { a as setI18nConfig } from "../config-CKE8p9xM.mjs";
+import { i as setI18nConfig } from "../config-Cq8H0SfX.mjs";
 import { getRequestContext, runWithContext } from "../request-context.mjs";
-import { n as getDb } from "../loader-fz8Q_3EO.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-CL8DWO9b.mjs";
-import "../query-BVYN0PJ6.mjs";
-import "../tokens-DpgrkrXK.mjs";
-import "../bylines-C2a-2TGt.mjs";
-import "../load-yOOlckBj.mjs";
+import { n as getDb } from "../loader-CHb2v0jm.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-CuMio1A9.mjs";
+import "../query-5Hcv_5ER.mjs";
+import "../tokens-DrB-W6Q-.mjs";
+import "../bylines-BYdTYmia.mjs";
+import "../load-Veizk2cT.mjs";
 import "../index.mjs";
-import { t as getAuthMode } from "../mode-C2EzN1uE.mjs";
+import { t as getAuthMode } from "../mode-CYeM2rPt.mjs";
 import { Kysely, sql } from "kysely";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
@@ -444,9 +444,15 @@ var EmDashRuntime = class EmDashRuntime {
 	*/
 	async setPluginStatus(pluginId, status) {
 		this.pluginStates.set(pluginId, status);
-		if (status === "active") this.enabledPlugins.add(pluginId);
-		else this.enabledPlugins.delete(pluginId);
-		await this.rebuildHookPipeline();
+		if (status === "active") {
+			this.enabledPlugins.add(pluginId);
+			await this.rebuildHookPipeline();
+			await this._hooks.runPluginActivate(pluginId);
+		} else {
+			await this._hooks.runPluginDeactivate(pluginId);
+			this.enabledPlugins.delete(pluginId);
+			await this.rebuildHookPipeline();
+		}
 	}
 	/**
 	* Rebuild the hook pipeline from the current set of enabled plugins.
@@ -716,9 +722,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-kC39ev1Z.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-yOOlckBj.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-_rsF-Dx_.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-wmVEOSbR.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-Veizk2cT.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-CXnRKfJK.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -874,6 +880,7 @@ var EmDashRuntime = class EmDashRuntime {
 						required: field.required
 					};
 					if (field.widget) entry.widget = field.widget;
+					if (field.options) entry.options = field.options;
 					if (field.validation?.options) entry.options = field.validation.options.map((v) => ({
 						value: v,
 						label: v.charAt(0).toUpperCase() + v.slice(1)
@@ -907,8 +914,8 @@ var EmDashRuntime = class EmDashRuntime {
 				version: plugin.version,
 				enabled,
 				adminMode,
-				adminPages: plugin.admin?.pages,
-				dashboardWidgets: plugin.admin?.widgets,
+				adminPages: plugin.admin?.pages ?? [],
+				dashboardWidgets: plugin.admin?.widgets ?? [],
 				portableTextBlocks: plugin.admin?.portableTextBlocks,
 				fieldWidgets: plugin.admin?.fieldWidgets
 			};
@@ -923,8 +930,8 @@ var EmDashRuntime = class EmDashRuntime {
 				enabled,
 				sandboxed: true,
 				adminMode: hasAdminPages || hasWidgets ? "blocks" : "none",
-				adminPages: entry.adminPages,
-				dashboardWidgets: entry.adminWidgets
+				adminPages: entry.adminPages ?? [],
+				dashboardWidgets: entry.adminWidgets ?? []
 			};
 		}
 		for (const [pluginId, meta] of marketplaceManifestCache) {
@@ -939,25 +946,38 @@ var EmDashRuntime = class EmDashRuntime {
 				enabled,
 				sandboxed: true,
 				adminMode: hasAdminPages || hasWidgets ? "blocks" : "none",
-				adminPages: pages,
-				dashboardWidgets: widgets
+				adminPages: pages ?? [],
+				dashboardWidgets: widgets ?? []
 			};
 		}
-		const manifestHash = await hashString(JSON.stringify(manifestCollections) + JSON.stringify(manifestPlugins));
+		let manifestTaxonomies = [];
+		try {
+			manifestTaxonomies = (await this.db.selectFrom("_emdash_taxonomy_defs").selectAll().orderBy("name").execute()).map((row) => ({
+				name: row.name,
+				label: row.label,
+				labelSingular: row.label_singular ?? void 0,
+				hierarchical: row.hierarchical === 1,
+				collections: row.collections ? JSON.parse(row.collections).toSorted() : []
+			}));
+		} catch (error) {
+			console.debug("EmDash: Could not load taxonomy definitions:", error);
+		}
+		const manifestHash = await hashString(JSON.stringify(manifestCollections) + JSON.stringify(manifestPlugins) + JSON.stringify(manifestTaxonomies));
 		const authMode = getAuthMode(this.config);
 		const authModeValue = authMode.type === "external" ? authMode.providerType : "passkey";
-		const { getI18nConfig, isI18nEnabled } = await import("../config-CKE8p9xM.mjs").then((n) => n.t);
-		const i18nConfig = getI18nConfig();
+		const i18nConfig = virtualConfig?.i18n;
+		const i18n = i18nConfig && i18nConfig.locales && i18nConfig.locales.length > 1 ? {
+			defaultLocale: i18nConfig.defaultLocale,
+			locales: i18nConfig.locales
+		} : void 0;
 		return {
 			version: "0.1.0",
 			hash: manifestHash,
 			collections: manifestCollections,
 			plugins: manifestPlugins,
+			taxonomies: manifestTaxonomies,
 			authMode: authModeValue,
-			i18n: isI18nEnabled() && i18nConfig ? {
-				defaultLocale: i18nConfig.defaultLocale,
-				locales: i18nConfig.locales
-			} : void 0,
+			i18n,
 			marketplace: !!this.config.marketplace
 		};
 	}
@@ -990,7 +1010,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-D6C2WsZC.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-BmXndhdi.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1217,7 +1237,10 @@ var EmDashRuntime = class EmDashRuntime {
 		};
 		const trustedPlugin = this.configuredPlugins.find((p) => p.id === pluginId);
 		if (trustedPlugin && this.enabledPlugins.has(trustedPlugin.id)) {
-			const routeRegistry = new PluginRouteRegistry({ db: this.db });
+			const routeRegistry = new PluginRouteRegistry({
+				db: this.db,
+				emailPipeline: this.email ?? void 0
+			});
 			routeRegistry.register(trustedPlugin);
 			const routeKey = path.replace(LEADING_SLASH_PATTERN, "");
 			let body = void 0;
@@ -1536,23 +1559,33 @@ function setBaselineSecurityHeaders(response) {
 }
 /** Public routes that require the runtime (sitemap, robots.txt, etc.) */
 const PUBLIC_RUNTIME_ROUTES = new Set(["/sitemap.xml", "/robots.txt"]);
+const SITEMAP_COLLECTION_RE = /^\/sitemap-[a-z][a-z0-9_]*\.xml$/;
 const onRequest = defineMiddleware(async (context, next) => {
 	const { request, locals, cookies } = context;
 	const url = context.url;
 	const isEmDashRoute = url.pathname.startsWith("/_emdash");
-	const isPublicRuntimeRoute = PUBLIC_RUNTIME_ROUTES.has(url.pathname);
+	const isPublicRuntimeRoute = PUBLIC_RUNTIME_ROUTES.has(url.pathname) || SITEMAP_COLLECTION_RE.test(url.pathname);
 	const hasEditCookie = cookies.get("emdash-edit-mode")?.value === "true";
 	const hasPreviewToken = url.searchParams.has("_preview");
 	const playgroundDb = locals.__playgroundDb;
 	if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
-		if (!await context.session?.get("user") && !playgroundDb) {
+		if (!(context.isPrerendered ? null : await context.session?.get("user")) && !playgroundDb) {
 			if (!setupVerified) try {
-				const { getDb } = await import("../loader-fz8Q_3EO.mjs").then((n) => n.r);
+				const { getDb } = await import("../loader-CHb2v0jm.mjs").then((n) => n.r);
 				await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 				setupVerified = true;
 			} catch {
 				return context.redirect("/_emdash/admin/setup");
 			}
+			const config = getConfig();
+			if (config) try {
+				const runtime = await getRuntime(config);
+				setupVerified = true;
+				locals.emdash = {
+					collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
+					collectPageFragments: runtime.collectPageFragments.bind(runtime)
+				};
+			} catch {}
 			const response = await next();
 			setBaselineSecurityHeaders(response);
 			return response;
@@ -1600,6 +1633,8 @@ const onRequest = defineMiddleware(async (context, next) => {
 				getPluginRouteMeta: runtime.getPluginRouteMeta.bind(runtime),
 				getMediaProvider: runtime.getMediaProvider.bind(runtime),
 				getMediaProviderList: runtime.getMediaProviderList.bind(runtime),
+				collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
+				collectPageFragments: runtime.collectPageFragments.bind(runtime),
 				storage: runtime.storage,
 				db: runtime.db,
 				hooks: runtime.hooks,
@@ -1618,7 +1653,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 		if (dbConfig && typeof isSessionEnabled === "function" && isSessionEnabled(dbConfig) && typeof getD1Binding === "function" && createSessionDialect) {
 			const d1Binding = getD1Binding(dbConfig);
 			if (d1Binding && typeof d1Binding === "object" && "withSession" in d1Binding) {
-				const isAuthenticated = !!await context.session?.get("user");
+				const isAuthenticated = context.isPrerendered ? false : !!await context.session?.get("user");
 				const isWrite = request.method !== "GET" && request.method !== "HEAD";
 				const configConstraint = getDefaultConstraint(dbConfig);
 				const cookieName = getBookmarkCookieName(dbConfig);