fix: gives maximum priority to the void character in custom sort type

hugop95 · web-flow · commit 1649bea46f69 · 2024-12-21T03:44:38.000+03:00
diff --git a/test/compare.test.ts b/test/compare.test.ts
@@ -249,6 +249,21 @@ describe('compare', () => {
         }),
       ).toBe(0)
     })
+
+    it('gives maximum priority to void', () => {
+      expect(
+        compare(createTestNode({ name: 'a' }), createTestNode({ name: '' }), {
+          ...compareOptions,
+          alphabet: 'a',
+        }),
+      ).toBe(1)
+      expect(
+        compare(createTestNode({ name: '' }), createTestNode({ name: 'a' }), {
+          ...compareOptions,
+          alphabet: 'a',
+        }),
+      ).toBe(-1)
+    })
   })
 
   let createTestNode = ({ name }: { name: string }): SortingNode =>
diff --git a/utils/compare.ts b/utils/compare.ts
@@ -122,9 +122,9 @@ let getCustomSortingFunction = <T extends SortingNode>(
   return (aNode: T, bNode: T) => {
     let aValue = formatString(nodeValueGetter(aNode))
     let bValue = formatString(nodeValueGetter(bNode))
+    let minLength = Math.min(aValue.length, bValue.length)
     // Iterate character by character
-    // eslint-disable-next-line unicorn/no-for-loop
-    for (let i = 0; i < aValue.length; i++) {
+    for (let i = 0; i < minLength; i++) {
       let aCharacter = aValue[i]
       let bCharacter = bValue[i]
       let indexOfA = indexByCharacters.get(aCharacter)
@@ -135,7 +135,10 @@ let getCustomSortingFunction = <T extends SortingNode>(
         return convertBooleanToSign(indexOfA - indexOfB > 0)
       }
     }
-    return 0
+    if (aValue.length === bValue.length) {
+      return 0
+    }
+    return convertBooleanToSign(aValue.length - bValue.length > 0)
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,9 @@ let getCustomSortingFunction = <T extends SortingNode>(`
`122`	`122`	`return (aNode: T, bNode: T) => {`
`123`	`123`	`let aValue = formatString(nodeValueGetter(aNode))`
`124`	`124`	`let bValue = formatString(nodeValueGetter(bNode))`
	`125`	`+ let minLength = Math.min(aValue.length, bValue.length)`
`125`	`126`	`// Iterate character by character`
`126`		`- // eslint-disable-next-line unicorn/no-for-loop`
`127`		`- for (let i = 0; i < aValue.length; i++) {`
	`127`	`+ for (let i = 0; i < minLength; i++) {`
`128`	`128`	`let aCharacter = aValue[i]`
`129`	`129`	`let bCharacter = bValue[i]`
`130`	`130`	`let indexOfA = indexByCharacters.get(aCharacter)`
`@@ -135,7 +135,10 @@ let getCustomSortingFunction = <T extends SortingNode>(`
`135`	`135`	`return convertBooleanToSign(indexOfA - indexOfB > 0)`
`136`	`136`	`}`
`137`	`137`	`}`
`138`		`- return 0`
	`138`	`+ if (aValue.length === bValue.length) {`
	`139`	`+ return 0`
	`140`	`+ }`
	`141`	`+ return convertBooleanToSign(aValue.length - bValue.length > 0)`
`139`	`142`	`}`
`140`	`143`	`}`
`141`	`144`