Skip to content

Commit 4137323

Browse files
committed
Merge branch 'main' into jsr
2 parents 9f850fa + d8d2abe commit 4137323

21 files changed

+877
-380
lines changed

.code-samples.meilisearch.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -99,35 +99,35 @@ multi_search_1: |-
9999
},
100100
]})
101101
get_all_tasks_1: |-
102-
client.getTasks()
102+
client.tasks.getTasks()
103103
get_task_1: |-
104-
client.getTask(1)
104+
client.tasks.getTask(1)
105105
async_guide_filter_by_date_1: |-
106-
client.getTasks({ afterEnqueuedAt: '2020-10-11T11:49:53.000Z' })
106+
client.tasks.getTasks({ afterEnqueuedAt: '2020-10-11T11:49:53.000Z' })
107107
async_guide_multiple_filters_1: |-
108-
client.getTasks({
108+
client.tasks.getTasks({
109109
indexUids: ['movies'],
110110
types: ['documentAdditionOrUpdate','documentDeletion'],
111111
statuses: ['processing']
112112
})
113113
async_guide_filter_by_ids_1: |-
114-
client.getTasks({ uids: [5, 10, 13] })
114+
client.tasks.getTasks({ uids: [5, 10, 13] })
115115
async_guide_filter_by_statuses_1: |-
116-
client.getTasks({ statuses: ['failed', 'canceled'] })
116+
client.tasks.getTasks({ statuses: ['failed', 'canceled'] })
117117
async_guide_filter_by_types_1: |-
118-
client.getTasks({ types: ['dumpCreation', 'indexSwap'] })
118+
client.tasks.getTasks({ types: ['dumpCreation', 'indexSwap'] })
119119
async_guide_filter_by_index_uids_1: |-
120-
client.getTasks({ indexUids: ['movies'] })
120+
client.tasks.getTasks({ indexUids: ['movies'] })
121121
get_all_tasks_paginating_1: |-
122-
client.getTasks({ limit: 2, from: 10 })
122+
client.tasks.getTasks({ limit: 2, from: 10 })
123123
get_all_tasks_paginating_2: |-
124-
client.getTasks({ limit: 2, from: 8 })
124+
client.tasks.getTasks({ limit: 2, from: 8 })
125125
async_guide_canceled_by_1: |-
126-
client.getTasks({ canceledBy: [9, 15] })
126+
client.tasks.getTasks({ canceledBy: [9, 15] })
127127
delete_tasks_1: |-
128-
client.deleteTasks({ uids: [1, 2] })
128+
client.tasks.deleteTasks({ uids: [1, 2] })
129129
cancel_tasks_1: |-
130-
client.cancelTasks({ uids: [1, 2] })
130+
client.tasks.cancelTasks({ uids: [1, 2] })
131131
get_one_key_1: |-
132132
client.getKey('6062abda-a5aa-4414-ac91-ecd7944c0f8d')
133133
get_all_keys_1: |-
@@ -458,7 +458,7 @@ getting_started_update_searchable_attributes: |-
458458
getting_started_update_stop_words: |-
459459
client.index('movies').updateStopWords(['the'])
460460
getting_started_check_task_status: |-
461-
client.getTask(0)
461+
client.tasks.getTask(0)
462462
getting_started_synonyms: |-
463463
client.index('movies').updateSynonyms({
464464
winnie: ['piglet'],
@@ -806,9 +806,9 @@ update_prefix_search_settings_1: |-
806806
reset_prefix_search_settings_1: |-
807807
client.index('INDEX_NAME').resetPrefixSearch();
808808
get_all_batches_1: |-
809-
client.getBatches();
809+
client.batches.getBatches();
810810
get_batch_1: |-
811-
client.getBatch(BATCH_UID);
811+
client.batches.getBatch(BATCH_UID);
812812
# Vector search
813813
update_embedders_1: |-
814814
client.index('INDEX_NAME').updateEmbedders({

.github/workflows/meilisearch-prototype-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- '7700:7700'
4747
strategy:
4848
matrix:
49-
node: ['18', '20', '22']
49+
node: ['20', '22']
5050
name: integration-tests (Node.js ${{ matrix.node }})
5151
steps:
5252
- uses: actions/checkout@v4

.github/workflows/pre-release-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- '7700:7700'
4444
strategy:
4545
matrix:
46-
node: ['18', '20', '22']
46+
node: ['20', '22']
4747
name: integration-tests (Node.js ${{ matrix.node }})
4848
steps:
4949
- uses: actions/checkout@v4

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
node: ['18', '20', '22']
39+
node: ['20', '22']
4040
name: integration-tests (Node.js ${{ matrix.node }})
4141
steps:
4242
- uses: actions/checkout@v4

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ 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 >= v18 and Node <= 22
37+
- Node >= v20 and Node <= 22
3838
- Yarn v1.x
3939

4040
### Setup

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -531,37 +531,37 @@ client.index('myIndex').deleteAllDocuments(): Promise<Types.EnqueuedTask>
531531
#### [Get all tasks](https://www.meilisearch.com/docs/reference/api/tasks#get-all-tasks)
532532

533533
```ts
534-
client.getTasks(parameters: TasksQuery): Promise<TasksResults>
534+
client.tasks.getTasks(parameters: TasksQuery): Promise<TasksResults>
535535
```
536536

537537
#### [Get one task](https://www.meilisearch.com/docs/reference/api/tasks)
538538

539539
```ts
540-
client.getTask(uid: number): Promise<Task>
540+
client.tasks.getTask(uid: number): Promise<Task>
541541
```
542542

543543
#### [Delete tasks](https://www.meilisearch.com/docs/reference/api/tasks#delete-tasks)
544544

545545
```ts
546-
client.deleteTasks(parameters: DeleteTasksQuery = {}): Promise<EnqueuedTask>
546+
client.tasks.deleteTasks(parameters: DeleteTasksQuery = {}): Promise<EnqueuedTask>
547547
```
548548

549549
#### [Cancel tasks](https://www.meilisearch.com/docs/reference/api/tasks#cancel-tasks)
550550

551551
```ts
552-
client.cancelTasks(parameters: CancelTasksQuery = {}): Promise<EnqueuedTask>
552+
client.tasks.cancelTasks(parameters: CancelTasksQuery = {}): Promise<EnqueuedTask>
553553
```
554554

555555
#### [Get all tasks of an index](https://www.meilisearch.com/docs/reference/api/tasks#get-all-tasks-by-index)
556556

557557
```ts
558-
client.index('myIndex').getTasks(parameters: TasksQuery): Promise<TasksResults>
558+
client.index('myIndex').tasks.getTasks(parameters: TasksQuery): Promise<TasksResults>
559559
```
560560

561561
#### [Get one task of an index](https://www.meilisearch.com/docs/reference/api/tasks)
562562

563563
```ts
564-
client.index('myIndex').getTask(uid: number): Promise<Task>
564+
client.index('myIndex').tasks.getTask(uid: number): Promise<Task>
565565
```
566566

567567
#### Wait for one task
@@ -581,13 +581,13 @@ client.tasks.waitForTasks(uids: number[], { timeout?: number, interval?: number
581581
#### [Get one batch](https://www.meilisearch.com/docs/reference/api/batches#get-one-batch)
582582

583583
```ts
584-
client.getBatch(uid: number): Promise<Batch>
584+
client.batches.getBatch(uid: number): Promise<Batch>
585585
```
586586

587587
#### [Get all batches](https://www.meilisearch.com/docs/reference/api/batchess#get-batches)
588588

589589
```ts
590-
client.getBatches(parameters: BatchesQuery = {}): Promise<BatchesResults>
590+
client.batches.getBatches(parameters: BatchesQuery = {}): Promise<BatchesResults>
591591
```
592592

593593
### Indexes <!-- omit in toc -->

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
package:
3-
image: node:18
3+
image: node:22
44
tty: true
55
stdin_open: true
66
working_dir: /home/package

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@
7272
"devDependencies": {
7373
"@eslint/js": "^9.23.0",
7474
"@vitest/coverage-v8": "^3.1.1",
75-
"@types/node": "^22.15.3",
75+
"@types/node": "^22.15.29",
7676
"@typescript-eslint/utils": "^8.29.0",
77-
"@vitest/eslint-plugin": "^1.1.38",
78-
"eslint": "^9.25.1",
77+
"@vitest/eslint-plugin": "^1.2.1",
78+
"eslint": "^9.28.0",
7979
"eslint-config-prettier": "^10.1.2",
8080
"eslint-plugin-tsdoc": "^0.4.0",
8181
"typescript": "^5.8.3",
82-
"vite": "^6.3.4",
83-
"globals": "^16.0.0",
82+
"vite": "^6.3.5",
83+
"globals": "^16.2.0",
8484
"husky": "^9.1.7",
85-
"lint-staged": "15.5.1",
85+
"lint-staged": "16.1.0",
8686
"prettier": "^3.5.3",
8787
"prettier-plugin-jsdoc": "^1.3.2",
88-
"typedoc": "^0.28.3",
89-
"typescript-eslint": "^8.31.1",
88+
"typedoc": "^0.28.5",
89+
"typescript-eslint": "^8.33.0",
9090
"vitest": "^3.1.1"
9191
},
9292
"packageManager": "[email protected]"

src/batch.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,11 @@ export class BatchClient {
1919

2020
/** {@link https://www.meilisearch.com/docs/reference/api/batches#get-one-batch} */
2121
async getBatch(uid: number): Promise<Batch> {
22-
const batch = await this.#httpRequest.get<Batch>({
23-
path: `batches/${uid}`,
24-
});
25-
return batch;
22+
return await this.#httpRequest.get({ path: `batches/${uid}` });
2623
}
2724

2825
/** {@link https://www.meilisearch.com/docs/reference/api/batches#get-batches} */
29-
async getBatches(
30-
batchesQuery?: TasksOrBatchesQuery,
31-
): Promise<BatchesResults> {
32-
const batches = await this.#httpRequest.get<BatchesResults>({
33-
path: "batches",
34-
params: batchesQuery,
35-
});
36-
return batches;
26+
async getBatches(params?: TasksOrBatchesQuery): Promise<BatchesResults> {
27+
return await this.#httpRequest.get({ path: "batches", params });
3728
}
3829
}

src/http-requests.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,8 @@ function getHeaders(config: Config, headersInit?: HeadersInit): Headers {
6969
return headers;
7070
}
7171

72-
// TODO: Convert to Symbol("timeout id") when Node.js 18 is dropped
7372
/** Used to identify whether an error is a timeout error after fetch request. */
74-
const TIMEOUT_ID = {};
73+
const TIMEOUT_ID = Symbol("<timeout>");
7574

7675
/**
7776
* Attach a timeout signal to a {@link RequestInit}, while preserving original

0 commit comments

Comments
 (0)