emdash 1.3.0 → 1.4.0

package/dist/{artifacts-htGyfCSt.mjs → artifacts-Dvdp2KK-.mjs}

@@ -1,10 +1,11 @@
-import { d as __exportAll } from "./runner-C5NeAkBQ.mjs";
-import { n as isMissingTableError } from "./db-errors-CBD5yMro.mjs";
-import { t as after } from "./after-PcEvMY_6.mjs";
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-xC4UD5-S.mjs";
-import { t as withTransaction } from "./transaction-BVYIo_yu.mjs";
-import { t as RedirectRepository } from "./redirect-DiS_3mA4.mjs";
-import { n as invalidateRedirectCache } from "./cache-CEU9wo_h.mjs";
+import { f as __exportAll } from "./runner-Bkkfk4O8.mjs";
+import { r as isMissingTableError } from "./db-errors-unnO6yiZ.mjs";
+import { t as after } from "./after-32yNRvd2.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-DiW8VMwz.mjs";
+import { t as withTransaction } from "./transaction-CkoQ5wqQ.mjs";
+import { t as RedirectRepository } from "./redirect-DjLdw427.mjs";
+import { n as siteSettingsVersionQuery, t as normalizeSiteSettingsVersion } from "./version-DqB7LIO7.mjs";
+import { n as invalidateRedirectCache } from "./cache-5DHbpEWu.mjs";
 
 //#region src/redirects/artifacts.ts
 var artifacts_exports = /* @__PURE__ */ __exportAll({
@@ -183,22 +184,32 @@ function parseEntries(payload) {
 		return null;
 	}
 }
+function observeSiteSettingsVersion(callback, raw) {
+	if (!callback) return;
+	let version = null;
+	try {
+		if (raw) version = normalizeSiteSettingsVersion(raw);
+	} catch {}
+	callback(version);
+}
 /**
 * Loads and verifies the active generation. Returns null when nothing is
 * published, the generation is stale, or any artifact is missing, altered, or
 * out of place.
 */
-async function loadPublishedRedirects(db) {
+async function loadPublishedRedirects(db, onSiteSettingsVersion) {
 	const rows = await db.selectFrom("_emdash_redirect_state as state").leftJoin("_emdash_redirect_generation_artifacts as link", "link.generation", "state.generation").leftJoin("_emdash_redirect_artifacts as artifact", "artifact.digest", "link.digest").select([
 		"state.revision",
 		"state.generation",
 		"state.generation_revision",
+		...onSiteSettingsVersion ? [siteSettingsVersionQuery(db).as("site_settings_version")] : [],
 		"link.position",
 		"link.digest",
 		"artifact.kind",
 		"artifact.payload"
 	]).where("state.id", "=", 1).orderBy("link.position", "asc").execute();
 	const state = rows[0];
+	observeSiteSettingsVersion(onSiteSettingsVersion, state?.site_settings_version);
 	if (!state?.generation) return null;
 	if (Number(state.revision) > Number(state.generation_revision)) return null;
 	const exact = [];
@@ -277,14 +288,17 @@ function scheduleRedirectRepair(db) {
 * current and verifies, otherwise the rules table. Before the artifact tables exist the
 * rules table is read directly.
 */
-function createRedirectSource(db) {
+function createRedirectSource(db, onSiteSettingsVersion) {
 	return {
 		async load() {
 			let published;
 			try {
-				published = await loadPublishedRedirects(db);
+				published = await loadPublishedRedirects(db, onSiteSettingsVersion);
 			} catch (error) {
-				if (isMissingTableError(error)) return loadRulesTable(db);
+				if (isMissingTableError(error)) {
+					onSiteSettingsVersion?.(null);
+					return loadRulesTable(db);
+				}
 				throw error;
 			}
 			if (published) return published;
@@ -295,8 +309,10 @@ function createRedirectSource(db) {
 			const state = await db.selectFrom("_emdash_redirect_state").select([
 				"revision",
 				"generation",
-				"generation_revision"
+				"generation_revision",
+				...onSiteSettingsVersion ? [siteSettingsVersionQuery(db).as("site_settings_version")] : []
 			]).where("id", "=", 1).executeTakeFirst();
+			observeSiteSettingsVersion(onSiteSettingsVersion, state?.site_settings_version);
 			return state?.generation === version && Number(state.revision) <= Number(state.generation_revision);
 		}
 	};
@@ -304,4 +320,4 @@ function createRedirectSource(db) {
 
 //#endregion
 export { createRedirectSource as n, publishRedirectChanges as r, artifacts_exports as t };
-//# sourceMappingURL=artifacts-htGyfCSt.mjs.map
+//# sourceMappingURL=artifacts-Dvdp2KK-.mjs.map

package/dist/artifacts-Dvdp2KK-.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"artifacts-Dvdp2KK-.mjs","names":[],"sources":["../src/redirects/artifacts.ts"],"sourcesContent":["/**\n * Published redirect artifacts.\n *\n * Enabled redirect rules are published as compact, content-addressed JSON\n * artifacts grouped into a generation. The middleware loads the active\n * generation in one query and afterwards only polls the small state row, so a\n * site with many redirects never rescans `_emdash_redirects` on the read path.\n *\n * Exact rules are sharded by a hash of their source and pattern rules are\n * chunked in precedence order, so a single rule change usually rewrites one\n * artifact. Writers bump `_emdash_redirect_state.revision` through triggers.\n * A generation that is stale or fails verification is never served: readers\n * fall back to the rules table and schedule a repair.\n */\n\nimport type { Kysely } from \"kysely\";\n\nimport { after } from \"../after.js\";\nimport { RedirectRepository } from \"../database/repositories/redirect.js\";\nimport { withTransaction } from \"../database/transaction.js\";\nimport type { Database } from \"../database/types.js\";\nimport { normalizeSiteSettingsVersion, siteSettingsVersionQuery } from \"../settings/version.js\";\nimport { chunks, SQL_BATCH_SIZE } from \"../utils/chunks.js\";\nimport { isMissingTableError } from \"../utils/db-errors.js\";\nimport {\n\tinvalidateRedirectCache,\n\ttype RedirectRule,\n\ttype RedirectRuleSet,\n\ttype RedirectSource,\n} from \"./cache.js\";\n\ntype ArtifactKind = \"exact\" | \"pattern\";\ntype ArtifactEntry = [id: string, source: string, destination: string, type: number];\n\ninterface RedirectArtifact {\n\tdigest: string;\n\tkind: ArtifactKind;\n\tpayload: string;\n}\n\ninterface RuleRow {\n\tid: string;\n\tsource: string;\n\tdestination: string;\n\ttype: number;\n\tis_pattern: number;\n}\n\nconst ARTIFACT_TARGET_BYTES = 64 * 1024;\nconst GENERATION_PREFIX = \"emdash-redirects-v1\";\nconst REPAIR_LEASE_MS = 60_000;\n/** Three bound parameters per link row keeps each insert within D1's limit. */\nconst LINK_BATCH_SIZE = 30;\n\nconst encoder = new TextEncoder();\n\nasync function sha256Hex(value: string): Promise<string> {\n\tconst digest = await crypto.subtle.digest(\"SHA-256\", encoder.encode(value));\n\treturn Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, \"0\")).join(\"\");\n}\n\nfunction fnv1a(value: string): number {\n\tlet hash = 0x811c9dc5;\n\tfor (let i = 0; i < value.length; i++) {\n\t\thash ^= value.charCodeAt(i);\n\t\thash = Math.imul(hash, 0x01000193);\n\t}\n\treturn hash >>> 0;\n}\n\nfunction toEntry(rule: RedirectRule): ArtifactEntry {\n\treturn [rule.id, rule.source, rule.destination, rule.type];\n}\n\nfunction entryBytes(entry: ArtifactEntry): number {\n\treturn encoder.encode(JSON.stringify(entry)).byteLength + 1;\n}\n\nasync function createArtifact(kind: ArtifactKind, entries: ArtifactEntry[]) {\n\tconst payload = JSON.stringify(entries);\n\treturn { digest: await sha256Hex(`${kind}\\n${payload}`), kind, payload };\n}\n\nfunction generationId(digests: string[]): Promise<string> {\n\treturn sha256Hex([GENERATION_PREFIX, ...digests].join(\"\\n\"));\n}\n\n/** Splits enabled rows, in precedence order, into exact and pattern rules. */\nfunction toRuleSet(\n\trows: Array<RedirectRule & { isPattern: boolean }>,\n\tversion: string | null,\n): RedirectRuleSet {\n\tconst exact: RedirectRule[] = [];\n\tconst patterns: RedirectRule[] = [];\n\tfor (const { isPattern, ...rule } of rows) {\n\t\t(isPattern ? patterns : exact).push(rule);\n\t}\n\treturn { version, exact, patterns };\n}\n\n/**\n * Builds the artifacts for a rule set. Exact rules keep the last rule per\n * source, matching lookup semantics, and are sorted so the shards are\n * deterministic. Pattern rules keep precedence order across chunks.\n */\nasync function buildArtifacts(\n\trules: RedirectRuleSet,\n): Promise<{ generation: string; artifacts: RedirectArtifact[] }> {\n\tconst bySource = new Map<string, ArtifactEntry>();\n\tfor (const rule of rules.exact) bySource.set(rule.source, toEntry(rule));\n\tconst exact = [...bySource.values()].toSorted((a, b) => (a[1] < b[1] ? -1 : a[1] > b[1] ? 1 : 0));\n\tconst exactBytes = exact.reduce((total, entry) => total + entryBytes(entry), 0);\n\tconst shardCount = Math.max(1, Math.ceil(exactBytes / ARTIFACT_TARGET_BYTES));\n\tconst shards: ArtifactEntry[][] = Array.from({ length: shardCount }, () => []);\n\tfor (const entry of exact) shards[fnv1a(entry[1]) % shardCount].push(entry);\n\n\tconst artifacts: RedirectArtifact[] = [];\n\tfor (const shard of shards) {\n\t\tif (shard.length > 0) artifacts.push(await createArtifact(\"exact\", shard));\n\t}\n\n\tlet chunk: ArtifactEntry[] = [];\n\tlet chunkBytes = 0;\n\tfor (const rule of rules.patterns) {\n\t\tconst entry = toEntry(rule);\n\t\tconst bytes = entryBytes(entry);\n\t\tif (chunk.length > 0 && chunkBytes + bytes > ARTIFACT_TARGET_BYTES) {\n\t\t\tartifacts.push(await createArtifact(\"pattern\", chunk));\n\t\t\tchunk = [];\n\t\t\tchunkBytes = 0;\n\t\t}\n\t\tchunk.push(entry);\n\t\tchunkBytes += bytes;\n\t}\n\tif (chunk.length > 0) artifacts.push(await createArtifact(\"pattern\", chunk));\n\n\treturn {\n\t\tgeneration: await generationId(artifacts.map((artifact) => artifact.digest)),\n\t\tartifacts,\n\t};\n}\n\n/**\n * Publishes the enabled redirect rules as the active generation.\n *\n * The revision is read before the rules, so the published generation holds\n * at least the changes up to the revision it is labelled with. A publish at\n * the active revision replaces the active generation, which repairs a damaged\n * one; losing the compare-and-set to a newer revision leaves that publish\n * active.\n */\nexport async function publishRedirectArtifacts(db: Kysely<Database>): Promise<void> {\n\tconst state = await db\n\t\t.selectFrom(\"_emdash_redirect_state\")\n\t\t.select(\"revision\")\n\t\t.where(\"id\", \"=\", 1)\n\t\t.executeTakeFirst();\n\tif (!state) throw new Error(\"Redirect state row is missing\");\n\tconst revision = Number(state.revision);\n\n\tconst rows: RuleRow[] = await db\n\t\t.selectFrom(\"_emdash_redirects\")\n\t\t.select([\"id\", \"source\", \"destination\", \"type\", \"is_pattern\"])\n\t\t.where(\"enabled\", \"=\", 1)\n\t\t.orderBy(\"created_at\", (order) => order.asc().nullsFirst())\n\t\t.orderBy(\"id\", \"asc\")\n\t\t.execute();\n\tconst { generation, artifacts } = await buildArtifacts(\n\t\ttoRuleSet(\n\t\t\trows.map((row) => ({\n\t\t\t\tid: row.id,\n\t\t\t\tsource: row.source,\n\t\t\t\tdestination: row.destination,\n\t\t\t\ttype: Number(row.type),\n\t\t\t\tisPattern: Number(row.is_pattern) === 1,\n\t\t\t})),\n\t\t\tnull,\n\t\t),\n\t);\n\n\tawait withTransaction(db, async (trx) => {\n\t\tconst digests = [...new Set(artifacts.map((artifact) => artifact.digest))];\n\t\tconst stored = new Map<string, string>();\n\t\tfor (const batch of chunks(digests, SQL_BATCH_SIZE)) {\n\t\t\tconst found = await trx\n\t\t\t\t.selectFrom(\"_emdash_redirect_artifacts\")\n\t\t\t\t.select([\"digest\", \"kind\", \"payload\"])\n\t\t\t\t.where(\"digest\", \"in\", batch)\n\t\t\t\t.execute();\n\t\t\tfor (const row of found) stored.set(row.digest, `${row.kind}\\n${row.payload}`);\n\t\t}\n\t\tfor (const artifact of artifacts) {\n\t\t\tconst content = `${artifact.kind}\\n${artifact.payload}`;\n\t\t\tif (stored.get(artifact.digest) === content) continue;\n\t\t\tstored.set(artifact.digest, content);\n\t\t\t// A stored row that does not match its digest was damaged; rewrite it.\n\t\t\tawait trx\n\t\t\t\t.insertInto(\"_emdash_redirect_artifacts\")\n\t\t\t\t.values(artifact)\n\t\t\t\t.onConflict((conflict) =>\n\t\t\t\t\tconflict.column(\"digest\").doUpdateSet({ kind: artifact.kind, payload: artifact.payload }),\n\t\t\t\t)\n\t\t\t\t.execute();\n\t\t}\n\n\t\tconst links = artifacts.map((artifact, position) => ({\n\t\t\tgeneration,\n\t\t\tposition,\n\t\t\tdigest: artifact.digest,\n\t\t}));\n\t\tfor (const batch of chunks(links, LINK_BATCH_SIZE)) {\n\t\t\tawait trx\n\t\t\t\t.insertInto(\"_emdash_redirect_generation_artifacts\")\n\t\t\t\t.values(batch)\n\t\t\t\t.onConflict((conflict) =>\n\t\t\t\t\tconflict\n\t\t\t\t\t\t.columns([\"generation\", \"position\"])\n\t\t\t\t\t\t.doUpdateSet((eb) => ({ digest: eb.ref(\"excluded.digest\") })),\n\t\t\t\t)\n\t\t\t\t.execute();\n\t\t}\n\t\tawait trx\n\t\t\t.deleteFrom(\"_emdash_redirect_generation_artifacts\")\n\t\t\t.where(\"generation\", \"=\", generation)\n\t\t\t.where(\"position\", \">=\", links.length)\n\t\t\t.execute();\n\n\t\tconst activated = await trx\n\t\t\t.updateTable(\"_emdash_redirect_state\")\n\t\t\t.set({ generation, generation_revision: revision })\n\t\t\t.where(\"id\", \"=\", 1)\n\t\t\t.where(\"generation_revision\", \"<=\", revision)\n\t\t\t.executeTakeFirst();\n\t\tif (BigInt(activated.numUpdatedRows) === 0n) return;\n\n\t\t// Another publish may have activated since this one; keep the active generation.\n\t\tawait trx\n\t\t\t.deleteFrom(\"_emdash_redirect_generation_artifacts\")\n\t\t\t.where((eb) =>\n\t\t\t\teb(\n\t\t\t\t\t\"generation\",\n\t\t\t\t\t\"<>\",\n\t\t\t\t\teb.selectFrom(\"_emdash_redirect_state\").select(\"generation\").where(\"id\", \"=\", 1),\n\t\t\t\t),\n\t\t\t)\n\t\t\t.execute();\n\t\tawait trx\n\t\t\t.deleteFrom(\"_emdash_redirect_artifacts\")\n\t\t\t.where(({ exists, not, selectFrom }) =>\n\t\t\t\tnot(\n\t\t\t\t\texists(\n\t\t\t\t\t\tselectFrom(\"_emdash_redirect_generation_artifacts\")\n\t\t\t\t\t\t\t.select(\"_emdash_redirect_generation_artifacts.digest\")\n\t\t\t\t\t\t\t.whereRef(\n\t\t\t\t\t\t\t\t\"_emdash_redirect_generation_artifacts.digest\",\n\t\t\t\t\t\t\t\t\"=\",\n\t\t\t\t\t\t\t\t\"_emdash_redirect_artifacts.digest\",\n\t\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t\t)\n\t\t\t.execute();\n\t});\n}\n\n/**\n * Publishes after a redirect write, then invalidates this isolate's cache. A\n * failed publish is logged rather than failing the write: readers fall back\n * to the rules table and repair the stale generation.\n */\nexport async function publishRedirectChanges(db: Kysely<Database>): Promise<void> {\n\ttry {\n\t\tawait publishRedirectArtifacts(db);\n\t} catch (error) {\n\t\tconsole.error(\"[emdash:redirects] publishing redirect artifacts failed:\", error);\n\t}\n\tinvalidateRedirectCache();\n}\n\nfunction isArtifactEntry(value: unknown): value is ArtifactEntry {\n\treturn (\n\t\tArray.isArray(value) &&\n\t\tvalue.length === 4 &&\n\t\ttypeof value[0] === \"string\" &&\n\t\ttypeof value[1] === \"string\" &&\n\t\ttypeof value[2] === \"string\" &&\n\t\ttypeof value[3] === \"number\"\n\t);\n}\n\nfunction parseEntries(payload: string): ArtifactEntry[] | null {\n\ttry {\n\t\tconst parsed: unknown = JSON.parse(payload);\n\t\treturn Array.isArray(parsed) && parsed.every(isArtifactEntry) ? parsed : null;\n\t} catch {\n\t\treturn null;\n\t}\n}\n\nfunction observeSiteSettingsVersion(\n\tcallback: ((version: string | null) => void) | undefined,\n\traw: string | null | undefined,\n): void {\n\tif (!callback) return;\n\tlet version: string | null = null;\n\ttry {\n\t\tif (raw) version = normalizeSiteSettingsVersion(raw);\n\t} catch {\n\t\t// A failed settings check must not prevent valid redirects from loading.\n\t}\n\tcallback(version);\n}\n\n/**\n * Loads and verifies the active generation. Returns null when nothing is\n * published, the generation is stale, or any artifact is missing, altered, or\n * out of place.\n */\nasync function loadPublishedRedirects(\n\tdb: Kysely<Database>,\n\tonSiteSettingsVersion?: (version: string | null) => void,\n): Promise<RedirectRuleSet | null> {\n\tconst rows = await db\n\t\t.selectFrom(\"_emdash_redirect_state as state\")\n\t\t.leftJoin(\n\t\t\t\"_emdash_redirect_generation_artifacts as link\",\n\t\t\t\"link.generation\",\n\t\t\t\"state.generation\",\n\t\t)\n\t\t.leftJoin(\"_emdash_redirect_artifacts as artifact\", \"artifact.digest\", \"link.digest\")\n\t\t.select([\n\t\t\t\"state.revision\",\n\t\t\t\"state.generation\",\n\t\t\t\"state.generation_revision\",\n\t\t\t...(onSiteSettingsVersion ? [siteSettingsVersionQuery(db).as(\"site_settings_version\")] : []),\n\t\t\t\"link.position\",\n\t\t\t\"link.digest\",\n\t\t\t\"artifact.kind\",\n\t\t\t\"artifact.payload\",\n\t\t])\n\t\t.where(\"state.id\", \"=\", 1)\n\t\t.orderBy(\"link.position\", \"asc\")\n\t\t.execute();\n\n\tconst state = rows[0];\n\tobserveSiteSettingsVersion(onSiteSettingsVersion, state?.site_settings_version);\n\tif (!state?.generation) return null;\n\tif (Number(state.revision) > Number(state.generation_revision)) return null;\n\n\tconst exact: RedirectRule[] = [];\n\tconst patterns: RedirectRule[] = [];\n\tconst digests: string[] = [];\n\tconst links = rows.filter((row) => row.position !== null);\n\tfor (const [index, link] of links.entries()) {\n\t\tif (\n\t\t\tNumber(link.position) !== index ||\n\t\t\t!link.digest ||\n\t\t\tlink.payload === null ||\n\t\t\t(link.kind !== \"exact\" && link.kind !== \"pattern\")\n\t\t) {\n\t\t\treturn null;\n\t\t}\n\t\tif ((await sha256Hex(`${link.kind}\\n${link.payload}`)) !== link.digest) {\n\t\t\treturn null;\n\t\t}\n\t\tconst entries = parseEntries(link.payload);\n\t\tif (!entries) return null;\n\t\tconst target = link.kind === \"exact\" ? exact : patterns;\n\t\tfor (const [id, source, destination, type] of entries) {\n\t\t\ttarget.push({ id, source, destination, type });\n\t\t}\n\t\tdigests.push(link.digest);\n\t}\n\tif ((await generationId(digests)) !== state.generation) return null;\n\n\treturn { version: state.generation, exact, patterns };\n}\n\nasync function loadRulesTable(db: Kysely<Database>): Promise<RedirectRuleSet> {\n\tconst redirects = await new RedirectRepository(db).findAllEnabled();\n\treturn toRuleSet(\n\t\tredirects.map(({ id, source, destination, type, isPattern }) => ({\n\t\t\tid,\n\t\t\tsource,\n\t\t\tdestination,\n\t\t\ttype,\n\t\t\tisPattern,\n\t\t})),\n\t\tnull,\n\t);\n}\n\ninterface RepairState {\n\trunningUntil: number;\n}\n\nconst REPAIR_STATE_KEY = Symbol.for(\"emdash:redirect-artifact-repair\");\nconst g = globalThis as Record<symbol, unknown>;\nconst repairState: RepairState =\n\t// eslint-disable-next-line typescript/no-unsafe-type-assertion -- globalThis singleton pattern (see request-context.ts)\n\t(g[REPAIR_STATE_KEY] as RepairState | undefined) ??\n\t(() => {\n\t\tconst state: RepairState = { runningUntil: 0 };\n\t\tg[REPAIR_STATE_KEY] = state;\n\t\treturn state;\n\t})();\n\n/**\n * Republishes the artifacts under a database lease so one isolate repairs a\n * stale or damaged generation while the others keep serving.\n */\nasync function repairRedirectArtifacts(db: Kysely<Database>): Promise<void> {\n\tconst now = Date.now();\n\tconst expiresAt = now + REPAIR_LEASE_MS;\n\tconst lease = await db\n\t\t.updateTable(\"_emdash_redirect_state\")\n\t\t.set({ repair_expires_at: expiresAt })\n\t\t.where(\"id\", \"=\", 1)\n\t\t.where(\"repair_expires_at\", \"<\", now)\n\t\t.executeTakeFirst();\n\tif (BigInt(lease.numUpdatedRows) === 0n) return;\n\ttry {\n\t\tawait publishRedirectArtifacts(db);\n\t} finally {\n\t\tawait db\n\t\t\t.updateTable(\"_emdash_redirect_state\")\n\t\t\t.set({ repair_expires_at: 0 })\n\t\t\t.where(\"id\", \"=\", 1)\n\t\t\t.where(\"repair_expires_at\", \"=\", expiresAt)\n\t\t\t.execute();\n\t}\n}\n\nfunction scheduleRedirectRepair(db: Kysely<Database>): void {\n\tconst now = Date.now();\n\tif (repairState.runningUntil > now) return;\n\tconst runningUntil = now + REPAIR_LEASE_MS;\n\trepairState.runningUntil = runningUntil;\n\tafter(async () => {\n\t\ttry {\n\t\t\tawait repairRedirectArtifacts(db);\n\t\t} catch (error) {\n\t\t\tconsole.error(\"[emdash:redirects] repairing redirect artifacts failed:\", error);\n\t\t} finally {\n\t\t\tif (repairState.runningUntil === runningUntil) repairState.runningUntil = 0;\n\t\t}\n\t});\n}\n\n/**\n * The rule source the middleware caches: the published generation when it is\n * current and verifies, otherwise the rules table. Before the artifact tables exist the\n * rules table is read directly.\n */\nexport function createRedirectSource(\n\tdb: Kysely<Database>,\n\tonSiteSettingsVersion?: (version: string | null) => void,\n): RedirectSource {\n\treturn {\n\t\tasync load() {\n\t\t\tlet published: RedirectRuleSet | null;\n\t\t\ttry {\n\t\t\t\tpublished = await loadPublishedRedirects(db, onSiteSettingsVersion);\n\t\t\t} catch (error) {\n\t\t\t\tif (isMissingTableError(error)) {\n\t\t\t\t\tonSiteSettingsVersion?.(null);\n\t\t\t\t\treturn loadRulesTable(db);\n\t\t\t\t}\n\t\t\t\tthrow error;\n\t\t\t}\n\t\t\tif (published) return published;\n\t\t\tscheduleRedirectRepair(db);\n\t\t\treturn loadRulesTable(db);\n\t\t},\n\t\tasync isCurrent(version) {\n\t\t\tconst state = await db\n\t\t\t\t.selectFrom(\"_emdash_redirect_state\")\n\t\t\t\t.select([\n\t\t\t\t\t\"revision\",\n\t\t\t\t\t\"generation\",\n\t\t\t\t\t\"generation_revision\",\n\t\t\t\t\t...(onSiteSettingsVersion\n\t\t\t\t\t\t? [siteSettingsVersionQuery(db).as(\"site_settings_version\")]\n\t\t\t\t\t\t: []),\n\t\t\t\t])\n\t\t\t\t.where(\"id\", \"=\", 1)\n\t\t\t\t.executeTakeFirst();\n\t\t\tobserveSiteSettingsVersion(onSiteSettingsVersion, state?.site_settings_version);\n\t\t\treturn (\n\t\t\t\tstate?.generation === version && Number(state.revision) <= Number(state.generation_revision)\n\t\t\t);\n\t\t},\n\t};\n}\n"],"mappings":"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"}

package/dist/astro/image-endpoint.mjs

@@ -39,16 +39,24 @@ const GET = async (ctx) => {
 	if (!key || !storage) return GET$1(ctx);
 	const service = await getConfiguredImageService();
 	if (!("transform" in service)) return GET$1(ctx);
+	let unusedBody;
 	try {
 		const source = await storage.download(key);
+		unusedBody = source.body;
 		if (!source.contentType.startsWith("image/")) {
 			if (isNotModified(ctx.request, source.size, source.lastModified)) return notModifiedResponse(source.contentType, source.size, source.lastModified);
-			return streamOriginal(source.body, source.contentType, source.size, source.lastModified);
+			const response = streamOriginal(source.body, source.contentType, source.size, source.lastModified);
+			if (ctx.request.method === "HEAD") return new Response(null, response);
+			unusedBody = void 0;
+			return response;
 		}
 		const transform = await service.parseURL(url, imageConfig);
 		if (!transform) {
 			if (isNotModified(ctx.request, source.size, source.lastModified)) return notModifiedResponse(source.contentType, source.size, source.lastModified);
-			return streamOriginal(source.body, source.contentType, source.size, source.lastModified);
+			const response = streamOriginal(source.body, source.contentType, source.size, source.lastModified);
+			if (ctx.request.method === "HEAD") return new Response(null, response);
+			unusedBody = void 0;
+			return response;
 		}
 		const fingerprint = getTransformFingerprint(url.searchParams);
 		if (isNotModified(ctx.request, source.size, source.lastModified, fingerprint)) return notModifiedResponse(source.contentType, source.size, source.lastModified, fingerprint);
@@ -67,6 +75,8 @@ const GET = async (ctx) => {
 		if (isNotFound(error)) return new Response("Not Found", { status: 404 });
 		console.error("[emdash] image transform failed:", error);
 		return new Response("Internal Server Error", { status: 500 });
+	} finally {
+		if (unusedBody && !unusedBody.locked) await unusedBody.cancel().catch(() => void 0);
 	}
 };
 

package/dist/astro/image-endpoint.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"image-endpoint.mjs","names":["genericGET"],"sources":["../../src/astro/image-endpoint.ts"],"sourcesContent":["/**\n * Node image endpoint -- the `image.endpoint` EmDash installs on non-Cloudflare\n * platforms whose image service is local (sharp).\n *\n * It wraps Astro's generic endpoint: for an EmDash media URL it loads the source\n * bytes straight from the storage adapter (no HTTP, so it works behind any auth\n * gate) and runs the configured image service's `transform`; every other image\n * is delegated to the stock endpoint unchanged.\n */\n\nimport type { APIRoute } from \"astro\";\n// @ts-ignore - astro/assets internal endpoint, resolved by the consumer's Astro build\nimport { GET as genericGET } from \"astro/assets/endpoint/generic\";\n// @ts-ignore - astro:assets is resolved by the consumer's Astro build\nimport { getConfiguredImageService, imageConfig } from \"astro:assets\";\n\nimport {\n\tgetTransformFingerprint,\n\tmatchInternalMediaKey,\n\tMUTABLE_MEDIA_CACHE_CONTROL,\n\toriginalMediaHeaders,\n\tvalidatorHeaders,\n\tisNotModified,\n} from \"../media/image-endpoint.js\";\n\nexport const prerender = false;\n\nconst FORMAT_MIME: Record<string, string> = {\n\twebp: \"image/webp\",\n\tavif: \"image/avif\",\n\tpng: \"image/png\",\n\tjpeg: \"image/jpeg\",\n\tjpg: \"image/jpeg\",\n\tgif: \"image/gif\",\n};\n\nfunction isNotFound(error: unknown): boolean {\n\treturn (\n\t\terror instanceof Error &&\n\t\t(error.message.includes(\"not found\") || error.message.includes(\"NOT_FOUND\"))\n\t);\n}\n\nfunction streamOriginal(\n\tbody: ReadableStream<Uint8Array>,\n\tcontentType: string,\n\tsize: number,\n\tlastModified?: Date,\n): Response {\n\treturn new Response(body, {\n\t\tstatus: 200,\n\t\theaders: originalMediaHeaders(contentType, size, lastModified),\n\t});\n}\n\nfunction notModifiedResponse(\n\tcontentType: string,\n\tsize: number,\n\tlastModified?: Date,\n\tsuffix?: string,\n): Response {\n\treturn new Response(null, {\n\t\tstatus: 304,\n\t\theaders: {\n\t\t\t\"Content-Type\": contentType,\n\t\t\t\"Cache-Control\": MUTABLE_MEDIA_CACHE_CONTROL,\n\t\t\t\"X-Content-Type-Options\": \"nosniff\",\n\t\t\t...validatorHeaders(size, lastModified, suffix),\n\t\t},\n\t});\n}\n\nexport const GET: APIRoute = async (ctx) => {\n\tconst url = new URL(ctx.request.url);\n\tconst key = matchInternalMediaKey(url.searchParams.get(\"href\"));\n\tconst storage = ctx.locals.emdash?.storage;\n\n\t// Not EmDash media, or storage unavailable: let the stock endpoint handle it\n\t// (bundled assets, allowed remote, `publicUrl` media).\n\tif (!key || !storage) return genericGET(ctx);\n\n\tconst service = await getConfiguredImageService();\n\tif (!(\"transform\" in service)) return genericGET(ctx);\n\n\ttry {\n\t\tconst source = await storage.download(key);\n\n\t\t// Only raster images are transformable; serve anything else unchanged.\n\t\tif (!source.contentType.startsWith(\"image/\")) {\n\t\t\tif (isNotModified(ctx.request, source.size, source.lastModified)) {\n\t\t\t\treturn notModifiedResponse(source.contentType, source.size, source.lastModified);\n\t\t\t}\n\t\t\treturn streamOriginal(source.body, source.contentType, source.size, source.lastModified);\n\t\t}\n\n\t\tconst transform = await service.parseURL(url, imageConfig);\n\t\tif (!transform) {\n\t\t\tif (isNotModified(ctx.request, source.size, source.lastModified)) {\n\t\t\t\treturn notModifiedResponse(source.contentType, source.size, source.lastModified);\n\t\t\t}\n\t\t\treturn streamOriginal(source.body, source.contentType, source.size, source.lastModified);\n\t\t}\n\n\t\tconst fingerprint = getTransformFingerprint(url.searchParams);\n\t\tif (isNotModified(ctx.request, source.size, source.lastModified, fingerprint)) {\n\t\t\treturn notModifiedResponse(source.contentType, source.size, source.lastModified, fingerprint);\n\t\t}\n\n\t\tconst inputBuffer = new Uint8Array(await new Response(source.body).arrayBuffer());\n\t\tconst { data, format } = await service.transform(inputBuffer, transform, imageConfig);\n\n\t\treturn new Response(data, {\n\t\t\tstatus: 200,\n\t\t\theaders: {\n\t\t\t\t\"Content-Type\": FORMAT_MIME[format] ?? source.contentType,\n\t\t\t\t\"Cache-Control\": MUTABLE_MEDIA_CACHE_CONTROL,\n\t\t\t\t\"X-Content-Type-Options\": \"nosniff\",\n\t\t\t\t...validatorHeaders(source.size, source.lastModified, fingerprint),\n\t\t\t},\n\t\t});\n\t} catch (error) {\n\t\tif (isNotFound(error)) return new Response(\"Not Found\", { status: 404 });\n\t\tconsole.error(\"[emdash] image transform failed:\", error);\n\t\treturn new Response(\"Internal Server Error\", { status: 500 });\n\t}\n};\n"],"mappings":";;;;;AAyBA,MAAa,YAAY;AAEzB,MAAM,cAAsC;CAC3C,MAAM;CACN,MAAM;CACN,KAAK;CACL,MAAM;CACN,KAAK;CACL,KAAK;CACL;AAED,SAAS,WAAW,OAAyB;AAC5C,QACC,iBAAiB,UAChB,MAAM,QAAQ,SAAS,YAAY,IAAI,MAAM,QAAQ,SAAS,YAAY;;AAI7E,SAAS,eACR,MACA,aACA,MACA,cACW;AACX,QAAO,IAAI,SAAS,MAAM;EACzB,QAAQ;EACR,SAAS,qBAAqB,aAAa,MAAM,aAAa;EAC9D,CAAC;;AAGH,SAAS,oBACR,aACA,MACA,cACA,QACW;AACX,QAAO,IAAI,SAAS,MAAM;EACzB,QAAQ;EACR,SAAS;GACR,gBAAgB;GAChB,iBAAiB;GACjB,0BAA0B;GAC1B,GAAG,iBAAiB,MAAM,cAAc,OAAO;GAC/C;EACD,CAAC;;AAGH,MAAa,MAAgB,OAAO,QAAQ;CAC3C,MAAM,MAAM,IAAI,IAAI,IAAI,QAAQ,IAAI;CACpC,MAAM,MAAM,sBAAsB,IAAI,aAAa,IAAI,OAAO,CAAC;CAC/D,MAAM,UAAU,IAAI,OAAO,QAAQ;AAInC,KAAI,CAAC,OAAO,CAAC,QAAS,QAAOA,MAAW,IAAI;CAE5C,MAAM,UAAU,MAAM,2BAA2B;AACjD,KAAI,EAAE,eAAe,SAAU,QAAOA,MAAW,IAAI;AAErD,KAAI;EACH,MAAM,SAAS,MAAM,QAAQ,SAAS,IAAI;AAG1C,MAAI,CAAC,OAAO,YAAY,WAAW,SAAS,EAAE;AAC7C,OAAI,cAAc,IAAI,SAAS,OAAO,MAAM,OAAO,aAAa,CAC/D,QAAO,oBAAoB,OAAO,aAAa,OAAO,MAAM,OAAO,aAAa;AAEjF,UAAO,eAAe,OAAO,MAAM,OAAO,aAAa,OAAO,MAAM,OAAO,aAAa;;EAGzF,MAAM,YAAY,MAAM,QAAQ,SAAS,KAAK,YAAY;AAC1D,MAAI,CAAC,WAAW;AACf,OAAI,cAAc,IAAI,SAAS,OAAO,MAAM,OAAO,aAAa,CAC/D,QAAO,oBAAoB,OAAO,aAAa,OAAO,MAAM,OAAO,aAAa;AAEjF,UAAO,eAAe,OAAO,MAAM,OAAO,aAAa,OAAO,MAAM,OAAO,aAAa;;EAGzF,MAAM,cAAc,wBAAwB,IAAI,aAAa;AAC7D,MAAI,cAAc,IAAI,SAAS,OAAO,MAAM,OAAO,cAAc,YAAY,CAC5E,QAAO,oBAAoB,OAAO,aAAa,OAAO,MAAM,OAAO,cAAc,YAAY;EAG9F,MAAM,cAAc,IAAI,WAAW,MAAM,IAAI,SAAS,OAAO,KAAK,CAAC,aAAa,CAAC;EACjF,MAAM,EAAE,MAAM,WAAW,MAAM,QAAQ,UAAU,aAAa,WAAW,YAAY;AAErF,SAAO,IAAI,SAAS,MAAM;GACzB,QAAQ;GACR,SAAS;IACR,gBAAgB,YAAY,WAAW,OAAO;IAC9C,iBAAiB;IACjB,0BAA0B;IAC1B,GAAG,iBAAiB,OAAO,MAAM,OAAO,cAAc,YAAY;IAClE;GACD,CAAC;UACM,OAAO;AACf,MAAI,WAAW,MAAM,CAAE,QAAO,IAAI,SAAS,aAAa,EAAE,QAAQ,KAAK,CAAC;AACxE,UAAQ,MAAM,oCAAoC,MAAM;AACxD,SAAO,IAAI,SAAS,yBAAyB,EAAE,QAAQ,KAAK,CAAC"}
+{"version":3,"file":"image-endpoint.mjs","names":["genericGET"],"sources":["../../src/astro/image-endpoint.ts"],"sourcesContent":["/**\n * Node image endpoint -- the `image.endpoint` EmDash installs on non-Cloudflare\n * platforms whose image service is local (sharp).\n *\n * It wraps Astro's generic endpoint: for an EmDash media URL it loads the source\n * bytes straight from the storage adapter (no HTTP, so it works behind any auth\n * gate) and runs the configured image service's `transform`; every other image\n * is delegated to the stock endpoint unchanged.\n */\n\nimport type { APIRoute } from \"astro\";\n// @ts-ignore - astro/assets internal endpoint, resolved by the consumer's Astro build\nimport { GET as genericGET } from \"astro/assets/endpoint/generic\";\n// @ts-ignore - astro:assets is resolved by the consumer's Astro build\nimport { getConfiguredImageService, imageConfig } from \"astro:assets\";\n\nimport {\n\tgetTransformFingerprint,\n\tmatchInternalMediaKey,\n\tMUTABLE_MEDIA_CACHE_CONTROL,\n\toriginalMediaHeaders,\n\tvalidatorHeaders,\n\tisNotModified,\n} from \"../media/image-endpoint.js\";\n\nexport const prerender = false;\n\nconst FORMAT_MIME: Record<string, string> = {\n\twebp: \"image/webp\",\n\tavif: \"image/avif\",\n\tpng: \"image/png\",\n\tjpeg: \"image/jpeg\",\n\tjpg: \"image/jpeg\",\n\tgif: \"image/gif\",\n};\n\nfunction isNotFound(error: unknown): boolean {\n\treturn (\n\t\terror instanceof Error &&\n\t\t(error.message.includes(\"not found\") || error.message.includes(\"NOT_FOUND\"))\n\t);\n}\n\nfunction streamOriginal(\n\tbody: ReadableStream<Uint8Array>,\n\tcontentType: string,\n\tsize: number,\n\tlastModified?: Date,\n): Response {\n\treturn new Response(body, {\n\t\tstatus: 200,\n\t\theaders: originalMediaHeaders(contentType, size, lastModified),\n\t});\n}\n\nfunction notModifiedResponse(\n\tcontentType: string,\n\tsize: number,\n\tlastModified?: Date,\n\tsuffix?: string,\n): Response {\n\treturn new Response(null, {\n\t\tstatus: 304,\n\t\theaders: {\n\t\t\t\"Content-Type\": contentType,\n\t\t\t\"Cache-Control\": MUTABLE_MEDIA_CACHE_CONTROL,\n\t\t\t\"X-Content-Type-Options\": \"nosniff\",\n\t\t\t...validatorHeaders(size, lastModified, suffix),\n\t\t},\n\t});\n}\n\nexport const GET: APIRoute = async (ctx) => {\n\tconst url = new URL(ctx.request.url);\n\tconst key = matchInternalMediaKey(url.searchParams.get(\"href\"));\n\tconst storage = ctx.locals.emdash?.storage;\n\n\t// Not EmDash media, or storage unavailable: let the stock endpoint handle it\n\t// (bundled assets, allowed remote, `publicUrl` media).\n\tif (!key || !storage) return genericGET(ctx);\n\n\tconst service = await getConfiguredImageService();\n\tif (!(\"transform\" in service)) return genericGET(ctx);\n\n\t// An unread download retains its storage connection even for a bodyless response.\n\tlet unusedBody: ReadableStream<Uint8Array> | undefined;\n\ttry {\n\t\tconst source = await storage.download(key);\n\t\tunusedBody = source.body;\n\n\t\t// Only raster images are transformable; serve anything else unchanged.\n\t\tif (!source.contentType.startsWith(\"image/\")) {\n\t\t\tif (isNotModified(ctx.request, source.size, source.lastModified)) {\n\t\t\t\treturn notModifiedResponse(source.contentType, source.size, source.lastModified);\n\t\t\t}\n\t\t\tconst response = streamOriginal(\n\t\t\t\tsource.body,\n\t\t\t\tsource.contentType,\n\t\t\t\tsource.size,\n\t\t\t\tsource.lastModified,\n\t\t\t);\n\t\t\tif (ctx.request.method === \"HEAD\") return new Response(null, response);\n\t\t\tunusedBody = undefined;\n\t\t\treturn response;\n\t\t}\n\n\t\tconst transform = await service.parseURL(url, imageConfig);\n\t\tif (!transform) {\n\t\t\tif (isNotModified(ctx.request, source.size, source.lastModified)) {\n\t\t\t\treturn notModifiedResponse(source.contentType, source.size, source.lastModified);\n\t\t\t}\n\t\t\tconst response = streamOriginal(\n\t\t\t\tsource.body,\n\t\t\t\tsource.contentType,\n\t\t\t\tsource.size,\n\t\t\t\tsource.lastModified,\n\t\t\t);\n\t\t\tif (ctx.request.method === \"HEAD\") return new Response(null, response);\n\t\t\tunusedBody = undefined;\n\t\t\treturn response;\n\t\t}\n\n\t\tconst fingerprint = getTransformFingerprint(url.searchParams);\n\t\tif (isNotModified(ctx.request, source.size, source.lastModified, fingerprint)) {\n\t\t\treturn notModifiedResponse(source.contentType, source.size, source.lastModified, fingerprint);\n\t\t}\n\n\t\tconst inputBuffer = new Uint8Array(await new Response(source.body).arrayBuffer());\n\t\tconst { data, format } = await service.transform(inputBuffer, transform, imageConfig);\n\n\t\treturn new Response(data, {\n\t\t\tstatus: 200,\n\t\t\theaders: {\n\t\t\t\t\"Content-Type\": FORMAT_MIME[format] ?? source.contentType,\n\t\t\t\t\"Cache-Control\": MUTABLE_MEDIA_CACHE_CONTROL,\n\t\t\t\t\"X-Content-Type-Options\": \"nosniff\",\n\t\t\t\t...validatorHeaders(source.size, source.lastModified, fingerprint),\n\t\t\t},\n\t\t});\n\t} catch (error) {\n\t\tif (isNotFound(error)) return new Response(\"Not Found\", { status: 404 });\n\t\tconsole.error(\"[emdash] image transform failed:\", error);\n\t\treturn new Response(\"Internal Server Error\", { status: 500 });\n\t} finally {\n\t\tif (unusedBody && !unusedBody.locked) await unusedBody.cancel().catch(() => undefined);\n\t}\n};\n"],"mappings":";;;;;AAyBA,MAAa,YAAY;AAEzB,MAAM,cAAsC;CAC3C,MAAM;CACN,MAAM;CACN,KAAK;CACL,MAAM;CACN,KAAK;CACL,KAAK;CACL;AAED,SAAS,WAAW,OAAyB;AAC5C,QACC,iBAAiB,UAChB,MAAM,QAAQ,SAAS,YAAY,IAAI,MAAM,QAAQ,SAAS,YAAY;;AAI7E,SAAS,eACR,MACA,aACA,MACA,cACW;AACX,QAAO,IAAI,SAAS,MAAM;EACzB,QAAQ;EACR,SAAS,qBAAqB,aAAa,MAAM,aAAa;EAC9D,CAAC;;AAGH,SAAS,oBACR,aACA,MACA,cACA,QACW;AACX,QAAO,IAAI,SAAS,MAAM;EACzB,QAAQ;EACR,SAAS;GACR,gBAAgB;GAChB,iBAAiB;GACjB,0BAA0B;GAC1B,GAAG,iBAAiB,MAAM,cAAc,OAAO;GAC/C;EACD,CAAC;;AAGH,MAAa,MAAgB,OAAO,QAAQ;CAC3C,MAAM,MAAM,IAAI,IAAI,IAAI,QAAQ,IAAI;CACpC,MAAM,MAAM,sBAAsB,IAAI,aAAa,IAAI,OAAO,CAAC;CAC/D,MAAM,UAAU,IAAI,OAAO,QAAQ;AAInC,KAAI,CAAC,OAAO,CAAC,QAAS,QAAOA,MAAW,IAAI;CAE5C,MAAM,UAAU,MAAM,2BAA2B;AACjD,KAAI,EAAE,eAAe,SAAU,QAAOA,MAAW,IAAI;CAGrD,IAAI;AACJ,KAAI;EACH,MAAM,SAAS,MAAM,QAAQ,SAAS,IAAI;AAC1C,eAAa,OAAO;AAGpB,MAAI,CAAC,OAAO,YAAY,WAAW,SAAS,EAAE;AAC7C,OAAI,cAAc,IAAI,SAAS,OAAO,MAAM,OAAO,aAAa,CAC/D,QAAO,oBAAoB,OAAO,aAAa,OAAO,MAAM,OAAO,aAAa;GAEjF,MAAM,WAAW,eAChB,OAAO,MACP,OAAO,aACP,OAAO,MACP,OAAO,aACP;AACD,OAAI,IAAI,QAAQ,WAAW,OAAQ,QAAO,IAAI,SAAS,MAAM,SAAS;AACtE,gBAAa;AACb,UAAO;;EAGR,MAAM,YAAY,MAAM,QAAQ,SAAS,KAAK,YAAY;AAC1D,MAAI,CAAC,WAAW;AACf,OAAI,cAAc,IAAI,SAAS,OAAO,MAAM,OAAO,aAAa,CAC/D,QAAO,oBAAoB,OAAO,aAAa,OAAO,MAAM,OAAO,aAAa;GAEjF,MAAM,WAAW,eAChB,OAAO,MACP,OAAO,aACP,OAAO,MACP,OAAO,aACP;AACD,OAAI,IAAI,QAAQ,WAAW,OAAQ,QAAO,IAAI,SAAS,MAAM,SAAS;AACtE,gBAAa;AACb,UAAO;;EAGR,MAAM,cAAc,wBAAwB,IAAI,aAAa;AAC7D,MAAI,cAAc,IAAI,SAAS,OAAO,MAAM,OAAO,cAAc,YAAY,CAC5E,QAAO,oBAAoB,OAAO,aAAa,OAAO,MAAM,OAAO,cAAc,YAAY;EAG9F,MAAM,cAAc,IAAI,WAAW,MAAM,IAAI,SAAS,OAAO,KAAK,CAAC,aAAa,CAAC;EACjF,MAAM,EAAE,MAAM,WAAW,MAAM,QAAQ,UAAU,aAAa,WAAW,YAAY;AAErF,SAAO,IAAI,SAAS,MAAM;GACzB,QAAQ;GACR,SAAS;IACR,gBAAgB,YAAY,WAAW,OAAO;IAC9C,iBAAiB;IACjB,0BAA0B;IAC1B,GAAG,iBAAiB,OAAO,MAAM,OAAO,cAAc,YAAY;IAClE;GACD,CAAC;UACM,OAAO;AACf,MAAI,WAAW,MAAM,CAAE,QAAO,IAAI,SAAS,aAAa,EAAE,QAAQ,KAAK,CAAC;AACxE,UAAQ,MAAM,oCAAoC,MAAM;AACxD,SAAO,IAAI,SAAS,yBAAyB,EAAE,QAAQ,KAAK,CAAC;WACpD;AACT,MAAI,cAAc,CAAC,WAAW,OAAQ,OAAM,WAAW,QAAQ,CAAC,YAAY,OAAU"}

package/dist/astro/index.d.mts

@@ -1,17 +1,18 @@
-import { i as ContentItem } from "../types-CNB-dj6F.mjs";
-import "../parse-CWHOFc6z.mjs";
-import "../types-DCFavOii.mjs";
-import { Cn as ResolvedPlugin } from "../types-QoPHm-2w.mjs";
-import "../options-DJWaq3Ie.mjs";
-import "../entry-lock-C7VX0NGK.mjs";
-import { Fr as LocalStorageConfig, Ir as S3StorageConfig, Lr as StorageDescriptor, Mr as EmDashConfig, Pr as getStoredConfig } from "../config-Bsm_u_oE.mjs";
-import "../runner-BObHz5FC.mjs";
-import { $ as MediaItem } from "../storage-query-DRyu3bSU.mjs";
-import "../index-BB9sVisO.mjs";
-import { i as ObjectCacheRuntimeConfig, r as ObjectCacheDescriptor } from "../types-DvqVxZXa.mjs";
-import "../types-DHO7Pd25.mjs";
-import "../hreflang-CY_F5OjF.mjs";
-import "../validate-emKxGC5F.mjs";
+import { i as ContentItem } from "../types-C4KT3Md2.mjs";
+import "../parse-Dndx1QmN.mjs";
+import "../types-DKwRUA-x.mjs";
+import { Cn as ResolvedPlugin } from "../types-CjftrmZR.mjs";
+import "../options-BUUgroHg.mjs";
+import "../entry-lock-BulbgPBX.mjs";
+import { Fr as getStoredConfig, Ir as LocalStorageConfig, Lr as S3StorageConfig, Nr as EmDashConfig, Rr as StorageDescriptor } from "../config-sDhZvkLR.mjs";
+import "../runner-Dfgp6-S_.mjs";
+import { $ as MediaItem } from "../storage-query-BFp06Y0s.mjs";
+import "../utils-Szp4iBQB.mjs";
+import { i as ObjectCacheRuntimeConfig, r as ObjectCacheDescriptor } from "../types-CVXHwIBB.mjs";
+import "../index-VM7Fzxwe.mjs";
+import "../types-CadaL_k8.mjs";
+import "../hreflang-8dUOJAPJ.mjs";
+import "../validate-DDvxy6qG.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;;AE4Y3D;;;;;;;;;;;;;iBFvXgB,KAAA,CAAM,MAAA,EAAQ,kBAAA,GAAqB,iBAAA;;;;UC3DlC,kBAAA,SAA2B,wBAAA;EDsCjB;;;;ECjC1B,UAAA;AAAA;;;;;ADsDD;;;;;;;;;iBCtCgB,WAAA,CAAY,OAAA,GAAS,kBAAA,GAA0B,qBAAA;;;;;;iBC6Z/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;;;AE6Y3D;;;;;;;;;;;;iBFxXgB,KAAA,CAAM,MAAA,EAAQ,kBAAA,GAAqB,iBAAA;;;;UC3DlC,kBAAA,SAA2B,wBAAA;EDsCT;;;;ECjClC,UAAA;AAAA;;;;;;ADsDD;;;;;;;;iBCtCgB,WAAA,CAAY,OAAA,GAAS,kBAAA,GAA0B,qBAAA;;;;;;iBC8Z/C,MAAA,CAAO,MAAA,GAAQ,YAAA,GAAoB,gBAAA"}

package/dist/astro/index.mjs

@@ -1,16 +1,16 @@
-import "../runner-C5NeAkBQ.mjs";
-import "../dialect-helpers-7_IqPdh9.mjs";
-import "../config-CvmjJcVw.mjs";
+import "../runner-Bkkfk4O8.mjs";
+import "../dialect-helpers-B1XN2HGB.mjs";
+import "../config-Cs_AwWXI.mjs";
 import "../datetime-normalization-PeiEdcRY.mjs";
-import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-BuWa0lvd.mjs";
+import { t as INTERNAL_MEDIA_PREFIX } from "../normalize-Cx-bNwhP.mjs";
 import { n as DEV_TYPEGEN_REFRESH_GLOBAL, t as DEV_TYPEGEN_REFRESH_EVENT } from "../dev-typegen-EBni_pOQ.mjs";
 import { a as parseDurationSeconds, c as resolveRegistryConfigForSandbox, i as normalizeRegistryConfig } from "../config-DBU6iUQB.mjs";
-import { n as VERSION, t as COMMIT } from "../version-DHmGpcch.mjs";
+import { n as VERSION, t as COMMIT } from "../version-Bu6Nlbb5.mjs";
 import { r as getEnvSiteUrl } from "../public-url-Bt98vysr.mjs";
 import { n as validateAllowedOrigins, r as validateOriginShape } from "../allowed-origins-CEug-p0t.mjs";
-import { r as normalizeMigrationConfig } from "../policy-DLQ--Hnm.mjs";
-import { c as normalizeAstroI18n, n as MIGRATION_CONFIG_SYMBOL, o as serializeMigrationManifest, r as createMigrationIntegrationMetadata, s as validateMigrationManifest, t as buildMigrationManifest } from "../manifest-builder-B8zjuH3f.mjs";
-import { r as getCoreMigrationIdentity } from "../identity-Cael5uTT.mjs";
+import { i as normalizeMigrationConfig } from "../policy-BPugqmeV.mjs";
+import { c as normalizeAstroI18n, n as MIGRATION_CONFIG_SYMBOL, o as serializeMigrationManifest, r as createMigrationIntegrationMetadata, s as validateMigrationManifest, t as buildMigrationManifest } from "../manifest-builder-g1FLviel.mjs";
+import { r as getCoreMigrationIdentity } from "../identity-CPRRSovU.mjs";
 import { A as VIRTUAL_SANDBOX_RUNNER_ID, B as generateConfigModule, C as VIRTUAL_CONFIG_ID, D as VIRTUAL_OBJECT_CACHE_ID, E as VIRTUAL_MEDIA_PROVIDERS_ID, F as generateAdminRegistryModule, G as generatePluginsModule, H as generateEnvModule, I as generateAuthModule, J as generateSchedulerModule, K as generateSandboxRunnerModule, L as generateAuthProvidersModule, M as VIRTUAL_SEED_ID, N as VIRTUAL_STORAGE_ID, O as VIRTUAL_PLUGINS_ID, P as VIRTUAL_WAIT_UNTIL_ID, R as generateBlockComponentsModule, S as VIRTUAL_BUILD_ID, T as VIRTUAL_ENV_ID, U as generateMediaProvidersModule, V as generateDialectModule, W as generateObjectCacheModule, X as generateStorageModule, Y as generateSeedModule, Z as generateWaitUntilModule, _ as RESOLVED_VIRTUAL_WAIT_UNTIL_ID, a as RESOLVED_VIRTUAL_BUILD_ID, b as VIRTUAL_AUTH_PROVIDERS_ID, c as RESOLVED_VIRTUAL_ENV_ID, d as RESOLVED_VIRTUAL_PLUGINS_ID, f as RESOLVED_VIRTUAL_SANDBOXED_PLUGINS_ID, g as RESOLVED_VIRTUAL_STORAGE_ID, h as RESOLVED_VIRTUAL_SEED_ID, i as RESOLVED_VIRTUAL_BLOCK_COMPONENTS_ID, j as VIRTUAL_SCHEDULER_ID, k as VIRTUAL_SANDBOXED_PLUGINS_ID, l as RESOLVED_VIRTUAL_MEDIA_PROVIDERS_ID, m as RESOLVED_VIRTUAL_SCHEDULER_ID, n as RESOLVED_VIRTUAL_AUTH_ID, o as RESOLVED_VIRTUAL_CONFIG_ID, p as RESOLVED_VIRTUAL_SANDBOX_RUNNER_ID, q as generateSandboxedPluginsModule, r as RESOLVED_VIRTUAL_AUTH_PROVIDERS_ID, s as RESOLVED_VIRTUAL_DIALECT_ID, t as RESOLVED_VIRTUAL_ADMIN_REGISTRY_ID, u as RESOLVED_VIRTUAL_OBJECT_CACHE_ID, v as VIRTUAL_ADMIN_REGISTRY_ID, w as VIRTUAL_DIALECT_ID, x as VIRTUAL_BLOCK_COMPONENTS_ID, y as VIRTUAL_AUTH_ID, z as generateBuildModule } from "../virtual-modules-DO954n7P.mjs";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, posix, relative, resolve, win32 } from "node:path";
@@ -229,6 +229,42 @@ function createAdminLocaleResolverPlugin(options) {
 	};
 }
 
+//#endregion
+//#region src/astro/integration/admin-nav.ts
+/**
+* Built-in admin navigation entries that `admin.hiddenNavItems` can hide.
+*/
+const HIDEABLE_ADMIN_NAV_ITEMS = [
+	"calendar",
+	"media",
+	"comments",
+	"menus",
+	"redirects",
+	"widgets",
+	"sections",
+	"bylines",
+	"import"
+];
+const HIDEABLE = new Set(HIDEABLE_ADMIN_NAV_ITEMS);
+function isHideableAdminNavItem(entry) {
+	return typeof entry === "string" && HIDEABLE.has(entry);
+}
+/**
+* Validate a user-supplied `admin.hiddenNavItems` list. Duplicates are
+* dropped. Throws, naming every unrecognized entry and listing the valid
+* names, if any entry is not a hideable navigation item.
+*/
+function resolveHiddenNavItems(requested) {
+	if (!Array.isArray(requested)) throw new Error("`admin.hiddenNavItems` must be an array of navigation item names.");
+	const entries = requested;
+	const resolved = /* @__PURE__ */ new Set();
+	const unknownEntries = [];
+	for (const entry of entries) if (isHideableAdminNavItem(entry)) resolved.add(entry);
+	else unknownEntries.push(String(JSON.stringify(entry)));
+	if (unknownEntries.length > 0) throw new Error(`Unknown navigation item${unknownEntries.length === 1 ? "" : "s"} in \`admin.hiddenNavItems\`: ${unknownEntries.join(", ")}. Valid names: ${HIDEABLE_ADMIN_NAV_ITEMS.join(", ")}.`);
+	return [...resolved];
+}
+
 //#endregion
 //#region src/astro/integration/dev-env.ts
 const DEV_ENV_SECRET_VAR_NAMES = new Set(["EMDASH_ENCRYPTION_KEY"]);
@@ -1707,6 +1743,9 @@ function canResolveProjectDependency(projectRoot, specifier) {
 */
 function createViteConfig(options, command) {
 	const adminDistPath = resolveAdminDist();
+	const adminRequire = createRequire(resolve(adminDistPath, "index.js"));
+	const adminLinguiReactPath = dirname(adminRequire.resolve("@lingui/react/package.json"));
+	const adminLinguiCorePath = dirname(adminRequire.resolve("@lingui/core/package.json"));
 	const cloudflare = isCloudflareAdapter(options.astroConfig);
 	const isDev = command === "dev";
 	const projectRoot = fileURLToPath(options.astroConfig.root);
@@ -1732,6 +1771,14 @@ function createViteConfig(options, command) {
 				"react-dom"
 			],
 			alias: [
+				{
+					find: "@lingui/react",
+					replacement: adminLinguiReactPath
+				},
+				{
+					find: "@lingui/core",
+					replacement: adminLinguiCorePath
+				},
 				{
 					find: ADMIN_STYLES_ALIAS,
 					replacement: resolve(adminDistPath, "styles.css")
@@ -2239,6 +2286,10 @@ function emdash(config = {}) {
 			locales: resolveAdminLocales(config.admin.locales, Object.keys(manifest))
 		};
 	}
+	if (config.admin?.hiddenNavItems !== void 0) resolvedConfig.admin = {
+		...resolvedConfig.admin,
+		hiddenNavItems: resolveHiddenNavItems(config.admin.hiddenNavItems)
+	};
 	const serializableConfig = buildSerializableConfig(resolvedConfig);
 	const useExternalAuth = !!(resolvedConfig.auth && "entrypoint" in resolvedConfig.auth);
 	let astroCommand;