@o3r/eslint-plugin 11.0.0-next.0 → 11.0.0-next.1

package/README.md

@@ -9,6 +9,9 @@ This package is an [Otter Framework Module](https://github.com/AmadeusITGroup/ot
 
 ## Description
 
+[![Stable Version](https://img.shields.io/npm/v/@o3r/eslint-plugin?style=for-the-badge)](https://www.npmjs.com/package/@o3r/eslint-plugin)
+[![Bundle Size](https://img.shields.io/bundlephobia/min/@o3r/eslint-plugin?color=green&style=for-the-badge)](https://www.npmjs.com/package/@o3r/eslint-plugin)
+
 The module provides in-house eslint plugins to use in your own eslint configuration.
 
 ## How to install
@@ -17,8 +20,9 @@ The module provides in-house eslint plugins to use in your own eslint configurat
 ng add @o3r/eslint-plugin
 ```
 
-> **Warning**: this module requires [@o3r/core](https://www.npmjs.com/package/@o3r/core) to be installed.
+> [!WARNING]
+> This module requires [@o3r/core](https://www.npmjs.com/package/@o3r/core) to be installed.
 
 ## Rules
 
-The list of rules is available in the [documentation](https://github.com/AmadeusITGroup/otter/tree/main/docs/linter/eslint-plugin/rules.md).
+The list of rules is available in the [documentation](https://github.com/AmadeusITGroup/otter/tree/main/docs/linter/eslint-plugin/rules).

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@o3r/eslint-plugin",
-  "version": "11.0.0-next.0",
+  "version": "11.0.0-next.1",
+  "publishConfig": {
+    "access": "public"
+  },
   "description": "The module provides in-house eslint plugins to use in your own eslint configuration.",
   "main": "./src/public_api.js",
   "keywords": [
@@ -17,14 +20,15 @@
     "build": "yarn nx build eslint-plugin",
     "postbuild": "patch-package-json-main",
     "prepare:publish": "prepare-publish ./dist",
-    "prepare:build:builders": "yarn cpy './collection.json' dist",
+    "prepare:build:builders": "yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy './collection.json' dist",
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
   },
   "dependencies": {
-    "@typescript-eslint/experimental-utils": "^5.3.0",
+    "@typescript-eslint/utils": "~7.8.0",
     "globby": "^11.1.0",
     "semver": "^7.5.2",
-    "tslib": "^2.5.3"
+    "tslib": "^2.6.2",
+    "type-fest": "^4.10.2"
   },
   "peerDependenciesMeta": {
     "@angular-eslint/template-parser": {
@@ -38,47 +42,50 @@
     }
   },
   "peerDependencies": {
-    "@angular-eslint/template-parser": "~17.1.0",
-    "@angular-eslint/utils": "~17.1.0",
-    "@angular/compiler": "~17.0.2",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@angular-eslint/template-parser": "~17.3.0",
+    "@angular-eslint/utils": "~17.3.0",
+    "@angular/compiler": "~17.3.0",
+    "@stylistic/eslint-plugin-ts": "^1.5.4",
+    "@typescript-eslint/eslint-plugin": "^7.0.1",
+    "@typescript-eslint/parser": "^7.0.1",
     "eslint": "^8.22.0",
     "jsonc-eslint-parser": "~2.4.0",
     "yaml-eslint-parser": "^1.2.2"
   },
   "devDependencies": {
-    "@angular-devkit/core": "~17.0.3",
-    "@angular-devkit/schematics": "~17.0.3",
-    "@angular-eslint/eslint-plugin": "~17.1.0",
-    "@angular-eslint/template-parser": "~17.1.0",
-    "@angular-eslint/utils": "~17.1.0",
-    "@angular/compiler": "~17.0.4",
-    "@babel/core": "~7.23.0",
-    "@babel/preset-typescript": "~7.23.0",
+    "@angular-devkit/core": "~17.3.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular-eslint/eslint-plugin": "~17.3.0",
+    "@angular-eslint/template-parser": "~17.3.0",
+    "@angular-eslint/utils": "~17.3.0",
+    "@angular/compiler": "~17.3.0",
+    "@babel/core": "~7.24.0",
+    "@babel/preset-typescript": "~7.24.0",
     "@compodoc/compodoc": "^1.1.19",
-    "@nx/eslint-plugin": "~17.1.1",
-    "@nx/jest": "~17.1.1",
-    "@o3r/build-helpers": "^11.0.0-next.0",
+    "@nx/eslint-plugin": "~18.3.0",
+    "@nx/jest": "~18.3.0",
+    "@o3r/build-helpers": "^11.0.0-next.1",
+    "@o3r/test-helpers": "^11.0.0-next.1",
+    "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/eslint-plugin": "6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "^8.42.0",
-    "eslint-plugin-jest": "~27.6.0",
-    "eslint-plugin-jsdoc": "~48.0.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-jest": "~27.9.0",
+    "eslint-plugin-jsdoc": "~48.2.1",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^50.0.0",
+    "eslint-plugin-unicorn": "^51.0.1",
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
     "jsonc-eslint-parser": "~2.4.0",
-    "nx": "~17.1.1",
+    "nx": "~18.3.0",
     "rimraf": "^5.0.1",
-    "ts-jest": "~29.1.1",
-    "type-fest": "^4.3.1",
-    "typescript": "~5.2.2",
+    "ts-jest": "~29.1.2",
+    "type-fest": "^4.10.2",
+    "typescript": "~5.4.2",
     "yaml-eslint-parser": "^1.2.2"
   },
   "schematics": "./collection.json",

package/schematics/ng-add/schema.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "ngAddSchematicsSchema",
+  "title": "Add Otter eslint-plugin ",
+  "description": "ngAdd Otter eslint-plugin ",
+  "properties": {
+    "projectName": {
+      "type": "string",
+      "description": "Project name",
+      "$default": {
+        "$source": "projectName"
+      }
+    }
+  },
+  "additionalProperties": true,
+  "required": [
+  ]
+}

package/src/rules/json/json-dependency-versions-harmonize/json-dependency-versions-harmonize.d.ts

@@ -1,15 +1,17 @@
 interface Options {
     /** List of package name to ignore when determining the dependencies versions */
-    ignoredPackages: string[];
+    ignoredPackages?: string[];
     /** List of dependencies to ignore */
-    ignoredDependencies: string[];
+    ignoredDependencies?: string[];
     /** List of dependency types to update */
-    dependencyTypes: string[];
+    dependencyTypes?: string[];
     /**
      * Enforce to align the version of the dependencies with the latest range.
      * If not set, the version will be aligned with the latest range if the latest range is not intersected with the current range.
      */
-    alignPeerDependencies: boolean;
+    alignPeerDependencies?: boolean;
+    /** Align the resolutions/overrides dependency rules with the latest determined range */
+    alignResolutions?: boolean;
 }
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"error" | "versionUpdate", [Options, ...any[]], any>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<"error" | "versionUpdate", [Options, ...any[]], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/json/json-dependency-versions-harmonize/json-dependency-versions-harmonize.js

@@ -9,6 +9,7 @@ const defaultOptions = [{
         ignoredDependencies: [],
         dependencyTypes: ['optionalDependencies', 'dependencies', 'devDependencies', 'peerDependencies', 'generatorDependencies'],
         alignPeerDependencies: false,
+        alignResolutions: true,
         ignoredPackages: []
     }];
 exports.default = (0, utils_1.createRule)({
@@ -18,7 +19,7 @@ exports.default = (0, utils_1.createRule)({
         type: 'problem',
         docs: {
             description: 'Ensure that the package dependency versions are aligned with the other package of the workspace.',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [
             {
@@ -49,6 +50,10 @@ exports.default = (0, utils_1.createRule)({
                         items: {
                             type: 'string'
                         }
+                    },
+                    alignResolutions: {
+                        type: 'boolean',
+                        description: 'Align the resolutions dependencies with the latest determined range.'
                     }
                 },
                 additionalProperties: false
@@ -62,30 +67,26 @@ exports.default = (0, utils_1.createRule)({
     },
     defaultOptions,
     create: (context, [options]) => {
+        const resolutionsFields = ['resolutions', 'overrides'];
         const parserServices = (0, utils_2.getJsoncParserServices)(context);
         const dirname = path.dirname(context.getFilename());
         const workspace = (0, version_harmonize_1.findWorkspacePackageJsons)(dirname);
         const bestRanges = workspace && (0, version_harmonize_1.getBestRanges)(options.dependencyTypes, workspace.packages.filter(({ content }) => !content.name || !options.ignoredPackages.includes(content.name)));
         const ignoredDependencies = options.ignoredDependencies.map((dep) => new RegExp(dep.replace(/[.+?^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*')));
+        const dependencyTypes = [...options.dependencyTypes, ...(options.alignResolutions ? resolutionsFields : [])];
         if (parserServices.isJSON) {
             return {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 'JSONExpressionStatement': (node) => {
                     if (node.expression.type === 'JSONObjectExpression') {
                         const deps = node.expression.properties
-                            .filter(({ key }) => options.dependencyTypes.includes(key.type === 'JSONLiteral' ? key.value.toString() : key.name));
+                            .filter(({ key }) => dependencyTypes.includes(key.type === 'JSONLiteral' ? key.value.toString() : key.name));
                         if (deps.length > 0 && bestRanges) {
                             deps
                                 .map((depGroup) => depGroup.value)
                                 .filter((depGroup) => depGroup.type === 'JSONObjectExpression')
                                 .forEach((depGroup) => {
-                                depGroup.properties.forEach((dep) => {
-                                    const name = dep.key.type === 'JSONLiteral' ? dep.key.value.toString() : dep.key.name;
-                                    if (ignoredDependencies.some((ignore) => ignore.test(name))) {
-                                        return;
-                                    }
-                                    const range = dep.value.type === 'JSONLiteral' ? dep.value.value : (dep.value.type === 'JSONIdentifier' ? dep.value.name : undefined);
-                                    const bestRange = (0, version_harmonize_1.getBestRange)(range, bestRanges[name]?.range);
+                                const report = (name, resolvedName, dep, range, bestRange) => {
                                     if (bestRange && bestRange !== range) {
                                         if (!options.alignPeerDependencies && depGroup.parent.type === 'JSONProperty' && range &&
                                             (depGroup.parent.key.type === 'JSONLiteral' ? depGroup.parent.key.value.toString() : depGroup.parent.key.name) === 'peerDependencies' &&
@@ -98,7 +99,7 @@ exports.default = (0, utils_1.createRule)({
                                             data: {
                                                 depName: name,
                                                 version: bestRange,
-                                                packageJsonFile: bestRanges[name].path
+                                                packageJsonFile: bestRanges[resolvedName].path
                                             },
                                             fix: (fixer) => fixer.replaceTextRange(dep.value.range, `"${bestRange}"`),
                                             suggest: [
@@ -112,6 +113,27 @@ exports.default = (0, utils_1.createRule)({
                                             ]
                                         });
                                     }
+                                };
+                                depGroup.properties.forEach((dependencyNode) => {
+                                    const isResolutionsField = options.alignResolutions && depGroup.parent.type === 'JSONProperty' &&
+                                        resolutionsFields.includes(depGroup.parent.key.type === 'JSONLiteral' ? depGroup.parent.key.value.toString() : depGroup.parent.key.name);
+                                    const getNodeDetails = (dep) => {
+                                        const name = dep.key.type === 'JSONLiteral' ? dep.key.value.toString() : dep.key.name;
+                                        const nameParts = name.split('/');
+                                        if (ignoredDependencies.some((ignore) => ignore.test(name))) {
+                                            return;
+                                        }
+                                        const range = dep.value.type === 'JSONLiteral' ? dep.value.value : (dep.value.type === 'JSONIdentifier' ? dep.value.name : undefined);
+                                        if (!range && dep.value.type === 'JSONObjectExpression') {
+                                            return dep.value.properties
+                                                .forEach((prop) => getNodeDetails(prop));
+                                        }
+                                        const resolutionSubNameIndex = isResolutionsField ? nameParts.findIndex((_, i) => !!bestRanges[nameParts.slice(nameParts.length - i).join('/')]) : -1;
+                                        const resolvedName = resolutionSubNameIndex > -1 ? nameParts.slice(nameParts.length - resolutionSubNameIndex).join('/') : name;
+                                        const bestRange = (0, version_harmonize_1.getBestRange)(range, bestRanges[resolvedName]?.range);
+                                        report(name, resolvedName, dep, range, bestRange);
+                                    };
+                                    getNodeDetails(dependencyNode);
                                 });
                             });
                         }
@@ -119,5 +141,6 @@ exports.default = (0, utils_1.createRule)({
                 }
             };
         }
+        return {};
     }
 });

package/src/rules/json/json-dependency-versions-harmonize/version-harmonize.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBestRanges = exports.getBestRange = exports.findWorkspacePackageJsons = void 0;
 const semver = require("semver");
+const fs = require("node:fs");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const globby_1 = require("globby");
@@ -21,7 +22,7 @@ const findWorkspacePackageJsons = (directory, rootDir) => {
     if (!content || !content.workspaces) {
         return (0, exports.findWorkspacePackageJsons)(parentFolder, rootDir);
     }
-    const packagePaths = (0, globby_1.sync)((Array.isArray(content.workspaces) ? content.workspaces : content.workspaces.packages || []).map((f) => node_path_1.posix.join(f, 'package.json')), { cwd: directory, onlyFiles: false, absolute: true });
+    const packagePaths = (0, globby_1.sync)((Array.isArray(content.workspaces) ? content.workspaces : content.workspaces.packages || []).map((f) => node_path_1.posix.join(f, 'package.json')), { cwd: directory, onlyFiles: false, absolute: true, fs });
     const isPackageWorkspace = packagePaths.some((workspacePath) => (0, node_path_1.normalize)(workspacePath) === rootDir);
     const getPackages = () => ([
         { content, path: packageJsonPath, isWorkspace: true },

package/src/rules/json/utils.d.ts

@@ -1,9 +1,9 @@
-import { ParserServices, TSESLint } from '@typescript-eslint/experimental-utils';
+import { type ParserServices, TSESLint } from '@typescript-eslint/utils';
 import type { AST } from 'jsonc-eslint-parser';
 /** Basic interface for the Parser Services object provided by jsonc-eslint-parser */
-interface JsoncParserServices extends ParserServices {
+type JsoncParserServices = ParserServices & {
     isJSON: boolean;
-}
+};
 /**
  * Determine if jsonc-eslint-parser is used
  * @param parserServices Parser services object

package/src/rules/template/no-inner-html/no-inner-html.d.ts

@@ -1,5 +1,5 @@
 /** Rule Name */
 export declare const name = "no-inner-html";
 type Messages = 'error' | 'fix';
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<Messages, [], import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleListener>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<Messages, [], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/template/no-inner-html/no-inner-html.js

@@ -13,7 +13,7 @@ exports.default = (0, utils_2.createRule)({
         hasSuggestions: true,
         docs: {
             description: 'Ensures that your template does not use innerHTML',
-            recommended: 'warn'
+            recommended: 'recommended'
         },
         schema: [],
         messages: {

package/src/rules/template/template-async-number-limitation/template-async-number-limitation.d.ts

@@ -3,5 +3,5 @@ interface Options {
 }
 /** Rule Name */
 export declare const name = "template-async-number-limitation";
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"tooManyAsyncOnTag", [Options, ...any[]], any>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<"tooManyAsyncOnTag", [Options, ...any[]], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/template/template-async-number-limitation/template-async-number-limitation.js

@@ -15,7 +15,7 @@ exports.default = (0, utils_2.createRule)({
         hasSuggestions: true,
         docs: {
             description: 'Ensures that your template does not use too many Async pipes that can slow down your application.',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [
             {

package/src/rules/template/utils.d.ts

@@ -1,4 +1,4 @@
-import { ParserServices, TSESLint } from '@typescript-eslint/experimental-utils';
+import { type ParserServices, TSESLint } from '@typescript-eslint/utils';
 /** Position in source code */
 interface SourceSpan {
     /** starting position */
@@ -13,12 +13,12 @@ interface SourceSpan {
     };
 }
 /** Basic interface for the Parser Services object provided by @angular-eslint/template-parser */
-interface TemplateParserServices extends ParserServices {
+type TemplateParserServices = ParserServices & {
     /** Set body visitor rule runner */
     convertElementSourceSpanToLoc: (listenerObj: any) => any;
     /** Determine the linter notification position based on the node */
     convertNodeSourceSpanToLoc: (sourceSpan: SourceSpan) => any;
-}
+};
 /**
  * Determine if @angular-eslint/template-parser is used
  * @param parserServices Parser services object

package/src/rules/typescript/matching-configuration-name/matching-configuration-name.d.ts

@@ -1,5 +1,2 @@
-import { TSESTree } from '@typescript-eslint/experimental-utils';
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"suggestion" | "error", never[], {
-    CallExpression: (node: TSESTree.CallExpression) => void;
-}>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<"suggestion" | "error", [], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/typescript/matching-configuration-name/matching-configuration-name.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
-const utils_1 = require("../../utils");
+const utils_1 = require("@typescript-eslint/utils");
+const utils_2 = require("../../utils");
 const nameDeterminingFunctionNames = ['computeItemIdentifier', 'computeConfigurationName'];
-exports.default = (0, utils_1.createRule)({
+exports.default = (0, utils_2.createRule)({
     name: 'matching-configuration-name',
     meta: {
         hasSuggestions: true,
@@ -12,7 +12,7 @@ exports.default = (0, utils_1.createRule)({
         docs: {
             // eslint-disable-next-line max-len
             description: 'Ensures that the configuration interface name matches the first parameter of `computeItemIdentifier` (or `computeConfigurationName`) used beside the configuration interface to expose its ID (as generated by the configuration module).',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [],
         messages: {
@@ -25,18 +25,18 @@ exports.default = (0, utils_1.createRule)({
         return {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             CallExpression: (node) => {
-                if (node.callee.type !== experimental_utils_1.TSESTree.AST_NODE_TYPES.Identifier
+                if (node.callee.type !== utils_1.TSESTree.AST_NODE_TYPES.Identifier
                     || !nameDeterminingFunctionNames.includes(node.callee.name)
                     || !node.arguments.length
-                    || node.arguments[0].type !== experimental_utils_1.TSESTree.AST_NODE_TYPES.Literal
+                    || node.arguments[0].type !== utils_1.TSESTree.AST_NODE_TYPES.Literal
                     || typeof node.arguments[0].value !== 'string') {
                     return;
                 }
                 const sourceCode = context.getSourceCode();
                 const interfaceNames = sourceCode.ast.body
-                    .filter((statement) => statement.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
-                    && statement.declaration?.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.TSInterfaceDeclaration
-                    && (statement.declaration.extends || []).some((heritageClause) => heritageClause.expression.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.Identifier
+                    .filter((statement) => statement.type === utils_1.TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
+                    && statement.declaration?.type === utils_1.TSESTree.AST_NODE_TYPES.TSInterfaceDeclaration
+                    && (statement.declaration.extends || []).some((heritageClause) => heritageClause.expression.type === utils_1.TSESTree.AST_NODE_TYPES.Identifier
                         && heritageClause.expression.name === 'Configuration'))
                     .map((statement) => statement.declaration.id.name);
                 const fnArgInterfaceName = node.arguments[0].value;

package/src/rules/typescript/no-folder-import-for-module/no-folder-import-for-module.d.ts

@@ -1,4 +1,2 @@
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"error" | "indexFile", never[], {
-    ImportDeclaration: (node: import("@typescript-eslint/types/dist/generated/ast-spec").ImportDeclaration) => void;
-}>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<"error" | "indexFile", [], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/typescript/no-folder-import-for-module/no-folder-import-for-module.js

@@ -10,7 +10,7 @@ exports.default = (0, utils_1.createRule)({
         type: 'problem',
         docs: {
             description: 'Ensures that imports of modules are pointing to the module file or an index.',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [],
         messages: {

package/src/rules/typescript/no-multiple-type-configuration-property/no-multiple-type-configuration-property.d.ts

@@ -1,5 +1,5 @@
 export interface NoMultipleTypeConfigurationPropertyOption {
     supportedInterfaceNames?: string[];
 }
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"suggestion" | "error", [Required<NoMultipleTypeConfigurationPropertyOption>, ...any[]], import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleListener>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<"suggestion" | "error", [Required<NoMultipleTypeConfigurationPropertyOption>, ...any[]], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/typescript/no-multiple-type-configuration-property/no-multiple-type-configuration-property.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
-const utils_1 = require("../../utils");
+const utils_1 = require("@typescript-eslint/utils");
+const utils_2 = require("../../utils");
 const separatorRegExp = /\s*[|&]\s*/;
-exports.default = (0, utils_1.createRule)({
+exports.default = (0, utils_2.createRule)({
     name: 'no-multiple-type-configuration-property',
     meta: {
         hasSuggestions: true,
         type: 'problem',
         docs: {
             description: 'Ensures that the configuration property does not accept multiple types.',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [
             {
@@ -21,7 +21,7 @@ exports.default = (0, utils_1.createRule)({
                         items: {
                             type: 'string'
                         },
-                        default: utils_1.defaultSupportedInterfaceNames
+                        default: utils_2.defaultSupportedInterfaceNames
                     }
                 }
             }
@@ -32,17 +32,17 @@ exports.default = (0, utils_1.createRule)({
         }
     },
     defaultOptions: [{
-            supportedInterfaceNames: utils_1.defaultSupportedInterfaceNames
+            supportedInterfaceNames: utils_2.defaultSupportedInterfaceNames
         }],
     create: (context, [options]) => {
         const supportedInterfaceNames = options.supportedInterfaceNames;
         const sourceCode = context.getSourceCode();
         const rule = (node) => {
             const interfaceDeclNode = node.parent?.parent?.parent?.parent;
-            if (!(0, utils_1.isExtendingConfiguration)(interfaceDeclNode, supportedInterfaceNames)) {
+            if (!(0, utils_2.isExtendingConfiguration)(interfaceDeclNode, supportedInterfaceNames)) {
                 return; // Not in a configuration interface
             }
-            if (node.types.every((type) => type.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.TSLiteralType && type.literal.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.Literal)
+            if (node.types.every((type) => type.type === utils_1.TSESTree.AST_NODE_TYPES.TSLiteralType && type.literal.type === utils_1.TSESTree.AST_NODE_TYPES.Literal)
                 && [...(new Set(node.types.map((literalType) => typeof literalType.literal.value)))].length === 1) {
                 return; // Only the same literal type
             }

package/src/rules/typescript/o3r-categories-tags/o3r-categories-tags.d.ts

@@ -3,5 +3,5 @@ export interface O3rCategoriesTagsRuleOption {
     globalConfigCategories?: string[];
 }
 type Messages = 'alreadyDefined' | 'undefinedCategory' | 'onlyOneCategoryAllowed' | 'notInConfigurationInterface' | 'suggestReplaceO3rCategory';
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<Messages, [O3rCategoriesTagsRuleOption, ...any[]], import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleListener>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<Messages, readonly [O3rCategoriesTagsRuleOption, ...any[]], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/typescript/o3r-categories-tags/o3r-categories-tags.js

@@ -9,7 +9,7 @@ exports.default = (0, utils_1.createRule)({
         type: 'problem',
         docs: {
             description: 'Ensures that @o3rCategories and @o3rCategory are used with correct value',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [
             {

package/src/rules/typescript/o3r-widget-tags/o3r-widget-tags.d.ts

@@ -1,8 +1,8 @@
-import { TSESLint } from '@typescript-eslint/experimental-utils';
+import { TSESLint } from '@typescript-eslint/utils';
 type O3rWidgetParamType = 'string' | 'number' | 'boolean' | 'string[]' | 'number[]' | 'boolean[]';
 export interface O3rWidgetTagsRuleOption {
     supportedInterfaceNames?: string[];
-    widgets: {
+    widgets?: {
         [widgetName: string]: {
             [paramName: string]: {
                 type: O3rWidgetParamType;
@@ -12,5 +12,5 @@ export interface O3rWidgetTagsRuleOption {
     };
 }
 type O3rWidgetRuleErrorId = 'notInConfigurationInterface' | 'notSupportedType' | 'notSupportedParamForType' | 'invalidParamValueType' | 'noParamWithoutWidget' | 'onlyOneWidgetAllowed' | 'duplicatedParam' | 'requiredParamMissing' | 'suggestParamMissing' | 'suggestRemoveDuplicatedO3rWidget' | 'suggestRemoveDuplicatedO3rWidgetParam' | 'suggestAddO3rWidgetTag' | 'suggestReplaceO3rWidgetType';
-declare const _default: TSESLint.RuleModule<O3rWidgetRuleErrorId, [Required<O3rWidgetTagsRuleOption>, ...any[]], TSESLint.RuleListener>;
+declare const _default: TSESLint.RuleModule<O3rWidgetRuleErrorId, [Readonly<O3rWidgetTagsRuleOption>, ...any[]], TSESLint.RuleListener>;
 export default _default;

package/src/rules/typescript/o3r-widget-tags/o3r-widget-tags.js

@@ -15,7 +15,7 @@ exports.default = (0, utils_1.createRule)({
         type: 'problem',
         docs: {
             description: 'Ensures that @o3rWidget and @o3rWidgetParam are used with correct value',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [
             {
@@ -30,6 +30,7 @@ exports.default = (0, utils_1.createRule)({
                         default: utils_1.defaultSupportedInterfaceNames
                     },
                     widgets: {
+                        type: 'object',
                         additionalProperties: {
                             type: 'object',
                             additionalProperties: false,

package/src/rules/utils.d.ts

@@ -1,6 +1,6 @@
-import { ESLintUtils, TSESLint, TSESTree } from '@typescript-eslint/experimental-utils';
+import { ESLintUtils, TSESLint, TSESTree } from '@typescript-eslint/utils';
 /** ESLint rule generator */
-export declare const createRule: <TOptions extends readonly unknown[], TMessageIds extends string, TRuleListener extends TSESLint.RuleListener = TSESLint.RuleListener>({ name, meta, ...rule }: Readonly<ESLintUtils.RuleWithMetaAndName<TOptions, TMessageIds, TRuleListener>>) => TSESLint.RuleModule<TMessageIds, TOptions, TRuleListener>;
+export declare const createRule: <Options extends readonly unknown[], MessageIds extends string>({ name, meta, ...rule }: Readonly<ESLintUtils.RuleWithMetaAndName<Options, MessageIds>>) => ESLintUtils.RuleModule<MessageIds, Options, ESLintUtils.RuleListener>;
 /** Default supported interface names */
 export declare const defaultSupportedInterfaceNames: string[];
 /**

package/src/rules/utils.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCommentString = exports.getNodeComment = exports.isExtendingConfiguration = exports.defaultSupportedInterfaceNames = exports.createRule = void 0;
-const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+const utils_1 = require("@typescript-eslint/utils");
 const path = require("node:path");
 /** Current package version (format: <major>.<minor>)*/
 const version = require(path.resolve(__dirname, '..', '..', 'package.json')).version.split('.').slice(0, 2).join('.');
 /** ESLint rule generator */
 // eslint-disable-next-line new-cap
-exports.createRule = experimental_utils_1.ESLintUtils.RuleCreator((name) => {
+exports.createRule = utils_1.ESLintUtils.RuleCreator((name) => {
     if (version === '0.0') {
         return 'file:' + path.resolve(__dirname, '..', '..', '..', '..', '..', 'docs', 'linter', 'eslint-plugin', 'rules', `${name}.md`);
     }
@@ -22,9 +22,9 @@ exports.defaultSupportedInterfaceNames = ['Configuration', 'NestedConfiguration'
  */
 const isExtendingConfiguration = (interfaceDeclNode, supportedInterfaceNames = []) => {
     const supportedInterfaceNamesSet = new Set(supportedInterfaceNames.length > 0 ? supportedInterfaceNames : exports.defaultSupportedInterfaceNames);
-    return interfaceDeclNode?.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.TSInterfaceDeclaration
-        && !!interfaceDeclNode.extends?.some((ext) => ext.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.TSInterfaceHeritage
-            && ext.expression.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.Identifier
+    return interfaceDeclNode?.type === utils_1.TSESTree.AST_NODE_TYPES.TSInterfaceDeclaration
+        && !!interfaceDeclNode.extends?.some((ext) => ext.type === utils_1.TSESTree.AST_NODE_TYPES.TSInterfaceHeritage
+            && ext.expression.type === utils_1.TSESTree.AST_NODE_TYPES.Identifier
             && supportedInterfaceNamesSet.has(ext.expression.name));
 };
 exports.isExtendingConfiguration = isExtendingConfiguration;
@@ -34,7 +34,7 @@ exports.isExtendingConfiguration = isExtendingConfiguration;
  * @param sourceCode
  */
 const getNodeComment = (node, sourceCode) => {
-    const [comment] = node.parent?.type === experimental_utils_1.TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
+    const [comment] = node.parent?.type === utils_1.TSESTree.AST_NODE_TYPES.ExportNamedDeclaration
         ? sourceCode.getCommentsBefore(node.parent)
         : sourceCode.getCommentsBefore(node);
     return comment;

package/src/rules/yaml/utils.d.ts

@@ -1,8 +1,8 @@
-import { ParserServices, TSESLint } from '@typescript-eslint/experimental-utils';
+import { type ParserServices, TSESLint } from '@typescript-eslint/utils';
 /** Basic interface for the Parser Services object provided by yaml-eslint-parser */
-interface YamlParserServices extends ParserServices {
+type YamlParserServices = ParserServices & {
     isYAML: boolean;
-}
+};
 /**
  * Determine if yaml-eslint-parser is used
  * @param parserServices Parser services object

package/src/rules/yaml/yarnrc-package-extensions-harmonize/yarnrc-package-extensions-harmonize.d.ts

@@ -8,5 +8,5 @@ interface Options {
     /** List of dependency types to validate in .yarnrc.yml */
     yarnrcDependencyTypes: string[];
 }
-declare const _default: import("@typescript-eslint/utils/dist/ts-eslint/Rule").RuleModule<"error" | "versionUpdate", [Options, ...any[]], any>;
+declare const _default: import("@typescript-eslint/utils/dist/ts-eslint").RuleModule<"error" | "versionUpdate", [Options, ...any[]], import("@typescript-eslint/utils/dist/ts-eslint").RuleListener>;
 export default _default;

package/src/rules/yaml/yarnrc-package-extensions-harmonize/yarnrc-package-extensions-harmonize.js

@@ -19,7 +19,7 @@ exports.default = (0, utils_1.createRule)({
         type: 'problem',
         docs: {
             description: 'Ensure that the package extension versions are aligned with range defined in packages.',
-            recommended: 'error'
+            recommended: 'strict'
         },
         schema: [
             {
@@ -118,5 +118,6 @@ exports.default = (0, utils_1.createRule)({
                 }
             };
         }
+        return {};
     }
 });

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.2.2"}
+{"version":"5.4.5"}