eslint-plugin-imports-regulation 0.2.12 → 0.2.13

package/dist/rules/imports-regulation.d.ts

@@ -1,5 +1,5 @@
 import type { TSESLint } from '@typescript-eslint/utils';
-type MessageIds = 'groupOrder' | 'exportBlock' | 'blankLinesBetween' | 'unexpectedBlankLine' | 'blankLineBelowComment' | 'typeSpecifiersLast' | 'markTypeOnly' | 'typeOnlyImport' | 'typeOnlySpecifier' | 'blankLinesAfter' | 'multilineBraces';
+type MessageIds = 'groupOrder' | 'exportBlock' | 'blankLinesBetween' | 'unexpectedBlankLine' | 'blankLineBelowComment' | 'typeSpecifiersLast' | 'typeSpecifiersFirst' | 'markTypeOnly' | 'typeOnlyImport' | 'typeOnlySpecifier' | 'blankLinesAfter' | 'multilineBraces';
 type Origin = 'external' | 'internal';
 type Options = [
     {

package/dist/rules/imports-regulation.js

@@ -69,6 +69,7 @@ const rule = {
             unexpectedBlankLine: 'Expected no blank lines between imports in the same group, found {{actual}}.',
             blankLineBelowComment: 'Expected no blank lines between a comment and the import it belongs to, found {{actual}}.',
             typeSpecifiersLast: 'Type specifiers must come after value specifiers.',
+            typeSpecifiersFirst: 'Across several lines, type specifiers must come first, on lines of their own.',
             markTypeOnly: 'An import of nothing but types must be written `import type { A }`.',
             typeOnlyImport: 'Everything this imports is only used as a type — write `import type`.',
             typeOnlySpecifier: '`{{name}}` is only used as a type — mark it `type`.',
@@ -191,6 +192,15 @@ const rule = {
             }
             return { carried, tail };
         };
+        const shapeOf = (range, named) => {
+            const interior = source.text.slice(range[0], range[1]);
+            const indent = /(?:\r\n|\n|\r)([^\S\r\n]*)\S/.exec(interior)?.[1] ?? '    ';
+            const closeIndent = /(?:\r\n|\n|\r)([^\S\r\n]*)$/.exec(interior)?.[1] ?? '';
+            // From the tokens, not the text: a comment after the last comma hides it from a regex.
+            const last = named[named.length - 1];
+            const trailingComma = last !== undefined && source.getTokenAfter(last)?.value === ',';
+            return { indent, closeIndent, trailingComma };
+        };
         /** Re-join specifiers in the shape the braces already had, carrying their comments with them. */
         const rejoin = (range, named, ordered, textOf) => {
             const interior = source.text.slice(range[0], range[1]);
@@ -205,11 +215,7 @@ const rule = {
                 });
                 return `${pad}${parts.join(', ')}${tail.map(comment => ` ${comment}`).join('')}${pad}`;
             }
-            const indent = /(?:\r\n|\n|\r)([^\S\r\n]*)\S/.exec(interior)?.[1] ?? '    ';
-            const closeIndent = /(?:\r\n|\n|\r)([^\S\r\n]*)$/.exec(interior)?.[1] ?? '';
-            // From the tokens, not the text: a comment after the last comma hides it from a regex.
-            const last = named[named.length - 1];
-            const trailingComma = last !== undefined && source.getTokenAfter(last)?.value === ',';
+            const { indent, closeIndent, trailingComma } = shapeOf(range, named);
             const lines = [];
             for (const [index, specifier] of ordered.entries()) {
                 const { leading, beforeComma, afterComma } = pieceOf(specifier);
@@ -329,6 +335,30 @@ const rule = {
             }
             if (types.length === 0 || values.length === 0)
                 return;
+            const first = named[0];
+            const last = named[named.length - 1];
+            if (first && last && first.loc.start.line !== last.loc.end.line) {
+                const firstValueLine = Math.min(...values.map(specifier => specifier.loc.start.line));
+                const late = types.find(specifier => specifier.loc.end.line >= firstValueLine);
+                if (!late)
+                    return;
+                const packed = named.some((specifier, i) => named[i - 1]?.loc.end.line === specifier.loc.start.line);
+                const commented = source.getAllComments().some(c => c.range[0] >= range[0] && c.range[1] <= range[1]);
+                context.report({
+                    node: late,
+                    messageId: 'typeSpecifiersFirst',
+                    fix: fixer => {
+                        if (!packed || commented) {
+                            return fixer.replaceTextRange(range, rejoin(range, named, [...types, ...values], specifier => source.getText(specifier)));
+                        }
+                        const { indent, closeIndent, trailingComma } = shapeOf(range, named);
+                        const line = (group) => `${indent}${group.map(specifier => source.getText(specifier)).join(', ')}`;
+                        const text = `${line(types)},${eol}${line(values)}${trailingComma ? ',' : ''}`;
+                        return fixer.replaceTextRange(range, `${eol}${text}${eol}${closeIndent}`);
+                    },
+                });
+                return;
+            }
             const firstType = named.findIndex(specifier => specifier.importKind === 'type');
             const misplaced = named.slice(firstType).find(specifier => specifier.importKind !== 'type');
             if (!misplaced)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-imports-regulation",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Order imports: external type-only, external, blank line, internal type-only, internal — with type specifiers last inside each import.",
   "author": "Robert Sandiford",
   "type": "module",