fix: Fix case sensitive sorting when not using natural compare

mskelton · Apr 14, 2023 · 2191831 · 2191831
1 parent c2ea732
commit 2191831
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/__tests__/destructuring-properties.spec.ts b/src/__tests__/destructuring-properties.spec.ts
@@ -56,7 +56,7 @@ ruleTester.run("sort/destructuring-properties", rule, {
       options: [{ caseSensitive: false, natural: false }],
     },
     {
-      code: "let { a: A, B: b, c: C, C: c } = {}",
+      code: "let { B: b, C: c, a: A, c: C } = {}",
       options: [{ caseSensitive: true, natural: false }],
     },
     {

diff --git a/src/__tests__/export-members.spec.ts b/src/__tests__/export-members.spec.ts
@@ -40,7 +40,7 @@ ruleTester.run("sort/export-members", rule, {
       options: [{ caseSensitive: false, natural: false }],
     },
     {
-      code: "export { a, B, c, C } from 'a'",
+      code: "export { B, C, a, c } from 'a'",
       options: [{ caseSensitive: true, natural: false }],
     },
     {

diff --git a/src/__tests__/import-members.spec.ts b/src/__tests__/import-members.spec.ts
@@ -40,7 +40,7 @@ ruleTester.run("sort/import-members", rule, {
       options: [{ caseSensitive: false, natural: false }],
     },
     {
-      code: "import { a, B, c, C } from 'a'",
+      code: "import { B, C, a, c } from 'a'",
       options: [{ caseSensitive: true, natural: false }],
     },
     {

diff --git a/src/__tests__/object-properties.spec.ts b/src/__tests__/object-properties.spec.ts
@@ -102,7 +102,7 @@ ruleTester.run("sort/object-properties", rule, {
       options: [{ caseSensitive: false, natural: false }],
     },
     {
-      code: "var a = { a: 1, B: 2, c: 3, C: 4 }",
+      code: "var a = { B: 2, C: 4, a: 1, c: 3 }",
       options: [{ caseSensitive: true, natural: false }],
     },
     {
@@ -120,7 +120,7 @@ ruleTester.run("sort/object-properties", rule, {
       options: [{ caseSensitive: false, natural: false }],
     },
     {
-      code: "var a = { ['a']: 1, ['B']: 2, ['c']: 3, ['C']: 4, }",
+      code: "var a = { ['B']: 2, ['C']: 4, ['a']: 1, ['c']: 3 }",
       options: [{ caseSensitive: true, natural: false }],
     },
     {

diff --git a/src/__tests__/string-unions.spec.ts b/src/__tests__/string-unions.spec.ts
@@ -32,7 +32,7 @@ ruleTester.run("sort/string-unions", rule, {
       options: [{ caseSensitive: false, natural: false }],
     },
     {
-      code: "type A = 'a1' | 'A1' | 'a12' | 'a2' | 'B2'",
+      code: "type A = 'A1' | 'B1' | 'a1' | 'a12' | 'a2'",
       options: [{ caseSensitive: true, natural: false }],
     },
     {
@@ -70,7 +70,7 @@ ruleTester.run("sort/string-unions", rule, {
     },
     {
       code: "type A = 'a1' | 'B2' | 'a2' | 'a12'",
-      output: "type A = 'a1' | 'a12' | 'a2' | 'B2'",
+      output: "type A = 'B2' | 'a1' | 'a12' | 'a2'",
       options: [{ caseSensitive: true, natural: false }],
       errors: [{ messageId: "unsorted" }],
     },

diff --git a/src/__tests__/type-properties.spec.ts b/src/__tests__/type-properties.spec.ts
@@ -80,7 +80,7 @@ ruleTester.run("sort/type-properties", rule, {
       options: [{ caseSensitive: false, natural: false }],
     },
     {
-      code: "type A = { a: 1, B: 2, c: 3, C: 4 }",
+      code: "type A = { B: 2, C: 4, a: 1, c: 3 }",
       options: [{ caseSensitive: true, natural: false }],
     },
     {

diff --git a/src/utils.ts b/src/utils.ts
@@ -72,7 +72,7 @@ export const getSorter = ({
   if (caseSensitive && natural) {
     return (a, b) => naturalCompare(a, b)
   } else if (caseSensitive) {
-    return (a, b) => a.localeCompare(b)
+    return (a, b) => (a < b ? -1 : a > b ? 1 : 0)
   } else if (natural) {
     return (a, b) => naturalCompare(a.toLowerCase(), b.toLowerCase())
   }