fix(client): handle query parameters in removeIndexString (#4352)

* fix(client): handle query parameters in `removeIndexString`

* fix the typo

Author: yusukebe

src/client/client.test.ts

@@ -356,6 +356,14 @@ describe('Basic - $url()', () => {
   it('Should return a correct url via $url().href', async () => {
     const client = hc<typeof app>('http://fake')
     expect(client.index.$url().href).toBe('http://fake/')
+    expect(
+      client.index.$url({
+        query: {
+          page: '123',
+          limit: '20',
+        },
+      }).href
+    ).toBe('http://fake/?page=123&limit=20')
     expect(client.api.$url().href).toBe('http://fake/api')
     expect(
       client.api.posts[':id'].$url({

src/client/utils.test.ts

@@ -122,6 +122,24 @@ describe('removeIndexString', () => {
     newUrl = removeIndexString(url)
     expect(newUrl).toBe('/subindex')
   })
+
+  it('Should remove `/index` with query parameters', () => {
+    let url = 'http://localhost/index?page=123&limit=20'
+    let newUrl = removeIndexString(url)
+    expect(newUrl).toBe('http://localhost/?page=123&limit=20')
+
+    url = 'https://example.com/index?q=search'
+    newUrl = removeIndexString(url)
+    expect(newUrl).toBe('https://example.com/?q=search')
+
+    url = '/api/index?filter=test'
+    newUrl = removeIndexString(url)
+    expect(newUrl).toBe('/api?filter=test')
+
+    url = '/index?a=1&b=2&c=3'
+    newUrl = removeIndexString(url)
+    expect(newUrl).toBe('?a=1&b=2&c=3')
+  })
 })
 
 describe('deepMerge', () => {

src/client/utils.ts

@@ -52,11 +52,11 @@ export const replaceUrlProtocol = (urlString: string, protocol: 'ws' | 'http') =
   }
 }
 
-export const removeIndexString = (urlSting: string) => {
-  if (/^https?:\/\/[^\/]+?\/index$/.test(urlSting)) {
-    return urlSting.replace(/\/index$/, '/')
+export const removeIndexString = (urlString: string) => {
+  if (/^https?:\/\/[^\/]+?\/index(?=\?|$)/.test(urlString)) {
+    return urlString.replace(/\/index(?=\?|$)/, '/')
   }
-  return urlSting.replace(/\/index$/, '')
+  return urlString.replace(/\/index(?=\?|$)/, '')
 }
 
 function isObject(item: unknown): item is ObjectType {