Skip to content

Commit a8d8e48

Browse files
committed
Revert splitting of multiSearch, and instead use overloads
1 parent b6ed2ce commit a8d8e48

File tree

6 files changed

+20
-39
lines changed

6 files changed

+20
-39
lines changed

.code-samples.meilisearch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ distinct_attribute_guide_filterable_1: |-
807807
distinct_attribute_guide_distinct_parameter_1: |-
808808
client.index('products').search({ q: 'white shirt', distinct: 'sku' })
809809
multi_search_federated_1: |-
810-
client.federatedMultiSearch({
810+
client.multiSearch({
811811
federation: {},
812812
queries: [
813813
{

src/meilisearch.ts

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,16 @@ export class MeiliSearch {
217217
/// Multi Search
218218
///
219219

220-
async #multiSearch(
220+
/** {@link https://www.meilisearch.com/docs/reference/api/multi_search} */
221+
multiSearch(
222+
multiSearch: MultiSearch,
223+
init?: ExtraRequestInit,
224+
): Promise<SearchResults>;
225+
multiSearch(
226+
federatedSearch: FederatedSearch,
227+
init?: ExtraRequestInit,
228+
): Promise<FederatedSearchResult>;
229+
async multiSearch(
221230
body: MultiSearchOrFederatedSearch,
222231
init?: ExtraRequestInit,
223232
): Promise<SearchResultsOrFederatedSearchResult> {
@@ -228,18 +237,6 @@ export class MeiliSearch {
228237
});
229238
}
230239

231-
/** {@link https://www.meilisearch.com/docs/reference/api/multi_search} */
232-
readonly multiSearch = this.#multiSearch.bind(this) as (
233-
multiSearch: MultiSearch,
234-
init?: ExtraRequestInit,
235-
) => Promise<SearchResults>;
236-
237-
/** {@link https://www.meilisearch.com/docs/reference/api/multi_search} */
238-
readonly federatedMultiSearch = this.#multiSearch.bind(this) as (
239-
federatedSearch: FederatedSearch,
240-
init?: ExtraRequestInit,
241-
) => Promise<FederatedSearchResult>;
242-
243240
///
244241
/// Network
245242
///

src/types/functions.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/types/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ export * from "./shared.js";
66
export * from "./task-and-batch.js";
77
export * from "./token.js";
88
export * from "./types.js";
9-
export * from "./functions.js";

tests/search.test.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,10 @@ test.concurrent(`${federatedMultiSearch.name} method`, async () => {
401401
facetsByIndex: { [INDEX_UID]: ["genres", "popularity"] },
402402
};
403403

404-
const { hits, facetsByIndex, remoteErrors } =
405-
await client.federatedMultiSearch({
406-
queries,
407-
federation,
408-
});
404+
const { hits, facetsByIndex, remoteErrors } = await client.multiSearch({
405+
queries,
406+
federation,
407+
});
409408

410409
for (const {
411410
_federation: { weightedRankingScore, ..._federation },
@@ -425,7 +424,7 @@ test.concurrent(`${federatedMultiSearch.name} method`, async () => {
425424
// TODO: Maybe could get an error response for this, to validate it against
426425
assert.deepEqual(remoteErrors, {});
427426

428-
const { facetDistribution, facetStats } = await client.federatedMultiSearch({
427+
const { facetDistribution, facetStats } = await client.multiSearch({
429428
queries,
430429
federation: { ...federation, mergeFacets: { maxValuesPerFacet: 100 } },
431430
});

tests/utils/search.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,14 @@ export const [
5353
},
5454
},
5555
{
56-
name: "federatedMultiSearch" satisfies keyof Pick<
57-
MeiliSearch,
58-
"federatedMultiSearch"
59-
>,
56+
name: "federatedMultiSearch" satisfies `federated${Capitalize<
57+
keyof Pick<MeiliSearch, "multiSearch">
58+
>}`,
6059
searchMethod: async (searchQuery) => {
6160
const { offset, limit, facets, ...restOfSearchQuery } =
6261
searchQuery as SearchQueryWithOffsetLimit;
6362

64-
const { hits, ...result } = await client.federatedMultiSearch({
63+
const { hits, ...result } = await client.multiSearch({
6564
queries: [{ indexUid: INDEX_UID, ...restOfSearchQuery }],
6665
federation: {
6766
offset: offset ?? undefined,

0 commit comments

Comments
 (0)