@petbee/eslint-config 3.0.3 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@petbee/eslint-config",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Petbee's eslint config",
   "keywords": [
     "eslint",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "46ff4afe672b542fcbd6d2f0b6481f52f2379b24"
+  "gitHead": "13a8a59332c6aa1b447f5d830041e7ed00d3e7a2"
 }

package/rules/nestjs.js

@@ -1,12 +1,9 @@
-const { hasPackage, getFlat } = require('../lib/utils')
+const { hasPackage } = require('../lib/utils')
 const nestjsLint = require('@darraghor/eslint-plugin-nestjs-typed')
-const tsConfig = require('./typescript.js') // <-- our patched TS config
+const { tsParserOptions } = require('./shared-config.js')
 
 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',
@@ -25,19 +22,19 @@ const nestjsRules = {
 }
 
 // If NestJS is present, take its flatRecommended array and
-// graft in parserOptions from tsFlat[0]:
+// graft in parserOptions from shared config:
 const nestFlat = hasNestJs
   ? [
       ...nestjsLint.default.configs.flatRecommended.map((cfg) => ({
         ...cfg,
         languageOptions: {
-          ...tsFlat[0].languageOptions,
-          ...cfg.languageOptions,
-          // merge parserOptions so `project` stays intact
+          parser: require('@typescript-eslint/parser'),
           parserOptions: {
-            ...tsFlat[0].languageOptions.parserOptions,
+            ...tsParserOptions,
+            // merge with any NestJS-specific parserOptions
             ...cfg.languageOptions?.parserOptions,
           },
+          ...cfg.languageOptions,
         },
       })),
       {

package/rules/shared-config.js

@@ -0,0 +1,36 @@
+// Shared configuration to avoid circular dependencies
+const { hasPackage } = require('../lib/utils')
+
+const hasTypescript = hasPackage('typescript')
+
+// Common TypeScript parser configuration
+const tsParserOptions = {
+  ecmaVersion: 2022,
+  sourceType: 'module',
+  projectService: true,
+  tsconfigRootDir: process.cwd(),
+  projectFolderIgnoreList: [/node_modules/i],
+  allowAutomaticSingleRunInference: true,
+}
+
+// Common TypeScript rules
+const tsCommonRules = {
+  'no-useless-catch': 'warn',
+  'no-magic-numbers': ['warn', { ignore: [0, 1], ignoreArrayIndexes: true }],
+  'max-classes-per-file': ['warn', 1],
+  'prefer-arrow-callback': ['warn', { allowNamedFunctions: false, allowUnboundThis: true }],
+  'no-console': ['warn', { allow: ['warn', 'error', 'info'] }],
+  'import/no-relative-parent-imports': 'warn',
+  'no-restricted-imports': [
+    'error',
+    {
+      patterns: ['../../*'],
+    },
+  ],
+}
+
+module.exports = {
+  hasTypescript,
+  tsParserOptions,
+  tsCommonRules,
+}

package/rules/typescript.js

@@ -1,5 +1,6 @@
 const { hasPackage } = require('../lib/utils')
-const hasTypescript = hasPackage('typescript')
+const { hasTypescript, tsParserOptions, tsCommonRules } = require('./shared-config.js')
+
 const hasNestJs = hasPackage('@nestjs/core')
 const hasReact = hasPackage('react')
 const hasNext = hasPackage('next') || hasPackage('nextjs')
@@ -7,7 +8,9 @@ const hasNext = hasPackage('next') || hasPackage('nextjs')
 // Load framework-specific rules
 const reactRules = hasReact ? require('./react.js').rules : {}
 const nextjsRules = hasNext ? require('./nextjs.js').rules : {}
-const nestjsRules = hasNestJs ? require('./nestjs.js').rules : {}
+// Note: Don't require nestjs.js here to avoid circular dependency.
+// NestJS handles its own flat config completely.
+const nestjsRules = {}
 
 const tsConfigOptions = [
   {
@@ -15,30 +18,9 @@ const tsConfigOptions = [
     extends: ['plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended'],
     plugins: ['@typescript-eslint'],
     parser: '@typescript-eslint/parser',
-    parserOptions: {
-      ecmaVersion: 2022,
-      sourceType: 'module',
-      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
-      allowAutomaticSingleRunInference: true,
-    },
+    parserOptions: tsParserOptions,
     rules: {
-      // General improvements
-      'no-useless-catch': 'warn',
-      'no-magic-numbers': ['warn', { ignore: [0, 1], ignoreArrayIndexes: true }],
-      'max-classes-per-file': ['warn', 1],
-      'prefer-arrow-callback': ['warn', { allowNamedFunctions: false, allowUnboundThis: true }],
-      'no-console': ['warn', { allow: ['warn', 'error', 'info'] }],
-      'import/no-relative-parent-imports': 'warn',
-      'no-restricted-imports': [
-        'error',
-        {
-          patterns: ['../../*'],
-        },
-      ],
+      ...tsCommonRules,
       ...reactRules,
       ...nextjsRules,
       ...nestjsRules,
@@ -62,7 +44,7 @@ const flatConfig = hasTypescript
         languageOptions: {
           parser: require('@typescript-eslint/parser'),
           parserOptions: {
-            ...tsConfigOptions[0].parserOptions,
+            ...tsParserOptions,
             tsconfigRootDir: process.cwd(),
           },
         },