fix: use locale-independent comparison for sorting of overrides (#327)

* fix: use locale-independent comparison for sorting of overrides * Update index.js Co-authored-by: Keith Cirkel <[email protected]> --------- Co-authored-by: Jan Novotny <[email protected]> Co-authored-by: Keith Cirkel <[email protected]>
keithamus · Nov 19, 2024 · 5213340 · 5213340
1 parent 99a9760
commit 5213340
Show file tree

Hide file tree

Showing 5 changed files with 556 additions and 17 deletions.
diff --git a/index.js b/index.js
@@ -77,7 +77,7 @@ const sortObjectBySemver = sortObjectBy((a, b) => {
   const { name: bName, range: bRange } = parseNameAndVersionRange(b)
 
   if (aName !== bName) {
-    return aName.localeCompare(bName)
+    return aName.localeCompare(bName, 'en')
   }
   if (!aRange) {
     return -1

diff --git a/tests/_helpers.js b/tests/_helpers.js
@@ -53,8 +53,8 @@ function sortObjectAlphabetically(t, options = {}) {
   for (let depth = 1; depth < maxDepth + 1; depth++) {
     sortObject(t, {
       ...options,
-      value: keysToObject(['z', 'a'], depth),
-      expect: expect || keysToObject(['a', 'z'], depth),
+      value: keysToObject(['z', 'e', 'ch', 'a'], depth),
+      expect: expect || keysToObject(['a', 'ch', 'e', 'z'], depth),
     })
   }
 }
@@ -73,6 +73,10 @@ function sortObjectWithRangeAlphabetically(t, options = {}) {
           '@[email protected]',
           '[email protected]',
           '@b-package',
+          '@[email protected]',
+          '@[email protected]',
+          '[email protected]',
+          '[email protected]',
         ],
         depth,
       ),
@@ -82,10 +86,14 @@ function sortObjectWithRangeAlphabetically(t, options = {}) {
           [
             '@[email protected]',
             '@b-package',
+            '@[email protected]',
+            '@[email protected]',
             '@[email protected]',
             '[email protected]',
             '[email protected]',
             '[email protected]',
+            '[email protected]',
+            '[email protected]',
           ],
           depth,
         ),

diff --git a/tests/deps.js b/tests/deps.js
@@ -44,3 +44,10 @@ test('dependenciesMetaRange', macro.sortObjectWithRangeAlphabetically, {
   // TODO: don't use snapshot, find a esaier way for review
   expect: 'snapshot',
 })
+
+test('pnpm.overrides', macro.sortObjectWithRangeAlphabetically, {
+  path: 'pnpm.overrides',
+  maxDepth: 2,
+  // TODO: don't use snapshot, find a esaier way for review
+  expect: 'snapshot',
+})