From c9661c8bbf048e9fa3ef55985e1e2e82bc098b1a Mon Sep 17 00:00:00 2001
From: James <5511220+Zamiell@users.noreply.github.com>
Date: Tue, 12 Dec 2023 11:28:13 -0500
Subject: [PATCH] feat: require-array-sort-compare + toSorted (#8052)

* feat: toSorted works

* refactor: add test
---
 .../docs/rules/require-array-sort-compare.md  |  2 +-
 .../src/rules/require-array-sort-compare.ts   | 35 ++++++++++---------
 .../rules/require-array-sort-compare.test.ts  | 15 ++++++++
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/packages/eslint-plugin/docs/rules/require-array-sort-compare.md b/packages/eslint-plugin/docs/rules/require-array-sort-compare.md
index d97e78e9aa0..8bb7d3fe9e0 100644
--- a/packages/eslint-plugin/docs/rules/require-array-sort-compare.md
+++ b/packages/eslint-plugin/docs/rules/require-array-sort-compare.md
@@ -6,7 +6,7 @@ description: 'Require `Array#sort` calls to always provide a `compareFunction`.'
 >
 > See **https://typescript-eslint.io/rules/require-array-sort-compare** for documentation.
 
-When called without a compare function, `Array#sort()` converts all non-undefined array elements into strings and then compares said strings based off their UTF-16 code units [[ECMA specification](https://www.ecma-international.org/ecma-262/9.0/#sec-sortcompare)].
+When called without a compare function, `Array#sort()` and `Array#toSorted()` converts all non-undefined array elements into strings and then compares said strings based off their UTF-16 code units [[ECMA specification](https://www.ecma-international.org/ecma-262/9.0/#sec-sortcompare)].
 
 The result is that elements are sorted alphabetically, regardless of their type.
 For example, when sorting numbers, this results in a "10 before 2" order:
diff --git a/packages/eslint-plugin/src/rules/require-array-sort-compare.ts b/packages/eslint-plugin/src/rules/require-array-sort-compare.ts
index 1b2916ea0b4..fe246a6d8bf 100644
--- a/packages/eslint-plugin/src/rules/require-array-sort-compare.ts
+++ b/packages/eslint-plugin/src/rules/require-array-sort-compare.ts
@@ -27,7 +27,7 @@ export default createRule<Options, MessageIds>({
     type: 'problem',
     docs: {
       description:
-        'Require `Array#sort` calls to always provide a `compareFunction`',
+        'Require `Array#sort` and `Array#toSorted` calls to always provide a `compareFunction`',
       requiresTypeChecking: true,
     },
     messages: {
@@ -66,23 +66,26 @@ export default createRule<Options, MessageIds>({
       return false;
     }
 
-    return {
-      "CallExpression[arguments.length=0] > MemberExpression[property.name='sort'][computed=false]"(
-        callee: TSESTree.MemberExpression,
-      ): void {
-        const calleeObjType = getConstrainedTypeAtLocation(
-          services,
-          callee.object,
-        );
+    function checkSortArgument(callee: TSESTree.MemberExpression): void {
+      const calleeObjType = getConstrainedTypeAtLocation(
+        services,
+        callee.object,
+      );
 
-        if (options.ignoreStringArrays && isStringArrayNode(callee.object)) {
-          return;
-        }
+      if (options.ignoreStringArrays && isStringArrayNode(callee.object)) {
+        return;
+      }
 
-        if (isTypeArrayTypeOrUnionOfArrayTypes(calleeObjType, checker)) {
-          context.report({ node: callee.parent, messageId: 'requireCompare' });
-        }
-      },
+      if (isTypeArrayTypeOrUnionOfArrayTypes(calleeObjType, checker)) {
+        context.report({ node: callee.parent, messageId: 'requireCompare' });
+      }
+    }
+
+    return {
+      "CallExpression[arguments.length=0] > MemberExpression[property.name='sort'][computed=false]":
+        checkSortArgument,
+      "CallExpression[arguments.length=0] > MemberExpression[property.name='toSorted'][computed=false]":
+        checkSortArgument,
     };
   },
 });
diff --git a/packages/eslint-plugin/tests/rules/require-array-sort-compare.test.ts b/packages/eslint-plugin/tests/rules/require-array-sort-compare.test.ts
index 771adedb141..3d544d7f2ce 100644
--- a/packages/eslint-plugin/tests/rules/require-array-sort-compare.test.ts
+++ b/packages/eslint-plugin/tests/rules/require-array-sort-compare.test.ts
@@ -126,6 +126,13 @@ ruleTester.run('require-array-sort-compare', rule, {
       `,
       options: [{ ignoreStringArrays: true }],
     },
+    {
+      code: `
+        function f(a: number[]) {
+          a.toSorted((a, b) => a - b);
+        }
+      `,
+    },
   ],
   invalid: [
     {
@@ -254,5 +261,13 @@ ruleTester.run('require-array-sort-compare', rule, {
       errors: [{ messageId: 'requireCompare' }],
       options: [{ ignoreStringArrays: true }],
     },
+    {
+      code: `
+        function f(a: number[]) {
+          a.toSorted();
+        }
+      `,
+      errors: [{ messageId: 'requireCompare' }],
+    },
   ],
 });