Skip to content

Commit 490b1de

Browse files
authored
Merge branch 'main' into feat/add-multi-modal-search
2 parents dd9be85 + a15460f commit 490b1de

File tree

9 files changed

+340
-320
lines changed

9 files changed

+340
-320
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Install dependencies
2020
run: yarn install

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
outputs:
2121
version: ${{ steps.grep-step.outputs.meilisearch_version }}
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- name: Grep docker beta version of Meilisearch
2525
id: grep-step
2626
run: |
@@ -49,7 +49,7 @@ jobs:
4949
node: ['20', '22']
5050
name: integration-tests (Node.js ${{ matrix.node }})
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v5
5353
- name: Setup node
5454
uses: actions/setup-node@v4
5555
with:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
outputs:
2424
version: ${{ steps.grep-step.outputs.meilisearch_version }}
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
- name: Grep docker beta version of Meilisearch
2828
id: grep-step
2929
run: |
@@ -46,7 +46,7 @@ jobs:
4646
node: ['20', '22']
4747
name: integration-tests (Node.js ${{ matrix.node }})
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v5
5050
- name: Setup node
5151
uses: actions/setup-node@v4
5252
with:

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
publish-npm:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- uses: actions/setup-node@v4
1515
with:
1616
node-version: 22

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
node: ['20', '22']
4040
name: integration-tests (Node.js ${{ matrix.node }})
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343
- name: Setup node
4444
uses: actions/setup-node@v4
4545
with:
@@ -67,7 +67,7 @@ jobs:
6767
runs-on: ubuntu-latest
6868
name: style-check
6969
steps:
70-
- uses: actions/checkout@v4
70+
- uses: actions/checkout@v5
7171
- name: Setup node
7272
uses: actions/setup-node@v4
7373
with:
@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ubuntu-latest
8686
name: types-check
8787
steps:
88-
- uses: actions/checkout@v4
88+
- uses: actions/checkout@v5
8989
- name: Setup node
9090
uses: actions/setup-node@v4
9191
with:

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,23 @@
6969
"CONTRIBUTING.md"
7070
],
7171
"devDependencies": {
72-
"@eslint/js": "^9.23.0",
72+
"@eslint/js": "^9.34.0",
7373
"@vitest/coverage-v8": "^3.1.1",
74-
"@types/node": "^24.1.0",
74+
"@types/node": "^24.3.0",
7575
"@typescript-eslint/utils": "^8.29.0",
76-
"@vitest/eslint-plugin": "^1.3.4",
77-
"eslint": "^9.32.0",
76+
"@vitest/eslint-plugin": "^1.3.5",
77+
"eslint": "^9.34.0",
7878
"eslint-config-prettier": "^10.1.8",
7979
"eslint-plugin-tsdoc": "^0.4.0",
8080
"typescript": "^5.8.3",
81-
"vite": "^7.0.6",
81+
"vite": "^7.1.3",
8282
"globals": "^16.3.0",
8383
"husky": "^9.1.7",
84-
"lint-staged": "16.1.2",
84+
"lint-staged": "16.1.5",
8585
"prettier": "^3.6.2",
8686
"prettier-plugin-jsdoc": "^1.3.3",
87-
"typedoc": "^0.28.8",
88-
"typescript-eslint": "^8.38.0",
87+
"typedoc": "^0.28.12",
88+
"typescript-eslint": "^8.41.0",
8989
"vitest": "^3.1.1"
9090
},
9191
"packageManager": "[email protected]"

src/types/task_and_batch.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ export type EnqueuedTask = {
106106
export type TaskUidOrEnqueuedTask = EnqueuedTask["taskUid"] | EnqueuedTask;
107107

108108
/** {@link https://www.meilisearch.com/docs/reference/api/tasks#indexswap} */
109-
export type IndexSwap = { indexes: [string, string] };
109+
export type IndexSwap = {
110+
indexes: [string, string];
111+
rename: boolean;
112+
};
110113

111114
/**
112115
* {@link https://www.meilisearch.com/docs/reference/api/tasks#details}

tests/client.test.ts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,9 @@ describe.each([{ permission: "Master" }, { permission: "Admin" }])(
519519
.index(index2.uid)
520520
.addDocuments([{ id: 1, title: "index_2" }])
521521
.waitTask();
522-
const swaps: IndexSwap[] = [{ indexes: [index.uid, index2.uid] }];
522+
const swaps: IndexSwap[] = [
523+
{ indexes: [index.uid, index2.uid], rename: false },
524+
];
523525

524526
const resolvedTask = await client.swapIndexes(swaps).waitTask();
525527
const docIndex1 = await client.index(index.uid).getDocument(1);
@@ -528,7 +530,7 @@ describe.each([{ permission: "Master" }, { permission: "Admin" }])(
528530
expect(docIndex1.title).toEqual("index_2");
529531
expect(docIndex2.title).toEqual("index_1");
530532
expect(resolvedTask.type).toEqual("indexSwap");
531-
expect(resolvedTask.details!.swaps).toEqual(swaps);
533+
expect(resolvedTask.details?.swaps).toEqual(swaps);
532534
});
533535

534536
test(`${permission} key: Swap two indexes with one that does not exist`, async () => {
@@ -540,7 +542,7 @@ describe.each([{ permission: "Master" }, { permission: "Admin" }])(
540542
.waitTask();
541543

542544
const swaps: IndexSwap[] = [
543-
{ indexes: ["does_not_exist", index2.uid] },
545+
{ indexes: ["does_not_exist", index2.uid], rename: false },
544546
];
545547

546548
const resolvedTask = await client.swapIndexes(swaps).waitTask();
@@ -549,14 +551,15 @@ describe.each([{ permission: "Master" }, { permission: "Admin" }])(
549551
expect(resolvedTask.error?.code).toEqual(
550552
ErrorStatusCode.INDEX_NOT_FOUND,
551553
);
552-
expect(resolvedTask.details!.swaps).toEqual(swaps);
554+
expect(resolvedTask.details?.swaps).toEqual(swaps);
553555
});
554556

555-
// Should be fixed by rc1
556557
test(`${permission} key: Swap two one index with itself`, async () => {
557558
const client = await getClient(permission);
558559

559-
const swaps: IndexSwap[] = [{ indexes: [index.uid, index.uid] }];
560+
const swaps: IndexSwap[] = [
561+
{ indexes: [index.uid, index.uid], rename: false },
562+
];
560563

561564
await expect(client.swapIndexes(swaps)).rejects.toHaveProperty(
562565
"cause.code",
@@ -874,6 +877,13 @@ describe.each([{ permission: "Master" }])(
874877
({ permission }) => {
875878
const instanceName = "instance_1";
876879

880+
beforeAll(async () => {
881+
const adminClient = await getClient("Admin");
882+
await adminClient.updateExperimentalFeatures({
883+
network: true,
884+
});
885+
});
886+
877887
test(`${permission} key: Update and get network settings`, async () => {
878888
const client = await getClient(permission);
879889

0 commit comments

Comments
 (0)