@o3r/eslint-plugin 10.2.0-prerelease.5 → 10.2.0-prerelease.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/eslint-plugin",
-  "version": "10.2.0-prerelease.5",
+  "version": "10.2.0-prerelease.7",
   "publishConfig": {
     "access": "public"
   },
@@ -64,8 +64,8 @@
     "@compodoc/compodoc": "^1.1.19",
     "@nx/eslint-plugin": "~18.0.2",
     "@nx/jest": "~18.0.2",
-    "@o3r/build-helpers": "^10.2.0-prerelease.5",
-    "@o3r/test-helpers": "^10.2.0-prerelease.5",
+    "@o3r/build-helpers": "^10.2.0-prerelease.7",
+    "@o3r/test-helpers": "^10.2.0-prerelease.7",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",

package/schematics/ng-add/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAkD;AAGlD;;GAEG;AACH,SAAgB,KAAK;IACnB,kBAAkB;IAClB,OAAO,IAAA,iBAAI,GAAE,CAAC;AAChB,CAAC;AAHD,sBAGC"}

package/schematics/ng-add/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}

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

@@ -10,6 +10,8 @@ interface Options {
      * 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;
+    /** 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>;
 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)({
@@ -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);
                                 });
                             });
                         }