eslint-plugin-crisp 1.7.12 → 1.7.13

package/package.json

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

package/rules/vue-methods-separator.js

@@ -18,7 +18,7 @@ export default {
       category: "Stylistic Issues",
       recommended: false
     },
-    fixable: null,
+    fixable: "code",
     schema: [],
     messages: {
       duplicateSeparator:
@@ -39,6 +39,114 @@ export default {
   create(context) {
     const sourceCode = context.sourceCode;
 
+    function createOrderFix(node, separatorEntries, properties) {
+      const objectEnd = node.value.range[1] - 1;
+      const sectionStarts = separatorEntries.map(({ comment }) => {
+        return sourceCode.getIndexFromLoc({
+          line: comment.loc.start.line,
+          column: 0
+        });
+      });
+
+      const hasInlineSeparator = separatorEntries.some(
+        ({ comment }, index) => {
+          return sourceCode.text
+            .slice(sectionStarts[index], comment.range[0])
+            .trim() !== "";
+        }
+      );
+
+      if (hasInlineSeparator) {
+        return null;
+      }
+
+      const sections = separatorEntries.map((entry, index) => {
+        const start = sectionStarts[index];
+        const end = sectionStarts[index + 1] ?? objectEnd;
+        const rawText = sourceCode.text.slice(start, end);
+        const text = rawText.trimEnd();
+        const nextEntry = separatorEntries[index + 1];
+        const sectionProperties = properties.filter((property) => {
+          return (
+            property.range[0] > entry.comment.range[1] &&
+            (!nextEntry || property.range[0] < nextEntry.comment.range[0])
+          );
+        });
+
+        return {
+          ...entry,
+          start,
+          end,
+          text,
+          trailingWhitespace: rawText.slice(text.length),
+          properties: sectionProperties
+        };
+      });
+
+      if (sections.some((section) => section.properties.length === 0)) {
+        return null;
+      }
+
+      const sectionGap = sections[0].trailingWhitespace;
+
+      if (!/[\r\n]/.test(sectionGap)) {
+        return null;
+      }
+
+      const suffix = sections.at(-1).trailingWhitespace;
+      const lastProperty = properties.at(-1);
+      const tokenAfterLastProperty = sourceCode.getTokenAfter(lastProperty);
+      const preserveTrailingComma = (
+        tokenAfterLastProperty?.value === "," &&
+        tokenAfterLastProperty.range[0] < objectEnd
+      );
+      const orderedSections = [...sections].sort((first, second) => {
+        return first.order - second.order;
+      });
+
+      const fixedSections = orderedSections.map((section, index) => {
+        const lastSectionProperty = section.properties.at(-1);
+        const tokenAfterProperty = sourceCode.getTokenAfter(
+          lastSectionProperty
+        );
+        const hasComma = (
+          tokenAfterProperty?.value === "," &&
+          tokenAfterProperty.range[0] < section.end
+        );
+        const needsComma = (
+          index < orderedSections.length - 1 ||
+          preserveTrailingComma
+        );
+        const propertyEnd = lastSectionProperty.range[1] - section.start;
+
+        if (needsComma && !hasComma) {
+          return (
+            section.text.slice(0, propertyEnd) +
+            "," +
+            section.text.slice(propertyEnd)
+          );
+        }
+
+        if (!needsComma && hasComma) {
+          const commaStart = tokenAfterProperty.range[0] - section.start;
+
+          return (
+            section.text.slice(0, commaStart) +
+            section.text.slice(commaStart + 1)
+          );
+        }
+
+        return section.text;
+      });
+
+      return (fixer) => {
+        return fixer.replaceTextRange(
+          [sectionStarts[0], objectEnd],
+          fixedSections.join(sectionGap) + suffix
+        );
+      };
+    }
+
     function checkMethods(node) {
       const properties = node.value.properties;
 
@@ -57,8 +165,10 @@ export default {
         }
       );
       const seenSeparators = new Set();
-      let lastSeparatorOrder = -1;
+      const separatorEntries = [];
       let separatorCount = 0;
+      let hasDuplicateSeparator = false;
+      let hasInvalidSeparator = false;
 
       comments.forEach((comment) => {
         if (comment.type !== "Line") {
@@ -70,6 +180,8 @@ export default {
 
         if (separatorOrder === undefined) {
           if (SEPARATOR_LIKE_PATTERN.test(separator)) {
+            hasInvalidSeparator = true;
+
             context.report({
               node: comment,
               messageId: "invalidSeparator"
@@ -82,6 +194,8 @@ export default {
         separatorCount++;
 
         if (seenSeparators.has(separator)) {
+          hasDuplicateSeparator = true;
+
           context.report({
             node: comment,
             messageId: "duplicateSeparator",
@@ -92,15 +206,37 @@ export default {
         }
 
         seenSeparators.add(separator);
+        separatorEntries.push({
+          comment,
+          order: separatorOrder
+        });
+      });
 
-        if (separatorOrder < lastSeparatorOrder) {
-          context.report({
-            node: comment,
-            messageId: "unorderedSeparator"
-          });
-        } else {
-          lastSeparatorOrder = separatorOrder;
+      let lastSeparatorOrder = -1;
+      const unorderedEntries = separatorEntries.filter((entry) => {
+        if (entry.order < lastSeparatorOrder) {
+          return true;
         }
+
+        lastSeparatorOrder = entry.order;
+
+        return false;
+      });
+
+      const orderFix = (
+        unorderedEntries.length > 0 &&
+        !hasDuplicateSeparator &&
+        !hasInvalidSeparator
+      )
+        ? createOrderFix(node, separatorEntries, properties)
+        : null;
+
+      unorderedEntries.forEach((entry, index) => {
+        context.report({
+          node: entry.comment,
+          messageId: "unorderedSeparator",
+          ...(index === 0 && orderFix ? { fix: orderFix } : {})
+        });
       });
 
       if (separatorCount === 0) {

package/tests/rules/vue-methods-separator.test.js

@@ -149,12 +149,94 @@ ruleTester.run("vue-methods-separator", rule, {
           }
         };
       `,
+      output: `
+        export default {
+          methods: {
+            // --> ACTIONS <--
+            save() {},
+            // --> HELPERS <--
+            format() {}
+          }
+        };
+      `,
       errors: [
         {
           messageId: "unorderedSeparator"
         }
       ]
     },
+    {
+      code: `
+        export default {
+          methods: {
+            // --> EVENT LISTENERS <--
+
+            /**
+             * Triggers on save
+             */
+            onSave() {},
+
+            /**
+             * Triggers on close
+             */
+            onClose() {},
+
+            // --> ACTIONS <--
+
+            /**
+             * Saves content
+             */
+            save() {},
+
+            // --> HELPERS <--
+
+            /**
+             * Formats content
+             */
+            format() {}
+          }
+        };
+      `,
+      output: `
+        export default {
+          methods: {
+            // --> ACTIONS <--
+
+            /**
+             * Saves content
+             */
+            save() {},
+
+            // --> HELPERS <--
+
+            /**
+             * Formats content
+             */
+            format() {},
+
+            // --> EVENT LISTENERS <--
+
+            /**
+             * Triggers on save
+             */
+            onSave() {},
+
+            /**
+             * Triggers on close
+             */
+            onClose() {}
+          }
+        };
+      `,
+      errors: [
+        {
+          messageId: "unorderedSeparator"
+        },
+        {
+          messageId: "unorderedSeparator"
+        }
+      ]
+    },
     {
       code: `
         export default {
@@ -184,6 +266,16 @@ ruleTester.run("vue-methods-separator", rule, {
           }
         });
       `,
+      output: `
+        export default defineComponent({
+          methods: {
+            // --> HELPERS <--
+            format() {},
+            // --> EVENT LISTENERS <--
+            onSave() {}
+          }
+        });
+      `,
       errors: [
         {
           messageId: "unorderedSeparator"
@@ -220,6 +312,18 @@ ruleTester.run("vue-methods-separator", rule, {
         });
         </script>
       `,
+      output: `
+        <script>
+        export default defineComponent({
+          methods: {
+            // --> ACTIONS <--
+            save() {},
+            // --> EVENT LISTENERS <--
+            onSave() {}
+          }
+        });
+        </script>
+      `,
       errors: [
         {
           messageId: "unorderedSeparator"