@pracht/core 0.2.5 → 0.2.6

package/README.md

@@ -35,16 +35,16 @@ metadata for the failure phase and matched framework files when available.
 ### Client
 
 - `startApp()` — client-side hydration and runtime
+- `useLocation()` — access the current pathname and search string separately
 - `useRouteData()` — access loader data inside a route component
 - `useRevalidateRoute()` — trigger a revalidation of the current route's data
-- `useSubmitAction()` — submit a form action programmatically
 - `<Form>` — progressive enhancement form component
 
 ### Types
 
 - `LoaderData<T>` — infer the return type of a loader
 - `RouteComponentProps<T>` — props type for route components
-- `LoaderArgs` — argument type passed to loaders and actions
+- `LoaderArgs` — argument type passed to loaders
 
 ## Rendering Modes
 

package/dist/{app-Cep0el7c.mjs → app-CUL3q2ZA.mjs}

@@ -216,7 +216,7 @@ function resolveApiRoutes(files, apiDir = "/src/api") {
 			file,
 			segments: parseRouteSegments(path)
 		};
-	});
+	}).sort(compareResolvedApiRoutes);
 }
 function matchApiRoute(apiRoutes, pathname) {
 	const normalizedPathname = normalizeRoutePath(pathname);
@@ -237,5 +237,23 @@ function createRouteId(path) {
 		return segment.startsWith(":") ? segment.slice(1) : segment;
 	}).join("-").replace(/[^a-zA-Z0-9-]/g, "-");
 }
+function compareResolvedApiRoutes(left, right) {
+	const length = Math.max(left.segments.length, right.segments.length);
+	for (let index = 0; index < length; index += 1) {
+		const leftSegment = left.segments[index];
+		const rightSegment = right.segments[index];
+		if (!leftSegment) return 1;
+		if (!rightSegment) return -1;
+		const leftScore = getRouteSegmentSpecificity(leftSegment);
+		const rightScore = getRouteSegmentSpecificity(rightSegment);
+		if (leftScore !== rightScore) return rightScore - leftScore;
+	}
+	return left.path.localeCompare(right.path);
+}
+function getRouteSegmentSpecificity(segment) {
+	if (segment.type === "static") return 3;
+	if (segment.type === "param") return 2;
+	return 1;
+}
 //#endregion
 export { matchApiRoute as a, resolveApp as c, group as i, route as l, buildPathFromSegments as n, matchAppRoute as o, defineApp as r, resolveApiRoutes as s, app_exports as t, timeRevalidate as u };

package/dist/index.d.mts

@@ -334,6 +334,7 @@ declare function readHydrationState<TData = unknown>(): PrachtHydrationState<TDa
 declare function useRouteData<TData = unknown>(): TData;
 interface Location {
   pathname: string;
+  search: string;
 }
 declare function useLocation(): Location;
 declare function useParams(): RouteParams;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as matchApiRoute, c as resolveApp, i as group, l as route, n as buildPathFromSegments, o as matchAppRoute, r as defineApp, s as resolveApiRoutes, u as timeRevalidate } from "./app-Cep0el7c.mjs";
+import { a as matchApiRoute, c as resolveApp, i as group, l as route, n as buildPathFromSegments, o as matchAppRoute, r as defineApp, s as resolveApiRoutes, u as timeRevalidate } from "./app-CUL3q2ZA.mjs";
 import { createContext, h, hydrate, options, render } from "preact";
 import { useContext, useEffect, useMemo, useState } from "preact/hooks";
 import { Suspense, lazy } from "preact-suspense";
@@ -137,7 +137,7 @@ function useRouteData() {
 	return useContext(RouteDataContext)?.data;
 }
 function useLocation() {
-	return { pathname: useContext(RouteDataContext)?.url ?? (typeof window !== "undefined" ? window.location.pathname : "/") };
+	return parseLocation(useContext(RouteDataContext)?.url ?? (typeof window !== "undefined" ? window.location.pathname + window.location.search : "/"));
 }
 function useParams() {
 	return useContext(RouteDataContext)?.params ?? {};
@@ -200,6 +200,10 @@ async function fetchPrachtRouteState(url) {
 		type: "redirect"
 	};
 	const json = await response.json();
+	if (json.redirect) return {
+		location: json.redirect,
+		type: "redirect"
+	};
 	if (!response.ok) {
 		if (json.error) return {
 			error: json.error,
@@ -214,6 +218,7 @@ async function fetchPrachtRouteState(url) {
 }
 async function handlePrachtRequest(options) {
 	const url = new URL(options.request.url);
+	const requestPath = getRequestPath(url);
 	const registry = options.registry ?? {};
 	const isRouteStateRequest = options.request.headers.get(ROUTE_STATE_REQUEST_HEADER) === "1";
 	const exposeDiagnostics = shouldExposeServerErrors(options);
@@ -315,7 +320,7 @@ async function handlePrachtRequest(options) {
 			route: match.route,
 			url
 		});
-		if (middlewareResult.response) return withRouteResponseHeaders(middlewareResult.response, { isRouteStateRequest });
+		if (middlewareResult.response) return normalizePageResponse(middlewareResult.response, { isRouteStateRequest });
 		routeArgs = {
 			...routeArgs,
 			context: middlewareResult.context
@@ -327,7 +332,7 @@ async function handlePrachtRequest(options) {
 		const { loader, loaderFile: resolvedLoaderFile } = await resolveDataFunctions(match.route, routeModule, registry);
 		loaderFile = resolvedLoaderFile;
 		const loaderResult = loader ? await loader(routeArgs) : void 0;
-		if (loaderResult instanceof Response) return withRouteResponseHeaders(loaderResult, { isRouteStateRequest });
+		if (loaderResult instanceof Response) return normalizePageResponse(loaderResult, { isRouteStateRequest });
 		const data = loaderResult;
 		if (isRouteStateRequest) return withRouteResponseHeaders(Response.json({ data }), { isRouteStateRequest: true });
 		currentPhase = "render";
@@ -348,7 +353,7 @@ async function handlePrachtRequest(options) {
 				head,
 				body,
 				hydrationState: {
-					url: url.pathname,
+					url: requestPath,
 					routeId: match.route.id ?? "",
 					data: null,
 					error: null,
@@ -372,13 +377,13 @@ async function handlePrachtRequest(options) {
 			data,
 			params: match.params,
 			routeId: match.route.id ?? "",
-			url: url.pathname
+			url: requestPath
 		}, componentTree);
 		return htmlResponse(buildHtmlDocument({
 			head,
 			body: await (await getRenderToStringAsync())(tree),
 			hydrationState: {
-				url: url.pathname,
+				url: requestPath,
 				routeId: match.route.id ?? "",
 				data,
 				error: null
@@ -399,10 +404,27 @@ async function handlePrachtRequest(options) {
 			routeModule,
 			shellFile: match.route.shellFile,
 			shellModule,
-			urlPathname: url.pathname
+			requestPath
 		});
 	}
 }
+function parseLocation(value) {
+	try {
+		const url = new URL(value, "http://pracht.local");
+		return {
+			pathname: url.pathname,
+			search: url.search
+		};
+	} catch {
+		return {
+			pathname: value || "/",
+			search: ""
+		};
+	}
+}
+function getRequestPath(url) {
+	return `${url.pathname}${url.search}`;
+}
 /** Strip leading `./` and `/` so all module paths share one canonical form. */
 function normalizeModulePath(path) {
 	return path.replace(/^\.?\//, "");
@@ -553,6 +575,24 @@ function jsonErrorResponse(routeError, options) {
 		headers
 	});
 }
+function jsonRedirectResponse(location, options) {
+	const headers = new Headers(options.headers);
+	headers.set("content-type", "application/json; charset=utf-8");
+	return withRouteResponseHeaders(new Response(JSON.stringify({ redirect: location }), {
+		status: 200,
+		headers
+	}), { isRouteStateRequest: options.isRouteStateRequest });
+}
+function normalizePageResponse(response, options) {
+	if (options.isRouteStateRequest && response.status >= 300 && response.status < 400) {
+		const location = response.headers.get("location");
+		if (location) return jsonRedirectResponse(location, {
+			headers: response.headers,
+			isRouteStateRequest: true
+		});
+	}
+	return withRouteResponseHeaders(response, options);
+}
 function renderApiErrorResponse(options) {
 	const exposeDetails = shouldExposeServerErrors(options.options);
 	const routeError = normalizeRouteError(options.error, { exposeDetails });
@@ -610,10 +650,10 @@ async function renderRouteErrorResponse(options) {
 		body: await renderToString(h(PrachtRuntimeProvider, {
 			data: null,
 			routeId: options.routeId,
-			url: options.urlPathname
+			url: options.requestPath
 		}, componentTree)),
 		hydrationState: {
-			url: options.urlPathname,
+			url: options.requestPath,
 			routeId: options.routeId,
 			data: null,
 			error: routeErrorWithDiagnostics
@@ -784,7 +824,7 @@ function serializeJsonForHtml(value) {
 	return JSON.stringify(value).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/&/g, "\\u0026").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
 }
 async function prerenderApp(options) {
-	const { resolveApp } = await import("./app-Cep0el7c.mjs").then((n) => n.t);
+	const { resolveApp } = await import("./app-CUL3q2ZA.mjs").then((n) => n.t);
 	const resolved = resolveApp(options.app);
 	const results = [];
 	const isgManifest = {};
@@ -846,7 +886,7 @@ async function collectSSGPaths(route, registry) {
 		console.warn(`  Warning: SSG route "${route.path}" has dynamic segments but no getStaticPaths() export, skipping.`);
 		return [];
 	}
-	const { buildPathFromSegments } = await import("./app-Cep0el7c.mjs").then((n) => n.t);
+	const { buildPathFromSegments } = await import("./app-CUL3q2ZA.mjs").then((n) => n.t);
 	return (await routeModule.getStaticPaths()).map((params) => buildPathFromSegments(route.segments, params));
 }
 //#endregion
@@ -874,6 +914,13 @@ function prefetchRouteState(url) {
 }
 function setupPrefetching(app, warmModules) {
 	let hoverTimer = null;
+	function getRoutePathname(url) {
+		try {
+			return new URL(url, window.location.origin).pathname;
+		} catch {
+			return null;
+		}
+	}
 	function getInternalHref(anchor) {
 		const href = anchor.getAttribute("href");
 		if (!href || href.startsWith("#")) return null;
@@ -887,7 +934,9 @@ function setupPrefetching(app, warmModules) {
 		return url.pathname + url.search;
 	}
 	function getPrefetchStrategy(pathname) {
-		const match = matchAppRoute(app, pathname);
+		const routePathname = getRoutePathname(pathname);
+		if (!routePathname) return "none";
+		const match = matchAppRoute(app, routePathname);
 		if (!match) return "none";
 		if (match.route.prefetch) return match.route.prefetch;
 		if (match.route.render === "spa") return "none";
@@ -904,7 +953,8 @@ function setupPrefetching(app, warmModules) {
 		hoverTimer = setTimeout(() => {
 			prefetchRouteState(href);
 			if (warmModules) {
-				const m = matchAppRoute(app, href);
+				const pathname = getRoutePathname(href);
+				const m = pathname ? matchAppRoute(app, pathname) : void 0;
 				if (m) warmModules(m);
 			}
 		}, 50);
@@ -925,7 +975,8 @@ function setupPrefetching(app, warmModules) {
 		if (strategy !== "hover" && strategy !== "intent") return;
 		prefetchRouteState(href);
 		if (warmModules) {
-			const m = matchAppRoute(app, href);
+			const pathname = getRoutePathname(href);
+			const m = pathname ? matchAppRoute(app, pathname) : void 0;
 			if (m) warmModules(m);
 		}
 	}, true);
@@ -938,7 +989,8 @@ function setupPrefetching(app, warmModules) {
 			if (!href) continue;
 			prefetchRouteState(href);
 			if (warmModules) {
-				const m = matchAppRoute(app, href);
+				const pathname = getRoutePathname(href);
+				const m = pathname ? matchAppRoute(app, pathname) : void 0;
 				if (m) warmModules(m);
 			}
 			observer.unobserve(anchor);
@@ -989,7 +1041,7 @@ async function initClientRouter(options) {
 		if (!shellKey) return null;
 		return loadModule(shellModules, shellKey);
 	}
-	async function buildRouteTree(match, state, routeModPromise, shellModPromise) {
+	async function buildRouteTree(match, state, currentUrl, routeModPromise, shellModPromise) {
 		const routeMod = await (routeModPromise ?? startRouteImport(match));
 		if (!routeMod) return null;
 		let Shell = null;
@@ -1007,10 +1059,10 @@ async function initClientRouter(options) {
 			data: state.data,
 			params: match.params,
 			routeId: match.route.id ?? "",
-			url: match.pathname
+			url: currentUrl
 		}, componentTree));
 	}
-	async function buildSpaPendingTree(match, shellModPromise) {
+	async function buildSpaPendingTree(match, currentUrl, shellModPromise) {
 		const resolvedShell = await (shellModPromise ?? startShellImport(match));
 		if (!resolvedShell) return null;
 		const Shell = resolvedShell.Shell;
@@ -1021,16 +1073,40 @@ async function initClientRouter(options) {
 			data: void 0,
 			params: match.params,
 			routeId: match.route.id ?? "",
-			url: match.pathname
+			url: currentUrl
 		}, componentTree));
 	}
+	function resolveRedirectTarget(location) {
+		const targetUrl = new URL(location, window.location.href);
+		const fullInternalTarget = targetUrl.pathname + targetUrl.search + targetUrl.hash;
+		const internalPath = targetUrl.pathname + targetUrl.search;
+		const currentPath = window.location.pathname + window.location.search + window.location.hash;
+		const isCurrentLocation = targetUrl.origin === window.location.origin && fullInternalTarget === currentPath;
+		if (targetUrl.origin !== window.location.origin) return {
+			externalUrl: targetUrl.toString(),
+			isCurrentLocation: false
+		};
+		if (targetUrl.hash) return {
+			documentUrl: targetUrl.toString(),
+			isCurrentLocation
+		};
+		return {
+			internalPath,
+			isCurrentLocation
+		};
+	}
 	async function navigate(to, opts) {
-		const match = matchAppRoute(app, to);
-		if (!match) {
+		const target = resolveBrowserRouteTarget(to);
+		if (!target) {
 			window.location.href = to;
 			return;
 		}
-		const statePromise = getCachedRouteState(to) ?? fetchPrachtRouteState(to);
+		const match = matchAppRoute(app, target.pathname);
+		if (!match) {
+			window.location.href = target.browserUrl;
+			return;
+		}
+		const statePromise = getCachedRouteState(target.requestUrl) ?? fetchPrachtRouteState(target.requestUrl);
 		const routeModPromise = startRouteImport(match);
 		const shellModPromise = startShellImport(match);
 		let state = {
@@ -1041,10 +1117,24 @@ async function initClientRouter(options) {
 			const result = await statePromise;
 			if (result.type === "redirect") {
 				if (result.location) {
-					await navigate(result.location, opts);
+					const redirect = resolveRedirectTarget(result.location);
+					if (redirect.externalUrl) {
+						window.location.href = redirect.externalUrl;
+						return;
+					}
+					if (redirect.isCurrentLocation) return;
+					if (redirect.documentUrl) {
+						window.location.href = redirect.documentUrl;
+						return;
+					}
+					if (redirect.internalPath) {
+						await navigate(redirect.internalPath, opts);
+						return;
+					}
+					window.location.href = result.location;
 					return;
 				}
-				window.location.href = to;
+				window.location.href = target.browserUrl;
 				return;
 			}
 			if (result.type === "error") state = {
@@ -1056,16 +1146,16 @@ async function initClientRouter(options) {
 				error: null
 			};
 		} catch {
-			window.location.href = to;
+			window.location.href = target.browserUrl;
 			return;
 		}
-		if (!opts?._popstate) if (opts?.replace) history.replaceState(null, "", to);
-		else history.pushState(null, "", to);
-		const tree = await buildRouteTree(match, state, routeModPromise, shellModPromise);
+		if (!opts?._popstate) if (opts?.replace) history.replaceState(null, "", target.browserUrl);
+		else history.pushState(null, "", target.browserUrl);
+		const tree = await buildRouteTree(match, state, target.requestUrl, routeModPromise, shellModPromise);
 		if (tree) {
 			render(tree, root);
 			window.scrollTo(0, 0);
-		} else window.location.href = to;
+		} else window.location.href = target.browserUrl;
 	}
 	if (import.meta.env?.DEV) {
 		const prev = options.__m;
@@ -1076,7 +1166,10 @@ async function initClientRouter(options) {
 			if (prev) prev(vnode, s);
 		};
 	}
-	const initialMatch = matchAppRoute(app, options.initialState.url);
+	const initialTarget = resolveBrowserRouteTarget(options.initialState.url);
+	const initialRequestUrl = initialTarget?.requestUrl ?? options.initialState.url;
+	const initialBrowserUrl = initialTarget?.browserUrl ?? options.initialState.url;
+	const initialMatch = matchAppRoute(app, initialTarget?.pathname ?? options.initialState.url);
 	if (initialMatch) {
 		const initialShellPromise = initialMatch.route.render === "spa" && options.initialState.pending ? startShellImport(initialMatch) : null;
 		let state = {
@@ -1084,8 +1177,8 @@ async function initClientRouter(options) {
 			error: options.initialState.error ?? null
 		};
 		if (initialMatch.route.render === "spa" && options.initialState.pending) {
-			const dataPromise = fetchPrachtRouteState(options.initialState.url);
-			const pendingTree = await buildSpaPendingTree(initialMatch, initialShellPromise);
+			const dataPromise = fetchPrachtRouteState(initialRequestUrl);
+			const pendingTree = await buildSpaPendingTree(initialMatch, initialRequestUrl, initialShellPromise);
 			if (pendingTree) hydrate(pendingTree, root);
 			try {
 				const result = await dataPromise;
@@ -1102,11 +1195,11 @@ async function initClientRouter(options) {
 					error: null
 				};
 			} catch {
-				window.location.href = options.initialState.url;
+				window.location.href = initialBrowserUrl;
 				return;
 			}
 		}
-		const tree = await buildRouteTree(initialMatch, state, void 0, initialShellPromise);
+		const tree = await buildRouteTree(initialMatch, state, initialRequestUrl, void 0, initialShellPromise);
 		if (tree) if (initialMatch.route.render === "spa") render(tree, root);
 		else {
 			markHydrating();
@@ -1132,10 +1225,10 @@ async function initClientRouter(options) {
 		}
 		if (url.origin !== window.location.origin) return;
 		e.preventDefault();
-		navigate(url.pathname + url.search);
+		navigate(url.pathname + url.search + url.hash);
 	});
 	window.addEventListener("popstate", () => {
-		navigate(window.location.pathname + window.location.search, { _popstate: true });
+		navigate(window.location.pathname + window.location.search + window.location.hash, { _popstate: true });
 	});
 	window.__PRACHT_NAVIGATE__ = navigate;
 	window.__PRACHT_ROUTER_READY__ = true;
@@ -1200,6 +1293,20 @@ function deserializeRouteError(error) {
 	result.diagnostics = error.diagnostics;
 	return result;
 }
+function resolveBrowserRouteTarget(to) {
+	if (typeof window === "undefined") return null;
+	try {
+		const url = new URL(to, window.location.href);
+		if (url.origin !== window.location.origin) return null;
+		return {
+			browserUrl: url.pathname + url.search + url.hash,
+			pathname: url.pathname,
+			requestUrl: url.pathname + url.search
+		};
+	} catch {
+		return null;
+	}
+}
 //#endregion
 //#region src/types.ts
 var PrachtHttpError = class extends Error {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pracht/core",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "license": "MIT",
   "homepage": "https://github.com/JoviDeCroock/pracht/tree/main/packages/framework",
   "bugs": {