Fixed RegExp in filter-adapter.ts and sort-context.ts to work in Safari

.changeset/twelve-knives-rush.md

@@ -0,0 +1,5 @@
+---
+"@meilisearch/instant-meilisearch": minor
+---
+
+Fixed RegExp in filter-adapter.ts and sort-context.ts to work in Safari

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

@@ -63,6 +63,18 @@ describe('Sort browser test', () => {
     ])
   })
 
+  test('split multiple sorting rules in different order', () => {
+    const sortRules = splitSortString(
+      'title:asc,_geoPoint(37.8153, -122.4784):asc,description:desc'
+    )
+
+    expect(sortRules).toEqual([
+      'title:asc',
+      '_geoPoint(37.8153, -122.4784):asc',
+      'description:desc',
+    ])
+  })
+
   test('split one sorting rule', () => {
     const sortRules = splitSortString('_geoPoint(37.8153, -122.4784):asc')
 

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

@@ -29,9 +29,6 @@ function transformFacetFilter(filter: string): string {
   return `"${attribute}"="${value}"`
 }
 
-// Matches first occurrence of an operator
-const numericSplitRegExp = /(?<!(?:[<!>]?=|<|>|:).*)([<!>]?=|<|>|:)/
-
 /**
  * Transform InstantSearch [numeric filter](https://www.algolia.com/doc/api-reference/api-parameters/numericFilters/)
  * to Meilisearch compatible filter format.
@@ -47,9 +44,25 @@ const numericSplitRegExp = /(?<!(?:[<!>]?=|<|>|:).*)([<!>]?=|<|>|:)/
  * @returns {string}
  */
 function transformNumericFilter(filter: string): string {
-  // TODO: Warn users to not enable facet values escape for negative numbers.
-  //       https://github.com/algolia/instantsearch/blob/da701529ed325bb7a1d782e80cb994711e20d94a/packages/instantsearch.js/src/lib/utils/escapeFacetValue.ts#L13-L21
-  const [attribute, operator, value] = filter.split(numericSplitRegExp)
+  const splitNumericFilter = (): [string, string, string] => {
+    const attributeMatch = filter.match(/^([^<!>:=]*)([<!>:=]+)(.*)$/)
+
+    if (attributeMatch) {
+      const [attribute, dirtyOperator, valueEnd] = attributeMatch.slice(1)
+      const operatorMatch = dirtyOperator.match(/^([<!>]?=|<|>|:){1}(.*)/) || [
+        '',
+        '',
+      ]
+      const [operator, valueStart] = operatorMatch.slice(1)
+      const cleanedValue = valueStart + valueEnd
+
+      return [attribute, operator, cleanedValue]
+    }
+
+    return [filter, '', '']
+  }
+
+  const [attribute, operator, value] = splitNumericFilter()
   const escapedAttribute = getValueWithEscapedBackslashesAndQuotes(attribute)
   return `"${escapedAttribute.trim()}"${
     operator === ':' ? ' ' : operator

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

@@ -16,7 +16,13 @@
  */
 export function splitSortString(sortStr: string): string[] {
   if (!sortStr) return []
-  const sortRules = sortStr.split(/,(?=\w+:(?:asc|desc))/)
+  const regex = /[^:]+:(?:asc|desc)/g
+  const sortRules: string[] = []
 
-  return sortRules
+  let match
+  while ((match = regex.exec(sortStr)) !== null) {
+    sortRules.push(match[0])
+  }
+
+  return sortRules.map((str) => str.replace(/^,+|,+$/, ''))
 }