emdash 0.10.0 → 0.11.0

package/dist/astro/middleware.mjs

@@ -1,35 +1,35 @@
-import { r as runMigrations } from "../runner-DMnlIkh4.mjs";
-import { getRequestContext, runWithContext } from "../request-context.mjs";
+import { r as runMigrations } from "../runner-DIcU2UCC.mjs";
+import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
 import "../connection-2igzM-AT.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { o as isSqlite } from "../dialect-helpers-BKCvISIQ.mjs";
 import { i as setI18nConfig } from "../config-CVssduLe.mjs";
-import { At as handleContentTranslations, Ct as handleContentGetIncludingTrashed, Dt as handleContentPublish, Et as handleContentPermanentDelete, G as sanitizeHeadersForSandbox, H as resolveExclusiveHooks, I as PluginRouteRegistry, K as getTrustedProxyHeaders, L as DEV_CONSOLE_EMAIL_PLUGIN_ID, Mt as handleContentUnschedule, Nt as handleContentUpdate, Ot as handleContentRestore, Pt as validateRev, R as devConsoleEmailDeliver, St as handleContentGet, Tt as handleContentListTrashed, U as CronExecutor, V as createHookPipeline, W as extractRequestMeta, X as after, _t as handleContentCountTrashed, bt as handleContentDiscardDraft, ct as handleMediaGet, dt as handleRevisionGet, ft as handleRevisionList, gt as handleContentCountScheduled, ht as handleContentCompare, it as PluginStateRepository, jt as handleContentUnpublish, kt as handleContentSchedule, lt as handleMediaList, ot as handleMediaCreate, pt as handleRevisionRestore, q as definePlugin, st as handleMediaDelete, tt as loadBundleFromR2, ut as handleMediaUpdate, vt as handleContentCreate, wt as handleContentList, xt as handleContentDuplicate, yt as handleContentDelete, z as EmailPipeline } from "../search-DkN-BqsS.mjs";
-import { r as RevisionRepository } from "../content-C7G4QXkK.mjs";
+import { At as handleContentTranslations, Ct as handleContentGetIncludingTrashed, Dt as handleContentPublish, Et as handleContentPermanentDelete, G as sanitizeHeadersForSandbox, H as resolveExclusiveHooks, I as PluginRouteRegistry, K as getTrustedProxyHeaders, L as DEV_CONSOLE_EMAIL_PLUGIN_ID, Mt as handleContentUnschedule, Nt as handleContentUpdate, Ot as handleContentRestore, Pt as validateRev, R as devConsoleEmailDeliver, St as handleContentGet, Tt as handleContentListTrashed, U as CronExecutor, V as createHookPipeline, W as extractRequestMeta, X as after, _t as handleContentCountTrashed, bt as handleContentDiscardDraft, ct as handleMediaGet, dt as handleRevisionGet, ft as handleRevisionList, gt as handleContentCountScheduled, ht as handleContentCompare, it as PluginStateRepository, jt as handleContentUnpublish, kt as handleContentSchedule, lt as handleMediaList, ot as handleMediaCreate, pt as handleRevisionRestore, q as definePlugin, st as handleMediaDelete, tt as loadBundleFromR2, ut as handleMediaUpdate, vt as handleContentCreate, wt as handleContentList, xt as handleContentDuplicate, yt as handleContentDelete, z as EmailPipeline } from "../search-DuWhx4NG.mjs";
+import { r as RevisionRepository } from "../content-CERxPUN0.mjs";
 import "../base64-MBPo9ozB.mjs";
 import "../types-BIgulNsW.mjs";
-import { t as MediaRepository } from "../media-D8FbNsl0.mjs";
-import "../taxonomy-DSxx2K2L.mjs";
+import { t as MediaRepository } from "../media-1fFhub9c.mjs";
+import "../taxonomy-D6NvlKo8.mjs";
 import { t as OptionsRepository } from "../options-nPxWnrya.mjs";
 import "../redirect-C5H7VGIX.mjs";
-import "../byline-C3vnhIpU.mjs";
+import "../byline-gFn1r0vA.mjs";
 import { n as normalizeMediaValue } from "../placeholder-Ci0RLeCk.mjs";
-import { r as hashString } from "../zod-generator-BNJDQBSZ.mjs";
-import { i as FTSManager, n as SchemaRegistry } from "../registry-Beb7wxFc.mjs";
-import { r as getDb } from "../loader-Bx2_9-5e.mjs";
-import { n as requestCached } from "../request-cache-C-tIpYIw.mjs";
-import "../apply-UsrFuO7l.mjs";
-import "../taxonomies-CTtewrSQ.mjs";
+import { n as requestCached } from "../request-cache-D4I69LeL.mjs";
+import { r as hashString } from "../zod-generator-CHnJUP2l.mjs";
+import { i as FTSManager, n as SchemaRegistry } from "../registry-Do34mz_P.mjs";
+import { r as getDb } from "../loader-ou_PXAjg.mjs";
+import "../apply-Ded_1vng.mjs";
+import "../taxonomies-Bw76xAxo.mjs";
 import { r as normalizeManifestRoute } from "../manifest-schema-CXAbd1vH.mjs";
-import "../types-CoO6mpV3.mjs";
+import "../types-DiI8NOG_.mjs";
 import "../error-DqnRMM5z.mjs";
-import { a as invalidateUrlPatternCache } from "../query-Bo-msrmu.mjs";
+import { a as invalidateUrlPatternCache } from "../query-8c_meo_K.mjs";
 import "../tokens-CyRDPVW2.mjs";
-import "../bylines-esI7ioa9.mjs";
-import "../load-sXRuM7Us.mjs";
+import "../bylines-DTFI8nDM.mjs";
+import "../load-DR1VwFXR.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-CMD42IRC.mjs";
+import { n as VERSION, t as COMMIT } from "../version-Bg31I_Ff.mjs";
 import { t as getAuthMode } from "../mode-YhqNVef_.mjs";
 import { a as validateEncryptionKeyAtStartup } from "../secrets-CZ8rxLX3.mjs";
 import { Kysely, sql } from "kysely";
@@ -801,9 +801,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-UsrFuO7l.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-sXRuM7Us.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-CBIbxM3L.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-Ded_1vng.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-DR1VwFXR.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-UK4Ja1uo.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -983,13 +983,14 @@ var EmDashRuntime = class EmDashRuntime {
 						label: field.label,
 						required: field.required
 					};
+					entry.id = field.id;
 					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)
 					}));
-					if (field.type === "repeater" && field.validation) entry.validation = field.validation;
+					if ((field.type === "repeater" || field.type === "file" || field.type === "image") && field.validation) entry.validation = { ...field.validation };
 					fields[field.slug] = entry;
 				}
 				manifestCollections[collection.slug] = {
@@ -1188,7 +1189,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-B1NYiEos.mjs");
+		const { validateContentData } = await import("../validation-Vc5DQkJa.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1204,7 +1205,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-C7G4QXkK.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-CERxPUN0.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1231,7 +1232,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-B1NYiEos.mjs");
+			const { validateContentData } = await import("../validation-Vc5DQkJa.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -1873,6 +1874,49 @@ function finalizeResponse(response, serverTimings) {
 	}).join(", "));
 	return res;
 }
+/**
+* Append always-on counters (db.*, cache.*) to the Server-Timing list.
+*
+* dur values for `count`, `hit`, `miss` are integer counts — Server-Timing
+* spec only models milliseconds, but browsers show whatever number is given,
+* which is the convention most projects use for non-time samples.
+*/
+function pushMetricsTimings(timings, metrics) {
+	if (metrics.dbCount > 0) {
+		timings.push({
+			name: "db.total",
+			dur: metrics.dbTotalMs,
+			desc: "DB total"
+		});
+		timings.push({
+			name: "db.count",
+			dur: metrics.dbCount,
+			desc: "Query count"
+		});
+		if (metrics.dbFirstOffset !== null) timings.push({
+			name: "db.first",
+			dur: metrics.dbFirstOffset,
+			desc: "First query at"
+		});
+		if (metrics.dbLastOffset !== null) timings.push({
+			name: "db.last",
+			dur: metrics.dbLastOffset,
+			desc: "Last query at"
+		});
+	}
+	if (metrics.cacheHits + metrics.cacheMisses > 0) {
+		timings.push({
+			name: "cache.hit",
+			dur: metrics.cacheHits,
+			desc: "Cache hits"
+		});
+		timings.push({
+			name: "cache.miss",
+			dur: metrics.cacheMisses,
+			desc: "Cache misses"
+		});
+	}
+}
 /** 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$/;
@@ -1893,6 +1937,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 		if (virtualConfig.authProviders.some((p) => p.routes?.some((r) => r.pattern && url.pathname === r.pattern))) return finalizeResponse(await next());
 	}
 	const queryRecorder = isInstrumentationEnabled() ? createRecorder(url.pathname, request.method, request.headers.get("x-perf-phase") ?? "default") : void 0;
+	const metrics = createRequestMetrics(performance.now());
 	const run = async () => {
 		const isEmDashRoute = url.pathname.startsWith("/_emdash");
 		const isPublicRuntimeRoute = PUBLIC_RUNTIME_ROUTES.has(url.pathname) || SITEMAP_COLLECTION_RE.test(url.pathname);
@@ -1908,7 +1953,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (!setupVerified) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-Bx2_9-5e.mjs").then((n) => n.i);
+						const { getDb } = await import("../loader-ou_PXAjg.mjs").then((n) => n.i);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						setupVerified = true;
 					} catch {
@@ -1960,6 +2005,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 						dur: performance.now() - mwStart,
 						desc: "Total middleware"
 					});
+					pushMetricsTimings(timings, metrics);
 					return finalizeResponse(response, timings);
 				};
 				if (anonScoped) {
@@ -1969,7 +2015,8 @@ const onRequest = defineMiddleware(async (context, next) => {
 						db: anonScoped.db
 					} : {
 						editMode: false,
-						db: anonScoped.db
+						db: anonScoped.db,
+						metrics
 					}, async () => {
 						const response = await runAnon();
 						anonScoped.commit();
@@ -2069,6 +2116,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 					dur: performance.now() - mwStart,
 					desc: "Total middleware"
 				});
+				pushMetricsTimings(timings, metrics);
 				return finalizeResponse(response, timings);
 			};
 			if (scoped) {
@@ -2078,7 +2126,8 @@ const onRequest = defineMiddleware(async (context, next) => {
 					db: scoped.db
 				} : {
 					editMode: false,
-					db: scoped.db
+					db: scoped.db,
+					metrics
 				}, async () => {
 					const response = await renderAndFinalize();
 					scoped.commit();
@@ -2098,20 +2147,21 @@ const onRequest = defineMiddleware(async (context, next) => {
 			} : {
 				editMode,
 				db: playgroundDb,
-				dbIsIsolated: true
+				dbIsIsolated: true,
+				metrics
 			}, doInit);
 		}
 		return doInit();
 	};
-	if (queryRecorder) try {
+	try {
 		return await runWithContext({
 			editMode: false,
-			queryRecorder
+			queryRecorder,
+			metrics
 		}, run);
 	} finally {
-		flushRecorder(queryRecorder);
+		if (queryRecorder) flushRecorder(queryRecorder);
 	}
-	return run();
 });
 
 //#endregion