@petbee/eslint-config 2.0.12 → 2.0.13

package/index.js

@@ -3,6 +3,8 @@ module.exports = {
   parserOptions: {
     project: 'tsconfig.json',
     sourceType: 'module',
+    // ensure tsconfigRootDir is the project root for v8:
+    tsconfigRootDir: process.cwd(),
   },
   plugins: ['@typescript-eslint/eslint-plugin'],
   extends: [
@@ -14,8 +16,9 @@ module.exports = {
     './rules/variables.js',
     './rules/best-practices.js',
     './rules/imports.js',
-    './rules/typescript.js',
     './rules/tests.js',
+    './rules/typescript.js',
+    './rules/nestjs.js',
   ],
   root: true,
   env: {

package/index.mjs

@@ -1,6 +1,9 @@
 import jsLint from '@eslint/js'
 import tsLint from 'typescript-eslint'
 
+// Utils
+import { hasPackage, getFlat } from './lib/utils.js'
+
 // Importing all the rules from the rules directory
 import prettierConfig from './rules/prettier.js'
 import errorsConfig from './rules/errors.js'
@@ -13,19 +16,25 @@ import typescriptConfig from './rules/typescript.js'
 import testsConfig from './rules/tests.js'
 import nestjsConfig from './rules/nestjs.js'
 
+const hasTypescript = hasPackage('typescript')
+const hasNestJs = hasPackage('@nestjs/core')
+
+const baseRecommended = [...tsLint.configs.recommended]
+const recommendedTypeChecked = [
+  ...tsLint.configs.recommendedTypeChecked,
+  ...tsLint.configs.strictTypeChecked,
+  ...tsLint.configs.stylisticTypeChecked,
+]
+
 const ignoreConfig = {
   ignores: ['coverage', 'dist', '**/dist/', 'node_modules', '**/node_modules'],
 }
 
-// Helper to get the flat config if available, otherwise fallback
-const getFlat = (config) => {
-  return config && config.flat ? (Array.isArray(config.flat) ? config.flat : [config.flat]) : []
-}
-
-export default [
+export default tsLint.config(
   ignoreConfig,
-  jsLint.configs.recommended,
-  ...tsLint.configs.recommended,
+  ...(hasTypescript ? [] : [jsLint.configs.recommended]),
+  ...getFlat(typescriptConfig),
+  ...(hasTypescript ? (hasNestJs ? recommendedTypeChecked : baseRecommended) : []),
   ...getFlat(prettierConfig),
   ...getFlat(errorsConfig),
   ...getFlat(nodeConfig),
@@ -33,7 +42,6 @@ export default [
   ...getFlat(variablesConfig),
   ...getFlat(bestPracticesConfig),
   ...getFlat(importsConfig),
-  ...getFlat(typescriptConfig),
   ...getFlat(testsConfig),
-  ...getFlat(nestjsConfig),
-]
+  ...getFlat(nestjsConfig)
+)

package/lib/utils.js

@@ -9,3 +9,6 @@ exports.hasPackage = (pkg) => {
     return false
   }
 }
+exports.getFlat = (config) => {
+  return config && config.flat ? (Array.isArray(config.flat) ? config.flat : [config.flat]) : []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@petbee/eslint-config",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "Petbee's eslint config",
   "keywords": [
     "eslint",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a169e9be79636fe7e156170bce458162ac413405"
+  "gitHead": "7bd18dff6b637dc709f25a85e449dda98a4f91a9"
 }

package/rules/nestjs.js

@@ -1,13 +1,57 @@
-const { hasPackage } = require('../lib/utils')
+const { hasPackage, getFlat } = require('../lib/utils')
 const nestjsLint = require('@darraghor/eslint-plugin-nestjs-typed')
+const tsConfig = require('./typescript.js') // <-- our patched TS config
 
 const hasNestJs = hasPackage('@nestjs/core')
 
+// Grab TS-ESLint flat override
+const tsFlat = getFlat(tsConfig)
+
+const nestjsRules = {
+  '@typescript-eslint/interface-name-prefix': 'off',
+  '@typescript-eslint/explicit-function-return-type': 'off',
+  '@typescript-eslint/explicit-module-boundary-types': 'off',
+  '@typescript-eslint/no-explicit-any': 'off',
+  '@typescript-eslint/no-extraneous-class': [
+    'error',
+    {
+      allowWithDecorator: true,
+      allowStaticOnly: true,
+      allowEmpty: true,
+      allowConstructorOnly: false,
+    },
+  ],
+  'no-redeclare': 'off',
+}
+
+// If NestJS is present, take its flatRecommended array and
+// graft in parserOptions from tsFlat[0]:
+const nestFlat = hasNestJs
+  ? [
+      ...nestjsLint.default.configs.flatRecommended.map((cfg) => ({
+        ...cfg,
+        languageOptions: {
+          ...tsFlat[0].languageOptions,
+          ...cfg.languageOptions,
+          // merge parserOptions so `project` stays intact
+          parserOptions: {
+            ...tsFlat[0].languageOptions.parserOptions,
+            ...cfg.languageOptions?.parserOptions,
+          },
+        },
+      })),
+      {
+        rules: nestjsRules,
+      },
+    ]
+  : []
+
 module.exports = hasNestJs
   ? {
+      extends: ['plugin:@darraghor/nestjs-typed/recommended'],
       plugins: [nestjsLint.classicPlugin],
+      rules: nestjsRules,
     }
   : {}
 
-// Flat config for ESLint v9 (no extends, plugins as object)
-module.exports.flat = hasNestJs ? nestjsLint.default.configs.flatRecommended : []
+module.exports.flat = nestFlat

package/rules/typescript.js

@@ -1,11 +1,15 @@
 const { hasPackage } = require('../lib/utils')
 
 const hasTypescript = hasPackage('typescript')
+const hasNestJs = hasPackage('@nestjs/core')
 
-const tsConfig = [
+const tsConfigOptions = [
   {
     files: ['*.ts', '*.tsx'],
-    extends: ['plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended'],
+    extends: [
+      'plugin:@typescript-eslint/eslint-recommended',
+      hasNestJs ? 'plugin:@typescript-eslint/recommended' : 'plugin:@typescript-eslint/recommended-type-checked',
+    ],
     plugins: ['@typescript-eslint'],
     parser: '@typescript-eslint/parser',
     parserOptions: {
@@ -19,6 +23,8 @@ const tsConfig = [
         // look in dirs like packages/package/*
         '*/*/tsconfig{.eslint.json,.json}',
       ],
+      projectService: true,
+      tsconfigRootDir: process.cwd(),
       projectFolderIgnoreList: [/node_modules/i],
       // We need this configuration to avoid performance issues in monorepos
       // https://github.com/typescript-eslint/typescript-eslint/issues/1192#issuecomment-862414778
@@ -28,9 +34,6 @@ const tsConfig = [
       //! extensions of native eslint rules
       //! when modifying a rule here, make sure to modify the native one and vice-versa
 
-      // Don't require a weird naming convention for interfaces
-      '@typescript-eslint/interface-name-prefix': 'off',
-
       // Disallow declaration of variables already declared in the outer scope
       // https://eslint.org/docs/rules/no-shadow
       'no-shadow': 'off',
@@ -277,29 +280,31 @@ const tsConfig = [
   },
 ]
 
-module.exports = hasTypescript
-  ? {
-      overrides: tsConfig,
-    }
-  : {}
-
 // Flat config for ESLint v9 (no extends, plugins as object)
-module.exports.flat = hasTypescript
+const flatConfig = hasTypescript
   ? [
       {
-        files: tsConfig[0].files,
+        files: tsConfigOptions[0].files,
         languageOptions: {
           parser: require('@typescript-eslint/parser'),
-          parserOptions: tsConfig[0].parserOptions,
+          parserOptions: {
+            ...tsConfigOptions[0].parserOptions,
+            tsconfigRootDir: process.cwd(),
+          },
         },
         plugins: {
           '@typescript-eslint': require('@typescript-eslint/eslint-plugin'),
         },
-        rules: tsConfig[0].rules,
+        rules: tsConfigOptions[0].rules,
       },
       {
-        files: tsConfig[1].files,
-        rules: tsConfig[1].rules,
+        files: tsConfigOptions[1].files,
+        rules: tsConfigOptions[1].rules,
       },
     ]
   : []
+
+const config = hasTypescript ? { overrides: tsConfigOptions } : {}
+
+module.exports = config
+module.exports.flat = flatConfig