@kikiutils/eslint-config 9.3.2 → 10.0.0

package/dist/style.js

@@ -14,11 +14,7 @@ function createPrettierCssConfig(parser) {
 	};
 }
 function createStyleFilesConfigs() {
-	return [
-		createPrettierCssConfig("css"),
-		createPrettierCssConfig("sass"),
-		createPrettierCssConfig("scss")
-	];
+	return [createPrettierCssConfig("css"), createPrettierCssConfig("scss")];
 }
 export { createStyleFilesConfigs };
 

package/dist/style.js.map

@@ -1 +1 @@
-{"version":3,"file":"style.js","names":[],"sources":["../src/style.ts"],"sourcesContent":["import type { TypedFlatConfigItem } from '@antfu/eslint-config';\nimport format from 'eslint-plugin-format';\n\nfunction createPrettierCssConfig(parser: 'css' | 'sass' | 'scss'): TypedFlatConfigItem {\n    return {\n        files: [`**/*.${parser}`],\n        languageOptions: { parser: format.parserPlain },\n        plugins: { format },\n        rules: {\n            'format/prettier': [\n                'error',\n                {\n                    parser,\n                    printWidth: 120,\n                    singleQuote: true,\n                    tabWidth: 4,\n                },\n            ],\n        },\n    };\n}\n\nexport function createStyleFilesConfigs(): TypedFlatConfigItem[] {\n    return [\n        createPrettierCssConfig('css'),\n        createPrettierCssConfig('sass'),\n        createPrettierCssConfig('scss'),\n    ];\n}\n"],"mappings":";;AAGA,SAAS,wBAAwB,QAAsD;CACnF,OAAO;EACH,OAAO,CAAC,QAAQ,QAAQ;EACxB,iBAAiB,EAAE,QAAQ,OAAO,YAAY;EAC9C,SAAS,EAAE,OAAO;EAClB,OAAO,EACH,mBAAmB,CACf,SACA;GACI;GACA,YAAY;GACZ,aAAa;GACb,UAAU;EACd,CACJ,EACJ;CACJ;AACJ;AAEA,SAAgB,0BAAiD;CAC7D,OAAO;EACH,wBAAwB,KAAK;EAC7B,wBAAwB,MAAM;EAC9B,wBAAwB,MAAM;CAClC;AACJ"}
+{"version":3,"file":"style.js","names":[],"sources":["../src/style.ts"],"sourcesContent":["import type { TypedFlatConfigItem } from '@antfu/eslint-config';\nimport format from 'eslint-plugin-format';\n\nfunction createPrettierCssConfig(parser: 'css' | 'scss'): TypedFlatConfigItem {\n    return {\n        files: [`**/*.${parser}`],\n        languageOptions: { parser: format.parserPlain },\n        plugins: { format },\n        rules: {\n            'format/prettier': [\n                'error',\n                {\n                    parser,\n                    printWidth: 120,\n                    singleQuote: true,\n                    tabWidth: 4,\n                },\n            ],\n        },\n    };\n}\n\nexport function createStyleFilesConfigs(): TypedFlatConfigItem[] {\n    return [\n        createPrettierCssConfig('css'),\n        createPrettierCssConfig('scss'),\n    ];\n}\n"],"mappings":";;AAGA,SAAS,wBAAwB,QAA6C;CAC1E,OAAO;EACH,OAAO,CAAC,QAAQ,QAAQ;EACxB,iBAAiB,EAAE,QAAQ,OAAO,YAAY;EAC9C,SAAS,EAAE,OAAO;EAClB,OAAO,EACH,mBAAmB,CACf,SACA;GACI;GACA,YAAY;GACZ,aAAa;GACb,UAAU;EACd,CACJ,EACJ;CACJ;AACJ;AAEA,SAAgB,0BAAiD;CAC7D,OAAO,CACH,wBAAwB,KAAK,GAC7B,wBAAwB,MAAM,CAClC;AACJ"}

package/dist/vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vue.d.ts","names":[],"sources":["../src/vue.ts"],"mappings":";wBASgB,gBAAgB,+BAAuC"}
+{"version":3,"file":"vue.d.ts","names":[],"sources":["../src/vue.ts"],"mappings":";wBAUgB,gBAAgB,+BAAuC"}

package/dist/vue.js

@@ -1,20 +1,24 @@
 import { customPlugins } from "./_internals/plugins.js";
+import { createTypeAwareConfig } from "./_internals/type-aware.js";
 import { createBaseRules } from "./base.js";
 import promise from "eslint-plugin-promise";
 import kikiutilsEslintPluginVue from "@kikiutils/eslint-plugin-vue";
-import betteTailwindcss from "eslint-plugin-better-tailwindcss";
+import betterTailwindcss from "eslint-plugin-better-tailwindcss";
 // src/vue.ts
 function createVueConfig(environment = "node") {
+	const typeAwareConfig = createTypeAwareConfig();
 	return {
 		files: ["**/*.vue"],
+		languageOptions: typeAwareConfig.languageOptions,
 		plugins: {
 			"@kikiutils/vue": kikiutilsEslintPluginVue,
-			"better-tailwindcss": betteTailwindcss,
+			"better-tailwindcss": betterTailwindcss,
 			"kikiutils": customPlugins,
 			promise
 		},
 		rules: {
 			...createBaseRules(environment),
+			...typeAwareConfig.rules,
 			"@kikiutils/vue/attributes-order": ["error", {
 				alphabetical: true,
 				alphabeticalEnhanced: true
@@ -29,6 +33,7 @@ function createVueConfig(environment = "node") {
 			"better-tailwindcss/no-duplicate-classes": "error",
 			"better-tailwindcss/no-unnecessary-whitespace": "error",
 			"style/max-len": "off",
+			"ts/array-type": ["error", { default: "array-simple" }],
 			"vue/attribute-hyphenation": "error",
 			"vue/attributes-order": "off",
 			"vue/block-order": ["error", { order: [
@@ -60,7 +65,6 @@ function createVueConfig(environment = "node") {
 			"vue/no-template-target-blank": "error",
 			"vue/no-v-html": "error",
 			"vue/prefer-define-options": "error",
-			"vue/prefer-separate-static-class": "error",
 			"vue/require-explicit-emits": "error",
 			"vue/require-typed-ref": "error"
 		}

package/dist/vue.js.map

@@ -1 +1 @@
-{"version":3,"file":"vue.js","names":[],"sources":["../src/vue.ts"],"sourcesContent":["import type { TypedFlatConfigItem } from '@antfu/eslint-config';\nimport kikiutilsEslintPluginVue from '@kikiutils/eslint-plugin-vue';\nimport betteTailwindcss from 'eslint-plugin-better-tailwindcss';\n// @ts-expect-error No declare file.\nimport promise from 'eslint-plugin-promise';\n\nimport { customPlugins } from './_internals/plugins';\nimport { createBaseRules } from './base';\n\nexport function createVueConfig(environment: 'bun' | 'node' = 'node'): TypedFlatConfigItem {\n    return {\n        files: ['**/*.vue'],\n        plugins: {\n            '@kikiutils/vue': kikiutilsEslintPluginVue,\n            'better-tailwindcss': betteTailwindcss,\n            'kikiutils': customPlugins,\n            promise,\n        },\n        rules: {\n            ...createBaseRules(environment),\n            '@kikiutils/vue/attributes-order': [\n                'error',\n                {\n                    alphabetical: true,\n                    alphabeticalEnhanced: true,\n                },\n            ],\n            '@kikiutils/vue/class-hex-color-case': 'error',\n            'better-tailwindcss/enforce-consistent-class-order': 'error',\n            'better-tailwindcss/enforce-consistent-important-position': 'error',\n            'better-tailwindcss/enforce-consistent-variable-syntax': 'error',\n            'better-tailwindcss/enforce-consistent-variant-order': 'error',\n            'better-tailwindcss/enforce-shorthand-classes': 'error',\n            'better-tailwindcss/no-deprecated-classes': 'warn',\n            'better-tailwindcss/no-duplicate-classes': 'error',\n            'better-tailwindcss/no-unnecessary-whitespace': 'error',\n            'style/max-len': 'off',\n            'vue/attribute-hyphenation': 'error',\n            'vue/attributes-order': 'off',\n            'vue/block-order': [\n                'error',\n                {\n                    order: [\n                        'template',\n                        'script',\n                        'style',\n                    ],\n                },\n            ],\n            'vue/component-api-style': 'error',\n            'vue/define-emits-declaration': 'error',\n            'vue/define-props-declaration': 'error',\n            'vue/enforce-style-attribute': 'error',\n            'vue/html-closing-bracket-newline': 'error',\n            'vue/html-closing-bracket-spacing': 'error',\n            'vue/html-indent': [\n                'error',\n                4,\n            ],\n            'vue/max-attributes-per-line': [\n                'error',\n                {\n                    multiline: 1,\n                    singleline: 1,\n                },\n            ],\n            'vue/max-len': [\n                'warn',\n                {\n                    code: 120,\n                    comments: 120,\n                    template: 120,\n                },\n            ],\n            'vue/no-dupe-keys': 'error',\n            'vue/no-lone-template': 'error',\n            'vue/no-multi-spaces': 'error',\n            'vue/no-multiple-objects-in-class': 'error',\n            'vue/no-root-v-if': 'error',\n            'vue/no-template-target-blank': 'error',\n            'vue/no-v-html': 'error',\n            'vue/prefer-define-options': 'error',\n            'vue/prefer-separate-static-class': 'error',\n            'vue/require-explicit-emits': 'error',\n            'vue/require-typed-ref': 'error',\n        },\n    };\n}\n"],"mappings":";;;;;;AASA,SAAgB,gBAAgB,cAA8B,QAA6B;CACvF,OAAO;EACH,OAAO,CAAC,UAAU;EAClB,SAAS;GACL,kBAAkB;GAClB,sBAAsB;GACtB,aAAa;GACb;EACJ;EACA,OAAO;GACH,GAAG,gBAAgB,WAAW;GAC9B,mCAAmC,CAC/B,SACA;IACI,cAAc;IACd,sBAAsB;GAC1B,CACJ;GACA,uCAAuC;GACvC,qDAAqD;GACrD,4DAA4D;GAC5D,yDAAyD;GACzD,uDAAuD;GACvD,gDAAgD;GAChD,4CAA4C;GAC5C,2CAA2C;GAC3C,gDAAgD;GAChD,iBAAiB;GACjB,6BAA6B;GAC7B,wBAAwB;GACxB,mBAAmB,CACf,SACA,EACI,OAAO;IACH;IACA;IACA;GACJ,EACJ,CACJ;GACA,2BAA2B;GAC3B,gCAAgC;GAChC,gCAAgC;GAChC,+BAA+B;GAC/B,oCAAoC;GACpC,oCAAoC;GACpC,mBAAmB,CACf,SACA,CACJ;GACA,+BAA+B,CAC3B,SACA;IACI,WAAW;IACX,YAAY;GAChB,CACJ;GACA,eAAe,CACX,QACA;IACI,MAAM;IACN,UAAU;IACV,UAAU;GACd,CACJ;GACA,oBAAoB;GACpB,wBAAwB;GACxB,uBAAuB;GACvB,oCAAoC;GACpC,oBAAoB;GACpB,gCAAgC;GAChC,iBAAiB;GACjB,6BAA6B;GAC7B,oCAAoC;GACpC,8BAA8B;GAC9B,yBAAyB;EAC7B;CACJ;AACJ"}
+{"version":3,"file":"vue.js","names":[],"sources":["../src/vue.ts"],"sourcesContent":["import type { TypedFlatConfigItem } from '@antfu/eslint-config';\nimport kikiutilsEslintPluginVue from '@kikiutils/eslint-plugin-vue';\nimport betterTailwindcss from 'eslint-plugin-better-tailwindcss';\n// @ts-expect-error No declare file.\nimport promise from 'eslint-plugin-promise';\n\nimport { customPlugins } from './_internals/plugins';\nimport { createTypeAwareConfig } from './_internals/type-aware';\nimport { createBaseRules } from './base';\n\nexport function createVueConfig(environment: 'bun' | 'node' = 'node'): TypedFlatConfigItem {\n    const typeAwareConfig = createTypeAwareConfig();\n    return {\n        files: ['**/*.vue'],\n        languageOptions: typeAwareConfig.languageOptions,\n        plugins: {\n            '@kikiutils/vue': kikiutilsEslintPluginVue,\n            'better-tailwindcss': betterTailwindcss,\n            'kikiutils': customPlugins,\n            promise,\n        },\n        rules: {\n            ...createBaseRules(environment),\n            ...typeAwareConfig.rules,\n            '@kikiutils/vue/attributes-order': [\n                'error',\n                {\n                    alphabetical: true,\n                    alphabeticalEnhanced: true,\n                },\n            ],\n            '@kikiutils/vue/class-hex-color-case': 'error',\n            'better-tailwindcss/enforce-consistent-class-order': 'error',\n            'better-tailwindcss/enforce-consistent-important-position': 'error',\n            'better-tailwindcss/enforce-consistent-variable-syntax': 'error',\n            'better-tailwindcss/enforce-consistent-variant-order': 'error',\n            'better-tailwindcss/enforce-shorthand-classes': 'error',\n            'better-tailwindcss/no-deprecated-classes': 'warn',\n            'better-tailwindcss/no-duplicate-classes': 'error',\n            'better-tailwindcss/no-unnecessary-whitespace': 'error',\n            'style/max-len': 'off',\n            'ts/array-type': [\n                'error',\n                { default: 'array-simple' },\n            ],\n            'vue/attribute-hyphenation': 'error',\n            'vue/attributes-order': 'off',\n            'vue/block-order': [\n                'error',\n                {\n                    order: [\n                        'template',\n                        'script',\n                        'style',\n                    ],\n                },\n            ],\n            'vue/component-api-style': 'error',\n            'vue/define-emits-declaration': 'error',\n            'vue/define-props-declaration': 'error',\n            'vue/enforce-style-attribute': 'error',\n            'vue/html-closing-bracket-newline': 'error',\n            'vue/html-closing-bracket-spacing': 'error',\n            'vue/html-indent': [\n                'error',\n                4,\n            ],\n            'vue/max-attributes-per-line': [\n                'error',\n                {\n                    multiline: 1,\n                    singleline: 1,\n                },\n            ],\n            'vue/max-len': [\n                'warn',\n                {\n                    code: 120,\n                    comments: 120,\n                    template: 120,\n                },\n            ],\n            'vue/no-dupe-keys': 'error',\n            'vue/no-lone-template': 'error',\n            'vue/no-multi-spaces': 'error',\n            'vue/no-multiple-objects-in-class': 'error',\n            'vue/no-root-v-if': 'error',\n            'vue/no-template-target-blank': 'error',\n            'vue/no-v-html': 'error',\n            'vue/prefer-define-options': 'error',\n            'vue/require-explicit-emits': 'error',\n            'vue/require-typed-ref': 'error',\n        },\n    };\n}\n"],"mappings":";;;;;;;AAUA,SAAgB,gBAAgB,cAA8B,QAA6B;CACvF,MAAM,kBAAkB,sBAAsB;CAC9C,OAAO;EACH,OAAO,CAAC,UAAU;EAClB,iBAAiB,gBAAgB;EACjC,SAAS;GACL,kBAAkB;GAClB,sBAAsB;GACtB,aAAa;GACb;EACJ;EACA,OAAO;GACH,GAAG,gBAAgB,WAAW;GAC9B,GAAG,gBAAgB;GACnB,mCAAmC,CAC/B,SACA;IACI,cAAc;IACd,sBAAsB;GAC1B,CACJ;GACA,uCAAuC;GACvC,qDAAqD;GACrD,4DAA4D;GAC5D,yDAAyD;GACzD,uDAAuD;GACvD,gDAAgD;GAChD,4CAA4C;GAC5C,2CAA2C;GAC3C,gDAAgD;GAChD,iBAAiB;GACjB,iBAAiB,CACb,SACA,EAAE,SAAS,eAAe,CAC9B;GACA,6BAA6B;GAC7B,wBAAwB;GACxB,mBAAmB,CACf,SACA,EACI,OAAO;IACH;IACA;IACA;GACJ,EACJ,CACJ;GACA,2BAA2B;GAC3B,gCAAgC;GAChC,gCAAgC;GAChC,+BAA+B;GAC/B,oCAAoC;GACpC,oCAAoC;GACpC,mBAAmB,CACf,SACA,CACJ;GACA,+BAA+B,CAC3B,SACA;IACI,WAAW;IACX,YAAY;GAChB,CACJ;GACA,eAAe,CACX,QACA;IACI,MAAM;IACN,UAAU;IACV,UAAU;GACd,CACJ;GACA,oBAAoB;GACpB,wBAAwB;GACxB,uBAAuB;GACvB,oCAAoC;GACpC,oBAAoB;GACpB,gCAAgC;GAChC,iBAAiB;GACjB,6BAA6B;GAC7B,8BAA8B;GAC9B,yBAAyB;EAC7B;CACJ;AACJ"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kikiutils/eslint-config",
   "type": "module",
-  "version": "9.3.2",
+  "version": "10.0.0",
   "description": "Using antfu/eslint-config as a base for eslint-config, slightly modified the settings and added additional plugins, mainly for my own use.",
   "author": "kiki-kanri",
   "license": "MIT",
@@ -12,38 +12,10 @@
   "keywords": [],
   "sideEffects": false,
   "exports": {
-    "./_internals/plugins": {
-      "types": null,
-      "import": null,
-      "require": null
-    },
-    "./_internals/rules/compact-iteration-layout": {
-      "types": null,
-      "import": null,
-      "require": null
-    },
-    "./_internals/rules/consistent-condition-layout": {
-      "types": null,
-      "import": null,
-      "require": null
-    },
-    "./_internals/rules/consistent-parameter-layout": {
-      "types": null,
-      "import": null,
-      "require": null
-    },
-    "./_internals/rules/statement-padding": {
-      "types": null,
-      "import": null,
-      "require": null
-    },
-    "./_internals/utils": {
-      "types": null,
-      "import": null,
-      "require": null
-    },
-    "./package.json": "./package.json",
-    "./*": "./dist/*.js"
+    "./base": "./dist/base.js",
+    "./style": "./dist/style.js",
+    "./vue": "./dist/vue.js",
+    "./package.json": "./package.json"
   },
   "files": [
     "./dist",
@@ -85,19 +57,20 @@
     "eslint-plugin-better-tailwindcss": "^4.10.0",
     "eslint-plugin-format": "^2.0.1",
     "eslint-plugin-promise": "^7.3.0",
-    "tailwind-csstree": "^0.4.1",
+    "tailwind-csstree": "^0.4.2",
     "vue-eslint-parser": "^10.4.1"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^10.0.0",
+    "@arethetypeswrong/core": "^0.18.5",
     "@kikiutils/tsconfigs": "^7.0.0",
-    "@types/node": "^26.6.5",
+    "@types/node": "^26.6.6",
     "@vitest/coverage-v8": "^5.0.5",
     "changelogen": "^0.6.2",
-    "eslint": "^10.13.0",
-    "knip": "^6.43.0",
+    "eslint": "^10.14.0",
+    "knip": "^6.44.0",
     "publint": "^0.3.25",
-    "tsdown": "^0.23.2",
+    "tsdown": "^0.23.4",
     "typescript": "^6.0.3",
     "unplugin-unused": "^0.6.0",
     "vitest": "^5.0.5"

package/src/_internals/rules/consistent-parameter-layout.ts

@@ -1,4 +1,7 @@
-import type { Rule } from 'eslint';
+import type {
+    AST,
+    Rule,
+} from 'eslint';
 
 import type { TokenStore } from '../utils';
 import { defineScriptAndTemplateVisitors } from '../utils';
@@ -13,120 +16,188 @@ type ListItem = CallNode['arguments'][number] | FunctionNode['params'][number];
 
 export const consistentParameterLayout: Rule.RuleModule = {
     create(context) {
-        const isTestFile = /\.test\.[jt]sx?$/.test(context.filename);
-
-        function checkParameterLayout(
-            node: Rule.Node,
-            items: readonly ListItem[],
-            tokenStore: TokenStore,
-            isTemplate: boolean,
-        ): void {
-            const first = items[0];
-            if (!first) return;
-            const isSingleParameter = items.length === 1;
-
-            // JSX argument layout belongs to the JSX formatting rules.
-            const firstType: string = first.type;
-            if (isSingleParameter && (firstType === 'JSXElement' || firstType === 'JSXFragment')) return;
-            let openingParen;
-            if (node.type === 'CallExpression' || node.type === 'NewExpression') {
-                const call = node as CallNode;
-                openingParen = tokenStore.getTokenAfter(
-                    call.typeArguments ?? call.callee,
-                    (token) => token.type === 'Punctuator' && token.value === '(',
-                );
-            } else {
-                openingParen = tokenStore.getTokenBefore(first);
-            }
+        const compactTestCalls = context.options[0]?.compactTestCalls === true;
 
-            if (!openingParen || openingParen.value !== '(') return;
-            // An unparenthesized arrow must not borrow its parent's delimiters.
-            if (openingParen.range[0] < node.range![0]) return;
-            const closingParen = node.type === 'CallExpression' || node.type === 'NewExpression'
-                ? tokenStore.getLastToken(node)
-                : tokenStore.getTokenAfter(items.at(-1)!, (token) => token.value === ')');
-
-            const next = tokenStore.getTokenAfter(openingParen)!;
+        function createVisitor(tokenStore: TokenStore, isTemplate: boolean): Rule.RuleListener {
+            function checkTestCallLayout(node: CallNode): void {
+                const items = node.arguments;
+                if (!items.length) return;
+                const openingParen = tokenStore.getTokenAfter(
+                    node.typeArguments ?? node.callee,
+                    (token) => token.type === 'Punctuator' && token.value === '(',
+                )!;
+
+                const closingParen = tokenStore.getLastToken(node)!;
+                const previous = tokenStore.getTokenBefore(closingParen)!;
+                const gaps: Array<[AST.Token, AST.Token, string]> = [
+                    [
+                        openingParen,
+                        tokenStore.getTokenAfter(openingParen)!,
+                        '',
+                    ],
+                    [
+                        previous,
+                        closingParen,
+                        '',
+                    ],
+                ];
 
-            if (isSingleParameter) {
-                if (!closingParen || closingParen.value !== ')') return;
-                let previous = tokenStore.getTokenBefore(closingParen)!;
-                if (previous.value === ',') previous = tokenStore.getTokenBefore(previous)!;
-                if (
-                    tokenStore.commentsExistBetween(openingParen, next)
-                    || tokenStore.commentsExistBetween(previous, closingParen)
-                ) return;
+                for (let index = 1; index < items.length; index++) {
+                    const comma = tokenStore.getTokensBetween(items[index - 1]!, items[index]!)
+                        .find((token) => token.type === 'Punctuator' && token.value === ',')!;
+
+                    gaps.push(
+                        [
+                            tokenStore.getTokenBefore(comma)!,
+                            comma,
+                            '',
+                        ],
+                        [
+                            comma,
+                            tokenStore.getTokenAfter(comma)!,
+                            ' ',
+                        ],
+                    );
+                }
 
-                const hasOpeningNewline = openingParen.loc.end.line !== next.loc.start.line;
-                const hasClosingNewline = tokenStore.getTokenBefore(closingParen)!.loc.end.line
-                  !== closingParen.loc.start.line;
+                if (previous.value === ',') {
+                    gaps.push([
+                        tokenStore.getTokenBefore(previous)!,
+                        previous,
+                        '',
+                    ]);
+                }
 
-                if (hasOpeningNewline === hasClosingNewline) return;
+                // Keep the whole list's layout when a boundary comment prevents safe compaction.
+                if (gaps.some(([left, right]) => tokenStore.commentsExistBetween(left, right))) return;
+                const multilineGaps = gaps.filter(([left, right]) => left.loc.end.line !== right.loc.start.line);
+                if (!multilineGaps.length) return;
 
                 context.report({
-                    fix: (fixer) => hasOpeningNewline
-                        ? fixer.insertTextBefore(closingParen, '\n')
-                        : fixer.insertTextAfter(openingParen, '\n'),
-                    messageId: 'singleBoundary',
+                    fix: (fixer) => multilineGaps.map(([
+                        left,
+                        right,
+                        text,
+                    ]) => fixer.replaceTextRange(
+                        [
+                            left.range[1],
+                            right.range[0],
+                        ],
+                        text,
+                    )),
+                    messageId: 'compactTestCall',
                     node,
                 });
-
-                return;
             }
 
-            if (!closingParen || openingParen.loc.start.line === closingParen.loc.end.line) return;
+            function checkParameterLayout(
+                node: CallNode | FunctionNode,
+                items: readonly ListItem[],
+            ): void {
+                const first = items[0];
+                if (!first) return;
+                const isSingleParameter = items.length === 1;
+
+                // JSX argument layout belongs to the JSX formatting rules.
+                const firstType: string = first.type;
+                if (isSingleParameter && (firstType === 'JSXElement' || firstType === 'JSXFragment')) return;
+                let openingParen;
+                if (node.type === 'CallExpression' || node.type === 'NewExpression') {
+                    openingParen = tokenStore.getTokenAfter(
+                        node.typeArguments ?? node.callee,
+                        (token) => token.type === 'Punctuator' && token.value === '(',
+                    );
+                } else {
+                    openingParen = tokenStore.getTokenBefore(first);
+                }
 
-            if (isTemplate) {
-                // Script list formatters do not traverse Vue template expressions.
-                const newlineOffsets: number[] = [];
-                if (openingParen.loc.end.line === next.loc.start.line) newlineOffsets.push(openingParen.range[1]);
-                for (let index = 1; index < items.length; index++) {
-                    const item = items[index]!;
-                    const comma = tokenStore.getTokensBetween(items[index - 1]!, item)
-                        .find((token) => token.value === ',');
+                if (!openingParen || openingParen.value !== '(') return;
+                // An unparenthesized arrow must not borrow its parent's delimiters.
+                if (openingParen.range[0] < node.range![0]) return;
+                const closingParen = node.type === 'CallExpression' || node.type === 'NewExpression'
+                    ? tokenStore.getLastToken(node)
+                    : tokenStore.getTokenAfter(items.at(-1)!, (token) => token.value === ')');
 
-                    if (comma && comma.loc.end.line === tokenStore.getTokenAfter(comma)!.loc.start.line) {
-                        newlineOffsets.push(comma.range[1]);
-                    }
-                }
+                const next = tokenStore.getTokenAfter(openingParen)!;
+
+                if (isSingleParameter) {
+                    if (!closingParen || closingParen.value !== ')') return;
+                    let previous = tokenStore.getTokenBefore(closingParen)!;
+                    if (previous.value === ',') previous = tokenStore.getTokenBefore(previous)!;
+                    if (
+                        tokenStore.commentsExistBetween(openingParen, next)
+                        || tokenStore.commentsExistBetween(previous, closingParen)
+                    ) return;
+
+                    const hasOpeningNewline = openingParen.loc.end.line !== next.loc.start.line;
+                    const hasClosingNewline = tokenStore.getTokenBefore(closingParen)!.loc.end.line
+                      !== closingParen.loc.start.line;
 
-                if (
-                    closingParen.value === ')'
-                    && tokenStore.getTokenBefore(closingParen)!.loc.end.line === closingParen.loc.start.line
-                ) newlineOffsets.push(closingParen.range[0]);
+                    if (hasOpeningNewline === hasClosingNewline) return;
 
-                if (newlineOffsets.length) {
                     context.report({
-                        fix: (fixer) => newlineOffsets.map((offset) => fixer.insertTextAfterRange(
-                            [
-                                offset,
-                                offset,
-                            ],
-                            '\n',
-                        )),
-                        messageId: 'newline',
-                        node: first,
+                        fix: (fixer) => hasOpeningNewline
+                            ? fixer.insertTextBefore(closingParen, '\n')
+                            : fixer.insertTextAfter(openingParen, '\n'),
+                        messageId: 'singleBoundary',
+                        node,
                     });
+
+                    return;
                 }
 
-                return;
-            }
+                if (!closingParen || openingParen.loc.start.line === closingParen.loc.end.line) return;
 
-            if (openingParen.loc.end.line !== next.loc.start.line) return;
+                if (isTemplate) {
+                    // Script list formatters do not traverse Vue template expressions.
+                    const newlineOffsets: number[] = [];
+                    if (openingParen.loc.end.line === next.loc.start.line) newlineOffsets.push(openingParen.range[1]);
+                    for (let index = 1; index < items.length; index++) {
+                        const item = items[index]!;
+                        const comma = tokenStore.getTokensBetween(items[index - 1]!, item)
+                            .find((token) => token.value === ',');
 
-            context.report({
-                fix: (fixer) => fixer.insertTextAfter(openingParen, '\n'),
-                messageId: 'newline',
-                node: first,
-            });
-        }
+                        if (comma && comma.loc.end.line === tokenStore.getTokenAfter(comma)!.loc.start.line) {
+                            newlineOffsets.push(comma.range[1]);
+                        }
+                    }
+
+                    if (
+                        closingParen.value === ')'
+                        && tokenStore.getTokenBefore(closingParen)!.loc.end.line === closingParen.loc.start.line
+                    ) newlineOffsets.push(closingParen.range[0]);
+
+                    if (newlineOffsets.length) {
+                        context.report({
+                            fix: (fixer) => newlineOffsets.map((offset) => fixer.insertTextBeforeRange(
+                                [
+                                    offset,
+                                    offset,
+                                ],
+                                '\n',
+                            )),
+                            messageId: 'newline',
+                            node: first,
+                        });
+                    }
+
+                    return;
+                }
+
+                if (openingParen.loc.end.line !== next.loc.start.line) return;
+
+                context.report({
+                    fix: (fixer) => fixer.insertTextAfter(openingParen, '\n'),
+                    messageId: 'newline',
+                    node: first,
+                });
+            }
 
-        function createVisitor(tokenStore: TokenStore, isTemplate: boolean): Rule.RuleListener {
             return {
-                ArrowFunctionExpression: (node) => checkParameterLayout(node, node.params, tokenStore, isTemplate),
+                ArrowFunctionExpression: (node) => checkParameterLayout(node, node.params),
                 CallExpression: (node) => {
                     const { callee } = node;
-                    if (isTestFile) {
+                    if (compactTestCalls) {
                         const target = callee.type === 'MemberExpression'
                           && !callee.computed
                           && callee.property.type === 'Identifier'
@@ -137,27 +208,37 @@ export const consistentParameterLayout: Rule.RuleModule = {
                         if (
                             target.type === 'Identifier'
                             && (target.name === 'describe' || target.name === 'it')
-                        ) return;
+                        ) {
+                            checkTestCallLayout(node);
+                            return;
+                        }
                     }
 
-                    checkParameterLayout(node, node.arguments, tokenStore, isTemplate);
+                    checkParameterLayout(node, node.arguments);
                 },
-                FunctionDeclaration: (node) => checkParameterLayout(node, node.params, tokenStore, isTemplate),
-                FunctionExpression: (node) => checkParameterLayout(node, node.params, tokenStore, isTemplate),
-                NewExpression: (node) => checkParameterLayout(node, node.arguments, tokenStore, isTemplate),
+                FunctionDeclaration: (node) => checkParameterLayout(node, node.params),
+                FunctionExpression: (node) => checkParameterLayout(node, node.params),
+                NewExpression: (node) => checkParameterLayout(node, node.arguments),
             };
         }
 
         return defineScriptAndTemplateVisitors(context.sourceCode, createVisitor);
     },
     meta: {
-        docs: { description: 'Preserve consistent single-parameter boundaries and expand multiline parameter lists.' },
+        docs: { description: 'Keep parameter boundaries consistent, expand multiline lists, and compact test calls.' },
         fixable: 'whitespace',
         messages: {
+            compactTestCall: 'Keep test-call arguments beside their parentheses and each other.',
             newline: 'Start a multiline parameter list on a new line.',
             singleBoundary: 'Use matching newline boundaries around a single parameter.',
         },
-        schema: [],
+        schema: [
+            {
+                additionalProperties: false,
+                properties: { compactTestCalls: { type: 'boolean' } },
+                type: 'object',
+            },
+        ],
         type: 'layout',
     },
 };

package/src/_internals/rules/statement-padding.ts

@@ -10,12 +10,20 @@ export const statementPadding: Rule.RuleModule = {
             for (let index = 1; index < statements.length; index++) {
                 const previous = statements[index - 1]!;
                 const next = statements[index]!;
+                if (
+                    [
+                        previous,
+                        next,
+                    ].some((node) =>
+                        node.type === 'ImportDeclaration'
+                        || node.type === 'ExportAllDeclaration'
+                        || (node.type === 'ExportNamedDeclaration' && node.source))
+                ) continue;
+
+                const previousFirstToken = sourceCode.getFirstToken(previous)!;
                 const lastToken = sourceCode.getLastToken(previous)!;
                 const firstToken = sourceCode.getFirstToken(next)!;
-                const closingLine = sourceCode.lines[lastToken.loc.end.line - 1]!;
-                const openingLine = sourceCode.lines[firstToken.loc.start.line - 1]!;
-                const hasDifferentIndent = /^\s*/.exec(closingLine)![0] !== /^\s*/.exec(openingLine)![0];
-                const hasStandaloneClosing = /^[)\]}]+;?$/.test(closingLine.slice(0, lastToken.loc.end.column).trim());
+                const isMultiline = previousFirstToken.loc.start.line !== lastToken.loc.end.line;
                 const blockNode = previous.type === 'ExportDefaultDeclaration'
                   || previous.type === 'ExportNamedDeclaration'
                     ? previous.declaration
@@ -36,24 +44,27 @@ export const statementPadding: Rule.RuleModule = {
                     'WithStatement',
                 ].includes(blockNode.type);
 
-                if (!hasDifferentIndent && !hasStandaloneClosing && !hasBlockClosing) continue;
-                const comments = sourceCode.getCommentsBefore(next);
-                if (
-                    sourceCode
-                        .lines
-                        .slice(lastToken.loc.end.line, firstToken.loc.start.line - 1)
-                        .some((line, index) => !line.trim() && !comments.some((comment) =>
-                            comment.loc!.start.line <= lastToken.loc.end.line + index + 1
-                            && comment.loc!.end.line >= lastToken.loc.end.line + index + 1))
-                ) continue;
+                if (!isMultiline && !hasBlockClosing) continue;
+                let previousEnd = lastToken.range[1];
+                let previousEndLine = lastToken.loc.end.line;
+                let nextStart = firstToken.range[0];
+                let nextStartLine = firstToken.loc.start.line;
 
-                // Keep leading comments attached to the next statement and trailing comments in place.
-                const boundary = comments
-                    .find((comment) => comment.loc!.start.line > lastToken.loc.end.line) ?? firstToken;
+                // Include trailing comments in the previous boundary, not leading comments of the next statement.
+                for (const comment of sourceCode.getCommentsBefore(next)) {
+                    if (comment.loc!.start.line === previousEndLine) {
+                        previousEnd = comment.range![1];
+                        previousEndLine = comment.loc!.end.line;
+                    } else {
+                        nextStart = comment.range![0];
+                        nextStartLine = comment.loc!.start.line;
+                        break;
+                    }
+                }
 
-                const offset = boundary.loc!.start.line > lastToken.loc.end.line
-                    ? boundary.range![0] - boundary.loc!.start.column
-                    : boundary.range![0];
+                if (nextStartLine > previousEndLine + 1) continue;
+                const linebreakIndex = sourceCode.text.slice(previousEnd, nextStart).indexOf('\n');
+                const offset = linebreakIndex === -1 ? nextStart : previousEnd + linebreakIndex + 1;
 
                 context.report({
                     fix: (fixer) => fixer.insertTextBeforeRange(
@@ -61,7 +72,7 @@ export const statementPadding: Rule.RuleModule = {
                             offset,
                             offset,
                         ],
-                        boundary.loc!.start.line === lastToken.loc.end.line ? '\n\n' : '\n',
+                        linebreakIndex === -1 ? '\n\n' : '\n',
                     ),
                     messageId: 'blankLine',
                     node: next,
@@ -77,7 +88,7 @@ export const statementPadding: Rule.RuleModule = {
         };
     },
     meta: {
-        docs: { description: 'Separate statements after closing lines, blocks, or indentation changes.' },
+        docs: { description: 'Separate complete multiline statements and block-ending statements with blank lines.' },
         fixable: 'whitespace',
         messages: { blankLine: 'Add a blank line between these complete statements.' },
         schema: [],

package/src/_internals/type-aware.ts

@@ -0,0 +1,28 @@
+import type { TypedFlatConfigItem } from '@antfu/eslint-config';
+
+export function createTypeAwareConfig(): TypedFlatConfigItem {
+    return {
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigRootDir: process.cwd(),
+            },
+        },
+        rules: {
+            'require-await': 'off',
+            'ts/await-thenable': 'error',
+            'ts/no-base-to-string': 'error',
+            'ts/no-floating-promises': 'error',
+            'ts/no-for-in-array': 'error',
+            'ts/no-misused-promises': 'error',
+            'ts/no-misused-spread': 'error',
+            'ts/no-unnecessary-type-assertion': 'error',
+            'ts/require-await': 'error',
+            'ts/return-await': 'error',
+            'ts/switch-exhaustiveness-check': [
+                'error',
+                { considerDefaultExhaustiveForUnions: true },
+            ],
+        },
+    };
+}