eslint-plugin-crisp 1.0.65 → 1.0.67

package/package.json

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

package/recommended-vue.js

@@ -144,6 +144,7 @@ module.exports = {
     "crisp/methods-naming": "error",
     "crisp/methods-ordering": "error",
     "crisp/multiline-comment-end-backslash": "error",
+    "crisp/newline-after-switch-case": "error",
     "crisp/no-async": "error",
     "crisp/no-var-in-blocks": "error",
     "crisp/no-useless-template-literals": "error",

package/recommended.js

@@ -148,6 +148,7 @@ module.exports = {
     "crisp/methods-naming": "error",
     "crisp/methods-ordering": "error",
     "crisp/multiline-comment-end-backslash": "error",
+    "crisp/newline-after-switch-case": "error",
     "crisp/no-async": "error",
     "crisp/no-var-in-blocks": "error",
     "crisp/no-space-in-optional-arguments": "error",

package/rules/jsdoc-align-params.js

@@ -141,6 +141,7 @@ module.exports = {
               context.report({
                 node: jsdocComment,
                 message: 'JSDoc alignment issue',
+
                 fix(fixer) {
                   return fixer.replaceText(jsdocComment, formattedJSDoc);
                 },

package/rules/newline-after-switch-case.js

@@ -0,0 +1,94 @@
+function getTokensWithNewlineBetween(sourceCode, startNode, endNode) {
+  const endLine = endNode.loc.start.line;
+
+  let next = startNode;
+  let previous = startNode;
+
+  do {
+    previous = next;
+    next = sourceCode.getTokenOrCommentAfter(next);
+
+    if (next.loc.start.line > previous.loc.end.line + 1) {
+      return [previous, next];
+    }
+  } while (next.loc.start.line < endLine);
+
+  return null;
+}
+
+module.exports = {
+  meta: {
+    fixable: "whitespace",
+    schema: []  // no options
+  },
+
+  create: function newlineBetweenSwitchCase(context) {
+    let currentCodePath = null;
+    const sourceCode = context.getSourceCode();
+
+    return {
+      onCodePathStart(codePath) {
+        currentCodePath = codePath;
+      },
+
+      onCodePathEnd() {
+        currentCodePath = currentCodePath.upper;
+      },
+
+      "SwitchCase:exit": (node) => {
+        let lastNode = node.parent.cases[node.parent.cases.length - 1]
+
+        // Last case?
+        if (lastNode === node) {
+          // Ignore it
+          return;
+        }
+
+        let isFallthrough = false;
+
+        if (
+          node.consequent.length === 0 ||
+          currentCodePath.currentSegments.some((segment) => {
+            return segment.reachable;
+          })
+        ) {
+          isFallthrough = true;
+        }
+
+        const nextToken = sourceCode.getTokenAfter(node);
+
+        const tokensWithBlankLinesBetween = getTokensWithNewlineBetween(
+          sourceCode,
+          node,
+          nextToken
+        );
+        const hasBlankLinesBetween = Boolean(tokensWithBlankLinesBetween);
+        const isNewlineRequired = isFallthrough ? false : true;
+
+        if (hasBlankLinesBetween && !isNewlineRequired) {
+          context.report({
+            node,
+            message: "Extraneous newlines between switch cases.",
+
+            fix(fixer) {
+              const [previous, next] = tokensWithBlankLinesBetween;
+              return fixer.replaceTextRange(
+                [previous.range[1], next.range[0] - next.loc.start.column],
+                "\n"
+              );
+            }
+          });
+        } else if (!hasBlankLinesBetween && isNewlineRequired) {
+          context.report({
+            node,
+            message: "Newline required between switch cases.",
+
+            fix(fixer) {
+              return fixer.insertTextAfter(node, "\n");
+            }
+          });
+        }
+      },
+    };
+  },
+};

package/rules/one-space-after-operator.js

@@ -32,6 +32,7 @@ module.exports = {
         context.report({
           node: operatorToken,
           message: `There should be at least one space before and exactly one space after '${operatorName}'`,
+
           fix(fixer) {
             return fixer.replaceTextRange(
               [sourceCode.getTokenBefore(operatorToken).range[1], sourceCode.getTokenAfter(operatorToken).range[0]],

package/rules/ternary-parenthesis.js

@@ -21,6 +21,7 @@ module.exports = {
             context.report({
               node,
               message: "The condition in ternary expressions with an operator should be wrapped in parentheses",
+
               fix(fixer) {
                 const conditionText = sourceCode.getText(node.test);
                 return [

package/rules/vue-computed-order.js

@@ -27,6 +27,7 @@ module.exports = {
             context.report({
               node: nextProperty,
               message: "Computed properties should be in alphabetical order.",
+
               fix(fixer) {
                 const sourceCode = context.getSourceCode();
                 const propertyText = sourceCode.getText(property);

package/rules/vue-emits-order.js

@@ -21,6 +21,7 @@ module.exports = {
             context.report({
               node: nextElement,
               message: "Emits should be in alphabetical order.",
+
               fix(fixer) {
                 const sourceCode = context.getSourceCode();
                 const elementText = sourceCode.getText(element);

package/rules/vue-header-check.js

@@ -31,7 +31,7 @@ module.exports = {
           // Check each tag individually
           vueTags.forEach((tag, index) => {
             const tagRegExp = new RegExp(`<${tag}`);
-            const headerRegExp = new RegExp(`<!--\\s*\\*{70,73}\\s*\\n\\s*${headers[index]}\\s*\\n\\s*\\*{70,73}\\s*-->\\s*\\n\\s*<${tag}`);
+            const headerRegExp = new RegExp(`\\n\\n<!--\\s*\\*{70,73}\\s*\\n\\s{5}${headers[index]}\\s*\\n\\s*\\*{70,73}\\s*-->\\s*\\n\\n<${tag}`);
 
             // If the tag exists without the corresponding header, report an error
             if (tagRegExp.test(fileContent) && !headerRegExp.test(fileContent)) {

package/rules/vue-props-declaration-order.js

@@ -21,6 +21,7 @@ module.exports = {
             context.report({
               node: nextProperty,
               message: "Props should be in alphabetical order.",
+
               fix(fixer) {
                 const sourceCode = context.getSourceCode();
                 const propertyText = sourceCode.getText(property);