fix(useUrlSearchParams): wrong iterable empty check (vitest-dev#347)

chaii3 · Feb 25, 2021 · 839cd86 · 839cd86
1 parent e66b1c6
commit 839cd86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/packages/core/useUrlSearchParams/index.test.ts b/packages/core/useUrlSearchParams/index.test.ts
@@ -33,9 +33,9 @@ describe('useUrlSearchParams', () => {
     test('return initial params', () => {
       useSetup(() => {
         if (mode === 'hash')
-          mockPopstate('', '#/test/?foo=bar')
+          window.location.hash = '#/test/?foo=bar'
         else
-          mockPopstate('?foo=bar', '')
+          window.location.search = '?foo=bar'
       })
 
       const params = useUrlSearchParams(mode)

diff --git a/packages/core/useUrlSearchParams/index.ts b/packages/core/useUrlSearchParams/index.ts
@@ -40,15 +40,10 @@ export function useUrlSearchParams<T extends Record<string, any> = UrlParams>(
 
   const write = (params: URLSearchParams, shouldUpdateParamsMap?: boolean) => {
     pause()
-    if (shouldUpdateParamsMap) {
-      Object.keys(paramsMap).forEach(key => delete paramsMap[key])
-      for (const key of params.keys()) {
-        const paramsForKey = params.getAll(key)
-        writeToParamsMap(key, paramsForKey.length > 1 ? paramsForKey : (params.get(key) || ''))
-      }
-    }
+    if (shouldUpdateParamsMap)
+      updateParamsMap()
 
-    const empty = !params.keys.length
+    const empty = !params.keys().next()
     const query = empty
       ? hashWithoutParams.value
       : (mode === 'hash')
@@ -64,6 +59,16 @@ export function useUrlSearchParams<T extends Record<string, any> = UrlParams>(
 
   const writeToParamsMap = (key: keyof T, value: any) => paramsMap[key] = value
 
+  const updateParamsMap = () => {
+    Object.keys(paramsMap).forEach(key => delete paramsMap[key])
+    for (const key of params.keys()) {
+      const paramsForKey = params.getAll(key)
+      writeToParamsMap(key, paramsForKey.length > 1 ? paramsForKey : (params.get(key) || ''))
+    }
+  }
+  // Update the paramsMap with initial values
+  updateParamsMap()
+
   const { pause, resume } = pausableWatch(
     paramsMap,
     () => {
@@ -85,8 +90,5 @@ export function useUrlSearchParams<T extends Record<string, any> = UrlParams>(
     write(params, true)
   })
 
-  // Update the paramsMap with initial values
-  write(params, true)
-
   return paramsMap
 }