one 2.10.0 → 2.11.1

package/dist/cjs/typed-routes/searchSchemaEntries.native.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+};
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: () => from[key],
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
+	}
+	return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var searchSchemaEntries_exports = {};
+__export(searchSchemaEntries_exports, { getSearchSchemaEntries: () => getSearchSchemaEntries });
+module.exports = __toCommonJS(searchSchemaEntries_exports);
+var import_posix = require("path/posix");
+var layoutFile = /^_layout(\+(ssg|ssr|spa))?\.[cm]?[jt]sx?$/;
+function getSearchSchemaEntries(routePaths, contextKey) {
+	var dir = (0, import_posix.dirname)(contextKey);
+	var layouts = routePaths.filter(function(path) {
+		if (path === contextKey || !layoutFile.test((0, import_posix.basename)(path))) return false;
+		var layoutDir = (0, import_posix.dirname)(path);
+		return layoutDir === "." || dir === layoutDir || dir.startsWith(`${layoutDir}/`);
+	}).sort(function(a, b) {
+		return (0, import_posix.dirname)(a).length - (0, import_posix.dirname)(b).length;
+	});
+	return [contextKey, ...layouts];
+}
+
+//# sourceMappingURL=searchSchemaEntries.native.js.map

package/dist/cjs/typed-routes/searchSchemaEntries.native.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"searchSchemaEntries.native.js","names":[],"sources":["cjs/typed-routes/searchSchemaEntries.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar searchSchemaEntries_exports = {};\n__export(searchSchemaEntries_exports, {\n  getSearchSchemaEntries: () => getSearchSchemaEntries\n});\nmodule.exports = __toCommonJS(searchSchemaEntries_exports);\nvar import_posix = require(\"path/posix\");\nvar layoutFile = /^_layout(\\+(ssg|ssr|spa))?\\.[cm]?[jt]sx?$/;\nfunction getSearchSchemaEntries(routePaths, contextKey) {\n  var dir = (0, import_posix.dirname)(contextKey);\n  var layouts = routePaths.filter(function(path) {\n    if (path === contextKey || !layoutFile.test((0, import_posix.basename)(path))) return false;\n    var layoutDir = (0, import_posix.dirname)(path);\n    return layoutDir === \".\" || dir === layoutDir || dir.startsWith(`${layoutDir}/`);\n  }).sort(function(a, b) {\n    return (0, import_posix.dirname)(a).length - (0, import_posix.dirname)(b).length;\n  });\n  return [\n    contextKey,\n    ...layouts\n  ];\n}\n//# sourceMappingURL=searchSchemaEntries.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,8BAA8B,CAAC;AACnC,SAAS,6BAA6B,EACpC,8BAA8B,uBAChC,CAAC;AACD,OAAO,UAAU,aAAa,2BAA2B;AACzD,IAAI,eAAe,QAAQ,YAAY;AACvC,IAAI,aAAa;AACjB,SAAS,uBAAuB,YAAY,YAAY;CACtD,IAAI,OAAO,GAAG,aAAa,QAAO,CAAE,UAAU;CAC9C,IAAI,UAAU,WAAW,OAAO,SAAS,MAAM;EAC7C,IAAI,SAAS,cAAc,CAAC,WAAW,MAAM,GAAG,aAAa,SAAQ,CAAE,IAAI,CAAC,GAAG,OAAO;EACtF,IAAI,aAAa,GAAG,aAAa,QAAO,CAAE,IAAI;EAC9C,OAAO,cAAc,OAAO,QAAQ,aAAa,IAAI,WAAW,GAAG,UAAU,EAAE;CACjF,CAAC,CAAC,CAAC,KAAK,SAAS,GAAG,GAAG;EACrB,QAAQ,GAAG,aAAa,QAAO,CAAE,CAAC,CAAC,CAAC,UAAU,GAAG,aAAa,QAAO,CAAE,CAAC,CAAC,CAAC;CAC5E,CAAC;CACD,OAAO,CACL,YACA,GAAG,OACL;AACF"}

package/dist/cjs/useLoader.cjs

@@ -106,22 +106,25 @@ function getLoaderState(path, preloadedData) {
 	});
 	return loaderState[path];
 }
-function importRefetchLoader(path) {
-	const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(path, true, `${Date.now()}`);
+function importRefetchLoader(key) {
+	const [path, search] = (0, import_cleanUrl.splitLoaderKey)(key);
+	const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(path, true, `${Date.now()}`, search);
 	return (0, import_dynamicImport.dynamicImport)(loaderJSUrl)?.catch(() => null);
 }
-async function refetchLoader(pathname) {
+async function refetchLoader(href) {
 	const startTime = performance.now();
-	updateState(pathname, {
+	const key = (0, import_router.normalizeLoaderPath)(href);
+	const pathname = (0, import_cleanUrl.splitLoaderKey)(key)[0];
+	updateState(key, {
 		state: "loading",
 		error: null
 	});
 	try {
 		const moduleLoadStart = performance.now();
-		const module2 = await importRefetchLoader(pathname);
+		const module2 = await importRefetchLoader(key);
 		const moduleLoadTime = performance.now() - moduleLoadStart;
 		if (!module2?.loader) {
-			updateState(pathname, {
+			updateState(key, {
 				data: void 0,
 				state: "idle",
 				hasLoadedOnce: true
@@ -132,6 +135,7 @@ async function refetchLoader(pathname) {
 		const result = await module2.loader();
 		const executionTime = performance.now() - executionStart;
 		const totalTime = performance.now() - startTime;
+		if ((0, import_cleanUrl.isLoaderBadRequest)(result)) throw new Error(result.__oneErrorMessage || "Bad Request");
 		if (result?.__oneRedirect) {
 			recordLoaderTiming?.({
 				path: pathname,
@@ -141,7 +145,7 @@ async function refetchLoader(pathname) {
 				totalTime,
 				source: "refetch"
 			});
-			updateState(pathname, {
+			updateState(key, {
 				data: void 0,
 				state: "idle",
 				hasLoadedOnce: true
@@ -166,7 +170,7 @@ async function refetchLoader(pathname) {
 			});
 			return;
 		}
-		updateState(pathname, {
+		updateState(key, {
 			data: result,
 			state: "idle",
 			timestamp: Date.now(),
@@ -187,7 +191,7 @@ async function refetchLoader(pathname) {
 		});
 	} catch (err) {
 		const totalTime = performance.now() - startTime;
-		updateState(pathname, {
+		updateState(key, {
 			error: err,
 			state: "idle"
 		});
@@ -214,6 +218,10 @@ function useLoaderState(loader) {
 	const params = (0, import_hooks.useParams)();
 	const pathname = (0, import_hooks.usePathname)();
 	const currentPath = pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
+	const isSsrPage = (0, import_Route.useRouteNode)()?.type === "ssr";
+	const href = (0, import_hooks.useRouteInfo)().unstable_globalHref;
+	const loaderKey = isSsrPage ? (0, import_cleanUrl.toLoaderKey)(currentPath, new URL(href, "http://example.com").search) : currentPath;
+	const [loaderPath, loaderSearch] = (0, import_cleanUrl.splitLoaderKey)(loaderKey);
 	if (typeof window === "undefined") {
 		if (loader) {
 			if (import_ssrLoaderData.ssrLoaderData.has(loader)) return {
@@ -251,10 +259,11 @@ function useLoaderState(loader) {
 		return typeof result === "string" && result.startsWith("./") ? result : null;
 	})() : null;
 	const clientMatches = (0, import_react.useSyncExternalStore)(import_useMatches.subscribeToClientMatches, import_useMatches.getClientMatchesSnapshot, import_useMatches.getClientMatchesSnapshot);
-	const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0;
-	const loaderStateEntry = (0, import_react.useSyncExternalStore)(subscribe, () => getLoaderState(currentPath, preloadedData), () => getLoaderState(currentPath, preloadedData));
-	const refetch = (0, import_react.useCallback)(() => refetchLoader(currentPath), [currentPath]);
-	if (matchRouteId) {
+	const serverContextPath = loaderPropsFromServerContext?.path;
+	const preloadedData = (isSsrPage && serverContextPath !== void 0 ? (0, import_cleanUrl.toLoaderKey)(serverContextPath, loaderPropsFromServerContext?.search ?? "") : serverContextPath) === loaderKey ? loaderDataFromServerContext : void 0;
+	const loaderStateEntry = (0, import_react.useSyncExternalStore)(subscribe, () => getLoaderState(loaderKey, preloadedData), () => getLoaderState(loaderKey, preloadedData));
+	const refetch = (0, import_react.useCallback)(() => refetchLoader(loaderKey), [loaderKey]);
+	if (matchRouteId && !isSsrPage) {
 		const match = clientMatches.find((m) => m.routeId === matchRouteId);
 		const isPageMatch = clientMatches.length > 0 && clientMatches[clientMatches.length - 1]?.routeId === matchRouteId;
 		const matchPathNormalized = (match?.pathname || "").replace(/\/$/, "") || "/";
@@ -262,8 +271,8 @@ function useLoaderState(loader) {
 		if (match && match.loaderData != null && matchPathFresh) return {
 			data: match.loaderData,
 			refetch: async () => {
-				await refetchLoader(currentPath);
-				const fresh = loaderState[currentPath];
+				await refetchLoader(loaderKey);
+				const fresh = loaderState[loaderKey];
 				if (fresh?.data != null) (0, import_useMatches.updateMatchLoaderData)(matchRouteId, fresh.data);
 			},
 			state: loaderStateEntry.state
@@ -274,25 +283,25 @@ function useLoaderState(loader) {
 		state: loaderStateEntry.state
 	};
 	if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) {
-		const resolvedPreloadData = import_router.preloadedLoaderData[currentPath];
+		const resolvedPreloadData = import_router.preloadedLoaderData[loaderKey];
 		if (resolvedPreloadData != null) {
-			delete import_router.preloadedLoaderData[currentPath];
-			delete import_router.preloadingLoader[currentPath];
+			delete import_router.preloadedLoaderData[loaderKey];
+			delete import_router.preloadingLoader[loaderKey];
 			loaderStateEntry.data = resolvedPreloadData;
 			loaderStateEntry.hasLoadedOnce = true;
-		} else if (import_router.preloadingLoader[currentPath]) loaderStateEntry.promise = import_router.preloadingLoader[currentPath].then((val) => {
-			delete import_router.preloadingLoader[currentPath];
-			delete import_router.preloadedLoaderData[currentPath];
-			if (val != null) updateState(currentPath, {
+		} else if (import_router.preloadingLoader[loaderKey]) loaderStateEntry.promise = import_router.preloadingLoader[loaderKey].then((val) => {
+			delete import_router.preloadingLoader[loaderKey];
+			delete import_router.preloadedLoaderData[loaderKey];
+			if (val != null) updateState(loaderKey, {
 				data: val,
 				hasLoadedOnce: true,
 				promise: void 0
 			});
-			else updateState(currentPath, { promise: void 0 });
+			else updateState(loaderKey, { promise: void 0 });
 		}).catch((err) => {
 			console.error(`Error running loader()`, err);
-			delete import_router.preloadingLoader[currentPath];
-			updateState(currentPath, {
+			delete import_router.preloadingLoader[loaderKey];
+			updateState(loaderKey, {
 				error: err,
 				promise: void 0
 			});
@@ -301,12 +310,12 @@ function useLoaderState(loader) {
 			const loadData = async () => {
 				const startTime = performance.now();
 				try {
-					const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, true);
+					const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(loaderPath, true, void 0, loaderSearch);
 					const moduleLoadStart = performance.now();
 					const module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl)?.catch(() => null);
 					const moduleLoadTime = performance.now() - moduleLoadStart;
 					if (!module2?.loader) {
-						updateState(currentPath, {
+						updateState(loaderKey, {
 							data: void 0,
 							hasLoadedOnce: true,
 							promise: void 0
@@ -317,6 +326,7 @@ function useLoaderState(loader) {
 					const result = await module2.loader();
 					const executionTime = performance.now() - executionStart;
 					const totalTime = performance.now() - startTime;
+					if ((0, import_cleanUrl.isLoaderBadRequest)(result)) throw new Error(result.__oneErrorMessage || "Bad Request");
 					if (result?.__oneRedirect) {
 						recordLoaderTiming?.({
 							path: currentPath,
@@ -326,7 +336,7 @@ function useLoaderState(loader) {
 							totalTime,
 							source: "initial"
 						});
-						updateState(currentPath, {
+						updateState(loaderKey, {
 							data: void 0,
 							hasLoadedOnce: true,
 							promise: void 0
@@ -351,7 +361,7 @@ function useLoaderState(loader) {
 						});
 						return;
 					}
-					updateState(currentPath, {
+					updateState(loaderKey, {
 						data: result,
 						hasLoadedOnce: true,
 						promise: void 0
@@ -366,7 +376,7 @@ function useLoaderState(loader) {
 					});
 				} catch (err) {
 					const totalTime = performance.now() - startTime;
-					updateState(currentPath, {
+					updateState(loaderKey, {
 						error: err,
 						promise: void 0
 					});

package/dist/cjs/useLoader.native.cjs

@@ -115,23 +115,27 @@ async function importNativeLoader(url) {
 	new Function("exports", loaderJsCode)(result);
 	return result;
 }
-function importRefetchLoader(path) {
-	return importNativeLoader(`${(0, import_cleanUrl.getLoaderPath)(path, true, `${Date.now()}`)}?platform=${import_react_native.Platform.OS}`).catch(function() {
+function importRefetchLoader(key) {
+	var [path, search] = (0, import_cleanUrl.splitLoaderKey)(key);
+	var loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(path, true, `${Date.now()}`, search);
+	return importNativeLoader((0, import_cleanUrl.appendLoaderQuery)(loaderJSUrl, "platform", import_react_native.Platform.OS)).catch(function() {
 		return null;
 	});
 }
-async function refetchLoader(pathname) {
+async function refetchLoader(href) {
 	var startTime = performance.now();
-	updateState(pathname, {
+	var key = (0, import_router.normalizeLoaderPath)(href);
+	var pathname = (0, import_cleanUrl.splitLoaderKey)(key)[0];
+	updateState(key, {
 		state: "loading",
 		error: null
 	});
 	try {
 		var moduleLoadStart = performance.now();
-		var module2 = await importRefetchLoader(pathname);
+		var module2 = await importRefetchLoader(key);
 		var moduleLoadTime = performance.now() - moduleLoadStart;
 		if (!(module2 === null || module2 === void 0 ? void 0 : module2.loader)) {
-			updateState(pathname, {
+			updateState(key, {
 				data: void 0,
 				state: "idle",
 				hasLoadedOnce: true
@@ -142,6 +146,7 @@ async function refetchLoader(pathname) {
 		var result = await module2.loader();
 		var executionTime = performance.now() - executionStart;
 		var totalTime = performance.now() - startTime;
+		if ((0, import_cleanUrl.isLoaderBadRequest)(result)) throw new Error(result.__oneErrorMessage || "Bad Request");
 		if (result === null || result === void 0 ? void 0 : result.__oneRedirect) {
 			recordLoaderTiming === null || recordLoaderTiming === void 0 || recordLoaderTiming({
 				path: pathname,
@@ -151,7 +156,7 @@ async function refetchLoader(pathname) {
 				totalTime,
 				source: "refetch"
 			});
-			updateState(pathname, {
+			updateState(key, {
 				data: void 0,
 				state: "idle",
 				hasLoadedOnce: true
@@ -176,7 +181,7 @@ async function refetchLoader(pathname) {
 			});
 			return;
 		}
-		updateState(pathname, {
+		updateState(key, {
 			data: result,
 			state: "idle",
 			timestamp: Date.now(),
@@ -197,7 +202,7 @@ async function refetchLoader(pathname) {
 		});
 	} catch (err) {
 		var totalTime1 = performance.now() - startTime;
-		updateState(pathname, {
+		updateState(key, {
 			error: err,
 			state: "idle"
 		});
@@ -220,10 +225,16 @@ async function refetchMatchLoader(routeId, currentPath) {
 	(0, import_useMatches.updateMatchLoaderData)(routeId, result);
 }
 function useLoaderState(loader) {
+	var _ref;
+	var _useRouteNode;
 	var { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = (0, import_one_server_only.useServerContext)() || {};
 	var params = (0, import_hooks.useParams)();
 	var pathname = (0, import_hooks.usePathname)();
 	var currentPath = pathname.replace(/\/index$/, "").replace(/\/$/, "") || "/";
+	var isSsrPage = ((_useRouteNode = (0, import_Route.useRouteNode)()) === null || _useRouteNode === void 0 ? void 0 : _useRouteNode.type) === "ssr";
+	var href = (0, import_hooks.useRouteInfo)().unstable_globalHref;
+	var loaderKey = isSsrPage ? (0, import_cleanUrl.toLoaderKey)(currentPath, new URL(href, "http://example.com").search) : currentPath;
+	var [loaderPath, loaderSearch] = (0, import_cleanUrl.splitLoaderKey)(loaderKey);
 	if (typeof window === "undefined") {
 		if (loader) {
 			if (import_ssrLoaderData.ssrLoaderData.has(loader)) return {
@@ -263,16 +274,17 @@ function useLoaderState(loader) {
 		return typeof result === "string" && result.startsWith("./") ? result : null;
 	})() : null;
 	var clientMatches = (0, import_react.useSyncExternalStore)(import_useMatches.subscribeToClientMatches, import_useMatches.getClientMatchesSnapshot, import_useMatches.getClientMatchesSnapshot);
-	var preloadedData = (loaderPropsFromServerContext === null || loaderPropsFromServerContext === void 0 ? void 0 : loaderPropsFromServerContext.path) === currentPath ? loaderDataFromServerContext : void 0;
+	var serverContextPath = loaderPropsFromServerContext === null || loaderPropsFromServerContext === void 0 ? void 0 : loaderPropsFromServerContext.path;
+	var preloadedData = (isSsrPage && serverContextPath !== void 0 ? (0, import_cleanUrl.toLoaderKey)(serverContextPath, (_ref = loaderPropsFromServerContext === null || loaderPropsFromServerContext === void 0 ? void 0 : loaderPropsFromServerContext.search) !== null && _ref !== void 0 ? _ref : "") : serverContextPath) === loaderKey ? loaderDataFromServerContext : void 0;
 	var loaderStateEntry = (0, import_react.useSyncExternalStore)(subscribe, function() {
-		return getLoaderState(currentPath, preloadedData);
+		return getLoaderState(loaderKey, preloadedData);
 	}, function() {
-		return getLoaderState(currentPath, preloadedData);
+		return getLoaderState(loaderKey, preloadedData);
 	});
 	var refetch = (0, import_react.useCallback)(function() {
-		return refetchLoader(currentPath);
-	}, [currentPath]);
-	if (matchRouteId) {
+		return refetchLoader(loaderKey);
+	}, [loaderKey]);
+	if (matchRouteId && !isSsrPage) {
 		var _clientMatches_;
 		var match1 = clientMatches.find(function(m) {
 			return m.routeId === matchRouteId;
@@ -283,8 +295,8 @@ function useLoaderState(loader) {
 		if (match1 && match1.loaderData != null && matchPathFresh) return {
 			data: match1.loaderData,
 			refetch: async function refetch2() {
-				await refetchLoader(currentPath);
-				var fresh = loaderState[currentPath];
+				await refetchLoader(loaderKey);
+				var fresh = loaderState[loaderKey];
 				if ((fresh === null || fresh === void 0 ? void 0 : fresh.data) != null) (0, import_useMatches.updateMatchLoaderData)(matchRouteId, fresh.data);
 			},
 			state: loaderStateEntry.state
@@ -295,25 +307,25 @@ function useLoaderState(loader) {
 		state: loaderStateEntry.state
 	};
 	if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) {
-		var resolvedPreloadData = import_router.preloadedLoaderData[currentPath];
+		var resolvedPreloadData = import_router.preloadedLoaderData[loaderKey];
 		if (resolvedPreloadData != null) {
-			delete import_router.preloadedLoaderData[currentPath];
-			delete import_router.preloadingLoader[currentPath];
+			delete import_router.preloadedLoaderData[loaderKey];
+			delete import_router.preloadingLoader[loaderKey];
 			loaderStateEntry.data = resolvedPreloadData;
 			loaderStateEntry.hasLoadedOnce = true;
-		} else if (import_router.preloadingLoader[currentPath]) loaderStateEntry.promise = import_router.preloadingLoader[currentPath].then(function(val) {
-			delete import_router.preloadingLoader[currentPath];
-			delete import_router.preloadedLoaderData[currentPath];
-			if (val != null) updateState(currentPath, {
+		} else if (import_router.preloadingLoader[loaderKey]) loaderStateEntry.promise = import_router.preloadingLoader[loaderKey].then(function(val) {
+			delete import_router.preloadingLoader[loaderKey];
+			delete import_router.preloadedLoaderData[loaderKey];
+			if (val != null) updateState(loaderKey, {
 				data: val,
 				hasLoadedOnce: true,
 				promise: void 0
 			});
-			else updateState(currentPath, { promise: void 0 });
+			else updateState(loaderKey, { promise: void 0 });
 		}).catch(function(err) {
 			console.error(`Error running loader()`, err);
-			delete import_router.preloadingLoader[currentPath];
-			updateState(currentPath, {
+			delete import_router.preloadingLoader[loaderKey];
+			updateState(loaderKey, {
 				error: err,
 				promise: void 0
 			});
@@ -323,8 +335,8 @@ function useLoaderState(loader) {
 			try {
 				var _dynamicImport;
 				var nativeLoaderJSUrl;
-				if (process.env.NODE_ENV === "development") nativeLoaderJSUrl = `${(0, import_cleanUrl.getLoaderPath)(currentPath, true)}?platform=native`;
-				else nativeLoaderJSUrl = (0, import_cleanUrl.getNativeLoaderPath)(currentPath);
+				if (process.env.NODE_ENV === "development") nativeLoaderJSUrl = (0, import_cleanUrl.appendLoaderQuery)((0, import_cleanUrl.getLoaderPath)(loaderPath, true, void 0, loaderSearch), "platform", "native");
+				else nativeLoaderJSUrl = (0, import_cleanUrl.getNativeLoaderPath)(loaderPath);
 				try {
 					var moduleLoadStart = performance.now();
 					var result = await importNativeLoader(nativeLoaderJSUrl);
@@ -334,6 +346,7 @@ function useLoaderState(loader) {
 					var data = await result.loader();
 					var executionTime = performance.now() - executionStart;
 					var totalTime = performance.now() - startTime;
+					if ((0, import_cleanUrl.isLoaderBadRequest)(data)) throw new Error(data.__oneErrorMessage || "Bad Request");
 					if (data === null || data === void 0 ? void 0 : data.__oneRedirect) {
 						recordLoaderTiming === null || recordLoaderTiming === void 0 || recordLoaderTiming({
 							path: currentPath,
@@ -343,7 +356,7 @@ function useLoaderState(loader) {
 							totalTime,
 							source: "initial"
 						});
-						updateState(currentPath, {
+						updateState(loaderKey, {
 							data: void 0,
 							hasLoadedOnce: true,
 							promise: void 0
@@ -368,7 +381,7 @@ function useLoaderState(loader) {
 						});
 						return;
 					}
-					updateState(currentPath, {
+					updateState(loaderKey, {
 						data,
 						hasLoadedOnce: true,
 						promise: void 0
@@ -385,7 +398,7 @@ function useLoaderState(loader) {
 				} catch (e) {
 					console.error(`[one] native loader error for ${currentPath}:`, e instanceof Error ? e.message : e, `url: ${nativeLoaderJSUrl}`);
 					var totalTime1 = performance.now() - startTime;
-					updateState(currentPath, {
+					updateState(loaderKey, {
 						data: {},
 						promise: void 0
 					});
@@ -398,14 +411,14 @@ function useLoaderState(loader) {
 					});
 					return;
 				}
-				var loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, true);
+				var loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(loaderPath, true, void 0, loaderSearch);
 				var moduleLoadStart1 = performance.now();
 				var module2 = await ((_dynamicImport = (0, import_dynamicImport.dynamicImport)(loaderJSUrl)) === null || _dynamicImport === void 0 ? void 0 : _dynamicImport.catch(function() {
 					return null;
 				}));
 				var moduleLoadTime1 = performance.now() - moduleLoadStart1;
 				if (!(module2 === null || module2 === void 0 ? void 0 : module2.loader)) {
-					updateState(currentPath, {
+					updateState(loaderKey, {
 						data: void 0,
 						hasLoadedOnce: true,
 						promise: void 0
@@ -416,6 +429,7 @@ function useLoaderState(loader) {
 				var result1 = await module2.loader();
 				var executionTime1 = performance.now() - executionStart1;
 				var totalTime2 = performance.now() - startTime;
+				if ((0, import_cleanUrl.isLoaderBadRequest)(result1)) throw new Error(result1.__oneErrorMessage || "Bad Request");
 				if (result1 === null || result1 === void 0 ? void 0 : result1.__oneRedirect) {
 					recordLoaderTiming === null || recordLoaderTiming === void 0 || recordLoaderTiming({
 						path: currentPath,
@@ -425,7 +439,7 @@ function useLoaderState(loader) {
 						totalTime: totalTime2,
 						source: "initial"
 					});
-					updateState(currentPath, {
+					updateState(loaderKey, {
 						data: void 0,
 						hasLoadedOnce: true,
 						promise: void 0
@@ -450,7 +464,7 @@ function useLoaderState(loader) {
 					});
 					return;
 				}
-				updateState(currentPath, {
+				updateState(loaderKey, {
 					data: result1,
 					hasLoadedOnce: true,
 					promise: void 0
@@ -465,7 +479,7 @@ function useLoaderState(loader) {
 				});
 			} catch (err) {
 				var totalTime3 = performance.now() - startTime;
-				updateState(currentPath, {
+				updateState(loaderKey, {
 					error: err,
 					promise: void 0
 				});