Skip to content

Updated Type definition for multiSearch return types for better TS support #1776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/meilisearch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ import {
CancelTasksQuery,
DeleteTasksQuery,
MultiSearchParams,
MultiSearchResponse,
SearchResponse,
FederatedMultiSearchParams,
MultiSearchResponseOrSearchResponse,
} from "./types";
import { HttpRequests } from "./http-requests";
import { TaskClient, Task } from "./task";
Expand Down Expand Up @@ -214,18 +213,13 @@ export class MeiliSearch {
* @param config - Additional request configuration options
* @returns Promise containing the search responses
*/
multiSearch<T extends Record<string, unknown> = Record<string, any>>(
queries: MultiSearchParams,
async multiSearch<
T1 extends MultiSearchParams | FederatedMultiSearchParams,
T2 extends Record<string, unknown> = Record<string, any>,
>(
queries: T1,
config?: Partial<Request>,
): Promise<MultiSearchResponse<T>>;
multiSearch<T extends Record<string, unknown> = Record<string, any>>(
queries: FederatedMultiSearchParams,
config?: Partial<Request>,
): Promise<SearchResponse<T>>;
async multiSearch<T extends Record<string, unknown> = Record<string, any>>(
queries: MultiSearchParams | FederatedMultiSearchParams,
config?: Partial<Request>,
): Promise<MultiSearchResponse<T> | SearchResponse<T>> {
): Promise<MultiSearchResponseOrSearchResponse<T1, T2>> {
const url = `multi-search`;

return await this.httpRequest.post(url, queries, undefined, config);
Expand Down
7 changes: 7 additions & 0 deletions src/types/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,13 @@ export type MultiSearchResponse<T = Record<string, any>> = {
results: Array<MultiSearchResult<T>>;
};

export type MultiSearchResponseOrSearchResponse<
T1 extends FederatedMultiSearchParams | MultiSearchParams,
T2 extends Record<string, unknown> = Record<string, any>,
> = T1 extends FederatedMultiSearchParams
? SearchResponse<T2>
: MultiSearchResponse<T2>;

export type FieldDistribution = {
[field: string]: number;
};
Expand Down