meilisearch · meili-bors · Mar 28, 2022 · Mar 22, 2022 · Mar 22, 2022 · Mar 23, 2022
diff --git a/README.md b/README.md
@@ -126,8 +126,6 @@ Example:
 
 `hitsPerPage` has a value of `6` by default and can [be customized](#-hitsperpage).
 
-
-
 ### Finite Pagination
 
 Finite pagination is used when you want to add a numbered pagination at the bottom of your hits (for example: `< << 1, 2, 3 > >>`).

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "test:build": "yarn build && jest --runInBand --selectProjects build",
     "test:e2e": "yarn local:env:setup && concurrently --kill-others -s first \"yarn local:env:react\" \"cypress run --env playground=local \"",
     "test:e2e:watch": "yarn local:env:setup && concurrently --kill-others -s first \"yarn local:env:react\" \"cypress open  --env playground=local\"",
-    "test:all": "yarn test:e2e:all && yarn test && test:build",
+    "test:all": "yarn test:e2e && yarn test && yarn test:build",
     "cy:open": "cypress open",
     "playground:vue": "yarn --cwd ./playgrounds/vue && yarn --cwd ./playgrounds/vue serve",
     "playground:react": "yarn --cwd ./playgrounds/react && yarn --cwd ./playgrounds/react start",

diff --git a/src/client/instant-meilisearch-client.ts b/src/client/instant-meilisearch-client.ts
@@ -31,10 +31,9 @@ export function instantMeiliSearch(
   const searchResolver = SearchResolver(SearchCache())
   // paginationTotalHits can be 0 as it is a valid number
   let defaultFacetDistribution: any = {}
+  const meilisearchClient = new MeiliSearch({ host: hostUrl, apiKey: apiKey })
 
   return {
-    MeiliSearchClient: new MeiliSearch({ host: hostUrl, apiKey: apiKey }),
-
     /**
      * @param  {readonlyAlgoliaMultipleQueriesQuery[]} instantSearchRequests
      * @returns {Array}
@@ -57,7 +56,7 @@ export function instantMeiliSearch(
         const searchResponse = await searchResolver.searchResponse(
           searchContext,
           adaptedSearchRequest,
-          this.MeiliSearchClient
+          meilisearchClient
         )
 
         // Cache first facets distribution of the instantMeilisearch instance

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -85,6 +85,4 @@ export type SearchContext = Omit<
   pagination: PaginationContext
 }
 
-export type InstantMeiliSearchInstance = SearchClient & {
-  MeiliSearchClient: MeiliSearch
-}
+export type InstantMeiliSearchInstance = SearchClient
diff --git a/tests/assets/utils.ts b/tests/assets/utils.ts
@@ -1,4 +1,5 @@
 import { instantMeiliSearch } from '../../src'
+import { MeiliSearch } from 'meilisearch'
 
 const dataset = [
   {
@@ -223,5 +224,15 @@ const wrongSearchClient = instantMeiliSearch(
   'http://localhost:7777',
   'masterKey'
 )
+const meilisearchClient = new MeiliSearch({
+  host: 'http://localhost:7700',
+  apiKey: 'masterKey',
+})
 
-export { searchClient, dataset, wrongSearchClient, geoDataset }
+export {
+  searchClient,
+  dataset,
+  wrongSearchClient,
+  geoDataset,
+  meilisearchClient,
+}
diff --git a/tests/base.tests.ts b/tests/base.tests.ts
diff --git a/tests/build.tests.js b/tests/build.tests.js
@@ -10,11 +10,11 @@ const CJSclient = CJSinstantMeiliSearch('http://localhost:7700', 'masterKey')
 const instantsearch = require('instantsearch.js')
 
 test('UMD client should correctly created', () => {
-  expect(UMDclient.MeiliSearchClient.config.apiKey).toBe('masterKey')
+  expect(UMDclient.search).not.toBeUndefined()
 })
 
 test('CJS client should correctly created', () => {
-  expect(CJSclient.MeiliSearchClient.config.apiKey).toBe('masterKey')
+  expect(CJSclient.search).not.toBeUndefined()
 })
 
 test('CJS instantsearch client should correctly created', () => {
@@ -23,9 +23,7 @@ test('CJS instantsearch client should correctly created', () => {
     searchClient: CJSclient,
   })
   expect(CJSInstantSearch.indexName).toBe('cjs_index')
-  expect(CJSInstantSearch.client.MeiliSearchClient.config.apiKey).toBe(
-    'masterKey'
-  )
+  expect(CJSInstantSearch.client.search).not.toBeUndefined()
 })
 
 test('UMD instantsearch client should correctly created', () => {
@@ -34,7 +32,5 @@ test('UMD instantsearch client should correctly created', () => {
     searchClient: UMDclient,
   })
   expect(UMDInstantSearch.indexName).toBe('umd_index')
-  expect(UMDInstantSearch.client.MeiliSearchClient.config.apiKey).toBe(
-    'masterKey'
-  )
+  expect(UMDInstantSearch.client.search).not.toBeUndefined()
 })
diff --git a/tests/configure.attributes-to-retrieve.tests.ts b/tests/configure.attributes-to-retrieve.tests.ts
@@ -1,18 +1,19 @@
-import { searchClient, dataset, Movies } from './assets/utils'
+import {
+  searchClient,
+  dataset,
+  Movies,
+  meilisearchClient,
+} from './assets/utils'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {
-    const deleteTask = await searchClient.MeiliSearchClient.deleteIndex(
-      'movies'
-    )
-    await searchClient.MeiliSearchClient.waitForTask(deleteTask.uid)
+    const deleteTask = await meilisearchClient.deleteIndex('movies')
+    await meilisearchClient.waitForTask(deleteTask.uid)
 
-    const documentsTask = await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).addDocuments(dataset)
-    await searchClient.MeiliSearchClient.index('movies').waitForTask(
-      documentsTask.uid
-    )
+    const documentsTask = await meilisearchClient
+      .index('movies')
+      .addDocuments(dataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.uid)
   })
 
   test('Test attributesToRetrieve on no attributes', async () => {

diff --git a/tests/facets-distribution.tests.ts b/tests/facets-distribution.tests.ts
@@ -1,20 +1,16 @@
-import { searchClient, dataset } from './assets/utils'
+import { searchClient, dataset, meilisearchClient } from './assets/utils'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {
-    const deleteTask = await searchClient.MeiliSearchClient.deleteIndex(
-      'movies'
-    )
-    await searchClient.MeiliSearchClient.waitForTask(deleteTask.uid)
-    await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).updateFilterableAttributes(['genres'])
-    const documentsTask = await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).addDocuments(dataset)
-    await searchClient.MeiliSearchClient.index('movies').waitForTask(
-      documentsTask.uid
-    )
+    const deleteTask = await meilisearchClient.deleteIndex('movies')
+    await meilisearchClient.waitForTask(deleteTask.uid)
+    await meilisearchClient
+      .index('movies')
+      .updateFilterableAttributes(['genres'])
+    const documentsTask = await meilisearchClient
+      .index('movies')
+      .addDocuments(dataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.uid)
   })
 
   test('Test empty array on facetsDistribution', async () => {

diff --git a/tests/filter.tests.ts b/tests/filter.tests.ts
@@ -1,20 +1,21 @@
-import { searchClient, dataset, Movies } from './assets/utils'
+import {
+  searchClient,
+  dataset,
+  Movies,
+  meilisearchClient,
+} from './assets/utils'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {
-    const deleteTask = await searchClient.MeiliSearchClient.deleteIndex(
-      'movies'
-    )
-    await searchClient.MeiliSearchClient.waitForTask(deleteTask.uid)
-    await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).updateFilterableAttributes(['genres', 'title'])
-    const documentsTask = await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).addDocuments(dataset)
-    await searchClient.MeiliSearchClient.index('movies').waitForTask(
-      documentsTask.uid
-    )
+    const deleteTask = await meilisearchClient.deleteIndex('movies')
+    await meilisearchClient.waitForTask(deleteTask.uid)
+    await meilisearchClient
+      .index('movies')
+      .updateFilterableAttributes(['genres', 'title'])
+    const documentsTask = await meilisearchClient
+      .index('movies')
+      .addDocuments(dataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.uid)
   })
 
   test('Test one string facet on filter without a query', async () => {

diff --git a/tests/geosearch.tests.ts b/tests/geosearch.tests.ts
@@ -1,23 +1,22 @@
-import { searchClient, geoDataset, City } from './assets/utils'
+import {
+  searchClient,
+  geoDataset,
+  City,
+  meilisearchClient,
+} from './assets/utils'
 
 describe('Instant Meilisearch Browser test', () => {
   beforeAll(async () => {
-    const deleteTask = await searchClient.MeiliSearchClient.deleteIndex(
-      'geotest'
-    )
-    await searchClient.MeiliSearchClient.waitForTask(deleteTask.uid)
-    await searchClient.MeiliSearchClient.index(
-      'geotest'
-    ).updateFilterableAttributes(['_geo'])
-    await searchClient.MeiliSearchClient.index(
-      'geotest'
-    ).updateSortableAttributes(['_geo'])
-    const documentsTask = await searchClient.MeiliSearchClient.index(
-      'geotest'
-    ).addDocuments(geoDataset)
-    await searchClient.MeiliSearchClient.index('movies').waitForTask(
-      documentsTask.uid
-    )
+    const deleteTask = await meilisearchClient.deleteIndex('geotest')
+    await meilisearchClient.waitForTask(deleteTask.uid)
+    await meilisearchClient
+      .index('geotest')
+      .updateFilterableAttributes(['_geo'])
+    await meilisearchClient.index('geotest').updateSortableAttributes(['_geo'])
+    const documentsTask = await meilisearchClient
+      .index('geotest')
+      .addDocuments(geoDataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.uid)
   })
 
   test('Test aroundRadius and aroundLatLng in geo search', async () => {

diff --git a/tests/highlight.tests.ts b/tests/highlight.tests.ts
@@ -1,20 +1,21 @@
-import { searchClient, dataset, Movies } from './assets/utils'
+import {
+  searchClient,
+  dataset,
+  Movies,
+  meilisearchClient,
+} from './assets/utils'
 
 describe('Highlight Browser test', () => {
   beforeAll(async () => {
-    const deleteTask = await searchClient.MeiliSearchClient.deleteIndex(
-      'movies'
-    )
-    await searchClient.MeiliSearchClient.waitForTask(deleteTask.uid)
-    await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).updateFilterableAttributes(['genres'])
-    const documentsTask = await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).addDocuments(dataset)
-    await searchClient.MeiliSearchClient.index('movies').waitForTask(
-      documentsTask.uid
-    )
+    const deleteTask = await meilisearchClient.deleteIndex('movies')
+    await meilisearchClient.waitForTask(deleteTask.uid)
+    await meilisearchClient
+      .index('movies')
+      .updateFilterableAttributes(['genres'])
+    const documentsTask = await meilisearchClient
+      .index('movies')
+      .addDocuments(dataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.uid)
   })
 
   test('Test one attributesToHighlight on wrong attribute placeholder', async () => {

diff --git a/tests/pagination.tests.ts b/tests/pagination.tests.ts
@@ -1,21 +1,22 @@
 import { instantMeiliSearch } from '../src'
-import { searchClient, dataset, Movies } from './assets/utils'
+import {
+  searchClient,
+  dataset,
+  Movies,
+  meilisearchClient,
+} from './assets/utils'
 
 describe('Pagination browser test', () => {
   beforeAll(async () => {
-    const deleteTask = await searchClient.MeiliSearchClient.deleteIndex(
-      'movies'
-    )
-    await searchClient.MeiliSearchClient.waitForTask(deleteTask.uid)
-    await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).updateFilterableAttributes(['genres'])
-    const documentsTask = await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).addDocuments(dataset)
-    await searchClient.MeiliSearchClient.index('movies').waitForTask(
-      documentsTask.uid
-    )
+    const deleteTask = await meilisearchClient.deleteIndex('movies')
+    await meilisearchClient.waitForTask(deleteTask.uid)
+    await meilisearchClient
+      .index('movies')
+      .updateFilterableAttributes(['genres'])
+    const documentsTask = await meilisearchClient
+      .index('movies')
+      .addDocuments(dataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.uid)
   })
 
   test('Test 1 hitsPerPage', async () => {

diff --git a/tests/snippets.tests.ts b/tests/snippets.tests.ts
@@ -1,20 +1,21 @@
-import { searchClient, dataset, Movies } from './assets/utils'
+import {
+  searchClient,
+  dataset,
+  Movies,
+  meilisearchClient,
+} from './assets/utils'
 
 describe('Snippet Browser test', () => {
   beforeAll(async () => {
-    const deleteTask = await searchClient.MeiliSearchClient.deleteIndex(
-      'movies'
-    )
-    await searchClient.MeiliSearchClient.waitForTask(deleteTask.uid)
-    await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).updateFilterableAttributes(['genres'])
-    const documentsTask = await searchClient.MeiliSearchClient.index(
-      'movies'
-    ).addDocuments(dataset)
-    await searchClient.MeiliSearchClient.index('movies').waitForTask(
-      documentsTask.uid
-    )
+    const deleteTask = await meilisearchClient.deleteIndex('movies')
+    await meilisearchClient.waitForTask(deleteTask.uid)
+    await meilisearchClient
+      .index('movies')
+      .updateFilterableAttributes(['genres'])
+    const documentsTask = await meilisearchClient
+      .index('movies')
+      .addDocuments(dataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.uid)
   })
 
   test('Test one attributesToSnippet on placeholder', async () => {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -126,8 +126,6 @@ Example:

		`hitsPerPage` has a value of `6` by default and can [be customized](#-hitsperpage).



		### Finite Pagination

		Finite pagination is used when you want to add a numbered pagination at the bottom of your hits (for example: `< << 1, 2, 3 > >>`).
Expand Down