@tanstack/router-core 1.171.10 → 1.171.11

package/dist/esm/searchMiddleware.js

@@ -1,4 +1,4 @@
-import { createNull, deepEqual } from "./utils.js";
+import { deepEqual } from "./utils.js";
 //#region src/searchMiddleware.ts
 /**
 * Retain specified search params across navigations.
@@ -12,33 +12,26 @@ import { createNull, deepEqual } from "./utils.js";
 */
 function retainSearchParams(keys) {
 	return ({ search, next }) => {
-		const [resultSearch, validations] = next(search, true);
-		const defaultKeys = validations.length ? getValidationDefaultKeys(search, resultSearch, validations) : void 0;
+		const { search: resultSearch, meta } = next(search, true);
 		if (keys === true) {
 			const copy = {
 				...search,
 				...resultSearch
 			};
-			if (defaultKeys) for (const key in defaultKeys) copy[key] = search[key];
+			const removed = meta.removed;
+			for (const key of removed?.keys() || []) if (deepEqual(search[key], removed.get(key))) delete copy[key];
+			for (const key of meta.removedAny || []) delete copy[key];
+			for (const key of meta.defaulted?.keys() || []) if (key in search && !meta.removedAny?.has(key) && !(meta.removed?.has(key) && deepEqual(search[key], meta.removed.get(key)))) copy[key] = search[key];
 			return copy;
 		}
 		const copy = { ...resultSearch };
-		for (const key of keys) if (!(key in copy) || (defaultKeys ? key in defaultKeys : false)) copy[key] = search[key];
+		for (const key of keys) {
+			const stringKey = key;
+			if (!(meta.removedAny?.has(stringKey) || meta.removed?.has(stringKey) && deepEqual(search[key], meta.removed.get(stringKey))) && (!(key in copy) || key in search && meta.defaulted?.has(stringKey) && deepEqual(copy[key], meta.defaulted.get(stringKey)))) copy[key] = search[key];
+		}
 		return copy;
 	};
 }
-function getValidationDefaultKeys(search, resultSearch, validations) {
-	let defaultKeys;
-	for (let i = 0; i < validations.length; i += 2) {
-		const baseSearch = validations[i];
-		const validatedSearch = validations[i + 1];
-		for (const key in validatedSearch) if (key in search && !(key in baseSearch) && resultSearch[key] === validatedSearch[key]) {
-			const target = defaultKeys || (defaultKeys = createNull());
-			target[key] = true;
-		}
-	}
-	return defaultKeys;
-}
 /**
 * Remove optional or default-valued search params from navigations.
 *
@@ -50,17 +43,26 @@ function getValidationDefaultKeys(search, resultSearch, validations) {
 * @link https://tanstack.com/router/latest/docs/framework/react/api/router/stripSearchParamsFunction
 */
 function stripSearchParams(input) {
-	return ({ search, next }) => {
-		if (input === true) return {};
+	return (({ search, next, meta }) => {
+		if (input === true) {
+			Object.keys(search).forEach((key) => {
+				if (meta) (meta.removedAny ||= /* @__PURE__ */ new Set()).add(key);
+			});
+			return {};
+		}
 		const result = { ...next(search) };
 		if (Array.isArray(input)) input.forEach((key) => {
 			delete result[key];
+			if (meta) (meta.removedAny ||= /* @__PURE__ */ new Set()).add(key);
 		});
 		else Object.entries(input).forEach(([key, value]) => {
-			if (deepEqual(result[key], value)) delete result[key];
+			if (deepEqual(result[key], value)) {
+				delete result[key];
+				if (meta) (meta.removed ||= /* @__PURE__ */ new Map()).set(key, value);
+			}
 		});
 		return result;
-	};
+	});
 }
 //#endregion
 export { retainSearchParams, stripSearchParams };

package/dist/esm/searchMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchMiddleware.js","names":[],"sources":["../../src/searchMiddleware.ts"],"sourcesContent":["import { createNull, deepEqual } from './utils'\nimport type { NoInfer, PickOptional } from './utils'\nimport type { SearchMiddleware } from './route'\nimport type { IsRequiredParams } from './link'\n\n/**\n * Retain specified search params across navigations.\n *\n * If `keys` is `true`, retain all current params. Otherwise, copy only the\n * listed keys from the current search into the next search.\n *\n * @param keys `true` to retain all, or a list of keys to retain.\n * @returns A search middleware suitable for route `search.middlewares`.\n * @link https://tanstack.com/router/latest/docs/framework/react/api/router/retainSearchParamsFunction\n */\nexport function retainSearchParams<TSearchSchema extends object>(\n  keys: Array<keyof TSearchSchema> | true,\n): SearchMiddleware<TSearchSchema> {\n  return ({ search, next }) => {\n    const [resultSearch, validations] = (next as any)(search, true) as [\n      TSearchSchema,\n      Array<Record<PropertyKey, unknown>>,\n    ]\n    const defaultKeys = validations.length\n      ? getValidationDefaultKeys(search, resultSearch, validations)\n      : undefined\n\n    if (keys === true) {\n      const copy = { ...search, ...resultSearch }\n      if (defaultKeys) {\n        for (const key in defaultKeys) {\n          copy[key as keyof TSearchSchema] = search[key as keyof TSearchSchema]\n        }\n      }\n      return copy\n    }\n\n    const copy = { ...resultSearch }\n    // add missing keys from search to copy\n    for (const key of keys) {\n      if (!(key in copy) || (defaultKeys ? key in defaultKeys : false)) {\n        copy[key] = search[key]\n      }\n    }\n    return copy\n  }\n}\n\nfunction getValidationDefaultKeys(\n  search: any,\n  resultSearch: any,\n  validations: Array<Record<PropertyKey, unknown>>,\n) {\n  let defaultKeys: Record<PropertyKey, true> | undefined\n  for (let i = 0; i < validations.length; i += 2) {\n    const baseSearch = validations[i]!\n    const validatedSearch = validations[i + 1]!\n    for (const key in validatedSearch) {\n      if (\n        key in search &&\n        !(key in baseSearch) &&\n        resultSearch[key] === validatedSearch[key]\n      ) {\n        const target = defaultKeys || (defaultKeys = createNull())\n        target[key] = true\n      }\n    }\n  }\n  return defaultKeys\n}\n\n/**\n * Remove optional or default-valued search params from navigations.\n *\n * - Pass `true` (only if there are no required search params) to strip all.\n * - Pass an array to always remove those optional keys.\n * - Pass an object of default values; keys equal (deeply) to the defaults are removed.\n *\n * @returns A search middleware suitable for route `search.middlewares`.\n * @link https://tanstack.com/router/latest/docs/framework/react/api/router/stripSearchParamsFunction\n */\nexport function stripSearchParams<\n  TSearchSchema,\n  TOptionalProps = PickOptional<NoInfer<TSearchSchema>>,\n  const TValues = Partial<NoInfer<TSearchSchema>> | Array<keyof TOptionalProps>,\n  const TInput = IsRequiredParams<TSearchSchema> extends never\n    ? TValues | true\n    : TValues,\n>(input: NoInfer<TInput>): SearchMiddleware<TSearchSchema> {\n  return ({ search, next }) => {\n    if (input === true) {\n      return {}\n    }\n    const result = { ...next(search) } as Record<string, unknown>\n    if (Array.isArray(input)) {\n      input.forEach((key) => {\n        delete result[key]\n      })\n    } else {\n      Object.entries(input as Record<string, unknown>).forEach(\n        ([key, value]) => {\n          if (deepEqual(result[key], value)) {\n            delete result[key]\n          }\n        },\n      )\n    }\n    return result as any\n  }\n}\n"],"mappings":";;;;;;;;;;;;AAeA,SAAgB,mBACd,MACiC;CACjC,QAAQ,EAAE,QAAQ,WAAW;EAC3B,MAAM,CAAC,cAAc,eAAgB,KAAa,QAAQ,IAAI;EAI9D,MAAM,cAAc,YAAY,SAC5B,yBAAyB,QAAQ,cAAc,WAAW,IAC1D,KAAA;EAEJ,IAAI,SAAS,MAAM;GACjB,MAAM,OAAO;IAAE,GAAG;IAAQ,GAAG;GAAa;GAC1C,IAAI,aACF,KAAK,MAAM,OAAO,aAChB,KAAK,OAA8B,OAAO;GAG9C,OAAO;EACT;EAEA,MAAM,OAAO,EAAE,GAAG,aAAa;EAE/B,KAAK,MAAM,OAAO,MAChB,IAAI,EAAE,OAAO,UAAU,cAAc,OAAO,cAAc,QACxD,KAAK,OAAO,OAAO;EAGvB,OAAO;CACT;AACF;AAEA,SAAS,yBACP,QACA,cACA,aACA;CACA,IAAI;CACJ,KAAK,IAAI,IAAI,GAAG,IAAI,YAAY,QAAQ,KAAK,GAAG;EAC9C,MAAM,aAAa,YAAY;EAC/B,MAAM,kBAAkB,YAAY,IAAI;EACxC,KAAK,MAAM,OAAO,iBAChB,IACE,OAAO,UACP,EAAE,OAAO,eACT,aAAa,SAAS,gBAAgB,MACtC;GACA,MAAM,SAAS,gBAAgB,cAAc,WAAW;GACxD,OAAO,OAAO;EAChB;CAEJ;CACA,OAAO;AACT;;;;;;;;;;;AAYA,SAAgB,kBAOd,OAAyD;CACzD,QAAQ,EAAE,QAAQ,WAAW;EAC3B,IAAI,UAAU,MACZ,OAAO,CAAC;EAEV,MAAM,SAAS,EAAE,GAAG,KAAK,MAAM,EAAE;EACjC,IAAI,MAAM,QAAQ,KAAK,GACrB,MAAM,SAAS,QAAQ;GACrB,OAAO,OAAO;EAChB,CAAC;OAED,OAAO,QAAQ,KAAgC,EAAE,SAC9C,CAAC,KAAK,WAAW;GAChB,IAAI,UAAU,OAAO,MAAM,KAAK,GAC9B,OAAO,OAAO;EAElB,CACF;EAEF,OAAO;CACT;AACF"}
+{"version":3,"file":"searchMiddleware.js","names":[],"sources":["../../src/searchMiddleware.ts"],"sourcesContent":["import { deepEqual } from './utils'\nimport type { NoInfer, PickOptional } from './utils'\nimport type {\n  SearchMiddleware,\n  SearchMiddlewareContext,\n  SearchMiddlewareMeta,\n} from './route'\nimport type { IsRequiredParams } from './link'\n\ntype SearchMiddlewareNextWithMeta<TSearchSchema> = (\n  newSearch: TSearchSchema,\n  collectMeta: true,\n) => { search: TSearchSchema; meta: SearchMiddlewareMeta }\n\n/**\n * Retain specified search params across navigations.\n *\n * If `keys` is `true`, retain all current params. Otherwise, copy only the\n * listed keys from the current search into the next search.\n *\n * @param keys `true` to retain all, or a list of keys to retain.\n * @returns A search middleware suitable for route `search.middlewares`.\n * @link https://tanstack.com/router/latest/docs/framework/react/api/router/retainSearchParamsFunction\n */\nexport function retainSearchParams<TSearchSchema extends object>(\n  keys: Array<keyof TSearchSchema> | true,\n): SearchMiddleware<TSearchSchema> {\n  return ({ search, next }) => {\n    const { search: resultSearch, meta } = (\n      next as unknown as SearchMiddlewareNextWithMeta<TSearchSchema>\n    )(search, true)\n\n    if (keys === true) {\n      const copy = { ...search, ...resultSearch }\n      const removed = meta.removed\n      for (const key of removed?.keys() || []) {\n        if (deepEqual(search[key as keyof TSearchSchema], removed!.get(key))) {\n          delete copy[key as keyof TSearchSchema]\n        }\n      }\n      for (const key of meta.removedAny || []) {\n        delete copy[key as keyof TSearchSchema]\n      }\n      for (const key of meta.defaulted?.keys() || []) {\n        if (\n          key in search &&\n          !meta.removedAny?.has(key) &&\n          !(\n            meta.removed?.has(key) &&\n            deepEqual(search[key as keyof TSearchSchema], meta.removed.get(key))\n          )\n        ) {\n          copy[key as keyof TSearchSchema] = search[key as keyof TSearchSchema]\n        }\n      }\n      return copy\n    }\n\n    const copy = { ...resultSearch }\n    // add missing keys from search to copy\n    for (const key of keys) {\n      const stringKey = key as string\n      const removed =\n        meta.removedAny?.has(stringKey) ||\n        (meta.removed?.has(stringKey) &&\n          deepEqual(search[key], meta.removed.get(stringKey)))\n      if (\n        !removed &&\n        (!(key in copy) ||\n          (key in search &&\n            meta.defaulted?.has(stringKey) &&\n            deepEqual(copy[key], meta.defaulted.get(stringKey))))\n      ) {\n        copy[key] = search[key]\n      }\n    }\n    return copy\n  }\n}\n\n/**\n * Remove optional or default-valued search params from navigations.\n *\n * - Pass `true` (only if there are no required search params) to strip all.\n * - Pass an array to always remove those optional keys.\n * - Pass an object of default values; keys equal (deeply) to the defaults are removed.\n *\n * @returns A search middleware suitable for route `search.middlewares`.\n * @link https://tanstack.com/router/latest/docs/framework/react/api/router/stripSearchParamsFunction\n */\nexport function stripSearchParams<\n  TSearchSchema,\n  TOptionalProps = PickOptional<NoInfer<TSearchSchema>>,\n  const TValues = Partial<NoInfer<TSearchSchema>> | Array<keyof TOptionalProps>,\n  const TInput = IsRequiredParams<TSearchSchema> extends never\n    ? TValues | true\n    : TValues,\n>(input: NoInfer<TInput>): SearchMiddleware<TSearchSchema> {\n  return (({ search, next, meta }: SearchMiddlewareContext<TSearchSchema>) => {\n    if (input === true) {\n      Object.keys(search as object).forEach((key) => {\n        if (meta) {\n          ;(meta.removedAny ||= new Set()).add(key)\n        }\n      })\n      return {}\n    }\n    const nextResult = next(search)\n    const result = { ...nextResult } as Record<string, unknown>\n    if (Array.isArray(input)) {\n      input.forEach((key) => {\n        delete result[key as string]\n        if (meta) {\n          ;(meta.removedAny ||= new Set()).add(key as string)\n        }\n      })\n    } else {\n      Object.entries(input as Record<string, unknown>).forEach(\n        ([key, value]) => {\n          if (deepEqual(result[key], value)) {\n            delete result[key]\n            if (meta) {\n              ;(meta.removed ||= new Map()).set(key, value)\n            }\n          }\n        },\n      )\n    }\n    return result as any\n  }) as SearchMiddleware<TSearchSchema>\n}\n"],"mappings":";;;;;;;;;;;;AAwBA,SAAgB,mBACd,MACiC;CACjC,QAAQ,EAAE,QAAQ,WAAW;EAC3B,MAAM,EAAE,QAAQ,cAAc,SAC5B,KACA,QAAQ,IAAI;EAEd,IAAI,SAAS,MAAM;GACjB,MAAM,OAAO;IAAE,GAAG;IAAQ,GAAG;GAAa;GAC1C,MAAM,UAAU,KAAK;GACrB,KAAK,MAAM,OAAO,SAAS,KAAK,KAAK,CAAC,GACpC,IAAI,UAAU,OAAO,MAA6B,QAAS,IAAI,GAAG,CAAC,GACjE,OAAO,KAAK;GAGhB,KAAK,MAAM,OAAO,KAAK,cAAc,CAAC,GACpC,OAAO,KAAK;GAEd,KAAK,MAAM,OAAO,KAAK,WAAW,KAAK,KAAK,CAAC,GAC3C,IACE,OAAO,UACP,CAAC,KAAK,YAAY,IAAI,GAAG,KACzB,EACE,KAAK,SAAS,IAAI,GAAG,KACrB,UAAU,OAAO,MAA6B,KAAK,QAAQ,IAAI,GAAG,CAAC,IAGrE,KAAK,OAA8B,OAAO;GAG9C,OAAO;EACT;EAEA,MAAM,OAAO,EAAE,GAAG,aAAa;EAE/B,KAAK,MAAM,OAAO,MAAM;GACtB,MAAM,YAAY;GAKlB,IACE,EAJA,KAAK,YAAY,IAAI,SAAS,KAC7B,KAAK,SAAS,IAAI,SAAS,KAC1B,UAAU,OAAO,MAAM,KAAK,QAAQ,IAAI,SAAS,CAAC,OAGnD,EAAE,OAAO,SACP,OAAO,UACN,KAAK,WAAW,IAAI,SAAS,KAC7B,UAAU,KAAK,MAAM,KAAK,UAAU,IAAI,SAAS,CAAC,IAEtD,KAAK,OAAO,OAAO;EAEvB;EACA,OAAO;CACT;AACF;;;;;;;;;;;AAYA,SAAgB,kBAOd,OAAyD;CACzD,SAAS,EAAE,QAAQ,MAAM,WAAmD;EAC1E,IAAI,UAAU,MAAM;GAClB,OAAO,KAAK,MAAgB,EAAE,SAAS,QAAQ;IAC7C,IAAI,MACD,CAAC,KAAK,+BAAe,IAAI,IAAI,GAAG,IAAI,GAAG;GAE5C,CAAC;GACD,OAAO,CAAC;EACV;EAEA,MAAM,SAAS,EAAE,GADE,KAAK,MACJ,EAAW;EAC/B,IAAI,MAAM,QAAQ,KAAK,GACrB,MAAM,SAAS,QAAQ;GACrB,OAAO,OAAO;GACd,IAAI,MACD,CAAC,KAAK,+BAAe,IAAI,IAAI,GAAG,IAAI,GAAa;EAEtD,CAAC;OAED,OAAO,QAAQ,KAAgC,EAAE,SAC9C,CAAC,KAAK,WAAW;GAChB,IAAI,UAAU,OAAO,MAAM,KAAK,GAAG;IACjC,OAAO,OAAO;IACd,IAAI,MACD,CAAC,KAAK,4BAAY,IAAI,IAAI,GAAG,IAAI,KAAK,KAAK;GAEhD;EACF,CACF;EAEF,OAAO;CACT;AACF"}

package/dist/esm/utils.js

@@ -321,6 +321,6 @@ function arraysEqual(a, b) {
 	return true;
 }
 //#endregion
-export { DEFAULT_PROTOCOL_ALLOWLIST, arraysEqual, buildDevStylesUrl, createControlledPromise, createNull, decodePath, deepEqual, encodePathLikeUrl, escapeHtml, findLast, functionalUpdate, hasKeys, isDangerousProtocol, isModuleNotFoundError, isPlainArray, isPlainObject, isPromise, last, nullReplaceEqualDeep, replaceEqualDeep };
+export { DEFAULT_PROTOCOL_ALLOWLIST, arraysEqual, buildDevStylesUrl, createControlledPromise, decodePath, deepEqual, encodePathLikeUrl, escapeHtml, findLast, functionalUpdate, hasKeys, isDangerousProtocol, isModuleNotFoundError, isPlainArray, isPlainObject, isPromise, last, nullReplaceEqualDeep, replaceEqualDeep };
 
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-core",
-  "version": "1.171.10",
+  "version": "1.171.11",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/route.ts

@@ -74,9 +74,16 @@ export type RoutePathOptionsIntersection<TCustomId, TPath> = {
 
 export type SearchFilter<TInput, TResult = TInput> = (prev: TInput) => TResult
 
+export type SearchMiddlewareMeta = {
+  removed?: Map<string, unknown>
+  removedAny?: Set<string>
+  defaulted?: Map<string, unknown>
+}
+
 export type SearchMiddlewareContext<TSearchSchema> = {
   search: TSearchSchema
   next: (newSearch: TSearchSchema) => TSearchSchema
+  meta?: SearchMiddlewareMeta
 }
 
 export type SearchMiddleware<TSearchSchema> = (

package/src/router.ts

@@ -79,6 +79,7 @@ import type {
   RouteLike,
   RouteMask,
   SearchMiddleware,
+  SearchMiddlewareMeta,
 } from './route'
 import type {
   FullSearchSchema,
@@ -3123,8 +3124,6 @@ function buildMiddlewareChain(destRoutes: ReadonlyArray<AnyRoute>) {
   let dest: BuildNextOptions
   let includeValidateSearch: boolean | undefined
   const middlewares = [] as Array<SearchMiddleware<any>>
-  // Flat pairs: [searchBeforeValidation, validatedSearch, ...]
-  type ValidatedSearches = Array<Record<PropertyKey, unknown>>
 
   for (const route of destRoutes) {
     const routeOptions = route.options
@@ -3157,17 +3156,18 @@ function buildMiddlewareChain(destRoutes: ReadonlyArray<AnyRoute>) {
 
     const routeValidateSearch = routeOptions.validateSearch
     if (routeValidateSearch) {
-      const validate: SearchMiddleware<any> = (
-        { search, next },
-        validations?: ValidatedSearches,
-      ) => {
+      const validate: SearchMiddleware<any> = ({ search, next, meta }) => {
         const result = next(search)
         if (includeValidateSearch) {
           try {
             const validated = validateSearch(routeValidateSearch, result) as any
 
-            if (validations && validated) {
-              validations.push(result, validated)
+            if (meta && validated) {
+              for (const key in validated) {
+                if (!(key in result)) {
+                  ;(meta.defaulted ||= new Map()).set(key, validated[key])
+                }
+              }
             }
             return { ...result, ...validated }
           } catch {
@@ -3184,7 +3184,7 @@ function buildMiddlewareChain(destRoutes: ReadonlyArray<AnyRoute>) {
   const applyNext = (
     index: number,
     currentSearch: any,
-    validations?: ValidatedSearches,
+    meta?: SearchMiddlewareMeta,
   ): any => {
     // no more middlewares left, return the current search
     if (index >= middlewares.length) {
@@ -3197,21 +3197,18 @@ function buildMiddlewareChain(destRoutes: ReadonlyArray<AnyRoute>) {
       return functionalUpdate(dest.search, currentSearch)
     }
 
-    const next = (newSearch: any, collectValidations?: true): any => {
-      if (collectValidations) {
-        const nextValidations: ValidatedSearches = []
-        return [
-          applyNext(index + 1, newSearch, nextValidations),
-          nextValidations,
-        ]
+    const next = (newSearch: any, collectMeta?: true): any => {
+      if (collectMeta) {
+        const nextMeta = meta || ({} as SearchMiddlewareMeta)
+        return {
+          search: applyNext(index + 1, newSearch, nextMeta),
+          meta: nextMeta,
+        }
       }
-      return applyNext(index + 1, newSearch, validations)
+      return applyNext(index + 1, newSearch, meta)
     }
 
-    return (middlewares[index]! as any)(
-      { search: currentSearch, next },
-      validations,
-    )
+    return (middlewares[index]! as any)({ search: currentSearch, next, meta })
   }
 
   return function middleware(

package/src/searchMiddleware.ts

@@ -1,8 +1,17 @@
-import { createNull, deepEqual } from './utils'
+import { deepEqual } from './utils'
 import type { NoInfer, PickOptional } from './utils'
-import type { SearchMiddleware } from './route'
+import type {
+  SearchMiddleware,
+  SearchMiddlewareContext,
+  SearchMiddlewareMeta,
+} from './route'
 import type { IsRequiredParams } from './link'
 
+type SearchMiddlewareNextWithMeta<TSearchSchema> = (
+  newSearch: TSearchSchema,
+  collectMeta: true,
+) => { search: TSearchSchema; meta: SearchMiddlewareMeta }
+
 /**
  * Retain specified search params across navigations.
  *
@@ -17,18 +26,30 @@ export function retainSearchParams<TSearchSchema extends object>(
   keys: Array<keyof TSearchSchema> | true,
 ): SearchMiddleware<TSearchSchema> {
   return ({ search, next }) => {
-    const [resultSearch, validations] = (next as any)(search, true) as [
-      TSearchSchema,
-      Array<Record<PropertyKey, unknown>>,
-    ]
-    const defaultKeys = validations.length
-      ? getValidationDefaultKeys(search, resultSearch, validations)
-      : undefined
+    const { search: resultSearch, meta } = (
+      next as unknown as SearchMiddlewareNextWithMeta<TSearchSchema>
+    )(search, true)
 
     if (keys === true) {
       const copy = { ...search, ...resultSearch }
-      if (defaultKeys) {
-        for (const key in defaultKeys) {
+      const removed = meta.removed
+      for (const key of removed?.keys() || []) {
+        if (deepEqual(search[key as keyof TSearchSchema], removed!.get(key))) {
+          delete copy[key as keyof TSearchSchema]
+        }
+      }
+      for (const key of meta.removedAny || []) {
+        delete copy[key as keyof TSearchSchema]
+      }
+      for (const key of meta.defaulted?.keys() || []) {
+        if (
+          key in search &&
+          !meta.removedAny?.has(key) &&
+          !(
+            meta.removed?.has(key) &&
+            deepEqual(search[key as keyof TSearchSchema], meta.removed.get(key))
+          )
+        ) {
           copy[key as keyof TSearchSchema] = search[key as keyof TSearchSchema]
         }
       }
@@ -38,35 +59,23 @@ export function retainSearchParams<TSearchSchema extends object>(
     const copy = { ...resultSearch }
     // add missing keys from search to copy
     for (const key of keys) {
-      if (!(key in copy) || (defaultKeys ? key in defaultKeys : false)) {
-        copy[key] = search[key]
-      }
-    }
-    return copy
-  }
-}
-
-function getValidationDefaultKeys(
-  search: any,
-  resultSearch: any,
-  validations: Array<Record<PropertyKey, unknown>>,
-) {
-  let defaultKeys: Record<PropertyKey, true> | undefined
-  for (let i = 0; i < validations.length; i += 2) {
-    const baseSearch = validations[i]!
-    const validatedSearch = validations[i + 1]!
-    for (const key in validatedSearch) {
+      const stringKey = key as string
+      const removed =
+        meta.removedAny?.has(stringKey) ||
+        (meta.removed?.has(stringKey) &&
+          deepEqual(search[key], meta.removed.get(stringKey)))
       if (
-        key in search &&
-        !(key in baseSearch) &&
-        resultSearch[key] === validatedSearch[key]
+        !removed &&
+        (!(key in copy) ||
+          (key in search &&
+            meta.defaulted?.has(stringKey) &&
+            deepEqual(copy[key], meta.defaulted.get(stringKey))))
       ) {
-        const target = defaultKeys || (defaultKeys = createNull())
-        target[key] = true
+        copy[key] = search[key]
       }
     }
+    return copy
   }
-  return defaultKeys
 }
 
 /**
@@ -87,24 +96,36 @@ export function stripSearchParams<
     ? TValues | true
     : TValues,
 >(input: NoInfer<TInput>): SearchMiddleware<TSearchSchema> {
-  return ({ search, next }) => {
+  return (({ search, next, meta }: SearchMiddlewareContext<TSearchSchema>) => {
     if (input === true) {
+      Object.keys(search as object).forEach((key) => {
+        if (meta) {
+          ;(meta.removedAny ||= new Set()).add(key)
+        }
+      })
       return {}
     }
-    const result = { ...next(search) } as Record<string, unknown>
+    const nextResult = next(search)
+    const result = { ...nextResult } as Record<string, unknown>
     if (Array.isArray(input)) {
       input.forEach((key) => {
-        delete result[key]
+        delete result[key as string]
+        if (meta) {
+          ;(meta.removedAny ||= new Set()).add(key as string)
+        }
       })
     } else {
       Object.entries(input as Record<string, unknown>).forEach(
         ([key, value]) => {
           if (deepEqual(result[key], value)) {
             delete result[key]
+            if (meta) {
+              ;(meta.removed ||= new Map()).set(key, value)
+            }
           }
         },
       )
     }
     return result as any
-  }
+  }) as SearchMiddleware<TSearchSchema>
 }