eslint-plugin-crisp 1.7.17 → 1.7.19

package/README.md

@@ -94,7 +94,7 @@ Each item has emojis denoting:
 | [no-implicit-coercion](https://eslint.org/docs/latest/rules/no-implicit-coercion) | Disallows short notations for type conversion |  | 🟢 | 🟣 |
 | [no-magic-numbers](https://eslint.org/docs/latest/rules/no-magic-numbers) | Disallows magic numbers (except the ones in the context of array indexes and in default value assignments) | 🟠 |
 | [no-multi-str](https://eslint.org/docs/latest/rules/no-multi-str) | Disallows multiline strings | 🟠 | 🟢 | 🟣 |
-| [no-multi-spaces](https://eslint.org/docs/latest/rules/no-multi-spaces) | Disallows multiple consecutive spaces except for indentation | 🟠 |  |  |
+| [no-multi-spaces](https://eslint.org/docs/latest/rules/no-multi-spaces) | Disallows multiple consecutive spaces except for indentation | 🟠 | 🟢 | 🟣 |
 | [no-multiple-empty-lines](https://eslint.org/docs/latest/rules/no-multiple-empty-lines) | Allows a maximum of 1 consecutive empty lines |  | 🟢 | 🟣 |
 | [no-mixed-spaces-and-tabs](https://eslint.org/docs/latest/rules/no-mixed-spaces-and-tabs) | Disallows mixed spaces and tabs for indentation | 🟠 | 🟢 | 🟣 |
 | [no-restricted-syntax](https://eslint.org/docs/latest/rules/no-restricted-syntax) | Enforces `switch` `case`'s content to be enclosed in braces |  | 🟢 | 🟣 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-crisp",
-  "version": "1.7.17",
+  "version": "1.7.19",
   "description": "Custom ESLint Rules for Crisp",
   "author": "Crisp IM SAS",
   "main": "index.js",

package/recommended.js

@@ -73,7 +73,7 @@ export default function configRecommended(pluginCrisp) {
             "CallExpression": {
               "arguments": "off"
             },
-            "VariableDeclarator": "first",
+            "VariableDeclarator": 1,
             "outerIIFEBody": 0,
             "ArrayExpression": "first",
             "ObjectExpression": "first",
@@ -83,7 +83,6 @@ export default function configRecommended(pluginCrisp) {
               "BinaryExpression",
               "ConditionalExpression",
               "IfStatement *",
-              "VariableDeclarator",
               "VariableDeclarator > CallExpression",
               "CallExpression > ArrayExpression"
             ]

package/rules/enforce-optional.js

@@ -18,9 +18,10 @@ export default {
 
     const patterns = [
       // Search for `foo && foo.` or `foo && foo[`
-      // Notice: do not match `foo && foo.bar !==` or `foo && foo[bar] !==`, \
-      //   as the version with optional chaining would be unsafe
-      /\b(\w\S+)\s&&\s+\1\b[\[\.](?!\w\S+\s\!\=\=)/g,
+      // Notice: do not match when the accessed value is compared, as the \
+      //   version with optional chaining could change the result for falsy \
+      //   non-nullish values
+      /\b(\w\S+)\s&&\s+\1\b[\[\.](?!\S+\s*(?:[=!]==?|[<>]=?))/g,
 
       // Search for patterns like `foo || {}).bar`, `foo || {})[`, \
       //   `foo || []).bar` or `foo || [])[`

package/tests/recommended.test.js

@@ -0,0 +1,58 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { Linter } from "eslint";
+
+import plugin from "../index.js";
+
+const recommendedRules = plugin.configs.recommended.find(
+  config => config.rules?.["no-multi-spaces"]
+).rules;
+
+test("all recommended configs reject multiple spaces", () => {
+  for (const configName of [
+    "recommended",
+    "recommended-vue",
+    "recommended-ts"
+  ]) {
+    assert.ok(plugin.configs[configName].some(
+      config => config.rules?.["no-multi-spaces"] === "error"
+    ));
+  }
+});
+
+test("recommended config removes legacy assignment alignment", () => {
+  const input = `class Example {
+  constructor() {
+    this.a    = 1;
+    this.long = 2;
+  }
+}
+
+const first = 1,
+      second  = 2;
+
+const alpha = require("alpha"),
+      beta  = require("beta");
+`;
+  const expected = `class Example {
+  constructor() {
+    this.a = 1;
+    this.long = 2;
+  }
+}
+
+const first = 1,
+  second = 2;
+
+const alpha = require("alpha"),
+  beta = require("beta");
+`;
+  const result = new Linter().verifyAndFix(input, [{
+    rules: {
+      indent: recommendedRules.indent,
+      "no-multi-spaces": recommendedRules["no-multi-spaces"]
+    }
+  }]);
+
+  assert.equal(result.output, expected);
+});

package/tests/rules/enforce-optional.test.js

@@ -7,6 +7,9 @@ ruleTester.run("enforce-optional", rule, {
   valid: [
     "const result = foo?.bar;",
     "const result = foo && foo.bar !== null;",
+    "const result = foo && foo.bar <= maximum;",
+    "const result = foo && foo[bar] === value;",
+    "if (_header_value && _header_value.length <= ORIGINAL_HEADER_MAX_LENGTH) {}",
     "const keys = Object.keys(foo || {});",
     "const filtered = (foo || []).filter(Boolean);"
   ],