Add Meilisearch Cloud touchpoint in README.md section

Related to meilisearch/integration-guides#277

Author: brunoocasali

.changeset/dirty-mangos-tie.md

@@ -0,0 +1,5 @@
+---
+"@meilisearch/instant-meilisearch": patch
+---
+
+Fix bug where sort-by failed on geo_points

README.md

@@ -4,6 +4,16 @@
 
 <h1 align="center">Meilisearch Javascript plugins</h1>
 
+<h4 align="center">
+  <a href="https://github.com/meilisearch/meilisearch">Meilisearch</a> |
+  <a href="https://www.meilisearch.com/pricing?utm_campaign=oss&utm_source=integration&utm_medium=meilisearch-js-plugins">Meilisearch Cloud</a> |
+  <a href="https://docs.meilisearch.com">Documentation</a> |
+  <a href="https://discord.meilisearch.com">Discord</a> |
+  <a href="https://roadmap.meilisearch.com/tabs/1-under-consideration">Roadmap</a> |
+  <a href="https://www.meilisearch.com">Website</a> |
+  <a href="https://docs.meilisearch.com/faq">FAQ</a>
+</h4>
+
 <p align="center">
   <a href="https://github.com/meilisearch/meilisearch-js-plugins/actions"><img src="https://github.com/meilisearch/meilisearch-js-plugins/workflows/Tests/badge.svg?branch=main" alt="Tests"></a>
   <a href="https://github.com/meilisearch/meilisearch-js-plugins/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-informational" alt="License"></a>
@@ -18,13 +28,18 @@ This repository contains clients and plugins to use Meilisearch with third party
 ## Table of Contents <!-- omit in toc -->
 
 - [📖 Documentation](#-documentation)
+- [⚡ Supercharge your Meilisearch experience](#-supercharge-your-meilisearch-experience)
 - [🐱 Plugins](#-plugins)
 - [⚙️ Development Workflow and Contributing](#️-development-workflow-and-contributing)
 
 ## 📖 Documentation
 
 For general information on how to use Meilisearch—such as our API reference, tutorials, guides, and in-depth articles—refer to our [main documentation website](https://docs.meilisearch.com/).
 
+## ⚡ Supercharge your Meilisearch experience
+
+Say goodbye to server deployment and manual updates with [Meilisearch Cloud](https://www.meilisearch.com/pricing?utm_campaign=oss&utm_source=integration&utm_medium=meilisearch-js-plugins). No credit card required.
+
 ## 🐱 Plugins
 
 ### Plugins in this repository

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

@@ -5,6 +5,8 @@ import {
   meilisearchClient,
 } from './assets/utils'
 
+import { splitSortString } from '../src/contexts/sort-context'
+
 describe('Sort browser test', () => {
   beforeAll(async () => {
     const deleteTask = await meilisearchClient.deleteIndex('movies')
@@ -48,4 +50,28 @@ describe('Sort browser test', () => {
     const hits = response.results[0].hits
     expect(hits.length).toBe(1)
   })
+
+  test('split multiple sorting rules', () => {
+    const sortRules = splitSortString(
+      '_geoPoint(37.8153, -122.4784):asc,title:asc,description:desc'
+    )
+
+    expect(sortRules).toEqual([
+      '_geoPoint(37.8153, -122.4784):asc',
+      'title:asc',
+      'description:desc',
+    ])
+  })
+
+  test('split one sorting rule', () => {
+    const sortRules = splitSortString('_geoPoint(37.8153, -122.4784):asc')
+
+    expect(sortRules).toEqual(['_geoPoint(37.8153, -122.4784):asc'])
+  })
+
+  test.only('split no sorting rule', () => {
+    const sortRules = splitSortString('')
+
+    expect(sortRules).toEqual([])
+  })
 })

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

@@ -3,9 +3,25 @@ import {
   AlgoliaMultipleQueriesQuery,
   SearchContext,
 } from '../types'
-
+import { splitSortString } from './sort-context'
 import { createPaginationState } from './pagination-context'
-import { createSortState } from './sort-context'
+
+function separateIndexFromSortRules(indexName: string): {
+  indexUid: string
+  sortBy: string
+} {
+  const colonIndex = indexName.indexOf(':')
+  if (colonIndex === -1) {
+    return {
+      indexUid: indexName,
+      sortBy: '',
+    }
+  }
+  return {
+    indexUid: indexName.substring(0, colonIndex),
+    sortBy: indexName.substring(colonIndex + 1),
+  }
+}
 
 /**
  * @param  {AlgoliaMultipleQueriesQuery} searchRequest
@@ -16,23 +32,21 @@ export function createSearchContext(
   searchRequest: AlgoliaMultipleQueriesQuery,
   options: InstantMeiliSearchOptions
 ): SearchContext {
+  const { query, indexName, params: instantSearchParams } = searchRequest
   // Split index name and possible sorting rules
-  const [indexUid, ...sortByArray] = searchRequest.indexName.split(':')
-  const { query, params: instantSearchParams } = searchRequest
+  const { indexUid, sortBy } = separateIndexFromSortRules(indexName)
 
   const paginationState = createPaginationState(
     options.finitePagination,
     instantSearchParams?.hitsPerPage,
     instantSearchParams?.page
   )
 
-  const sortState = createSortState(sortByArray.join(':'))
-
   const searchContext: SearchContext = {
     ...options,
     query,
     ...instantSearchParams,
-    sort: sortState,
+    sort: splitSortString(sortBy),
     indexUid,
     pagination: paginationState,
     placeholderSearch: options.placeholderSearch !== false, // true by default

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

@@ -1,10 +1,22 @@
 /**
- * @param {string} rawSort
+ * Split sort string into an array.
+ *
+ * Example:
+ * '_geoPoint(37.8153, -122.4784):asc,title:asc,description:desc'
+ *
+ * becomes:
+ * [
+ * '_geoPoint(37.8153, -122.4784):asc',
+ * 'title:asc',
+ * 'description:desc',
+ * ]
+ *
+ * @param {string} sortStr
  * @returns {string[]}
  */
-export function createSortState(rawSort: string): string[] {
-  return rawSort
-    .split(',')
-    .map((sort) => sort.trim())
-    .filter((sort) => !!sort)
+export function splitSortString(sortStr: string): string[] {
+  if (!sortStr) return []
+  const sortRules = sortStr.split(/,(?=\w+:(?:asc|desc))/)
+
+  return sortRules
 }