Skip to content

Commit 7f4fbd6

Browse files
authored
Merge branch 'main' into bump-meilisearch-v0.12.0
2 parents 118da8e + 756d856 commit 7f4fbd6

File tree

7 files changed

+190
-365
lines changed

7 files changed

+190
-365
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Run Browser env
5959
run: yarn test:env:browser
6060
- name: Upload coverage reports to Codecov
61-
uses: codecov/codecov-action@v4
61+
uses: codecov/codecov-action@v5
6262
env:
6363
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6464
style_tests:

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ First of all, thank you for contributing to Meilisearch! The goal of this docume
3434

3535
To run this project, you will need:
3636

37-
- Node.js >= v14 and node <= 18
37+
- Node.js >= v16 and node <= 18
3838
- Yarn
39-
39+
- vitest
4040

4141
### Setup
4242

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "meilisearch",
3-
"version": "0.45.0",
3+
"version": "0.46.0",
44
"description": "The Meilisearch JS client for Node.js and the browser.",
55
"keywords": [
66
"meilisearch",
@@ -89,33 +89,33 @@
8989
"@rollup/plugin-terser": "^0.4.4",
9090
"@babel/core": "^7.25.2",
9191
"@babel/preset-env": "^7.25.4",
92-
"@eslint/js": "^9.11.1",
92+
"@eslint/js": "^9.16.0",
9393
"@rollup/plugin-babel": "^6.0.4",
9494
"@rollup/plugin-commonjs": "28.0.0",
9595
"@rollup/plugin-json": "^6.1.0",
9696
"@rollup/plugin-node-resolve": "15.3.0",
9797
"@types/eslint__js": "^8.42.3",
9898
"@vitest/coverage-v8": "2.0.5",
9999
"@vitest/eslint-plugin": "^1.1.4",
100-
"@types/node": "^22.8.6",
100+
"@types/node": "^22.10.1",
101101
"brotli-size": "^4.0.0",
102-
"eslint": "^9.13.0",
102+
"eslint": "^9.16.0",
103103
"eslint-config-prettier": "^9.1.0",
104104
"eslint-plugin-tsdoc": "^0.3.0",
105-
"globals": "^15.11.0",
105+
"globals": "^15.12.0",
106106
"gzip-size": "^6.0.0",
107107
"kleur": "^4.1.5",
108108
"lint-staged": "15.2.10",
109109
"nodemon": "^3.1.7",
110-
"prettier": "^3.3.3",
110+
"prettier": "^3.4.1",
111111
"prettier-plugin-jsdoc": "^1.3.0",
112112
"pretty-bytes": "^5.6.0",
113113
"rollup": "^4.22.5",
114114
"rollup-plugin-typescript2": "^0.36.0",
115115
"shx": "^0.3.2",
116-
"typedoc": "^0.26.10",
116+
"typedoc": "^0.27.2",
117117
"typescript": "^5.4.5",
118-
"typescript-eslint": "^8.12.2",
118+
"typescript-eslint": "^8.16.0",
119119
"vitest": "2.0.5"
120120
},
121121
"packageManager": "[email protected]"

src/meilisearch.ts

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ import {
2929
CancelTasksQuery,
3030
DeleteTasksQuery,
3131
MultiSearchParams,
32-
MultiSearchResponse,
33-
SearchResponse,
3432
FederatedMultiSearchParams,
33+
MultiSearchResponseOrSearchResponse,
3534
} from "./types";
3635
import { HttpRequests } from "./http-requests";
3736
import { TaskClient, Task } from "./task";
@@ -214,18 +213,13 @@ export class MeiliSearch {
214213
* @param config - Additional request configuration options
215214
* @returns Promise containing the search responses
216215
*/
217-
multiSearch<T extends Record<string, unknown> = Record<string, any>>(
218-
queries: MultiSearchParams,
216+
async multiSearch<
217+
T1 extends MultiSearchParams | FederatedMultiSearchParams,
218+
T2 extends Record<string, unknown> = Record<string, any>,
219+
>(
220+
queries: T1,
219221
config?: Partial<Request>,
220-
): Promise<MultiSearchResponse<T>>;
221-
multiSearch<T extends Record<string, unknown> = Record<string, any>>(
222-
queries: FederatedMultiSearchParams,
223-
config?: Partial<Request>,
224-
): Promise<SearchResponse<T>>;
225-
async multiSearch<T extends Record<string, unknown> = Record<string, any>>(
226-
queries: MultiSearchParams | FederatedMultiSearchParams,
227-
config?: Partial<Request>,
228-
): Promise<MultiSearchResponse<T> | SearchResponse<T>> {
222+
): Promise<MultiSearchResponseOrSearchResponse<T1, T2>> {
229223
const url = `multi-search`;
230224

231225
return await this.httpRequest.post(url, queries, undefined, config);

src/package-version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const PACKAGE_VERSION = "0.45.0";
1+
export const PACKAGE_VERSION = "0.46.0";

src/types/types.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,13 @@ export type MultiSearchResponse<T = Record<string, any>> = {
299299
results: Array<MultiSearchResult<T>>;
300300
};
301301

302+
export type MultiSearchResponseOrSearchResponse<
303+
T1 extends FederatedMultiSearchParams | MultiSearchParams,
304+
T2 extends Record<string, unknown> = Record<string, any>,
305+
> = T1 extends FederatedMultiSearchParams
306+
? SearchResponse<T2>
307+
: MultiSearchResponse<T2>;
308+
302309
export type FieldDistribution = {
303310
[field: string]: number;
304311
};

0 commit comments

Comments
 (0)