ref: ensure non-nullable searchParams in adapters

Author: franky47

packages/nuqs/src/adapters/next/impl.app.ts

@@ -61,7 +61,7 @@ export function NavigationSpy() {
 
 export function useNuqsNextAppRouterAdapter(): AdapterInterface {
   const router = useRouter()
-  const searchParams = useSearchParams()
+  const searchParams = useSearchParams() ?? new URLSearchParams()
   const [optimisticSearchParams, setOptimisticSearchParams] =
     useOptimistic<URLSearchParams>(searchParams)
   const updateUrl: UpdateUrlFunction = useCallback((search, options) => {

packages/nuqs/src/useQueryStates.ts

@@ -114,10 +114,9 @@ export function useQueryStates<KeyMap extends UseQueryStatesKeysMap>(
   const queuedQueries = debounceController.useQueuedQueries(
     Object.values(resolvedUrlKeys)
   )
-  const [internalState, setInternalState] = useState<V>(() => {
-    const source = initialSearchParams ?? new URLSearchParams()
-    return parseMap(keyMap, urlKeys, source, queuedQueries).state
-  })
+  const [internalState, setInternalState] = useState<V>(
+    () => parseMap(keyMap, urlKeys, initialSearchParams, queuedQueries).state
+  )
 
   const stateRef = useRef(internalState)
   debug(
@@ -158,8 +157,8 @@ export function useQueryStates<KeyMap extends UseQueryStatesKeysMap>(
         return [
           urlKey,
           parser?.type === 'multi'
-            ? initialSearchParams?.getAll(urlKey)
-            : (initialSearchParams?.get(urlKey) ?? null)
+            ? initialSearchParams.getAll(urlKey)
+            : (initialSearchParams.get(urlKey) ?? null)
         ]
       })
     )
@@ -187,7 +186,7 @@ export function useQueryStates<KeyMap extends UseQueryStatesKeysMap>(
     }
   }, [
     Object.values(resolvedUrlKeys)
-      .map(key => `${key}=${initialSearchParams?.getAll(key)}`)
+      .map(key => `${key}=${initialSearchParams.getAll(key)}`)
       .join('&'),
     JSON.stringify(queuedQueries)
   ])
@@ -412,8 +411,8 @@ function parseMap<KeyMap extends UseQueryStatesKeysMap>(
     const query =
       queuedQuery === undefined
         ? ((parser.type === 'multi'
-            ? searchParams?.getAll(urlKey)
-            : searchParams?.get(urlKey)) ?? fallbackValue)
+            ? searchParams.getAll(urlKey)
+            : searchParams.get(urlKey)) ?? fallbackValue)
         : queuedQuery
     if (
       cachedQuery &&