meilisearch · Strift · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025 · Jan 15, 2025
diff --git a/packages/autocomplete-client/.eslintrc.js → packages/autocomplete-client/.eslintrc.cjs b/packages/autocomplete-client/.eslintrc.js → packages/autocomplete-client/.eslintrc.cjs
diff --git a/packages/autocomplete-client/jest.config.js b/packages/autocomplete-client/jest.config.js
@@ -1,34 +1,45 @@
-const ignoreFiles = ['<rootDir>(/.*)*/assets', 'test.utils']
+/** @type {import('ts-jest').JestConfigWithTsJest} **/
+const baseConfig = {
+  coveragePathIgnorePatterns: ['<rootDir>(/.*)*/assets/'],
+  testPathIgnorePatterns: ['<rootDir>(/.*)*/assets', 'test.utils'],
+  setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
+  // Transform all JS and TS files with `ts-jest`
+  transform: {
+    '^.+.(ts|js)?$': [
+      'ts-jest',
+      {
+        // use ESM because we're loading the ESM build of `meilisearch-js`
+        useESM: true,
+      },
+    ],
+  },
+  // Allow `ts-jest` to resolve relative JS imports, e.g., `./folder/index.js`
+  // See https://github.com/kulshekhar/ts-jest/issues/1057
+  moduleNameMapper: {
+    '(.+)\\.js': '$1',
+  },
+  // Treat TS as ESM. JS is automatically treated as ESM
+  // if package.json has `"type": "module"`
+  extensionsToTreatAsEsm: ['.ts'],
+}
 
-module.exports = {
+/** @type {import('ts-jest').JestConfigWithTsJest} **/
+export default {
   verbose: true,
   watchPlugins: [
     'jest-watch-typeahead/filename',
     'jest-watch-typeahead/testname',
   ],
   collectCoverage: true,
-  setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
   projects: [
     {
-      globals: {
-        'ts-jest': { tsconfig: 'tsconfig.test.json' },
-        fetch: globalThis.fetch,
-      },
-      preset: 'ts-jest',
+      ...baseConfig,
       displayName: 'dom',
-      testPathIgnorePatterns: [...ignoreFiles],
-      coveragePathIgnorePatterns: ['<rootDir>(/.*)*/assets/'],
     },
     {
-      globals: {
-        'ts-jest': { tsconfig: 'tsconfig.test.json' },
-        fetch: globalThis.fetch,
-      },
-      preset: 'ts-jest',
+      ...baseConfig,
       displayName: 'node',
       testEnvironment: 'node',
-      coveragePathIgnorePatterns: ['<rootDir>(/.*)*/assets/'],
-      testPathIgnorePatterns: [...ignoreFiles],
     },
   ],
 }
diff --git a/packages/autocomplete-client/package.json b/packages/autocomplete-client/package.json
@@ -19,6 +19,7 @@
     "test:types": "yarn tsc",
     "version": "node scripts/update_version.js"
   },
+  "type": "module",
   "main": "./dist/autocomplete-client.umd.js",
   "module": "./dist/autocomplete-client.esm.js",
   "browser": "./dist/autocomplete-client.umd.js",
@@ -56,13 +57,13 @@
     "@babel/preset-env": "^7.20.2",
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-node-resolve": "^11.2.0",
-    "@types/jest": "^27.0.2",
+    "@types/jest": "^29.5.14",
     "babel-jest": "^27.2.2",
     "concurrently": "^7.1.0",
     "cssnano": "^4.1.10",
     "eslint-config-meilisearch": "*",
     "instantsearch.js": "^4.56.2",
-    "jest": "^27.2.2",
+    "jest": "^29.7.0",
     "jest-watch-typeahead": "^0.6.3",
     "regenerator-runtime": "^0.13.7",
     "rollup": "^2.79.2",
@@ -71,7 +72,7 @@
     "rollup-plugin-terser": "^7.0.0",
     "rollup-plugin-typescript2": "^0.32.1",
     "shx": "^0.3.4",
-    "ts-jest": "^27.0.7",
+    "ts-jest": "^29.2.5",
     "tslib": "^2.6.1",
     "typescript": "^4.9.3"
   }

diff --git a/packages/instant-meilisearch/.babelrc b/packages/instant-meilisearch/.babelrc
diff --git a/packages/instant-meilisearch/.eslintrc.js → packages/instant-meilisearch/.eslintrc.cjs b/packages/instant-meilisearch/.eslintrc.js → packages/instant-meilisearch/.eslintrc.cjs
diff --git a/packages/instant-meilisearch/__tests__/assets/utils.ts b/packages/instant-meilisearch/__tests__/assets/utils.ts
@@ -1,4 +1,4 @@
-import { instantMeiliSearch } from '../../src'
+import { instantMeiliSearch } from '../../src/index.js'
 import { MeiliSearch } from 'meilisearch'
 
 const HOST = 'http://localhost:7700'

diff --git a/packages/instant-meilisearch/__tests__/configure.attributes-to-retrieve.test.ts b/packages/instant-meilisearch/__tests__/configure.attributes-to-retrieve.test.ts
@@ -3,7 +3,7 @@ import {
   dataset,
   Movies,
   meilisearchClient,
-} from './assets/utils'
+} from './assets/utils.js'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/custom-http-client.test.ts b/packages/instant-meilisearch/__tests__/custom-http-client.test.ts
@@ -1,5 +1,6 @@
-import { instantMeiliSearch } from '../src'
-import { meilisearchClient, dataset } from './assets/utils'
+import { instantMeiliSearch } from '../src/index.js'
+import { meilisearchClient, dataset } from './assets/utils.js'
+import { jest } from '@jest/globals'
 
 describe('Custom HTTP client tests', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/disjunctive-facet-search.test.ts b/packages/instant-meilisearch/__tests__/disjunctive-facet-search.test.ts
@@ -1,5 +1,5 @@
-import { instantMeiliSearch } from '../src'
-import { Movies, meilisearchClient } from './assets/utils'
+import { instantMeiliSearch } from '../src/index.js'
+import { Movies, meilisearchClient } from './assets/utils.js'
 import movies from './assets/movies.json'
 import games from './assets/games.json'
 

diff --git a/packages/instant-meilisearch/__tests__/facet-stats.test.ts b/packages/instant-meilisearch/__tests__/facet-stats.test.ts
@@ -1,4 +1,4 @@
-import { searchClient, dataset, meilisearchClient } from './assets/utils'
+import { searchClient, dataset, meilisearchClient } from './assets/utils.js'
 
 describe('Facet stats tests', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/facets-distribution.test.ts b/packages/instant-meilisearch/__tests__/facets-distribution.test.ts
@@ -1,4 +1,4 @@
-import { searchClient, dataset, meilisearchClient } from './assets/utils'
+import { searchClient, dataset, meilisearchClient } from './assets/utils.js'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/filter.test.ts b/packages/instant-meilisearch/__tests__/filter.test.ts
@@ -3,7 +3,7 @@ import {
   dataset,
   Movies,
   meilisearchClient,
-} from './assets/utils'
+} from './assets/utils.js'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/first-facets-distribution.test.ts b/packages/instant-meilisearch/__tests__/first-facets-distribution.test.ts
@@ -1,5 +1,5 @@
-import { dataset, meilisearchClient, HOST, API_KEY } from './assets/utils'
-import { instantMeiliSearch } from '../src'
+import { dataset, meilisearchClient, HOST, API_KEY } from './assets/utils.js'
+import { instantMeiliSearch } from '../src/index.js'
 
 describe('Default facet distribution', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/geosearch.test.ts b/packages/instant-meilisearch/__tests__/geosearch.test.ts
@@ -3,7 +3,7 @@ import {
   geoDataset,
   City,
   meilisearchClient,
-} from './assets/utils'
+} from './assets/utils.js'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/highlight.test.ts b/packages/instant-meilisearch/__tests__/highlight.test.ts
@@ -3,7 +3,7 @@ import {
   dataset,
   Movies,
   meilisearchClient,
-} from './assets/utils'
+} from './assets/utils.js'
 
 describe('Highlight Browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/instantiation.test.ts b/packages/instant-meilisearch/__tests__/instantiation.test.ts
@@ -1,4 +1,4 @@
-import { instantMeiliSearch } from '../src'
+import { instantMeiliSearch } from '../src/index.js'
 
 describe('InstantMeiliSearch instantiation', () => {
   test('instantiation with required params returns InstantMeiliSearchInstance', () => {

diff --git a/packages/instant-meilisearch/__tests__/multi-index-search.test.ts b/packages/instant-meilisearch/__tests__/multi-index-search.test.ts
@@ -1,5 +1,5 @@
-import { instantMeiliSearch } from '../src'
-import { Movies, meilisearchClient } from './assets/utils'
+import { instantMeiliSearch } from '../src/index.js'
+import { Movies, meilisearchClient } from './assets/utils.js'
 import movies from './assets/movies.json'
 import games from './assets/games.json'
 

diff --git a/packages/instant-meilisearch/__tests__/overridden-meilisearch-parameters.test.ts b/packages/instant-meilisearch/__tests__/overridden-meilisearch-parameters.test.ts
@@ -1,5 +1,5 @@
-import { instantMeiliSearch } from '../src'
-import { dataset, meilisearchClient, Movies } from './assets/utils'
+import { instantMeiliSearch } from '../src/index.js'
+import { dataset, meilisearchClient, Movies } from './assets/utils.js'
 
 describe('InstantMeiliSearch overridden parameters', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/pagination.test.ts b/packages/instant-meilisearch/__tests__/pagination.test.ts
@@ -3,7 +3,7 @@ import {
   dataset,
   Movies,
   meilisearchClient,
-} from './assets/utils'
+} from './assets/utils.js'
 
 describe('Pagination browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/placeholder-search.test.ts b/packages/instant-meilisearch/__tests__/placeholder-search.test.ts
@@ -1,5 +1,5 @@
-import { instantMeiliSearch } from '../src'
-import { dataset, Movies, meilisearchClient } from './assets/utils'
+import { instantMeiliSearch } from '../src/index.js'
+import { dataset, Movies, meilisearchClient } from './assets/utils.js'
 
 describe('Pagination browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/search-resolver.test.ts b/packages/instant-meilisearch/__tests__/search-resolver.test.ts
@@ -1,11 +1,8 @@
-import { Movies } from './assets/utils'
-import { instantMeiliSearch } from '../src'
-import { MeiliSearch } from 'meilisearch'
-import { mocked } from 'ts-jest/utils'
-import { PACKAGE_VERSION } from '../src/package-version'
-import { MeiliSearchMultiSearchParams } from '../src/types'
-
-jest.mock('meilisearch')
+import { Movies } from './assets/utils.js'
+import { instantMeiliSearch } from '../src/index.js'
+import { MeiliSearch, MultiSearchParams } from 'meilisearch'
+import { MeiliSearchMultiSearchParams } from '../src/types/index.js'
+import { jest } from '@jest/globals'
 
 export const searchResponse = {
   hits: [],
@@ -17,22 +14,19 @@ export const searchResponse = {
   exhaustiveNbHits: false,
 }
 
-// Mocking of Meilisearch package
-const mockedMeilisearch = mocked(MeiliSearch, true)
-const mockedMultiSearch = jest.fn((request) => {
-  const response = request.queries.map((req: MeiliSearchMultiSearchParams) => ({
-    ...searchResponse,
-    indexUid: req.indexUid,
-  }))
-  return {
-    results: response,
-  }
-})
-
-mockedMeilisearch.mockReturnValue({
-  // @ts-ignore
-  multiSearch: mockedMultiSearch,
-})
+const mockedMultiSearch = jest
+  .spyOn(MeiliSearch.prototype, 'multiSearch')
+  .mockImplementation((request: MultiSearchParams) => {
+    const response = request.queries.map(
+      (req: MeiliSearchMultiSearchParams) => ({
+        ...searchResponse,
+        indexUid: req.indexUid,
+      })
+    )
+    return Promise.resolve({
+      results: response,
+    })
+  })
 
 describe('Cached search tests', () => {
   afterEach(() => {
@@ -50,11 +44,6 @@ describe('Cached search tests', () => {
     await searchClient.search<Movies>([searchParameters])
     await searchClient.search<Movies>([searchParameters])
 
-    expect(mockedMeilisearch).toHaveBeenCalledWith({
-      host: 'http://localhost:7700',
-      apiKey: '',
-      clientAgents: [`Meilisearch instant-meilisearch (v${PACKAGE_VERSION})`],
-    })
     expect(mockedMultiSearch).toHaveBeenCalledTimes(2)
   })
 
@@ -76,11 +65,6 @@ describe('Cached search tests', () => {
     await searchClient.search<Movies>([searchParameters1])
     await searchClient.search<Movies>([searchParameters2])
 
-    expect(mockedMeilisearch).toHaveBeenCalledWith({
-      host: 'http://localhost:7700',
-      apiKey: '',
-      clientAgents: [`Meilisearch instant-meilisearch (v${PACKAGE_VERSION})`],
-    })
     expect(mockedMultiSearch).toHaveBeenCalledTimes(3)
   })
 
@@ -103,11 +87,6 @@ describe('Cached search tests', () => {
     await searchClient.search<Movies>([searchParameters2])
     await searchClient.search<Movies>([searchParameters1])
 
-    expect(mockedMeilisearch).toHaveBeenCalledWith({
-      host: 'http://localhost:7700',
-      apiKey: '',
-      clientAgents: [`Meilisearch instant-meilisearch (v${PACKAGE_VERSION})`],
-    })
     expect(mockedMultiSearch).toHaveBeenCalledTimes(3)
   })
 
@@ -131,11 +110,6 @@ describe('Cached search tests', () => {
     await searchClient.search<Movies>([searchParameters1])
     await searchClient.search<Movies>([searchParameters2])
 
-    expect(mockedMeilisearch).toHaveBeenCalledWith({
-      host: 'http://localhost:7700',
-      apiKey: '',
-      clientAgents: [`Meilisearch instant-meilisearch (v${PACKAGE_VERSION})`],
-    })
     expect(mockedMultiSearch).toHaveBeenCalledTimes(3)
   })
 
@@ -167,12 +141,6 @@ describe('Cached search tests', () => {
     await searchClient.search<Movies>(searchParameters1)
     await searchClient.search<Movies>([searchParameters2])
 
-    expect(mockedMeilisearch).toHaveBeenCalledWith({
-      host: 'http://localhost:7700',
-      apiKey: '',
-      clientAgents: [`Meilisearch instant-meilisearch (v${PACKAGE_VERSION})`],
-    })
-
     expect(mockedMultiSearch).toHaveBeenCalledTimes(3)
   })
 })
diff --git a/packages/instant-meilisearch/__tests__/snippets.test.ts b/packages/instant-meilisearch/__tests__/snippets.test.ts
@@ -3,7 +3,7 @@ import {
   dataset,
   Movies,
   meilisearchClient,
-} from './assets/utils'
+} from './assets/utils.js'
 
 describe('Snippet Browser test', () => {
   beforeAll(async () => {

diff --git a/packages/instant-meilisearch/__tests__/sort.test.ts b/packages/instant-meilisearch/__tests__/sort.test.ts
@@ -1,11 +1,12 @@
+import { instantMeiliSearch } from '../src/index.js'
 import {
   searchClient,
   dataset,
   Movies,
   meilisearchClient,
-} from './assets/utils'
+} from './assets/utils.js'
 
-import { splitSortString } from '../src/contexts/sort-context'
+import { splitSortString } from '../src/contexts/sort-context.js'
 
 describe('Sort browser test', () => {
   beforeAll(async () => {