@junejs/server 1.0.0-dev.29 → 1.0.0-dev.36

package/dist/pipeline.js

@@ -1,14 +1,16 @@
 import { iconLetter } from "./icon-letter.js";
-import { collectLlmsLinks } from "./llms-links.js";
+import { collectLlmsLinks, collectSitemapPages } from "./llms-links.js";
 import { webManifest } from "./web-manifest.js";
 import { SEGMENT_HEADER, TITLE_HEADER, encodeTitle, negotiate } from "./negotiate.js";
 import { ensureScope, runInScope, setRequestLocale } from "@junejs/db";
 import { LoaderDataContext } from "@junejs/core/route";
+import { siteShortName } from "@junejs/core/config";
 import React, { Suspense, use } from "react";
 import { renderToReadableStream } from "react-dom/server";
-import { Document } from "@junejs/core/document";
-import { apiCatalog, buildLinkHeader, llmsTxt, mcpServerCard, robotsTxt, sitemapXml } from "@junejs/core/discovery";
-import { mcpHandler, mcpTools } from "@junejs/core/mcp";
+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 { LOCALE_COOKIE, localeAlternates, localeDir, matchPinnedLocale, negotiateLocale } from "@junejs/core/i18n";
 //#region src/pipeline.ts
 function readCookie(request, name) {
@@ -21,6 +23,7 @@ function readCookie(request, name) {
 	}
 }
 const DefaultNotFound = ({ pathname }) => React.createElement("main", null, React.createElement("h1", null, "404 — Not found"), React.createElement("p", null, pathname));
+const CORS = { "access-control-allow-origin": "*" };
 function text(body, contentType, init) {
 	const headers = new Headers(init?.headers);
 	headers.set("content-type", contentType);
@@ -39,13 +42,49 @@ function StreamedView({ loadPromise, def, ctx }) {
 function letterFavicon(siteName) {
 	return text(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><rect width="64" height="64" rx="12" fill="#1d1d1f"/><text x="32" y="32" dy=".36em" text-anchor="middle" font-family="ui-sans-serif, system-ui, sans-serif" font-size="34" font-weight="600" fill="#fbfbf8">${(iconLetter(siteName) || "•").replace(/[<>&"']/g, "") || "•"}</text></svg>\n`, "image/svg+xml", { headers: { "cache-control": "public, max-age=86400" } });
 }
+function markdownPath(pathname, isHome) {
+	const path = pathname.replace(/\/+$/, "");
+	return isHome ? `${path.replace(/\/index$/, "")}/index.md` : `${path}.md`;
+}
+function htmlPath(pathname, isHome) {
+	const path = pathname.endsWith(".md") ? pathname.slice(0, -3) : pathname;
+	if (!isHome) return path;
+	return path.replace(/\/+$/, "").replace(/\/index$/, "") || "/";
+}
+const SERVER_CARD_PATH = "/.well-known/mcp/server-card.json";
+const SERVER_CARD_CORS = {
+	"access-control-allow-origin": "*",
+	"access-control-allow-methods": "GET, HEAD",
+	"access-control-allow-headers": "Content-Type, If-None-Match",
+	"access-control-expose-headers": "ETag"
+};
+function humanizeSegment(segment) {
+	let s = segment;
+	try {
+		s = decodeURIComponent(segment);
+	} catch {}
+	s = s.replace(/[-_]+/g, " ").trim();
+	return s.charAt(0).toUpperCase() + s.slice(1);
+}
 const routePathOf = /* @__PURE__ */ new WeakMap();
+function isDecodablePath(pathname) {
+	try {
+		for (const segment of pathname.split("/"));
+		return true;
+	} catch {
+		return false;
+	}
+}
 function createPipeline(cfg) {
 	const { docConfig, agent } = cfg;
 	const NotFound = cfg.notFoundComponent ?? DefaultNotFound;
+	const publishesCatalogs = agent.discovery && !docConfig.basePath;
 	function htmlHeaders() {
-		const headers = new Headers({ "content-type": "text/html; charset=utf-8" });
-		const links = [buildLinkHeader(agent), ...cfg.earlyHints ?? []].filter(Boolean);
+		const headers = new Headers({
+			"content-type": "text/html; charset=utf-8",
+			vary: "accept"
+		});
+		const links = [buildLinkHeader(agent, { catalogs: publishesCatalogs }), ...cfg.earlyHints ?? []].filter(Boolean);
 		if (links.length) headers.set("link", links.join(", "));
 		if (cfg.htmlCacheControl) headers.set("cache-control", cfg.htmlCacheControl);
 		return headers;
@@ -66,18 +105,52 @@ function createPipeline(cfg) {
 			protocol: ctx.url.protocol.replace(":", "")
 		});
 	}
-	function pageProps(ctx) {
-		const host = ctx.url.hostname.toLowerCase();
+	function pageProps(ctx, def) {
+		const isHome = routePathOf.get(ctx) === "/";
 		return {
 			pageUrl: ctx.url.href,
-			isHome: routePathOf.get(ctx) === "/",
-			onLocaleDomain: cfg.i18n ? Object.values(cfg.i18n.locales).some((l) => l.domain?.toLowerCase() === host) : false
+			isHome,
+			onLocaleDomain: onLocaleDomain(ctx),
+			markdownHref: agent.discovery && def.md !== false ? markdownPath(ctx.url.pathname, isHome) : void 0
 		};
 	}
+	async function breadcrumbsFor(ctx, meta) {
+		const routePath = routePathOf.get(ctx);
+		if (!routePath || routePath === "/" || meta?.breadcrumb === false) return void 0;
+		const urlPath = ctx.url.pathname.replace(/\/+$/, "") || "/";
+		const route = routePath.replace(/\/+$/, "");
+		const prefix = urlPath.endsWith(route) ? urlPath.slice(0, urlPath.length - route.length) : "";
+		const home = {
+			name: siteShortName(docConfig.site) ?? documentTitle(void 0, docConfig.site),
+			path: prefix || "/"
+		};
+		if (Array.isArray(meta?.breadcrumb)) return [home, ...meta.breadcrumb];
+		const segments = route.split("/").filter(Boolean);
+		const trail = [home];
+		for (let i = 1; i < segments.length; i++) {
+			const ancestor = "/" + segments.slice(0, i).join("/");
+			const r = await resolveRoute(ancestor);
+			if (!r || "handler" in r || Object.keys(r.params).length > 0) continue;
+			const title = typeof r.def.metadata === "object" ? r.def.metadata?.title : void 0;
+			trail.push({
+				name: title || humanizeSegment(segments[i - 1]),
+				path: prefix + ancestor
+			});
+		}
+		trail.push({
+			name: meta?.title || humanizeSegment(segments[segments.length - 1]),
+			path: urlPath
+		});
+		return trail;
+	}
+	function onLocaleDomain(ctx) {
+		const host = ctx.url.hostname.toLowerCase();
+		return cfg.i18n ? Object.values(cfg.i18n.locales).some((l) => l.domain?.toLowerCase() === host) : false;
+	}
 	async function renderDocument(node, metadata, status, chain, locale, boundaryKey, alternates, page) {
 		const wrapped = chain.reduceRight((acc, L) => React.createElement(L, null, acc), node);
 		const stream = await renderToReadableStream(React.createElement(Document, {
-			config: docConfigForRender(),
+			config: docConfigForRender(page?.pageUrl),
 			metadata,
 			children: wrapped,
 			shellKey: boundaryKey,
@@ -93,7 +166,8 @@ function createPipeline(cfg) {
 	}
 	async function renderFragment(node, metadata, chain, boundaryIndex, boundaryKey) {
 		const segmented = typeof boundaryIndex === "number" && boundaryKey != null;
-		const stream = await renderToReadableStream((segmented ? chain.slice(boundaryIndex + 1) : chain).reduceRight((acc, L) => React.createElement(L, null, acc), node));
+		const wrapped = (segmented ? chain.slice(boundaryIndex + 1) : chain).reduceRight((acc, L) => React.createElement(L, null, acc), node);
+		const stream = await renderToReadableStream(wrapped);
 		await stream.allReady;
 		const html = await new Response(stream).text();
 		const headers = new Headers({ "content-type": "text/html; charset=utf-8" });
@@ -105,14 +179,16 @@ function createPipeline(cfg) {
 			headers
 		});
 	}
-	function docConfigForRender() {
+	function docConfigForRender(pageUrl) {
 		const webmcpTools = agent.webmcp && agent.mcp ? mcpTools() : null;
-		return webmcpTools?.length ? {
+		const servesCatalog = !!pageUrl && catalogOrigin(new URL(pageUrl)) !== null;
+		return {
 			...docConfig,
-			webmcpTools
-		} : docConfig;
+			...webmcpTools?.length ? { webmcpTools } : {},
+			...servesCatalog ? { aiCatalog: AI_CATALOG_PATH } : {}
+		};
 	}
-	async function renderStreamingDocument(resolved, loadPromise, ctx) {
+	async function renderStreamingDocument(resolved, loadPromise, ctx, breadcrumbs) {
 		const { def, chain, loading: Loading, boundaryKey } = resolved;
 		const leaf = React.createElement(StreamedView, {
 			loadPromise,
@@ -123,12 +199,13 @@ function createPipeline(cfg) {
 		const wrapped = chain.reduceRight((acc, L) => React.createElement(L, null, acc), boundary);
 		const metadata = typeof def.metadata === "object" ? def.metadata : void 0;
 		const stream = await renderToReadableStream(React.createElement(Document, {
-			config: docConfigForRender(),
+			config: docConfigForRender(ctx.url.href),
 			metadata,
 			children: wrapped,
 			shellKey: boundaryKey,
 			alternates: alternatesFor(ctx),
-			...pageProps(ctx),
+			...pageProps(ctx, def),
+			breadcrumbs,
 			...langDir(ctx.locale)
 		}), { onError: (e) => console.error("[june] streaming render error:", e) });
 		return new Response(stream, {
@@ -136,23 +213,74 @@ function createPipeline(cfg) {
 			headers: htmlHeaders()
 		});
 	}
-	function notFoundResponse(target, pathname, locale) {
-		return target !== "view" ? Response.json({
+	async function resolveRoute(pathname) {
+		return isDecodablePath(pathname) ? cfg.resolve(pathname) : null;
+	}
+	function notFoundResponse(target, pathname, locale, unmatched) {
+		if (unmatched && agent.api) {
+			const url = new URL(unmatched.url);
+			if (isApiNamespace(url.pathname)) return apiNamespaceResponse(unmatched, url.origin);
+		}
+		if (target === "md") return discoveryLinks().then((links) => text(notFoundMarkdown(pathname, links), "text/markdown; charset=utf-8", {
+			status: 404,
+			headers: { vary: "accept" }
+		}));
+		if (target !== "view") return discoveryLinks().then((links) => Response.json({
 			error: "Not Found",
-			path: pathname
-		}, { status: 404 }) : renderDocument(React.createElement(NotFound, { pathname }), {
+			code: "not_found",
+			path: pathname,
+			hint: notFoundHint(links)
+		}, {
+			status: 404,
+			headers: { vary: "accept" }
+		}));
+		return renderDocument(React.createElement(NotFound, { pathname }), {
 			title: "Not found",
 			robots: "noindex"
 		}, 404, [], locale);
 	}
+	async function discoveryLinks() {
+		const links = [];
+		if (agent.discovery) links.push(["llms.txt — the site index for agents", "/llms.txt"], ["sitemap.xml — every page", "/sitemap.xml"]);
+		if (agent.mcp) links.push(["MCP server — this site's tools", "/mcp"]);
+		if (agent.api) links.push(["OpenAPI — the same tools over HTTP", "/openapi.json"]);
+		const home = await cfg.resolve("/");
+		if (home && "def" in home && home.def.md !== false) links.push(["Home page (Markdown)", "/index.md"]);
+		return links;
+	}
+	function notFoundHint(links) {
+		return links.length ? `No page at this path. Start from ${links.map(([, h]) => h).join(", ")}.` : "No page at this path.";
+	}
+	function notFoundMarkdown(pathname, links) {
+		const site = docConfig.site.name ? ` on ${docConfig.site.name}` : "";
+		return [
+			"# 404 — Not found",
+			"",
+			links.length ? `There is no page at \`${pathname}\`${site}. Try one of these instead:` : `There is no page at \`${pathname}\`${site}.`,
+			"",
+			...links.map(([label, href]) => `- [${label}](${href})`),
+			""
+		].join("\n");
+	}
 	function resolveMeta(def, data, ctx) {
 		return typeof def.metadata === "function" ? def.metadata(data, ctx) : def.metadata;
 	}
 	async function renderMarkdown(def, data, ctx) {
 		const jsonData = typeof def.json === "function" ? await def.json(data, ctx) : def.json === false ? null : data;
-		const body = typeof def.md === "function" ? await def.md(data, ctx) : "```json\n" + JSON.stringify(jsonData, null, 2) + "\n```\n";
+		const body = withFrontmatter(typeof def.md === "function" ? await def.md(data, ctx) : "```json\n" + JSON.stringify(jsonData, null, 2) + "\n```\n", resolveMeta(def, data, ctx), ctx);
 		return text(body, "text/markdown; charset=utf-8", { headers: { "x-markdown-tokens": String(Math.ceil(body.length / 4)) } });
 	}
+	function withFrontmatter(body, meta, ctx) {
+		if (/^---\r?\n/.test(body)) return body;
+		const title = meta?.title || documentTitle(meta, docConfig.site);
+		const description = meta?.description ?? docConfig.site.description;
+		const canonical = pageCanonical(docConfig, meta, ctx.url.href, htmlPath(ctx.url.pathname, routePathOf.get(ctx) === "/"), onLocaleDomain(ctx));
+		const lines = ["---", `title: ${JSON.stringify(title)}`];
+		if (description) lines.push(`description: ${JSON.stringify(description)}`);
+		if (canonical) lines.push(`canonical: ${JSON.stringify(canonical)}`);
+		lines.push("---", "");
+		return lines.join("\n") + body;
+	}
 	async function renderProjection(resolved, target, data, ctx) {
 		const { def, chain, boundaryIndex, boundaryKey } = resolved;
 		if (target !== "fragment" && def[target] === false) return notFoundResponse(target, ctx.url.pathname, ctx.locale);
@@ -169,19 +297,74 @@ function createPipeline(cfg) {
 		const node = provideLoaderData(data, def.view ? def.view(data, ctx) : null);
 		const meta = resolveMeta(def, data, ctx);
 		if (target === "fragment") return renderFragment(node, meta, chain, boundaryIndex, boundaryKey);
-		return renderDocument(node, meta, 200, chain, ctx.locale, boundaryKey, alternatesFor(ctx), pageProps(ctx));
+		const page = {
+			...pageProps(ctx, def),
+			breadcrumbs: await breadcrumbsFor(ctx, meta)
+		};
+		return renderDocument(node, meta, 200, chain, ctx.locale, boundaryKey, alternatesFor(ctx), page);
+	}
+	function catalogOrigin(url) {
+		return publishesCatalogs ? publicOrigin(url) : null;
+	}
+	function publicOrigin(url) {
+		if (url.origin !== PRERENDER_ORIGIN) return url.origin;
+		return docConfig.site.url ? new URL(docConfig.site.url).origin : docConfig.deployOrigin ?? null;
+	}
+	function publicBase(url) {
+		const origin = publicOrigin(url);
+		return origin === null ? null : origin + (docConfig.basePath ?? "");
+	}
+	async function agentCatalog(url) {
+		const { pathname } = url;
+		if (!pathname.startsWith("/.well-known/")) return null;
+		const origin = catalogOrigin(url);
+		if (!origin) return null;
+		if (pathname === AGENT_SKILLS_INDEX_PATH) return Response.json(await agentSkillsIndex(origin, agent, docConfig.site), { headers: CORS });
+		if (pathname === AI_CATALOG_PATH || pathname === ARD_PATH) return Response.json(aiCatalog(origin, agent, docConfig.site), { headers: CORS });
+		const skill = siteSkill(origin, agent, docConfig.site);
+		if (pathname === new URL(skill.url).pathname) return text(skill.markdown, "text/markdown; charset=utf-8", { headers: CORS });
+		if (pathname.startsWith("/.well-known/agent-skills/")) return Response.json({
+			error: "Not Found",
+			path: pathname
+		}, {
+			status: 404,
+			headers: CORS
+		});
+		return null;
 	}
 	async function discovery(url) {
+		const catalog = await agentCatalog(url);
+		if (catalog) return catalog;
 		switch (url.pathname) {
 			case "/llms.txt": {
 				const routes = await cfg.routeList();
-				const links = await collectLlmsLinks(url.origin, routes, cfg.resolve);
-				return text(llmsTxt(url.origin, routes, agent, docConfig.site, links), "text/markdown; charset=utf-8");
+				const base = publicBase(url) ?? docConfig.basePath ?? "";
+				const links = await collectLlmsLinks(base, routes, cfg.resolve);
+				return text(llmsTxt(base, routes, agent, docConfig.site, links), "text/markdown; charset=utf-8");
+			}
+			case "/robots.txt": {
+				const base = publicBase(url);
+				if (base === null) return text("Not Found\n", "text/plain; charset=utf-8", { status: 404 });
+				return text(robotsTxt(base, { catalogs: catalogOrigin(url) !== null }), "text/plain; charset=utf-8");
+			}
+			case "/sitemap.xml": {
+				const base = publicBase(url);
+				if (base === null) return text("Not Found\n", "text/plain; charset=utf-8", { status: 404 });
+				return text(sitemapXml(base, await collectSitemapPages(await cfg.routeList(), cfg.resolve, {
+					i18n: !!cfg.i18n,
+					staticPaths: cfg.staticBuild === true
+				}), cfg.i18n), "application/xml; charset=utf-8");
 			}
-			case "/robots.txt": return text(robotsTxt(url.origin), "text/plain; charset=utf-8");
-			case "/sitemap.xml": return text(sitemapXml(url.origin, await cfg.routeList(), cfg.i18n), "application/xml; charset=utf-8");
-			case "/.well-known/api-catalog": return text(JSON.stringify(apiCatalog(url.origin, agent)), "application/linkset+json");
-			case "/.well-known/mcp/server-card.json": return agent.mcp ? Response.json(mcpServerCard(url.origin)) : null;
+			case "/.well-known/api-catalog": return text(JSON.stringify(apiCatalog(url.origin, agent)), API_CATALOG_CONTENT_TYPE, { headers: { link: `</.well-known/api-catalog>; rel="api-catalog"` } });
+			case SERVER_CARD_PATH: return agent.mcp ? text(JSON.stringify(mcpServerCard(url.origin, {
+				site: docConfig.site,
+				agent,
+				icons: docConfig.icons,
+				basePath: docConfig.basePath
+			})), MCP_SERVER_CARD_TYPE, { headers: {
+				...SERVER_CARD_CORS,
+				"cache-control": "public, max-age=3600"
+			} }) : null;
 			default: return null;
 		}
 	}
@@ -189,14 +372,45 @@ function createPipeline(cfg) {
 		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;
 			return mcpHandler(request, {
 				request,
-				...cfg.identity ? await cfg.identity(request) : void 0
-			});
+				...identity
+			}, mcpServerIdentity(url.origin, {
+				site: docConfig.site,
+				agent
+			}));
+		}
+		if (agent.api) {
+			if (url.pathname === "/openapi.json" && (request.method === "GET" || request.method === "HEAD")) {
+				const doc = Response.json(openApiDocument(url.origin, docConfig.site), { headers: {
+					"content-type": OPENAPI_MEDIA_TYPE,
+					"access-control-allow-origin": "*"
+				} });
+				return request.method === "HEAD" ? new Response(null, {
+					status: doc.status,
+					headers: doc.headers
+				}) : doc;
+			}
+			const actionId = apiActionId(url.pathname);
+			if (actionId) {
+				const identity = cfg.identity ? await cfg.identity(request) : void 0;
+				return apiHandler(request, actionId, {
+					request,
+					...identity
+				});
+			}
 		}
-		if (request.method === "GET" && agent.discovery) {
+		if (request.method === "OPTIONS" && agent.discovery && agent.mcp && url.pathname === SERVER_CARD_PATH) return new Response(null, {
+			status: 204,
+			headers: SERVER_CARD_CORS
+		});
+		if ((request.method === "GET" || request.method === "HEAD") && agent.discovery) {
 			const d = await discovery(url);
-			if (d) return d;
+			if (d) return request.method === "HEAD" ? new Response(null, {
+				status: d.status,
+				headers: d.headers
+			}) : d;
 		}
 		if (agent.runtime.enabled && cfg.agentSurface) {
 			const a = await cfg.agentSurface(request, url);
@@ -228,8 +442,8 @@ function createPipeline(cfg) {
 			if (locale) setRequestLocale(locale);
 		}
 		const { target, pathname, speculative } = negotiate(url, request, routeBase);
-		const resolved = await cfg.resolve(pathname);
-		if (!resolved) return notFoundResponse(target, pathname, locale);
+		const resolved = await resolveRoute(pathname);
+		if (!resolved) return notFoundResponse(target, pathname, locale, request);
 		const ctx = {
 			request,
 			url,
@@ -240,7 +454,10 @@ function createPipeline(cfg) {
 		};
 		routePathOf.set(ctx, pathname);
 		if ("handler" in resolved) return resolved.handler(request, ctx);
-		if (target === "view" && resolved.loading && typeof resolved.def.metadata !== "function") return renderStreamingDocument(resolved, Promise.resolve(resolved.def.load ? resolved.def.load(ctx) : void 0), ctx);
+		if (target === "view" && resolved.loading && typeof resolved.def.metadata !== "function") {
+			const breadcrumbs = await breadcrumbsFor(ctx, resolved.def.metadata);
+			return renderStreamingDocument(resolved, Promise.resolve(resolved.def.load ? resolved.def.load(ctx) : void 0), ctx, breadcrumbs);
+		}
 		let data;
 		try {
 			data = resolved.def.load ? await resolved.def.load(ctx) : void 0;
@@ -251,11 +468,13 @@ function createPipeline(cfg) {
 	}
 	return { async fetch(request) {
 		await ensureScope();
+		const resources = cfg.resources ? await cfg.resources() : {};
+		const services = cfg.services ? await cfg.services() : void 0;
 		return runInScope({
-			resources: cfg.resources ? await cfg.resources() : {},
-			services: cfg.services ? await cfg.services() : void 0
+			resources,
+			services
 		}, () => handleRequest(request));
 	} };
 }
 //#endregion
-export { createPipeline };
+export { createPipeline, htmlPath, isDecodablePath, markdownPath };

package/dist/resources.d.ts

@@ -1,15 +1,14 @@
 import { t as D1Database } from "./d1-BkdUg9kg.js";
 import { ResourceConfig, Resources } from "@junejs/core/resources";
 //#region src/resources.d.ts
-declare function memoizeResources(config?: ResourceConfig): () => Promise<Resources>;
-type WorkerEnv = {
+export declare function memoizeResources(config?: ResourceConfig): () => Promise<Resources>;
+export type WorkerEnv = {
   DB?: D1Database;
 } & Record<string, unknown>;
-type ResourceFlags = {
+export type ResourceFlags = {
   db?: boolean;
   kv?: boolean;
   blob?: boolean;
 };
-declare function bindWorkerResources(flags: ResourceFlags): (env?: unknown) => Promise<Resources>;
-//#endregion
-export { ResourceFlags, WorkerEnv, bindWorkerResources, memoizeResources };
+export declare function bindWorkerResources(flags: ResourceFlags): (env?: unknown) => Promise<Resources>;
+//#endregion

package/dist/router.d.ts

@@ -1,32 +1,31 @@
 //#region src/router.d.ts
-type RouteMatch = {
+export type RouteMatch = {
   file: string;
   params: Record<string, string>;
 };
-type SegmentMatch = {
+export type SegmentMatch = {
   dir: string;
   layout?: string;
   loading?: string;
   error?: string;
   notFound?: string;
 };
-type RouteTreeMatch = {
+export type RouteTreeMatch = {
   file: string;
   params: Record<string, string>;
   segments: SegmentMatch[];
 };
-declare function findMiddlewareFile(appDir: string): string | null;
-type MatchOptions = {
+export declare function findMiddlewareFile(appDir: string): string | null;
+export type MatchOptions = {
   pageConvention?: boolean;
 };
-declare function isResourceFile(file: string): boolean;
-declare function matchRouteTree(appDir: string, pathname: string, options?: MatchOptions): Promise<RouteTreeMatch | null>;
-declare function resolveNotFound(appDir: string, pathname: string): Promise<{
+export declare function isResourceFile(file: string): boolean;
+export declare function matchRouteTree(appDir: string, pathname: string, options?: MatchOptions): Promise<RouteTreeMatch | null>;
+export declare function resolveNotFound(appDir: string, pathname: string): Promise<{
   segments: SegmentMatch[];
   notFound?: string;
 }>;
-declare function routeFiles(appDir: string, options?: MatchOptions): Promise<string[]>;
-declare function listRoutes(appDir: string, options?: MatchOptions): Promise<string[]>;
-declare function matchRoute(appDir: string, pathname: string, options?: MatchOptions): Promise<RouteMatch | null>;
-//#endregion
-export { MatchOptions, RouteMatch, RouteTreeMatch, SegmentMatch, findMiddlewareFile, isResourceFile, listRoutes, matchRoute, matchRouteTree, resolveNotFound, routeFiles };
+export declare function routeFiles(appDir: string, options?: MatchOptions): Promise<string[]>;
+export declare function listRoutes(appDir: string, options?: MatchOptions): Promise<string[]>;
+export declare function matchRoute(appDir: string, pathname: string, options?: MatchOptions): Promise<RouteMatch | null>;
+//#endregion

package/dist/rsc-build.d.ts

@@ -1,17 +1,16 @@
 import { DocumentConfig } from "@junejs/core/document";
 //#region src/rsc-build.d.ts
-type RscRoute = {
+export type RscRoute = {
   path: string;
   file: string;
 };
-declare function findRscRoutes(appDir: string): RscRoute[];
-type RscBuildResult = {
+export declare function findRscRoutes(appDir: string): RscRoute[];
+export type RscBuildResult = {
   worker: string;
   server: string;
   paths: string[];
 } | null;
-declare function buildRsc(appRoot: string, outDir: string, docConfig: DocumentConfig): Promise<RscBuildResult>;
+export declare function buildRsc(appRoot: string, outDir: string, docConfig: DocumentConfig): Promise<RscBuildResult>;
 type Fetcher = (request: Request) => Promise<Response>;
-declare function createRscDispatch(ssrFetch: Fetcher, rscFetch: Fetcher, rscPaths: Iterable<string>): Fetcher;
-//#endregion
-export { RscBuildResult, RscRoute, buildRsc, createRscDispatch, findRscRoutes };
+export declare function createRscDispatch(ssrFetch: Fetcher, rscFetch: Fetcher, rscPaths: Iterable<string>): Fetcher;
+//#endregion

package/dist/rsc-bundle.d.ts

@@ -1,8 +1,7 @@
 //#region src/rsc-bundle.d.ts
-type RscGraph = "server" | "ssr";
-type RscAliases = Record<string, string>;
-declare function bundleServerGraph(entryFile: string, cwd: string, aliases?: RscAliases, appDir?: string): Promise<string>;
-declare function bundleSsrGraph(entryFile: string, cwd: string, aliases?: RscAliases): Promise<string>;
-declare function referencesNodeBuiltins(code: string): boolean;
-//#endregion
-export { RscAliases, RscGraph, bundleServerGraph, bundleSsrGraph, referencesNodeBuiltins };
+export type RscGraph = "server" | "ssr";
+export type RscAliases = Record<string, string>;
+export declare function bundleServerGraph(entryFile: string, cwd: string, aliases?: RscAliases, appDir?: string): Promise<string>;
+export declare function bundleSsrGraph(entryFile: string, cwd: string, aliases?: RscAliases): Promise<string>;
+export declare function referencesNodeBuiltins(code: string): boolean;
+//#endregion

package/dist/rsc-manifest.d.ts

@@ -1,8 +1,7 @@
 import { Plugin } from "rolldown";
 //#region src/rsc-manifest.d.ts
-declare const RSC_SERVER_MANIFEST_FILE = "_rsc-server.gen.ts";
-declare const RSC_CLIENT_MANIFEST_FILE = "_rsc-client.gen.ts";
-declare function rscClientReferencesPlugin(appDir: string): Plugin;
-declare function generateRscManifests(appDir: string): number;
-//#endregion
-export { RSC_CLIENT_MANIFEST_FILE, RSC_SERVER_MANIFEST_FILE, generateRscManifests, rscClientReferencesPlugin };
+export declare const RSC_SERVER_MANIFEST_FILE = "_rsc-server.gen.ts";
+export declare const RSC_CLIENT_MANIFEST_FILE = "_rsc-client.gen.ts";
+export declare function rscClientReferencesPlugin(appDir: string): Plugin;
+export declare function generateRscManifests(appDir: string): number;
+//#endregion

package/dist/rsc-runtime/flight-render-routes.d.ts

@@ -1,5 +1,4 @@
 //#region src/rsc-runtime/flight-render-routes.d.ts
-declare function renderFlight(path: string): Promise<string | null>;
-declare function rscPaths(): string[];
-//#endregion
-export { renderFlight, rscPaths };
+export declare function renderFlight(path: string): Promise<string | null>;
+export declare function rscPaths(): string[];
+//#endregion

package/dist/rsc-runtime/flight-render.d.ts

@@ -1,4 +1,3 @@
 //#region src/rsc-runtime/flight-render.d.ts
-declare function renderFlight(): Promise<string>;
-//#endregion
-export { renderFlight };
+export declare function renderFlight(): Promise<string>;
+//#endregion

package/dist/rsc-runtime/flight-to-html.d.ts

@@ -1,4 +1,3 @@
 //#region src/rsc-runtime/flight-to-html.d.ts
-declare function flightToHtml(flight: string, moduleMap?: Record<string, unknown>): Promise<string>;
-//#endregion
-export { flightToHtml };
+export declare function flightToHtml(flight: string, moduleMap?: Record<string, unknown>): Promise<string>;
+//#endregion

package/dist/rsc-runtime/flight-to-html.js

@@ -20,11 +20,12 @@ async function streamToString(stream) {
 }
 async function flightToHtml(flight, moduleMap = {}) {
 	const flightStream = new Response(flight).body;
-	const html = await renderToReadableStream(/* @__PURE__ */ jsx(Root, { tree: createFromReadableStream(flightStream, { serverConsumerManifest: {
+	const tree = createFromReadableStream(flightStream, { serverConsumerManifest: {
 		moduleMap,
 		serverModuleMap: null,
 		moduleLoading: null
-	} }) }));
+	} });
+	const html = await renderToReadableStream(/* @__PURE__ */ jsx(Root, { tree }));
 	if (typeof html.allReady?.then === "function") await html.allReady;
 	return streamToString(html);
 }

package/dist/rsc-runtime/rsdw-shims.d.ts

@@ -39,4 +39,5 @@ declare module "june:rsc-client" {
 declare module "june:rsc-config" {
   import type { DocumentConfig } from "@junejs/core/document";
   export const DOC_CONFIG: DocumentConfig;
-}
+}
+export {};

package/dist/segment.d.ts

@@ -1,7 +1,7 @@
 //#region src/segment.d.ts
-declare const boundaryWarning: (file: string) => string;
-declare function boundaryKey(file: string): string;
-declare function resolveBoundary<C>(items: Array<{
+export declare const boundaryWarning: (file: string) => string;
+export declare function boundaryKey(file: string): string;
+export declare function resolveBoundary<C>(items: Array<{
   file: string;
   entry: C | null;
   boundary: boolean;
@@ -10,5 +10,4 @@ declare function resolveBoundary<C>(items: Array<{
   boundaryIndex: number | null;
   key: string | null;
 };
-//#endregion
-export { boundaryKey, boundaryWarning, resolveBoundary };
+//#endregion