eslint-plugin-sonarjs 0.18.0 → 0.19.0

package/lib/rules/no-identical-conditions.js

@@ -19,20 +19,21 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 // https://sonarsource.github.io/rspec/#/rspec/S1862
-const nodes_1 = require("../utils/nodes");
 const equivalence_1 = require("../utils/equivalence");
 const locations_1 = require("../utils/locations");
 const docs_url_1 = require("../utils/docs-url");
-const message = 'This branch duplicates the one on line {{line}}';
+const duplicatedConditionMessage = 'This condition is covered by the one on line {{line}}';
+const duplicatedCaseMessage = 'This case duplicates the one on line {{line}}';
 const rule = {
     meta: {
         messages: {
-            duplicatedBranch: message,
+            duplicatedCondition: duplicatedConditionMessage,
+            duplicatedCase: duplicatedCaseMessage,
             sonarRuntime: '{{sonarRuntimeData}}',
         },
         type: 'problem',
         docs: {
-            description: 'Related "if/else if" statements should not have the same condition',
+            description: 'Related "if-else-if" and "switch-case" statements should not have the same condition',
             recommended: 'error',
             url: (0, docs_url_1.default)(__filename),
         },
@@ -44,34 +45,84 @@ const rule = {
         ],
     },
     create(context) {
+        const sourceCode = context.getSourceCode();
         return {
             IfStatement(node) {
-                const ifStmt = node;
-                const condition = ifStmt.test;
-                let statement = ifStmt.alternate;
-                while (statement) {
-                    if ((0, nodes_1.isIfStatement)(statement)) {
-                        if ((0, equivalence_1.areEquivalent)(condition, statement.test, context.getSourceCode())) {
-                            const line = ifStmt.loc && ifStmt.loc.start.line;
-                            if (line && condition.loc) {
-                                (0, locations_1.report)(context, {
-                                    messageId: 'duplicatedBranch',
-                                    data: {
-                                        line,
-                                    },
-                                    node: statement.test,
-                                }, [(0, locations_1.issueLocation)(condition.loc, condition.loc, 'Original')], message);
-                            }
-                        }
-                        statement = statement.alternate;
-                    }
-                    else {
+                var _a;
+                const { test } = node;
+                const conditionsToCheck = test.type === 'LogicalExpression' && test.operator === '&&'
+                    ? [test, ...splitByAnd(test)]
+                    : [test];
+                let current = node;
+                let operandsToCheck = conditionsToCheck.map(c => splitByOr(c).map(splitByAnd));
+                while (((_a = current.parent) === null || _a === void 0 ? void 0 : _a.type) === 'IfStatement' && current.parent.alternate === current) {
+                    current = current.parent;
+                    const currentOrOperands = splitByOr(current.test).map(splitByAnd);
+                    operandsToCheck = operandsToCheck.map(orOperands => orOperands.filter(orOperand => !currentOrOperands.some(currentOrOperand => isSubset(currentOrOperand, orOperand, sourceCode))));
+                    if (operandsToCheck.some(orOperands => orOperands.length === 0)) {
+                        (0, locations_1.report)(context, {
+                            messageId: 'duplicatedCondition',
+                            data: { line: current.test.loc.start.line },
+                            node: test,
+                        }, [(0, locations_1.issueLocation)(current.test.loc, current.test.loc, 'Covering')], duplicatedConditionMessage);
                         break;
                     }
                 }
             },
+            SwitchStatement(node) {
+                const switchStmt = node;
+                const previousTests = [];
+                for (const switchCase of switchStmt.cases) {
+                    if (switchCase.test) {
+                        const { test } = switchCase;
+                        const duplicateTest = previousTests.find(previousTest => (0, equivalence_1.areEquivalent)(test, previousTest, sourceCode));
+                        if (duplicateTest) {
+                            (0, locations_1.report)(context, {
+                                messageId: 'duplicatedCase',
+                                data: {
+                                    line: duplicateTest.loc.start.line,
+                                },
+                                node: test,
+                            }, [(0, locations_1.issueLocation)(duplicateTest.loc, duplicateTest.loc, 'Original')], duplicatedCaseMessage);
+                        }
+                        else {
+                            previousTests.push(test);
+                        }
+                    }
+                }
+            },
         };
     },
 };
+const splitByOr = splitByLogicalOperator.bind(null, '||');
+const splitByAnd = splitByLogicalOperator.bind(null, '&&');
+function splitByLogicalOperator(operator, node) {
+    if (node.type === 'LogicalExpression' && node.operator === operator) {
+        return [
+            ...splitByLogicalOperator(operator, node.left),
+            ...splitByLogicalOperator(operator, node.right),
+        ];
+    }
+    return [node];
+}
+function isSubset(first, second, sourceCode) {
+    return first.every(fst => second.some(snd => isSubsetOf(fst, snd, sourceCode)));
+    function isSubsetOf(first, second, sourceCode) {
+        if (first.type !== second.type) {
+            return false;
+        }
+        if (first.type === 'LogicalExpression') {
+            const second1 = second;
+            if ((first.operator === '||' || first.operator === '&&') &&
+                first.operator === second1.operator) {
+                return ((isSubsetOf(first.left, second1.left, sourceCode) &&
+                    isSubsetOf(first.right, second1.right, sourceCode)) ||
+                    (isSubsetOf(first.left, second1.right, sourceCode) &&
+                        isSubsetOf(first.right, second1.left, sourceCode)));
+            }
+        }
+        return (0, equivalence_1.areEquivalent)(first, second, sourceCode);
+    }
+}
 module.exports = rule;
 //# sourceMappingURL=no-identical-conditions.js.map

package/lib/rules/no-identical-conditions.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-identical-conditions.js","sourceRoot":"","sources":["../../src/rules/no-identical-conditions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,oDAAoD;AAGpD,0CAA+C;AAC/C,sDAAqD;AACrD,kDAA2D;AAC3D,gDAAwC;AAExC,MAAM,OAAO,GAAG,iDAAiD,CAAC;AAElE,MAAM,IAAI,GAA0C;IAClD,IAAI,EAAE;QACJ,QAAQ,EAAE;YACR,gBAAgB,EAAE,OAAO;YACzB,YAAY,EAAE,sBAAsB;SACrC;QACD,IAAI,EAAE,SAAS;QACf,IAAI,EAAE;YACJ,WAAW,EAAE,oEAAoE;YACjF,WAAW,EAAE,OAAO;YACpB,GAAG,EAAE,IAAA,kBAAO,EAAC,UAAU,CAAC;SACzB;QACD,MAAM,EAAE;YACN;gBACE,qBAAqB;gBACrB,IAAI,EAAE,CAAC,eAAe,CAAC;aACxB;SACF;KACF;IACD,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,WAAW,CAAC,IAAmB;gBAC7B,MAAM,MAAM,GAAG,IAA4B,CAAC;gBAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC;gBAC9B,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;gBACjC,OAAO,SAAS,EAAE;oBAChB,IAAI,IAAA,qBAAa,EAAC,SAAS,CAAC,EAAE;wBAC5B,IAAI,IAAA,2BAAa,EAAC,SAAS,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC,EAAE;4BACrE,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;4BACjD,IAAI,IAAI,IAAI,SAAS,CAAC,GAAG,EAAE;gCACzB,IAAA,kBAAM,EACJ,OAAO,EACP;oCACE,SAAS,EAAE,kBAAkB;oCAC7B,IAAI,EAAE;wCACJ,IAAI;qCACL;oCACD,IAAI,EAAE,SAAS,CAAC,IAAI;iCACrB,EACD,CAAC,IAAA,yBAAa,EAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,EACzD,OAAO,CACR,CAAC;6BACH;yBACF;wBACD,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;qBACjC;yBAAM;wBACL,MAAM;qBACP;iBACF;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,iBAAS,IAAI,CAAC"}
+{"version":3,"file":"no-identical-conditions.js","sourceRoot":"","sources":["../../src/rules/no-identical-conditions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-sonarjs",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "SonarJS rules for ESLint",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -51,7 +51,7 @@
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-notice": "0.9.10",
-    "eslint-plugin-sonarjs": "0.17.0",
+    "eslint-plugin-sonarjs": "0.18.0",
     "jest": "28.1.3",
     "jest-sonar-reporter": "2.0.0",
     "lint-staged": "13.0.3",