fix: Change searchParams type to Record

Closes #672

src/config.spec.ts

@@ -67,9 +67,11 @@ describe('Config', () => {
     );
 
     const url = config
-      .resolveHttpPath('/api/v1/yay', new URLSearchParams({ query: 'true' }))
+      .resolveHttpPath('/api/v1/yay', { query: 'true', list: ['1', '2', '3'] })
       .toString();
-    expect(url).toEqual('https://mastodon.social/api/v1/yay?query=true');
+    expect(url).toEqual(
+      'https://mastodon.social/api/v1/yay?query=true&list[]=1&list[]=2&list[]=3',
+    );
   });
 
   it('resolves WS path with path', () => {
@@ -114,10 +116,7 @@ describe('Config', () => {
     );
 
     const url = config
-      .resolveHttpPath(
-        '/path/to/somewhere?foo=bar',
-        new URLSearchParams({ foo2: 'bar2' }),
-      )
+      .resolveHttpPath('/path/to/somewhere?foo=bar', { foo2: 'bar2' })
       .toString();
     expect(url).toEqual('https://mastodon.social/path/to/somewhere?foo2=bar2');
   });

src/config.ts

@@ -54,13 +54,11 @@ export class MastoConfig {
       : protocols;
   }
 
-  resolveHttpPath(path: string, params?: URLSearchParams): URL {
+  resolveHttpPath(path: string, params?: Record<string, unknown>): URL {
     const url = new URL(path, this.props.url);
 
     if (params) {
-      url.search = this.serializer.serializeQueryString(
-        Object.fromEntries(params.entries()),
-      );
+      url.search = this.serializer.serializeQueryString(params);
     }
 
     return url;

src/http/base-http.ts

@@ -8,7 +8,7 @@ export abstract class BaseHttp implements Http {
   get<T>(path: string, data?: unknown, init: RequestInit = {}): Promise<T> {
     return this.request({
       path,
-      searchParams: new URLSearchParams(data as Record<string, string>),
+      searchParams: data as Record<string, unknown>,
       requestInit: {
         method: 'GET',
         ...init,

src/http/http.ts

@@ -8,7 +8,7 @@ export type HttpMethod = <T>(
 
 export type HttpRequestParams = {
   readonly path: string;
-  readonly searchParams?: URLSearchParams;
+  readonly searchParams?: Record<string, unknown>;
   readonly body?: Record<string, unknown>;
   readonly requestInit?: Omit<RequestInit, 'body'>;
 };

src/mastodon/v1/repositories/account-repository.ts

@@ -232,7 +232,7 @@ export class AccountRepository
    * @see https://docs.joinmastodon.org/methods/accounts/
    */
   @version({ since: '0.0.0' })
-  fetchRelationships(id: string[]): Promise<Relationship[]> {
+  fetchRelationships(id: readonly string[]): Promise<Relationship[]> {
     return this.http.get('/api/v1/accounts/relationships', {
       id,
     });

src/paginator.spec.ts

@@ -19,7 +19,7 @@ describe('Paginator', () => {
     expect(http.request).toBeCalledWith({
       requestInit: { method: 'GET' },
       path: '/v1/api/timelines',
-      searchParams: new URLSearchParams({ foo: 'bar' }),
+      searchParams: { foo: 'bar' },
     });
   });
 
@@ -32,7 +32,7 @@ describe('Paginator', () => {
     expect(http.request).toBeCalledWith({
       requestInit: { method: 'GET' },
       path: '/v1/api/timelines',
-      searchParams: new URLSearchParams({ foo: 'bar' }),
+      searchParams: { foo: 'bar' },
     });
   });
 
@@ -47,7 +47,7 @@ describe('Paginator', () => {
     await paginator.next();
     expect(http.request).toBeCalledWith({
       requestInit: { method: 'GET' },
-      searchParams: new URLSearchParams({ max_id: '109382006402042919' }),
+      searchParams: { max_id: '109382006402042919' },
       path: '/api/v1/timelines/home',
     });
   });

src/paginator.ts

@@ -24,9 +24,7 @@ export class Paginator<Entity, Params = never>
     const response = await this.http.request({
       requestInit: { method: 'GET' },
       path: this.nextPath,
-      searchParams: new URLSearchParams(
-        this.nextParams as Record<string, string>,
-      ),
+      searchParams: this.nextParams as Record<string, unknown>,
     });
 
     const next = this.pluckNext(response.headers.get('link'))?.split('?');

tests/accounts.spec.ts

@@ -84,4 +84,13 @@ describe('account', () => {
         .every((status) => status.inReplyToId == undefined),
     ).toBe(true);
   });
+
+  it('fetches relationships', async () => {
+    const accountIds = await client.v1.timelines
+      .listPublic()
+      .then((ar) => [ar[0], ar[1], ar[2]].map((s) => s.account.id));
+
+    const res = await client.v1.accounts.fetchRelationships(accountIds);
+    expect(res).toHaveLength(accountIds.length);
+  });
 });