eclipsa 0.1.8 → 0.1.10

package/vite/mod.mjs

@@ -1,4 +1,4 @@
-import { Hn as runHandleError, Kn as withServerRequestContext, L as primeLocationState, Mn as APP_HOOKS_ELEMENT_ID, Nn as attachRequestFetch, Pn as createRequestFetch, Rn as markPublicError, Vn as resolveReroute, _n as ROUTE_RPC_URL_HEADER, bn as renderRouteMetadataHead, fn as ROUTE_MANIFEST_ELEMENT_ID, hn as ROUTE_PREFLIGHT_REQUEST_HEADER, ln as ROUTE_DATA_ENDPOINT, mn as ROUTE_PREFLIGHT_ENDPOINT, un as ROUTE_DATA_REQUEST_HEADER, yn as composeRouteMetadata } from "../action-DqgkV3zb.mjs";
+import { Bn as createRequestFetch, Fn as applyActionCsrfCookie, In as ensureActionCsrfToken, Jn as runHandleError, L as primeLocationState, Qn as withServerRequestContext, Rn as APP_HOOKS_ELEMENT_ID, Wn as markPublicError, bn as composeRouteMetadata, dn as ROUTE_DATA_REQUEST_HEADER, gn as ROUTE_PREFLIGHT_REQUEST_HEADER, hn as ROUTE_PREFLIGHT_ENDPOINT, pn as ROUTE_MANIFEST_ELEMENT_ID, qn as resolveReroute, un as ROUTE_DATA_ENDPOINT, vn as ROUTE_RPC_URL_HEADER, xn as renderRouteMetadataHead, zn as attachRequestFetch } from "../action-DCc4fBhy.mjs";
 import { a as jsxDEV, t as Fragment } from "../jsx-dev-runtime-DpbWQ4Q0.mjs";
 import { t as RESUME_HMR_EVENT } from "../resume-hmr-qTpLc5o-.mjs";
 import { createServerModuleRunner, transformWithOxc } from "vite";
@@ -19,6 +19,14 @@ const normalizeRoutePath = (pathname) => {
 	if (withLeadingSlash.length > 1 && withLeadingSlash.endsWith("/")) return withLeadingSlash.slice(0, -1);
 	return withLeadingSlash;
 };
+const decodeRoutePathSegment = (segment) => {
+	try {
+		return decodeURIComponent(segment);
+	} catch {
+		return segment;
+	}
+};
+const splitRoutePath = (pathname) => normalizeRoutePath(pathname).split("/").filter(Boolean).map(decodeRoutePathSegment);
 const createDirectoryEntry = () => ({
 	error: null,
 	layout: null,
@@ -149,7 +157,7 @@ const matchSegments = (segments, pathnameSegments, routeIndex = 0, pathIndex = 0
 	}
 };
 const toMatch = (route, pathname) => {
-	const pathnameSegments = normalizeRoutePath(pathname).split("/").filter(Boolean);
+	const pathnameSegments = splitRoutePath(pathname);
 	const params = matchSegments(route.segments, pathnameSegments);
 	if (!params) return null;
 	return {
@@ -861,6 +869,7 @@ const getRequestUrl = (request) => {
 	if (proto) url.protocol = `${proto}:`;
 	return url;
 };
+const createInternalRouteRequestUrl = (request, targetUrl) => new URL(`${targetUrl.pathname}${targetUrl.search}`, request.url).href;
 const toAppRelativePath = (root, filePath) => {
 	const relativePath = path$1.relative(path$1.join(root, "app"), filePath);
 	if (relativePath.startsWith("..") || path$1.isAbsolute(relativePath)) return null;
@@ -1003,7 +1012,13 @@ const createRouteElement = (pathname, params, Page, Layouts, error) => {
 	return children;
 };
 const scoreSpecialRoute = (route, pathname) => {
-	const pathnameSegments = normalizeRoutePath(pathname).split("/").filter(Boolean);
+	const pathnameSegments = normalizeRoutePath(pathname).split("/").filter(Boolean).map((segment) => {
+		try {
+			return decodeURIComponent(segment);
+		} catch {
+			return segment;
+		}
+	});
 	let score = 0;
 	for (let index = 0; index < route.segments.length && index < pathnameSegments.length; index += 1) {
 		const segment = route.segments[index];
@@ -1019,8 +1034,14 @@ const scoreSpecialRoute = (route, pathname) => {
 	return score;
 };
 const findSpecialRoute = (routes, pathname, kind) => {
-	const matched = matchRoute(routes, pathname);
+	const normalizedPath = normalizeRoutePath(pathname);
+	const matched = matchRoute(routes, normalizedPath);
 	if (matched?.route[kind]) return matched;
+	const rawPathSegments = normalizedPath.split("/").filter(Boolean);
+	for (let length = rawPathSegments.length - 1; length >= 0; length -= 1) {
+		const candidate = matchRoute(routes, length === 0 ? "/" : `/${rawPathSegments.slice(0, length).join("/")}`);
+		if (candidate?.route[kind]) return candidate;
+	}
 	let best = null;
 	let bestScore = -1;
 	for (const route of routes) {
@@ -1175,6 +1196,7 @@ const createDevApp = async (init) => {
 		return c.text("Not Found", 404);
 	};
 	const renderRouteResponse = async (route, pathname, params, c, modulePath, status = 200, options) => {
+		ensureActionCsrfToken(c);
 		const [_primedModules, modules, { default: SSRRoot }, { escapeJSONScriptText, getStreamingResumeBootstrapScriptContent, renderSSRStream, resolvePendingLoaders, serializeResumePayload, RESUME_FINAL_STATE_ELEMENT_ID }] = await Promise.all([
 			Promise.all([fileExists$2(modulePath).then((exists) => exists ? primeCompilerCache(modulePath) : void 0), ...route.layouts.map((layout) => fileExists$2(layout.filePath).then((exists) => exists ? primeCompilerCache(layout.filePath) : void 0))]),
 			Promise.all([init.runner.import(modulePath), ...route.layouts.map((layout) => init.runner.import(layout.filePath))]),
@@ -1257,7 +1279,7 @@ const createDevApp = async (init) => {
 		});
 		const { prefix, suffix } = splitHtmlForStreaming(replaceHeadPlaceholder(replaceHeadPlaceholder(replaceHeadPlaceholder(html, RESUME_PAYLOAD_PLACEHOLDER, serializeAppResumePayload(payload)), ROUTE_MANIFEST_PLACEHOLDER, escapeJSONScriptText(JSON.stringify(routeManifest))), APP_HOOKS_PLACEHOLDER, escapeJSONScriptText(JSON.stringify(appHooksManifest))));
 		const encoder = new TextEncoder();
-		return new Response(new ReadableStream({ start(controller) {
+		return applyActionCsrfCookie(new Response(new ReadableStream({ start(controller) {
 			controller.enqueue(encoder.encode(prefix));
 			(async () => {
 				let latestPayload = payload;
@@ -1275,7 +1297,7 @@ const createDevApp = async (init) => {
 		} }), {
 			status,
 			headers: { "content-type": "text/html; charset=utf-8" }
-		});
+		}), c);
 	};
 	const renderMatchedPage = async (match, c, options) => {
 		const requestUrl = getRequestUrl(c.req.raw);
@@ -1354,7 +1376,7 @@ const createDevApp = async (init) => {
 		});
 		const headers = new Headers(c.req.raw.headers);
 		headers.set(ROUTE_DATA_REQUEST_HEADER, "1");
-		const response = await app.fetch(new Request(targetUrl.href, {
+		const response = await app.fetch(new Request(createInternalRouteRequestUrl(c.req.raw, targetUrl), {
 			headers,
 			method: "GET",
 			redirect: "manual"
@@ -1379,19 +1401,11 @@ const createDevApp = async (init) => {
 		if (!resolvePreflightTarget(reroutePathname(new Request(targetUrl.href), normalizeRoutePath(targetUrl.pathname), targetUrl.href))) return c.json({ ok: true });
 		const headers = new Headers(c.req.raw.headers);
 		headers.set(ROUTE_PREFLIGHT_REQUEST_HEADER, "1");
-		let response;
-		try {
-			response = await c.var.fetch(targetUrl.href, {
-				headers,
-				redirect: "manual"
-			});
-		} catch {
-			response = await app.fetch(new Request(targetUrl.href, {
-				headers,
-				method: "GET",
-				redirect: "manual"
-			}));
-		}
+		const response = await app.fetch(new Request(createInternalRouteRequestUrl(c.req.raw, targetUrl), {
+			headers,
+			method: "GET",
+			redirect: "manual"
+		}));
 		if (response.status >= 200 && response.status < 300) return c.json({ ok: true });
 		if (isRedirectResponse(response)) return c.json({
 			location: new URL(response.headers.get("location"), requestUrl).href,
@@ -1948,7 +1962,7 @@ const renderAppModule = (actions, appHooksClientUrl, appHooksServerUrl, loaders,
 	const serializedSymbolUrls = JSON.stringify(symbolUrls);
 	return `import userApp from "./entries/server_entry.mjs";
 import SSRRoot from "./entries/ssr_root.mjs";
-import { ACTION_CONTENT_TYPE, APP_HOOKS_ELEMENT_ID, Fragment, RESUME_FINAL_STATE_ELEMENT_ID, attachRequestFetch, composeRouteMetadata, createRequestFetch, deserializePublicValue, escapeInlineScriptText, escapeJSONScriptText, executeAction, executeLoader, getActionFormSubmissionId, getNormalizedActionInput, getStreamingResumeBootstrapScriptContent, hasAction, hasLoader, jsxDEV, markPublicError, primeActionState, primeLocationState, renderRouteMetadataHead, renderSSRAsync, renderSSRStream, resolvePendingLoaders, resolveReroute, runHandleError, serializeResumePayload, withServerRequestContext } from "./entries/eclipsa_runtime.mjs";
+import { ACTION_CONTENT_TYPE, APP_HOOKS_ELEMENT_ID, Fragment, RESUME_FINAL_STATE_ELEMENT_ID, applyActionCsrfCookie, attachRequestFetch, composeRouteMetadata, createRequestFetch, deserializePublicValue, ensureActionCsrfToken, escapeInlineScriptText, escapeJSONScriptText, executeAction, executeLoader, getActionFormSubmissionId, getNormalizedActionInput, getStreamingResumeBootstrapScriptContent, hasAction, hasLoader, jsxDEV, markPublicError, primeActionState, primeLocationState, renderRouteMetadataHead, renderSSRAsync, renderSSRStream, resolvePendingLoaders, resolveReroute, runHandleError, serializeResumePayload, withServerRequestContext } from "./entries/eclipsa_runtime.mjs";
 
 const app = userApp;
 const actions = {
@@ -1991,6 +2005,18 @@ const normalizeRoutePath = (pathname) => {
     : withLeadingSlash;
 };
 
+const decodeRoutePathSegment = (segment) => {
+  try {
+    return decodeURIComponent(segment);
+  } catch {
+    return segment;
+  }
+};
+
+const splitRawRoutePath = (pathname) => normalizeRoutePath(pathname).split("/").filter(Boolean);
+
+const splitRoutePath = (pathname) => splitRawRoutePath(pathname).map(decodeRoutePathSegment);
+
 const getRequestUrl = (request) => {
   const url = new URL(request.url);
   const host = request.headers.get("x-forwarded-host") ?? request.headers.get("host");
@@ -2004,6 +2030,9 @@ const getRequestUrl = (request) => {
   return url;
 };
 
+const createInternalRouteRequestUrl = (request, targetUrl) =>
+  new URL(targetUrl.pathname + targetUrl.search, request.url).href;
+
 const matchSegments = (segments, pathnameSegments, routeIndex = 0, pathIndex = 0, params = {}) => {
   if (routeIndex >= segments.length) {
     return pathIndex >= pathnameSegments.length ? params : null;
@@ -2054,7 +2083,7 @@ const matchSegments = (segments, pathnameSegments, routeIndex = 0, pathIndex = 0
 };
 
 const matchRoute = (pathname) => {
-  const pathnameSegments = normalizeRoutePath(pathname).split("/").filter(Boolean);
+  const pathnameSegments = splitRoutePath(pathname);
   for (const route of routes) {
     const params = matchSegments(route.segments, pathnameSegments);
     if (params) {
@@ -2065,7 +2094,7 @@ const matchRoute = (pathname) => {
 };
 
 const matchRouteManifestEntry = (pathname) => {
-  const pathnameSegments = normalizeRoutePath(pathname).split("/").filter(Boolean);
+  const pathnameSegments = splitRoutePath(pathname);
   for (const entry of routeManifest) {
     const params = matchSegments(entry.segments, pathnameSegments);
     if (params) {
@@ -2121,7 +2150,7 @@ const createChunkCacheRegistrationScript = (pathname, payload) => {
 };
 
 const scoreSpecialRoute = (route, pathname) => {
-  const pathnameSegments = normalizeRoutePath(pathname).split("/").filter(Boolean);
+  const pathnameSegments = splitRoutePath(pathname);
   let score = 0;
   for (let index = 0; index < route.segments.length && index < pathnameSegments.length; index += 1) {
     const segment = route.segments[index];
@@ -2142,11 +2171,21 @@ const scoreSpecialRoute = (route, pathname) => {
 };
 
 const findSpecialRoute = (pathname, kind) => {
-  const matched = matchRoute(pathname);
+  const normalizedPath = normalizeRoutePath(pathname);
+  const matched = matchRoute(normalizedPath);
   if (matched?.route[kind]) {
     return matched;
   }
 
+  const rawPathSegments = splitRawRoutePath(normalizedPath);
+  for (let length = rawPathSegments.length - 1; length >= 0; length -= 1) {
+    const candidatePath = length === 0 ? "/" : "/" + rawPathSegments.slice(0, length).join("/");
+    const candidate = matchRoute(candidatePath);
+    if (candidate?.route[kind]) {
+      return candidate;
+    }
+  }
+
   let best = null;
   let bestScore = -1;
   for (const route of routes) {
@@ -2468,6 +2507,7 @@ const invokeRouteServer = async (moduleUrl, c, params) => {
 };
 
 const renderRouteResponse = async (route, pathname, params, c, moduleUrl, status = 200, options) => {
+  ensureActionCsrfToken(c);
   const [pageModule, ...layoutModules] = await Promise.all([
     import(moduleUrl),
     ...route.layouts.map((layout) => import(layout)),
@@ -2575,7 +2615,7 @@ const renderRouteResponse = async (route, pathname, params, c, moduleUrl, status
   );
   const { prefix, suffix } = splitHtmlForStreaming(shellHtml);
   const encoder = new TextEncoder();
-  return new Response(
+  return applyActionCsrfCookie(new Response(
     new ReadableStream({
       start(controller) {
         controller.enqueue(encoder.encode(prefix));
@@ -2614,7 +2654,7 @@ const renderRouteResponse = async (route, pathname, params, c, moduleUrl, status
       },
       status,
     },
-  );
+  ), c);
 };
 
 const renderMatchedPage = async (match, c, options) => {
@@ -2705,7 +2745,7 @@ const resolveRouteData = async (href, c) => {
   const headers = new Headers(c.req.raw.headers);
   headers.set(ROUTE_DATA_REQUEST_HEADER, "1");
   const response = await app.fetch(
-    new Request(targetUrl.href, {
+    new Request(createInternalRouteRequestUrl(c.req.raw, targetUrl), {
       headers,
       method: "GET",
       redirect: "manual",
@@ -2738,21 +2778,13 @@ const resolveRoutePreflight = async (href, c) => {
 
   const headers = new Headers(c.req.raw.headers);
   headers.set(ROUTE_PREFLIGHT_REQUEST_HEADER, "1");
-  let response;
-  try {
-    response = await c.var.fetch(targetUrl.href, {
+  const response = await app.fetch(
+    new Request(createInternalRouteRequestUrl(c.req.raw, targetUrl), {
       headers,
+      method: "GET",
       redirect: "manual",
-    });
-  } catch {
-    response = await app.fetch(
-      new Request(targetUrl.href, {
-        headers,
-        method: "GET",
-        redirect: "manual",
-      }),
-    );
-  }
+    }),
+  );
 
   if (response.status >= 200 && response.status < 300) {
     return c.json({ ok: true });