wip

Author: fitimvata

packages/instant-meilisearch/__tests__/sort.test.ts

@@ -0,0 +1,51 @@
+import {
+  searchClient,
+  dataset,
+  Movies,
+  meilisearchClient,
+} from './assets/utils'
+
+describe('Sort browser test', () => {
+  beforeAll(async () => {
+    const deleteTask = await meilisearchClient.deleteIndex('movies')
+    await meilisearchClient.waitForTask(deleteTask.taskUid)
+    await meilisearchClient.index('movies').updateSettings({
+      sortableAttributes: ['release_date', 'title'],
+    })
+
+    const documentsTask = await meilisearchClient
+      .index('movies')
+      .addDocuments(dataset)
+    await meilisearchClient.index('movies').waitForTask(documentsTask.taskUid)
+  })
+
+  test('sort-by one fields', async () => {
+    const response = await searchClient.search<Movies>([
+      {
+        indexName: 'movies:release_date:desc',
+        params: {
+          query: '',
+          hitsPerPage: 1,
+        },
+      },
+    ])
+
+    const hits = response.results[0].hits
+    expect(hits.length).toBe(1)
+  })
+
+  test('sort-by mutiple fields', async () => {
+    const response = await searchClient.search<Movies>([
+      {
+        indexName: 'movies:release_date:desc,title:asc',
+        params: {
+          query: '',
+          hitsPerPage: 1,
+        },
+      },
+    ])
+
+    const hits = response.results[0].hits
+    expect(hits.length).toBe(1)
+  })
+})

packages/instant-meilisearch/src/adapter/search-request-adapter/search-params-adapter.ts

@@ -166,7 +166,7 @@ export function MeiliParamsCreator(searchContext: SearchContext) {
     },
     addSort() {
       if (sort?.length) {
-        meiliSearchParams.sort = [sort]
+        meiliSearchParams.sort = Array.isArray(sort) ? sort : [sort]
       }
     },
     addGeoSearchRules() {

packages/instant-meilisearch/src/contexts/search-context.ts

@@ -5,6 +5,7 @@ import {
 } from '../types'
 
 import { createPaginationState } from './pagination-context'
+import { createSortState } from './sort-context'
 
 /**
  * @param  {AlgoliaMultipleQueriesQuery} searchRequest
@@ -25,10 +26,12 @@ export function createSearchContext(
     instantSearchParams?.page
   )
 
+  const sortState = createSortState(sortByArray.join(':'))
+
   const searchContext: SearchContext = {
     ...options,
     ...instantSearchParams,
-    sort: sortByArray.join(':') || '',
+    sort: sortState,
     indexUid,
     pagination: paginationState,
     placeholderSearch: options.placeholderSearch !== false, // true by default

packages/instant-meilisearch/src/contexts/sort-context.ts

@@ -0,0 +1,10 @@
+/**
+ * @param {string} rawSort
+ * @returns {string[]}
+ */
+export function createSortState(rawSort: string): string[] {
+  return rawSort
+    .split(',')
+    .map((sort) => sort.trim())
+    .filter((sort) => !!sort)
+}

packages/instant-meilisearch/src/types/types.ts

@@ -71,7 +71,7 @@ export type SearchContext = Omit<InstantSearchParams, 'insideBoundingBox'> &
     keepZeroFacets: boolean
     insideBoundingBox?: InsideBoundingBox
     cropMarker?: string
-    sort?: string
+    sort?: string | string[]
     primaryKey?: string
     matchingStrategy?: MatchingStrategies
   }