JS-837 Update ESLint to 9.33.0 (#5635)

Co-authored-by: Michal Zgliczynski <[email protected]>

Author: vdiez

package-lock.json

@@ -61,6 +61,7 @@
   },
   "type": "module",
   "devDependencies": {
+    "@eslint/core": "0.15.2",
     "@inquirer/prompts": "7.8.0",
     "@istanbuljs/esm-loader-hook": "0.3.0",
     "@types/babel__preset-env": "7.10.0",
@@ -116,7 +117,7 @@
     "@typescript/native-preview": "7.0.0-dev.20250807.1",
     "builtin-modules": "3.3.0",
     "bytes": "3.1.2",
-    "eslint": "9.31.0",
+    "eslint": "9.33.0",
     "eslint-plugin-import": "2.32.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-react": "7.37.5",

package.json

@@ -68,7 +68,7 @@ export function createOptions(filename: string) {
     filename,
     allowInlineConfig: true,
     getRule: (ruleId: string) => eslintMapping[getRuleId(ruleId)]?.ruleId,
-    patchDirectives: ({ disableDirectives }: { disableDirectives: Directive[] }) =>
+    patchDirectives: (disableDirectives: Directive[]) =>
       disableDirectives.forEach(directive => {
         if (!eslintMapping[getRuleId(directive.ruleId)]) {
           return;

packages/jsts/src/linter/pragmas.ts

@@ -15,6 +15,8 @@
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 import type { Rule } from 'eslint';
+
+import type { RulesMeta } from '@eslint/core';
 import type estree from 'estree';
 import { getFullyQualifiedName } from '../module.js';
 import {
@@ -67,7 +69,7 @@ type AwsCdkConsumerMap = { [key: FullyQualifiedName]: AwsCdkConsumer };
  */
 export function AwsCdkTemplate(
   mapOrFactory: AwsCdkConsumerMap | ((ctx: Rule.RuleContext) => AwsCdkConsumerMap),
-  meta: Rule.RuleMetaData = {},
+  meta: RulesMeta = {},
 ): Rule.RuleModule {
   return {
     meta,

packages/jsts/src/rules/helpers/aws/cdk.ts

@@ -20,6 +20,7 @@ import { AwsCdkTemplate, normalizeFQN } from './cdk.js';
 import { getResultOfExpression, Result } from '../result.js';
 import { flattenArgs, isStringLiteral, StringLiteral } from '../ast.js';
 import { getFullyQualifiedName } from '../module.js';
+import { RulesMeta } from '@eslint/core';
 
 export interface PolicyCheckerOptions {
   effect: {
@@ -99,7 +100,7 @@ const JSON_OPTIONS: PolicyCheckerOptions = {
   },
 };
 
-export function AwsIamPolicyTemplate(statementChecker: StatementChecker, meta: Rule.RuleMetaData) {
+export function AwsIamPolicyTemplate(statementChecker: StatementChecker, meta: RulesMeta) {
   return AwsCdkTemplate(
     {
       'aws-cdk-lib.aws-iam.PolicyStatement': {

packages/jsts/src/rules/helpers/aws/iam.ts

@@ -26,6 +26,7 @@ import {
   toSecondaryLocation,
 } from '../index.js';
 import { normalizeFQN } from './cdk.js';
+import { RulesMeta } from '@eslint/core';
 
 /**
  * A rule template for AWS S3 Buckets
@@ -41,7 +42,7 @@ import { normalizeFQN } from './cdk.js';
  */
 export function S3BucketTemplate(
   callback: (bucketConstructor: estree.NewExpression, context: Rule.RuleContext) => void,
-  meta: Rule.RuleMetaData = {},
+  meta: RulesMeta = {},
 ): Rule.RuleModule {
   return {
     meta,

packages/jsts/src/rules/helpers/aws/s3.ts

@@ -25,6 +25,7 @@ import {
   report,
   toSecondaryLocation,
 } from './index.js';
+import { RulesMeta } from '@eslint/core';
 
 /**
  * This modules provides utilities for writing rules about Express.js.
@@ -133,7 +134,7 @@ export namespace Express {
       middlewareCall: estree.CallExpression,
     ) => estree.Property[],
     message: string,
-    meta: Rule.RuleMetaData = {},
+    meta: RulesMeta = {},
   ): Rule.RuleModule {
     return {
       meta,

packages/jsts/src/rules/helpers/express.ts

@@ -15,6 +15,7 @@
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 import type { Rule } from 'eslint';
+import type { RulesMeta } from '@eslint/core';
 import type { JSONSchema4 } from '@typescript-eslint/utils/json-schema';
 import { ESLintConfiguration } from './configs.js';
 import merge from 'lodash.merge';
@@ -31,10 +32,7 @@ export type SonarMeta = {
   fields?: ESLintConfiguration;
 };
 
-export function generateMeta(
-  sonarMeta: SonarMeta,
-  ruleMeta?: Rule.RuleMetaData,
-): Rule.RuleMetaData {
+export function generateMeta(sonarMeta: SonarMeta, ruleMeta?: RulesMeta): RulesMeta {
   if (sonarMeta.meta.fixable && !ruleMeta?.fixable && !ruleMeta?.hasSuggestions) {
     throw new Error(
       `Mismatch between RSPEC metadata and implementation for fixable attribute in rule ${sonarMeta.meta.docs!.url}`,

packages/jsts/src/rules/helpers/generate-meta.ts

@@ -15,6 +15,7 @@
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 import type { Rule } from 'eslint';
+import type { RulesMeta } from '@eslint/core';
 import type estree from 'estree';
 import * as regexpp from '@eslint-community/regexpp';
 import type { RegExpVisitor } from '@eslint-community/regexpp/visitor';
@@ -52,7 +53,7 @@ type RegexReportDescriptor = RegexReportData & RegexReportMessage & RegexReportO
  */
 export function createRegExpRule(
   handlers: (context: RegexRuleContext) => RegExpVisitor.Handlers,
-  meta: Rule.RuleMetaData = {},
+  meta: RulesMeta = {},
 ): Rule.RuleModule {
   return {
     meta,

packages/jsts/src/rules/helpers/regex/rule-template.ts

@@ -1,8 +1,8 @@
 diff --git a/node_modules/eslint/lib/linter/linter.js b/node_modules/eslint/lib/linter/linter.js
-index db059b2..76b7a6b 100644
+index f46f5e3..aa203b9 100755
 --- a/node_modules/eslint/lib/linter/linter.js
 +++ b/node_modules/eslint/lib/linter/linter.js
-@@ -2074,7 +2074,7 @@ class Linter {
+@@ -1934,7 +1934,7 @@ class Linter {
  						loc,
  					} of inlineConfigResult.configs) {
  						Object.keys(inlineConfig.rules).forEach(ruleId => {
@@ -11,16 +11,17 @@ index db059b2..76b7a6b 100644
  							const ruleValue = inlineConfig.rules[ruleId];
 
  							if (!rule) {
-@@ -2233,11 +2233,18 @@ class Linter {
+@@ -2084,12 +2084,19 @@ class Linter {
  			options.allowInlineConfig && !options.warnInlineConfig
  				? getDirectiveCommentsForFlatConfig(
  						sourceCode,
 -						ruleId => config.getRuleDefinition(ruleId),
-+						ruleId => (providedOptions.getRule ?? config.getRuleDefinition)(ruleId),
++            ruleId => (providedOptions.getRule ?? config.getRuleDefinition)(ruleId),
  						config.language,
+ 						report,
  					)
- 				: { problems: [], disableDirectives: [] };
-     
+ 				: [];
+ 
 +    if (typeof providedOptions.patchInlineOptions === "function") {
 +      providedOptions.patchInlineOptions(mergedInlineConfig);
 +    }