@w5s/eslint-config 3.12.0 → 3.14.0

package/src/config/imports.ts

@@ -10,10 +10,13 @@ export async function imports(options: imports.Options = {}) {
   const [importPlugin] = await Promise.all([interopDefault(import('eslint-plugin-import'))] as const);
   return [
     {
-      name: 'w5s/import/rules',
+      name: 'w5s/import/setup',
       plugins: {
         import: importPlugin,
       },
+    },
+    {
+      name: 'w5s/import/rules',
       rules: {
         ...(recommended ? imports['recommended'] : {}),
         ...(stylisticEnabled
@@ -22,7 +25,7 @@ export async function imports(options: imports.Options = {}) {
         ...rules,
       },
     },
-  ] as [Config] satisfies Array<Config>;
+  ] as [Config, Config] satisfies Array<Config>;
 }
 
 /**

package/src/config/jsdoc.ts

@@ -2,13 +2,14 @@ import { interopDefault } from '@w5s/dev';
 
 import type { RuleOptions } from '../typegen/jsdoc.js';
 
-import { sourceGlob } from '../glob.js';
+import { esSourceGlob, tsSourceGlob } from '../glob.js';
 import { withDefaultFiles } from '../internal/withDefaultFiles.js';
 import { type Config, type PluginOptionsBase, StylisticConfig } from '../type.js';
 
-const defaultFiles = [sourceGlob];
+const defaultJsFiles = [esSourceGlob];
+const defaultTsFiles = [tsSourceGlob];
 
-export async function jsdoc(options: jsdoc.Options = {}): Promise<readonly Config[]> {
+export async function jsdoc(options: jsdoc.Options = {}): Promise<ReadonlyArray<Config>> {
   const [jsdocPlugin] = await Promise.all([interopDefault(import('eslint-plugin-jsdoc'))] as const);
   const {
     files,
@@ -18,6 +19,18 @@ export async function jsdoc(options: jsdoc.Options = {}): Promise<readonly Confi
   } = options;
   const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
 
+  const recommendedRules = recommended
+    ? jsdocPlugin.configs['flat/recommended-typescript-flavor'].rules
+    : {};
+  const stylisticRules = stylisticEnabled
+    ? {
+        ...jsdocPlugin.configs['flat/stylistic-typescript'].rules,
+        'jsdoc/check-alignment': 'warn',
+        'jsdoc/multiline-blocks': 'warn',
+        'jsdoc/tag-lines': ['warn', 'any', { startLines: 1 }],
+      }
+    : {};
+
   return [
     {
       name: 'w5s/jsdoc/setup',
@@ -26,10 +39,10 @@ export async function jsdoc(options: jsdoc.Options = {}): Promise<readonly Confi
       },
     },
     {
-      files: withDefaultFiles(files, defaultFiles),
-      name: 'w5s/jsdoc/rules',
+      files: withDefaultFiles(files, defaultJsFiles),
+      name: 'w5s/jsdoc/rules-js',
       rules: {
-        ...(recommended ? jsdocPlugin.configs['flat/recommended-typescript-flavor'].rules : {}),
+        ...recommendedRules,
 
         ...(recommended
           ? {
@@ -39,19 +52,41 @@ export async function jsdoc(options: jsdoc.Options = {}): Promise<readonly Confi
               'jsdoc/require-param-description': 'off',
               'jsdoc/require-param-type': 'off',
               'jsdoc/require-returns': 'off',
+              'jsdoc/require-returns-type': 'off',
               'jsdoc/valid-types': 'off', // FIXME: reports lots of false positive
             }
           : {}),
 
-        // 'strict': ['error', 'safe'],
-        ...(stylisticEnabled
+        ...stylisticRules,
+        ...rules,
+      },
+      settings: {
+        jsdoc: {
+          mode: 'typescript',
+        },
+      },
+    },
+    {
+      files: withDefaultFiles(files, defaultTsFiles),
+      name: 'w5s/jsdoc/rules-ts',
+      rules: {
+        ...recommendedRules,
+
+        ...(recommended
           ? {
-              ...jsdocPlugin.configs['flat/stylistic-typescript'].rules,
-              'jsdoc/check-alignment': 'warn',
-              'jsdoc/multiline-blocks': 'warn',
-              'jsdoc/tag-lines': ['warn', 'any', { startLines: 1 }],
+              'jsdoc/no-types': 'warn',
+              'jsdoc/no-undefined-types': 'off', // https://github.com/gajus/eslint-plugin-jsdoc/issues/839
+              'jsdoc/require-hyphen-before-param-description': ['warn', 'always'],
+              'jsdoc/require-jsdoc': 'off',
+              'jsdoc/require-param-description': 'off',
+              'jsdoc/require-param-type': 'off',
+              'jsdoc/require-returns': 'off',
+              'jsdoc/require-returns-type': 'off',
+              'jsdoc/valid-types': 'off', // FIXME: reports lots of false positive
             }
           : {}),
+
+        ...stylisticRules,
         ...rules,
       },
       settings: {
@@ -60,7 +95,7 @@ export async function jsdoc(options: jsdoc.Options = {}): Promise<readonly Confi
         },
       },
     },
-  ] as [Config, Config] satisfies Array<Config>;
+  ] as [Config, Config, Config] satisfies Array<Config>;
 }
 
 export namespace jsdoc {

package/src/config/jsonc.ts

@@ -9,7 +9,7 @@ import { type Config, type PluginOptionsBase, StylisticConfig } from '../type.js
 
 const defaultFiles = [jsonSourceGlob];
 
-export async function jsonc(options: jsonc.Options = {}): Promise<readonly Config[]> {
+export async function jsonc(options: jsonc.Options = {}): Promise<ReadonlyArray<Config>> {
   const [jsoncPlugin, jsoncParser] = await Promise.all([
     interopDefault(import('eslint-plugin-jsonc')),
     interopDefault(import('jsonc-eslint-parser')),

package/src/config/ts.ts

@@ -20,6 +20,7 @@ export async function ts(options: ts.Options = {}) {
   const tsTypeCheckedRules = tsPlugin.configs['recommended-type-checked-only']!.rules!;
   const { files, rules = {}, stylistic = true, typeChecked = false } = options;
   const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
+  const tsCustomRules = tsRules();
 
   return [
     {
@@ -51,8 +52,44 @@ export async function ts(options: ts.Options = {}) {
       rules: {
         ...ESLintConfig.renameRules(tsRecommendedRules, { '@typescript-eslint': 'ts' }),
         ...ESLintConfig.renameRules(tsStrictRules, { '@typescript-eslint': 'ts' }),
-        ...tsRules(),
-        ...(stylisticEnabled ? {} : {}),
+        ...tsCustomRules,
+        ...(stylisticEnabled
+          ? {
+              // eslint-disable-next-line ts/no-non-null-asserted-optional-chain
+              ...ESLintConfig.renameRules(tsPlugin.configs['stylistic']?.rules!, { '@typescript-eslint': 'ts' }),
+              'ts/array-type': ['error', { default: 'generic' }],
+              'ts/consistent-type-assertions': [
+                'error',
+                { assertionStyle: 'as', objectLiteralTypeAssertions: 'allow' },
+              ],
+              'ts/naming-convention': [
+                'error',
+                // {
+                //   format: ['PascalCase', 'camelCase'],
+                //   leadingUnderscore: 'allow',
+                //   selector: 'default',
+                //   trailingUnderscore: 'allow',
+                // },
+                {
+                  format: ['PascalCase', 'camelCase', 'UPPER_CASE'],
+                  leadingUnderscore: 'allow',
+                  selector: 'variable',
+                  trailingUnderscore: 'allow',
+                },
+                // {
+                //   format: ['PascalCase', 'camelCase', 'UPPER_CASE'],
+                //   leadingUnderscore: 'allowSingleOrDouble',
+                //   selector: 'memberLike',
+                //   trailingUnderscore: 'allowDouble',
+                // },
+                {
+                  format: ['PascalCase'],
+                  selector: 'typeLike',
+                },
+              ],
+              'ts/no-empty-function': tsCustomRules['ts/no-empty-function'],
+            }
+          : {}),
         ...rules,
       },
     },

package/src/config/unicorn.ts

@@ -3,13 +3,14 @@ import { interopDefault } from '@w5s/dev';
 import type { RuleOptions } from '../typegen/unicorn.js';
 
 import { sourceGlob } from '../glob.js';
+import { withDefaultFiles } from '../internal/withDefaultFiles.js';
 import { type Config, type PluginOptionsBase, StylisticConfig } from '../type.js';
 
 const defaultFiles = [sourceGlob];
 
 export async function unicorn(options: unicorn.Options = {}) {
   const [unicornPlugin] = await Promise.all([interopDefault(import('eslint-plugin-unicorn'))] as const);
-  const { files = defaultFiles, recommended = true, rules = {}, stylistic = true } = options;
+  const { files, recommended = true, rules = {}, stylistic = true } = options;
   const { enabled: stylisticEnabled } = StylisticConfig.from(stylistic);
 
   return [
@@ -20,7 +21,7 @@ export async function unicorn(options: unicorn.Options = {}) {
       },
     },
     {
-      files,
+      files: withDefaultFiles(files, defaultFiles),
       name: 'w5s/unicorn/rules',
       rules: {
         ...(recommended && unicornPlugin.configs['unopinionated'].rules),

package/src/config/yml.ts

@@ -28,7 +28,7 @@ export async function yml(options: yml.Options = {}) {
         ...(recommended
           ? ymlPlugin.configs['recommended'].reduce(
               (acc, config) => ({ ...acc, ...config.rules }),
-              // eslint-disable-next-line ts/consistent-type-assertions
+
               {} as RuleOptions,
             )
           : {}),

package/src/defineConfig.ts

@@ -56,13 +56,18 @@ export async function defineConfig(options: DefineConfigOptions = {}) {
   const stylisticOptions =
     typeof plugins.stylistic === 'boolean' ? { enabled: plugins.stylistic } : { enabled: true, ...plugins.stylistic };
   const withDefaultStylistic = <T>(_options: T) => ({ stylistic: stylisticOptions, ..._options });
-  const toOption = <T extends {}>(optionsOrBoolean: boolean | T | undefined) =>
+  const toOption = <T extends {}>(
+    optionsOrBoolean: boolean | T | undefined,
+    defaultEnabled = true,
+  ) =>
     withDefaultStylistic(
       (typeof optionsOrBoolean === 'boolean'
         ? { enabled: optionsOrBoolean }
-        : { enabled: true, ...optionsOrBoolean }) as T & { enabled: boolean },
+        : optionsOrBoolean === undefined
+          ? { enabled: defaultEnabled }
+          : { enabled: defaultEnabled, ...optionsOrBoolean }) as T & { enabled: boolean },
     );
-  const includeEnabled = <T extends { enabled?: boolean }, R extends Promise<readonly Config[]>>(factory: (config: T) => R, input: T) =>
+  const includeEnabled = <T extends { enabled?: boolean }, R extends Promise<ReadonlyArray<Config>>>(factory: (config: T) => R, input: T) =>
     input.enabled ? [factory(input)] : [];
 
   return ESLintConfig.concat(
@@ -76,7 +81,7 @@ export async function defineConfig(options: DefineConfigOptions = {}) {
     ...includeEnabled(stylistic, toOption(plugins.stylistic)),
     ...includeEnabled(imports, toOption(plugins.import)),
     ...includeEnabled(markdown, toOption(plugins.markdown)),
-    ...includeEnabled(next, toOption(plugins.next)),
+    ...includeEnabled(next, toOption(plugins.next, false)),
     ...includeEnabled(node, toOption(plugins.node)),
     ...includeEnabled(perfectionist, toOption(plugins.perfectionist)),
     ...includeEnabled(unicorn, toOption(plugins.unicorn)),

package/src/rules/esRules/bestPractices.ts

@@ -44,7 +44,7 @@ export const bestPractices = () => ({
 
   // enforces consistent newlines before or after dots
   // https://eslint.org/docs/rules/dot-location
-  'dot-location': ['error', 'property'],
+  // 'dot-location': ['error', 'property'],
 
   // encourages use of dot notation whenever possible
   // https://eslint.org/docs/rules/dot-notation
@@ -190,9 +190,9 @@ export const bestPractices = () => ({
 
   // disallow use of multiple spaces
   // https://eslint.org/docs/rules/no-multi-spaces
-  'no-multi-spaces': ['error', {
-    ignoreEOLComments: false,
-  }],
+  // 'no-multi-spaces': ['error', {
+  //   ignoreEOLComments: false,
+  // }],
 
   // disallow use of multiline strings
   // https://eslint.org/docs/rules/no-multi-str

package/src/rules/esRules/errors.ts

@@ -69,13 +69,13 @@ export const errors = () => ({
 
   // disallow unnecessary parentheses
   // https://eslint.org/docs/rules/no-extra-parens
-  'no-extra-parens': ['off', 'all', {
-    conditionalAssign: true,
-    enforceForArrowConditionals: false,
-    ignoreJSX: 'all', // delegate to eslint-plugin-react
-    nestedBinaryExpressions: false,
-    returnAssign: false,
-  }],
+  // 'no-extra-parens': ['off', 'all', {
+  //   conditionalAssign: true,
+  //   enforceForArrowConditionals: false,
+  //   ignoreJSX: 'all', // delegate to eslint-plugin-react
+  //   nestedBinaryExpressions: false,
+  //   returnAssign: false,
+  // }],
 
   // disallow unnecessary semicolons
   'no-extra-semi': 'error',

package/src/rules/esRules/es6.ts

@@ -4,24 +4,24 @@ export const es6 = () => ({
 // enforces no braces where they can be omitted
   // https://eslint.org/docs/rules/arrow-body-style
   // TODO: enable requireReturnForObjectLiteral?
-  'arrow-body-style': ['error', 'as-needed', {
-    requireReturnForObjectLiteral: false,
-  }],
+  // 'arrow-body-style': ['error', 'as-needed', {
+  //   requireReturnForObjectLiteral: false,
+  // }],
 
   // require parens in arrow function arguments
   // https://eslint.org/docs/rules/arrow-parens
-  'arrow-parens': ['error', 'always'],
+  // 'arrow-parens': ['error', 'always'],
 
   // require space before/after arrow function's arrow
   // https://eslint.org/docs/rules/arrow-spacing
-  'arrow-spacing': ['error', { after: true, before: true }],
+  // 'arrow-spacing': ['error', { after: true, before: true }],
 
   // verify super() callings in constructors
   'constructor-super': 'error',
 
   // enforce the spacing around the * in generator functions
   // https://eslint.org/docs/rules/generator-star-spacing
-  'generator-star-spacing': ['error', { after: true, before: false }],
+  // 'generator-star-spacing': ['error', { after: true, before: false }],
 
   // disallow modifying variables of class declarations
   // https://eslint.org/docs/rules/no-class-assign
@@ -90,16 +90,16 @@ export const es6 = () => ({
 
   // require method and property shorthand syntax for object literals
   // https://eslint.org/docs/rules/object-shorthand
-  'object-shorthand': ['error', 'always', {
-    avoidQuotes: true,
-    ignoreConstructors: false,
-  }],
+  // 'object-shorthand': ['error', 'always', {
+  //   avoidQuotes: true,
+  //   ignoreConstructors: false,
+  // }],
 
   // suggest using arrow functions as callbacks
-  'prefer-arrow-callback': ['error', {
-    allowNamedFunctions: false,
-    allowUnboundThis: true,
-  }],
+  // 'prefer-arrow-callback': ['error', {
+  //   allowNamedFunctions: false,
+  //   allowUnboundThis: true,
+  // }],
 
   // suggest using of const declaration for variables that are never modified after declared
   'prefer-const': ['error', {
@@ -109,18 +109,18 @@ export const es6 = () => ({
 
   // Prefer destructuring from arrays and objects
   // https://eslint.org/docs/rules/prefer-destructuring
-  'prefer-destructuring': ['error', {
-    AssignmentExpression: {
-      array: true,
-      object: false,
-    },
-    VariableDeclarator: {
-      array: false,
-      object: true,
-    },
-  }, {
-    enforceForRenamedProperties: false,
-  }],
+  // 'prefer-destructuring': ['error', {
+  //   AssignmentExpression: {
+  //     array: true,
+  //     object: false,
+  //   },
+  //   VariableDeclarator: {
+  //     array: false,
+  //     object: true,
+  //   },
+  // }, {
+  //   enforceForRenamedProperties: false,
+  // }],
 
   // disallow parseInt() in favor of binary, octal, and hexadecimal literals
   // https://eslint.org/docs/rules/prefer-numeric-literals
@@ -148,16 +148,16 @@ export const es6 = () => ({
 
   // enforce spacing between object rest-spread
   // https://eslint.org/docs/rules/rest-spread-spacing
-  'rest-spread-spacing': ['error', 'never'],
+  // 'rest-spread-spacing': ['error', 'never'],
 
   // import sorting
   // https://eslint.org/docs/rules/sort-imports
-  'sort-imports': ['off', {
-    ignoreCase: false,
-    ignoreDeclarationSort: false,
-    ignoreMemberSort: false,
-    memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
-  }],
+  // 'sort-imports': ['off', {
+  //   ignoreCase: false,
+  //   ignoreDeclarationSort: false,
+  //   ignoreMemberSort: false,
+  //   memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
+  // }],
 
   // require a Symbol description
   // https://eslint.org/docs/rules/symbol-description
@@ -165,9 +165,9 @@ export const es6 = () => ({
 
   // enforce usage of spacing in template strings
   // https://eslint.org/docs/rules/template-curly-spacing
-  'template-curly-spacing': 'error',
+  // 'template-curly-spacing': 'error',
 
   // enforce spacing around the * in yield* expressions
   // https://eslint.org/docs/rules/yield-star-spacing
-  'yield-star-spacing': ['error', 'after'],
+  // 'yield-star-spacing': ['error', 'after'],
 } satisfies Linter.RulesRecord);

package/src/rules/esRules/overrides.ts

@@ -24,5 +24,5 @@ export const overrides = () => ({
   'no-use-before-define': ['error', 'nofunc'],
   // Allow statements, to be compatible with '@typescript-eslint/no-floating-promises' fix
   'no-void': ['error', { allowAsStatement: true }],
-  'unicode-bom': ['error', 'never'],
+  // 'unicode-bom': ['error', 'never'],
 } satisfies Linter.RulesRecord);

package/src/rules/esStylistic.ts

@@ -0,0 +1,98 @@
+import type { Linter } from 'eslint';
+
+// Extracted from airbnb base but not used at the moment
+export const esStylistic = () => ({
+  // enforces no braces where they can be omitted
+  // https://eslint.org/docs/rules/arrow-body-style
+  // TODO: enable requireReturnForObjectLiteral?
+  'arrow-body-style': ['error', 'as-needed', {
+    requireReturnForObjectLiteral: false,
+  }],
+
+  // require parens in arrow function arguments
+  // https://eslint.org/docs/rules/arrow-parens
+  'arrow-parens': ['error', 'always'],
+
+  // require space before/after arrow function's arrow
+  // https://eslint.org/docs/rules/arrow-spacing
+  'arrow-spacing': ['error', { after: true, before: true }],
+
+  // enforces consistent newlines before or after dots
+  // https://eslint.org/docs/rules/dot-location
+  'dot-location': ['error', 'property'],
+
+  // enforce the spacing around the * in generator functions
+  // https://eslint.org/docs/rules/generator-star-spacing
+  'generator-star-spacing': ['error', { after: true, before: false }],
+
+  // disallow unnecessary parentheses (stylistic)
+  // https://eslint.org/docs/rules/no-extra-parens
+  'no-extra-parens': ['off', 'all', {
+    conditionalAssign: true,
+    enforceForArrowConditionals: false,
+    ignoreJSX: 'all', // delegate to eslint-plugin-react
+    nestedBinaryExpressions: false,
+    returnAssign: false,
+  }],
+
+  // disallow use of multiple spaces
+  // https://eslint.org/docs/rules/no-multi-spaces
+  'no-multi-spaces': ['error', {
+    ignoreEOLComments: false,
+  }],
+
+  // require method and property shorthand syntax for object literals
+  // https://eslint.org/docs/rules/object-shorthand
+  'object-shorthand': ['error', 'always', {
+    avoidQuotes: true,
+    ignoreConstructors: false,
+  }],
+
+  // suggest using arrow functions as callbacks
+  'prefer-arrow-callback': ['error', {
+    allowNamedFunctions: false,
+    allowUnboundThis: true,
+  }],
+
+  // Prefer destructuring from arrays and objects
+  // https://eslint.org/docs/rules/prefer-destructuring
+  'prefer-destructuring': ['error', {
+    AssignmentExpression: {
+      array: true,
+      object: false,
+    },
+    VariableDeclarator: {
+      array: false,
+      object: true,
+    },
+  }, {
+    enforceForRenamedProperties: false,
+  }],
+
+  // enforce spacing between object rest-spread
+  // https://eslint.org/docs/rules/rest-spread-spacing
+  'rest-spread-spacing': ['error', 'never'],
+
+  // import sorting
+  // https://eslint.org/docs/rules/sort-imports
+  'sort-imports': ['off', {
+    ignoreCase: false,
+    ignoreDeclarationSort: false,
+    ignoreMemberSort: false,
+    memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
+  }],
+
+  // enforce usage of spacing in template strings
+  // https://eslint.org/docs/rules/template-curly-spacing
+  'template-curly-spacing': 'error',
+
+  // Unicode BOM handling
+  // https://eslint.org/docs/rules/unicode-bom
+  'unicode-bom': ['error', 'never'],
+
+  // enforce spacing around the * in yield* expressions
+  // https://eslint.org/docs/rules/yield-star-spacing
+  'yield-star-spacing': ['error', 'after'],
+} satisfies Linter.RulesRecord);
+
+export default esStylistic;

package/src/rules/tsRules.ts

@@ -7,16 +7,6 @@ export const tsRules = () => {
 
   return ESLintConfig.renameRules(
     {
-      // '@typescript-eslint/comma-dangle': [
-      //   baseRules['comma-dangle'][0],
-      //   {
-      //     ...baseRules['comma-dangle'][1],
-      //     enums: baseRules['comma-dangle'][1].arrays,
-      //     generics: baseRules['comma-dangle'][1].arrays,
-      //     tuples: baseRules['comma-dangle'][1].arrays,
-      //   },
-      // ],
-      '@typescript-eslint/adjacent-overload-signatures': 'error',
       '@typescript-eslint/ban-ts-comment': [
         'warn',
         {
@@ -27,65 +17,17 @@ export const tsRules = () => {
           'ts-nocheck': true,
         },
       ],
-      // '@typescript-eslint/brace-style': baseRules['brace-style'],
-      // '@typescript-eslint/comma-dangle': [
-      //   baseRules['comma-dangle'][0],
-      //   {
-      //     ...baseRules['comma-dangle'][1],
-      //     enums: baseRules['comma-dangle'][1].arrays,
-      //     generics: baseRules['comma-dangle'][1].arrays,
-      //     tuples: baseRules['comma-dangle'][1].arrays,
-      //   },
-      // ],
-      // '@typescript-eslint/comma-spacing': baseRules['comma-spacing'],
-      '@typescript-eslint/consistent-type-assertions': [
-        'error',
-        { assertionStyle: 'as', objectLiteralTypeAssertions: 'never' },
-      ],
       '@typescript-eslint/default-param-last': baseRules['default-param-last'],
-      // '@typescript-eslint/dot-notation': baseRules['dot-notation'], // TODO: Stylistic typechecked
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
-      // '@typescript-eslint/func-call-spacing': baseRules['func-call-spacing'],
-      // '@typescript-eslint/indent': baseRules.indent,
-      // '@typescript-eslint/keyword-spacing': baseRules['keyword-spacing'],
-      // '@typescript-eslint/lines-between-class-members': baseRules['lines-between-class-members'],
-      // '@typescript-eslint/member-delimiter-style': 'error', // TODO: @stylistic/member-delimiter-style
-      '@typescript-eslint/naming-convention': [
-        'error',
-        // {
-        //   format: ['PascalCase', 'camelCase'],
-        //   leadingUnderscore: 'allow',
-        //   selector: 'default',
-        //   trailingUnderscore: 'allow',
-        // },
-        {
-          format: ['PascalCase', 'camelCase', 'UPPER_CASE'],
-          leadingUnderscore: 'allow',
-          selector: 'variable',
-          trailingUnderscore: 'allow',
-        },
-        // {
-        //   format: ['PascalCase', 'camelCase', 'UPPER_CASE'],
-        //   leadingUnderscore: 'allowSingleOrDouble',
-        //   selector: 'memberLike',
-        //   trailingUnderscore: 'allowDouble',
-        // },
-        {
-          format: ['PascalCase'],
-          selector: 'typeLike',
-        },
-      ],
+      '@typescript-eslint/no-dupe-class-members': baseRules['no-dupe-class-members'],
       // '@typescript-eslint/no-array-constructor': baseRules['no-array-constructor'],
       // '@typescript-eslint/no-base-to-string': 'error', // TODO: require type check
-      '@typescript-eslint/no-dupe-class-members': baseRules['no-dupe-class-members'],
       '@typescript-eslint/no-empty-function': baseRules['no-empty-function'],
       '@typescript-eslint/no-empty-interface': ['error', { allowSingleExtends: true }],
       '@typescript-eslint/no-empty-object-type': 'off',
       '@typescript-eslint/no-explicit-any': 'off', // if any is explicit then it's wanted
-      '@typescript-eslint/no-extra-parens': baseRules['no-extra-parens'],
       // '@typescript-eslint/no-extra-semi': baseRules['no-extra-semi'], // TODO: @stylistic/no-extra-semi
-      '@typescript-eslint/no-inferrable-types': 'error',
       '@typescript-eslint/no-loop-func': baseRules['no-loop-func'],
       '@typescript-eslint/no-loss-of-precision': baseRules['no-loss-of-precision'],
       '@typescript-eslint/no-magic-numbers': baseRules['no-magic-numbers'],
@@ -102,7 +44,6 @@ export const tsRules = () => {
       '@typescript-eslint/no-unused-vars': baseRules['no-unused-vars'],
       '@typescript-eslint/no-use-before-define': baseRules['no-use-before-define'],
       '@typescript-eslint/no-useless-constructor': baseRules['no-useless-constructor'],
-      '@typescript-eslint/no-var-requires': 'error',
       '@typescript-eslint/no-wrapper-object-types': 'error',
       // '@typescript-eslint/object-curly-spacing': baseRules['object-curly-spacing'],
       // '@typescript-eslint/only-throw-error': baseRules['no-throw-literal'], //TODO: Recommended type check
@@ -111,8 +52,6 @@ export const tsRules = () => {
       // '@typescript-eslint/quotes': baseRules.quotes,
       '@typescript-eslint/require-await': baseRules['require-await'],
       // '@typescript-eslint/return-await': baseRules['no-return-await'], // TODO: strict type check
-      // '@typescript-eslint/semi': baseRules.semi,
-      // '@typescript-eslint/space-before-function-paren': baseRules['space-before-function-paren'],
       // '@typescript-eslint/space-infix-ops': baseRules['space-infix-ops'],
       // '@typescript-eslint/strict-boolean-expressions': [
       //   'error',
@@ -124,7 +63,6 @@ export const tsRules = () => {
       // ], //TODO: require typing
       // '@typescript-eslint/switch-exhaustiveness-check': 'error',//TODO: require type check
       '@typescript-eslint/triple-slash-reference': 'error',
-      // '@typescript-eslint/type-annotation-spacing': 'error',// TODO: @stylistic/type-annotation-spacing
     },
     {
       '@typescript-eslint': 'ts',