@isentinel/eslint-config 6.0.0-beta.44 → 6.0.0-beta.46

package/README.md

@@ -255,8 +255,8 @@ Other behaviours:
   (see `FAST_FILES_PER_WORKER`) than the type-aware pass.
 - Keeps a separate ESLint cache per pass so they never invalidate one another:
   `.eslintcache-fast-<key>` (fast pass), `.eslintcache-typeaware-<key>`
-  (type-aware pass), and `.eslintcache-<key>` (the full single-pass config used
-  by `--fix`, CI and `--type-aware=full`). A change to an
+  (type-aware pass), and `.eslintcache-<key>` (the full config, used by CI,
+  `--type-aware=full` and the fix child below). A change to an
   ESLint/oxlint/Prettier/tsconfig file or a lockfile clears each cache that is
   actually older than that change; a change to the root `package.json`
   resolution surface (`exports`, `imports`, `main`, `module`, `types`,
@@ -281,16 +281,46 @@ Other behaviours:
   value naming that branch. It is folded into the key, giving those configs
   separate caches too.
 
-- Runs `--fix` sequentially (`oxlint --fix`, then `eslint --fix`) so two writers
-  never race on the same files.
+- Treats `--fix` as a check followed by a fix, in three steps. `oxlint --fix`
+  goes first and alone, since it rewrites the files the ESLint children are
+  about to read. The run's ESLint passes then run as ordinary **checks** —
+  concurrent, own caches, no writes. By default those are the fast and
+  type-aware passes — the single full pass in CI; an explicit `--type-aware`
+  checks whichever passes that mode selects instead (`full` the single full
+  pass, `only` the type-aware pass alone, `off` the fast pass alone). Finally
+  **one** ESLint child applies fixes to **only the files those checks had
+  messages about**, using the full config (a superset of every pass, so it can
+  fix anything any of them found).
+
+  When the checks report nothing, which is the common case, that last child
+  never spawns and `--fix` costs what a check run costs. Being the run's only
+  ESLint writer, it also cannot race anything.
+
+  The file list comes from the check passes' own caches: ESLint stores each
+  file's result beside its cache entry and replays it on a cache hit, so a warm
+  cache is that pass's whole-tree verdict — including for a pass that
+  auto-skipped, whose verdict stands precisely because nothing it cares about
+  changed. `--no-cache` leaves no verdict to read, so the fix child falls back
+  to linting everything it was given. A target outside the working directory is
+  invisible to the listing the verdict is read against, so it is handed to the
+  fix child as it stands, alongside the reported files; that child runs without
+  the cache, since a stale entry for a file no verdict covers would let ESLint
+  skip it.
+
 - Lets every child run to completion and returns non-zero if any failed — an
   ordinary lint error in one tool no longer kills the others mid-run.
 
 > **Unused eslint-disable directives.** The default two-pass mode does **not**
 > report unused `eslint-disable` directives: a directive naming a rule that
 > lives in the _other_ pass would look unused to the pass that runs it and
-> produce a false positive. `--fix`, CI and `--type-aware=full` runs use the
-> single full config and still report unused directives.
+> produce a false positive. CI and `--type-aware=full` runs use the single full
+> config and still report them.
+>
+> A local `--fix` inherits this from its checks. The fix child runs the full
+> config and would report an unused directive, but it only ever sees the files
+> the checks reported, and a file whose _only_ problem is an unused directive is
+> not one of them — so those directives survive a local fix run. In CI the check
+> is the full config, so they are reported and removed as before.
 
 ### Hybrid detection
 
@@ -317,7 +347,7 @@ Any trailing positional arguments are treated as paths to lint (default `.`).
 | ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------- |
 | `--eslint`                     | Run only ESLint.                                                                                                                   |
 | `--oxlint`                     | Run only oxlint.                                                                                                                   |
-| `--fix`                        | Apply fixes: `oxlint --fix` then `eslint --fix` (sequential).                                                                      |
+| `--fix`                        | Check as usual, then fix only the files the checks reported (one child).                                                           |
 | `--agents`, `--no-agents`      | Force agent-friendly output from both linters on or off (default: on in an agent session).                                         |
 | `--type-aware=off\|only\|full` | Force a single ESLint pass: `off` fast-only, `only` type-aware-only, `full` the whole config in one pass. Cannot mix with `--fix`. |
 | `--no-oxlint-type-aware`       | Skip oxlint's type-aware rules (no `oxlint-tsgolint` needed).                                                                      |

package/dist/cli.mjs

@@ -9,7 +9,7 @@ import path from "node:path";
 import { existsSync, readFileSync } from "fs";
 import { execSync } from "node:child_process";
 //#region package.json
-var version = "6.0.0-beta.44";
+var version = "6.0.0-beta.46";
 var package_default = {
 	name: "@isentinel/eslint-config",
 	version,
@@ -175,7 +175,7 @@ var package_default = {
 	},
 	peerDependencies: {
 		"@vitest/eslint-plugin": "^1.6.4",
-		"eslint": "^10.4.0",
+		"eslint": "^10.10.0",
 		"eslint-plugin-eslint-plugin": "^7.5.0",
 		"eslint-plugin-jest": "^29.15.0",
 		"eslint-plugin-jest-extended": "^3.0.0",
@@ -534,7 +534,7 @@ async function updateEslintFiles(result) {
 //#endregion
 //#region src/cli/constants-generated.ts
 const versionsMap = {
-	"eslint": "10.8.1",
+	"eslint": "10.10.0",
 	"eslint-plugin-jest": "29.16.0",
 	"eslint-plugin-react-jsx": "5.17.3",
 	"eslint-plugin-react-naming-convention": "5.17.3",

package/dist/index.d.mts

@@ -1510,7 +1510,9 @@ interface MainRuleDefaults {
     "*": "off";
   };
   "no-unmodified-loop-condition": {
-    "*": "error";
+    "*": ["error", {
+      "checkConditionalExpressions": false;
+    }];
   };
   "no-unneeded-ternary": {
     "*": ["error", {
@@ -6498,7 +6500,7 @@ interface OverrideSiteChains {
 type TestChain = [TestRuleDefaults, SourceFeatureRuleDefaults, MainRuleDefaults];
 type ValidateOptionsWith<O, VK extends VariantKey> = ValidateSite<O, "rules", MainChain, VK> & ValidateSubOptionsFromTable<O, OverrideSiteChains, VK> & ValidateTestOption<O, TestChain, VK>;
 //#endregion
-//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-config-flat-gitignore/2.3.0/0a594adbd94ca75e2950b1104992894d49bc93f4f2bc935ad192d7104e4c271e/node_modules/eslint-config-flat-gitignore/dist/index.d.mts
+//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-config-flat-gitignore/2.3.0/48bee61dfbd6416cb227d1c477eb8990bf234fa634e4ccd62a9520a90cc26602/node_modules/eslint-config-flat-gitignore/dist/index.d.mts
 interface FlatGitignoreOptions {
   /**
    * Name of the configuration.
@@ -9343,7 +9345,7 @@ interface RuleOptions {
    * Disallow unmodified loop conditions
    * @see https://eslint.org/docs/latest/rules/no-unmodified-loop-condition
    */
-  'no-unmodified-loop-condition'?: Linter.RuleEntry<[]>;
+  'no-unmodified-loop-condition'?: Linter.RuleEntry<NoUnmodifiedLoopCondition>;
   /**
    * Disallow ternary operators when simpler alternatives exist
    * @see https://eslint.org/docs/latest/rules/no-unneeded-ternary
@@ -19662,6 +19664,10 @@ type NoUnderscoreDangle = [] | [{
   allowInArrayDestructuring?: boolean;
   allowInObjectDestructuring?: boolean;
 }];
+// ----- no-unmodified-loop-condition -----
+type NoUnmodifiedLoopCondition = [] | [{
+  checkConditionalExpressions?: boolean;
+}];
 // ----- no-unneeded-ternary -----
 type NoUnneededTernary = [] | [{
   defaultAssignment?: boolean;

package/dist/index.mjs

@@ -1889,7 +1889,7 @@ async function flawless(options = {}, prettierOptions = {}) {
 	];
 }
 //#endregion
-//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@eslint/compat/2.1.0/90f1da88f603538864cab10657b202d55290237a3b641df9ac72b842a3be07f2/node_modules/@eslint/compat/dist/esm/index.js
+//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@eslint/compat/2.1.0/c5793be99df3f1294a68a791ed84f1ed609714ef294e5fa5fdeeff97455db3c8/node_modules/@eslint/compat/dist/esm/index.js
 /**
 * @fileoverview Ignore file utilities for the compat package.
 * @author Nicholas C. Zakas
@@ -1918,7 +1918,7 @@ function convertIgnorePatternToMinimatch(pattern) {
 }
 var init_esm$1 = __esmMin((() => {}));
 //#endregion
-//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-config-flat-gitignore/2.3.0/0a594adbd94ca75e2950b1104992894d49bc93f4f2bc935ad192d7104e4c271e/node_modules/eslint-config-flat-gitignore/dist/index.mjs
+//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-config-flat-gitignore/2.3.0/48bee61dfbd6416cb227d1c477eb8990bf234fa634e4ccd62a9520a90cc26602/node_modules/eslint-config-flat-gitignore/dist/index.mjs
 var dist_exports = /* @__PURE__ */ __exportAll$2({ default: () => ignore });
 function toArray(array) {
 	array = array ?? [];
@@ -3932,6 +3932,7 @@ async function pnpm(options) {
 				"pnpm/yaml-enforce-settings": ["error", { settings: {
 					catalogMode: "prefer",
 					cleanupUnusedCatalogs: true,
+					minimumReleaseAgeExcludePrune: true,
 					shellEmulator: true,
 					trustPolicy: "no-downgrade",
 					trustPolicyIgnoreAfter: 10080
@@ -4907,6 +4908,7 @@ function sortPnpmWorkspace() {
 							"blockExoticSubdeps",
 							"cacheDir",
 							"catalogMode",
+							"catalogPrune",
 							"cleanupUnusedCatalogs",
 							"dedupeDirectDeps",
 							"dedupePeerDependents",
@@ -4916,6 +4918,7 @@ function sortPnpmWorkspace() {
 							"enablePrePostScripts",
 							"engineStrict",
 							"extendNodePath",
+							"globalShims",
 							"hoist",
 							"hoistPattern",
 							"hoistWorkspacePackages",
@@ -4931,6 +4934,7 @@ function sortPnpmWorkspace() {
 							"managePackageManagerVersions",
 							"minimumReleaseAge",
 							"minimumReleaseAgeExclude",
+							"minimumReleaseAgeExcludePrune",
 							"minimumReleaseAgeIgnoreMissingTime",
 							"minimumReleaseAgeStrict",
 							"modulesDir",
@@ -4953,6 +4957,7 @@ function sortPnpmWorkspace() {
 							"shamefullyHoist",
 							"sharedWorkspaceLockfile",
 							"shellEmulator",
+							"sideEffectsCache",
 							"stateDir",
 							"strictDepBuilds",
 							"strictPeerDependencies",
@@ -4965,7 +4970,8 @@ function sortPnpmWorkspace() {
 							"trustPolicyIgnoreAfter",
 							"updateConfig",
 							"updateNotifier",
-							"verifyDepsBeforeRun"
+							"verifyDepsBeforeRun",
+							"virtualStoreType"
 						],
 						...[
 							"gitBranchLockfile",
@@ -4992,7 +4998,8 @@ function sortPnpmWorkspace() {
 							"onlyBuiltDependencies",
 							"onlyBuiltDependenciesFile",
 							"packageExtensions",
-							"peerDependencyRules"
+							"peerDependencyRules",
+							"tasks"
 						],
 						{ order: { type: "asc" } }
 					],
@@ -5017,7 +5024,7 @@ function sortPnpmWorkspace() {
 						natural: true,
 						type: "asc"
 					},
-					pathPattern: "^(supportedArchitectures\\.(cpu|libc|os)|updateConfig\\.ignoreDependencies|peerDependencyRules\\.(allowAny|ignoreMissing)|auditConfig\\.(ignoreCves|ignoreGhsas))$"
+					pathPattern: "^(supportedArchitectures\\.(cpu|libc|os)|update\\.ignoreDeps|updateConfig\\.ignoreDependencies|peerDependencyRules\\.(allowAny|ignoreMissing)|audit\\.ignore|auditConfig\\.(ignoreCves|ignoreGhsas)|sideEffectsCache\\.remote\\.packages|tasks\\.[^.]+\\.dependsOn)$"
 				}
 			]
 		}
@@ -6243,7 +6250,7 @@ async function unicorn({ complementIgnores, nameReplacements, roblox = true, roo
 	];
 }
 //#endregion
-//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-plugin-yml/3.5.0/a00fc88a04d0f2081267792f61f05ad4ceff0f52e1ff41acbbc866518b4fd9c1/node_modules/eslint-plugin-yml/lib/chunk-CfYAbeIz.mjs
+//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-plugin-yml/3.5.0/eedfb7e8cfd566a06319a5894d49f61723d6a8793c9b4a69e6556dd999563774/node_modules/eslint-plugin-yml/lib/chunk-CfYAbeIz.mjs
 var __defProp$1, __exportAll$1;
 var init_chunk_CfYAbeIz = __esmMin((() => {
 	__defProp$1 = Object.defineProperty;
@@ -9426,7 +9433,7 @@ var init_lib$1 = __esmMin((() => {
 	({ ...meta_exports$1 });
 }));
 //#endregion
-//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-plugin-yml/3.5.0/a00fc88a04d0f2081267792f61f05ad4ceff0f52e1ff41acbbc866518b4fd9c1/node_modules/eslint-plugin-yml/lib/index.mjs
+//#region ../../../setup-pnpm/node_modules/.bin/store/v11/links/@/eslint-plugin-yml/3.5.0/eedfb7e8cfd566a06319a5894d49f61723d6a8793c9b4a69e6556dd999563774/node_modules/eslint-plugin-yml/lib/index.mjs
 var lib_exports = /* @__PURE__ */ __exportAll$2({
 	configs: () => configs,
 	default: () => src_default,
@@ -19839,8 +19846,10 @@ var oxlint_drop_exports = /* @__PURE__ */ __exportAll$2({
 * Warn when a user-supplied config references a rule that oxlint owns in hybrid
 * mode (`oxlint: true`). The preset drops every oxlint-covered rule from the
 * ESLint side and lets oxlint format real JS/TS files, so such entries silently
-* do nothing. Markdown-scoped configs are exempt: oxlint cannot lint Markdown
-* virtual files, so the preset re-enables those rules there.
+* do nothing. Configs oxlint cannot reach are exempt: Markdown-scoped ones
+* (oxlint cannot lint Markdown virtual files, so the preset re-enables those
+* rules there) and ones scoped to a non-JS/TS language, which oxlint never
+* parses.
 *
 * @param configs - The resolved flat config items.
 * @param mode - The hybrid mode; in `native` mode jsPlugin rules and formatting
@@ -19870,6 +19879,11 @@ function warnMissingTsgolint() {
 * sibling is inserted directly after the original so later configs (for
 * example the markdown disables) still take precedence.
 *
+* Configs scoped to a language oxlint does not parse are skipped outright: it
+* reads only the JS/TS family, so handing it `oxfmt/oxfmt` for YAML, JSON, CSS
+* or GraphQL would drop the formatter from ESLint without any engine picking it
+* up. See {@link targetsJsOrTs}.
+*
 * @param configs - The resolved flat config items (mutated in place).
 * @param typeAware - Whether oxlint runs type-aware (oxlint-tsgolint present).
 *   When `false`, tsgolint rules are kept in ESLint so they do not vanish from
@@ -19879,7 +19893,7 @@ function warnMissingTsgolint() {
 function dropOxlintCoveredRules(configs, typeAware = true, mode = "full") {
 	for (let index = 0; index < configs.length; index += 1) {
 		const config = configs[index];
-		if (config?.name === void 0 || !config.name.startsWith("isentinel/") || config.name.endsWith("/markdown-code") || config.rules === void 0 || targetsMarkdown(config.files)) continue;
+		if (config?.name === void 0 || !config.name.startsWith("isentinel/") || config.name.endsWith("/markdown-code") || config.rules === void 0 || targetsMarkdown(config.files) || !targetsJsOrTs(config.files)) continue;
 		const dropped = dropCoveredRulesFromConfig(config.rules, typeAware, mode);
 		if (Object.keys(dropped).length === 0) continue;
 		if ((config.ignores ?? []).some((pattern) => typeof pattern === "string" && pattern.includes(".md/"))) continue;
@@ -19928,10 +19942,98 @@ function targetsMarkdown(files) {
 	const patterns = files.flat();
 	return patterns.length > 0 && patterns.every((pattern) => typeof pattern === "string" && pattern.includes(".md"));
 }
+/**
+* The strings one part of a {@link GLOB_GROUP_SPLIT} split can stand for: the
+* comma-separated members of a brace group, the individual characters of a
+* bracket group, or the literal text itself. A part that still holds a group
+* delimiter is a nested or unterminated group, which is not expanded.
+*
+* @param part - One part of a glob fragment split on its groups.
+* @returns The alternatives, or `undefined` when the part is not expandable.
+*/
+function groupAlternatives(part) {
+	const body = part.slice(1, -1);
+	if (part.startsWith("{")) return body.split(",");
+	if (part.startsWith("[")) return body.match(GLOB_ANY_CHARACTER) ?? [];
+	return GLOB_GROUP_DELIMITER.test(part) ? void 0 : [part];
+}
+/**
+* Expand the brace and character-class alternatives of a glob fragment.
+*
+* Only the closed forms the preset's globs use are handled (`{,c,m}`, `[jt]`);
+* anything with a wildcard, a nested group or an unterminated group yields
+* `undefined`, meaning "could be anything". Callers treat that as a match, so
+* an unknown pattern keeps the pre-existing drop behavior.
+*
+* @param fragment - The glob fragment to expand.
+* @returns Every literal string the fragment can produce, or `undefined` when
+*   the fragment is not a closed set of literals.
+*/
+function expandGlobAlternatives(fragment) {
+	if (GLOB_WILDCARD.test(fragment)) return;
+	let results = [""];
+	for (const part of fragment.split(GLOB_GROUP_SPLIT)) {
+		const alternatives = groupAlternatives(part);
+		if (alternatives === void 0) return;
+		results = results.flatMap((prefix) => {
+			return alternatives.map((alternative) => prefix + alternative);
+		});
+	}
+	return results;
+}
+/**
+* The index of the extension dot in a glob's last path segment, or `-1` when it
+* has none. Dots inside a brace or bracket group are masked out first: they
+* belong to an alternative, not to the extension boundary.
+*
+* @param segment - The last path segment of a `files` pattern.
+* @returns The index of the extension dot, or `-1`.
+*/
+function extensionDotIndex(segment) {
+	return segment.replaceAll(GLOB_GROUP, (group) => "\0".repeat(group.length)).lastIndexOf(".");
+}
+/**
+* Whether a single `files` pattern can match a file oxlint reads.
+*
+* Oxlint parses only the JS/TS family, so a pattern whose extension is a closed
+* set of non-JS/TS extensions (`**\/*.y{,a}ml`, `**\/*.json{,5,c}`) describes
+* files oxlint never sees. A pattern whose last segment has no extension, or
+* whose extension is not a closed set, matches conservatively.
+*
+* @param pattern - The `files` pattern to classify.
+* @returns Whether oxlint can lint something the pattern matches.
+*/
+function patternTargetsJsOrTs(pattern) {
+	const segment = pattern.slice(pattern.lastIndexOf("/") + 1);
+	const dot = extensionDotIndex(segment);
+	if (dot === -1) return true;
+	const extensions = expandGlobAlternatives(segment.slice(dot + 1));
+	if (extensions === void 0) return true;
+	return extensions.some((extension) => JS_TS_EXTENSIONS.has(extension));
+}
+/**
+* Whether a config's `files` reach any file oxlint can lint.
+*
+* Hybrid mode only hands a rule to oxlint for the files oxlint actually parses.
+* A config scoped to YAML, JSON, CSS or GraphQL is invisible to oxlint, so its
+* rules must stay in ESLint or they run in neither engine — the case that
+* silently dropped `oxfmt/oxfmt` from every non-JS formatting config.
+*
+* @param files - The config's `files` patterns; nested arrays are AND-combined,
+*   so they only reach JS/TS when every member does.
+* @returns Whether oxlint can lint something the config targets.
+*/
+function targetsJsOrTs(files) {
+	if (files === void 0 || files.length === 0) return true;
+	return files.some((entry) => {
+		if (typeof entry === "string") return patternTargetsJsOrTs(entry);
+		return entry.every((pattern) => patternTargetsJsOrTs(pattern));
+	});
+}
 function findDeadMappedRules(configs, mode) {
 	const references = [];
 	for (const config of configs) {
-		if (config.rules === void 0 || isPresetConfig(config) || targetsMarkdown(config.files)) continue;
+		if (config.rules === void 0 || isPresetConfig(config) || targetsMarkdown(config.files) || !targetsJsOrTs(config.files)) continue;
 		const label = describeConfig(config);
 		for (const [rule, value] of Object.entries(config.rules)) if (value !== void 0 && (presetHandsRuleToOxlint(rule, mode) || mode === "full" && HYBRID_FORMATTING_RULES.has(rule))) references.push({
 			config: label,
@@ -19992,11 +20094,17 @@ function markdownVirtualFiles(files) {
 		return [GLOB_MARKDOWN_CODE, ...[pattern].flat()];
 	});
 }
-var HYBRID_FORMATTING_RULES;
+var HYBRID_FORMATTING_RULES, JS_TS_EXTENSIONS, GLOB_WILDCARD, GLOB_GROUP, GLOB_GROUP_SPLIT, GLOB_GROUP_DELIMITER, GLOB_ANY_CHARACTER;
 var init_oxlint_drop = __esmMin((() => {
 	init_globs();
 	init_routing();
 	HYBRID_FORMATTING_RULES = /* @__PURE__ */ new Set(["oxfmt/oxfmt"]);
+	JS_TS_EXTENSIONS = new Set(GLOB_SRC_EXTENSIONS);
+	GLOB_WILDCARD = /[*?]/;
+	GLOB_GROUP = /\{[^{}]*\}|\[[^[\]]*\]/gu;
+	GLOB_GROUP_SPLIT = /(\{[^{}]*\}|\[[^[\]]*\])/u;
+	GLOB_GROUP_DELIMITER = /[{}[\]]/u;
+	GLOB_ANY_CHARACTER = /./gu;
 }));
 //#endregion
 //#region src/eslint/factory.ts