emdash 0.32.0 → 0.34.0

package/dist/astro/index.d.mts

@@ -1,15 +1,15 @@
-import { i as ContentItem } from "../types-DqZVPILm.mjs";
-import "../options-aeIs8WFu.mjs";
-import "../types-84Bque3-.mjs";
-import { Et as ResolvedPlugin } from "../types-BQY7VYw6.mjs";
-import "../relations-DHFQGX0h.mjs";
-import { _i as MediaItem, _r as getStoredConfig, br as StorageDescriptor, hr as EmDashConfig, vr as LocalStorageConfig, yr as S3StorageConfig } from "../index-j9rTh3cp.mjs";
-import "../runner-CHdkERbt.mjs";
-import "../index-BeNto_Vs.mjs";
-import { i as ObjectCacheRuntimeConfig, r as ObjectCacheDescriptor } from "../types-DsAMyD_o.mjs";
-import "../types-Dr2GLlwu.mjs";
-import "../hreflang-CZbSx6Bg.mjs";
-import "../validate-CdYcY-Ln.mjs";
+import { i as ContentItem } from "../types-D4_1Ga4L.mjs";
+import "../options-DRe1pIBL.mjs";
+import "../types-CAGdePf3.mjs";
+import { Dt as ResolvedPlugin } from "../types-Cs-TFLNf.mjs";
+import "../relations-DItI3MN9.mjs";
+import { Ar as LocalStorageConfig, Dr as EmDashConfig, Mr as StorageDescriptor, jr as S3StorageConfig, ki as MediaItem, kr as getStoredConfig } from "../index-C3Y-rsyN.mjs";
+import "../runner-CgQbELYC.mjs";
+import "../index-Cof4-Fab.mjs";
+import { i as ObjectCacheRuntimeConfig, r as ObjectCacheDescriptor } from "../types-X0MThr7x.mjs";
+import "../types-DefV3OiO.mjs";
+import "../hreflang-D3Uehfv2.mjs";
+import "../validate-DeGtBN84.mjs";
 import { EmDashHandlers, EmDashManifest, ManifestCollection } from "./types.mjs";
 import { AstroIntegration } from "astro";
 

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/astro/storage/adapters.ts","../../src/astro/object-cache/adapters.ts","../../src/astro/integration/index.ts"],"mappings":";;;;;;;;;;;;;;;;;AAkFA;;;;;;;;;;;;AC3DA;;;;;AAqBA;;;;;;;;;;;;iBDiBgB,EAAA,CAAG,MAAA,GAAQ,OAAA,CAAQ,eAAA,IAAwB,iBAAA;;;;;;;;;;;;;;;iBAqB3C,KAAA,CAAM,MAAA,EAAQ,kBAAA,GAAqB,iBAAA;;;;UC3DlC,kBAAA,SAA2B,wBAAA;EDsCgC;;;;ECjC3E,UAAA;AAAA;;;ADsDD;;;;;;;;;;;iBCtCgB,WAAA,CAAY,OAAA,GAAS,kBAAA,GAA0B,qBAAA;;;;;;iBCsN/C,MAAA,CAAO,MAAA,GAAQ,YAAA,GAAoB,gBAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/astro/storage/adapters.ts","../../src/astro/object-cache/adapters.ts","../../src/astro/integration/index.ts"],"mappings":";;;;;;;;;;;;;;;;;AAkFA;;;;;;;;;;;;AC3DA;;;;;AAqBA;;;;;;;;;;;;iBDiBgB,EAAA,CAAG,MAAA,GAAQ,OAAA,CAAQ,eAAA,IAAwB,iBAAA;;;;;;;;;;;;;;;iBAqB3C,KAAA,CAAM,MAAA,EAAQ,kBAAA,GAAqB,iBAAA;;;;UC3DlC,kBAAA,SAA2B,wBAAA;EDsCgC;;;;ECjC3E,UAAA;AAAA;;;ADsDD;;;;;;;;;;;iBCtCgB,WAAA,CAAY,OAAA,GAAS,kBAAA,GAA0B,qBAAA;;;;;;iBC0Q/C,MAAA,CAAO,MAAA,GAAQ,YAAA,GAAoB,gBAAA"}

package/dist/astro/index.mjs

@@ -1,7 +1,7 @@
-import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-C-SHXmra.mjs";
-import { t as defaultSeed } from "../default-C4v9KP56.mjs";
-import { n as validateAllowedOrigins, r as validateOriginShape } from "../allowed-origins-CCEi9bPI.mjs";
-import { n as VERSION, t as COMMIT } from "../version-Bdfb34kk.mjs";
+import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-Bc-s_r-a.mjs";
+import { t as defaultSeed } from "../default-DdDl3fxv.mjs";
+import { n as validateAllowedOrigins, r as validateOriginShape } from "../allowed-origins-DW7sYyqg.mjs";
+import { n as VERSION, t as COMMIT } from "../version-x0NjTScG.mjs";
 import { createRequire } from "node:module";
 import { fontProviders } from "astro/config";
 import { existsSync, readFileSync } from "node:fs";
@@ -408,6 +408,22 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/admin/media-usage/repair",
 		entrypoint: resolveRoute("api/admin/media-usage/repair.ts")
 	});
+	injectRoute({
+		pattern: "/_emdash/api/admin/media-usage/work",
+		entrypoint: resolveRoute("api/admin/media-usage/work/index.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/admin/media-usage/work/retry",
+		entrypoint: resolveRoute("api/admin/media-usage/work/retry.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/admin/media-usage/collection-deletions",
+		entrypoint: resolveRoute("api/admin/media-usage/collection-deletions/index.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/admin/media-usage/collection-deletions/retry",
+		entrypoint: resolveRoute("api/admin/media-usage/collection-deletions/retry.ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/import/probe",
 		entrypoint: resolveRoute("api/import/probe.ts")
@@ -456,6 +472,10 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/schema/collections",
 		entrypoint: resolveRoute("api/schema/collections/index.ts")
 	});
+	injectRoute({
+		pattern: "/_emdash/api/schema/collections/reorder",
+		entrypoint: resolveRoute("api/schema/collections/reorder.ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/schema/collections/[slug]",
 		entrypoint: resolveRoute("api/schema/collections/[slug]/index.ts")
@@ -512,6 +532,18 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/_emdash/api/taxonomies",
 		entrypoint: resolveRoute("api/taxonomies/index.ts")
 	});
+	injectRoute({
+		pattern: "/_emdash/api/taxonomies/[name]",
+		entrypoint: resolveRoute("api/taxonomies/[name].ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/taxonomies/[name]/translations",
+		entrypoint: resolveRoute("api/taxonomies/[name]/translations.ts")
+	});
+	injectRoute({
+		pattern: "/_emdash/api/taxonomies/[name]/reorder",
+		entrypoint: resolveRoute("api/taxonomies/[name]/reorder.ts")
+	});
 	injectRoute({
 		pattern: "/_emdash/api/taxonomies/[name]/terms",
 		entrypoint: resolveRoute("api/taxonomies/[name]/terms/index.ts")
@@ -848,7 +880,7 @@ function injectCoreRoutes(injectRoute, options = {}) {
 		pattern: "/sitemap.xml",
 		entrypoint: resolveRoute("sitemap.xml.ts")
 	});
-	injectRoute({
+	if (!options.srcDir || !hasUserDefinedPublicRoute(options.srcDir, "sitemap-[collection].xml")) injectRoute({
 		pattern: "/sitemap-[collection].xml",
 		entrypoint: resolveRoute("sitemap-[collection].xml.ts")
 	});
@@ -1048,6 +1080,8 @@ const VIRTUAL_SCHEDULER_ID = "virtual:emdash/scheduler";
 const RESOLVED_VIRTUAL_SCHEDULER_ID = "\0" + VIRTUAL_SCHEDULER_ID;
 const VIRTUAL_ENV_ID = "virtual:emdash/env";
 const RESOLVED_VIRTUAL_ENV_ID = "\0" + VIRTUAL_ENV_ID;
+const VIRTUAL_BUILD_ID = "virtual:emdash/build";
+const RESOLVED_VIRTUAL_BUILD_ID = "\0" + VIRTUAL_BUILD_ID;
 /**
 * Generates the config virtual module.
 */
@@ -1068,26 +1102,30 @@ function generateConfigModule(serializableConfig) {
 * exist on SQLite, libSQL, PostgreSQL, or other adapters.
 */
 function generateDialectModule(opts) {
-	const { entrypoint, supportsRequestScope, supportsCoalescing } = opts;
+	const { entrypoint, supportsRequestScope, supportsCoalescing, supportsCollectionDeletionGuard } = opts;
 	if (!entrypoint) return [
 		`export const createDialect = undefined;`,
 		`export const dialectType = "sqlite";`,
 		`export const createRequestScopedDb = (_opts) => null;`,
-		`export const createCoalescingDialect = undefined;`
+		`export const createCoalescingDialect = undefined;`,
+		`export const executeCollectionDeletionGuard = undefined;`
 	].join("\n");
 	const type = opts.type ?? "sqlite";
 	const coalescingExport = supportsCoalescing ? `import { createCoalescingDialect as _createCoalescingDialect } from "${entrypoint}";
 export const createCoalescingDialect = _createCoalescingDialect;` : `export const createCoalescingDialect = undefined;`;
+	const collectionDeletionExport = supportsCollectionDeletionGuard ? `export { executeCollectionDeletionGuard } from "${entrypoint}";` : `export const executeCollectionDeletionGuard = undefined;`;
 	if (supportsRequestScope) return `
 import { createDialect as _createDialect } from "${entrypoint}";
 export { createRequestScopedDb } from "${entrypoint}";
 ${coalescingExport}
+${collectionDeletionExport}
 export const createDialect = _createDialect;
 export const dialectType = ${JSON.stringify(type)};
 `;
 	return `
 import { createDialect as _createDialect } from "${entrypoint}";
 ${coalescingExport}
+${collectionDeletionExport}
 export const createDialect = _createDialect;
 export const dialectType = ${JSON.stringify(type)};
 export const createRequestScopedDb = (_opts) => null;
@@ -1358,6 +1396,18 @@ function generateEnvModule(adapterName) {
 	return `export const env = undefined;`;
 }
 /**
+* Generates the build virtual module.
+*
+* Content-hashed `/_astro/*` names make the response depend on the build, not
+* only on the content. Exposing the build timestamp lets the middleware fold
+* that dimension into the cache validator, so a code-only deploy stops
+* answering conditional requests with 304 while the assets the cached HTML
+* references are already gone.
+*/
+function generateBuildModule(buildTime) {
+	return `export const buildTime = ${buildTime};`;
+}
+/**
 * Generates the scheduler virtual module.
 *
 * Decides — at build time, from the Astro adapter — whether the runtime gets a
@@ -1462,6 +1512,8 @@ export const sandboxedPlugins = [];
     allowedHosts: ${JSON.stringify(descriptor.allowedHosts ?? [])},
     storage: ${JSON.stringify(descriptor.storage ?? {})},
     mcp: ${JSON.stringify(descriptor.mcp)},
+    routes: ${JSON.stringify(descriptor.routes ?? [])},
+    hooks: ${JSON.stringify(descriptor.hooks ?? [])},
     adminPages: ${JSON.stringify(descriptor.adminPages ?? [])},
     adminWidgets: ${JSON.stringify(descriptor.adminWidgets ?? [])},
     settingsSchema: ${JSON.stringify(descriptor.settingsSchema)},
@@ -1567,6 +1619,7 @@ function resolveIntegrationShim(fileName) {
 function createVirtualModulesPlugin(options, astroCommand) {
 	const { serializableConfig, resolvedConfig, pluginDescriptors, astroConfig } = options;
 	let viteCommand;
+	const buildTime = Date.now();
 	return {
 		name: "emdash-virtual-modules",
 		configResolved(config) {
@@ -1589,6 +1642,7 @@ function createVirtualModulesPlugin(options, astroCommand) {
 			if (id === VIRTUAL_WAIT_UNTIL_ID) return RESOLVED_VIRTUAL_WAIT_UNTIL_ID;
 			if (id === VIRTUAL_SCHEDULER_ID) return RESOLVED_VIRTUAL_SCHEDULER_ID;
 			if (id === VIRTUAL_ENV_ID) return RESOLVED_VIRTUAL_ENV_ID;
+			if (id === VIRTUAL_BUILD_ID) return RESOLVED_VIRTUAL_BUILD_ID;
 		},
 		load(id) {
 			if (id === RESOLVED_VIRTUAL_CONFIG_ID) return generateConfigModule(serializableConfig);
@@ -1596,7 +1650,8 @@ function createVirtualModulesPlugin(options, astroCommand) {
 				entrypoint: resolvedConfig.database?.entrypoint,
 				type: resolvedConfig.database?.type,
 				supportsRequestScope: resolvedConfig.database?.supportsRequestScope ?? false,
-				supportsCoalescing: resolvedConfig.database?.supportsCoalescing ?? false
+				supportsCoalescing: resolvedConfig.database?.supportsCoalescing ?? false,
+				supportsCollectionDeletionGuard: resolvedConfig.database?.supportsCollectionDeletionGuard ?? false
 			});
 			if (id === RESOLVED_VIRTUAL_STORAGE_ID) return generateStorageModule(resolvedConfig.storage?.entrypoint);
 			if (id === RESOLVED_VIRTUAL_OBJECT_CACHE_ID) return generateObjectCacheModule(resolvedConfig.objectCache?.entrypoint, resolvedConfig.objectCache?.config);
@@ -1622,6 +1677,7 @@ function createVirtualModulesPlugin(options, astroCommand) {
 				return generateSchedulerModule(astroConfig.adapter?.name, schedulerCommand);
 			}
 			if (id === RESOLVED_VIRTUAL_ENV_ID) return generateEnvModule(astroConfig.adapter?.name);
+			if (id === RESOLVED_VIRTUAL_BUILD_ID) return generateBuildModule(buildTime);
 		}
 	};
 }
@@ -1711,7 +1767,6 @@ function createViteConfig(options, command) {
 					"emdash > @unpic/placeholder",
 					"emdash > blurhash",
 					"emdash > croner",
-					"emdash > image-size",
 					"emdash > jose",
 					"emdash > jpeg-js",
 					"emdash > kysely",
@@ -1934,6 +1989,44 @@ function printDevServerInfo(baseUrl, mcpEnabled) {
 	console.log(`    ${dim("Skips passkey setup/auth and signs you in as a dev admin")}`);
 	console.log("");
 }
+function buildMiddlewareEntries(config, root) {
+	const entries = [];
+	if (config.middleware !== void 0) {
+		const configuredEntrypoint = config.middleware?.outer;
+		if (typeof configuredEntrypoint !== "string" && !(configuredEntrypoint instanceof URL) || typeof configuredEntrypoint === "string" && configuredEntrypoint.trim() === "") throw new Error("middleware.outer must be a non-empty module specifier string or URL.");
+		const entrypoint = typeof configuredEntrypoint === "string" && (configuredEntrypoint.startsWith("./") || configuredEntrypoint.startsWith("../")) ? new URL(configuredEntrypoint, root) : configuredEntrypoint;
+		entries.push({
+			entrypoint,
+			order: "pre"
+		});
+	}
+	if (config.playground) entries.push({
+		entrypoint: config.playground.middlewareEntrypoint,
+		order: "pre"
+	});
+	entries.push({
+		entrypoint: "emdash/middleware",
+		order: "pre"
+	}, {
+		entrypoint: "emdash/middleware/redirect",
+		order: "pre"
+	});
+	if (!config.playground) entries.push({
+		entrypoint: "emdash/middleware/setup",
+		order: "pre"
+	}, {
+		entrypoint: "emdash/middleware/auth",
+		order: "pre"
+	});
+	entries.push({
+		entrypoint: "emdash/middleware/media-usage-write-fence",
+		order: "pre"
+	}, {
+		entrypoint: "emdash/middleware/request-context",
+		order: "pre"
+	});
+	return entries;
+}
 /**
 * Create the EmDash Astro integration
 */
@@ -2065,32 +2158,7 @@ function emdash(config = {}) {
 				if (resolvedConfig.authProviders?.length) injectAuthProviderRoutes(injectRoute, resolvedConfig.authProviders);
 				if (!useExternalAuth) injectBuiltinAuthRoutes(injectRoute);
 				if (resolvedConfig.mcp !== false) injectMcpRoute(injectRoute);
-				if (resolvedConfig.playground) addMiddleware({
-					entrypoint: resolvedConfig.playground.middlewareEntrypoint,
-					order: "pre"
-				});
-				addMiddleware({
-					entrypoint: "emdash/middleware",
-					order: "pre"
-				});
-				addMiddleware({
-					entrypoint: "emdash/middleware/redirect",
-					order: "pre"
-				});
-				if (!resolvedConfig.playground) {
-					addMiddleware({
-						entrypoint: "emdash/middleware/setup",
-						order: "pre"
-					});
-					addMiddleware({
-						entrypoint: "emdash/middleware/auth",
-						order: "pre"
-					});
-				}
-				addMiddleware({
-					entrypoint: "emdash/middleware/request-context",
-					order: "pre"
-				});
+				for (const middleware of buildMiddlewareEntries(resolvedConfig, astroConfig.root)) addMiddleware(middleware);
 			},
 			"astro:config:done": ({ config: finalConfig, logger }) => {
 				const warning = missingReactIntegrationWarning(finalConfig.integrations);