eslint-plugin-flawless 1.4.2 → 1.4.3

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as plugin, t as PLUGIN_NAME } from "./plugin-F1dJgCBi.mjs";
+import { n as plugin, t as PLUGIN_NAME } from "./plugin-rI_n00SA.mjs";
 //#region src/configs/index.ts
 const configs = { recommended: {
 	plugins: { [PLUGIN_NAME]: plugin },

package/dist/oxlint.mjs

@@ -1,4 +1,4 @@
-import { n as plugin, t as PLUGIN_NAME } from "./plugin-F1dJgCBi.mjs";
+import { n as plugin, t as PLUGIN_NAME } from "./plugin-rI_n00SA.mjs";
 import { definePlugin } from "@oxlint/plugins";
 //#region src/oxlint.ts
 /**

package/dist/{plugin-F1dJgCBi.mjs → plugin-rI_n00SA.mjs}

@@ -14,7 +14,7 @@ import * as core from "@eslint-react/core";
 import { getStaticTOMLValue } from "toml-eslint-parser";
 //#region package.json
 var name = "eslint-plugin-flawless";
-var version = "1.4.2";
+var version = "1.4.3";
 var repository = {
 	"url": "git+https://github.com/christopher-buss/eslint-plugin-flawless.git",
 	"type": "git"
@@ -3132,9 +3132,8 @@ function resolveVitestName$1(sourceCode, identifier) {
 */
 function isInAssertionArgument(node, sourceCode) {
 	let current = node;
-	for (;;) {
+	while (current.type !== AST_NODE_TYPES.Program) {
 		const { parent } = current;
-		if (parent === void 0) return false;
 		if (parent.type === AST_NODE_TYPES.ArrowFunctionExpression || parent.type === AST_NODE_TYPES.FunctionDeclaration || parent.type === AST_NODE_TYPES.FunctionExpression) return false;
 		if (parent.type === AST_NODE_TYPES.CallExpression) {
 			if (current === parent.callee) return false;
@@ -3144,6 +3143,7 @@ function isInAssertionArgument(node, sourceCode) {
 		}
 		current = parent;
 	}
+	return false;
 }
 /**
 * Collects the `?.` tokens along an optional chain's primary spine and the parts
@@ -3205,13 +3205,13 @@ function collectOptionalTokenFixes(chain, sourceCode) {
 function createOnce$10(context) {
 	let config;
 	let sourceCode;
-	let inTestCase = false;
+	const testBlocks = [];
 	/**
-	* Determines whether a call opens a test block (a resolved vitest `it`/`test`,
+	* Determines whether a call names a test block (a resolved vitest `it`/`test`,
 	* or a configured `additionalTestBlockFunctions` name).
 	*
 	* @param node - The call to inspect.
-	* @returns `true` when the call opens a test.
+	* @returns `true` when the call is rooted at a test block name.
 	*/
 	function isTestBlock(node) {
 		const root = getRootIdentifier$1(node.callee);
@@ -3220,12 +3220,46 @@ function createOnce$10(context) {
 		return name !== null && config.additionalTestBlockFunctions.includes(name);
 	}
 	/**
+	* Determines whether a test block call is a modifier applied to the block
+	* rather than the call that opens it. In `it.skipIf(cond)("works", fn)` both
+	* calls are rooted at `it`, but only the outer one takes the test body — the
+	* inner one sits in its callee position.
+	*
+	* @param node - The test block call to inspect.
+	* @returns `true` when the call is a modifier in a callee chain.
+	*/
+	function isTestBlockModifier(node) {
+		const { parent } = node;
+		return parent.type === AST_NODE_TYPES.CallExpression && parent.callee === node;
+	}
+	/**
+	* Determines whether a node sits in the body of the innermost open test block.
+	* A node reached through that block's callee — a modifier's arguments
+	* (`it.skipIf(cond)`, `it.each(cases)`) or a computed key (`it[flag ? …]`) —
+	* decides whether and how the test runs rather than what it does, so it is not
+	* part of the body.
+	*
+	* @param node - The node to locate.
+	* @returns `true` when the node is inside a test body.
+	*/
+	function isInTestBody(node) {
+		const block = testBlocks.at(-1);
+		if (block === void 0) return false;
+		let current = node;
+		while (current.type !== AST_NODE_TYPES.Program) {
+			const { parent } = current;
+			if (parent === block) return current !== block.callee;
+			current = parent;
+		}
+		return false;
+	}
+	/**
 	* Reports a conditional node when the traversal is inside a test body.
 	*
 	* @param node - The `if`/`switch`/ternary/logical construct to flag.
 	*/
 	function maybeReportConditional(node) {
-		if (inTestCase) context.report({
+		if (isInTestBody(node)) context.report({
 			messageId: MESSAGE_ID$9,
 			node
 		});
@@ -3238,16 +3272,16 @@ function createOnce$10(context) {
 				allowOptionalChaining: options?.allowOptionalChaining ?? DEFAULTS$1.allowOptionalChaining
 			};
 			({sourceCode} = context);
-			inTestCase = false;
+			testBlocks.length = 0;
 		},
 		"CallExpression": function(node) {
-			if (isTestBlock(node)) inTestCase = true;
+			if (isTestBlock(node) && !isTestBlockModifier(node)) testBlocks.push(node);
 		},
 		"CallExpression:exit": function(node) {
-			if (isTestBlock(node)) inTestCase = false;
+			if (testBlocks.at(-1) === node) testBlocks.pop();
 		},
 		"ChainExpression": function(node) {
-			if (!inTestCase || config.allowOptionalChaining) return;
+			if (config.allowOptionalChaining || !isInTestBody(node)) return;
 			context.report({
 				fix: (fixer) => {
 					return collectOptionalTokenFixes(node, sourceCode).flatMap((optionalFix) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-flawless",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "Your ESLint plugin description",
   "keywords": [
     "eslint",