eslint-config: upgrade @typescript-eslint

framework/eslint-config/base.yaml

@@ -1,6 +1,6 @@
 extends:
   - airbnb-base
-  - airbnb-typescript/base
+  - ./typescript
 env:
   es6: true
 globals:
@@ -23,10 +23,6 @@ rules:
   '@typescript-eslint/no-throw-literal': 0
   '@typescript-eslint/return-await': 0
 
-  comma-dangle:
-    - 1
-    - always-multiline
-
   no-implicit-coercion:
     - warn
     - allow: ["!!", "+"]
@@ -35,15 +31,6 @@ rules:
     - enforceForLogicalOperands: true
   no-empty-pattern: 0
   no-multi-str: 0
-  '@typescript-eslint/no-invalid-this': 0
-  '@typescript-eslint/type-annotation-spacing': 1
-  '@typescript-eslint/indent':
-    - warn
-    - 4
-  '@typescript-eslint/lines-between-class-members':
-    - error
-    - always
-    - exceptAfterSingleLine: true
   '@typescript-eslint/naming-convention':
     - warn
     - selector: default
@@ -90,7 +77,20 @@ rules:
   '@typescript-eslint/no-redeclare': 0
   '@typescript-eslint/default-param-last': 0
   default-param-last: 0
-  '@typescript-eslint/quotes': ['warn', 'single', { avoidEscape: true }]
+  '@typescript-eslint/no-invalid-this': 0
+
+  '@stylistic/indent':
+    - warn
+    - 4
+  '@stylistic/comma-dangle':
+    - 1
+    - always-multiline
+  '@stylistic/lines-between-class-members':
+    - error
+    - always
+    - exceptAfterSingleLine: true
+
+  '@stylistic/quotes': ['warn', 'single', { avoidEscape: true }]
 
   class-methods-use-this: 0
   global-require: 0
@@ -134,13 +134,10 @@ rules:
   function-paren-newline: 0
   simple-import-sort/exports: 0
 
-  # Note: must disable the base rule as it can report incorrect errors
-  no-use-before-define: 0
   '@typescript-eslint/no-use-before-define': 1
-  no-unused-vars: 0
   '@typescript-eslint/no-unused-vars':
     - error
-    - caughtErrorsIgnorePattern: "^_"
+    - caughtErrorsIgnorePattern: "^_|e"
       argsIgnorePattern: "^_"
 
   no-restricted-syntax:

framework/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/eslint-config",
-    "version": "1.0.13",
+    "version": "1.1.0",
     "license": "MIT",
     "main": "react.yaml",
     "dependencies": {
@@ -8,7 +8,6 @@
         "@typescript-eslint/eslint-plugin": "^8.0.0",
         "@typescript-eslint/parser": "^8.0.0",
         "eslint-config-airbnb": "^19.0.4",
-        "eslint-config-airbnb-typescript": "^18.0.0",
         "eslint-plugin-github": "^5.0.1",
         "eslint-plugin-import": "2.29.1",
         "eslint-plugin-jsx-a11y": "^6.9.0",

framework/eslint-config/typescript.js

@@ -0,0 +1,240 @@
+// Modified from eslint-config-airbnb-typescript for @typescript/eslint-plugin@9
+/* eslint-disable import/no-extraneous-dependencies */
+const { rules: baseBestPracticesRules } = require('eslint-config-airbnb-base/rules/best-practices');
+const { rules: baseErrorsRules } = require('eslint-config-airbnb-base/rules/errors');
+const { rules: baseES6Rules } = require('eslint-config-airbnb-base/rules/es6');
+const { rules: baseStyleRules } = require('eslint-config-airbnb-base/rules/style');
+const { rules: baseVariablesRules } = require('eslint-config-airbnb-base/rules/variables');
+/* eslint-enable import/no-extraneous-dependencies */
+
+module.exports = {
+    plugins: ['@typescript-eslint'],
+    parser: '@typescript-eslint/parser',
+    settings: {
+        // Apply special parsing for TypeScript files
+        'import/parsers': {
+            '@typescript-eslint/parser': ['.ts', '.tsx', '.d.ts'],
+        },
+        // Append 'ts' extensions to Airbnb 'import/resolver' setting
+        // Original: ['.mjs', '.js', '.json']
+        'import/resolver': {
+            node: {
+                extensions: ['.mjs', '.js', '.json', '.ts', '.d.ts'],
+            },
+        },
+        // Append 'ts' extensions to Airbnb 'import/extensions' setting
+        // Original: ['.js', '.mjs', '.jsx']
+        'import/extensions': ['.js', '.mjs', '.jsx', '.ts', '.tsx', '.d.ts'],
+        // Resolve type definition packages
+        'import/external-module-folders': ['node_modules', 'node_modules/@types'],
+    },
+    rules: {
+        // Replace Airbnb 'brace-style' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/brace-style.md
+        'brace-style': 'off',
+        '@stylistic/brace-style': baseStyleRules['brace-style'],
+
+        // Replace Airbnb 'camelcase' rule with '@typescript-eslint/naming-convention'
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/naming-convention.md
+        camelcase: 'off',
+
+        // Replace Airbnb 'comma-dangle' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/comma-dangle.md
+        // The TypeScript version also adds 3 new options, all of which should be set to the same value as the base config
+        'comma-dangle': 'off',
+        '@stylistic/comma-dangle': [
+            baseStyleRules['comma-dangle'][0],
+            {
+                ...baseStyleRules['comma-dangle'][1],
+                enums: baseStyleRules['comma-dangle'][1].arrays,
+                generics: baseStyleRules['comma-dangle'][1].arrays,
+                tuples: baseStyleRules['comma-dangle'][1].arrays,
+            },
+        ],
+
+        // Replace Airbnb 'comma-spacing' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/comma-spacing.md
+        'comma-spacing': 'off',
+        '@stylistic/comma-spacing': baseStyleRules['comma-spacing'],
+
+        // Replace Airbnb 'default-param-last' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/default-param-last.md
+        'default-param-last': 'off',
+        '@typescript-eslint/default-param-last': baseBestPracticesRules['default-param-last'],
+
+        // Replace Airbnb 'dot-notation' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/dot-notation.md
+        'dot-notation': 'off',
+        '@typescript-eslint/dot-notation': baseBestPracticesRules['dot-notation'],
+
+        // Replace Airbnb 'func-call-spacing' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/func-call-spacing.md
+        'func-call-spacing': 'off',
+        '@stylistic/func-call-spacing': baseStyleRules['func-call-spacing'],
+
+        // Replace Airbnb 'indent' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/indent.md
+        indent: 'off',
+        '@stylistic/indent': baseStyleRules.indent,
+
+        // Replace Airbnb 'keyword-spacing' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/keyword-spacing.md
+        'keyword-spacing': 'off',
+        '@stylistic/keyword-spacing': baseStyleRules['keyword-spacing'],
+
+        // Replace Airbnb 'lines-between-class-members' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/lines-between-class-members.md
+        'lines-between-class-members': 'off',
+        '@stylistic/lines-between-class-members': baseStyleRules['lines-between-class-members'],
+
+        // Replace Airbnb 'no-array-constructor' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-array-constructor.md
+        'no-array-constructor': 'off',
+        '@typescript-eslint/no-array-constructor': baseStyleRules['no-array-constructor'],
+
+        // Replace Airbnb 'no-dupe-class-members' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-dupe-class-members.md
+        'no-dupe-class-members': 'off',
+        '@typescript-eslint/no-dupe-class-members': baseES6Rules['no-dupe-class-members'],
+
+        // Replace Airbnb 'no-empty-function' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-empty-function.md
+        'no-empty-function': 'off',
+        '@typescript-eslint/no-empty-function': baseBestPracticesRules['no-empty-function'],
+
+        // Replace Airbnb 'no-extra-parens' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-extra-parens.md
+        'no-extra-parens': 'off',
+        '@typescript-eslint/no-extra-parens': baseErrorsRules['no-extra-parens'],
+
+        // Replace Airbnb 'no-extra-semi' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-extra-semi.md
+        'no-extra-semi': 'off',
+        '@stylistic/no-extra-semi': baseErrorsRules['no-extra-semi'],
+
+        // Replace Airbnb 'no-implied-eval' and 'no-new-func' rules with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-implied-eval.md
+        'no-implied-eval': 'off',
+        'no-new-func': 'off',
+        '@typescript-eslint/no-implied-eval': baseBestPracticesRules['no-implied-eval'],
+
+        // Replace Airbnb 'no-loss-of-precision' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-loss-of-precision.md
+        'no-loss-of-precision': 'off',
+        '@typescript-eslint/no-loss-of-precision': baseErrorsRules['no-loss-of-precision'],
+
+        // Replace Airbnb 'no-loop-func' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-loop-func.md
+        'no-loop-func': 'off',
+        '@typescript-eslint/no-loop-func': baseBestPracticesRules['no-loop-func'],
+
+        // Replace Airbnb 'no-magic-numbers' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-magic-numbers.md
+        'no-magic-numbers': 'off',
+        '@typescript-eslint/no-magic-numbers': baseBestPracticesRules['no-magic-numbers'],
+
+        // Replace Airbnb 'no-redeclare' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-redeclare.md
+        'no-redeclare': 'off',
+        '@typescript-eslint/no-redeclare': baseBestPracticesRules['no-redeclare'],
+
+        // Replace Airbnb 'no-shadow' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-shadow.md
+        'no-shadow': 'off',
+        '@typescript-eslint/no-shadow': baseVariablesRules['no-shadow'],
+
+        // Replace Airbnb 'space-before-blocks' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/space-before-blocks.md
+        'space-before-blocks': 'off',
+        '@stylistic/space-before-blocks': baseStyleRules['space-before-blocks'],
+
+        // Replace Airbnb 'no-throw-literal' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-throw-literal.md
+        'no-throw-literal': 'off',
+        '@typescript-eslint/no-throw-literal': baseBestPracticesRules['no-throw-literal'],
+
+        // Replace Airbnb 'no-unused-expressions' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-unused-expressions.md
+        'no-unused-expressions': 'off',
+        '@typescript-eslint/no-unused-expressions': baseBestPracticesRules['no-unused-expressions'],
+
+        // Replace Airbnb 'no-unused-vars' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-unused-vars.md
+        'no-unused-vars': 'off',
+        '@typescript-eslint/no-unused-vars': baseVariablesRules['no-unused-vars'],
+
+        // Replace Airbnb 'no-use-before-define' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-use-before-define.md
+        'no-use-before-define': 'off',
+        '@typescript-eslint/no-use-before-define': baseVariablesRules['no-use-before-define'],
+
+        // Replace Airbnb 'no-useless-constructor' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-useless-constructor.md
+        'no-useless-constructor': 'off',
+        '@typescript-eslint/no-useless-constructor': baseES6Rules['no-useless-constructor'],
+
+        // Replace Airbnb 'quotes' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/quotes.md
+        quotes: 'off',
+        '@stylistic/quotes': baseStyleRules.quotes,
+
+        // Replace Airbnb 'semi' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/semi.md
+        semi: 'off',
+        '@stylistic/semi': baseStyleRules.semi,
+
+        // Replace Airbnb 'space-before-function-paren' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/space-before-function-paren.md
+        'space-before-function-paren': 'off',
+        '@stylistic/space-before-function-paren': baseStyleRules['space-before-function-paren'],
+
+        // Replace Airbnb 'require-await' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/require-await.md
+        'require-await': 'off',
+        '@typescript-eslint/require-await': baseBestPracticesRules['require-await'],
+
+        // Replace Airbnb 'no-return-await' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/return-await.md
+        'no-return-await': 'off',
+        '@typescript-eslint/return-await': [baseBestPracticesRules['no-return-await'], 'in-try-catch'],
+
+        // Replace Airbnb 'space-infix-ops' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/space-infix-ops.md
+        'space-infix-ops': 'off',
+        '@stylistic/space-infix-ops': baseStyleRules['space-infix-ops'],
+
+        // Replace Airbnb 'object-curly-spacing' rule with '@typescript-eslint' version
+        // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/object-curly-spacing.md
+        'object-curly-spacing': 'off',
+        '@stylistic/object-curly-spacing': baseStyleRules['object-curly-spacing'],
+    },
+    overrides: [
+        {
+            files: ['*.ts', '*.tsx'],
+            rules: {
+                // The following rules are enabled in Airbnb config, but are already checked (more thoroughly) by the TypeScript compiler
+                'constructor-super': 'off',
+                'getter-return': 'off',
+                'no-const-assign': 'off',
+                'no-dupe-args': 'off',
+                'no-dupe-class-members': 'off',
+                'no-dupe-keys': 'off',
+                'no-func-assign': 'off',
+                'no-import-assign': 'off',
+                'no-new-symbol': 'off',
+                'no-obj-calls': 'off',
+                'no-redeclare': 'off',
+                'no-setter-return': 'off',
+                'no-this-before-super': 'off',
+                'no-undef': 'off',
+                'no-unreachable': 'off',
+                'no-unsafe-negation': 'off',
+                'valid-typeof': 'off',
+                'import/named': 'off',
+                'import/no-named-as-default-member': 'off',
+                // Disable `import/no-unresolved`, see README.md for details
+                'import/no-unresolved': 'off',
+            },
+        },
+    ],
+};

packages/hydrooj/src/typeutils.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 export type Atomic = number | string | boolean | bigint | symbol | Date | any[];
 export type Values<S> = S[keyof S];
 export type Intersect<U> = (U extends any ? (arg: U) => void : never) extends ((arg: infer I) => void) ? I : never;
@@ -10,8 +9,8 @@ export type ArrayKeys<O, P = any> = {
 }[keyof O];
 type FlatWrap<S, T, P extends string> = { [K in P]?: S } | (S extends T ? never // rule out atomic / recursive types
     : S extends any[] ? never // rule out array types
-    : string extends keyof S ? never // rule out dict / infinite types
+        : string extends keyof S ? never // rule out dict / infinite types
-    : FlatMap<S, T, `${P}.`>);
+            : FlatMap<S, T, `${P}.`>);
 type FlatMap<S, T = Atomic, P extends string = ''> = Values<{
     [K in keyof S & string as `${P}${K}`]: FlatWrap<S[K], S | T, `${P}${K}`>
 }>;

packages/ui-default/.eslintrc.js

@@ -54,7 +54,7 @@ module.exports = {
     // FIXME A bug with eslint-parser
     // 'template-curly-spacing': 'off',
 
-    '@typescript-eslint/indent': [
+    '@stylistic/indent': [
       'warn',
       2,
       { SwitchCase: 1 },