Update typescript-eslint rules

Author: Shinigami92

src/rules/typescript-eslint/index.d.ts

@@ -78,6 +78,7 @@ import type { NoUnnecessaryTypeConstraintRule } from './no-unnecessary-type-cons
 import type { NoUnsafeArgumentRule } from './no-unsafe-argument';
 import type { NoUnsafeAssignmentRule } from './no-unsafe-assignment';
 import type { NoUnsafeCallRule } from './no-unsafe-call';
+import type { NoUnsafeDeclarationMergingRule } from './no-unsafe-declaration-merging';
 import type { NoUnsafeMemberAccessRule } from './no-unsafe-member-access';
 import type { NoUnsafeReturnRule } from './no-unsafe-return';
 import type { NoUnusedExpressionsRule } from './no-unused-expressions';
@@ -114,6 +115,7 @@ import type { RestrictPlusOperandsRule } from './restrict-plus-operands';
 import type { RestrictTemplateExpressionsRule } from './restrict-template-expressions';
 import type { ReturnAwaitRule } from './return-await';
 import type { SemiRule } from './semi';
+import type { SortTypeConstituentsRule } from './sort-type-constituents';
 import type { SortTypeUnionIntersectionMembersRule } from './sort-type-union-intersection-members';
 import type { SpaceBeforeBlocksRule } from './space-before-blocks';
 import type { SpaceBeforeFunctionParenRule } from './space-before-function-paren';
@@ -209,6 +211,7 @@ export type TypeScriptRules = AdjacentOverloadSignaturesRule &
   NoUnsafeArgumentRule &
   NoUnsafeAssignmentRule &
   NoUnsafeCallRule &
+  NoUnsafeDeclarationMergingRule &
   NoUnsafeMemberAccessRule &
   NoUnsafeReturnRule &
   NoUnusedExpressionsRule &
@@ -245,6 +248,7 @@ export type TypeScriptRules = AdjacentOverloadSignaturesRule &
   RestrictTemplateExpressionsRule &
   ReturnAwaitRule &
   SemiRule &
+  SortTypeConstituentsRule &
   SortTypeUnionIntersectionMembersRule &
   SpaceBeforeBlocksRule &
   SpaceBeforeFunctionParenRule &

src/rules/typescript-eslint/member-ordering.d.ts

@@ -480,7 +480,9 @@ export interface MemberOrderingOption {
         order?:
           | 'alphabetically'
           | 'alphabetically-case-insensitive'
-          | 'as-written';
+          | 'as-written'
+          | 'natural'
+          | 'natural-case-insensitive';
       };
   classes?:
     | 'never'
@@ -958,7 +960,9 @@ export interface MemberOrderingOption {
         order?:
           | 'alphabetically'
           | 'alphabetically-case-insensitive'
-          | 'as-written';
+          | 'as-written'
+          | 'natural'
+          | 'natural-case-insensitive';
       };
   classExpressions?:
     | 'never'
@@ -1436,7 +1440,9 @@ export interface MemberOrderingOption {
         order?:
           | 'alphabetically'
           | 'alphabetically-case-insensitive'
-          | 'as-written';
+          | 'as-written'
+          | 'natural'
+          | 'natural-case-insensitive';
       };
   interfaces?:
     | 'never'
@@ -1454,7 +1460,9 @@ export interface MemberOrderingOption {
         order?:
           | 'alphabetically'
           | 'alphabetically-case-insensitive'
-          | 'as-written';
+          | 'as-written'
+          | 'natural'
+          | 'natural-case-insensitive';
       };
   typeLiterals?:
     | 'never'
@@ -1472,7 +1480,9 @@ export interface MemberOrderingOption {
         order?:
           | 'alphabetically'
           | 'alphabetically-case-insensitive'
-          | 'as-written';
+          | 'as-written'
+          | 'natural'
+          | 'natural-case-insensitive';
       };
 }
 

src/rules/typescript-eslint/no-unsafe-declaration-merging.d.ts

@@ -0,0 +1,22 @@
+import type { RuleConfig } from '../rule-config';
+
+/**
+ * Disallow unsafe declaration merging.
+ *
+ * @see [no-unsafe-declaration-merging](https://typescript-eslint.io/rules/no-unsafe-declaration-merging)
+ */
+export type NoUnsafeDeclarationMergingRuleConfig = RuleConfig<[]>;
+
+/**
+ * Disallow unsafe declaration merging.
+ *
+ * @see [no-unsafe-declaration-merging](https://typescript-eslint.io/rules/no-unsafe-declaration-merging)
+ */
+export interface NoUnsafeDeclarationMergingRule {
+  /**
+   * Disallow unsafe declaration merging.
+   *
+   * @see [no-unsafe-declaration-merging](https://typescript-eslint.io/rules/no-unsafe-declaration-merging)
+   */
+  '@typescript-eslint/no-unsafe-declaration-merging': NoUnsafeDeclarationMergingRuleConfig;
+}

src/rules/typescript-eslint/sort-type-constituents.d.ts

@@ -0,0 +1,60 @@
+import type { RuleConfig } from '../rule-config';
+
+/**
+ * Option.
+ */
+export interface SortTypeConstituentsOption {
+  /**
+   * Whether to check intersection types.
+   */
+  checkIntersections?: boolean;
+  /**
+   * Whether to check union types.
+   */
+  checkUnions?: boolean;
+  /**
+   * Ordering of the groups.
+   */
+  groupOrder?: (
+    | 'conditional'
+    | 'function'
+    | 'import'
+    | 'intersection'
+    | 'keyword'
+    | 'nullish'
+    | 'literal'
+    | 'named'
+    | 'object'
+    | 'operator'
+    | 'tuple'
+    | 'union'
+  )[];
+  [k: string]: any;
+}
+
+/**
+ * Options.
+ */
+export type SortTypeConstituentsOptions = [SortTypeConstituentsOption?];
+
+/**
+ * Enforce constituents of a type union/intersection to be sorted alphabetically.
+ *
+ * @see [sort-type-constituents](https://typescript-eslint.io/rules/sort-type-constituents)
+ */
+export type SortTypeConstituentsRuleConfig =
+  RuleConfig<SortTypeConstituentsOptions>;
+
+/**
+ * Enforce constituents of a type union/intersection to be sorted alphabetically.
+ *
+ * @see [sort-type-constituents](https://typescript-eslint.io/rules/sort-type-constituents)
+ */
+export interface SortTypeConstituentsRule {
+  /**
+   * Enforce constituents of a type union/intersection to be sorted alphabetically.
+   *
+   * @see [sort-type-constituents](https://typescript-eslint.io/rules/sort-type-constituents)
+   */
+  '@typescript-eslint/sort-type-constituents': SortTypeConstituentsRuleConfig;
+}

src/rules/typescript-eslint/sort-type-union-intersection-members.d.ts

@@ -42,6 +42,8 @@ export type SortTypeUnionIntersectionMembersOptions = [
 /**
  * Enforce members of a type union/intersection to be sorted alphabetically.
  *
+ * @deprecated
+ *
  * @see [sort-type-union-intersection-members](https://typescript-eslint.io/rules/sort-type-union-intersection-members)
  */
 export type SortTypeUnionIntersectionMembersRuleConfig =
@@ -50,12 +52,16 @@ export type SortTypeUnionIntersectionMembersRuleConfig =
 /**
  * Enforce members of a type union/intersection to be sorted alphabetically.
  *
+ * @deprecated
+ *
  * @see [sort-type-union-intersection-members](https://typescript-eslint.io/rules/sort-type-union-intersection-members)
  */
 export interface SortTypeUnionIntersectionMembersRule {
   /**
    * Enforce members of a type union/intersection to be sorted alphabetically.
    *
+   * @deprecated
+   *
    * @see [sort-type-union-intersection-members](https://typescript-eslint.io/rules/sort-type-union-intersection-members)
    */
   '@typescript-eslint/sort-type-union-intersection-members': SortTypeUnionIntersectionMembersRuleConfig;