@junejs/server 1.0.0-dev.42 → 1.0.0-dev.47

package/dist/manifest.js

@@ -1,7 +1,7 @@
 import { findMiddlewareFile } from "./router.js";
+import { scanAppRoutes } from "./route-scan.js";
 import { resolveBoundary } from "./segment.js";
 import { freezeConfig } from "./config-freeze.js";
-import { scanAppRoutes } from "./route-scan.js";
 import { existsSync } from "node:fs";
 import { basename, join } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -47,6 +47,7 @@ async function buildManifest(appRoot) {
 	const routes = {};
 	const dynamicRoutes = [];
 	const resourceRoutes = [];
+	const generatedRoutes = scanned.filter((r) => r.generated).map((r) => r.path);
 	const layoutChains = {};
 	const layoutBoundaries = {};
 	const loadings = {};
@@ -96,6 +97,7 @@ async function buildManifest(appRoot) {
 		routes,
 		dynamicRoutes,
 		resourceRoutes,
+		...generatedRoutes.length ? { generatedRoutes } : {},
 		layoutChains,
 		layoutBoundaries,
 		loadings,

package/dist/pipeline.js

@@ -9,8 +9,8 @@ import React, { Suspense, use } from "react";
 import { renderToReadableStream } from "react-dom/server";
 import { Document, PRERENDER_ORIGIN, documentTitle, pageCanonical } from "@junejs/core/document";
 import { AGENT_SKILLS_INDEX_PATH, AI_CATALOG_PATH, API_CATALOG_CONTENT_TYPE, ARD_PATH, MCP_SERVER_CARD_TYPE, agentSkillsIndex, aiCatalog, apiCatalog, buildLinkHeader, llmsTxt, mcpServerCard, robotsTxt, siteSkill, sitemapXml } from "@junejs/core/discovery";
-import { mcpHandler, mcpServerIdentity, mcpTools } from "@junejs/core/mcp";
-import { OPENAPI_MEDIA_TYPE, apiActionId, apiHandler, apiNamespaceResponse, isApiNamespace, openApiDocument } from "@junejs/core/api";
+import { mcpForbidden, mcpHandler, mcpServerIdentity, mcpTools, originRejection } from "@junejs/core/mcp";
+import { OPENAPI_MEDIA_TYPE, apiActionId, apiForbidden, apiHandler, apiNamespaceResponse, isApiNamespace, openApiDocument } from "@junejs/core/api";
 import { LOCALE_COOKIE, localeAlternates, localeDir, matchPinnedLocale, negotiateLocale } from "@junejs/core/i18n";
 //#region src/pipeline.ts
 function readCookie(request, name) {
@@ -368,18 +368,25 @@ function createPipeline(cfg) {
 			default: return null;
 		}
 	}
+	const originPolicy = {
+		allowedOrigins: agent.allowedOrigins,
+		allowedHosts: agent.allowedHosts
+	};
+	const callerIdentity = async (request) => request.method === "POST" && cfg.identity ? await cfg.identity(request) : void 0;
 	async function handleRequest(request) {
 		const url = new URL(request.url);
 		if (url.pathname === "/mcp") {
 			if (!agent.mcp) return notFoundResponse("view", url.pathname);
-			const identity = cfg.identity ? await cfg.identity(request) : void 0;
+			const refused = originRejection(request, originPolicy);
+			if (refused !== void 0) return mcpForbidden(refused);
+			const identity = await callerIdentity(request);
 			return mcpHandler(request, {
 				request,
 				...identity
 			}, mcpServerIdentity(url.origin, {
 				site: docConfig.site,
 				agent
-			}));
+			}), originPolicy);
 		}
 		if (agent.api) {
 			if (url.pathname === "/openapi.json" && (request.method === "GET" || request.method === "HEAD")) {
@@ -394,11 +401,13 @@ function createPipeline(cfg) {
 			}
 			const actionId = apiActionId(url.pathname);
 			if (actionId) {
-				const identity = cfg.identity ? await cfg.identity(request) : void 0;
+				const refused = originRejection(request, originPolicy);
+				if (refused !== void 0) return apiForbidden(request, refused);
+				const identity = await callerIdentity(request);
 				return apiHandler(request, actionId, {
 					request,
 					...identity
-				});
+				}, originPolicy);
 			}
 		}
 		if (request.method === "OPTIONS" && agent.discovery && agent.mcp && url.pathname === SERVER_CARD_PATH) return new Response(null, {

package/dist/route-rank.d.ts

@@ -0,0 +1,10 @@
+//#region src/route-rank.d.ts
+export type SegmentKind = "static" | "param" | "optional" | "catchAll" | "optionalCatchAll";
+export declare function parseSegment(segment: string): {
+  kind: SegmentKind;
+  name?: string;
+};
+export declare function segmentRank(segment: string): number;
+export declare function compareSegments(a: string, b: string): number;
+export declare function compareRoutePatterns(a: string, b: string): number;
+//#endregion

package/dist/route-rank.js

@@ -0,0 +1,38 @@
+//#region src/route-rank.ts
+const DYNAMIC = /^\[(\[)?(\.\.\.)?([A-Za-z_][A-Za-z0-9_]*)\](\])?$/;
+function parseSegment(segment) {
+	const m = segment.match(DYNAMIC);
+	if (!m || !!m[1] !== !!m[4]) return { kind: "static" };
+	const optional = !!m[1];
+	return {
+		kind: !!m[2] ? optional ? "optionalCatchAll" : "catchAll" : optional ? "optional" : "param",
+		name: m[3]
+	};
+}
+const RANK = {
+	static: 0,
+	param: 1,
+	optional: 2,
+	catchAll: 3,
+	optionalCatchAll: 4
+};
+function segmentRank(segment) {
+	return RANK[parseSegment(segment).kind];
+}
+function compareSegments(a, b) {
+	return segmentRank(a) - segmentRank(b) || (a < b ? -1 : a > b ? 1 : 0);
+}
+function compareRoutePatterns(a, b) {
+	const as = a.split("/").filter(Boolean);
+	const bs = b.split("/").filter(Boolean);
+	for (let i = 0; i < Math.max(as.length, bs.length); i++) {
+		const x = as[i];
+		const y = bs[i];
+		if (x === void 0) return -1;
+		if (y === void 0) return 1;
+		if (x !== y) return compareSegments(x, y);
+	}
+	return 0;
+}
+//#endregion
+export { compareRoutePatterns, compareSegments, parseSegment, segmentRank };

package/dist/route-scan-BMbBzPIB.d.ts

@@ -0,0 +1,20 @@
+//#region src/route-scan.d.ts
+type RouteEntry = {
+  path: string;
+  file: string;
+  dynamic: boolean;
+  resource?: boolean;
+  generated?: boolean;
+  layouts: string[];
+  loading?: string;
+};
+declare function scanRoutes(appDir: string, dir?: string, layouts?: string[], out?: RouteEntry[], loading?: string): Promise<RouteEntry[]>;
+declare function scanAppRoutes(appRoot: string): Promise<RouteEntry[]>;
+declare function routeConflicts(routes: RouteEntry[]): Array<{
+  path: string;
+  files: string[];
+}>;
+declare function misplacedSegments(routes: RouteEntry[]): RouteEntry[];
+declare function routeProblems(trees: RouteEntry[][], appRoot: string): string | null;
+//#endregion
+export { scanAppRoutes as a, routeProblems as i, misplacedSegments as n, scanRoutes as o, routeConflicts as r, RouteEntry as t };

package/dist/route-scan.d.ts

@@ -1,2 +1,2 @@
-import { n as scanAppRoutes, r as scanRoutes, t as RouteEntry } from "./route-scan-DMlwoESy.js";
-export { RouteEntry, scanAppRoutes, scanRoutes };
+import { a as scanAppRoutes, i as routeProblems, n as misplacedSegments, o as scanRoutes, r as routeConflicts, t as RouteEntry } from "./route-scan-BMbBzPIB.js";
+export { RouteEntry, misplacedSegments, routeConflicts, routeProblems, scanAppRoutes, scanRoutes };

package/dist/route-scan.js

@@ -1,3 +1,4 @@
+import { parseSegment } from "./route-rank.js";
 import { existsSync } from "node:fs";
 import { readdir } from "node:fs/promises";
 import { basename, join, relative, sep } from "node:path";
@@ -48,8 +49,52 @@ async function scanAppRoutes(appRoot) {
 	const juneRoutesDir = join(appRoot, ".june", "routes");
 	const appRoutes = await scanRoutes(appDir);
 	const frameworkRoutes = existsSync(juneRoutesDir) ? await scanRoutes(juneRoutesDir) : [];
+	const problems = routeProblems([appRoutes, frameworkRoutes], appRoot);
+	if (problems) throw new Error(problems);
 	const appPaths = new Set(appRoutes.map((r) => r.path));
-	return [...appRoutes, ...frameworkRoutes.filter((r) => !appPaths.has(r.path))].sort((a, b) => a.path.localeCompare(b.path));
+	const generated = frameworkRoutes.filter((r) => !appPaths.has(r.path)).map((r) => ({
+		...r,
+		generated: true
+	}));
+	return [...appRoutes, ...generated].sort((a, b) => a.path.localeCompare(b.path));
+}
+function routeConflicts(routes) {
+	const byKey = /* @__PURE__ */ new Map();
+	for (const r of routes) {
+		const key = `${r.resource ? "route" : "page"} ${r.path}`;
+		const hit = byKey.get(key);
+		if (hit) hit.files.push(r.file);
+		else byKey.set(key, {
+			path: r.path,
+			files: [r.file]
+		});
+	}
+	return [...byKey.values()].filter((c) => c.files.length > 1).map((c) => ({
+		path: c.path,
+		files: c.files.sort()
+	})).sort((a, b) => a.path.localeCompare(b.path));
+}
+const ENDS_PATH = /* @__PURE__ */ new Set([
+	"optional",
+	"catchAll",
+	"optionalCatchAll"
+]);
+const beforeLast = (path) => path.split("/").filter(Boolean).slice(0, -1).map((s) => parseSegment(s).kind);
+function misplacedSegments(routes) {
+	return routes.filter((r) => beforeLast(r.path).some((k) => ENDS_PATH.has(k))).sort((a, b) => a.path.localeCompare(b.path) || a.file.localeCompare(b.file));
+}
+function routeProblems(trees, appRoot) {
+	const rel = (f) => relative(appRoot, f).split(sep).join("/");
+	const sections = [];
+	const conflicts = trees.flatMap(routeConflicts);
+	if (conflicts.length) sections.push("[june] more than one route file resolves to the same path — keep one per path:\n" + conflicts.map((c) => `  ${c.path}: ${c.files.map(rel).join(", ")}`).join("\n"));
+	const misplaced = trees.flatMap(misplacedSegments);
+	if (misplaced.length) {
+		const lines = misplaced.map((r) => `  ${r.path}: ${rel(r.file)}`);
+		if (misplaced.some((r) => beforeLast(r.path).includes("optional"))) lines.push("  Unlike SvelteKit, June does not skip a [[param]] mid-path. For a locale prefix, set i18n.locales in june.config.ts instead of a [[lang]] directory.");
+		sections.push("[june] an optional or catch-all segment must be the last segment of a route path — nothing may follow it:\n" + lines.join("\n"));
+	}
+	return sections.length ? sections.join("\n") : null;
 }
 //#endregion
-export { scanAppRoutes, scanRoutes };
+export { misplacedSegments, routeConflicts, routeProblems, scanAppRoutes, scanRoutes };

package/dist/router.js

@@ -1,3 +1,4 @@
+import { compareSegments, parseSegment } from "./route-rank.js";
 import { existsSync } from "node:fs";
 import { readdir } from "node:fs/promises";
 import { join, relative, sep } from "node:path";
@@ -42,11 +43,11 @@ function isSpecialFile(file) {
 	return SPECIAL_FILES.has(baseName(file));
 }
 const isRouteGroup = (name) => /^\(.+\)$/.test(name);
-const isParamDir = (name) => /^\[([A-Za-z_][A-Za-z0-9_]*)\]$/.test(name);
-const isOptionalDir = (name) => /^\[\[([A-Za-z_][A-Za-z0-9_]*)\]\]$/.test(name);
-const isOptionalCatchAllDir = (name) => /^\[\[\.\.\.([A-Za-z_][A-Za-z0-9_]*)\]\]$/.test(name);
-const isCatchAllDir = (name) => /^\[\.\.\.([A-Za-z_][A-Za-z0-9_]*)\]$/.test(name);
-const paramName = (name) => name.replace(/^\[+(\.\.\.)?|\]+$/g, "");
+const isParamDir = (name) => parseSegment(name).kind === "param";
+const isOptionalDir = (name) => parseSegment(name).kind === "optional";
+const isOptionalCatchAllDir = (name) => parseSegment(name).kind === "optionalCatchAll";
+const isCatchAllDir = (name) => parseSegment(name).kind === "catchAll";
+const paramName = (name) => parseSegment(name).name;
 async function listDir(dir) {
 	return (await readdir(dir, { withFileTypes: true }).catch(() => [])).filter((e) => !e.name.startsWith("_") && !e.name.startsWith(".")).map((e) => ({
 		name: e.name,
@@ -84,63 +85,76 @@ function routePath(appDir, file) {
 }
 async function matchRouteTree(appDir, pathname, options = {}) {
 	const urlSegments = pathname.split("/").filter(Boolean).map(decodeURIComponent);
-	async function descend(dir, rest, params, chain) {
-		const entries = await listDir(dir);
+	async function levelAt(dir, chain) {
+		const entries = (await listDir(dir)).sort((a, b) => compareSegments(a.name, b.name));
 		const segments = [...chain, segmentAt(dir, entries)];
-		if (rest.length === 0) {
-			const page = fileFor(entries, dir, "page") ?? fileFor(entries, dir, "index") ?? fileFor(entries, dir, "route");
-			if (page) return {
-				file: page,
+		const levels = [{
+			dir,
+			entries,
+			segments
+		}];
+		for (const e of entries) if (e.dir && isRouteGroup(e.name)) levels.push(...await levelAt(join(dir, e.name), segments));
+		return levels;
+	}
+	async function descend(nodes, rest, params) {
+		const levels = (await Promise.all(nodes.map((n) => levelAt(n.dir, n.chain)))).flat();
+		if (rest.length === 0) for (const base of [["page", "index"], ["route"]]) for (const { dir: d, entries, segments } of levels) {
+			const file = base.map((b) => fileFor(entries, d, b)).find(Boolean);
+			if (file) return {
+				file,
 				params,
 				segments
 			};
-		} else if (!options.pageConvention) {
-			if (rest.length === 1) {
-				const leaf = fileFor(entries, dir, rest[0]);
-				if (leaf && !isSpecialFile(leaf) && !isPageFile(leaf)) return {
-					file: leaf,
-					params,
-					segments
-				};
-			}
 		}
-		for (const e of entries) {
-			if (!e.dir || !isRouteGroup(e.name)) continue;
-			const hit = await descend(join(dir, e.name), rest, params, segments);
-			if (hit) return hit;
+		else if (!options.pageConvention && rest.length === 1) for (const { dir: d, entries, segments } of levels) {
+			const leaf = fileFor(entries, d, rest[0]);
+			if (leaf && !isSpecialFile(leaf) && !isPageFile(leaf)) return {
+				file: leaf,
+				params,
+				segments
+			};
+		}
+		const children = /* @__PURE__ */ new Map();
+		for (const lv of levels) for (const e of lv.entries) {
+			if (!e.dir || isRouteGroup(e.name)) continue;
+			const node = {
+				dir: join(lv.dir, e.name),
+				chain: lv.segments
+			};
+			const same = children.get(e.name);
+			if (same) same.push(node);
+			else children.set(e.name, [node]);
 		}
+		const names = [...children.keys()].sort(compareSegments);
 		if (rest.length === 0) {
-			for (const e of entries) {
-				if (!e.dir || !(isOptionalDir(e.name) || isOptionalCatchAllDir(e.name))) continue;
-				const hit = await descend(join(dir, e.name), [], params, segments);
+			for (const name of names) {
+				if (!(isOptionalDir(name) || isOptionalCatchAllDir(name))) continue;
+				const hit = await descend(children.get(name), [], params);
 				if (hit) return hit;
 			}
 			return null;
 		}
 		const [head, ...tail] = rest;
-		if (entries.find((e) => e.dir && e.name === head)) {
-			const hit = await descend(join(dir, head), tail, params, segments);
-			if (hit) return hit;
-		}
-		for (const e of entries) {
-			if (!e.dir || !(isParamDir(e.name) || isOptionalDir(e.name))) continue;
-			const hit = await descend(join(dir, e.name), tail, {
+		for (const name of names) {
+			const into = children.get(name);
+			let hit = null;
+			if (isParamDir(name) || isOptionalDir(name)) hit = await descend(into, tail, {
 				...params,
-				[paramName(e.name)]: head
-			}, segments);
-			if (hit) return hit;
-		}
-		for (const e of entries) {
-			if (!e.dir || !(isCatchAllDir(e.name) || isOptionalCatchAllDir(e.name))) continue;
-			const hit = await descend(join(dir, e.name), [], {
+				[paramName(name)]: head
+			});
+			else if (isCatchAllDir(name) || isOptionalCatchAllDir(name)) hit = await descend(into, [], {
 				...params,
-				[paramName(e.name)]: rest.join("/")
-			}, segments);
+				[paramName(name)]: rest.join("/")
+			});
+			else if (name === head) hit = await descend(into, tail, params);
 			if (hit) return hit;
 		}
 		return null;
 	}
-	return descend(appDir, urlSegments, {}, []);
+	return descend([{
+		dir: appDir,
+		chain: []
+	}], urlSegments, {});
 }
 async function resolveNotFound(appDir, pathname) {
 	const urlSegments = pathname.split("/").filter(Boolean).map(decodeURIComponent);

package/dist/sqlite-driver.d.ts

@@ -19,6 +19,7 @@ export declare function nodeSqliteHelp(nodeVersion: string): string;
 export declare function isNodeSqliteExperimentalWarning(type: unknown, message: string): boolean;
 type EmitWarning = (warning: string | Error, ...rest: unknown[]) => void;
 export declare function makeWarningFilter(original: EmitWarning): EmitWarning;
+export declare function useDurableJournal(db: SyncSqlite, path: string): SyncSqlite;
 export declare function openLocalSqliteSync(path: string): Promise<SyncSqlite>;
 export declare function openLocalSqlite(path: string): Promise<JuneDb>;
 //#endregion

package/dist/sqlite-driver.js

@@ -72,10 +72,23 @@ function makeWarningFilter(original) {
 		original(warning, ...rest);
 	};
 }
+function useDurableJournal(db, path) {
+	if (path === ":memory:" || path === "") return db;
+	try {
+		db.exec("PRAGMA journal_mode=WAL");
+		db.exec("PRAGMA synchronous=FULL");
+	} catch (err) {
+		try {
+			db.close();
+		} catch {}
+		throw err;
+	}
+	return db;
+}
 async function openLocalSqliteSync(path) {
 	if (typeof Bun !== "undefined") {
 		const { Database } = await import("bun:sqlite");
-		return new Database(path, { create: true });
+		return useDurableJournal(new Database(path, { create: true }), path);
 	}
 	const specifier = "node:sqlite";
 	let mod;
@@ -89,14 +102,14 @@ async function openLocalSqliteSync(path) {
 		process.emitWarning = originalEmitWarning;
 	}
 	const db = new mod.DatabaseSync(path);
-	return {
+	return useDurableJournal({
 		query: (sql) => db.prepare(sql),
 		exec: (sql) => db.exec(sql),
 		close: () => db.close()
-	};
+	}, path);
 }
 async function openLocalSqlite(path) {
 	return asyncSqlite(await openLocalSqliteSync(path));
 }
 //#endregion
-export { NODE_SQLITE_MIN_LTS, NODE_SQLITE_MIN_ODD, isNodeSqliteExperimentalWarning, makeWarningFilter, nodeSqliteHelp, openLocalSqlite, openLocalSqliteSync };
+export { NODE_SQLITE_MIN_LTS, NODE_SQLITE_MIN_ODD, isNodeSqliteExperimentalWarning, makeWarningFilter, nodeSqliteHelp, openLocalSqlite, openLocalSqliteSync, useDurableJournal };

package/dist/{worker-Dv4l6Ybs.d.ts → worker-2qbQjj2c.d.ts}

@@ -20,6 +20,7 @@ type WorkerManifest = {
     pattern: string;
     handler: ResourceHandler;
   }>;
+  generatedRoutes?: string[];
   layoutChains?: Record<string, LayoutComponent[]>;
   layoutBoundaries?: Record<string, {
     index: number;

package/dist/worker.d.ts

@@ -1,2 +1,2 @@
-import { a as withDenoAssets, i as withAssets, n as WorkerManifest, r as createWorker, t as WorkerExecutionContext } from "./worker-Dv4l6Ybs.js";
+import { a as withDenoAssets, i as withAssets, n as WorkerManifest, r as createWorker, t as WorkerExecutionContext } from "./worker-2qbQjj2c.js";
 export { WorkerExecutionContext, WorkerManifest, createWorker, withAssets, withDenoAssets };

package/dist/worker.js

@@ -1,41 +1,25 @@
 import { durableAgentSurface, durableChannelSurface } from "./agent-durable.js";
+import { compareRoutePatterns, parseSegment } from "./route-rank.js";
 import { acceptTarget } from "./negotiate.js";
 import { createPipeline } from "./pipeline.js";
 import { RESERVED_PREFIX, contentTypeFor, safeRelativePath } from "./static-files.js";
+import { blobFileStore } from "@junejs/core/agent-files";
 //#region src/worker.ts
 function compilePattern(pattern) {
 	const names = [];
 	let source = "";
 	let allOptional = true;
 	for (const seg of pattern.split("/").filter(Boolean)) {
-		const oca = seg.match(/^\[\[\.\.\.(\w+)\]\]$/);
-		if (oca) {
-			names.push(oca[1]);
-			source += "(?:/(.+))?";
-			continue;
-		}
-		const ca = seg.match(/^\[\.\.\.(\w+)\]$/);
-		if (ca) {
-			names.push(ca[1]);
-			source += "/(.+)";
-			allOptional = false;
-			continue;
-		}
-		const op = seg.match(/^\[\[(\w+)\]\]$/);
-		if (op) {
-			names.push(op[1]);
-			source += "(?:/([^/]+))?";
-			continue;
-		}
-		const p = seg.match(/^\[(\w+)\]$/);
-		if (p) {
-			names.push(p[1]);
-			source += "/([^/]+)";
+		const { kind, name } = parseSegment(seg);
+		if (name) names.push(name);
+		if (kind === "optionalCatchAll") source += "(?:/(.+))?";
+		else if (kind === "optional") source += "(?:/([^/]+))?";
+		else {
+			if (kind === "catchAll") source += "/(.+)";
+			else if (kind === "param") source += "/([^/]+)";
+			else source += "/" + seg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 			allOptional = false;
-			continue;
 		}
-		source += "/" + seg.replace(/[.*+?^${}()|\\]/g, "\\$&");
-		allOptional = false;
 	}
 	if (source === "") return {
 		regex: /^\/$/,
@@ -47,20 +31,42 @@ function compilePattern(pattern) {
 	};
 }
 function createWorker(manifest, opts = {}) {
-	const dynamic = (manifest.dynamicRoutes ?? []).map((d) => ({
-		...compilePattern(d.pattern),
-		def: d.def,
-		pattern: d.pattern
-	}));
-	const resources = (manifest.resourceRoutes ?? []).map((r) => ({
-		...compilePattern(r.pattern),
-		handler: r.handler,
-		pattern: r.pattern
-	}));
+	const generated = new Set(manifest.generatedRoutes ?? []);
+	const row = (pattern) => ({
+		...compilePattern(pattern),
+		pattern,
+		generated: generated.has(pattern)
+	});
+	const table = [
+		...Object.entries(manifest.routes).map(([pattern, def]) => ({
+			...row(pattern),
+			def
+		})),
+		...(manifest.dynamicRoutes ?? []).map((d) => ({
+			...row(d.pattern),
+			def: d.def
+		})),
+		...(manifest.resourceRoutes ?? []).map((r) => ({
+			...row(r.pattern),
+			handler: r.handler
+		}))
+	];
+	table.sort((a, b) => Number(a.generated) - Number(b.generated) || compareRoutePatterns(a.pattern, b.pattern) || Number(!!a.handler) - Number(!!b.handler));
 	const routeList = [...Object.keys(manifest.routes), ...(manifest.dynamicRoutes ?? []).map((d) => d.pattern)].sort();
 	const chainFor = (key) => manifest.layoutChains?.[key] ?? [];
 	const loadingFor = (key) => manifest.loadings?.[key];
 	const boundaryFor = (key) => manifest.layoutBoundaries?.[key] ?? null;
+	const resolvedPage = (def, key, params) => {
+		const b = boundaryFor(key);
+		return {
+			def,
+			params,
+			chain: chainFor(key),
+			boundaryIndex: b?.index ?? null,
+			boundaryKey: b?.key ?? null,
+			loading: loadingFor(key)
+		};
+	};
 	let currentEnv;
 	const requestLocals = /* @__PURE__ */ new WeakMap();
 	const provider = manifest.resources;
@@ -83,7 +89,12 @@ function createWorker(manifest, opts = {}) {
 				channels: manifest.agentChannels,
 				env: locals?.env,
 				services: servicesProvider,
-				waitUntil: locals?.ctx?.waitUntil?.bind(locals.ctx)
+				waitUntil: locals?.ctx?.waitUntil?.bind(locals.ctx),
+				files: provider ? blobFileStore(async () => {
+					const blob = (await provider(locals?.env)).blob;
+					if (!blob) throw new Error(`agent "${agentName}": no blob resource bound in this isolate — attached files can't be read`);
+					return blob;
+				}) : void 0
 			})(req);
 		};
 	})() : void 0;
@@ -102,47 +113,18 @@ function createWorker(manifest, opts = {}) {
 		services: servicesProvider ? () => (servicesCache ??= { v: servicesProvider(currentEnv) }).v : void 0,
 		resolve: async (pathname) => {
 			const staticDef = manifest.routes[pathname];
-			if (staticDef) {
-				const b = boundaryFor(pathname);
-				return {
-					def: staticDef,
-					params: {},
-					chain: chainFor(pathname),
-					boundaryIndex: b?.index ?? null,
-					boundaryKey: b?.key ?? null,
-					loading: loadingFor(pathname)
-				};
-			}
-			for (const d of dynamic) {
-				const m = pathname.match(d.regex);
-				if (m) {
-					const params = Object.fromEntries(d.names.flatMap((n, i) => {
-						const v = m[i + 1];
-						return v === void 0 ? [] : [[n, decodeURIComponent(v)]];
-					}));
-					const b = boundaryFor(d.pattern);
-					return {
-						def: d.def,
-						params,
-						chain: chainFor(d.pattern),
-						boundaryIndex: b?.index ?? null,
-						boundaryKey: b?.key ?? null,
-						loading: loadingFor(d.pattern)
-					};
-				}
-			}
-			for (const r of resources) {
+			if (staticDef && !generated.has(pathname)) return resolvedPage(staticDef, pathname, {});
+			for (const r of table) {
 				const m = pathname.match(r.regex);
-				if (m) {
-					const params = Object.fromEntries(r.names.flatMap((n, i) => {
-						const v = m[i + 1];
-						return v === void 0 ? [] : [[n, decodeURIComponent(v)]];
-					}));
-					return {
-						handler: r.handler,
-						params
-					};
-				}
+				if (!m) continue;
+				const params = Object.fromEntries(r.names.flatMap((n, i) => {
+					const v = m[i + 1];
+					return v === void 0 ? [] : [[n, decodeURIComponent(v)]];
+				}));
+				return r.handler ? {
+					handler: r.handler,
+					params
+				} : resolvedPage(r.def, r.pattern, params);
 			}
 			return null;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "1.0.0-dev.42",
+  "version": "1.0.0-dev.47",
   "description": "June host adapters + dev server. Host-coupled; depends on the pure @junejs/core contract layer.",
   "type": "module",
   "license": "MIT",
@@ -136,11 +136,11 @@
     "@momiji-rs/sparkdown": "^0.0.4",
     "@resvg/resvg-wasm": "^2.6.2",
     "lightningcss": "^1.27.0",
-    "oxc-parser": "^0.151.0",
+    "oxc-parser": "^0.152.0",
     "rolldown": "^1.1.0"
   },
   "peerDependencies": {
-    "@junejs/core": ">=0.2.0-dev.63",
+    "@junejs/core": ">=0.2.0-dev.66",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-server-dom-webpack": "19.3.0",