@kikiutils/eslint-config 9.3.2 → 10.1.0

package/README.md

@@ -26,6 +26,14 @@ You can also use `yarn`, `npm`, or `bun`.
 
 ## Usage
 
+TypeScript and Vue configs enable type-aware checks using TypeScript's Project Service.
+Linted files must belong to a discoverable `tsconfig.json`; project references are supported.
+The default setup does not require an additional `typescript.tsconfigPath` option.
+JavaScript files retain syntax-only linting.
+TypeScript tool configs (`*.config.ts`, `*.config.mts`, `*.config.cts`) are excluded from type-aware checks.
+Base configs keep linting Markdown itself, but exclude its code blocks from all lint rules.
+Style configs format CSS and SCSS; indented Sass (`.sass`) is not supported.
+
 ## License
 
 [MIT License](./LICENSE)

package/dist/_internals/jsdoc.d.ts

@@ -0,0 +1,53 @@
+export declare const jsdocSettings: {
+  jsdoc: {
+    tagNamePreference: {
+      arg: string;
+      argument: string;
+      desc: boolean;
+      description: boolean;
+      exception: string;
+      return: string;
+      types: boolean;
+    };
+  };
+};
+export declare const typescriptJsdocConfig: {
+  rules: {
+    'jsdoc/check-tag-names': ["error", {
+      definedTags: string[];
+    }];
+    'jsdoc/multiline-blocks': ["error", {
+      noSingleLineBlocks: true;
+      singleLineTags: never[];
+    }];
+    'jsdoc/no-types': "error";
+  };
+  settings: {
+    jsdoc: {
+      mode: string;
+      tagNamePreference: {
+        callback: boolean;
+        class: boolean;
+        constructor: boolean;
+        default: string;
+        function: boolean;
+        method: boolean;
+        readonly: boolean;
+        static: boolean;
+        template: boolean;
+        type: boolean;
+        typedef: boolean;
+        typeParam: string;
+        virtual: string;
+        arg: string;
+        argument: string;
+        desc: boolean;
+        description: boolean;
+        exception: string;
+        return: string;
+        types: boolean;
+      };
+    };
+  };
+};
+//# sourceMappingURL=jsdoc.d.ts.map

package/dist/_internals/jsdoc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsdoc.d.ts","names":[],"sources":["../../src/_internals/jsdoc.ts"],"mappings":"A,qBAEa;;;;;;;;;;;;;qBAcA"}

package/dist/_internals/jsdoc.js

@@ -0,0 +1,57 @@
+// src/_internals/jsdoc.ts
+const jsdocSettings = { jsdoc: { tagNamePreference: {
+	arg: "param",
+	argument: "param",
+	desc: false,
+	description: false,
+	exception: "throws",
+	return: "returns",
+	types: false
+} } };
+const typescriptJsdocConfig = {
+	rules: {
+		"jsdoc/check-tag-names": ["error", { definedTags: [
+			"alpha",
+			"beta",
+			"defaultValue",
+			"eventProperty",
+			"experimental",
+			"hidden",
+			"inheritDoc",
+			"internal",
+			"packageDocumentation",
+			"privateRemarks",
+			"remarks",
+			"sealed",
+			"typeParam",
+			"virtual"
+		] }],
+		"jsdoc/multiline-blocks": ["error", {
+			noSingleLineBlocks: true,
+			singleLineTags: []
+		}],
+		"jsdoc/no-types": "error"
+	},
+	settings: { jsdoc: {
+		mode: "typescript",
+		tagNamePreference: {
+			...jsdocSettings.jsdoc.tagNamePreference,
+			callback: false,
+			class: false,
+			constructor: false,
+			default: "defaultValue",
+			function: false,
+			method: false,
+			readonly: false,
+			static: false,
+			template: false,
+			type: false,
+			typedef: false,
+			typeParam: "typeParam",
+			virtual: "virtual"
+		}
+	} }
+};
+export { jsdocSettings, typescriptJsdocConfig };
+
+//# sourceMappingURL=jsdoc.js.map

package/dist/_internals/jsdoc.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"jsdoc.js","names":[],"sources":["../../src/_internals/jsdoc.ts"],"sourcesContent":["import type { TypedFlatConfigItem } from '@antfu/eslint-config';\n\nexport const jsdocSettings = {\n    jsdoc: {\n        tagNamePreference: {\n            arg: 'param',\n            argument: 'param',\n            desc: false,\n            description: false,\n            exception: 'throws',\n            return: 'returns',\n            types: false,\n        },\n    },\n};\n\nexport const typescriptJsdocConfig = {\n    rules: {\n        'jsdoc/check-tag-names': [\n            'error',\n            {\n                definedTags: [\n                    'alpha',\n                    'beta',\n                    'defaultValue',\n                    'eventProperty',\n                    'experimental',\n                    'hidden',\n                    'inheritDoc',\n                    'internal',\n                    'packageDocumentation',\n                    'privateRemarks',\n                    'remarks',\n                    'sealed',\n                    'typeParam',\n                    'virtual',\n                ],\n            },\n        ],\n        'jsdoc/multiline-blocks': [\n            'error',\n            {\n                noSingleLineBlocks: true,\n                singleLineTags: [],\n            },\n        ],\n        'jsdoc/no-types': 'error',\n    },\n    settings: {\n        jsdoc: {\n            mode: 'typescript',\n            tagNamePreference: {\n                ...jsdocSettings.jsdoc.tagNamePreference,\n                callback: false,\n                class: false,\n                constructor: false,\n                default: 'defaultValue',\n                function: false,\n                method: false,\n                readonly: false,\n                static: false,\n                template: false,\n                type: false,\n                typedef: false,\n                typeParam: 'typeParam',\n                virtual: 'virtual',\n            },\n        },\n    },\n} satisfies TypedFlatConfigItem;\n"],"mappings":";AAEA,MAAa,gBAAgB,EACzB,OAAO,EACH,mBAAmB;CACf,KAAK;CACL,UAAU;CACV,MAAM;CACN,aAAa;CACb,WAAW;CACX,QAAQ;CACR,OAAO;AACX,EACJ,EACJ;AAEA,MAAa,wBAAwB;CACjC,OAAO;EACH,yBAAyB,CACrB,SACA,EACI,aAAa;GACT;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;EACJ,EACJ,CACJ;EACA,0BAA0B,CACtB,SACA;GACI,oBAAoB;GACpB,gBAAgB,CAAC;EACrB,CACJ;EACA,kBAAkB;CACtB;CACA,UAAU,EACN,OAAO;EACH,MAAM;EACN,mBAAmB;GACf,GAAG,cAAc,MAAM;GACvB,UAAU;GACV,OAAO;GACP,aAAa;GACb,SAAS;GACT,UAAU;GACV,QAAQ;GACR,UAAU;GACV,QAAQ;GACR,UAAU;GACV,MAAM;GACN,SAAS;GACT,WAAW;GACX,SAAS;EACb;CACJ,EACJ;AACJ"}

package/dist/_internals/rules/consistent-parameter-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consistent-parameter-layout.d.ts","names":[],"sources":["../../../src/_internals/rules/consistent-parameter-layout.ts"],"mappings":";qBAaa,2BAA2B,KAAK"}
+{"version":3,"file":"consistent-parameter-layout.d.ts","names":[],"sources":["../../../src/_internals/rules/consistent-parameter-layout.ts"],"mappings":";qBAgBa,2BAA2B,KAAK"}

package/dist/_internals/rules/consistent-parameter-layout.js

@@ -2,86 +2,133 @@ import { defineScriptAndTemplateVisitors } from "../utils.js";
 // src/_internals/rules/consistent-parameter-layout.ts
 const consistentParameterLayout = {
 	create(context) {
-		const isTestFile = /\.test\.[jt]sx?$/.test(context.filename);
-		function checkParameterLayout(node, items, tokenStore, isTemplate) {
-			const first = items[0];
-			if (!first) return;
-			const isSingleParameter = items.length === 1;
-			const firstType = first.type;
-			if (isSingleParameter && (firstType === "JSXElement" || firstType === "JSXFragment")) return;
-			let openingParen;
-			if (node.type === "CallExpression" || node.type === "NewExpression") {
-				const call = node;
-				openingParen = tokenStore.getTokenAfter(call.typeArguments ?? call.callee, (token) => token.type === "Punctuator" && token.value === "(");
-			} else openingParen = tokenStore.getTokenBefore(first);
-			if (!openingParen || openingParen.value !== "(") return;
-			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);
-			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;
-				if (hasOpeningNewline === (tokenStore.getTokenBefore(closingParen).loc.end.line !== closingParen.loc.start.line)) return;
+		const compactTestCalls = context.options[0]?.compactTestCalls === true;
+		function createVisitor(tokenStore, isTemplate) {
+			function checkTestCallLayout(node) {
+				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 = [[
+					openingParen,
+					tokenStore.getTokenAfter(openingParen),
+					""
+				], [
+					previous,
+					closingParen,
+					""
+				]];
+				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),
+						" "
+					]);
+				}
+				if (previous.value === ",") gaps.push([
+					tokenStore.getTokenBefore(previous),
+					previous,
+					""
+				]);
+				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;
-			if (isTemplate) {
-				const newlineOffsets = [];
-				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 (comma && comma.loc.end.line === tokenStore.getTokenAfter(comma).loc.start.line) newlineOffsets.push(comma.range[1]);
+			function checkParameterLayout(node, items) {
+				const first = items[0];
+				if (!first) return;
+				const isSingleParameter = items.length === 1;
+				const firstType = 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 (!openingParen || openingParen.value !== "(") return;
+				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);
+				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;
+					if (hasOpeningNewline === (tokenStore.getTokenBefore(closingParen).loc.end.line !== closingParen.loc.start.line)) return;
+					context.report({
+						fix: (fixer) => hasOpeningNewline ? fixer.insertTextBefore(closingParen, "\n") : fixer.insertTextAfter(openingParen, "\n"),
+						messageId: "singleBoundary",
+						node
+					});
+					return;
 				}
-				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.insertTextAfterRange([offset, offset], "\n")),
+				if (!closingParen || openingParen.loc.start.line === closingParen.loc.end.line) return;
+				if (isTemplate) {
+					const newlineOffsets = [];
+					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 (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
 				});
-				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, isTemplate) {
 			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" && callee.property.name === "concurrent" ? callee.object : callee;
-						if (target.type === "Identifier" && (target.name === "describe" || target.name === "it")) return;
+						if (target.type === "Identifier" && (target.name === "describe" || target.name === "it")) {
+							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/dist/_internals/rules/consistent-parameter-layout.js.map

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

package/dist/_internals/rules/statement-padding.js

@@ -6,12 +6,11 @@ const statementPadding = {
 			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 : previous;
 				const hasBlockClosing = lastToken.value === "}" && blockNode && [
 					"BlockStatement",
@@ -27,13 +26,24 @@ const statementPadding = {
 					"WhileStatement",
 					"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;
-				const boundary = comments.find((comment) => comment.loc.start.line > lastToken.loc.end.line) ?? firstToken;
-				const offset = boundary.loc.start.line > lastToken.loc.end.line ? boundary.range[0] - boundary.loc.start.column : boundary.range[0];
+				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;
+				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;
+				}
+				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([offset, offset], boundary.loc.start.line === lastToken.loc.end.line ? "\n\n" : "\n"),
+					fix: (fixer) => fixer.insertTextBeforeRange([offset, offset], linebreakIndex === -1 ? "\n\n" : "\n"),
 					messageId: "blankLine",
 					node: next
 				});
@@ -47,7 +57,7 @@ const statementPadding = {
 		};
 	},
 	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/dist/_internals/rules/statement-padding.js.map

@@ -1 +1 @@
-{"version":3,"file":"statement-padding.js","names":[],"sources":["../../../src/_internals/rules/statement-padding.ts"],"sourcesContent":["import type { Rule } from 'eslint';\n\ntype StatementNode = Extract<Rule.Node, { type: 'Program' }>['body'][number];\n\nexport const statementPadding: Rule.RuleModule = {\n    create(context) {\n        const { sourceCode } = context;\n\n        function checkStatements(statements: readonly StatementNode[]): void {\n            for (let index = 1; index < statements.length; index++) {\n                const previous = statements[index - 1]!;\n                const next = statements[index]!;\n                const lastToken = sourceCode.getLastToken(previous)!;\n                const firstToken = sourceCode.getFirstToken(next)!;\n                const closingLine = sourceCode.lines[lastToken.loc.end.line - 1]!;\n                const openingLine = sourceCode.lines[firstToken.loc.start.line - 1]!;\n                const hasDifferentIndent = /^\\s*/.exec(closingLine)![0] !== /^\\s*/.exec(openingLine)![0];\n                const hasStandaloneClosing = /^[)\\]}]+;?$/.test(closingLine.slice(0, lastToken.loc.end.column).trim());\n                const blockNode = previous.type === 'ExportDefaultDeclaration'\n                  || previous.type === 'ExportNamedDeclaration'\n                    ? previous.declaration\n                    : previous;\n\n                const hasBlockClosing = lastToken.value === '}' && blockNode && [\n                    'BlockStatement',\n                    'ClassDeclaration',\n                    'ForInStatement',\n                    'ForOfStatement',\n                    'ForStatement',\n                    'FunctionDeclaration',\n                    'IfStatement',\n                    'LabeledStatement',\n                    'SwitchStatement',\n                    'TryStatement',\n                    'WhileStatement',\n                    'WithStatement',\n                ].includes(blockNode.type);\n\n                if (!hasDifferentIndent && !hasStandaloneClosing && !hasBlockClosing) continue;\n                const comments = sourceCode.getCommentsBefore(next);\n                if (\n                    sourceCode\n                        .lines\n                        .slice(lastToken.loc.end.line, firstToken.loc.start.line - 1)\n                        .some((line, index) => !line.trim() && !comments.some((comment) =>\n                            comment.loc!.start.line <= lastToken.loc.end.line + index + 1\n                            && comment.loc!.end.line >= lastToken.loc.end.line + index + 1))\n                ) continue;\n\n                // Keep leading comments attached to the next statement and trailing comments in place.\n                const boundary = comments\n                    .find((comment) => comment.loc!.start.line > lastToken.loc.end.line) ?? firstToken;\n\n                const offset = boundary.loc!.start.line > lastToken.loc.end.line\n                    ? boundary.range![0] - boundary.loc!.start.column\n                    : boundary.range![0];\n\n                context.report({\n                    fix: (fixer) => fixer.insertTextBeforeRange(\n                        [\n                            offset,\n                            offset,\n                        ],\n                        boundary.loc!.start.line === lastToken.loc.end.line ? '\\n\\n' : '\\n',\n                    ),\n                    messageId: 'blankLine',\n                    node: next,\n                });\n            }\n        }\n\n        return {\n            BlockStatement: (node) => checkStatements(node.body),\n            Program: (node) => checkStatements(node.body),\n            StaticBlock: (node) => checkStatements(node.body),\n            SwitchCase: (node) => checkStatements(node.consequent),\n        };\n    },\n    meta: {\n        docs: { description: 'Separate statements after closing lines, blocks, or indentation changes.' },\n        fixable: 'whitespace',\n        messages: { blankLine: 'Add a blank line between these complete statements.' },\n        schema: [],\n        type: 'layout',\n    },\n};\n"],"mappings":";AAIA,MAAa,mBAAoC;CAC7C,OAAO,SAAS;EACZ,MAAM,EAAE,eAAe;EAEvB,SAAS,gBAAgB,YAA4C;GACjE,KAAK,IAAI,QAAQ,GAAG,QAAQ,WAAW,QAAQ,SAAS;IACpD,MAAM,WAAW,WAAW,QAAQ;IACpC,MAAM,OAAO,WAAW;IACxB,MAAM,YAAY,WAAW,aAAa,QAAQ;IAClD,MAAM,aAAa,WAAW,cAAc,IAAI;IAChD,MAAM,cAAc,WAAW,MAAM,UAAU,IAAI,IAAI,OAAO;IAC9D,MAAM,cAAc,WAAW,MAAM,WAAW,IAAI,MAAM,OAAO;IACjE,MAAM,qBAAqB,OAAO,KAAK,WAAW,CAAC,CAAE,OAAO,OAAO,KAAK,WAAW,CAAC,CAAE;IACtF,MAAM,uBAAuB,cAAc,KAAK,YAAY,MAAM,GAAG,UAAU,IAAI,IAAI,MAAM,CAAC,CAAC,KAAK,CAAC;IACrG,MAAM,YAAY,SAAS,SAAS,8BAC/B,SAAS,SAAS,2BACjB,SAAS,cACT;IAEN,MAAM,kBAAkB,UAAU,UAAU,OAAO,aAAa;KAC5D;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;IACJ,CAAC,CAAC,SAAS,UAAU,IAAI;IAEzB,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,CAAC,iBAAiB;IACtE,MAAM,WAAW,WAAW,kBAAkB,IAAI;IAClD,IACI,WACK,MACA,MAAM,UAAU,IAAI,IAAI,MAAM,WAAW,IAAI,MAAM,OAAO,CAAC,CAAC,CAC5D,MAAM,MAAM,UAAU,CAAC,KAAK,KAAK,KAAK,CAAC,SAAS,MAAM,YACnD,QAAQ,IAAK,MAAM,QAAQ,UAAU,IAAI,IAAI,OAAO,QAAQ,KACzD,QAAQ,IAAK,IAAI,QAAQ,UAAU,IAAI,IAAI,OAAO,QAAQ,CAAC,CAAC,GACzE;IAGF,MAAM,WAAW,SACZ,MAAM,YAAY,QAAQ,IAAK,MAAM,OAAO,UAAU,IAAI,IAAI,IAAI,KAAK;IAE5E,MAAM,SAAS,SAAS,IAAK,MAAM,OAAO,UAAU,IAAI,IAAI,OACtD,SAAS,MAAO,KAAK,SAAS,IAAK,MAAM,SACzC,SAAS,MAAO;IAEtB,QAAQ,OAAO;KACX,MAAM,UAAU,MAAM,sBAClB,CACI,QACA,MACJ,GACA,SAAS,IAAK,MAAM,SAAS,UAAU,IAAI,IAAI,OAAO,SAAS,IACnE;KACA,WAAW;KACX,MAAM;IACV,CAAC;GACL;EACJ;EAEA,OAAO;GACH,iBAAiB,SAAS,gBAAgB,KAAK,IAAI;GACnD,UAAU,SAAS,gBAAgB,KAAK,IAAI;GAC5C,cAAc,SAAS,gBAAgB,KAAK,IAAI;GAChD,aAAa,SAAS,gBAAgB,KAAK,UAAU;EACzD;CACJ;CACA,MAAM;EACF,MAAM,EAAE,aAAa,2EAA2E;EAChG,SAAS;EACT,UAAU,EAAE,WAAW,sDAAsD;EAC7E,QAAQ,CAAC;EACT,MAAM;CACV;AACJ"}
+{"version":3,"file":"statement-padding.js","names":[],"sources":["../../../src/_internals/rules/statement-padding.ts"],"sourcesContent":["import type { Rule } from 'eslint';\n\ntype StatementNode = Extract<Rule.Node, { type: 'Program' }>['body'][number];\n\nexport const statementPadding: Rule.RuleModule = {\n    create(context) {\n        const { sourceCode } = context;\n\n        function checkStatements(statements: readonly StatementNode[]): void {\n            for (let index = 1; index < statements.length; index++) {\n                const previous = statements[index - 1]!;\n                const next = statements[index]!;\n                if (\n                    [\n                        previous,\n                        next,\n                    ].some((node) =>\n                        node.type === 'ImportDeclaration'\n                        || node.type === 'ExportAllDeclaration'\n                        || (node.type === 'ExportNamedDeclaration' && node.source))\n                ) continue;\n\n                const previousFirstToken = sourceCode.getFirstToken(previous)!;\n                const lastToken = sourceCode.getLastToken(previous)!;\n                const firstToken = sourceCode.getFirstToken(next)!;\n                const isMultiline = previousFirstToken.loc.start.line !== lastToken.loc.end.line;\n                const blockNode = previous.type === 'ExportDefaultDeclaration'\n                  || previous.type === 'ExportNamedDeclaration'\n                    ? previous.declaration\n                    : previous;\n\n                const hasBlockClosing = lastToken.value === '}' && blockNode && [\n                    'BlockStatement',\n                    'ClassDeclaration',\n                    'ForInStatement',\n                    'ForOfStatement',\n                    'ForStatement',\n                    'FunctionDeclaration',\n                    'IfStatement',\n                    'LabeledStatement',\n                    'SwitchStatement',\n                    'TryStatement',\n                    'WhileStatement',\n                    'WithStatement',\n                ].includes(blockNode.type);\n\n                if (!isMultiline && !hasBlockClosing) continue;\n                let previousEnd = lastToken.range[1];\n                let previousEndLine = lastToken.loc.end.line;\n                let nextStart = firstToken.range[0];\n                let nextStartLine = firstToken.loc.start.line;\n\n                // Include trailing comments in the previous boundary, not leading comments of the next statement.\n                for (const comment of sourceCode.getCommentsBefore(next)) {\n                    if (comment.loc!.start.line === previousEndLine) {\n                        previousEnd = comment.range![1];\n                        previousEndLine = comment.loc!.end.line;\n                    } else {\n                        nextStart = comment.range![0];\n                        nextStartLine = comment.loc!.start.line;\n                        break;\n                    }\n                }\n\n                if (nextStartLine > previousEndLine + 1) continue;\n                const linebreakIndex = sourceCode.text.slice(previousEnd, nextStart).indexOf('\\n');\n                const offset = linebreakIndex === -1 ? nextStart : previousEnd + linebreakIndex + 1;\n\n                context.report({\n                    fix: (fixer) => fixer.insertTextBeforeRange(\n                        [\n                            offset,\n                            offset,\n                        ],\n                        linebreakIndex === -1 ? '\\n\\n' : '\\n',\n                    ),\n                    messageId: 'blankLine',\n                    node: next,\n                });\n            }\n        }\n\n        return {\n            BlockStatement: (node) => checkStatements(node.body),\n            Program: (node) => checkStatements(node.body),\n            StaticBlock: (node) => checkStatements(node.body),\n            SwitchCase: (node) => checkStatements(node.consequent),\n        };\n    },\n    meta: {\n        docs: { description: 'Separate complete multiline statements and block-ending statements with blank lines.' },\n        fixable: 'whitespace',\n        messages: { blankLine: 'Add a blank line between these complete statements.' },\n        schema: [],\n        type: 'layout',\n    },\n};\n"],"mappings":";AAIA,MAAa,mBAAoC;CAC7C,OAAO,SAAS;EACZ,MAAM,EAAE,eAAe;EAEvB,SAAS,gBAAgB,YAA4C;GACjE,KAAK,IAAI,QAAQ,GAAG,QAAQ,WAAW,QAAQ,SAAS;IACpD,MAAM,WAAW,WAAW,QAAQ;IACpC,MAAM,OAAO,WAAW;IACxB,IACI,CACI,UACA,IACJ,CAAC,CAAC,MAAM,SACJ,KAAK,SAAS,uBACX,KAAK,SAAS,0BACb,KAAK,SAAS,4BAA4B,KAAK,MAAO,GAChE;IAEF,MAAM,qBAAqB,WAAW,cAAc,QAAQ;IAC5D,MAAM,YAAY,WAAW,aAAa,QAAQ;IAClD,MAAM,aAAa,WAAW,cAAc,IAAI;IAChD,MAAM,cAAc,mBAAmB,IAAI,MAAM,SAAS,UAAU,IAAI,IAAI;IAC5E,MAAM,YAAY,SAAS,SAAS,8BAC/B,SAAS,SAAS,2BACjB,SAAS,cACT;IAEN,MAAM,kBAAkB,UAAU,UAAU,OAAO,aAAa;KAC5D;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;KACA;IACJ,CAAC,CAAC,SAAS,UAAU,IAAI;IAEzB,IAAI,CAAC,eAAe,CAAC,iBAAiB;IACtC,IAAI,cAAc,UAAU,MAAM;IAClC,IAAI,kBAAkB,UAAU,IAAI,IAAI;IACxC,IAAI,YAAY,WAAW,MAAM;IACjC,IAAI,gBAAgB,WAAW,IAAI,MAAM;IAGzC,KAAK,MAAM,WAAW,WAAW,kBAAkB,IAAI,GACnD,IAAI,QAAQ,IAAK,MAAM,SAAS,iBAAiB;KAC7C,cAAc,QAAQ,MAAO;KAC7B,kBAAkB,QAAQ,IAAK,IAAI;IACvC,OAAO;KACH,YAAY,QAAQ,MAAO;KAC3B,gBAAgB,QAAQ,IAAK,MAAM;KACnC;IACJ;IAGJ,IAAI,gBAAgB,kBAAkB,GAAG;IACzC,MAAM,iBAAiB,WAAW,KAAK,MAAM,aAAa,SAAS,CAAC,CAAC,QAAQ,IAAI;IACjF,MAAM,SAAS,mBAAmB,KAAK,YAAY,cAAc,iBAAiB;IAElF,QAAQ,OAAO;KACX,MAAM,UAAU,MAAM,sBAClB,CACI,QACA,MACJ,GACA,mBAAmB,KAAK,SAAS,IACrC;KACA,WAAW;KACX,MAAM;IACV,CAAC;GACL;EACJ;EAEA,OAAO;GACH,iBAAiB,SAAS,gBAAgB,KAAK,IAAI;GACnD,UAAU,SAAS,gBAAgB,KAAK,IAAI;GAC5C,cAAc,SAAS,gBAAgB,KAAK,IAAI;GAChD,aAAa,SAAS,gBAAgB,KAAK,UAAU;EACzD;CACJ;CACA,MAAM;EACF,MAAM,EAAE,aAAa,uFAAuF;EAC5G,SAAS;EACT,UAAU,EAAE,WAAW,sDAAsD;EAC7E,QAAQ,CAAC;EACT,MAAM;CACV;AACJ"}

package/dist/_internals/type-aware.d.ts

@@ -0,0 +1,3 @@
+import { TypedFlatConfigItem } from "@antfu/eslint-config";
+export declare function createTypeAwareConfig(): TypedFlatConfigItem;
+//# sourceMappingURL=type-aware.d.ts.map

package/dist/_internals/type-aware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-aware.d.ts","names":[],"sources":["../../src/_internals/type-aware.ts"],"mappings":";wBAEgB,yBAAyB"}

package/dist/_internals/type-aware.js

@@ -0,0 +1,25 @@
+// src/_internals/type-aware.ts
+function createTypeAwareConfig() {
+	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 }]
+		}
+	};
+}
+export { createTypeAwareConfig };
+
+//# sourceMappingURL=type-aware.js.map

package/dist/_internals/type-aware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-aware.js","names":[],"sources":["../../src/_internals/type-aware.ts"],"sourcesContent":["import type { TypedFlatConfigItem } from '@antfu/eslint-config';\n\nexport function createTypeAwareConfig(): TypedFlatConfigItem {\n    return {\n        languageOptions: {\n            parserOptions: {\n                projectService: true,\n                tsconfigRootDir: process.cwd(),\n            },\n        },\n        rules: {\n            'require-await': 'off',\n            'ts/await-thenable': 'error',\n            'ts/no-base-to-string': 'error',\n            'ts/no-floating-promises': 'error',\n            'ts/no-for-in-array': 'error',\n            'ts/no-misused-promises': 'error',\n            'ts/no-misused-spread': 'error',\n            'ts/no-unnecessary-type-assertion': 'error',\n            'ts/require-await': 'error',\n            'ts/return-await': 'error',\n            'ts/switch-exhaustiveness-check': [\n                'error',\n                { considerDefaultExhaustiveForUnions: true },\n            ],\n        },\n    };\n}\n"],"mappings":";AAEA,SAAgB,wBAA6C;CACzD,OAAO;EACH,iBAAiB,EACb,eAAe;GACX,gBAAgB;GAChB,iBAAiB,QAAQ,IAAI;EACjC,EACJ;EACA,OAAO;GACH,iBAAiB;GACjB,qBAAqB;GACrB,wBAAwB;GACxB,2BAA2B;GAC3B,sBAAsB;GACtB,0BAA0B;GAC1B,wBAAwB;GACxB,oCAAoC;GACpC,oBAAoB;GACpB,mBAAmB;GACnB,kCAAkC,CAC9B,SACA,EAAE,oCAAoC,KAAK,CAC/C;EACJ;CACJ;AACJ"}

package/dist/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","names":[],"sources":["../src/base.ts"],"mappings":";wBAgBgB,kBAAkB,+BAAuC;wBA+EzD,gBAAgB,+BAAuC"}
+{"version":3,"file":"base.d.ts","names":[],"sources":["../src/base.ts"],"mappings":";wBAwCgB,kBAAkB,+BAAuC;wBA6IzD,gBAAgB,+BAAuC"}