one 2.10.0 → 2.11.0

package/dist/cjs/searchParams.native.js

@@ -0,0 +1,196 @@
+"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 searchParams_exports = {};
+__export(searchParams_exports, {
+	applySearchParams: () => applySearchParams,
+	describeIssues: () => describeIssues,
+	mergeSearchRecord: () => mergeSearchRecord,
+	parseSearchRecord: () => parseSearchRecord,
+	searchRecordKey: () => searchRecordKey,
+	stringifySearchRecord: () => stringifySearchRecord,
+	toSearchRecord: () => toSearchRecord
+});
+module.exports = __toCommonJS(searchParams_exports);
+var import_standardSchema = require("./standardSchema.native.js");
+var import_validateSearchParams = require("./validateSearchParams.native.js");
+function toSearchRecord(params, href) {
+	var _href_split__split_;
+	var search = (_href_split__split_ = href.split("#")[0].split("?")[1]) !== null && _href_split__split_ !== void 0 ? _href_split__split_ : "";
+	var queryKeys = new Set(new URLSearchParams(search).keys());
+	var record = {};
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = Object.entries(params)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var [key, value] = _step.value;
+			if (value == null || !queryKeys.has(key)) continue;
+			(0, import_validateSearchParams.setOwn)(record, key, Array.isArray(value) ? value.map(String) : String(value));
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return record;
+}
+function searchRecordKey(record) {
+	return JSON.stringify(record);
+}
+function parseSearchRecord(schema, record) {
+	var result = (0, import_standardSchema.validateStandardSchemaSync)(schema, record);
+	if (result.issues) {
+		throw new import_validateSearchParams.SearchValidationError(`Invalid search params (${describeIssues(result.issues)})`, result.issues);
+	}
+	return result.value;
+}
+function describeIssues(issues) {
+	return issues.map(function(issue) {
+		var _issue_path;
+		var path = (_issue_path = issue.path) === null || _issue_path === void 0 ? void 0 : _issue_path.map(function(segment) {
+			return String(typeof segment === "object" ? segment.key : segment);
+		}).join(".");
+		return path ? `${path}: ${issue.message}` : issue.message;
+	}).join("; ");
+}
+function toStrings(key, value) {
+	if (value == null) return void 0;
+	var values = Array.isArray(value) ? value : [value];
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = values[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var item = _step.value;
+			var type = typeof item;
+			if (type !== "string" && type !== "number" && type !== "boolean") {
+				var _item_constructor;
+				throw new TypeError(`Search param "${key}" cannot be written to the URL: expected a string, number, boolean or an array of those, got ${type === "object" ? item === null ? "null" : (_item_constructor = item.constructor) === null || _item_constructor === void 0 ? void 0 : _item_constructor.name : type}. Pass the text the schema reads instead.`);
+			}
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return values.length ? values.map(String) : void 0;
+}
+function mergeSearchRecord(current, update) {
+	var next = { ...current };
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = Object.entries(update)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var [key, value] = _step.value;
+			var strings = toStrings(key, value);
+			if (!strings) {
+				delete next[key];
+			} else {
+				(0, import_validateSearchParams.setOwn)(next, key, strings.length === 1 && !Array.isArray(value) ? strings[0] : strings);
+			}
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return next;
+}
+function stringifySearchRecord(record) {
+	var parts = [];
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = Object.entries(record)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var [key, value] = _step.value;
+			var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+			try {
+				for (var _iterator1 = (Array.isArray(value) ? value : [value])[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+					var item = _step1.value;
+					parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(item)}`);
+				}
+			} catch (err) {
+				_didIteratorError1 = true;
+				_iteratorError1 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+						_iterator1.return();
+					}
+				} finally {
+					if (_didIteratorError1) {
+						throw _iteratorError1;
+					}
+				}
+			}
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return parts.join("&");
+}
+function applySearchParams(href, update) {
+	if (!update) return href;
+	var hashIndex = href.indexOf("#");
+	var hash = hashIndex === -1 ? "" : href.slice(hashIndex);
+	var withoutHash = hashIndex === -1 ? href : href.slice(0, hashIndex);
+	var queryIndex = withoutHash.indexOf("?");
+	var path = queryIndex === -1 ? withoutHash : withoutHash.slice(0, queryIndex);
+	var current = queryIndex === -1 ? {} : (0, import_validateSearchParams.parseSearchString)(withoutHash.slice(queryIndex + 1));
+	var query = stringifySearchRecord(mergeSearchRecord(current, update));
+	return `${path}${query ? `?${query}` : ""}${hash}`;
+}
+
+//# sourceMappingURL=searchParams.native.js.map

package/dist/cjs/searchParams.native.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"searchParams.native.js","names":[],"sources":["cjs/searchParams.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 searchParams_exports = {};\n__export(searchParams_exports, {\n  applySearchParams: () => applySearchParams,\n  describeIssues: () => describeIssues,\n  mergeSearchRecord: () => mergeSearchRecord,\n  parseSearchRecord: () => parseSearchRecord,\n  searchRecordKey: () => searchRecordKey,\n  stringifySearchRecord: () => stringifySearchRecord,\n  toSearchRecord: () => toSearchRecord\n});\nmodule.exports = __toCommonJS(searchParams_exports);\nvar import_standardSchema = require(\"./standardSchema\");\nvar import_validateSearchParams = require(\"./validateSearchParams\");\nfunction toSearchRecord(params, href) {\n  var _href_split__split_;\n  var search = (_href_split__split_ = href.split(\"#\")[0].split(\"?\")[1]) !== null && _href_split__split_ !== void 0 ? _href_split__split_ : \"\";\n  var queryKeys = new Set(new URLSearchParams(search).keys());\n  var record = {};\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = Object.entries(params)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var [key, value] = _step.value;\n      if (value == null || !queryKeys.has(key)) continue;\n      (0, import_validateSearchParams.setOwn)(record, key, Array.isArray(value) ? value.map(String) : String(value));\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  return record;\n}\nfunction searchRecordKey(record) {\n  return JSON.stringify(record);\n}\nfunction parseSearchRecord(schema, record) {\n  var result = (0, import_standardSchema.validateStandardSchemaSync)(schema, record);\n  if (result.issues) {\n    throw new import_validateSearchParams.SearchValidationError(`Invalid search params (${describeIssues(result.issues)})`, result.issues);\n  }\n  return result.value;\n}\nfunction describeIssues(issues) {\n  return issues.map(function(issue) {\n    var _issue_path;\n    var path = (_issue_path = issue.path) === null || _issue_path === void 0 ? void 0 : _issue_path.map(function(segment) {\n      return String(typeof segment === \"object\" ? segment.key : segment);\n    }).join(\".\");\n    return path ? `${path}: ${issue.message}` : issue.message;\n  }).join(\"; \");\n}\nfunction toStrings(key, value) {\n  if (value == null) return void 0;\n  var values = Array.isArray(value) ? value : [\n    value\n  ];\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = values[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var item = _step.value;\n      var type = typeof item;\n      if (type !== \"string\" && type !== \"number\" && type !== \"boolean\") {\n        var _item_constructor;\n        throw new TypeError(`Search param \"${key}\" cannot be written to the URL: expected a string, number, boolean or an array of those, got ${type === \"object\" ? item === null ? \"null\" : (_item_constructor = item.constructor) === null || _item_constructor === void 0 ? void 0 : _item_constructor.name : type}. Pass the text the schema reads instead.`);\n      }\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  return values.length ? values.map(String) : void 0;\n}\nfunction mergeSearchRecord(current, update) {\n  var next = {\n    ...current\n  };\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = Object.entries(update)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var [key, value] = _step.value;\n      var strings = toStrings(key, value);\n      if (!strings) {\n        delete next[key];\n      } else {\n        (0, import_validateSearchParams.setOwn)(next, key, strings.length === 1 && !Array.isArray(value) ? strings[0] : strings);\n      }\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  return next;\n}\nfunction stringifySearchRecord(record) {\n  var parts = [];\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = Object.entries(record)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var [key, value] = _step.value;\n      var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;\n      try {\n        for (var _iterator1 = (Array.isArray(value) ? value : [\n          value\n        ])[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {\n          var item = _step1.value;\n          parts.push(`${encodeURIComponent(key)}=${encodeURIComponent(item)}`);\n        }\n      } catch (err) {\n        _didIteratorError1 = true;\n        _iteratorError1 = err;\n      } finally {\n        try {\n          if (!_iteratorNormalCompletion1 && _iterator1.return != null) {\n            _iterator1.return();\n          }\n        } finally {\n          if (_didIteratorError1) {\n            throw _iteratorError1;\n          }\n        }\n      }\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  return parts.join(\"&\");\n}\nfunction applySearchParams(href, update) {\n  if (!update) return href;\n  var hashIndex = href.indexOf(\"#\");\n  var hash = hashIndex === -1 ? \"\" : href.slice(hashIndex);\n  var withoutHash = hashIndex === -1 ? href : href.slice(0, hashIndex);\n  var queryIndex = withoutHash.indexOf(\"?\");\n  var path = queryIndex === -1 ? withoutHash : withoutHash.slice(0, queryIndex);\n  var current = queryIndex === -1 ? {} : (0, import_validateSearchParams.parseSearchString)(withoutHash.slice(queryIndex + 1));\n  var query = stringifySearchRecord(mergeSearchRecord(current, update));\n  return `${path}${query ? `?${query}` : \"\"}${hash}`;\n}\n//# sourceMappingURL=searchParams.js.map\n"],"mappings":"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"}

package/dist/cjs/server/oneServe.cjs

@@ -35,6 +35,7 @@ var import_cleanUrl = require("../utils/cleanUrl.cjs");
 var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions.cjs");
 var import_toAbsolute = require("../utils/toAbsolute.cjs");
 var import_toServerOutputPath = require("../utils/toServerOutputPath.cjs");
+var import_loaderSearchParams = require("../loaderSearchParams.cjs");
 var import_routeExportsFromEntry = require("./routeExportsFromEntry.cjs");
 var import_ssrLoaderData = require("./ssrLoaderData.cjs");
 var import_staticHtmlFetcher = require("./staticHtmlFetcher.cjs");
@@ -135,6 +136,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 	const loaderCache = /* @__PURE__ */ new Map();
 	const moduleImportCache = /* @__PURE__ */ new Map();
 	const loaderCacheFnMap = /* @__PURE__ */ new Map();
+	const loaderSearchSchemaMap = /* @__PURE__ */ new Map();
 	const pendingLoaderResults = /* @__PURE__ */ new Map();
 	async function importRouteModule(lazyKey, serverPath) {
 		if (lazyKey && options?.lazyRoutes?.pages?.[lazyKey]) {
@@ -163,10 +165,11 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			setBounded(loaderCache, cacheKey, loader, MODULE_CACHE_MAX);
 			const loaderCacheFn = routeExported?.loaderCache ?? null;
 			setBounded(loaderCacheFnMap, cacheKey, loaderCacheFn, MODULE_CACHE_MAX);
+			setBounded(loaderSearchSchemaMap, cacheKey, (0, import_loaderSearchParams.getLoaderSearchSchemas)(routeExported), MODULE_CACHE_MAX);
 			return loader;
 		})();
 	}
-	async function importAndRunLoader(routeId, serverPath, lazyKey, loaderProps) {
+	async function importAndRunLoader(routeId, serverPath, lazyKey, requestLoaderProps, withSearchParams = false) {
 		if (!serverPath && !lazyKey) {
 			return {
 				loaderData: void 0,
@@ -174,6 +177,12 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			};
 		}
 		const cacheMapKey = lazyKey || serverPath || "";
+		let loaderProps = requestLoaderProps;
+		const validateSearch = () => {
+			const schemas = withSearchParams && loaderSearchSchemaMap.get(cacheMapKey);
+			if (schemas) loaderProps = (0, import_loaderSearchParams.withLoaderSearchParams)(schemas, requestLoaderProps);
+		};
+		validateSearch();
 		const loaderCacheFn = loaderCacheFnMap.get(cacheMapKey);
 		let coalFullKey;
 		let coalTtl = 0;
@@ -202,6 +211,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 					routeId
 				};
 			}
+			if (loaderProps === requestLoaderProps) validateSearch();
 			if (coalFullKey) {
 				const promise = loader(loaderProps);
 				const entry = {
@@ -307,6 +317,8 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			if (!loader) {
 				return null;
 			}
+			const searchSchemas = route.type === "ssr" && loaderSearchSchemaMap.get(routeFile || serverPath);
+			if (searchSchemas) loaderProps = (0, import_loaderSearchParams.withLoaderSearchParams)(searchSchemas, loaderProps);
 			let json;
 			try {
 				json = await loader(loaderProps);
@@ -343,10 +355,10 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 								routeId: layout.contextKey
 							});
 						} else {
-							layoutLoaderPromises.push(importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps));
+							layoutLoaderPromises.push(importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps, true));
 						}
 					}
-					const pageLoaderPromise = importAndRunLoader(route.file, buildInfo2.serverJsPath, route.file, loaderProps);
+					const pageLoaderPromise = importAndRunLoader(route.file, buildInfo2.serverJsPath, route.file, loaderProps, true);
 					let layoutResults;
 					let pageResult;
 					try {

package/dist/cjs/server/oneServe.native.cjs

@@ -37,6 +37,7 @@ var import_cleanUrl = require("../utils/cleanUrl.native.js");
 var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions.native.js");
 var import_toAbsolute = require("../utils/toAbsolute.native.js");
 var import_toServerOutputPath = require("../utils/toServerOutputPath.native.js");
+var import_loaderSearchParams = require("../loaderSearchParams.native.js");
 var import_routeExportsFromEntry = require("./routeExportsFromEntry.native.js");
 var import_ssrLoaderData = require("./ssrLoaderData.native.js");
 var import_staticHtmlFetcher = require("./staticHtmlFetcher.native.js");
@@ -175,6 +176,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 	var loaderCache = /* @__PURE__ */ new Map();
 	var moduleImportCache = /* @__PURE__ */ new Map();
 	var loaderCacheFnMap = /* @__PURE__ */ new Map();
+	var loaderSearchSchemaMap = /* @__PURE__ */ new Map();
 	var pendingLoaderResults = /* @__PURE__ */ new Map();
 	async function importRouteModule(lazyKey, serverPath) {
 		var _options_lazyRoutes_pages, _options_lazyRoutes;
@@ -205,10 +207,12 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			setBounded(loaderCache, cacheKey, loader, MODULE_CACHE_MAX);
 			var loaderCacheFn = (_ref = routeExported === null || routeExported === void 0 ? void 0 : routeExported.loaderCache) !== null && _ref !== void 0 ? _ref : null;
 			setBounded(loaderCacheFnMap, cacheKey, loaderCacheFn, MODULE_CACHE_MAX);
+			setBounded(loaderSearchSchemaMap, cacheKey, (0, import_loaderSearchParams.getLoaderSearchSchemas)(routeExported), MODULE_CACHE_MAX);
 			return loader;
 		})();
 	}
-	async function importAndRunLoader(routeId, serverPath, lazyKey, loaderProps) {
+	async function importAndRunLoader(routeId, serverPath, lazyKey, requestLoaderProps) {
+		var withSearchParams = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
 		if (!serverPath && !lazyKey) {
 			return {
 				loaderData: void 0,
@@ -216,6 +220,12 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			};
 		}
 		var cacheMapKey = lazyKey || serverPath || "";
+		var loaderProps = requestLoaderProps;
+		var validateSearch = function validateSearch2() {
+			var schemas = withSearchParams && loaderSearchSchemaMap.get(cacheMapKey);
+			if (schemas) loaderProps = (0, import_loaderSearchParams.withLoaderSearchParams)(schemas, requestLoaderProps);
+		};
+		validateSearch();
 		var loaderCacheFn = loaderCacheFnMap.get(cacheMapKey);
 		var coalFullKey;
 		var coalTtl = 0;
@@ -245,6 +255,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 					routeId
 				};
 			}
+			if (loaderProps === requestLoaderProps) validateSearch();
 			if (coalFullKey) {
 				var promise = loader(loaderProps);
 				var entry = {
@@ -357,6 +368,8 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			if (!loader) {
 				return null;
 			}
+			var searchSchemas = route2.type === "ssr" && loaderSearchSchemaMap.get(routeFile || serverPath);
+			if (searchSchemas) loaderProps = (0, import_loaderSearchParams.withLoaderSearchParams)(searchSchemas, loaderProps);
 			var json;
 			try {
 				json = await loader(loaderProps);
@@ -398,7 +411,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 									routeId: layout.contextKey
 								});
 							} else {
-								layoutLoaderPromises.push(importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps));
+								layoutLoaderPromises.push(importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps, true));
 							}
 						}
 					} catch (err) {
@@ -415,7 +428,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 							}
 						}
 					}
-					var pageLoaderPromise = importAndRunLoader(route2.file, _$buildInfo.serverJsPath, route2.file, loaderProps);
+					var pageLoaderPromise = importAndRunLoader(route2.file, _$buildInfo.serverJsPath, route2.file, loaderProps, true);
 					var layoutResults;
 					var pageResult;
 					try {

package/dist/cjs/server/oneServe.native.js

@@ -37,6 +37,7 @@ var import_cleanUrl = require("../utils/cleanUrl.native.js");
 var import_getRouterRootFromOneOptions = require("../utils/getRouterRootFromOneOptions.native.js");
 var import_toAbsolute = require("../utils/toAbsolute.native.js");
 var import_toServerOutputPath = require("../utils/toServerOutputPath.native.js");
+var import_loaderSearchParams = require("../loaderSearchParams.native.js");
 var import_routeExportsFromEntry = require("./routeExportsFromEntry.native.js");
 var import_ssrLoaderData = require("./ssrLoaderData.native.js");
 var import_staticHtmlFetcher = require("./staticHtmlFetcher.native.js");
@@ -175,6 +176,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 	var loaderCache = /* @__PURE__ */ new Map();
 	var moduleImportCache = /* @__PURE__ */ new Map();
 	var loaderCacheFnMap = /* @__PURE__ */ new Map();
+	var loaderSearchSchemaMap = /* @__PURE__ */ new Map();
 	var pendingLoaderResults = /* @__PURE__ */ new Map();
 	async function importRouteModule(lazyKey, serverPath) {
 		var _options_lazyRoutes_pages, _options_lazyRoutes;
@@ -205,10 +207,12 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			setBounded(loaderCache, cacheKey, loader, MODULE_CACHE_MAX);
 			var loaderCacheFn = (_ref = routeExported === null || routeExported === void 0 ? void 0 : routeExported.loaderCache) !== null && _ref !== void 0 ? _ref : null;
 			setBounded(loaderCacheFnMap, cacheKey, loaderCacheFn, MODULE_CACHE_MAX);
+			setBounded(loaderSearchSchemaMap, cacheKey, (0, import_loaderSearchParams.getLoaderSearchSchemas)(routeExported), MODULE_CACHE_MAX);
 			return loader;
 		})();
 	}
-	async function importAndRunLoader(routeId, serverPath, lazyKey, loaderProps) {
+	async function importAndRunLoader(routeId, serverPath, lazyKey, requestLoaderProps) {
+		var withSearchParams = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : false;
 		if (!serverPath && !lazyKey) {
 			return {
 				loaderData: void 0,
@@ -216,6 +220,12 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			};
 		}
 		var cacheMapKey = lazyKey || serverPath || "";
+		var loaderProps = requestLoaderProps;
+		var validateSearch = function validateSearch2() {
+			var schemas = withSearchParams && loaderSearchSchemaMap.get(cacheMapKey);
+			if (schemas) loaderProps = (0, import_loaderSearchParams.withLoaderSearchParams)(schemas, requestLoaderProps);
+		};
+		validateSearch();
 		var loaderCacheFn = loaderCacheFnMap.get(cacheMapKey);
 		var coalFullKey;
 		var coalTtl = 0;
@@ -245,6 +255,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 					routeId
 				};
 			}
+			if (loaderProps === requestLoaderProps) validateSearch();
 			if (coalFullKey) {
 				var promise = loader(loaderProps);
 				var entry = {
@@ -357,6 +368,8 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 			if (!loader) {
 				return null;
 			}
+			var searchSchemas = route2.type === "ssr" && loaderSearchSchemaMap.get(routeFile || serverPath);
+			if (searchSchemas) loaderProps = (0, import_loaderSearchParams.withLoaderSearchParams)(searchSchemas, loaderProps);
 			var json;
 			try {
 				json = await loader(loaderProps);
@@ -398,7 +411,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 									routeId: layout.contextKey
 								});
 							} else {
-								layoutLoaderPromises.push(importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps));
+								layoutLoaderPromises.push(importAndRunLoader(layout.contextKey, serverPath, layout.contextKey, loaderProps, true));
 							}
 						}
 					} catch (err) {
@@ -415,7 +428,7 @@ async function oneServe(oneOptions, buildInfo, app, options) {
 							}
 						}
 					}
-					var pageLoaderPromise = importAndRunLoader(route2.file, _$buildInfo.serverJsPath, route2.file, loaderProps);
+					var pageLoaderPromise = importAndRunLoader(route2.file, _$buildInfo.serverJsPath, route2.file, loaderProps, true);
 					var layoutResults;
 					var pageResult;
 					try {